From 42680689cb973d04c0972be1f9876bcde91f8ead Mon Sep 17 00:00:00 2001 From: dengxiaoyu Date: Thu, 17 Oct 2024 19:47:54 +0800 Subject: [PATCH] eliminate diff in app Signed-off-by: dengxiaoyu --- .../ContinueSwitchAbility.ets | 2 -- .../entry/src/main/ets/pages/ContinueSwitch.ets | 14 ++------------ .../src/main/resources/base/element/string.json | 16 ++++++++++++---- .../src/main/resources/bo_CN/element/string.json | 14 +++++++++++--- .../src/main/resources/ug/element/string.json | 14 +++++++++++--- .../src/main/resources/zh_HK/element/string.json | 14 +++++++++++--- .../src/main/resources/zh_TW/element/string.json | 14 +++++++++++--- .../src/main/resources/zz_ZX/element/string.json | 16 ++++++++++++---- 8 files changed, 70 insertions(+), 34 deletions(-) diff --git a/application/entry/src/main/ets/continueswitchability/ContinueSwitchAbility.ets b/application/entry/src/main/ets/continueswitchability/ContinueSwitchAbility.ets index 08ce25ba..16fe747f 100644 --- a/application/entry/src/main/ets/continueswitchability/ContinueSwitchAbility.ets +++ b/application/entry/src/main/ets/continueswitchability/ContinueSwitchAbility.ets @@ -23,12 +23,10 @@ export default class ContinueSwitchAbility extends UIExtensionAbility { onCreate() { console.log(TAG, `UIExtAbility onCreate`); AppStorage.setOrCreate('currentColorMode', this.context.config.colorMode); - AppStorage.setOrCreate('currentFontSizeScale', this.context.config.fontSizeScale); } onConfigurationUpdate(newConfig: Configuration) { AppStorage.setOrCreate('currentColorMode', this.context.config.colorMode); - AppStorage.setOrCreate('currentFontSizeScale', this.context.config.fontSizeScale); } onForeground() { diff --git a/application/entry/src/main/ets/pages/ContinueSwitch.ets b/application/entry/src/main/ets/pages/ContinueSwitch.ets index e5135625..260ab31a 100644 --- a/application/entry/src/main/ets/pages/ContinueSwitch.ets +++ b/application/entry/src/main/ets/pages/ContinueSwitch.ets @@ -313,7 +313,7 @@ struct ContinueSwitch { }) { SymbolGlyph($r('sys.symbol.info_circle_fill')) .fontWeight(FontWeight.Medium) - .fontSize(this.getSymbolSize()) + .fontSize(CommonConstants.SYMBOL_INFO_CIRCLE) .fontColor([$r('sys.color.ohos_id_color_activated')]) .margin({ right: CommonConstants.SYMBOL_MARGIN_RIGHT }) @@ -336,7 +336,7 @@ struct ContinueSwitch { Text($r('app.string.continue_privacy_text')) .fontSize($r('sys.float.ohos_id_text_size_body3')) .fontWeight(FontWeight.Regular) - .margin({ top: CommonConstants.CONTINUE_PRIVACY_TEXT_MARGIN_TOP}) + .margin({ top: CommonConstants.CONTINUE_PRIVACY_TEXT_MARGIN_TOP }) .fontColor($r('sys.color.ohos_id_color_text_secondary')) .textAlign(TextAlign.Start) .width('100%') @@ -387,14 +387,4 @@ struct ContinueSwitch { this.imageAnimatorWidth + ', this.imageAnimatorHeight = ' + this.imageAnimatorHeight); }) } - - private getSymbolSize(): Length { - logger.info(TAG + 'getSymbolSize in'); - let fontSizeScale: number = AppStorage.get('currentFontSizeScale') as number; - logger.info(TAG + 'getSymbolSize : fontSizeScale =' + fontSizeScale); - if (fontSizeScale >= 2) { - return `${CommonConstants.SYMBOL_INFO_CIRCLE * 2}vp` - } - return CommonConstants.SYMBOL_INFO_CIRCLE; - } } \ No newline at end of file diff --git a/application/entry/src/main/resources/base/element/string.json b/application/entry/src/main/resources/base/element/string.json index f8fb4373..7204d57c 100644 --- a/application/entry/src/main/resources/base/element/string.json +++ b/application/entry/src/main/resources/base/element/string.json @@ -50,11 +50,11 @@ }, { "name": "continue_title", - "value": "Continuation" + "value": "Handover" }, { - "name": "continue_desc", - "value":"Continuation lets you start something on one device, then instantly pick it up on other devices nearby using the same HUAWEI ID. When continuation is available, an icon will appear in the app dock." + "name": "continue_desc_text", + "value":"Start viewing or editing content on one device, then continue seamlessly on nearby devices using the same HUAWEI ID. When Handover is available, an icon will appear in the app dock. %s" }, { "name": "multi_device_collaboration", @@ -62,7 +62,15 @@ }, { "name": "continue_privacy_text", - "value":"This service uses Bluetooth and WLAN. During use, it will read this device's name and send it to devices you hop to. By turning this on, you agree to these terms." + "value":"This service uses Bluetooth and WLAN, and needs to send the name of this device to devices you handover to. By turning this on, you agree to these terms." + }, + { + "name": "update_version_prompt", + "value":"Both devices must be running HarmonyOS NEXT." + }, + { + "name": "learn_more", + "value":"Learn more" } ] } \ No newline at end of file diff --git a/application/entry/src/main/resources/bo_CN/element/string.json b/application/entry/src/main/resources/bo_CN/element/string.json index e9592d83..00b5a6a3 100644 --- a/application/entry/src/main/resources/bo_CN/element/string.json +++ b/application/entry/src/main/resources/bo_CN/element/string.json @@ -29,8 +29,8 @@ "value":"མུ་མཐུད།" }, { - "name":"continue_desc", - "value":"སྒྲིག་ཆས་གཅིག་གི་ཐོག་ཏུ་ནང་དོན་བཤར་ལྟ་དང་རྩོམ་སྒྲིག་བྱས་རྗེས། ཉེ་འགྲམ་གྱི་ཧྭ་ཝེ་ཐོ་ཨང་གཅིག་པ་ཐོ་འཇུག་བྱས་ཡོད་པའི་སྒྲིག་ཆས་གཞན་ཞིག་གི་ཅོག་ངོས་ཀྱི་ལས་འགན་ཚན་བྱང་ཐོག་ཏུ་འཕྲོ་མཐུད་རིས་རྟགས་རྙེད་པར་བྱས་ནས་བརྡབས་ནས་མུ་མཐུད་བཀོལ་ཆོག" + "name":"continue_desc_text", + "value":"སྒྲིག་ཆས་གཅིག་གི་ཐོག་ཏུ་ནང་དོན་བཤར་ལྟ་དང་རྩོམ་སྒྲིག་བྱས་རྗེས། དེ་ནས་ཉེ་འགྲམ་གྱི་ཧྭ་ཝེ་ཐོ་ཨང་གཅིག་པ་ཐོ་འཇུག་བྱས་ཡོད་པའི་སྒྲིག་ཆས་གཞན་ཞིག་གི་ཅོག་ངོས་ཀྱི་ལས་འགན་ཚན་བྱང་ཐོག་ཏུ་འཕྲོ་མཐུད་རིས་རྟགས་ལ་བརྡབས་ཚེ། མུ་མཐུད་བཀོལ་ཐུབ། %s" }, { "name":"continue_title", @@ -38,7 +38,15 @@ }, { "name":"continue_privacy_text", - "value":"ཞབས་ཞུ་འདི་བཀོལ་བའི་བརྒྱུད་རིམ་ཁྲོད་དུ་སོ་སྔོན་དང་ WLAN རྩོལ་ནུས་བཀོལ་དགོས། སྒྲིག་ཆས་ཀྱི་མིང་ཀློག་ལེན་བྱས་ནས་འཕྲོ་མཐུད་བྱ་ཡུལ་གྱི་སྒྲིག་ཆས་ལ་བརྒྱུད་སྐྱེལ་བྱ། བསད་སྤར་ཁ་ཕྱེ་ཚེ། ཁྱེད་ཀྱིས་གོང་གི་ནང་དོན་ལ་མོས་མཐུན་བྱེད་པ་མཚོན།" + "value":"ཞབས་ཞུ་འདིས་ WLAN དང་སོ་སྔོན་རྩོལ་ནུས་བཀོལ་དགོས་ཤིང་། སྒྲིག་ཆས་ཀྱི་མིང་ཀློག་ལེན་བྱས་ནས་འཕྲོ་མཐུད་བྱ་ཡུལ་གྱི་སྒྲིག་ཆས་ལ་བརྒྱུད་སྐྱེལ་བྱ། བསད་སྤར་ཁ་ཕྱེ་ཚེ། ཁྱེད་ཀྱིས་གོང་གི་ནང་དོན་ལ་མོས་མཐུན་བྱེད་པ་མཚོན།" + }, + { + "name":"learn_more", + "value":"ཞིབ་ཕྲའི་གནས་ཚུལ་ལ་རྒྱུས་ལོན།" + }, + { + "name":"update_version_prompt", + "value":"ཕ་རོལ་པོས་ HarmonyOS NEXT དང་དེ་ཡན་གྱི་པར་གཞིར་རིམ་པ་སྤོར་དགོས།" } ] } \ No newline at end of file diff --git a/application/entry/src/main/resources/ug/element/string.json b/application/entry/src/main/resources/ug/element/string.json index 62c11a14..53be6b75 100644 --- a/application/entry/src/main/resources/ug/element/string.json +++ b/application/entry/src/main/resources/ug/element/string.json @@ -29,8 +29,8 @@ "value":"داۋاملاشتۇرۇش" }, { - "name":"continue_desc", - "value":"بىر ئۈسكۈنىدە كۆرۈۋاتقان ياكى تەھرىرلەۋاتقان ئىشنى ئەتراپتىكى ئوخشاش خۇاۋېي ھېسابىغا تىزىملاپ كىرگەن يەنە بىر ئۈسكۈنىدە داۋاملاشتۇرۇشقا بولىدۇ. بۇ مۇلازىمەتنى قوللايدىغان ئۈسكۈنىنىڭ ۋەزىپە بالدىقىدا ئۆتكۈزۈش سىنبەلگىسى كۆرۈنىدۇ." + "name":"continue_desc_text", + "value":"بىر ئۈسكۈنىدە كۆرۈۋاتقان ياكى تەھرىرلەۋاتقان ئىشنى ئەتراپتىكى ئوخشاش خۇاۋېي ھېسابىغا تىزىملاپ كىرگەن يەنە بىر ئۈسكۈنىدە ۋەزىپە بالدىقىدىكى ئۆتكۈزۈش سىنبەلگىسىنى چېكىپ داۋاملاشتۇرۇشقا بولىدۇ. %s" }, { "name":"continue_title", @@ -38,7 +38,15 @@ }, { "name":"continue_privacy_text", - "value":"بۇ مۇلازىمەت كۆكچىش ۋە WLAN ئىشلىتىدۇ؛ بۇ ئۈسكۈنىنىڭ نامىنى ئوقۇپ، ئۆتكۈزىدىغان ئۈسكۈنىگە يوللايدۇ. بۇ مۇلازىمەتنى ئاچسىڭىز، يۇقىرىقىلارغا قوشۇلغان بولىسىز." + "value":"بۇ مۇلازىمەت WLAN ۋە كۆكچىش ئىشلىتىدۇ؛ بۇ ئۈسكۈنىنىڭ نامىنى ئوقۇپ، ئۆتكۈزىدىغان ئۈسكۈنىگە يوللايدۇ. بۇ مۇلازىمەتنى ئاچسىڭىز، يۇقىرىقىلارغا قوشۇلغان بولىسىز." + }, + { + "name":"learn_more", + "value":"تەپسىلات" + }, + { + "name":"update_version_prompt", + "value":"قارشى ئۈسكۈنە نەشرى HarmonyOS NEXT ياكى يۇقىرى بولۇشى كېرەك." } ] } \ No newline at end of file diff --git a/application/entry/src/main/resources/zh_HK/element/string.json b/application/entry/src/main/resources/zh_HK/element/string.json index 55de9541..354f3998 100644 --- a/application/entry/src/main/resources/zh_HK/element/string.json +++ b/application/entry/src/main/resources/zh_HK/element/string.json @@ -29,8 +29,8 @@ "value":"繼續" }, { - "name":"continue_desc", - "value":"在一台裝置上瀏覽或編輯內容後，只需在附近的另一台已登入相同華為 ID 裝置的主屏幕任務列上找到接續圖標並輕觸，即可繼續操作。" + "name":"continue_desc_text", + "value":"在一部裝置上瀏覽或編輯內容，然後在附近另一部登入相同華為 ID 的裝置之主屏幕任務欄上輕觸接續圖標，即可繼續使用。%s" }, { "name":"continue_title", @@ -38,7 +38,15 @@ }, { "name":"continue_privacy_text", - "value":"本服務在使用過程中需要使用藍牙和 WLAN 功能，讀取並傳輸本裝置名稱至要接續的裝置。開啟開關，即表示您同意上述內容。" + "value":"本服務需要使用 WLAN 和藍牙功能，讀取並傳輸本裝置名稱到要接續的裝置。開啟開關，即表示您同意上述內容。" + }, + { + "name":"learn_more", + "value":"了解詳細資訊" + }, + { + "name":"update_version_prompt", + "value":"對方需要升級至 HarmonyOS NEXT 及以上版本。" } ] } \ No newline at end of file diff --git a/application/entry/src/main/resources/zh_TW/element/string.json b/application/entry/src/main/resources/zh_TW/element/string.json index 79ae22cc..83721189 100644 --- a/application/entry/src/main/resources/zh_TW/element/string.json +++ b/application/entry/src/main/resources/zh_TW/element/string.json @@ -29,8 +29,8 @@ "value":"繼續" }, { - "name":"continue_desc", - "value":"在一部裝置上瀏覽或編輯內容後，只需在附近的另一部已登入相同華為 ID 裝置的桌面工作列上，找到接續圖示並輕觸，即可繼續操作。" + "name":"continue_desc_text", + "value":"在一台裝置上瀏覽或編輯內容，然後在附近另一台登入相同華為 ID 的裝置桌面任務列上輕觸接續圖示，即可繼續使用。%s" }, { "name":"continue_title", @@ -38,7 +38,15 @@ }, { "name":"continue_privacy_text", - "value":"本服務使用過程中需要使用藍牙和 WLAN 功能，讀取本裝置名稱並將其傳輸至要接續的裝置。若開啟開關，即表示您同意上述內容。" + "value":"本服務需要使用 WLAN 和藍牙功能，讀取本裝置名稱並將其傳輸至要接續的裝置。若開啟開關，即表示您同意上述內容。" + }, + { + "name":"learn_more", + "value":"瞭解詳細資料" + }, + { + "name":"update_version_prompt", + "value":"對方需要升級至 HarmonyOS NEXT 及以上版本。" } ] } \ No newline at end of file diff --git a/application/entry/src/main/resources/zz_ZX/element/string.json b/application/entry/src/main/resources/zz_ZX/element/string.json index c1a154cb..cad4c76a 100644 --- a/application/entry/src/main/resources/zz_ZX/element/string.json +++ b/application/entry/src/main/resources/zz_ZX/element/string.json @@ -41,8 +41,8 @@ "value":"[TS_867711]_Resume" }, { - "name":"continue_desc", - "value":"[TS_921308]_Continuation lets you start something on one device, then instantly pick it up on other devices nearby using the same HUAWEI ID. When continuation is available, an icon will appear in the app dock." + "name":"continue_desc_text", + "value":"[TS_962336]_Start viewing or editing content on one device, then continue seamlessly on nearby devices using the same HUAWEI ID. When Handover is available, an icon will appear in the app dock. %s" }, { "name":"ContinueSwitchAbility_label", @@ -50,7 +50,7 @@ }, { "name":"continue_title", - "value":"[TS_921305]_Continuation" + "value":"[TS_921305]_Handover" }, { "name":"ContinueSwitchAbility_desc", @@ -62,7 +62,15 @@ }, { "name":"continue_privacy_text", - "value":"[TS_932988]_This service uses Bluetooth and WLAN. During use, it will read this device's name and send it to devices you hop to. By turning this on, you agree to these terms." + "value":"[TS_932988]_This service uses Bluetooth and WLAN, and needs to send the name of this device to devices you handover to. By turning this on, you agree to these terms." + }, + { + "name":"learn_more", + "value":"[TS_961711]_Learn more" + }, + { + "name":"update_version_prompt", + "value":"[TS_961710]_Both devices must be running HarmonyOS NEXT." } ] } \ No newline at end of file -- Gitee