提交 a0a87143 编写于 作者: T tianwenzhe

srcroll list

Signed-off-by: Ntian-wenzhe411 <tianwenzhe2@huawei.com>
上级 c6857b33
...@@ -32,6 +32,8 @@ struct SetCircle { ...@@ -32,6 +32,8 @@ struct SetCircle {
} }
@Builder specificNoParam() { @Builder specificNoParam() {
Column() {
Scroll() {
Column() { Column() {
Flex({ direction: FlexDirection.Row, alignItems: ItemAlign.Center, justifyContent: FlexAlign.SpaceBetween }){ Flex({ direction: FlexDirection.Row, alignItems: ItemAlign.Center, justifyContent: FlexAlign.SpaceBetween }){
Text('Red').fontSize(16).border({width:2}).size({width:'25%',height:'20%'}) Text('Red').fontSize(16).border({width:2}).size({width:'25%',height:'20%'})
...@@ -78,6 +80,8 @@ struct SetCircle { ...@@ -78,6 +80,8 @@ struct SetCircle {
this.context.fillRect(100, 160, 150, 100); this.context.fillRect(100, 160, 150, 100);
}) })
}.width('100%').height('70%') }.width('100%').height('70%')
}
}
}.width('100%').height('80%').backgroundColor(Color.White) }.width('100%').height('80%').backgroundColor(Color.White)
} }
build() { build() {
......
...@@ -50,6 +50,8 @@ struct SetCircle { ...@@ -50,6 +50,8 @@ struct SetCircle {
await FirstDialog.ChooseDialog(this.StepTips,this.name); await FirstDialog.ChooseDialog(this.StepTips,this.name);
} }
@Builder specificNoParam() { @Builder specificNoParam() {
Column() {
Scroll() {
Column() { Column() {
Flex({ direction: FlexDirection.Column, alignItems: ItemAlign.Center, justifyContent: FlexAlign.SpaceBetween }){ Flex({ direction: FlexDirection.Column, alignItems: ItemAlign.Center, justifyContent: FlexAlign.SpaceBetween }){
Row(){ Row(){
...@@ -452,6 +454,8 @@ struct SetCircle { ...@@ -452,6 +454,8 @@ struct SetCircle {
.onReady(() =>{ .onReady(() =>{
}) })
}.width('100%').height('70%') }.width('100%').height('70%')
}
}
}.width('100%').height('80%').backgroundColor(Color.White) }.width('100%').height('80%').backgroundColor(Color.White)
} }
build() { build() {
......
...@@ -30,6 +30,8 @@ struct SetCircle { ...@@ -30,6 +30,8 @@ struct SetCircle {
} }
@Builder specificNoParam() { @Builder specificNoParam() {
Column() {
Scroll() {
Column() { Column() {
Flex({ direction: FlexDirection.Row, alignItems: ItemAlign.Center, justifyContent: FlexAlign.SpaceBetween }){ Flex({ direction: FlexDirection.Row, alignItems: ItemAlign.Center, justifyContent: FlexAlign.SpaceBetween }){
Text('→').fontSize(16).border({width:2}).size({width:'20%',height:'20%'}) Text('→').fontSize(16).border({width:2}).size({width:'20%',height:'20%'})
...@@ -79,6 +81,8 @@ struct SetCircle { ...@@ -79,6 +81,8 @@ struct SetCircle {
this.context.fillRect(200, 200, 50, 50); this.context.fillRect(200, 200, 50, 50);
}) })
}.width('100%').height('55%') }.width('100%').height('55%')
}
}
}.width('100%').height('80%').backgroundColor(Color.White) }.width('100%').height('80%').backgroundColor(Color.White)
} }
build() { build() {
......
...@@ -39,6 +39,8 @@ struct SetCircle { ...@@ -39,6 +39,8 @@ struct SetCircle {
await FirstDialog.ChooseDialog(this.StepTips,this.name); await FirstDialog.ChooseDialog(this.StepTips,this.name);
} }
@Builder specificNoParam() { @Builder specificNoParam() {
Column() {
Scroll() {
Column() { Column() {
Flex({ direction: FlexDirection.Column, alignItems: ItemAlign.Center, justifyContent: FlexAlign.SpaceBetween }){ Flex({ direction: FlexDirection.Column, alignItems: ItemAlign.Center, justifyContent: FlexAlign.SpaceBetween }){
Row(){ Row(){
...@@ -324,6 +326,8 @@ struct SetCircle { ...@@ -324,6 +326,8 @@ struct SetCircle {
.onReady(() =>{ .onReady(() =>{
}) })
}.width('100%').height('70%') }.width('100%').height('70%')
}
}
}.width('100%').height('80%').backgroundColor(Color.White) }.width('100%').height('80%').backgroundColor(Color.White)
} }
build() { build() {
......
...@@ -31,6 +31,8 @@ struct SetCircle { ...@@ -31,6 +31,8 @@ struct SetCircle {
await FirstDialog.ChooseDialog(this.StepTips,this.name); await FirstDialog.ChooseDialog(this.StepTips,this.name);
} }
@Builder specificNoParam() { @Builder specificNoParam() {
Column() {
Scroll() {
Column() { Column() {
Flex({ direction: FlexDirection.Row, alignItems: ItemAlign.Center, justifyContent: FlexAlign.SpaceBetween }){ Flex({ direction: FlexDirection.Row, alignItems: ItemAlign.Center, justifyContent: FlexAlign.SpaceBetween }){
Text('butt').fontSize(16).border({width:2}).size({width:'25%',height:'20%'}) Text('butt').fontSize(16).border({width:2}).size({width:'25%',height:'20%'})
...@@ -90,6 +92,8 @@ struct SetCircle { ...@@ -90,6 +92,8 @@ struct SetCircle {
this.context.stroke(); this.context.stroke();
}) })
}.width('100%').height('70%') }.width('100%').height('70%')
}
}
}.width('100%').height('80%').backgroundColor(Color.White) }.width('100%').height('80%').backgroundColor(Color.White)
} }
build() { build() {
......
...@@ -29,6 +29,8 @@ struct SetCircle { ...@@ -29,6 +29,8 @@ struct SetCircle {
await FirstDialog.ChooseDialog(this.StepTips,this.name); await FirstDialog.ChooseDialog(this.StepTips,this.name);
} }
@Builder specificNoParam() { @Builder specificNoParam() {
Column() {
Scroll() {
Column() { Column() {
Flex({ direction: FlexDirection.Row, alignItems: ItemAlign.Center, justifyContent: FlexAlign.SpaceBetween }){ Flex({ direction: FlexDirection.Row, alignItems: ItemAlign.Center, justifyContent: FlexAlign.SpaceBetween }){
Text('→').fontSize(16).border({width:2}).size({width:'20%',height:'20%'}) Text('→').fontSize(16).border({width:2}).size({width:'20%',height:'20%'})
...@@ -70,6 +72,8 @@ struct SetCircle { ...@@ -70,6 +72,8 @@ struct SetCircle {
.onReady(() =>{ .onReady(() =>{
}) })
}.width('100%').height('55%') }.width('100%').height('55%')
}
}
}.width('100%').height('80%').backgroundColor(Color.White) }.width('100%').height('80%').backgroundColor(Color.White)
} }
build() { build() {
......
...@@ -31,6 +31,8 @@ struct SetCircle { ...@@ -31,6 +31,8 @@ struct SetCircle {
await FirstDialog.ChooseDialog(this.StepTips,this.name); await FirstDialog.ChooseDialog(this.StepTips,this.name);
} }
@Builder specificNoParam() { @Builder specificNoParam() {
Column() {
Scroll() {
Column() { Column() {
Flex({ direction: FlexDirection.Row, alignItems: ItemAlign.Center, justifyContent: FlexAlign.SpaceBetween }){ Flex({ direction: FlexDirection.Row, alignItems: ItemAlign.Center, justifyContent: FlexAlign.SpaceBetween }){
Text('round').fontSize(16).border({width:2}).size({width:'25%',height:'20%'}) Text('round').fontSize(16).border({width:2}).size({width:'25%',height:'20%'})
...@@ -94,6 +96,8 @@ struct SetCircle { ...@@ -94,6 +96,8 @@ struct SetCircle {
this.context.stroke(); this.context.stroke();
}) })
}.width('100%').height('70%') }.width('100%').height('70%')
}
}
}.width('100%').height('80%').backgroundColor(Color.White) }.width('100%').height('80%').backgroundColor(Color.White)
} }
build() { build() {
......
...@@ -29,6 +29,8 @@ struct SetCircle { ...@@ -29,6 +29,8 @@ struct SetCircle {
} }
@State X: number = 20; @State X: number = 20;
@Builder specificNoParam() { @Builder specificNoParam() {
Column() {
Scroll() {
Column() { Column() {
Flex({ direction: FlexDirection.Row, alignItems: ItemAlign.Center, justifyContent: FlexAlign.SpaceBetween }){ Flex({ direction: FlexDirection.Row, alignItems: ItemAlign.Center, justifyContent: FlexAlign.SpaceBetween }){
Text('→').fontSize(16).border({width:2}).size({width:'20%',height:'20%'}) Text('→').fontSize(16).border({width:2}).size({width:'20%',height:'20%'})
...@@ -70,6 +72,8 @@ struct SetCircle { ...@@ -70,6 +72,8 @@ struct SetCircle {
this.context.strokeRect(120, 120, 120, 120); this.context.strokeRect(120, 120, 120, 120);
}) })
}.width('100%').height('50%') }.width('100%').height('50%')
}
}
}.width('100%').height('80%').backgroundColor(Color.White) }.width('100%').height('80%').backgroundColor(Color.White)
} }
build() { build() {
......
...@@ -29,6 +29,8 @@ struct SetCircle { ...@@ -29,6 +29,8 @@ struct SetCircle {
await FirstDialog.ChooseDialog(this.StepTips,this.name); await FirstDialog.ChooseDialog(this.StepTips,this.name);
} }
@Builder specificNoParam() { @Builder specificNoParam() {
Column() {
Scroll() {
Column() { Column() {
Flex({ direction: FlexDirection.Row, alignItems: ItemAlign.Center, justifyContent: FlexAlign.SpaceBetween }){ Flex({ direction: FlexDirection.Row, alignItems: ItemAlign.Center, justifyContent: FlexAlign.SpaceBetween }){
Text('→').fontSize(16).border({width:2}).size({width:'20%',height:'20%'}) Text('→').fontSize(16).border({width:2}).size({width:'20%',height:'20%'})
...@@ -75,6 +77,8 @@ struct SetCircle { ...@@ -75,6 +77,8 @@ struct SetCircle {
this.context.fillRect(150, 150, 100, 100); this.context.fillRect(150, 150, 100, 100);
}) })
}.width('100%').height('55%') }.width('100%').height('55%')
}
}
}.width('100%').height('80%').backgroundColor(Color.White) }.width('100%').height('80%').backgroundColor(Color.White)
} }
build() { build() {
......
...@@ -32,6 +32,8 @@ struct SetCircle { ...@@ -32,6 +32,8 @@ struct SetCircle {
await FirstDialog.ChooseDialog(this.StepTips,this.name); await FirstDialog.ChooseDialog(this.StepTips,this.name);
} }
@Builder specificNoParam() { @Builder specificNoParam() {
Column() {
Scroll() {
Column() { Column() {
Flex({ direction: FlexDirection.Row, alignItems: ItemAlign.Center, justifyContent: FlexAlign.SpaceBetween }){ Flex({ direction: FlexDirection.Row, alignItems: ItemAlign.Center, justifyContent: FlexAlign.SpaceBetween }){
Text('Blue').fontSize(16).border({width:2}).size({width:'25%',height:'20%'}) Text('Blue').fontSize(16).border({width:2}).size({width:'25%',height:'20%'})
...@@ -81,6 +83,8 @@ struct SetCircle { ...@@ -81,6 +83,8 @@ struct SetCircle {
this.context.fillRect(150, 150, 100, 100); this.context.fillRect(150, 150, 100, 100);
}) })
}.width('100%').height('60%') }.width('100%').height('60%')
}
}
}.width('100%').height('80%').backgroundColor(Color.White) }.width('100%').height('80%').backgroundColor(Color.White)
} }
build() { build() {
......
...@@ -29,6 +29,8 @@ struct SetCircle { ...@@ -29,6 +29,8 @@ struct SetCircle {
await FirstDialog.ChooseDialog(this.StepTips,this.name); await FirstDialog.ChooseDialog(this.StepTips,this.name);
} }
@Builder specificNoParam() { @Builder specificNoParam() {
Column() {
Scroll() {
Column() { Column() {
Flex({ direction: FlexDirection.Row, alignItems: ItemAlign.Center, justifyContent: FlexAlign.SpaceBetween }){ Flex({ direction: FlexDirection.Row, alignItems: ItemAlign.Center, justifyContent: FlexAlign.SpaceBetween }){
Text('→').fontSize(16).border({width:2}).size({width:'20%',height:'20%'}) Text('→').fontSize(16).border({width:2}).size({width:'20%',height:'20%'})
...@@ -79,6 +81,8 @@ struct SetCircle { ...@@ -79,6 +81,8 @@ struct SetCircle {
this.context.fillRect(150, 150, 100, 100); this.context.fillRect(150, 150, 100, 100);
}) })
}.width('100%').height('55%') }.width('100%').height('55%')
}
}
}.width('100%').height('80%').backgroundColor(Color.White) }.width('100%').height('80%').backgroundColor(Color.White)
} }
build() { build() {
......
...@@ -29,6 +29,8 @@ struct SetCircle { ...@@ -29,6 +29,8 @@ struct SetCircle {
await FirstDialog.ChooseDialog(this.StepTips,this.name); await FirstDialog.ChooseDialog(this.StepTips,this.name);
} }
@Builder specificNoParam() { @Builder specificNoParam() {
Column() {
Scroll() {
Column() { Column() {
Flex({ direction: FlexDirection.Row, alignItems: ItemAlign.Center, justifyContent: FlexAlign.SpaceBetween }){ Flex({ direction: FlexDirection.Row, alignItems: ItemAlign.Center, justifyContent: FlexAlign.SpaceBetween }){
Text('→').fontSize(16).border({width:2}).size({width:'20%',height:'20%'}) Text('→').fontSize(16).border({width:2}).size({width:'20%',height:'20%'})
...@@ -78,6 +80,8 @@ struct SetCircle { ...@@ -78,6 +80,8 @@ struct SetCircle {
this.context.fillRect(150, 150, 100, 100); this.context.fillRect(150, 150, 100, 100);
}) })
}.width('100%').height('55%') }.width('100%').height('55%')
}
}
}.width('100%').height('80%').backgroundColor(Color.White) }.width('100%').height('80%').backgroundColor(Color.White)
} }
build() { build() {
......
...@@ -31,6 +31,8 @@ struct SetCircle { ...@@ -31,6 +31,8 @@ struct SetCircle {
await FirstDialog.ChooseDialog(this.StepTips,this.name); await FirstDialog.ChooseDialog(this.StepTips,this.name);
} }
@Builder specificNoParam() { @Builder specificNoParam() {
Column() {
Scroll() {
Column() { Column() {
Flex({ direction: FlexDirection.Row, alignItems: ItemAlign.Center, justifyContent: FlexAlign.SpaceBetween }){ Flex({ direction: FlexDirection.Row, alignItems: ItemAlign.Center, justifyContent: FlexAlign.SpaceBetween }){
Text('Red').fontSize(16).border({width:2}).size({width:'25%',height:'20%'}) Text('Red').fontSize(16).border({width:2}).size({width:'25%',height:'20%'})
...@@ -81,6 +83,8 @@ struct SetCircle { ...@@ -81,6 +83,8 @@ struct SetCircle {
this.context.strokeRect(100, 160, 150, 100); this.context.strokeRect(100, 160, 150, 100);
}) })
}.width('100%').height('70%') }.width('100%').height('70%')
}
}
}.width('100%').height('80%').backgroundColor(Color.White) }.width('100%').height('80%').backgroundColor(Color.White)
} }
build() { build() {
......
...@@ -33,6 +33,8 @@ struct SetCircle { ...@@ -33,6 +33,8 @@ struct SetCircle {
await FirstDialog.ChooseDialog(this.StepTips,this.name); await FirstDialog.ChooseDialog(this.StepTips,this.name);
} }
@Builder specificNoParam() { @Builder specificNoParam() {
Column() {
Scroll() {
Column() { Column() {
Flex({ direction: FlexDirection.Row, alignItems: ItemAlign.Center, justifyContent: FlexAlign.SpaceBetween }){ Flex({ direction: FlexDirection.Row, alignItems: ItemAlign.Center, justifyContent: FlexAlign.SpaceBetween }){
Text('start').fontSize(13).border({width:2}).size({width:'18%',height:'20%'}) Text('start').fontSize(13).border({width:2}).size({width:'18%',height:'20%'})
...@@ -119,6 +121,8 @@ struct SetCircle { ...@@ -119,6 +121,8 @@ struct SetCircle {
this.context.stroke(); this.context.stroke();
}) })
}.width('100%').height('70%') }.width('100%').height('70%')
}
}
}.width('100%').height('80%').backgroundColor(Color.White) }.width('100%').height('80%').backgroundColor(Color.White)
} }
build() { build() {
......
...@@ -33,6 +33,8 @@ struct SetCircle { ...@@ -33,6 +33,8 @@ struct SetCircle {
await FirstDialog.ChooseDialog(this.StepTips,this.name); await FirstDialog.ChooseDialog(this.StepTips,this.name);
} }
@Builder specificNoParam() { @Builder specificNoParam() {
Column() {
Scroll() {
Column() { Column() {
Flex({ direction: FlexDirection.Row, alignItems: ItemAlign.Center, justifyContent: FlexAlign.SpaceBetween }){ Flex({ direction: FlexDirection.Row, alignItems: ItemAlign.Center, justifyContent: FlexAlign.SpaceBetween }){
Text('Top').fontSize(13).border({width:2}).size({width:'18%',height:'20%'}) Text('Top').fontSize(13).border({width:2}).size({width:'18%',height:'20%'})
...@@ -125,6 +127,8 @@ struct SetCircle { ...@@ -125,6 +127,8 @@ struct SetCircle {
this.context.stroke(); this.context.stroke();
}) })
}.width('100%').height('70%') }.width('100%').height('70%')
}
}
}.width('100%').height('80%').backgroundColor(Color.White) }.width('100%').height('80%').backgroundColor(Color.White)
} }
build() { build() {
......
...@@ -26,6 +26,8 @@ struct LongPressGestureExample { ...@@ -26,6 +26,8 @@ struct LongPressGestureExample {
await FirstDialog.ChooseDialog(this.StepTips,this.name); await FirstDialog.ChooseDialog(this.StepTips,this.name);
} }
@Builder specificNoParam() { @Builder specificNoParam() {
Column() {
Scroll() {
Column() { Column() {
Flex({direction:FlexDirection.Column,alignItems: ItemAlign.Center, justifyContent: FlexAlign.SpaceBetween }) { Flex({direction:FlexDirection.Column,alignItems: ItemAlign.Center, justifyContent: FlexAlign.SpaceBetween }) {
Image($r("app.media.img")).height('60%').width('60%') Image($r("app.media.img")).height('60%').width('60%')
...@@ -46,6 +48,8 @@ struct LongPressGestureExample { ...@@ -46,6 +48,8 @@ struct LongPressGestureExample {
}) })
) )
Text('长按动作连续触发:' + this.X).fontColor(Color.Black) Text('长按动作连续触发:' + this.X).fontColor(Color.Black)
}
}
}.width('100%').height('80%').backgroundColor(Color.White) }.width('100%').height('80%').backgroundColor(Color.White)
.justifyContent(FlexAlign.SpaceEvenly) .justifyContent(FlexAlign.SpaceEvenly)
} }
......
...@@ -28,6 +28,8 @@ struct PanGestureExample { ...@@ -28,6 +28,8 @@ struct PanGestureExample {
} }
@Builder specificNoParam() { @Builder specificNoParam() {
Column() { Column() {
Scroll(){
Column(){
Flex({direction:FlexDirection.Column,alignItems: ItemAlign.Center, justifyContent: FlexAlign.SpaceBetween }) { Flex({direction:FlexDirection.Column,alignItems: ItemAlign.Center, justifyContent: FlexAlign.SpaceBetween }) {
Image($r("app.media.img")).height('60%').width('60%') Image($r("app.media.img")).height('60%').width('60%')
} }
...@@ -48,6 +50,8 @@ struct PanGestureExample { ...@@ -48,6 +50,8 @@ struct PanGestureExample {
}) })
) )
Text('偏移坐标x: ' + this.X + '\n' + '偏移坐标y: ' + this.Y) Text('偏移坐标x: ' + this.X + '\n' + '偏移坐标y: ' + this.Y)
}
}
}.width('100%').height('80%').backgroundColor(Color.White) }.width('100%').height('80%').backgroundColor(Color.White)
.justifyContent(FlexAlign.SpaceEvenly) .justifyContent(FlexAlign.SpaceEvenly)
} }
......
...@@ -27,6 +27,8 @@ struct PinchGuestureTest { ...@@ -27,6 +27,8 @@ struct PinchGuestureTest {
} }
@Builder specificNoParam() { @Builder specificNoParam() {
Column(){ Column(){
Scroll() {
Column() {
Flex({direction:FlexDirection.Column,alignItems: ItemAlign.Center, justifyContent: FlexAlign.SpaceBetween }) { Flex({direction:FlexDirection.Column,alignItems: ItemAlign.Center, justifyContent: FlexAlign.SpaceBetween }) {
Image($r("app.media.img")).height('60%').width('60%') Image($r("app.media.img")).height('60%').width('60%')
} }
...@@ -40,6 +42,8 @@ struct PinchGuestureTest { ...@@ -40,6 +42,8 @@ struct PinchGuestureTest {
}) })
) )
Text('捏合放缩比例:'+this.X).fontColor(Color.Black) Text('捏合放缩比例:'+this.X).fontColor(Color.Black)
}
}
} .width('100%').height('80%').backgroundColor(Color.White) } .width('100%').height('80%').backgroundColor(Color.White)
.justifyContent(FlexAlign.SpaceEvenly) .justifyContent(FlexAlign.SpaceEvenly)
} }
......
...@@ -27,6 +27,8 @@ struct RotationGuestureTest { ...@@ -27,6 +27,8 @@ struct RotationGuestureTest {
} }
@Builder specificNoParam() { @Builder specificNoParam() {
Column(){ Column(){
Scroll() {
Column() {
Flex({direction:FlexDirection.Column,alignItems: ItemAlign.Center, justifyContent: FlexAlign.SpaceBetween }) { Flex({direction:FlexDirection.Column,alignItems: ItemAlign.Center, justifyContent: FlexAlign.SpaceBetween }) {
Image($r("app.media.img")).height('60%').width('60%') Image($r("app.media.img")).height('60%').width('60%')
} }
...@@ -41,6 +43,8 @@ struct RotationGuestureTest { ...@@ -41,6 +43,8 @@ struct RotationGuestureTest {
}) })
) )
Text('旋转角度:' + this.X) Text('旋转角度:' + this.X)
}
}
}.height('80%').width('100%').backgroundColor(Color.White) }.height('80%').width('100%').backgroundColor(Color.White)
} }
build() { build() {
......
...@@ -26,6 +26,8 @@ struct TapGestureExample { ...@@ -26,6 +26,8 @@ struct TapGestureExample {
await FirstDialog.ChooseDialog(this.StepTips,this.name); await FirstDialog.ChooseDialog(this.StepTips,this.name);
} }
@Builder specificNoParam() { @Builder specificNoParam() {
Column() {
Scroll() {
Column() { Column() {
Flex({direction:FlexDirection.Column,alignItems: ItemAlign.Center, justifyContent: FlexAlign.SpaceBetween }) { Flex({direction:FlexDirection.Column,alignItems: ItemAlign.Center, justifyContent: FlexAlign.SpaceBetween }) {
Image($r("app.media.img")).height('60%').width('60%') Image($r("app.media.img")).height('60%').width('60%')
...@@ -39,6 +41,8 @@ struct TapGestureExample { ...@@ -39,6 +41,8 @@ struct TapGestureExample {
}) })
) )
Text(this.value) Text(this.value)
}
}
}.width('100%').height('80%').backgroundColor(Color.White) }.width('100%').height('80%').backgroundColor(Color.White)
.justifyContent(FlexAlign.SpaceEvenly) .justifyContent(FlexAlign.SpaceEvenly)
} }
......
...@@ -98,6 +98,7 @@ struct audioInputRouting { ...@@ -98,6 +98,7 @@ struct audioInputRouting {
}.backgroundColor(Color.Black).height('10%').width('100%').justifyContent(FlexAlign.SpaceBetween) }.backgroundColor(Color.Black).height('10%').width('100%').justifyContent(FlexAlign.SpaceBetween)
Column() { Column() {
Flex({direction:FlexDirection.Column,alignItems: ItemAlign.Start, justifyContent: FlexAlign.SpaceBetween }) { Flex({direction:FlexDirection.Column,alignItems: ItemAlign.Start, justifyContent: FlexAlign.SpaceBetween }) {
Scroll() {
Column(){ Column(){
Row(){ Row(){
Text(`是否设备支持TypeC耳机?`).fontColor(Color.White).fontSize('18fp') Text(`是否设备支持TypeC耳机?`).fontColor(Color.White).fontSize('18fp')
...@@ -176,6 +177,7 @@ struct audioInputRouting { ...@@ -176,6 +177,7 @@ struct audioInputRouting {
} }
} }
} }
}
} }
}.width('100%').height('80%').backgroundColor(Color.Black) }.width('100%').height('80%').backgroundColor(Color.Black)
......
...@@ -98,6 +98,7 @@ struct audioInputRouting { ...@@ -98,6 +98,7 @@ struct audioInputRouting {
}.backgroundColor(Color.Black).height('10%').width('100%').justifyContent(FlexAlign.SpaceBetween) }.backgroundColor(Color.Black).height('10%').width('100%').justifyContent(FlexAlign.SpaceBetween)
Column() { Column() {
Flex({direction:FlexDirection.Column,alignItems: ItemAlign.Start, justifyContent: FlexAlign.SpaceBetween }) { Flex({direction:FlexDirection.Column,alignItems: ItemAlign.Start, justifyContent: FlexAlign.SpaceBetween }) {
Scroll() {
Column(){ Column(){
Row(){ Row(){
Text(`是否设备支持3.5mm耳机?`).fontColor(Color.White).fontSize('18fp') Text(`是否设备支持3.5mm耳机?`).fontColor(Color.White).fontSize('18fp')
...@@ -176,6 +177,7 @@ struct audioInputRouting { ...@@ -176,6 +177,7 @@ struct audioInputRouting {
} }
} }
} }
}
} }
}.width('100%').height('80%').backgroundColor(Color.Black) }.width('100%').height('80%').backgroundColor(Color.Black)
......
...@@ -88,6 +88,7 @@ struct audioOutputRouting { ...@@ -88,6 +88,7 @@ struct audioOutputRouting {
}.backgroundColor(Color.Black).height('10%').width('100%').justifyContent(FlexAlign.SpaceBetween) }.backgroundColor(Color.Black).height('10%').width('100%').justifyContent(FlexAlign.SpaceBetween)
Column() { Column() {
Flex({direction:FlexDirection.Column,alignItems: ItemAlign.Center, justifyContent: FlexAlign.SpaceBetween }) { Flex({direction:FlexDirection.Column,alignItems: ItemAlign.Center, justifyContent: FlexAlign.SpaceBetween }) {
Scroll() {
Column(){ Column(){
Row(){ Row(){
Text(`是否设备支持蓝牙耳机?`).fontColor(Color.White).fontSize('18fp') Text(`是否设备支持蓝牙耳机?`).fontColor(Color.White).fontSize('18fp')
...@@ -156,6 +157,7 @@ struct audioOutputRouting { ...@@ -156,6 +157,7 @@ struct audioOutputRouting {
} }
} }
} }
}
} }
}.width('100%').height('80%').backgroundColor(Color.Black) }.width('100%').height('80%').backgroundColor(Color.Black)
......
...@@ -88,6 +88,7 @@ struct audioOutputRouting { ...@@ -88,6 +88,7 @@ struct audioOutputRouting {
}.backgroundColor(Color.Black).height('10%').width('100%').justifyContent(FlexAlign.SpaceBetween) }.backgroundColor(Color.Black).height('10%').width('100%').justifyContent(FlexAlign.SpaceBetween)
Column() { Column() {
Flex({direction:FlexDirection.Column,alignItems: ItemAlign.Center, justifyContent: FlexAlign.SpaceBetween }) { Flex({direction:FlexDirection.Column,alignItems: ItemAlign.Center, justifyContent: FlexAlign.SpaceBetween }) {
Scroll() {
Column(){ Column(){
Row(){ Row(){
Text(`是否设备支持TypeC耳机?`).fontColor(Color.White).fontSize('18fp') Text(`是否设备支持TypeC耳机?`).fontColor(Color.White).fontSize('18fp')
...@@ -156,6 +157,7 @@ struct audioOutputRouting { ...@@ -156,6 +157,7 @@ struct audioOutputRouting {
} }
} }
} }
}
} }
}.width('100%').height('80%').backgroundColor(Color.Black) }.width('100%').height('80%').backgroundColor(Color.Black)
......
...@@ -88,6 +88,7 @@ struct audioOutputRouting { ...@@ -88,6 +88,7 @@ struct audioOutputRouting {
}.backgroundColor(Color.Black).height('10%').width('100%').justifyContent(FlexAlign.SpaceBetween) }.backgroundColor(Color.Black).height('10%').width('100%').justifyContent(FlexAlign.SpaceBetween)
Column() { Column() {
Flex({direction:FlexDirection.Column,alignItems: ItemAlign.Center, justifyContent: FlexAlign.SpaceBetween }) { Flex({direction:FlexDirection.Column,alignItems: ItemAlign.Center, justifyContent: FlexAlign.SpaceBetween }) {
Scroll() {
Column(){ Column(){
Row(){ Row(){
Text(`是否设备支持3.5mm有线耳机?`).fontColor(Color.White).fontSize('18fp') Text(`是否设备支持3.5mm有线耳机?`).fontColor(Color.White).fontSize('18fp')
...@@ -157,6 +158,7 @@ struct audioOutputRouting { ...@@ -157,6 +158,7 @@ struct audioOutputRouting {
} }
} }
} }
}
}.width('100%').height('80%').backgroundColor(Color.Black) }.width('100%').height('80%').backgroundColor(Color.Black)
.justifyContent(FlexAlign.SpaceEvenly) .justifyContent(FlexAlign.SpaceEvenly)
CustomContainer({ CustomContainer({
......
...@@ -104,6 +104,8 @@ struct cameraOrientation { ...@@ -104,6 +104,8 @@ struct cameraOrientation {
}.size({ width: '10%', height: '30%' }) }.size({ width: '10%', height: '30%' })
Flex({ alignItems: ItemAlign.Center, justifyContent: FlexAlign.Start, direction: FlexDirection.Column }) { Flex({ alignItems: ItemAlign.Center, justifyContent: FlexAlign.Start, direction: FlexDirection.Column }) {
Scroll() {
Column() {
// Text(`提示:` + this.isFlash).fontSize('16fp').fontColor(Color.White) // Text(`提示:` + this.isFlash).fontSize('16fp').fontColor(Color.White)
Text(`提示:如果设备存在闪光灯,选择开启,否则选择无闪光灯`) Text(`提示:如果设备存在闪光灯,选择开启,否则选择无闪光灯`)
.fontSize('16fp').fontColor(Color.White).margin('20fp') .fontSize('16fp').fontColor(Color.White).margin('20fp')
...@@ -115,6 +117,8 @@ struct cameraOrientation { ...@@ -115,6 +117,8 @@ struct cameraOrientation {
this.Vue = true this.Vue = true
}) })
}.justifyContent(FlexAlign.SpaceEvenly).width('100%').margin('20fp') }.justifyContent(FlexAlign.SpaceEvenly).width('100%').margin('20fp')
}
}
}.width('80%').height('50%') }.width('80%').height('50%')
......
...@@ -118,6 +118,8 @@ struct cameraOrientation { ...@@ -118,6 +118,8 @@ struct cameraOrientation {
Text('hello').fontColor(Color.White).visibility(Visibility.Hidden) Text('hello').fontColor(Color.White).visibility(Visibility.Hidden)
}.backgroundColor(Color.Black).height('10%').width('100%').justifyContent(FlexAlign.SpaceBetween) }.backgroundColor(Color.Black).height('10%').width('100%').justifyContent(FlexAlign.SpaceBetween)
Scroll() {
Column() {
Flex({ alignItems: ItemAlign.Center, justifyContent: FlexAlign.SpaceAround }) { Flex({ alignItems: ItemAlign.Center, justifyContent: FlexAlign.SpaceAround }) {
Column() { Column() {
XComponent({ XComponent({
...@@ -136,13 +138,13 @@ struct cameraOrientation { ...@@ -136,13 +138,13 @@ struct cameraOrientation {
}) })
.size({ width: '100%', height: '100%' }) .size({ width: '100%', height: '100%' })
Text('预览').fontSize('20fp').fontColor(Color.White) Text('预览').fontSize('20fp').fontColor(Color.White)
}.size({ width: '40%', height: '60%' }) }.size({ width: '40%', height: '65%' })
Column() { Column() {
Image(this.assetUri || '').size({ width: '100%', height: '100%' }).border({ width: 1 }) Image(this.assetUri || '').size({ width: '100%', height: '100%' }).border({ width: 1 })
Text('带旋转角度的图片').fontSize('20fp').fontColor(Color.White) Text('带旋转角度的图片').fontSize('20fp').fontColor(Color.White)
}.size({ width: '40%', height: '60%' }) }.size({ width: '40%', height: '65%' })
}.width('100%').height('50%') }.width('100%').height('60%')
Flex({ direction: FlexDirection.Column }) { Flex({ direction: FlexDirection.Column }) {
Text(`Camera: ${this.cameraDeviceIndex}`).fontSize('16fp').fontColor(Color.White) Text(`Camera: ${this.cameraDeviceIndex}`).fontSize('16fp').fontColor(Color.White)
...@@ -162,6 +164,9 @@ struct cameraOrientation { ...@@ -162,6 +164,9 @@ struct cameraOrientation {
.onClick(async () => { .onClick(async () => {
this.onChangeTake() this.onChangeTake()
}) })
}
}.height('80%')
CustomContainer({ CustomContainer({
title: this.name, title: this.name,
......
...@@ -125,6 +125,8 @@ struct cameraOrientation { ...@@ -125,6 +125,8 @@ struct cameraOrientation {
Text('hello').fontColor(Color.White).visibility(Visibility.Hidden) Text('hello').fontColor(Color.White).visibility(Visibility.Hidden)
}.backgroundColor(Color.Black).height('10%').width('100%').justifyContent(FlexAlign.SpaceBetween) }.backgroundColor(Color.Black).height('10%').width('100%').justifyContent(FlexAlign.SpaceBetween)
Scroll() {
Column() {
Flex({ alignItems: ItemAlign.Center, justifyContent: FlexAlign.SpaceAround }) { Flex({ alignItems: ItemAlign.Center, justifyContent: FlexAlign.SpaceAround }) {
Column() { Column() {
XComponent({ XComponent({
...@@ -141,13 +143,14 @@ struct cameraOrientation { ...@@ -141,13 +143,14 @@ struct cameraOrientation {
}) })
.size({ width: '100%', height: '100%' }) .size({ width: '100%', height: '100%' })
Text('预览').fontSize('20fp').fontColor(Color.White) Text('预览').fontSize('20fp').fontColor(Color.White)
}.size({ width: '40%', height: '60%' }) }.size({ width: '40%', height: '65%' })
Column() { Column() {
Image(this.assetUri || '').size({ width: '100%', height: '100%' }).border({ width: 1 }) Image(this.assetUri || '').size({ width: '100%', height: '100%' }).border({ width: 1 })
Text('图片').fontSize('20fp').fontColor(Color.White) Text('图片').fontSize('20fp').fontColor(Color.White)
}.size({ width: '40%', height: '60%' }) }.size({ width: '40%', height: '65%' })
}.width('100%').height('50%') }.width('100%').height('60%')
Flex({ direction: FlexDirection.Column }) { Flex({ direction: FlexDirection.Column }) {
Row() { Row() {
...@@ -195,7 +198,7 @@ struct cameraOrientation { ...@@ -195,7 +198,7 @@ struct cameraOrientation {
Text(`提示:不同拍照分辨率下进行拍摄,图片拍摄成功且与预览画面一致则选择pass,否则选择fail`) Text(`提示:不同拍照分辨率下进行拍摄,图片拍摄成功且与预览画面一致则选择pass,否则选择fail`)
.fontSize('16fp').fontColor(Color.White).margin({ top: 20 }) .fontSize('16fp').fontColor(Color.White).margin({ top: 20 })
}.size({ width: '80%', height: '20%' }) }.size({ width: '80%', height: '25%' })
Row() { Row() {
Button('拍照') Button('拍照')
...@@ -249,6 +252,10 @@ struct cameraOrientation { ...@@ -249,6 +252,10 @@ struct cameraOrientation {
}) })
}.width('100%').justifyContent(FlexAlign.SpaceEvenly) }.width('100%').justifyContent(FlexAlign.SpaceEvenly)
.height('10%') .height('10%')
}
}.height('80%')
CustomContainer({ CustomContainer({
title: this.name, title: this.name,
......
...@@ -131,6 +131,8 @@ struct cameraFormat { ...@@ -131,6 +131,8 @@ struct cameraFormat {
}.backgroundColor(Color.Black).height('10%').width('100%').justifyContent(FlexAlign.SpaceBetween) }.backgroundColor(Color.Black).height('10%').width('100%').justifyContent(FlexAlign.SpaceBetween)
Flex({ alignItems: ItemAlign.Center, justifyContent: FlexAlign.SpaceAround, direction: FlexDirection.Column }) { Flex({ alignItems: ItemAlign.Center, justifyContent: FlexAlign.SpaceAround, direction: FlexDirection.Column }) {
Scroll() {
Column() {
Column() { Column() {
XComponent({ XComponent({
id: 'componentId', id: 'componentId',
...@@ -144,10 +146,9 @@ struct cameraFormat { ...@@ -144,10 +146,9 @@ struct cameraFormat {
Logger.info(this.tag, `onLoad surfaceId: ${this.surfaceId}`) Logger.info(this.tag, `onLoad surfaceId: ${this.surfaceId}`)
this.cameraInit() this.cameraInit()
}) })
.size({ width: '100%', height: '100%' }) .size({ width: '100%', height: '70%' })
Text('预览').fontSize('20fp').fontColor(Color.White) Text('预览').fontSize('20fp').fontColor(Color.White)
}.size({ width: '80%', height: '70%' }) }.size({ width: '80%' })
Column() { Column() {
Row() { Row() {
Select(this.resolution) Select(this.resolution)
...@@ -215,6 +216,9 @@ struct cameraFormat { ...@@ -215,6 +216,9 @@ struct cameraFormat {
}) })
}.size({ width: '100%', height: '50%' }).justifyContent(FlexAlign.SpaceEvenly) }.size({ width: '100%', height: '50%' }).justifyContent(FlexAlign.SpaceEvenly)
}.size({ width: '100%', height: '20%' }) }.size({ width: '100%', height: '20%' })
}
}
}.height('80%').width('100%') }.height('80%').width('100%')
CustomContainer({ CustomContainer({
......
...@@ -116,6 +116,8 @@ struct cameraOrientation { ...@@ -116,6 +116,8 @@ struct cameraOrientation {
Text('hello').fontColor(Color.White).visibility(Visibility.Hidden) Text('hello').fontColor(Color.White).visibility(Visibility.Hidden)
}.backgroundColor(Color.Black).height('10%').width('100%').justifyContent(FlexAlign.SpaceBetween) }.backgroundColor(Color.Black).height('10%').width('100%').justifyContent(FlexAlign.SpaceBetween)
Scroll() {
Column() {
Flex({ alignItems: ItemAlign.Center, justifyContent: FlexAlign.SpaceAround }) { Flex({ alignItems: ItemAlign.Center, justifyContent: FlexAlign.SpaceAround }) {
Column() { Column() {
XComponent({ XComponent({
...@@ -134,13 +136,13 @@ struct cameraOrientation { ...@@ -134,13 +136,13 @@ struct cameraOrientation {
}) })
.size({ width: '100%', height: '100%' }) .size({ width: '100%', height: '100%' })
Text('预览').fontSize('20fp').fontColor(Color.White) Text('预览').fontSize('20fp').fontColor(Color.White)
}.size({ width: '40%', height: '60%' }) }.size({ width: '40%', height: '65%' })
Column() { Column() {
Image(this.assetUri || '').size({ width: '100%', height: '100%' }).border({ width: 1 }) Image(this.assetUri || '').size({ width: '100%', height: '100%' }).border({ width: 1 })
Text('图片').fontSize('20fp').fontColor(Color.White) Text('图片').fontSize('20fp').fontColor(Color.White)
}.size({ width: '40%', height: '60%' }) }.size({ width: '40%', height: '65%' })
}.width('100%').height('50%') }.width('100%').height('60%')
Flex({ direction: FlexDirection.Column }) { Flex({ direction: FlexDirection.Column }) {
Select(this.cameraList) Select(this.cameraList)
...@@ -176,6 +178,10 @@ struct cameraOrientation { ...@@ -176,6 +178,10 @@ struct cameraOrientation {
this.clickSerialPhotoVal++ this.clickSerialPhotoVal++
}, 1000) }, 1000)
}) })
}
}.height('80%')
CustomContainer({ CustomContainer({
title: this.name, title: this.name,
......
...@@ -141,6 +141,8 @@ struct cameraOrientation { ...@@ -141,6 +141,8 @@ struct cameraOrientation {
Text('hello').fontColor(Color.White).visibility(Visibility.Hidden) Text('hello').fontColor(Color.White).visibility(Visibility.Hidden)
}.backgroundColor(Color.Black).height('10%').width('100%').justifyContent(FlexAlign.SpaceBetween) }.backgroundColor(Color.Black).height('10%').width('100%').justifyContent(FlexAlign.SpaceBetween)
Scroll() {
Column() {
Flex({ justifyContent: FlexAlign.SpaceEvenly }) { Flex({ justifyContent: FlexAlign.SpaceEvenly }) {
Column() { Column() {
...@@ -174,7 +176,7 @@ struct cameraOrientation { ...@@ -174,7 +176,7 @@ struct cameraOrientation {
} }
}.size({ width: '45%', height: '100%' }) }.size({ width: '45%', height: '100%' })
}.size({ width: '100%', height: '50%' }) }.size({ width: '100%', height: '60%' })
Column() { Column() {
Flex({ alignItems: ItemAlign.Center, justifyContent: FlexAlign.SpaceEvenly }) { Flex({ alignItems: ItemAlign.Center, justifyContent: FlexAlign.SpaceEvenly }) {
...@@ -270,6 +272,9 @@ struct cameraOrientation { ...@@ -270,6 +272,9 @@ struct cameraOrientation {
}) })
}.size({ width: '100%', height: '50%' }).justifyContent(FlexAlign.SpaceEvenly) }.size({ width: '100%', height: '50%' }).justifyContent(FlexAlign.SpaceEvenly)
}.size({ width: '100%', height: '30%' }) }.size({ width: '100%', height: '30%' })
}
}.height('80%')
CustomContainer({ CustomContainer({
title: this.name, title: this.name,
......
...@@ -37,7 +37,6 @@ struct CustomContainerUser { ...@@ -37,7 +37,6 @@ struct CustomContainerUser {
async aboutToAppear(){ async aboutToAppear(){
await FirstDialog.ChooseDialog(this.StepTips,this.name); await FirstDialog.ChooseDialog(this.StepTips,this.name);
this.Vue = false; this.Vue = false;
globalThis.resultNum = 'time:-1000';
globalThis.SendMessage = this.toSP_daemon; globalThis.SendMessage = this.toSP_daemon;
globalThis.HideFloatingWindow(); globalThis.HideFloatingWindow();
} }
...@@ -54,7 +53,8 @@ struct CustomContainerUser { ...@@ -54,7 +53,8 @@ struct CustomContainerUser {
Row(){ Row(){
Text(`测试步骤:`+ '\n' + '\n' + '\n' + '\n' + `1.点击开始键进入系统桌面` + '\n' + '\n' Text(`测试步骤:`+ '\n' + '\n' + '\n' + '\n' + `1.点击开始键进入系统桌面` + '\n' + '\n'
+ `2.清空后台应用` + '\n' + '\n' + `3.快速点击桌面相机应用` + '\n' + '\n' +`4.测试应用拉起后手动返回validator界面` + `2.清空后台应用` + '\n' + '\n' + `3.快速点击桌面相机应用` + '\n' + '\n' +`4.测试应用拉起后手动返回validator界面`
+ '\n' + '\n' + '5.点击结束键观察测试结果' + '\n' + '\n' + `6.若冷启动测试在规定时延内完成则通过测试` + '\n' + '\n' ) + '\n' + '\n' + '5.点击结束键观察测试结果' + '\n' + '\n' + `6.若冷启动测试在规定时延内完成则通过测试`
+ '\n' + '\n' + 'PS:双击悬浮球中断测试,长按悬浮球快速结束测试')
.fontColor(Color.White).fontSize('20fp') .fontColor(Color.White).fontSize('20fp')
} }
Row(){ Row(){
...@@ -90,15 +90,18 @@ struct CustomContainerUser { ...@@ -90,15 +90,18 @@ struct CustomContainerUser {
.onClick(() => { .onClick(() => {
this.StartEnable = !this.StartEnable; this.StartEnable = !this.StartEnable;
// /* /*
// camera camera
// */ */
console.log('result num: ' + globalThis.resultNum);
let CameraReport = globalThis.resultNum; let CameraReport = globalThis.resultNum;
let CameraHead = CameraReport.indexOf('time:'); let CameraHead = CameraReport.indexOf('time:');
let CameraTime = CameraReport.substring(CameraHead+5); let CameraTime = CameraReport.substring(CameraHead+5);
this.cameraNum = parseFloat(CameraTime); this.cameraNum = parseFloat(CameraTime);
if( 0 < this.cameraNum && this.cameraNum < 2300 ) { if( 0 < this.cameraNum && this.cameraNum < 2300 ) {
this.num++ this.num++
} else if ( isNaN(this.cameraNum )){
this.cameraNum = -1000;
} }
if( this.num === 1 ) { if( this.num === 1 ) {
this.Vue = true; this.Vue = true;
......
...@@ -97,6 +97,8 @@ struct CustomContainerUser { ...@@ -97,6 +97,8 @@ struct CustomContainerUser {
this.contactsNum = parseFloat(ContactsTime); this.contactsNum = parseFloat(ContactsTime);
if( 0 < this.contactsNum && this.contactsNum < 2300 ) { if( 0 < this.contactsNum && this.contactsNum < 2300 ) {
this.num++ this.num++
} else if ( isNaN(this.contactsNum )){
this.contactsNum = -1000;
} }
if( this.num === 1 ) { if( this.num === 1 ) {
this.Vue = true; this.Vue = true;
......
...@@ -97,6 +97,8 @@ struct CustomContainerUser { ...@@ -97,6 +97,8 @@ struct CustomContainerUser {
this.contactsNum = parseFloat(ContactsTime); this.contactsNum = parseFloat(ContactsTime);
if( 0 < this.contactsNum && this.contactsNum < 600 ) { if( 0 < this.contactsNum && this.contactsNum < 600 ) {
this.num++ this.num++
} else if ( isNaN(this.contactsNum )){
this.contactsNum = -1000;
} }
if( this.num === 1 ) { if( this.num === 1 ) {
this.Vue = true; this.Vue = true;
......
...@@ -89,6 +89,8 @@ struct CustomContainerUser { ...@@ -89,6 +89,8 @@ struct CustomContainerUser {
let time = parseFloat(this.time); let time = parseFloat(this.time);
if( 0 < time && time < 1000 ) { if( 0 < time && time < 1000 ) {
this.Vue = true; this.Vue = true;
}else if ( isNaN(this.time )){
this.time = -1000;
} }
globalThis.HideFloatingWindow(); globalThis.HideFloatingWindow();
}) })
......
...@@ -97,6 +97,8 @@ struct CustomContainerUser { ...@@ -97,6 +97,8 @@ struct CustomContainerUser {
this.mmsNum = parseFloat(MmsTime); this.mmsNum = parseFloat(MmsTime);
if( 0 < this.mmsNum && this.mmsNum < 2300 ) { if( 0 < this.mmsNum && this.mmsNum < 2300 ) {
this.num++ this.num++
} else if ( isNaN(this.mmsNum )){
this.mmsNum = -1000;
} }
if( this.num === 1 ) { if( this.num === 1 ) {
this.Vue = true; this.Vue = true;
......
...@@ -98,6 +98,8 @@ struct CustomContainerUser { ...@@ -98,6 +98,8 @@ struct CustomContainerUser {
this.mmsNum = parseFloat(MmsTime); this.mmsNum = parseFloat(MmsTime);
if( 0 < this.mmsNum && this.mmsNum < 600 ) { if( 0 < this.mmsNum && this.mmsNum < 600 ) {
this.num++ this.num++
} else if ( isNaN(this.mmsNum )){
this.mmsNum = -1000;
} }
if( this.num === 1 ) { if( this.num === 1 ) {
this.Vue = true; this.Vue = true;
......
...@@ -97,6 +97,8 @@ struct CustomContainerUser { ...@@ -97,6 +97,8 @@ struct CustomContainerUser {
this.photosNum = parseFloat(photosTime); this.photosNum = parseFloat(photosTime);
if( 0 < this.photosNum && this.photosNum < 2300 ) { if( 0 < this.photosNum && this.photosNum < 2300 ) {
this.num++ this.num++
} else if ( isNaN(this.photosNum )){
this.photosNum = -1000;
} }
if( this.num === 1 ) { if( this.num === 1 ) {
this.Vue = true; this.Vue = true;
......
...@@ -98,6 +98,8 @@ struct CustomContainerUser { ...@@ -98,6 +98,8 @@ struct CustomContainerUser {
this.photosNum = parseFloat(photosTime); this.photosNum = parseFloat(photosTime);
if( 0 < this.photosNum && this.photosNum < 600 ) { if( 0 < this.photosNum && this.photosNum < 600 ) {
this.num++ this.num++
} else if ( isNaN(this.photosNum )){
this.photosNum = -1000;
} }
if( this.num === 1 ) { if( this.num === 1 ) {
this.Vue = true; this.Vue = true;
......
...@@ -97,6 +97,8 @@ struct CustomContainerUser { ...@@ -97,6 +97,8 @@ struct CustomContainerUser {
this.setNum = parseFloat(setTime); this.setNum = parseFloat(setTime);
if( 0 < this.setNum && this.setNum < 2300 ) { if( 0 < this.setNum && this.setNum < 2300 ) {
this.num++ this.num++
} else if ( isNaN(this.setNum )){
this.setNum = -1000;
} }
if( this.num === 1 ) { if( this.num === 1 ) {
this.Vue = true; this.Vue = true;
......
...@@ -98,6 +98,8 @@ struct CustomContainerUser { ...@@ -98,6 +98,8 @@ struct CustomContainerUser {
this.setNum = parseFloat(setTime); this.setNum = parseFloat(setTime);
if( 0 < this.setNum && this.setNum < 600 ) { if( 0 < this.setNum && this.setNum < 600 ) {
this.num++ this.num++
} else if ( isNaN(this.setNum )){
this.setNum = -1000;
} }
if( this.num === 1 ) { if( this.num === 1 ) {
this.Vue = true; this.Vue = true;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册