openharmony/applications_camera
1
0
Fork 0
mirror of https://github.com/openharmony/applications_camera.git synced 2026-06-30 20:37:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

主干代码规范整改

Browse Source 
Signed-off-by: lijinfengde123 <lijinfeng26@huawei.com>
This commit is contained in:
lijinfengde123
2024-07-19 11:19:25 +08:00
parent a8b72eca10
commit 0bbd17e0c9
34 changed files with 136 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/src/main/ets/default/featurecommon/customdialog/EntryComponentForMulti.ets
+7 -7
View File
@@ -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)
}
common/src/main/ets/default/featurecommon/customdialog/MultiCameraDialog.ets
+9 -9
View File
@@ -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 },
common/src/main/ets/default/featurecommon/customdialog/dialogComponent/CustomDialogView.ets
+8 -8
View File
@@ -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 },
common/src/main/ets/default/featurecommon/customdialog/dialogComponent/EntryComponent.ets
+1 -1
View File
@@ -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() })
common/src/main/ets/default/featurecommon/moreList/moreList.ets
+9 -9
View File
@@ -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(() => {
common/src/main/ets/default/featurecommon/settingview/phone/SetResolution.ets
+9 -9
View File
@@ -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)
common/src/main/ets/default/featurecommon/settingview/phone/SetToggle.ets
+10 -10
View File
@@ -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)
common/src/main/ets/default/featurecommon/settingview/phone/SettingItem.ets
+3 -3
View File
@@ -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)
}
common/src/main/ets/default/featurecommon/settingview/tablet/TabletSetResolution.ets
+8 -8
View File
@@ -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')
common/src/main/ets/default/featurecommon/settingview/tablet/TabletSetToggle.ets
+9 -9
View File
@@ -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 })
}
common/src/main/ets/default/featurecommon/settingview/tablet/TabletSettingItem.ets
+3 -3
View File
@@ -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)
}
common/src/main/ets/default/featurecommon/shutterbutton/ShutterButtonLand.ets
+1 -1
View File
@@ -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)
common/src/main/ets/default/featurecommon/shutterbutton/ShutterController.ts
+1 -1
View File
@@ -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
common/src/main/ets/default/featurecommon/tabbar/TabBar.ets
+1 -1
View File
@@ -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()
common/src/main/ets/default/featurecommon/tabbar/TabBarLand.ets
+2 -2
View File
@@ -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);
common/src/main/ets/default/setting/SettingManager.ts
+3 -3
View File
@@ -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
features/photo/hvigorfile.ts
+2 -2
View File
@@ -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
module.exports = require('@ohos/hvigor-ohos-plugin').harTasks;
features/video/hvigorfile.ts
+2 -2
View File
@@ -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
module.exports = require('@ohos/hvigor-ohos-plugin').harTasks;
hvigorfile.js
+2 -2
View File
@@ -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
module.exports = require('@ohos/hvigor-ohos-plugin').appTasks;
product/phone/hvigorfile.js
+2 -2
View File
@@ -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;
product/phone/src/main/ets/pages/Control.ets
+2 -2
View File
@@ -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)
product/phone/src/main/ets/pages/FootBar.ets
+5 -5
View File
@@ -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 {
product/phone/src/main/ets/pages/SettingView.ets
+10 -10
View File
@@ -67,7 +67,7 @@ class SizeStruct {
export struct SettingView {
private TAG: string = '[SettingView]:'
private settingManager = SettingManager.getInstance()
@State checkNameList: Array<string> = ["4:3", "[16:9] 720p"]
@State checkNameList: Array<string> = ['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)
product/phone/src/main/ets/pages/ThirdPreviewView.ets
+1 -1
View File
@@ -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)
product/phone/src/main/ets/pages/index.ets
+1 -1
View File
@@ -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;
product/phone/src/ohosTest/ets/test/Ability.test.ts
+1 -1
View File
@@ -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)
product/tablet/hvigorfile.js
+2 -2
View File
@@ -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;
product/tablet/src/main/ets/pages/ControlLand.ets
+5 -5
View File
@@ -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 () => {
product/tablet/src/main/ets/pages/PreviewAreaLand.ets
+2 -2
View File
@@ -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();
product/tablet/src/main/ets/pages/SettingView.ets
+11 -11
View File
@@ -86,7 +86,7 @@ export struct SettingView {
private TAG: string = '[SettingView]:'
private settingManager = SettingManager.getInstance()
private scroller: Scroller = new Scroller();
@State checkNameList: Array<string> = ["4:3", "[16:9] 720p"]
@State checkNameList: Array<string> = ['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 })
}
}
}
product/tablet/src/main/ets/pages/SmallVideoTimer.ets
+1 -1
View File
@@ -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)
product/tablet/src/main/ets/pages/ThirdPreviewView.ets
+1 -1
View File
@@ -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)
product/tablet/src/main/ets/pages/indexLand.ets
+1 -1
View File
@@ -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;
product/tablet/src/ohosTest/ets/test/Ability.test.ets
+1 -1
View File
@@ -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)