From 0bbd17e0c991deaf00fc84d91c285a36c6b20025 Mon Sep 17 00:00:00 2001 From: lijinfengde123 Date: Fri, 19 Jul 2024 11:19:25 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=BB=E5=B9=B2=E4=BB=A3=E7=A0=81=E8=A7=84?= =?UTF-8?q?=E8=8C=83=E6=95=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: lijinfengde123 --- .../customdialog/EntryComponentForMulti.ets | 14 ++++++------ .../customdialog/MultiCameraDialog.ets | 18 +++++++-------- .../dialogComponent/CustomDialogView.ets | 16 +++++++------- .../dialogComponent/EntryComponent.ets | 2 +- .../featurecommon/moreList/moreList.ets | 18 +++++++-------- .../settingview/phone/SetResolution.ets | 18 +++++++-------- .../settingview/phone/SetToggle.ets | 20 ++++++++--------- .../settingview/phone/SettingItem.ets | 6 ++--- .../tablet/TabletSetResolution.ets | 16 +++++++------- .../settingview/tablet/TabletSetToggle.ets | 18 +++++++-------- .../settingview/tablet/TabletSettingItem.ets | 6 ++--- .../shutterbutton/ShutterButtonLand.ets | 2 +- .../shutterbutton/ShutterController.ts | 2 +- .../default/featurecommon/tabbar/TabBar.ets | 2 +- .../featurecommon/tabbar/TabBarLand.ets | 4 ++-- .../ets/default/setting/SettingManager.ts | 6 ++--- features/photo/hvigorfile.ts | 4 ++-- features/video/hvigorfile.ts | 4 ++-- hvigorfile.js | 4 ++-- product/phone/hvigorfile.js | 4 ++-- product/phone/src/main/ets/pages/Control.ets | 4 ++-- product/phone/src/main/ets/pages/FootBar.ets | 10 ++++----- .../phone/src/main/ets/pages/SettingView.ets | 20 ++++++++--------- .../src/main/ets/pages/ThirdPreviewView.ets | 2 +- product/phone/src/main/ets/pages/index.ets | 2 +- .../src/ohosTest/ets/test/Ability.test.ts | 2 +- product/tablet/hvigorfile.js | 4 ++-- .../tablet/src/main/ets/pages/ControlLand.ets | 10 ++++----- .../src/main/ets/pages/PreviewAreaLand.ets | 4 ++-- .../tablet/src/main/ets/pages/SettingView.ets | 22 +++++++++---------- .../src/main/ets/pages/SmallVideoTimer.ets | 2 +- .../src/main/ets/pages/ThirdPreviewView.ets | 2 +- .../tablet/src/main/ets/pages/indexLand.ets | 2 +- .../src/ohosTest/ets/test/Ability.test.ets | 2 +- 34 files changed, 136 insertions(+), 136 deletions(-) diff --git a/common/src/main/ets/default/featurecommon/customdialog/EntryComponentForMulti.ets b/common/src/main/ets/default/featurecommon/customdialog/EntryComponentForMulti.ets index 633a5ff..a8d80db 100644 --- a/common/src/main/ets/default/featurecommon/customdialog/EntryComponentForMulti.ets +++ b/common/src/main/ets/default/featurecommon/customdialog/EntryComponentForMulti.ets @@ -61,7 +61,7 @@ export default struct EntryComponentForMulti { this.getShowName(this.item) this.curCameraName = this.cameraService.getCameraName() - if (this.localList.split(",").length === 1 && this.curCameraName === 'BACK') { + if (this.localList.split(',').length === 1 && this.curCameraName === 'BACK') { this.curCameraName = 'FRONT' } } @@ -70,10 +70,10 @@ export default struct EntryComponentForMulti { this.cameraPositionName = item.split('_').pop() as string; switch (this.cameraPositionName) { case 'FRONT': - this.cameraPositionRes = $r("app.string.front") + this.cameraPositionRes = $r('app.string.front') break case 'BACK': - this.cameraPositionRes = $r("app.string.back") + this.cameraPositionRes = $r('app.string.back') break default: break @@ -93,19 +93,19 @@ export default struct EntryComponentForMulti { Flex({ direction: FlexDirection.Row, alignItems: ItemAlign.Center, justifyContent: FlexAlign.SpaceBetween }) { Row() { if (this.isLocalDevice) { - Text($r("app.string.local")) + Text($r('app.string.local')) .fontColor('#E6000000') - .fontSize($r("sys.float.ohos_id_text_size_body1")) + .fontSize($r('sys.float.ohos_id_text_size_body1')) .fontWeight(FontWeight.Medium) } else { Text(this.deviceName) .fontColor('#E6000000') - .fontSize($r("sys.float.ohos_id_text_size_body1")) + .fontSize($r('sys.float.ohos_id_text_size_body1')) .fontWeight(FontWeight.Medium) } Text(this.cameraPositionRes) .fontColor('#E6000000') - .fontSize($r("sys.float.ohos_id_text_size_body1")) + .fontSize($r('sys.float.ohos_id_text_size_body1')) .fontWeight(FontWeight.Medium) } diff --git a/common/src/main/ets/default/featurecommon/customdialog/MultiCameraDialog.ets b/common/src/main/ets/default/featurecommon/customdialog/MultiCameraDialog.ets index b1a3645..b5a4ea7 100644 --- a/common/src/main/ets/default/featurecommon/customdialog/MultiCameraDialog.ets +++ b/common/src/main/ets/default/featurecommon/customdialog/MultiCameraDialog.ets @@ -105,19 +105,19 @@ export default struct MultiCameraDialog { Column() { Row() { Text($r('app.string.select_camera')) - .fontSize($r("sys.float.ohos_id_text_size_dialog_tittle")) + .fontSize($r('sys.float.ohos_id_text_size_dialog_tittle')) .fontColor('#E6000000') .opacity(0.9) .fontWeight(FontWeight.Medium) - .opacity($r("sys.float.ohos_id_alpha_content_primary")) + .opacity($r('sys.float.ohos_id_alpha_content_primary')) } .width('100%') .height('56vp') Row() { Text($r('app.string.local_device')) - .fontSize($r("sys.float.ohos_id_text_size_body2")) - .fontColor("#99182431") + .fontSize($r('sys.float.ohos_id_text_size_body2')) + .fontColor('#99182431') .fontWeight(FontWeight.Medium) } .width('100%') @@ -138,12 +138,12 @@ export default struct MultiCameraDialog { }) } .listDirection(Axis.Vertical) - .divider({ strokeWidth: '1vp', color: "#33182431", startMargin: 0, endMargin: 12}) + .divider({ strokeWidth: '1vp', color: '#33182431', startMargin: 0, endMargin: 12}) Row() { Text($r('app.string.more_devices')) - .fontSize($r("sys.float.ohos_id_text_size_body2")) - .fontColor("#99182431") + .fontSize($r('sys.float.ohos_id_text_size_body2')) + .fontColor('#99182431') .fontWeight(FontWeight.Medium) } .width('100%') @@ -171,7 +171,7 @@ export default struct MultiCameraDialog { Column() { Button({ type: ButtonType.Capsule, stateEffect: true }) { Text($r('app.string.cancel')) - .fontSize($r("sys.float.ohos_id_text_size_sub_title2")) + .fontSize($r('sys.float.ohos_id_text_size_sub_title2')) .fontColor('#1095E8') .fontWeight(FontWeight.Medium) .height('100%') @@ -193,7 +193,7 @@ export default struct MultiCameraDialog { .width('100%') .backgroundColor(Color.White) .padding({ left: 24, right: 24 }) - .borderRadius($r("sys.float.ohos_id_corner_radius_default_xl")) + .borderRadius($r('sys.float.ohos_id_corner_radius_default_xl')) .useSizeType({ xs: { span: 4, offset: this.useSizeTypeOffset }, sm: { span: 4, offset: this.useSizeTypeOffset }, diff --git a/common/src/main/ets/default/featurecommon/customdialog/dialogComponent/CustomDialogView.ets b/common/src/main/ets/default/featurecommon/customdialog/dialogComponent/CustomDialogView.ets index 6d1dda5..c059187 100644 --- a/common/src/main/ets/default/featurecommon/customdialog/dialogComponent/CustomDialogView.ets +++ b/common/src/main/ets/default/featurecommon/customdialog/dialogComponent/CustomDialogView.ets @@ -103,11 +103,11 @@ export struct CustomDialogView { Column() { Row() { Text(this.customDialogDetails.settingTitle) - .fontSize($r("sys.float.ohos_id_text_size_dialog_tittle")) + .fontSize($r('sys.float.ohos_id_text_size_dialog_tittle')) .fontColor('#E6000000') .opacity(0.9) .fontWeight(FontWeight.Medium) - .opacity($r("sys.float.ohos_id_alpha_content_primary")) + .opacity($r('sys.float.ohos_id_alpha_content_primary')) } .width('100%') .height(56) @@ -131,7 +131,7 @@ export struct CustomDialogView { Column() { Button({ type: ButtonType.Capsule, stateEffect: true }) { Text($r('app.string.cancel')) - .fontSize($r("sys.float.ohos_id_text_size_sub_title2")) + .fontSize($r('sys.float.ohos_id_text_size_sub_title2')) .fontColor('#1095E8') .fontWeight(FontWeight.Medium) .height('100%') @@ -155,18 +155,18 @@ export struct CustomDialogView { .margin({ left: '12vp', right: '12vp', bottom: '16vp' }) .backgroundColor(Color.White) .padding({ left: '24vp', right: '24vp' }) - .borderRadius($r("sys.float.ohos_id_corner_radius_default_xl")) + .borderRadius($r('sys.float.ohos_id_corner_radius_default_xl')) } } else { Flex({ justifyContent: FlexAlign.Center }) { Column() { Row() { Text(this.customDialogDetails.settingTitle) - .fontSize($r("sys.float.ohos_id_text_size_dialog_tittle")) + .fontSize($r('sys.float.ohos_id_text_size_dialog_tittle')) .fontColor('#E6000000') .opacity(0.9) .fontWeight(FontWeight.Medium) - .opacity($r("sys.float.ohos_id_alpha_content_primary")) + .opacity($r('sys.float.ohos_id_alpha_content_primary')) } .width('100%') .height(56) @@ -192,7 +192,7 @@ export struct CustomDialogView { Column() { Button({ type: ButtonType.Capsule, stateEffect: true }) { Text($r('app.string.cancel')) - .fontSize($r("sys.float.ohos_id_text_size_sub_title2")) + .fontSize($r('sys.float.ohos_id_text_size_sub_title2')) .fontColor('#1095E8') .fontWeight(FontWeight.Medium) .height('100%') @@ -217,7 +217,7 @@ export struct CustomDialogView { .margin({ left: '12vp', right: '12vp', bottom: '16vp' }) .backgroundColor(Color.White) .padding({ left: '24vp', right: '24vp' }) - .borderRadius($r("sys.float.ohos_id_corner_radius_default_xl")) + .borderRadius($r('sys.float.ohos_id_corner_radius_default_xl')) .useSizeType({ xs: { span: 4, offset: this.localStyle.offset }, sm: { span: 4, offset: this.localStyle.offset }, diff --git a/common/src/main/ets/default/featurecommon/customdialog/dialogComponent/EntryComponent.ets b/common/src/main/ets/default/featurecommon/customdialog/dialogComponent/EntryComponent.ets index a01bd89..bb25740 100644 --- a/common/src/main/ets/default/featurecommon/customdialog/dialogComponent/EntryComponent.ets +++ b/common/src/main/ets/default/featurecommon/customdialog/dialogComponent/EntryComponent.ets @@ -75,7 +75,7 @@ export default struct EntryComponent { Flex({ direction: FlexDirection.Row, alignItems: ItemAlign.Center, justifyContent: FlexAlign.SpaceBetween }) { Text(this.itemValue) .fontColor('#E6000000') - .fontSize($r("sys.float.ohos_id_text_size_body1")) + .fontSize($r('sys.float.ohos_id_text_size_body1')) .fontWeight(FontWeight.Regular) Radio({ group: 'settingChildren', value: this.itemValue.toString() }) diff --git a/common/src/main/ets/default/featurecommon/moreList/moreList.ets b/common/src/main/ets/default/featurecommon/moreList/moreList.ets index 9605827..7ac4099 100644 --- a/common/src/main/ets/default/featurecommon/moreList/moreList.ets +++ b/common/src/main/ets/default/featurecommon/moreList/moreList.ets @@ -19,7 +19,7 @@ import { Dispatch, OhCombinedState } from '../../redux/store'; import { getStore } from '../../redux/store'; class MoreListInfo { - itemIcon: Resource = $r("app.media.photo"); + itemIcon: Resource = $r('app.media.photo'); itemValue: string = 'photo'; } @@ -46,19 +46,19 @@ export struct MoreList { private mAction: MoreListDispatcher = new MoreListDispatcher(); private mDirection: PanDirection = PanDirection.Right; private moreList: MoreListInfo[] = [{ - itemIcon: $r("app.media.photo"), + itemIcon: $r('app.media.photo'), itemValue: 'photo' }, { - itemIcon: $r("app.media.sd_card"), + itemIcon: $r('app.media.sd_card'), itemValue: 'sd_card' }, { - itemIcon: $r("app.media.setting"), + itemIcon: $r('app.media.setting'), itemValue: 'setting' }, { - itemIcon: $r("app.media.small_switch_camera"), + itemIcon: $r('app.media.small_switch_camera'), itemValue: 'switch' }, { - itemIcon: $r("app.media.sound_mute"), + itemIcon: $r('app.media.sound_mute'), itemValue: 'sound_mute' }] @@ -113,10 +113,10 @@ export struct MoreList { .rowsTemplate('1fr 1fr 1fr') .columnsGap(1) .rowsGap(1) - .backgroundColor("rgba(205,201,201,0.6)") + .backgroundColor('rgba(205,201,201,0.6)') } - .width("100%") - .height("70%") + .width('100%') + .height('70%') .gesture( PanGesture({ direction: this.mDirection }) .onActionEnd(() => { diff --git a/common/src/main/ets/default/featurecommon/settingview/phone/SetResolution.ets b/common/src/main/ets/default/featurecommon/settingview/phone/SetResolution.ets index 43c3d00..1099548 100644 --- a/common/src/main/ets/default/featurecommon/settingview/phone/SetResolution.ets +++ b/common/src/main/ets/default/featurecommon/settingview/phone/SetResolution.ets @@ -48,8 +48,8 @@ export struct SetResolution { private WH_100_100: string = "100%"; private settingManager = SettingManager.getInstance(); private setAlias: string = ''; - @StorageLink("settingDialogFlag") settingDialogFlag: boolean = true; - @State curCheckName: Resource = $r("app.string.default_value"); + @StorageLink('settingDialogFlag') settingDialogFlag: boolean = true; + @State curCheckName: Resource = $r('app.string.default_value'); @State state: StateStruct = new StateStruct(); private mAction: SetResolutionDispatcher = new SetResolutionDispatcher(); @Provide customDialogDetails: CustomDialogDetails = { @@ -119,21 +119,21 @@ export struct SetResolution { Image(this.itemValue.imagePath) .width(24) .height(24) - .fillColor("#FFFFFF") + .fillColor('#FFFFFF') Text(this.itemValue.settingName) - .margin({ left: $r("sys.float.ohos_id_elements_margin_horizontal_l") }) - .fontColor("#FFFFFF") - .fontSize($r("sys.float.ohos_id_text_size_sub_title2")) + .margin({ left: $r('sys.float.ohos_id_elements_margin_horizontal_l') }) + .fontColor('#FFFFFF') + .fontSize($r('sys.float.ohos_id_text_size_sub_title2')) .fontWeight(FontWeight.Regular) } Row() { Text(this.formatCurCheckName(this.curCheckName)) .fontColor($r('app.color.font_color_FFFFFF')) - .fontSize($r("sys.float.ohos_id_text_size_body2")) + .fontSize($r('sys.float.ohos_id_text_size_body2')) .opacity(0.6) .fontWeight(FontWeight.Regular) - Image($r("app.media.ic_public_arrow_right")) + Image($r('app.media.ic_public_arrow_right')) .width(12) .height(24) .fillColor('#33FFFFFF') @@ -142,7 +142,7 @@ export struct SetResolution { .margin({ left: 4 }) } } - .height("100%") + .height('100%') } .padding({ left: 12, right: 12 }) .width(this.WH_100_100) diff --git a/common/src/main/ets/default/featurecommon/settingview/phone/SetToggle.ets b/common/src/main/ets/default/featurecommon/settingview/phone/SetToggle.ets index fb7bbfd..3701fb0 100644 --- a/common/src/main/ets/default/featurecommon/settingview/phone/SetToggle.ets +++ b/common/src/main/ets/default/featurecommon/settingview/phone/SetToggle.ets @@ -78,23 +78,23 @@ export struct SetToggle { Image(this.itemValue.imagePath) .width(24) .height(24) - .fillColor("#FFFFFF") + .fillColor('#FFFFFF') Text(this.itemValue.settingName) - .fontColor("#FFFFFF") - .fontSize($r("sys.float.ohos_id_text_size_sub_title2")) + .fontColor('#FFFFFF') + .fontSize($r('sys.float.ohos_id_text_size_sub_title2')) .fontWeight(FontWeight.Regular) - .margin({ left: $r("sys.float.ohos_id_elements_margin_horizontal_l") }) + .margin({ left: $r('sys.float.ohos_id_elements_margin_horizontal_l') }) } if (this.itemValue?.description) { Row() { Text(this.itemValue.description) - .fontColor("#FFFFFF") - .fontSize($r("sys.float.ohos_id_text_size_body2")) + .fontColor('#FFFFFF') + .fontSize($r('sys.float.ohos_id_text_size_body2')) .fontWeight(FontWeight.Regular) - .opacity($r("sys.float.ohos_id_alpha_content_secondary")) + .opacity($r('sys.float.ohos_id_alpha_content_secondary')) }.margin({ - top: $r("sys.float.ohos_id_text_margin_vertical"), + top: $r('sys.float.ohos_id_text_margin_vertical'), left: 40 }) } } @@ -117,9 +117,9 @@ export struct SetToggle { } this.settingManager.setSettingValue(this.itemValue.settingAlias, setToggle, this.state.mode) }) - }.margin({ left: $r("sys.float.ohos_id_card_margin_end") }) + }.margin({ left: $r('sys.float.ohos_id_card_margin_end') }) } - .height("100%") + .height('100%') } .padding({ left: 12, right: 12 }) .height(this.itemValue?.description ? 72 : 56) diff --git a/common/src/main/ets/default/featurecommon/settingview/phone/SettingItem.ets b/common/src/main/ets/default/featurecommon/settingview/phone/SettingItem.ets index 36df59a..5a21b5f 100644 --- a/common/src/main/ets/default/featurecommon/settingview/phone/SettingItem.ets +++ b/common/src/main/ets/default/featurecommon/settingview/phone/SettingItem.ets @@ -43,7 +43,7 @@ export struct SettingItem { Row() { Text(this.item.settingTitle) .margin({ top: $r('app.float.margin_value_20'), - left: $r("sys.float.ohos_id_card_margin_start"), + left: $r('sys.float.ohos_id_card_margin_start'), bottom: $r('app.float.margin_value_8') }) .fontColor($r('app.color.font_color_FFFFFF')) .opacity($r('app.float.opacity_6')) @@ -80,8 +80,8 @@ export struct SettingItem { } .listDirection(Axis.Vertical) .divider({ strokeWidth: 0.5, color: '#33FFFFFF', startMargin: 56, endMargin: 12 }) - .borderRadius($r("sys.float.ohos_id_corner_radius_card")) - .backgroundColor("#202224") + .borderRadius($r('sys.float.ohos_id_corner_radius_card')) + .backgroundColor('#202224') .padding({ top: 4, bottom: 4 }) }.width(this.WH_100_100) } diff --git a/common/src/main/ets/default/featurecommon/settingview/tablet/TabletSetResolution.ets b/common/src/main/ets/default/featurecommon/settingview/tablet/TabletSetResolution.ets index 3dd2084..6e1141b 100644 --- a/common/src/main/ets/default/featurecommon/settingview/tablet/TabletSetResolution.ets +++ b/common/src/main/ets/default/featurecommon/settingview/tablet/TabletSetResolution.ets @@ -47,8 +47,8 @@ export struct TabletSetResolution { private WH_100_100: string = "100%"; private settingManager: SettingManager = SettingManager.getInstance(); private setAlias: string = ''; - @StorageLink("settingDialogFlag") settingDialogFlag: boolean = true; - @State curCheckName: Resource = $r("app.string.default_value"); + @StorageLink('settingDialogFlag') settingDialogFlag: boolean = true; + @State curCheckName: Resource = $r('app.string.default_value'); @State state: StateStruct = new StateStruct(); private mAction: SetResolutionDispatcher = new SetResolutionDispatcher(); @@ -123,22 +123,22 @@ export struct TabletSetResolution { Image(this.itemValue.imagePath) .width(24) .height(24) - .fillColor("#FFFFFF") + .fillColor('#FFFFFF') Text(this.itemValue.settingName) - .margin({ left: $r("sys.float.ohos_id_elements_margin_horizontal_l") }) - .fontColor("#FFFFFF") - .fontSize($r("sys.float.ohos_id_text_size_sub_title2")) + .margin({ left: $r('sys.float.ohos_id_elements_margin_horizontal_l') }) + .fontColor('#FFFFFF') + .fontSize($r('sys.float.ohos_id_text_size_sub_title2')) .fontWeight(FontWeight.Regular) } Row() { Text(this.formatCurCheckName(this.curCheckName)) .fontColor($r('app.color.font_color_FFFFFF')) - .fontSize($r("sys.float.ohos_id_text_size_body2")) + .fontSize($r('sys.float.ohos_id_text_size_body2')) .opacity(0.6) .fontWeight(FontWeight.Regular) .opacity($r('app.float.opacity_6')) - Image($r("app.media.ic_public_arrow_right")) + Image($r('app.media.ic_public_arrow_right')) .width(12) .height(24) .fillColor('#33FFFFFF') diff --git a/common/src/main/ets/default/featurecommon/settingview/tablet/TabletSetToggle.ets b/common/src/main/ets/default/featurecommon/settingview/tablet/TabletSetToggle.ets index 9e5dc97..0d4fcb0 100644 --- a/common/src/main/ets/default/featurecommon/settingview/tablet/TabletSetToggle.ets +++ b/common/src/main/ets/default/featurecommon/settingview/tablet/TabletSetToggle.ets @@ -78,23 +78,23 @@ export struct TabletSetToggle { Image(this.itemValue.imagePath) .width(24) .height(24) - .fillColor("#FFFFFF") + .fillColor('#FFFFFF') Text(this.itemValue.settingName) - .fontColor("#FFFFFF") - .fontSize($r("sys.float.ohos_id_text_size_sub_title2")) + .fontColor('#FFFFFF') + .fontSize($r('sys.float.ohos_id_text_size_sub_title2')) .fontWeight(FontWeight.Regular) - .margin({ left: $r("sys.float.ohos_id_elements_margin_horizontal_l") }) + .margin({ left: $r('sys.float.ohos_id_elements_margin_horizontal_l') }) } if (this.itemValue?.description) { Row() { Text(this.itemValue.description) - .fontColor("#FFFFFF") - .fontSize($r("sys.float.ohos_id_text_size_body2")) + .fontColor('#FFFFFF') + .fontSize($r('sys.float.ohos_id_text_size_body2')) .fontWeight(FontWeight.Regular) - .opacity($r("sys.float.ohos_id_alpha_content_secondary")) + .opacity($r('sys.float.ohos_id_alpha_content_secondary')) }.margin({ - top: $r("sys.float.ohos_id_text_margin_vertical"), + top: $r('sys.float.ohos_id_text_margin_vertical'), left: 40 }) } } @@ -117,7 +117,7 @@ export struct TabletSetToggle { this.settingManager.setSettingValue(this.itemValue.settingAlias, setToggle, this.state.mode) }) } - .margin({ left: $r("sys.float.ohos_id_card_margin_end") }) + .margin({ left: $r('sys.float.ohos_id_card_margin_end') }) } .padding({ left: 12, right: 12, top: 4, bottom: 4 }) } diff --git a/common/src/main/ets/default/featurecommon/settingview/tablet/TabletSettingItem.ets b/common/src/main/ets/default/featurecommon/settingview/tablet/TabletSettingItem.ets index c739569..0b217e2 100644 --- a/common/src/main/ets/default/featurecommon/settingview/tablet/TabletSettingItem.ets +++ b/common/src/main/ets/default/featurecommon/settingview/tablet/TabletSettingItem.ets @@ -47,7 +47,7 @@ export struct TabletSettingItem { Row() { Text(this.item.settingTitle) .margin({ top: $r('app.float.margin_value_20'), - left: $r("sys.float.ohos_id_card_margin_start"), + left: $r('sys.float.ohos_id_card_margin_start'), bottom: $r('app.float.margin_value_8') }) .fontColor($r('app.color.font_color_FFFFFF')) .opacity($r('app.float.opacity_6')) @@ -84,8 +84,8 @@ export struct TabletSettingItem { } .listDirection(Axis.Vertical) .divider({ strokeWidth: 0.5, color: '#33FFFFFF', startMargin: 56, endMargin: 12 }) - .borderRadius($r("sys.float.ohos_id_corner_radius_card")) - .backgroundColor("#202224") + .borderRadius($r('sys.float.ohos_id_corner_radius_card')) + .backgroundColor('#202224') .padding({ top: 4, bottom: 4 }) }.width(this.WH_100_100) } diff --git a/common/src/main/ets/default/featurecommon/shutterbutton/ShutterButtonLand.ets b/common/src/main/ets/default/featurecommon/shutterbutton/ShutterButtonLand.ets index e21a497..0582cac 100644 --- a/common/src/main/ets/default/featurecommon/shutterbutton/ShutterButtonLand.ets +++ b/common/src/main/ets/default/featurecommon/shutterbutton/ShutterButtonLand.ets @@ -210,7 +210,7 @@ export struct ShutterButtonLand { } }) } else { - Image($r("app.media.ic_circled")).fillColor(Color.White).width(76).aspectRatio(1) + Image($r('app.media.ic_circled')).fillColor(Color.White).width(76).aspectRatio(1) Image(this.state.shutterIcon) .width(54) .aspectRatio(1) diff --git a/common/src/main/ets/default/featurecommon/shutterbutton/ShutterController.ts b/common/src/main/ets/default/featurecommon/shutterbutton/ShutterController.ts index 7bcb807..cf48901 100644 --- a/common/src/main/ets/default/featurecommon/shutterbutton/ShutterController.ts +++ b/common/src/main/ets/default/featurecommon/shutterbutton/ShutterController.ts @@ -21,7 +21,7 @@ export class ShutterController { stateEffect: boolean getParam(): void { - this.icon = $r("app.media.ic_circled_filled") + this.icon = $r('app.media.ic_circled_filled') this.width = 76 this.height = 76 this.type = ButtonType.Circle diff --git a/common/src/main/ets/default/featurecommon/tabbar/TabBar.ets b/common/src/main/ets/default/featurecommon/tabbar/TabBar.ets index 8d00749..f6f2b0c 100644 --- a/common/src/main/ets/default/featurecommon/tabbar/TabBar.ets +++ b/common/src/main/ets/default/featurecommon/tabbar/TabBar.ets @@ -62,7 +62,7 @@ export struct TabBar { Column() { if (this.state.isThirdPartyCall) { Row() { - Image($r("app.media.ic_public_back")).width(24).height(24) + Image($r('app.media.ic_public_back')).width(24).height(24) .onClick(() => { this.mAction.showSettingView(false) this.onBackClicked() diff --git a/common/src/main/ets/default/featurecommon/tabbar/TabBarLand.ets b/common/src/main/ets/default/featurecommon/tabbar/TabBarLand.ets index 728f23f..689b0f0 100644 --- a/common/src/main/ets/default/featurecommon/tabbar/TabBarLand.ets +++ b/common/src/main/ets/default/featurecommon/tabbar/TabBarLand.ets @@ -71,7 +71,7 @@ export struct TabBarLand { Flex({ direction: FlexDirection.ColumnReverse, alignItems: ItemAlign.Center, justifyContent: FlexAlign.Start }) { if (this.state.isThirdPartyCall) { Row() { - Image($r("app.media.ic_public_back")).width(24).height(24) + Image($r('app.media.ic_public_back')).width(24).height(24) .onClick(() => { this.onBackClicked() }) @@ -81,7 +81,7 @@ export struct TabBarLand { } Row() { - Image($r("app.media.setting")).width(24).height(24) + Image($r('app.media.setting')).width(24).height(24) .onClick(() => { ReportUtil.write(ReportUtil.CLICK_SETTINGS) this.mAction.showSettingView(true); diff --git a/common/src/main/ets/default/setting/SettingManager.ts b/common/src/main/ets/default/setting/SettingManager.ts index 4c6c703..8df8e1a 100644 --- a/common/src/main/ets/default/setting/SettingManager.ts +++ b/common/src/main/ets/default/setting/SettingManager.ts @@ -68,15 +68,15 @@ export class SettingManager { let needCommit = false if (settingAlias == AspectRatio.ALIAS) { this.mAspectRatio = itemValue - this.mEventBus.emit("AspectRatio", [this.getPreviewDisplaySize(mode)]) + this.mEventBus.emit('AspectRatio', [this.getPreviewDisplaySize(mode)]) needCommit = true } else if (settingAlias == Resolution.ALIAS) { this.mResolution = itemValue - this.mEventBus.emit("Resolution", [this.getPreviewDisplaySize(mode)]) + this.mEventBus.emit('Resolution', [this.getPreviewDisplaySize(mode)]) needCommit = true } else if (settingAlias == AssistiveGrid.ALIAS) { this.mAssistiveGrid = itemValue - this.mEventBus.emit("AssistiveGrid", [this.mAssistiveGrid]) + this.mEventBus.emit('AssistiveGrid', [this.mAssistiveGrid]) needCommit = true } else if (settingAlias == Timer.ALIAS) { this.mTimer = itemValue diff --git a/features/photo/hvigorfile.ts b/features/photo/hvigorfile.ts index 3262224..eccf82f 100644 --- a/features/photo/hvigorfile.ts +++ b/features/photo/hvigorfile.ts @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 Huawei Device Co., Ltd. + * Copyright (c) 2023-2024 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -14,4 +14,4 @@ */ // Script for compiling build behavior. It is built in the build plug-in and cannot be modified currently. -module.exports = require('@ohos/hvigor-ohos-plugin').harTasks \ No newline at end of file +module.exports = require('@ohos/hvigor-ohos-plugin').harTasks; \ No newline at end of file diff --git a/features/video/hvigorfile.ts b/features/video/hvigorfile.ts index 3262224..eccf82f 100644 --- a/features/video/hvigorfile.ts +++ b/features/video/hvigorfile.ts @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 Huawei Device Co., Ltd. + * Copyright (c) 2023-2024 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -14,4 +14,4 @@ */ // Script for compiling build behavior. It is built in the build plug-in and cannot be modified currently. -module.exports = require('@ohos/hvigor-ohos-plugin').harTasks \ No newline at end of file +module.exports = require('@ohos/hvigor-ohos-plugin').harTasks; \ No newline at end of file diff --git a/hvigorfile.js b/hvigorfile.js index 2d4f29a..93523c9 100644 --- a/hvigorfile.js +++ b/hvigorfile.js @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 Huawei Device Co., Ltd. + * Copyright (c) 2023-2024 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -14,4 +14,4 @@ */ // Script for compiling build behavior. It is built in the build plug-in and cannot be modified currently. -module.exports = require('@ohos/hvigor-ohos-plugin').appTasks \ No newline at end of file +module.exports = require('@ohos/hvigor-ohos-plugin').appTasks; \ No newline at end of file diff --git a/product/phone/hvigorfile.js b/product/phone/hvigorfile.js index 8371a4a..ad43504 100644 --- a/product/phone/hvigorfile.js +++ b/product/phone/hvigorfile.js @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 Huawei Device Co., Ltd. + * Copyright (c) 2023-2024 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -14,4 +14,4 @@ */ // Script for compiling build behavior. It is built in the build plug-in and cannot be modified currently. -module.exports = require('@ohos/hvigor-ohos-plugin').hapTasks +module.exports = require('@ohos/hvigor-ohos-plugin').hapTasks; diff --git a/product/phone/src/main/ets/pages/Control.ets b/product/phone/src/main/ets/pages/Control.ets index b1a0f6c..f085b93 100644 --- a/product/phone/src/main/ets/pages/Control.ets +++ b/product/phone/src/main/ets/pages/Control.ets @@ -174,7 +174,7 @@ export struct Control { .width('100%') .height('100%') .fontColor('#fff') - .fontSize($r("sys.float.ohos_id_text_size_sub_title3")) + .fontSize($r('sys.float.ohos_id_text_size_sub_title3')) .fontWeight(this.getModeFontWeight(0)) .textAlign(TextAlign.Center) .enabled(this.state.uiEnable) @@ -188,7 +188,7 @@ export struct Control { .width('100%') .height('100%') .fontColor('#fff') - .fontSize($r("sys.float.ohos_id_text_size_sub_title3")) + .fontSize($r('sys.float.ohos_id_text_size_sub_title3')) .fontWeight(this.getModeFontWeight(1)) .textAlign(TextAlign.Center) .enabled(this.state.uiEnable) diff --git a/product/phone/src/main/ets/pages/FootBar.ets b/product/phone/src/main/ets/pages/FootBar.ets index 06b9132..fbde74e 100644 --- a/product/phone/src/main/ets/pages/FootBar.ets +++ b/product/phone/src/main/ets/pages/FootBar.ets @@ -26,11 +26,11 @@ import { ThumbnailView } from '@ohos/common/src/main/ets/default/featurecommon/t import { CameraPlatformCapability } from '@ohos/common/src/main/ets/default/camera/CameraPlatformCapability'; class StateStruct { - platformCapability: CameraPlatformCapability | undefined = undefined; - isThirdPartyCall: boolean = false; - videoState: string = ''; - showZoomLabelValue: boolean = true; - mode: string = ''; + private platformCapability: CameraPlatformCapability | undefined = undefined; + private isThirdPartyCall: boolean = false; + private videoState: string = ''; + private showZoomLabelValue: boolean = true; + private mode: string = ''; } class FootBarDispatcher { diff --git a/product/phone/src/main/ets/pages/SettingView.ets b/product/phone/src/main/ets/pages/SettingView.ets index 839a5ec..00cd7c3 100644 --- a/product/phone/src/main/ets/pages/SettingView.ets +++ b/product/phone/src/main/ets/pages/SettingView.ets @@ -67,7 +67,7 @@ class SizeStruct { export struct SettingView { private TAG: string = '[SettingView]:' private settingManager = SettingManager.getInstance() - @State checkNameList: Array = ["4:3", "[16:9] 720p"] + @State checkNameList: Array = ['4:3', '[16:9] 720p'] @State closeFlag: boolean = false @State tempGutter: number = 12; //列间距 @State tempMargin: number = 12; //两侧间距 @@ -88,17 +88,17 @@ export struct SettingView { }, (dispatch: Dispatch) => { this.mAction.setDispatch(dispatch); }); - this.mEventBus.on("AspectRatio", (data: SizeStruct) => this.aspectRatioChange(data)); - this.mEventBus.on("Resolution", (data: SizeStruct) => this.resolutionChange(data)); - this.mEventBus.on("AssistiveGrid", (data: number) => this.assistiveGridChange(data)); + this.mEventBus.on('AspectRatio', (data: SizeStruct) => this.aspectRatioChange(data)); + this.mEventBus.on('Resolution', (data: SizeStruct) => this.resolutionChange(data)); + this.mEventBus.on('AssistiveGrid', (data: number) => this.assistiveGridChange(data)); Log.info(`${this.TAG} aboutToAppear invoke X`) } aboutToDisappear(): void { Log.info(`${this.TAG} aboutToDisappear E`) - this.mEventBus.off("AspectRatio", (data: SizeStruct) => this.aspectRatioChange(data)); - this.mEventBus.off("Resolution", (data: SizeStruct) => this.resolutionChange(data)); - this.mEventBus.off("AssistiveGrid", (data: number) => this.assistiveGridChange(data)); + this.mEventBus.off('AspectRatio', (data: SizeStruct) => this.aspectRatioChange(data)); + this.mEventBus.off('Resolution', (data: SizeStruct) => this.resolutionChange(data)); + this.mEventBus.off('AssistiveGrid', (data: number) => this.assistiveGridChange(data)); } onBackPress(): boolean { @@ -132,7 +132,7 @@ export struct SettingView { build() { Flex({ direction: FlexDirection.Column }) { Row() { - Image($r("app.media.ic_public_back")) + Image($r('app.media.ic_public_back")) .width(24) .height(24) .fillColor($r('app.color.settings_ic_public_back_FFFFFF')) @@ -140,7 +140,7 @@ export struct SettingView { this.mAction.hideSettingView() }) Text($r('app.string.settings')) - .margin({ left: $r("sys.float.ohos_id_elements_margin_horizontal_l") }) + .margin({ left: $r('sys.float.ohos_id_elements_margin_horizontal_l') }) .fontColor($r('app.color.settings_ic_public_back_FFFFFF')) .fontSize($r('sys.float.ohos_id_text_size_headline8')) .fontWeight(FontWeight.Medium) @@ -184,7 +184,7 @@ export struct SettingView { this.mAction.hideSettingView() }) } - .margin({ top: $r("sys.float.ohos_id_text_paragraph_margin_l") }) + .margin({ top: $r('sys.float.ohos_id_text_paragraph_margin_l') }) } } .width(this.WH_100_100) diff --git a/product/phone/src/main/ets/pages/ThirdPreviewView.ets b/product/phone/src/main/ets/pages/ThirdPreviewView.ets index 8f538f0..4231636 100644 --- a/product/phone/src/main/ets/pages/ThirdPreviewView.ets +++ b/product/phone/src/main/ets/pages/ThirdPreviewView.ets @@ -133,7 +133,7 @@ struct ThirdPreviewView { } else { Video({ src: this.videoUri, - previewUri: `${this.videoUri}/thumbnail/${this.photoWidth?.split("px")[0]}/${this.photoHeight?.split("px")[0]}`, + previewUri: `${this.videoUri}/thumbnail/${this.photoWidth?.split('px')[0]}/${this.photoHeight?.split('px')[0]}`, controller: this.myVideoController }) .controls(this.controls) diff --git a/product/phone/src/main/ets/pages/index.ets b/product/phone/src/main/ets/pages/index.ets index 31d998f..ab605c8 100644 --- a/product/phone/src/main/ets/pages/index.ets +++ b/product/phone/src/main/ets/pages/index.ets @@ -43,7 +43,7 @@ import { GlobalContext } from '@ohos/common/src/main/ets/default/utils/GlobalCon CameraWorker.getInstance(new ModeMap()); -PersistentStorage.PersistProp("storageCameraId", ""); +PersistentStorage.PersistProp('storageCameraId', ''); class StateStruct { footBarHeight: number = 0; diff --git a/product/phone/src/ohosTest/ets/test/Ability.test.ts b/product/phone/src/ohosTest/ets/test/Ability.test.ts index 78d9262..6a93d4f 100644 --- a/product/phone/src/ohosTest/ets/test/Ability.test.ts +++ b/product/phone/src/ohosTest/ets/test/Ability.test.ts @@ -19,7 +19,7 @@ import { Log } from '@ohos/common/src/main/ets/default/utils/Log' export default function abilityTest() { describe('ActsAbilityTest', function () { it('assertContain', 0, function () { - Log.info("it begin") + Log.info('it begin') let a = 'abc' let b = 'b' expect(a).assertContain(b) diff --git a/product/tablet/hvigorfile.js b/product/tablet/hvigorfile.js index 8371a4a..ad43504 100644 --- a/product/tablet/hvigorfile.js +++ b/product/tablet/hvigorfile.js @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 Huawei Device Co., Ltd. + * Copyright (c) 2023-2024 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -14,4 +14,4 @@ */ // Script for compiling build behavior. It is built in the build plug-in and cannot be modified currently. -module.exports = require('@ohos/hvigor-ohos-plugin').hapTasks +module.exports = require('@ohos/hvigor-ohos-plugin').hapTasks; diff --git a/product/tablet/src/main/ets/pages/ControlLand.ets b/product/tablet/src/main/ets/pages/ControlLand.ets index 8d2b557..a94344b 100644 --- a/product/tablet/src/main/ets/pages/ControlLand.ets +++ b/product/tablet/src/main/ets/pages/ControlLand.ets @@ -192,14 +192,14 @@ export struct ControlLand { if ((this.state.isThirdPartyCall || this.state.isFaCall) && this.state.mode === 'PHOTO') { Flex({ direction: FlexDirection.Row, alignItems: ItemAlign.Center, justifyContent: FlexAlign.End }) { Text($r('app.string.photo_mode')) - .fontSize($r("sys.float.ohos_id_text_size_body1")) + .fontSize($r('sys.float.ohos_id_text_size_body1')) .fontColor(Color.White) .fontWeight(FontWeight.Bold) }.layoutWeight(1).height('100%') } else if ((this.state.isThirdPartyCall || this.state.isFaCall) && this.state.mode === 'VIDEO') { Flex({ direction: FlexDirection.Row, alignItems: ItemAlign.Center, justifyContent: FlexAlign.End }) { Text($r('app.string.video_mode')) - .fontSize($r("sys.float.ohos_id_text_size_body1")) + .fontSize($r('sys.float.ohos_id_text_size_body1')) .fontColor(Color.White) .fontWeight(FontWeight.Bold) }.layoutWeight(1).height('100%') @@ -215,7 +215,7 @@ export struct ControlLand { ListItem() { Flex({ direction: FlexDirection.Row, alignItems: ItemAlign.Center, justifyContent: FlexAlign.End }) { Text($r('app.string.multi_mode')) - .fontSize($r("sys.float.ohos_id_text_size_body1")) + .fontSize($r('sys.float.ohos_id_text_size_body1')) .fontColor(Color.White) .enabled(this.state.uiEnable) .onClick(async () => { @@ -228,7 +228,7 @@ export struct ControlLand { ListItem() { Flex({ direction: FlexDirection.Row, alignItems: ItemAlign.Center, justifyContent: FlexAlign.End }) { Text($r('app.string.photo_mode')) - .fontSize($r("sys.float.ohos_id_text_size_body1")) + .fontSize($r('sys.float.ohos_id_text_size_body1')) .fontColor(Color.White) .enabled(this.state.uiEnable) .onClick(async () => { @@ -241,7 +241,7 @@ export struct ControlLand { ListItem() { Flex({ direction: FlexDirection.Row, alignItems: ItemAlign.Center, justifyContent: FlexAlign.End }) { Text($r('app.string.video_mode')) - .fontSize($r("sys.float.ohos_id_text_size_body1")) + .fontSize($r('sys.float.ohos_id_text_size_body1')) .fontColor(Color.White) .enabled(this.state.uiEnable) .onClick(async () => { diff --git a/product/tablet/src/main/ets/pages/PreviewAreaLand.ets b/product/tablet/src/main/ets/pages/PreviewAreaLand.ets index 888ee97..4734689 100644 --- a/product/tablet/src/main/ets/pages/PreviewAreaLand.ets +++ b/product/tablet/src/main/ets/pages/PreviewAreaLand.ets @@ -405,7 +405,7 @@ export struct PreviewAreaLand { this.appEventBus.on(Action.ACTION_INIT_DONE, () => this.onCameraInit); this.appEventBus.on(Action.ACTION_ON_MODE_CHANGED, () => this.onModeChanged); this.appEventBus.on(Action.ACTION_KEEP_SCREEN_ON, () => this.onKeepScreen); - this.appEventBus.on("windowSize", () => this.windowSizeChange); + this.appEventBus.on('windowSize', () => this.windowSizeChange); this.appEventBus.on(Action.ACTION_RECORD_ERROR, () => this.onRecordError); this.appEventBus.on(ScreenLockManager.SCREEN_CHANGE_EVENT, () => this.onScreenChange); this.appEventBus.on(Action.ACTION_UPDATE_CAMERA_STATUS, () => this.updateCameraStatus); @@ -531,7 +531,7 @@ export struct PreviewAreaLand { Log.info(`${this.TAG} aboutToDisappear E`); this.appEventBus.off(Action.ACTION_INIT_DONE, () => this.onCameraInit); this.appEventBus.off(Action.ACTION_ON_MODE_CHANGED, () => this.onModeChanged); - this.appEventBus.off("windowSize", () => this.windowSizeChange); + this.appEventBus.off('windowSize', () => this.windowSizeChange); this.appEventBus.off(Action.ACTION_UPDATE_CAMERA_STATUS, () => this.updateCameraStatus); // this.mConnect?.destroy(); GeoLocation.getInstance().off(); diff --git a/product/tablet/src/main/ets/pages/SettingView.ets b/product/tablet/src/main/ets/pages/SettingView.ets index a9f45f0..2d904f7 100644 --- a/product/tablet/src/main/ets/pages/SettingView.ets +++ b/product/tablet/src/main/ets/pages/SettingView.ets @@ -86,7 +86,7 @@ export struct SettingView { private TAG: string = '[SettingView]:' private settingManager = SettingManager.getInstance() private scroller: Scroller = new Scroller(); - @State checkNameList: Array = ["4:3", "[16:9] 720p"] + @State checkNameList: Array = ['4:3', '[16:9] 720p'] @State closeFlag: boolean = false @State tempGutter: number = 12; //列间距 @State tempMargin: number = 12; //两侧间距 @@ -109,18 +109,18 @@ export struct SettingView { this.mAction.setDispatch(dispatch); }); - this.mEventBus.on("windowSize", (data: PositionData) => this.windowSizeChange(data)); - this.mEventBus.on("AspectRatio", (data: PositionData) => this.aspectRatioChange(data)); - this.mEventBus.on("Resolution", (data: PositionData) => this.resolutionChange(data)); - this.mEventBus.on("AssistiveGrid", (data: number) => this.assistiveGridChange(data)); + this.mEventBus.on('windowSize', (data: PositionData) => this.windowSizeChange(data)); + this.mEventBus.on('AspectRatio', (data: PositionData) => this.aspectRatioChange(data)); + this.mEventBus.on('Resolution', (data: PositionData) => this.resolutionChange(data)); + this.mEventBus.on('AssistiveGrid', (data: number) => this.assistiveGridChange(data)); Log.info(`${this.TAG} aboutToAppear invoke X`); } aboutToDisappear(): void { Log.info(`${this.TAG} aboutToDisappear E`); - this.mEventBus.off("AspectRatio", (data: PositionData) => this.aspectRatioChange(data)); - this.mEventBus.off("Resolution", (data: PositionData) => this.resolutionChange(data)); - this.mEventBus.off("AssistiveGrid", (data: number) => this.assistiveGridChange(data)); + this.mEventBus.off('AspectRatio', (data: PositionData) => this.aspectRatioChange(data)); + this.mEventBus.off('Resolution', (data: PositionData) => this.resolutionChange(data)); + this.mEventBus.off('AssistiveGrid', (data: number) => this.assistiveGridChange(data)); } onBackPress(): boolean { @@ -159,7 +159,7 @@ export struct SettingView { build() { Column() { Row() { - Image($r("app.media.ic_public_back")) + Image($r('app.media.ic_public_back')) .width(24) .height(24) .fillColor($r('app.color.settings_ic_public_back_FFFFFF')) @@ -167,7 +167,7 @@ export struct SettingView { this.mAction.hideSettingView() }) Text($r('app.string.settings')) - .margin({ left: $r("sys.float.ohos_id_elements_margin_horizontal_l") }) + .margin({ left: $r('sys.float.ohos_id_elements_margin_horizontal_l') }) .fontColor($r('app.color.settings_ic_public_back_FFFFFF')) .fontSize($r('sys.float.ohos_id_text_size_headline8')) .fontWeight(FontWeight.Medium) @@ -226,7 +226,7 @@ export struct SettingView { this.mAction.resetZoomRatio() this.mAction.hideSettingView() }) - }.margin({ top: $r("sys.float.ohos_id_text_paragraph_margin_l") , bottom: 70 }) + }.margin({ top: $r('sys.float.ohos_id_text_paragraph_margin_l') , bottom: 70 }) } } } diff --git a/product/tablet/src/main/ets/pages/SmallVideoTimer.ets b/product/tablet/src/main/ets/pages/SmallVideoTimer.ets index 817faf9..7d55418 100644 --- a/product/tablet/src/main/ets/pages/SmallVideoTimer.ets +++ b/product/tablet/src/main/ets/pages/SmallVideoTimer.ets @@ -173,7 +173,7 @@ export struct SmallVideoTimer { .fontColor('#FFFFFF') }.layoutWeight(1) - Text(":").fontSize('28fp').fontWeight(300).fontColor('#FFFFFF') + Text(':').fontSize('28fp').fontWeight(300).fontColor('#FFFFFF') Text(`${this.state.recordingTimeDisplay.split(':')[1]}`) .fontSize('28fp') .fontWeight(300) diff --git a/product/tablet/src/main/ets/pages/ThirdPreviewView.ets b/product/tablet/src/main/ets/pages/ThirdPreviewView.ets index 5e7b804..0ccb87c 100644 --- a/product/tablet/src/main/ets/pages/ThirdPreviewView.ets +++ b/product/tablet/src/main/ets/pages/ThirdPreviewView.ets @@ -110,7 +110,7 @@ struct ThirdPreviewView { } else { Video({ src: this.videoUri, - previewUri: `${this.videoUri}/thumbnail/${this.photoWidth?.split("px")[0]}/${this.photoHeight?.split("px")[0]}`, + previewUri: `${this.videoUri}/thumbnail/${this.photoWidth?.split('px')[0]}/${this.photoHeight?.split('px')[0]}`, controller: this.myVideoController }) .controls(this.controls) diff --git a/product/tablet/src/main/ets/pages/indexLand.ets b/product/tablet/src/main/ets/pages/indexLand.ets index 78737bd..d8a1a61 100644 --- a/product/tablet/src/main/ets/pages/indexLand.ets +++ b/product/tablet/src/main/ets/pages/indexLand.ets @@ -48,7 +48,7 @@ const DEFAULT_FUNCTION = () => { CameraWorker.getInstance(new ModeMap()); let mScreenLockManager = new ScreenLockManager(); -PersistentStorage.PersistProp("storageCameraId", ""); +PersistentStorage.PersistProp('storageCameraId', ''); class StateStruct { permissionFlag: boolean = false; diff --git a/product/tablet/src/ohosTest/ets/test/Ability.test.ets b/product/tablet/src/ohosTest/ets/test/Ability.test.ets index 26918a6..100eae0 100644 --- a/product/tablet/src/ohosTest/ets/test/Ability.test.ets +++ b/product/tablet/src/ohosTest/ets/test/Ability.test.ets @@ -19,7 +19,7 @@ import { Log } from '@ohos/common/src/main/ets/default/utils/Log' export default function abilityTest() { describe('ActsAbilityTest', function () { it('assertContain',0, function () { - Log.info("it begin") + Log.info('it begin') let a = 'abc' let b = 'b' expect(a).assertContain(b)