From db16851833d2ebd822dfa3cf50334d0a2ca3700c Mon Sep 17 00:00:00 2001 From: tangzhigang1 Date: Fri, 2 Dec 2022 16:05:15 +0800 Subject: [PATCH] arkui Signed-off-by: tangzhigang1 --- common/src/main/module.json5 | 6 + entry/src/main/module.json5 | 6 + .../src/main/ets/default/pages/batteryPic.ets | 2 +- .../src/main/ets/default/pages/batterySoc.ets | 2 +- .../batterycomponent/src/main/module.json5 | 6 + features/clockcomponent/src/main/module.json5 | 6 + features/datetimecomponent/package.json | 2 +- .../ets/com/ohos/view/component/dateTime.ets | 2 +- .../datetimecomponent/src/main/module.json5 | 6 + .../main/resources/base/element/float.json | 12 +- .../main/resources/phone/element/float.json | 2 +- .../ohos/noticeItem/view/item/groupItem.ets | 3 +- .../ohos/noticeItem/view/item/titleItem.ets | 4 +- features/noticeitem/src/main/module.json5 | 6 + .../main/resources/base/element/float.json | 94 ++-- .../main/resources/phone/element/float.json | 66 +-- .../src/main/ets/com/ohos/common/constants.ts | 8 +- .../main/ets/com/ohos/model/accountsModel.ts | 65 ++- features/screenlock/src/main/module.json5 | 6 + .../main/resources/base/element/float.json | 96 ++-- .../main/resources/phone/element/float.json | 28 +- .../main/ets/com/ohos/vm/shortcutViewModel.ts | 2 +- .../shortcutcomponent/src/main/module.json5 | 6 + .../main/resources/base/element/float.json | 2 +- .../signalcomponent/src/main/module.json5 | 6 + .../wallpapercomponent/src/main/module.json5 | 6 + features/wificomponent/src/main/module.json5 | 6 + product/pc/src/main/module.json5 | 6 + .../main/resources/base/element/float.json | 506 +---------------- product/phone/src/main/module.json5 | 6 + .../main/resources/base/element/float.json | 513 +----------------- 31 files changed, 293 insertions(+), 1194 deletions(-) diff --git a/common/src/main/module.json5 b/common/src/main/module.json5 index 56a91a8..36beeaf 100644 --- a/common/src/main/module.json5 +++ b/common/src/main/module.json5 @@ -6,6 +6,12 @@ "default", "tablet" ], + "metadata": [ + { + "name": "ArkTSPartialUpdate", + "value": "true" + } + ], "uiSyntax": "ets" } } diff --git a/entry/src/main/module.json5 b/entry/src/main/module.json5 index d85dc66..1821c59 100644 --- a/entry/src/main/module.json5 +++ b/entry/src/main/module.json5 @@ -9,6 +9,12 @@ "default", "tablet" ], + "metadata": [ + { + "name": "ArkTSPartialUpdate", + "value": "true" + } + ], "deliveryWithInstall": true, "installationFree": false, "pages": "$profile:main_pages", diff --git a/features/batterycomponent/src/main/ets/default/pages/batteryPic.ets b/features/batterycomponent/src/main/ets/default/pages/batteryPic.ets index bbfba29..16e5d5e 100644 --- a/features/batterycomponent/src/main/ets/default/pages/batteryPic.ets +++ b/features/batterycomponent/src/main/ets/default/pages/batteryPic.ets @@ -24,7 +24,7 @@ export default struct BatteryPic { @StorageLink('batterySoc') batterySoc: number = 100 @StorageLink('batteryCharging') batteryCharging : boolean = false - @Prop mContentColor: string + @State mContentColor: string = "#FFFFFFFF" @State style: any = StyleConfiguration.getBatteryPicStyle() aboutToAppear(){ diff --git a/features/batterycomponent/src/main/ets/default/pages/batterySoc.ets b/features/batterycomponent/src/main/ets/default/pages/batterySoc.ets index 31e9d46..9bcfec2 100644 --- a/features/batterycomponent/src/main/ets/default/pages/batterySoc.ets +++ b/features/batterycomponent/src/main/ets/default/pages/batterySoc.ets @@ -21,7 +21,7 @@ const TAG = 'BatteryComponent-batterySoc' @Component export default struct BatterySoc { @StorageLink('batterySoc') batterySoc: number = 100 - @Prop mContentColor: string + @State mContentColor: string = "#FFFFFFFF" @State styleCommon: any = StyleConfigurationCommon.getCommonStyle() aboutToAppear() { diff --git a/features/batterycomponent/src/main/module.json5 b/features/batterycomponent/src/main/module.json5 index f121300..18e9b5a 100644 --- a/features/batterycomponent/src/main/module.json5 +++ b/features/batterycomponent/src/main/module.json5 @@ -6,6 +6,12 @@ "default", "tablet" ], + "metadata": [ + { + "name": "ArkTSPartialUpdate", + "value": "true" + } + ], "uiSyntax": "ets" } } diff --git a/features/clockcomponent/src/main/module.json5 b/features/clockcomponent/src/main/module.json5 index c13e085..192f6a4 100644 --- a/features/clockcomponent/src/main/module.json5 +++ b/features/clockcomponent/src/main/module.json5 @@ -6,6 +6,12 @@ "default", "tablet" ], + "metadata": [ + { + "name": "ArkTSPartialUpdate", + "value": "true" + } + ], "uiSyntax": "ets" } } diff --git a/features/datetimecomponent/package.json b/features/datetimecomponent/package.json index 7dce3cb..6b3a089 100644 --- a/features/datetimecomponent/package.json +++ b/features/datetimecomponent/package.json @@ -11,4 +11,4 @@ "repository": {}, "version": "1.0.0", "dependencies": {} -} +} \ No newline at end of file diff --git a/features/datetimecomponent/src/main/ets/com/ohos/view/component/dateTime.ets b/features/datetimecomponent/src/main/ets/com/ohos/view/component/dateTime.ets index 921afd9..f97b697 100644 --- a/features/datetimecomponent/src/main/ets/com/ohos/view/component/dateTime.ets +++ b/features/datetimecomponent/src/main/ets/com/ohos/view/component/dateTime.ets @@ -28,7 +28,7 @@ const TAG = 'ScreenLock-DateTime'; @Component export default struct DateTime { @State mViewModel: ViewModel = new ViewModel() - @Prop isShowDate: boolean + @State isShowDate: boolean = true @State isPhone: boolean = false @State currentLanguage: string = DEFAULTLANG diff --git a/features/datetimecomponent/src/main/module.json5 b/features/datetimecomponent/src/main/module.json5 index 7685a92..29a1e8d 100644 --- a/features/datetimecomponent/src/main/module.json5 +++ b/features/datetimecomponent/src/main/module.json5 @@ -6,6 +6,12 @@ "default", "tablet" ], + "metadata": [ + { + "name": "ArkTSPartialUpdate", + "value": "true" + } + ], "uiSyntax": "ets" } } diff --git a/features/datetimecomponent/src/main/resources/base/element/float.json b/features/datetimecomponent/src/main/resources/base/element/float.json index 5a9bb74..9a6219d 100644 --- a/features/datetimecomponent/src/main/resources/base/element/float.json +++ b/features/datetimecomponent/src/main/resources/base/element/float.json @@ -2,27 +2,27 @@ "float": [ { "name": "time_fontsize", - "value": "148" + "value": "148px" }, { "name": "time_fontWeight", - "value": "400" + "value": "400px" }, { "name": "time_top_margin", - "value": "10" + "value": "10px" }, { "name": "time_bottom_margin", - "value": "10" + "value": "10px" }, { "name": "date_fontsize", - "value": "36" + "value": "36px" }, { "name": "date_week_area_height", - "value": "48" + "value": "48px" }, { "name": "date_lunar_calendar_height", diff --git a/features/datetimecomponent/src/main/resources/phone/element/float.json b/features/datetimecomponent/src/main/resources/phone/element/float.json index f40d0b4..dbf9bf5 100644 --- a/features/datetimecomponent/src/main/resources/phone/element/float.json +++ b/features/datetimecomponent/src/main/resources/phone/element/float.json @@ -6,7 +6,7 @@ }, { "name": "time_fontWeight", - "value": "300" + "value": "300px" }, { "name": "time_top_margin", diff --git a/features/noticeitem/src/main/ets/com/ohos/noticeItem/view/item/groupItem.ets b/features/noticeitem/src/main/ets/com/ohos/noticeItem/view/item/groupItem.ets index d4b3e4f..12ee8e4 100644 --- a/features/noticeitem/src/main/ets/com/ohos/noticeItem/view/item/groupItem.ets +++ b/features/noticeitem/src/main/ets/com/ohos/noticeItem/view/item/groupItem.ets @@ -31,6 +31,7 @@ export default struct GroupItem { private mScroller: Scroller = new Scroller(); @State mIconAlpha: number = 0; @State @Watch('scrollEdge') mEdgeEnd: boolean = false; + @State needExpand: boolean = true; aboutToAppear() { Log.showInfo(TAG, `aboutToAppear`) @@ -55,7 +56,7 @@ export default struct GroupItem { notificationName: this.groupData[0].appName, notificationTime: this.groupData[0].time, isExpand: $toExpand, - needExpand: true, + needExpand: this.needExpand, distributedDeviceName: this.distributedDeviceName, clickTitleAction: () => null }) diff --git a/features/noticeitem/src/main/ets/com/ohos/noticeItem/view/item/titleItem.ets b/features/noticeitem/src/main/ets/com/ohos/noticeItem/view/item/titleItem.ets index 5d89431..2c3fe03 100644 --- a/features/noticeitem/src/main/ets/com/ohos/noticeItem/view/item/titleItem.ets +++ b/features/noticeitem/src/main/ets/com/ohos/noticeItem/view/item/titleItem.ets @@ -22,8 +22,8 @@ const TAG = 'NoticeItem-TitleItem'; @Component export default struct TitleItem { private notificationSmallIcon: PixelMap - @Prop notificationName: string - @Prop notificationTime: string + private notificationName: string + private notificationTime: string @Link isExpand: boolean @Prop needExpand: boolean @State rowSpace: any = $r('app.float.titleitem_row_space') diff --git a/features/noticeitem/src/main/module.json5 b/features/noticeitem/src/main/module.json5 index 277a74a..e25bcfc 100644 --- a/features/noticeitem/src/main/module.json5 +++ b/features/noticeitem/src/main/module.json5 @@ -6,6 +6,12 @@ "default", "tablet" ], + "metadata": [ + { + "name": "ArkTSPartialUpdate", + "value": "true" + } + ], "uiSyntax": "ets" } } diff --git a/features/noticeitem/src/main/resources/base/element/float.json b/features/noticeitem/src/main/resources/base/element/float.json index 85d6e87..5f986b5 100644 --- a/features/noticeitem/src/main/resources/base/element/float.json +++ b/features/noticeitem/src/main/resources/base/element/float.json @@ -6,95 +6,95 @@ }, { "name": "notification_title_fontsize", - "value": "20" + "value": "20px" }, { "name": "notification_expanded_text_maxheight", - "value": "295" + "value": "295px" }, { "name": "notification_content_fontsize", - "value": "20" + "value": "20px" }, { "name": "notification_content_lineheight", - "value": "20" + "value": "20px" }, { "name": "notification_content_maxlines", - "value": "1" + "value": "1px" }, { "name": "content_margin_top", - "value": "10" + "value": "10px" }, { "name": "body_margin_top", - "value": "10" + "value": "10px" }, { "name": "item_opicaty", - "value": "0.9" + "value": "0.9px" }, { "name": "item_borderradius", - "value": "20" + "value": "20px" }, { "name": "item_margintop", - "value": "10" + "value": "10px" }, { "name": "item_marginleft", - "value": "10" + "value": "10px" }, { "name": "item_marginright", - "value": "10" + "value": "10px" }, { "name": "item_paddingleft", - "value": "20" + "value": "20px" }, { "name": "item_paddingright", - "value": "20" + "value": "20px" }, { "name": "item_paddingbottom", - "value": "20" + "value": "20px" }, { "name": "item_setting_image_width", - "value": "30" + "value": "30px" }, { "name": "item_setting_image_height", - "value": "30" + "value": "30px" }, { "name": "item_delete_image_width", - "value": "30" + "value": "30px" }, { "name": "item_delete_image_height", - "value": "30" + "value": "30px" }, { "name": "titleitem_row_space", - "value": "10" + "value": "10px" }, { "name": "titleitem_height", - "value": "50" + "value": "50px" }, { "name": "title_image_width", - "value": "30" + "value": "30px" }, { "name": "title_image_height", - "value": "30" + "value": "30px" }, { "name": "title_image_left_margin", @@ -118,31 +118,31 @@ }, { "name": "title_name_fontsize", - "value": "20" + "value": "20px" }, { "name": "title_time_fontsize", - "value": "20" + "value": "20px" }, { "name": "displayicon_width", - "value": "20" + "value": "20px" }, { "name": "displayicon_height", - "value": "20" + "value": "20px" }, { "name": "deleteall_image_opacity", - "value": "0.9" + "value": "0.9px" }, { "name": "setting_title_fontsize", - "value": "40" + "value": "40px" }, { "name": "setting_cont_fontsize", - "value": "32" + "value": "32px" }, { "name": "setting_cont_height", @@ -154,11 +154,11 @@ }, { "name": "setting_border_width", - "value": "1" + "value": "1px" }, { "name": "setting_border_radius", - "value": "80" + "value": "80px" }, { "name": "notification_border_radius", @@ -166,19 +166,19 @@ }, { "name": "action_button_height", - "value": "48" + "value": "48px" }, { "name": "action_button_padding", - "value": "12" + "value": "12px" }, { "name": "picture_default_height", - "value": "300" + "value": "300px" }, { "name": "confirm_title_fontsize", - "value": "40" + "value": "40px" }, { "name": "confirm_title_width", @@ -186,15 +186,15 @@ }, { "name": "confirm_cont_fontsize", - "value": "32" + "value": "32px" }, { "name": "confirm_divider_height", - "value": "44" + "value": "44px" }, { "name": "confirm_button_height", - "value": "60" + "value": "60px" }, { "name": "confirm_button_margin_t", @@ -202,15 +202,15 @@ }, { "name": "confirm_button_width", - "value": "140" + "value": "140px" }, { "name": "icon_item_fontsize", - "value": "18" + "value": "18px" }, { "name": "setting_dialog_dy", - "value": "200" + "value": "200px" }, { "name": "setting_dialog_width", @@ -222,7 +222,7 @@ }, { "name": "confirm_dialog_dy", - "value": "250" + "value": "250px" }, { "name": "close_notification_margin_top", @@ -238,19 +238,19 @@ }, { "name": "device_divider_margin_l", - "value": "70" + "value": "70px" }, { "name": "device_divider_margin_r", - "value": "30" + "value": "30px" }, { "name": "device_border_width", - "value": "1" + "value": "1px" }, { "name": "device_border_radius", - "value": "30" + "value": "30px" }, { "name": "device_image_radius", diff --git a/features/noticeitem/src/main/resources/phone/element/float.json b/features/noticeitem/src/main/resources/phone/element/float.json index f984f39..7f4cfea 100644 --- a/features/noticeitem/src/main/resources/phone/element/float.json +++ b/features/noticeitem/src/main/resources/phone/element/float.json @@ -6,11 +6,11 @@ }, { "name": "notification_title_fontsize", - "value": "20" + "value": "20px" }, { "name": "notification_expanded_text_maxheight", - "value": "295" + "value": "295px" }, { "name": "notification_content_fontsize", @@ -18,75 +18,75 @@ }, { "name": "notification_content_lineheight", - "value": "20" + "value": "20px" }, { "name": "notification_content_maxlines", - "value": "1" + "value": "1px" }, { "name": "content_margin_top", - "value": "10" + "value": "10px" }, { "name": "body_margin_top", - "value": "10" + "value": "10px" }, { "name": "item_opicaty", - "value": "0.9" + "value": "0.9px" }, { "name": "item_borderradius", - "value": "20" + "value": "20px" }, { "name": "item_margintop", - "value": "10" + "value": "10px" }, { "name": "item_marginleft", - "value": "10" + "value": "10px" }, { "name": "item_marginright", - "value": "10" + "value": "10px" }, { "name": "item_paddingleft", - "value": "20" + "value": "20px" }, { "name": "item_paddingright", - "value": "20" + "value": "20px" }, { "name": "item_paddingbottom", - "value": "20" + "value": "20px" }, { "name": "item_setting_image_width", - "value": "30" + "value": "30px" }, { "name": "item_setting_image_height", - "value": "30" + "value": "30px" }, { "name": "item_delete_image_width", - "value": "30" + "value": "30px" }, { "name": "item_delete_image_height", - "value": "30" + "value": "30px" }, { "name": "titleitem_row_space", - "value": "10" + "value": "10px" }, { "name": "titleitem_height", - "value": "50" + "value": "50px" }, { "name": "title_image_width", @@ -126,15 +126,15 @@ }, { "name": "displayicon_width", - "value": "20" + "value": "20px" }, { "name": "displayicon_height", - "value": "20" + "value": "20px" }, { "name": "deleteall_image_opacity", - "value": "0.9" + "value": "0.9px" }, { "name": "setting_title_fontsize", @@ -154,11 +154,11 @@ }, { "name": "setting_border_width", - "value": "1" + "value": "1px" }, { "name": "setting_border_radius", - "value": "80" + "value": "80px" }, { "name": "notification_border_radius", @@ -166,15 +166,15 @@ }, { "name": "action_button_height", - "value": "48" + "value": "48px" }, { "name": "action_button_padding", - "value": "12" + "value": "12px" }, { "name": "picture_default_height", - "value": "300" + "value": "300px" }, { "name": "confirm_title_fontsize", @@ -194,7 +194,7 @@ }, { "name": "confirm_button_height", - "value": "60" + "value": "60px" }, { "name": "confirm_button_margin_t", @@ -238,19 +238,19 @@ }, { "name": "device_divider_margin_l", - "value": "70" + "value": "70px" }, { "name": "device_divider_margin_r", - "value": "30" + "value": "30px" }, { "name": "device_border_width", - "value": "1" + "value": "1px" }, { "name": "device_border_radius", - "value": "30" + "value": "30px" }, { "name": "device_image_radius", diff --git a/features/screenlock/src/main/ets/com/ohos/common/constants.ts b/features/screenlock/src/main/ets/com/ohos/common/constants.ts index c15026f..f665dcf 100644 --- a/features/screenlock/src/main/ets/com/ohos/common/constants.ts +++ b/features/screenlock/src/main/ets/com/ohos/common/constants.ts @@ -133,11 +133,11 @@ export default class Constants { }]; //max password length static PASSWORD_MAX_LEN = 32 - static PASSWORD_TEXT_WIDTH =290 - static PASSWORD_TEXT_HEIGHT =40 + static PASSWORD_TEXT_WIDTH ='290px' + static PASSWORD_TEXT_HEIGHT ='40px' static PASSWORD_TEXT_BORDER =20 - static ACCOUNT_SPACE = 24 - static ACCOUNT_SPACE_PORTRAIT = 40 + static ACCOUNT_SPACE = '24px' + static ACCOUNT_SPACE_PORTRAIT = '40px' } export class StatusBarGroupComponentData { diff --git a/features/screenlock/src/main/ets/com/ohos/model/accountsModel.ts b/features/screenlock/src/main/ets/com/ohos/model/accountsModel.ts index e1bc217..1927666 100644 --- a/features/screenlock/src/main/ets/com/ohos/model/accountsModel.ts +++ b/features/screenlock/src/main/ets/com/ohos/model/accountsModel.ts @@ -196,17 +196,22 @@ export default class AccountsModel { authUser(challenge, authType: AuthType, authLevel: number, callback) { Log.showDebug(TAG, `authUser param: userId ${this.mCurrentUserId} challenge ${challenge}`); Trace.end(Trace.CORE_METHOD_CALL_ACCOUNT_SYSTEM); - this.userAuthManager.authUser(this.mCurrentUserId, challenge, authType, authLevel, { - onResult: (result, extraInfo) => { - Log.showInfo(TAG, `authUser UserAuthManager.authUser onResult`); - Trace.start(Trace.CORE_METHOD_PASS_ACCOUNT_SYSTEM_RESULT); - callback(result, extraInfo); - }, - onAcquireInfo: (moduleId, acquire, extraInfo) => { - Log.showInfo(TAG, `authUser UserAuthManager.authUser onAcquireInfo`); + let challengeArray = new Uint8Array(challenge); + try { + this.userAuthManager.authUser(this.mCurrentUserId, challengeArray, authType, authLevel, { + onResult: (result, extraInfo) => { + Log.showInfo(TAG, `authUser UserAuthManager.authUser onResult`); + Trace.start(Trace.CORE_METHOD_PASS_ACCOUNT_SYSTEM_RESULT); + callback(result, extraInfo); + }, + onAcquireInfo: (moduleId, acquire, extraInfo) => { + Log.showInfo(TAG, `authUser UserAuthManager.authUser onAcquireInfo`); + } } + ) + } catch(error) { + console.error(`authUser failed, code is ${error.code}, message is ${error.message}`); } - ) } getAuthProperty(authType, callback) { @@ -216,10 +221,14 @@ export default class AccountsModel { 'authType': authType, 'keys': keyArray } - this.userAuthManager.getProperty(request).then((properties) => { - Log.showInfo(TAG, `getAuthProperty properties ${JSON.stringify(properties)}`); - callback(properties) - }) + try { + this.userAuthManager.getProperty(request).then((properties) => { + Log.showInfo(TAG, `getAuthProperty properties ${JSON.stringify(properties)}`); + callback(properties) + }) + } catch (error) { + console.error(`getProperty failed, code is ${error.code}, message is ${error.message}`); + }; } registerPWDInputer(password: string): Promise { @@ -234,22 +243,32 @@ export default class AccountsModel { private registerInputer(password: string): boolean { Log.showDebug(TAG, `registerInputer`); - let result = this.pinAuthManager.registerInputer({ - onGetData: (passType, inputData) => { - Log.showDebug(TAG, `registerInputer onSetData passType:${passType}`); - let textEncoder = new util.TextEncoder(); - let uint8PW = textEncoder.encode(password); - Log.showDebug(TAG, `registerInputer onSetData call`); - inputData.onSetData(passType, uint8PW); - } - }) + let result = null + try { + result = this.pinAuthManager.registerInputer({ + onGetData: (passType, inputData) => { + Log.showDebug(TAG, `registerInputer onSetData passType:${passType}`); + let textEncoder = new util.TextEncoder(); + let uint8PW = textEncoder.encode(password); + Log.showDebug(TAG, `registerInputer onSetData call`); + inputData.onSetData(passType, uint8PW); + } + }) + } catch(error) { + console.error(`registerInputer failed, code is ${e.code}, message is ${e.message}`); + } + Log.showInfo(TAG, `registerInputer result:${result}`); return result; } unregisterInputer() { Log.showDebug(TAG, `unregisterInputer`); - this.pinAuthManager.unregisterInputer(); + try { + this.pinAuthManager.unregisterInputer(); + } catch { + LogUtil.debug(`${this.TAG}unregisterInputer failed`); + } } modelFinish() { diff --git a/features/screenlock/src/main/module.json5 b/features/screenlock/src/main/module.json5 index ae2b1d7..fea4cbc 100644 --- a/features/screenlock/src/main/module.json5 +++ b/features/screenlock/src/main/module.json5 @@ -6,6 +6,12 @@ "default", "tablet" ], + "metadata": [ + { + "name": "ArkTSPartialUpdate", + "value": "true" + } + ], "uiSyntax": "ets" } } diff --git a/features/screenlock/src/main/resources/base/element/float.json b/features/screenlock/src/main/resources/base/element/float.json index db2757d..aaab976 100644 --- a/features/screenlock/src/main/resources/base/element/float.json +++ b/features/screenlock/src/main/resources/base/element/float.json @@ -2,19 +2,19 @@ "float": [ { "name": "lockicon_width", - "value": "40" + "value": "40px" }, { "name": "lockicon_height", - "value": "45" + "value": "45px" }, { "name": "lockicon_top_margin", - "value": "10" + "value": "10px" }, { "name": "lockicon_bottom_margin", - "value": "10" + "value": "10px" }, { "name": "lockicon_right_margin", @@ -22,7 +22,7 @@ }, { "name": "lock_prompt_fontsize", - "value": "32" + "value": "32px" }, { "name": "lock_Text_top_margin", @@ -30,47 +30,47 @@ }, { "name": "batterysoc_fontsize", - "value": "36" + "value": "36px" }, { "name": "accounts_component_height", - "value": "120" + "value": "120px" }, { "name": "accounts_ic_width", - "value": "72" + "value": "72px" }, { "name": "accounts_ic_height", - "value": "72" + "value": "72px" }, { "name": "accounts_name_fontsize", - "value": "24" + "value": "24px" }, { "name": "accounts_block", - "value": "8" + "value": "8px" }, { "name": "digitalpsd_prompt_fontsize", - "value": "32" + "value": "32px" }, { "name": "digitalpsd_prompt_margin_bottom", - "value": "48" + "value": "48px" }, { "name": "digitalpsd_prompt_width", - "value": "800" + "value": "800px" }, { "name": "digitalpsd_prompt_height", - "value": "72" + "value": "72px" }, { "name": "digitalpsd_passwdmask_width", - "value": "400" + "value": "400px" }, { "name": "digitalpsd_passwdmask_height", @@ -78,47 +78,47 @@ }, { "name": "digitalpsd_passwdmask_margin_bottom", - "value": "128" + "value": "128px" }, { "name": "digitalpsd_input_area_height", - "value": "200" + "value": "200px" }, { "name": "digitalpsd_row1_fontsize", - "value": "48" + "value": "48px" }, { "name": "digitalpsd_row2_fontsize", - "value": "24" + "value": "24px" }, { "name": "digitalpsd_row_height", - "value": "200" + "value": "200px" }, { "name": "digitalpsd_key_area_height", - "value": "800" + "value": "800px" }, { "name": "digitalpsd_key_area_margin_bottom", - "value": "64" + "value": "64px" }, { "name": "digitalpsd_key_area_margin_bottom_portrait", - "value": "128" + "value": "128px" }, { "name": "mixedpsd_prompt_fontsize", - "value": "32" + "value": "32px" }, { "name": "mixedpsd_prompt_text_fontsize", - "value": "32" + "value": "32px" }, { "name": "mixedpsd_prompt_margin_bottom", - "value": "48" + "value": "48px" }, { "name": "mixedpsd_prompt_margin_top", @@ -126,87 +126,87 @@ }, { "name": "mixedpsd_prompt_width", - "value": "800" + "value": "800px" }, { "name": "mixedpsd_prompt_height", - "value": "72" + "value": "72px" }, { "name": "mixedpsd_input_maxlen", - "value": "30" + "value": "30px" }, { "name": "mixedpsd_input_width", - "value": "600" + "value": "600px" }, { "name": "mixedpsd_input_height", - "value": "72" + "value": "72px" }, { "name": "mixedpsd_input_margin_bottom", - "value": "64" + "value": "64px" }, { "name": "custompsd_prompt_fontsize", - "value": "32" + "value": "32px" }, { "name": "custompsd_prompt_margin_bottom", - "value": "48" + "value": "48px" }, { "name": "custompsd_prompt_width", - "value": "800" + "value": "800px" }, { "name": "custompsd_prompt_height", - "value": "72" + "value": "72px" }, { "name": "custompsd_input_width", - "value": "600" + "value": "600px" }, { "name": "custompsd_input_width_portrait", - "value": "700" + "value": "700px" }, { "name": "custompsd_input_height", - "value": "72" + "value": "72px" }, { "name": "custompsd_input_radius", - "value": "36" + "value": "36px" }, { "name": "custompsd_input_margin_bottom", - "value": "90" + "value": "90px" }, { "name": "custompsd_passwdmask_margin_bottom", - "value": "128" + "value": "128px" }, { "name": "custompsd_input_area_height", - "value": "400" + "value": "400px" }, { "name": "custompsd_key_area_height", - "value": "800" + "value": "800px" }, { "name": "custompsd_key_area_margin_bottom", - "value": "64" + "value": "64px" }, { "name": "custompsd_key_area_margin_bottom_portrait", - "value": "128" + "value": "128px" }, { "name": "custompsd_text_opacity", - "value": "1" + "value": "1px" }, { "name": "custompsd_digitalpsd_ic_diameter", diff --git a/features/screenlock/src/main/resources/phone/element/float.json b/features/screenlock/src/main/resources/phone/element/float.json index c59ae13..df2590b 100644 --- a/features/screenlock/src/main/resources/phone/element/float.json +++ b/features/screenlock/src/main/resources/phone/element/float.json @@ -30,27 +30,27 @@ }, { "name": "batterysoc_fontsize", - "value": "36" + "value": "36px" }, { "name": "accounts_component_height", - "value": "120" + "value": "120px" }, { "name": "accounts_ic_width", - "value": "72" + "value": "72px" }, { "name": "accounts_ic_height", - "value": "72" + "value": "72px" }, { "name": "accounts_name_fontsize", - "value": "24" + "value": "24px" }, { "name": "accounts_block", - "value": "8" + "value": "8px" }, { "name": "digitalpsd_prompt_fontsize", @@ -62,7 +62,7 @@ }, { "name": "digitalpsd_prompt_width", - "value": "800" + "value": "800px" }, { "name": "digitalpsd_prompt_height", @@ -98,7 +98,7 @@ }, { "name": "digitalpsd_key_area_height", - "value": "800" + "value": "800px" }, { "name": "digitalpsd_key_area_margin_bottom", @@ -126,15 +126,15 @@ }, { "name": "mixedpsd_prompt_width", - "value": "800" + "value": "800px" }, { "name": "mixedpsd_prompt_height", - "value": "72" + "value": "72px" }, { "name": "mixedpsd_input_maxlen", - "value": "30" + "value": "30px" }, { "name": "mixedpsd_input_width", @@ -158,7 +158,7 @@ }, { "name": "custompsd_prompt_width", - "value": "800" + "value": "800px" }, { "name": "custompsd_prompt_height", @@ -182,7 +182,7 @@ }, { "name": "custompsd_input_margin_bottom", - "value": "90" + "value": "90px" }, { "name": "custompsd_passwdmask_margin_bottom", @@ -194,7 +194,7 @@ }, { "name": "custompsd_key_area_height", - "value": "800" + "value": "800px" }, { "name": "custompsd_key_area_margin_bottom", diff --git a/features/shortcutcomponent/src/main/ets/com/ohos/vm/shortcutViewModel.ts b/features/shortcutcomponent/src/main/ets/com/ohos/vm/shortcutViewModel.ts index a941539..cc897a5 100644 --- a/features/shortcutcomponent/src/main/ets/com/ohos/vm/shortcutViewModel.ts +++ b/features/shortcutcomponent/src/main/ets/com/ohos/vm/shortcutViewModel.ts @@ -24,7 +24,7 @@ export default class ShortcutViewModel { Log.showInfo(TAG, `onShortcutClick ${shortcutType}`) switch (shortcutType) { case Constants.CLICK_TYPE_SHUTDOWN: - power.shutdownDevice("shutdown_device") + power.shutdown("shutdown_device") break; case Constants.CLICK_TYPE_REBOOT: power.rebootDevice("reboot_device") diff --git a/features/shortcutcomponent/src/main/module.json5 b/features/shortcutcomponent/src/main/module.json5 index 71394d9..cad052b 100644 --- a/features/shortcutcomponent/src/main/module.json5 +++ b/features/shortcutcomponent/src/main/module.json5 @@ -6,6 +6,12 @@ "default", "tablet" ], + "metadata": [ + { + "name": "ArkTSPartialUpdate", + "value": "true" + } + ], "uiSyntax": "ets" } } diff --git a/features/shortcutcomponent/src/main/resources/base/element/float.json b/features/shortcutcomponent/src/main/resources/base/element/float.json index ca1adcf..419d1d7 100644 --- a/features/shortcutcomponent/src/main/resources/base/element/float.json +++ b/features/shortcutcomponent/src/main/resources/base/element/float.json @@ -2,7 +2,7 @@ "float": [ { "name": "shortcut_block", - "value": "8" + "value": "8px" } ] } \ No newline at end of file diff --git a/features/signalcomponent/src/main/module.json5 b/features/signalcomponent/src/main/module.json5 index dc9c80c..7600fe2 100644 --- a/features/signalcomponent/src/main/module.json5 +++ b/features/signalcomponent/src/main/module.json5 @@ -6,6 +6,12 @@ "default", "tablet" ], + "metadata": [ + { + "name": "ArkTSPartialUpdate", + "value": "true" + } + ], "uiSyntax": "ets" } } diff --git a/features/wallpapercomponent/src/main/module.json5 b/features/wallpapercomponent/src/main/module.json5 index 68fa33f..e4cdb66 100644 --- a/features/wallpapercomponent/src/main/module.json5 +++ b/features/wallpapercomponent/src/main/module.json5 @@ -6,6 +6,12 @@ "default", "tablet" ], + "metadata": [ + { + "name": "ArkTSPartialUpdate", + "value": "true" + } + ], "uiSyntax": "ets" } } diff --git a/features/wificomponent/src/main/module.json5 b/features/wificomponent/src/main/module.json5 index 5bad4d2..364b737 100644 --- a/features/wificomponent/src/main/module.json5 +++ b/features/wificomponent/src/main/module.json5 @@ -6,6 +6,12 @@ "default", "tablet" ], + "metadata": [ + { + "name": "ArkTSPartialUpdate", + "value": "true" + } + ], "uiSyntax": "ets" } } diff --git a/product/pc/src/main/module.json5 b/product/pc/src/main/module.json5 index 53b4749..1e1c439 100644 --- a/product/pc/src/main/module.json5 +++ b/product/pc/src/main/module.json5 @@ -8,6 +8,12 @@ "deviceTypes": [ "tablet" ], + "metadata": [ + { + "name": "ArkTSPartialUpdate", + "value": "true" + } + ], "deliveryWithInstall": true, "installationFree": false, "pages": "$profile:main_pages", diff --git a/product/pc/src/main/resources/base/element/float.json b/product/pc/src/main/resources/base/element/float.json index 8324d09..8c52eba 100644 --- a/product/pc/src/main/resources/base/element/float.json +++ b/product/pc/src/main/resources/base/element/float.json @@ -2,35 +2,35 @@ "float": [ { "name": "lockicon_area_height", - "value": "44" + "value": "44px" }, { "name": "datetime_area_height", - "value": "240" + "value": "240px" }, { "name": "datetime_margin_top", - "value": "66" + "value": "66px" }, { "name": "batterysoc_area_height", - "value": "48" + "value": "48px" }, { "name": "shortcut_area_margin_top", - "value": "24" + "value": "24px" }, { "name": "shortcut_area_height", - "value": "120" + "value": "120px" }, { "name": "shortcut_area_height_portrait", - "value": "146" + "value": "146px" }, { "name": "notificationList_margin_top", - "value": "32" + "value": "32px" }, { "name": "title_font_height", @@ -42,7 +42,7 @@ }, { "name": "setting_cont_fontsize", - "value": "32" + "value": "32px" }, { "name": "close_notification_margin_top", @@ -175,494 +175,6 @@ { "name": "status_bar_clock_margin", "value": "0" - }, - { - "name": "status_bar_clock_width", - "value": "60vp" - }, - { - "name": "time_fontsize", - "value": "148" - }, - { - "name": "time_fontWeight", - "value": "400" - }, - { - "name": "time_top_margin", - "value": "10" - }, - { - "name": "time_bottom_margin", - "value": "10" - }, - { - "name": "date_fontsize", - "value": "36" - }, - { - "name": "date_week_area_height", - "value": "48" - }, - { - "name": "date_lunar_calendar_height", - "value": "0" - }, - { - "name": "date_lunar_calendar_fontSize", - "value": "14fp" - }, - { - "name": "date_lunar_calendar_top_margin", - "value": "6vp" - }, - { - "name": "notificationList_width", - "value": "834vp" - }, - { - "name": "notification_title_fontsize", - "value": "20" - }, - { - "name": "notification_expanded_text_maxheight", - "value": "295" - }, - { - "name": "notification_content_fontsize", - "value": "20" - }, - { - "name": "notification_content_lineheight", - "value": "20" - }, - { - "name": "notification_content_maxlines", - "value": "1" - }, - { - "name": "content_margin_top", - "value": "10" - }, - { - "name": "body_margin_top", - "value": "10" - }, - { - "name": "item_opicaty", - "value": "0.9" - }, - { - "name": "item_borderradius", - "value": "20" - }, - { - "name": "item_margintop", - "value": "10" - }, - { - "name": "item_marginleft", - "value": "10" - }, - { - "name": "item_marginright", - "value": "10" - }, - { - "name": "item_paddingleft", - "value": "20" - }, - { - "name": "item_paddingright", - "value": "20" - }, - { - "name": "item_paddingbottom", - "value": "20" - }, - { - "name": "item_setting_image_width", - "value": "30" - }, - { - "name": "item_setting_image_height", - "value": "30" - }, - { - "name": "item_delete_image_width", - "value": "30" - }, - { - "name": "item_delete_image_height", - "value": "30" - }, - { - "name": "titleitem_row_space", - "value": "10" - }, - { - "name": "titleitem_height", - "value": "50" - }, - { - "name": "title_image_width", - "value": "30" - }, - { - "name": "title_image_height", - "value": "30" - }, - { - "name": "title_image_left_margin", - "value": "0" - }, - { - "name": "title_image_right_margin", - "value": "0" - }, - { - "name": "message_font_margin_t", - "value": "14vp" - }, - { - "name": "title_name_fontsize", - "value": "20" - }, - { - "name": "title_time_fontsize", - "value": "20" - }, - { - "name": "displayicon_width", - "value": "20" - }, - { - "name": "displayicon_height", - "value": "20" - }, - { - "name": "deleteall_image_opacity", - "value": "0.9" - }, - { - "name": "setting_title_fontsize", - "value": "40" - }, - { - "name": "setting_cont_height", - "value": "40vp" - }, - { - "name": "setting_cont_width", - "value": "300vp" - }, - { - "name": "setting_border_width", - "value": "1" - }, - { - "name": "setting_border_radius", - "value": "80" - }, - { - "name": "notification_border_radius", - "value": "24vp" - }, - { - "name": "action_button_height", - "value": "48" - }, - { - "name": "action_button_padding", - "value": "12" - }, - { - "name": "picture_default_height", - "value": "300" - }, - { - "name": "confirm_title_fontsize", - "value": "40" - }, - { - "name": "confirm_title_width", - "value": "330vp" - }, - { - "name": "confirm_cont_fontsize", - "value": "32" - }, - { - "name": "confirm_divider_height", - "value": "44" - }, - { - "name": "confirm_button_height", - "value": "60" - }, - { - "name": "confirm_button_margin_t", - "value": "23vp" - }, - { - "name": "confirm_button_width", - "value": "140" - }, - { - "name": "icon_item_fontsize", - "value": "18" - }, - { - "name": "setting_dialog_dy", - "value": "200" - }, - { - "name": "setting_dialog_width", - "value": "330vp" - }, - { - "name": "setting_dialog_Width", - "value": "362vp" - }, - { - "name": "confirm_dialog_dy", - "value": "250" - }, - { - "name": "device_divider_margin_l", - "value": "70" - }, - { - "name": "device_divider_margin_r", - "value": "30" - }, - { - "name": "device_border_width", - "value": "1" - }, - { - "name": "device_border_radius", - "value": "30" - }, - { - "name": "device_image_radius", - "value": "0" - }, - { - "name": "lockicon_width", - "value": "40" - }, - { - "name": "lockicon_height", - "value": "45" - }, - { - "name": "lockicon_top_margin", - "value": "10" - }, - { - "name": "lockicon_bottom_margin", - "value": "10" - }, - { - "name": "lockicon_right_margin", - "value": "0" - }, - { - "name": "lock_prompt_fontsize", - "value": "32" - }, - { - "name": "lock_Text_top_margin", - "value": "0" - }, - { - "name": "batterysoc_fontsize", - "value": "36" - }, - { - "name": "accounts_component_height", - "value": "120" - }, - { - "name": "accounts_ic_width", - "value": "72" - }, - { - "name": "accounts_ic_height", - "value": "72" - }, - { - "name": "accounts_name_fontsize", - "value": "24" - }, - { - "name": "accounts_block", - "value": "8" - }, - { - "name": "digitalpsd_prompt_fontsize", - "value": "32" - }, - { - "name": "digitalpsd_prompt_margin_bottom", - "value": "48" - }, - { - "name": "digitalpsd_prompt_width", - "value": "800" - }, - { - "name": "digitalpsd_prompt_height", - "value": "72" - }, - { - "name": "digitalpsd_passwdmask_width", - "value": "400" - }, - { - "name": "digitalpsd_passwdmask_height", - "value": "24vp" - }, - { - "name": "digitalpsd_passwdmask_margin_bottom", - "value": "128" - }, - { - "name": "digitalpsd_input_area_height", - "value": "200" - }, - { - "name": "digitalpsd_row1_fontsize", - "value": "48" - }, - { - "name": "digitalpsd_row2_fontsize", - "value": "24" - }, - { - "name": "digitalpsd_row_height", - "value": "200" - }, - { - "name": "digitalpsd_key_area_height", - "value": "800" - }, - { - "name": "digitalpsd_key_area_margin_bottom", - "value": "64" - }, - { - "name": "mixedpsd_prompt_fontsize", - "value": "32" - }, - { - "name": "mixedpsd_prompt_text_fontsize", - "value": "32" - }, - { - "name": "mixedpsd_prompt_margin_bottom", - "value": "48" - }, - { - "name": "mixedpsd_prompt_margin_top", - "value": "0" - }, - { - "name": "mixedpsd_prompt_width", - "value": "800" - }, - { - "name": "mixedpsd_prompt_height", - "value": "72" - }, - { - "name": "mixedpsd_input_maxlen", - "value": "30" - }, - { - "name": "mixedpsd_input_width", - "value": "600" - }, - { - "name": "mixedpsd_input_height", - "value": "72" - }, - { - "name": "mixedpsd_input_margin_bottom", - "value": "128" - }, - { - "name": "custompsd_prompt_fontsize", - "value": "32" - }, - { - "name": "custompsd_prompt_margin_bottom", - "value": "48" - }, - { - "name": "custompsd_prompt_width", - "value": "800" - }, - { - "name": "custompsd_prompt_height", - "value": "72" - }, - { - "name": "custompsd_input_width", - "value": "600" - }, - { - "name": "custompsd_input_height", - "value": "72" - }, - { - "name": "custompsd_input_radius", - "value": "36" - }, - { - "name": "custompsd_input_margin_bottom", - "value": "90" - }, - { - "name": "custompsd_passwdmask_margin_bottom", - "value": "128" - }, - { - "name": "custompsd_input_area_height", - "value": "400" - }, - { - "name": "custompsd_key_area_height", - "value": "800" - }, - { - "name": "custompsd_key_area_margin_bottom", - "value": "64" - }, - { - "name": "custompsd_text_opacity", - "value": "1" - }, - { - "name": "custompsd_digitalpsd_ic_diameter", - "value": "12vp" - }, - { - "name": "custompsd_button_height", - "value": "36vp" - }, - { - "name": "numkeyBoard_text_opacity", - "value": "1" - }, - { - "name": "numkeyBoard_rowsGap", - "value": "0" - }, - { - "name": "shortcut_block", - "value": "8" } ] diff --git a/product/phone/src/main/module.json5 b/product/phone/src/main/module.json5 index 6a88890..4db82eb 100644 --- a/product/phone/src/main/module.json5 +++ b/product/phone/src/main/module.json5 @@ -8,6 +8,12 @@ "deviceTypes": [ "default" ], + "metadata": [ + { + "name": "ArkTSPartialUpdate", + "value": "true" + } + ], "deliveryWithInstall": true, "installationFree": false, "pages": "$profile:main_pages", diff --git a/product/phone/src/main/resources/base/element/float.json b/product/phone/src/main/resources/base/element/float.json index 4d95bfc..2d8171a 100644 --- a/product/phone/src/main/resources/base/element/float.json +++ b/product/phone/src/main/resources/base/element/float.json @@ -135,518 +135,7 @@ { "name": "accounts_area_height", "value": "80vp" - }, - { - "name": "status_bar_clock_width", - "value": "2vp" - }, - { - "name": "time_fontsize", - "value": "72fp" - }, - { - "name": "time_fontWeight", - "value": "300" - }, - { - "name": "time_top_margin", - "value": "11vp" - }, - { - "name": "time_bottom_margin", - "value": "3vp" - }, - { - "name": "date_fontsize", - "value": "18fp" - }, - { - "name": "date_week_area_height", - "value": "24vp" - }, - { - "name": "date_lunar_calendar_height", - "value": "19vp" - }, - { - "name": "date_lunar_calendar_fontSize", - "value": "14fp" - }, - { - "name": "date_lunar_calendar_top_margin", - "value": "6vp" - }, - { - "name": "notificationList_width", - "value": "336vp" - }, - { - "name": "notification_title_fontsize", - "value": "20" - }, - { - "name": "notification_expanded_text_maxheight", - "value": "295" - }, - { - "name": "notification_content_fontsize", - "value": "20" - }, - { - "name": "notification_content_lineheight", - "value": "20" - }, - { - "name": "notification_content_maxlines", - "value": "1" - }, - { - "name": "content_margin_top", - "value": "10" - }, - { - "name": "body_margin_top", - "value": "10" - }, - { - "name": "item_opicaty", - "value": "0.9" - }, - { - "name": "item_borderradius", - "value": "20" - }, - { - "name": "item_margintop", - "value": "10" - }, - { - "name": "item_marginleft", - "value": "10" - }, - { - "name": "item_marginright", - "value": "10" - }, - { - "name": "item_paddingleft", - "value": "20" - }, - { - "name": "item_paddingright", - "value": "20" - }, - { - "name": "item_paddingbottom", - "value": "20" - }, - { - "name": "item_setting_image_width", - "value": "30" - }, - { - "name": "item_setting_image_height", - "value": "30" - }, - { - "name": "item_delete_image_width", - "value": "30" - }, - { - "name": "item_delete_image_height", - "value": "30" - }, - { - "name": "titleitem_row_space", - "value": "10" - }, - { - "name": "titleitem_height", - "value": "50" - }, - { - "name": "title_image_width", - "value": "24vp" - }, - { - "name": "title_image_height", - "value": "24vp" - }, - { - "name": "title_image_left_margin", - "value": "24vp" - }, - { - "name": "title_image_right_margin", - "value": "8vp" - }, - { - "name": "title_font_height", - "value": "28vp" - }, - { - "name": "title_font_margin_t", - "value": "13vp" - }, - { - "name": "message_font_margin_t", - "value": "23vp" - }, - { - "name": "title_name_fontsize", - "value": "20" - }, - { - "name": "title_time_fontsize", - "value": "20" - }, - { - "name": "displayicon_width", - "value": "20" - }, - { - "name": "displayicon_height", - "value": "20" - }, - { - "name": "deleteall_image_opacity", - "value": "0.9" - }, - { - "name": "setting_title_fontsize", - "value": "20fp" - }, - { - "name": "setting_cont_fontsize", - "value": "16fp" - }, - { - "name": "setting_cont_height", - "value": "40vp" - }, - { - "name": "setting_cont_width", - "value": "288vp" - }, - { - "name": "setting_border_width", - "value": "1" - }, - { - "name": "setting_border_radius", - "value": "80" - }, - { - "name": "notification_border_radius", - "value": "24vp" - }, - { - "name": "action_button_height", - "value": "48" - }, - { - "name": "action_button_padding", - "value": "12" - }, - { - "name": "picture_default_height", - "value": "300" - }, - { - "name": "confirm_title_fontsize", - "value": "20fp" - }, - { - "name": "confirm_title_width", - "value": "288vp" - }, - { - "name": "confirm_cont_fontsize", - "value": "16fp" - }, - { - "name": "confirm_divider_height", - "value": "24vp" - }, - { - "name": "confirm_button_height", - "value": "60" - }, - { - "name": "confirm_button_margin_t", - "value": "23vp" - }, - { - "name": "confirm_button_width", - "value": "128fp" - }, - { - "name": "icon_item_fontsize", - "value": "18" - }, - { - "name": "setting_dialog_dy", - "value": "288vp" - }, - { - "name": "setting_dialog_width", - "value": "304vp" - }, - { - "name": "setting_dialog_Width", - "value": "336vp" - }, - { - "name": "confirm_dialog_dy", - "value": "310vp" - }, - { - "name": "close_notification_margin_top", - "value": "17vp" - }, - { - "name": "notification_appname_margin_top", - "value": "11vp" - }, - { - "name": "notification_cancle_margin_top", - "value": "9vp" - }, - { - "name": "device_divider_margin_l", - "value": "70" - }, - { - "name": "device_divider_margin_r", - "value": "30" - }, - { - "name": "device_border_width", - "value": "1" - }, - { - "name": "device_border_radius", - "value": "30" - }, - { - "name": "device_image_radius", - "value": "12vp" - }, - { - "name": "lockicon_width", - "value": "16vp" - }, - { - "name": "lockicon_height", - "value": "16vp" - }, - { - "name": "lockicon_top_margin", - "value": "60vp" - }, - { - "name": "lockicon_bottom_margin", - "value": "10" - }, - { - "name": "lockicon_right_margin", - "value": "4vp" - }, - { - "name": "lock_prompt_fontsize", - "value": "14vp" - }, - { - "name": "lock_Text_top_margin", - "value": "58vp" - }, - { - "name": "batterysoc_fontsize", - "value": "36" - }, - { - "name": "accounts_component_height", - "value": "120" - }, - { - "name": "accounts_ic_width", - "value": "72" - }, - { - "name": "accounts_ic_height", - "value": "72" - }, - { - "name": "accounts_name_fontsize", - "value": "24" - }, - { - "name": "accounts_block", - "value": "8" - }, - { - "name": "digitalpsd_prompt_fontsize", - "value": "16vp" - }, - { - "name": "digitalpsd_prompt_margin_bottom", - "value": "24vp" - }, - { - "name": "digitalpsd_prompt_width", - "value": "800" - }, - { - "name": "digitalpsd_prompt_height", - "value": "22vp" - }, - { - "name": "digitalpsd_passwdmask_width", - "value": "192vp" - }, - { - "name": "digitalpsd_passwdmask_height", - "value": "12vp" - }, - { - "name": "digitalpsd_passwdmask_margin_bottom", - "value": "151vp" - }, - { - "name": "digitalpsd_input_area_height", - "value": "60vp" - }, - { - "name": "digitalpsd_row1_fontsize", - "value": "28vp" - }, - { - "name": "digitalpsd_row2_fontsize", - "value": "12vp" - }, - { - "name": "digitalpsd_row_height", - "value": "54vp" - }, - { - "name": "digitalpsd_key_area_height", - "value": "800" - }, - { - "name": "digitalpsd_key_area_margin_bottom", - "value": "52vp" - }, - { - "name": "mixedpsd_prompt_fontsize", - "value": "16fp" - }, - { - "name": "mixedpsd_prompt_margin_top", - "value": "239vp" - }, - { - "name": "mixedpsd_prompt_text_fontsize", - "value": "20fp" - }, - { - "name": "mixedpsd_prompt_margin_bottom", - "value": "24vp" - }, - { - "name": "mixedpsd_prompt_width", - "value": "800" - }, - { - "name": "mixedpsd_prompt_height", - "value": "72" - }, - { - "name": "mixedpsd_input_maxlen", - "value": "30" - }, - { - "name": "mixedpsd_input_width", - "value": "288vp" - }, - { - "name": "mixedpsd_input_height", - "value": "36vp" - }, - { - "name": "mixedpsd_input_margin_bottom", - "value": "16vp" - }, - { - "name": "custompsd_prompt_fontsize", - "value": "16vp" - }, - { - "name": "custompsd_prompt_margin_bottom", - "value": "24vp" - }, - { - "name": "custompsd_prompt_width", - "value": "800" - }, - { - "name": "custompsd_prompt_height", - "value": "22vp" - }, - { - "name": "custompsd_input_width", - "value": "288vp" - }, - { - "name": "custompsd_input_height", - "value": "36vp" - }, - { - "name": "custompsd_input_radius", - "value": "18vp" - }, - { - "name": "custompsd_input_margin_bottom", - "value": "90" - }, - { - "name": "custompsd_passwdmask_margin_bottom", - "value": "71vp" - }, - { - "name": "custompsd_input_area_height", - "value": "138vp" - }, - { - "name": "custompsd_key_area_height", - "value": "800" - }, - { - "name": "custompsd_key_area_margin_bottom", - "value": "52vp" - }, - { - "name": "custompsd_text_opacity", - "value": "0.2" - }, - { - "name": "custompsd_digitalpsd_ic_diameter", - "value": "9vp" - }, - { - "name": "custompsd_button_height", - "value": "40vp" - }, - { - "name": "numkeyBoard_text_opacity", - "value": "0.6" - }, - { - "name": "numkeyBoard_rowsGap", - "value": "22vp" - }, - { - "name": "shortcut_block", - "value": "8" + } ] } \ No newline at end of file