From 20c0a3f96ac5e4c7fb3b16f3edbd84d6e4fb6924 Mon Sep 17 00:00:00 2001 From: cheng_li-11 <2321508477@qq.com> Date: Tue, 30 Sep 2025 14:02:25 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=E4=BF=AE=E6=94=B9sample=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E9=97=AE=E9=A2=98=EF=BC=8C=E5=8C=85=E6=8B=AC=E6=97=A0?= =?UTF-8?q?=E8=BD=AC=E5=9C=BA=E5=8A=A8=E7=94=BB=E3=80=81=E6=97=A0=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E3=80=81=E5=BA=9F=E5=BC=83=E6=8E=A5=E5=8F=A3=E3=80=81?= =?UTF-8?q?=E4=BE=A7=E6=BB=91=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: cheng_li-11 <2321508477@qq.com> --- .../common/constants/CommonConstants.ets | 2 +- .../common/constants/DetailConstants.ets | 20 ++--- .../common/constants/HomeConstants.ets | 78 +++++++++---------- .../common/constants/LiveConstants.ets | 10 +-- .../common/constants/LoginConstants.ets | 54 ++++++------- .../common/constants/MineConstants.ets | 40 +++++----- .../common/constants/PayConstants.ets | 22 +++--- .../common/constants/ShoppingBagConstants.ets | 28 +++---- .../main/ets/component/mine/MineContent.ets | 6 +- .../shoppingBag/ShoppingBagContent.ets | 2 + .../main/ets/lifecycle/ExitAppLifecycle.ets | 2 +- 11 files changed, 133 insertions(+), 131 deletions(-) diff --git a/entry/src/main/ets/component/common/constants/CommonConstants.ets b/entry/src/main/ets/component/common/constants/CommonConstants.ets index aab878b..cbe2913 100644 --- a/entry/src/main/ets/component/common/constants/CommonConstants.ets +++ b/entry/src/main/ets/component/common/constants/CommonConstants.ets @@ -131,5 +131,5 @@ export class CommonConstants { /** * home exit toast. */ - static readonly EXIT_TOAST: string = uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.HOME_EXIT_TOAST')); + static readonly EXIT_TOAST: string = uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.HOME_EXIT_TOAST').id); } \ No newline at end of file diff --git a/entry/src/main/ets/component/common/constants/DetailConstants.ets b/entry/src/main/ets/component/common/constants/DetailConstants.ets index 492cfc3..5e6c950 100644 --- a/entry/src/main/ets/component/common/constants/DetailConstants.ets +++ b/entry/src/main/ets/component/common/constants/DetailConstants.ets @@ -19,7 +19,7 @@ export class DetailConstants { /** * Living. */ - static readonly LIVING: string = uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.LIVING')); + static readonly LIVING: string = uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.LIVING').id); /** * Product detail resources. */ @@ -78,9 +78,9 @@ export class DetailConstants { * Product select type list. */ static readonly SELECT_NAME_LIST: string[] = - [uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.SELECT_NAME_LIST1')), - uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.SELECT_NAME_LIST2')), - uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.SELECT_NAME_LIST3'))]; + [uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.SELECT_NAME_LIST1').id), + uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.SELECT_NAME_LIST2').id), + uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.SELECT_NAME_LIST3').id)]; /** * Product image list. */ @@ -90,16 +90,16 @@ export class DetailConstants { * Button names. */ static readonly BUTTON_NAMES: string[] = - [uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.BUTTON_NAMES1')), - uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.BUTTON_NAMES2'))]; + [uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.BUTTON_NAMES1').id), + uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.BUTTON_NAMES2').id)]; /** * Pay address and contact. */ static readonly PAY_INFO: string[] = - ['XXXX大道XXXXX楼XX单元XX号', uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.PAY_INFO1')), - uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.PAY_INFO2')), - uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.PAY_INFO3')), - uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.PAY_INFO4'))]; + ['XXXX大道XXXXX楼XX单元XX号', uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.PAY_INFO1').id), + uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.PAY_INFO2').id), + uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.PAY_INFO3').id), + uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.PAY_INFO4').id)]; /** * Product config list. */ diff --git a/entry/src/main/ets/component/common/constants/HomeConstants.ets b/entry/src/main/ets/component/common/constants/HomeConstants.ets index d9d9de3..18c5ec4 100644 --- a/entry/src/main/ets/component/common/constants/HomeConstants.ets +++ b/entry/src/main/ets/component/common/constants/HomeConstants.ets @@ -20,11 +20,11 @@ export class HomeConstants { * Footer tab topics. */ static readonly FOOTER_TOPIC_LIST: string[] = [ - uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.FOOTER_TOPIC_LIST1')), - uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.FOOTER_TOPIC_LIST2')), - uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.FOOTER_TOPIC_LIST3')), - uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.FOOTER_TOPIC_LIST4')), - uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.FOOTER_TOPIC_LIST5'))]; + uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.FOOTER_TOPIC_LIST1').id), + uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.FOOTER_TOPIC_LIST2').id), + uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.FOOTER_TOPIC_LIST3').id), + uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.FOOTER_TOPIC_LIST4').id), + uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.FOOTER_TOPIC_LIST5').id)]; /** * Footer topic icons. @@ -43,16 +43,16 @@ export class HomeConstants { * Top bar text list. */ static readonly TOP_BAR_TEXTS: string[] = [ - uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.TOP_BAR_TEXTS1')), - uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.TOP_BAR_TEXTS2')), - uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.TOP_BAR_TEXTS3')), - uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.TOP_BAR_TEXTS4'))]; + uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.TOP_BAR_TEXTS1').id), + uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.TOP_BAR_TEXTS2').id), + uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.TOP_BAR_TEXTS3').id), + uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.TOP_BAR_TEXTS4').id)]; /** * Search placeholder. */ static readonly SEARCH_PLACEHOLDER: string = - uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.searching')); + uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.searching').id); /** * Recommended product list. @@ -69,16 +69,16 @@ export class HomeConstants { * Good categories. */ static readonly GOOD_CATEGORIES: string[] = [ - uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.GOOD_CATEGORIES1')), - uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.GOOD_CATEGORIES2')), - uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.GOOD_CATEGORIES3')), - uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.GOOD_CATEGORIES4')), - uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.GOOD_CATEGORIES5')), - uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.GOOD_CATEGORIES6')), - uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.GOOD_CATEGORIES7')), - uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.GOOD_CATEGORIES8')), - uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.GOOD_CATEGORIES9')), - uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.GOOD_CATEGORIES10'))]; + uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.GOOD_CATEGORIES1').id), + uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.GOOD_CATEGORIES2').id), + uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.GOOD_CATEGORIES3').id), + uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.GOOD_CATEGORIES4').id), + uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.GOOD_CATEGORIES5').id), + uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.GOOD_CATEGORIES6').id), + uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.GOOD_CATEGORIES7').id), + uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.GOOD_CATEGORIES8').id), + uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.GOOD_CATEGORIES9').id), + uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.GOOD_CATEGORIES10').id)]; /** * Good category images. @@ -130,30 +130,30 @@ export class HomeConstants { * Price unit. */ static readonly PRICE_UNIT: string[] = ['￥', - uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.PRICE_UNIT'))]; + uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.PRICE_UNIT').id)]; /** * Home title list. */ static readonly HOME_TITLES: string[] = [ - uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.HOME_TITLES1')), - uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.HOME_TITLES2')), - uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.HOME_TITLES3'))]; + uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.HOME_TITLES1').id), + uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.HOME_TITLES2').id), + uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.HOME_TITLES3').id)]; /** * Home button text list. */ static readonly BUTTON_TEXTS: string[] = [ - uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.BUTTON_TEXTS1')), - uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.BUTTON_TEXTS2'))]; + uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.BUTTON_TEXTS1').id), + uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.BUTTON_TEXTS2').id)]; /** * Welfare tip text. */ static readonly TIP_TEXTS: string[] = [ - uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.TIP_TEXTS1')), - uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.TIP_TEXTS2')), - uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.TIP_TEXTS3'))]; + uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.TIP_TEXTS1').id), + uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.TIP_TEXTS2').id), + uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.TIP_TEXTS3').id)]; /** * Gradient color list. @@ -171,18 +171,18 @@ export class HomeConstants { * Section products title list. */ static readonly SECTION_PRODUCTS_TITLES: string[][] = [ - [uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.SECTION_PRODUCTS_TITLES1'))], + [uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.SECTION_PRODUCTS_TITLES1').id)], ['HUAWEI Mate 50', - uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.SECTION_PRODUCTS_TITLES2'))], + uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.SECTION_PRODUCTS_TITLES2').id)], ['Sound X NEW'], ['HUAWEI MatePad Air'], ['HUAWEI MateBook 14s']]; /** * Section products info list. */ static readonly SECTION_PRODUCTS_INFO: string[] = ['', - uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.SECTION_PRODUCTS_INFO1')), '', - uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.SECTION_PRODUCTS_INFO2')), - uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.SECTION_PRODUCTS_INFO3'))]; + uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.SECTION_PRODUCTS_INFO1').id), '', + uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.SECTION_PRODUCTS_INFO2').id), + uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.SECTION_PRODUCTS_INFO3').id)]; /** * Section products price list. @@ -193,11 +193,11 @@ export class HomeConstants { * Section products feature list. */ static readonly SECTION_PRODUCTS_FEATURES: string[][] = [ - [uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.SECTION_PRODUCTS_FEATURES1'))], - [uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.SECTION_PRODUCTS_FEATURES2'))], - [uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.SECTION_PRODUCTS_FEATURES3'))], - [uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.SECTION_PRODUCTS_FEATURES4'))], - [uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.SECTION_PRODUCTS_FEATURES5'))]]; + [uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.SECTION_PRODUCTS_FEATURES1').id)], + [uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.SECTION_PRODUCTS_FEATURES2').id)], + [uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.SECTION_PRODUCTS_FEATURES3').id)], + [uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.SECTION_PRODUCTS_FEATURES4').id)], + [uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.SECTION_PRODUCTS_FEATURES5').id)]]; /** * Section products comment list. diff --git a/entry/src/main/ets/component/common/constants/LiveConstants.ets b/entry/src/main/ets/component/common/constants/LiveConstants.ets index 93eddb0..d8ec347 100644 --- a/entry/src/main/ets/component/common/constants/LiveConstants.ets +++ b/entry/src/main/ets/component/common/constants/LiveConstants.ets @@ -139,25 +139,25 @@ export class LiveConstants { * Live comments title left text. */ static readonly LIVING_LEFT_TEXT: string = - uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.LIVING_LEFT_TEXT')); + uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.LIVING_LEFT_TEXT').id); /** * Live comments title left text. */ static readonly LIVING_RIGHT_TEXT: string = - uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.LIVING_RIGHT_TEXT')); + uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.LIVING_RIGHT_TEXT').id); /** * Live comments title left text. */ static readonly LIVING_WRITE: string = - uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.LIVING_WRITE')); + uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.LIVING_WRITE').id); /** * Live title top. */ static readonly LIVING_TITLE_TOP: string = - uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.store_name')); + uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.store_name').id); /** * Live title bottom. */ static readonly LIVING_TITLE_BOTTOM: string = - uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.number_of_viewers')); + uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.number_of_viewers').id); } \ No newline at end of file diff --git a/entry/src/main/ets/component/common/constants/LoginConstants.ets b/entry/src/main/ets/component/common/constants/LoginConstants.ets index dfde0b1..69e3bdf 100644 --- a/entry/src/main/ets/component/common/constants/LoginConstants.ets +++ b/entry/src/main/ets/component/common/constants/LoginConstants.ets @@ -19,101 +19,101 @@ export class LoginConstants { /** * Login title. */ - static readonly LOGIN_TEXT: string = uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.LOGIN_TITLE')); + static readonly LOGIN_TEXT: string = uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.LOGIN_TITLE').id); /** * Login TextInput placeholder1. */ static readonly LOGIN_PLACEHOLDER1: string = - uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.LOGIN_PLACEHOLDER1')); + uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.LOGIN_PLACEHOLDER1').id); /** * Login TextInput placeholder2. */ static readonly LOGIN_PLACEHOLDER2: string = - uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.LOGIN_PLACEHOLDER2')); + uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.LOGIN_PLACEHOLDER2').id); /** * Login TextInput1 text. */ static readonly LOGIN_INPUT_TEXT: string = - uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.LOGIN_INPUT_TEXT')); + uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.LOGIN_INPUT_TEXT').id); /** * Login button. */ - static readonly LOGIN_BUTTON: string = uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.LOGIN_BUTTON')); + static readonly LOGIN_BUTTON: string = uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.LOGIN_BUTTON').id); /** * Login show toast. */ - static readonly LOGIN_TOAST: string = uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.LOGIN_TOAST')); + static readonly LOGIN_TOAST: string = uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.LOGIN_TOAST').id); /** * Privacy dialog title. */ static readonly PRIVACY_DIALOG_TITLE: string = - uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.PRIVACY_DIALOG_TITLE')); + uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.PRIVACY_DIALOG_TITLE').id); /** * Privacy dialog text1. */ static readonly PRIVACY_DIALOG_TEXT1: string = - uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.PRIVACY_DIALOG_TEXT1')); + uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.PRIVACY_DIALOG_TEXT1').id); /** * Privacy dialog text2. */ static readonly PRIVACY_DIALOG_TEXT2: string = - uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.PRIVACY_DIALOG_TEXT2')); + uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.PRIVACY_DIALOG_TEXT2').id); /** * Privacy dialog text3. */ static readonly PRIVACY_DIALOG_TEXT3: string = - uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.PRIVACY_DIALOG_TEXT3')); + uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.PRIVACY_DIALOG_TEXT3').id); /** * Privacy dialog text4. */ static readonly PRIVACY_DIALOG_TEXT4: string = - uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.PRIVACY_DIALOG_TEXT4')); + uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.PRIVACY_DIALOG_TEXT4').id); /** * Privacy dialog left button. */ static readonly PRIVACY_DIALOG_LEFT_BUTTON: string = - uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.PRIVACY_DIALOG_LEFT_BUTTON')); + uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.PRIVACY_DIALOG_LEFT_BUTTON').id); /** * Privacy dialog right button. */ static readonly PRIVACY_DIALOG_RIGHT_BUTTON: string = - uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.PRIVACY_DIALOG_RIGHT_BUTTON')); + uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.PRIVACY_DIALOG_RIGHT_BUTTON').id); /** * Privacy detail title. */ static readonly PRIVACY_DETAIL_TITLE: string = - uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.PRIVACY_DETAIL_TITLE')); + uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.PRIVACY_DETAIL_TITLE').id); /** * Privacy detail text1. */ static readonly PRIVACY_DETAIL_TEXT1: string = - uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.PRIVACY_DETAIL_TEXT1')); + uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.PRIVACY_DETAIL_TEXT1').id); /** * Privacy detail text2. */ static readonly PRIVACY_DETAIL_TEXT2: string = - uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.PRIVACY_DETAIL_TEXT2')); + uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.PRIVACY_DETAIL_TEXT2').id); /** * Privacy detail text3. */ static readonly PRIVACY_DETAIL_TEXT3: string = - uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.PRIVACY_DETAIL_TEXT3')); + uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.PRIVACY_DETAIL_TEXT3').id); /** * Privacy detail text4. */ static readonly PRIVACY_DETAIL_TEXT4: string = - uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.PRIVACY_DETAIL_TEXT4')); + uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.PRIVACY_DETAIL_TEXT4').id); /** * Privacy detail content. */ static readonly PRIVACY_DETAIL_INFO: string[] = - [uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.PRIVACY_DETAIL_ITEM_TEXT1')), - uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.PRIVACY_DETAIL_ITEM_TEXT2')), - uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.PRIVACY_DETAIL_ITEM_TEXT3')), - uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.PRIVACY_DETAIL_ITEM_TEXT4')), - uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.PRIVACY_DETAIL_ITEM_TEXT5')), - uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.PRIVACY_DETAIL_ITEM_TEXT6')), - uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.PRIVACY_DETAIL_ITEM_TEXT7')), - uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.PRIVACY_DETAIL_ITEM_TEXT8')), - uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.PRIVACY_DETAIL_ITEM_TEXT9'))]; + [uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.PRIVACY_DETAIL_ITEM_TEXT1').id), + uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.PRIVACY_DETAIL_ITEM_TEXT2').id), + uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.PRIVACY_DETAIL_ITEM_TEXT3').id), + uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.PRIVACY_DETAIL_ITEM_TEXT4').id), + uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.PRIVACY_DETAIL_ITEM_TEXT5').id), + uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.PRIVACY_DETAIL_ITEM_TEXT6').id), + uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.PRIVACY_DETAIL_ITEM_TEXT7').id), + uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.PRIVACY_DETAIL_ITEM_TEXT8').id), + uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.PRIVACY_DETAIL_ITEM_TEXT9').id)]; } \ No newline at end of file diff --git a/entry/src/main/ets/component/common/constants/MineConstants.ets b/entry/src/main/ets/component/common/constants/MineConstants.ets index cf85650..f0480ab 100644 --- a/entry/src/main/ets/component/common/constants/MineConstants.ets +++ b/entry/src/main/ets/component/common/constants/MineConstants.ets @@ -19,81 +19,81 @@ export class MineConstants{ /** * Mine page title. */ - static readonly MINE_TITLE: string = uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.MINE_TITLE')); + static readonly MINE_TITLE: string = uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.MINE_TITLE').id); /** * Mine page text1. */ - static readonly MINE_TEXT1: string = uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.MINE_TEXT1')); + static readonly MINE_TEXT1: string = uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.MINE_TEXT1').id); /** * Mine page text2. */ - static readonly MINE_TEXT2: string = uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.MINE_TEXT2')); + static readonly MINE_TEXT2: string = uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.MINE_TEXT2').id); /** * Mine animation settings page content. */ - static readonly MINE_ANIMATION_CONTENT: string = uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.MINE_ANIMATION_CONTENT')); + static readonly MINE_ANIMATION_CONTENT: string = uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.MINE_ANIMATION_CONTENT').id); /** * Mine page animation type1. */ - static readonly MINE_ANIMATION_TYPE1: string = uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.MINE_ANIMATION_TYPE1')); + static readonly MINE_ANIMATION_TYPE1: string = uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.MINE_ANIMATION_TYPE1').id); /** * Mine page animation type2. */ - static readonly MINE_ANIMATION_TYPE2: string = uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.MINE_ANIMATION_TYPE2')); + static readonly MINE_ANIMATION_TYPE2: string = uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.MINE_ANIMATION_TYPE2').id); /** * Mine page animation type3. */ - static readonly MINE_ANIMATION_TYPE3: string = uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.MINE_ANIMATION_TYPE3')); + static readonly MINE_ANIMATION_TYPE3: string = uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.MINE_ANIMATION_TYPE3').id); /** * Personalized transition animation page title. */ - static readonly PERSONALIZED_ANIMATION_TITLE: string = uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.PERSONALIZED_ANIMATION_TITLE')); + static readonly PERSONALIZED_ANIMATION_TITLE: string = uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.PERSONALIZED_ANIMATION_TITLE').id); /** * Personalized transition animation type1. */ - static readonly PERSONALIZED_ANIMATION_TYPE1: string = uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.PERSONALIZED_ANIMATION_TYPE1')); + static readonly PERSONALIZED_ANIMATION_TYPE1: string = uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.PERSONALIZED_ANIMATION_TYPE1').id); /** * Personalized transition animation type2. */ - static readonly PERSONALIZED_ANIMATION_TYPE2: string = uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.PERSONALIZED_ANIMATION_TYPE2')); + static readonly PERSONALIZED_ANIMATION_TYPE2: string = uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.PERSONALIZED_ANIMATION_TYPE2').id); /** * Personalized transition animation type3. */ - static readonly PERSONALIZED_ANIMATION_TYPE3: string = uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.PERSONALIZED_ANIMATION_TYPE3')); + static readonly PERSONALIZED_ANIMATION_TYPE3: string = uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.PERSONALIZED_ANIMATION_TYPE3').id); /** * Mine page button text. */ - static readonly MINE_BUTTON_TEXT: string = uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.MINE_BUTTON_TEXT')); + static readonly MINE_BUTTON_TEXT: string = uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.MINE_BUTTON_TEXT').id); /** * Mine page user name. */ - static readonly MINE_NAME: string = uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.MINE_NAME')); + static readonly MINE_NAME: string = uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.MINE_NAME').id); /** * Mine log out page title. */ - static readonly MINE_LOG_OUT_TITLE: string = uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.MINE_LOG_OUT_TITLE')); + static readonly MINE_LOG_OUT_TITLE: string = uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.MINE_LOG_OUT_TITLE').id); /** * Mine log out page text. */ - static readonly MINE_LOG_OUT_TEXT: string = uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.MINE_LOG_OUT_TEXT')); + static readonly MINE_LOG_OUT_TEXT: string = uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.MINE_LOG_OUT_TEXT').id); /** * Mine log out page button text. */ - static readonly MINE_LOG_OUT_BUTTON: string = uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.MINE_LOG_OUT_BUTTON')); + static readonly MINE_LOG_OUT_BUTTON: string = uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.MINE_LOG_OUT_BUTTON').id); /** * Exit login title. */ - static readonly EXIT_LOGIN_TITLE: string = uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.EXIT_LOGIN_TITLE')); + static readonly EXIT_LOGIN_TITLE: string = uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.EXIT_LOGIN_TITLE').id); /** * Exit login content. */ - static readonly EXIT_LOGIN_CONTENT: string = uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.EXIT_LOGIN_CONTENT')); + static readonly EXIT_LOGIN_CONTENT: string = uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.EXIT_LOGIN_CONTENT').id); /** * Exit login left button. */ - static readonly EXIT_LOGIN_LEFT_BUTTON: string = uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.EXIT_LOGIN_LEFT_BUTTON')); + static readonly EXIT_LOGIN_LEFT_BUTTON: string = uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.EXIT_LOGIN_LEFT_BUTTON').id); /** * Exit login right button. */ - static readonly EXIT_LOGIN_RIGHT_BUTTON: string = uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.EXIT_LOGIN_RIGHT_BUTTON')); + static readonly EXIT_LOGIN_RIGHT_BUTTON: string = uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.EXIT_LOGIN_RIGHT_BUTTON').id); } \ No newline at end of file diff --git a/entry/src/main/ets/component/common/constants/PayConstants.ets b/entry/src/main/ets/component/common/constants/PayConstants.ets index a7c69a3..c534b66 100644 --- a/entry/src/main/ets/component/common/constants/PayConstants.ets +++ b/entry/src/main/ets/component/common/constants/PayConstants.ets @@ -19,45 +19,45 @@ export class PayConstants { /** * Pay card text1. */ - static readonly PAY_CARD_TEXT1: string = uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.PAY_CARD_TEXT1')); + static readonly PAY_CARD_TEXT1: string = uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.PAY_CARD_TEXT1').id); /** * Pay card text2. */ - static readonly PAY_CARD_TEXT2: string = uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.PAY_CARD_TEXT2')); + static readonly PAY_CARD_TEXT2: string = uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.PAY_CARD_TEXT2').id); /** * Pay card text3. */ - static readonly PAY_CARD_TEXT3: string = uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.PAY_CARD_TEXT3')); + static readonly PAY_CARD_TEXT3: string = uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.PAY_CARD_TEXT3').id); /** * Pay card text2. */ - static readonly PAY_CARD_BUTTON: string = uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.PAY_CARD_BUTTON')); + static readonly PAY_CARD_BUTTON: string = uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.PAY_CARD_BUTTON').id); /** * Pay cancel title. */ - static readonly PAY_CANCEL_TITLE: string = uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.PAY_CANCEL_TITLE')); + static readonly PAY_CANCEL_TITLE: string = uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.PAY_CANCEL_TITLE').id); /** * Pay cancel content. */ - static readonly PAY_CANCEL_CONTENT: string = uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.PAY_CANCEL_CONTENT')); + static readonly PAY_CANCEL_CONTENT: string = uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.PAY_CANCEL_CONTENT').id); /** * Pay cancel button1. */ - static readonly PAY_CANCEL_BUTTON1: string = uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.PAY_CANCEL_SEE')); + static readonly PAY_CANCEL_BUTTON1: string = uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.PAY_CANCEL_SEE').id); /** * Pay cancel button2. */ - static readonly PAY_CANCEL_BUTTON2: string = uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.PAY_CANCEL_CONFIRM')); + static readonly PAY_CANCEL_BUTTON2: string = uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.PAY_CANCEL_CONFIRM').id); /** * Pay success title. */ - static readonly PAY_SUCCESS_TITLE: string = uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.PAY_SUCCESS_TITLE')); + static readonly PAY_SUCCESS_TITLE: string = uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.PAY_SUCCESS_TITLE').id); /** * Pay success text. */ - static readonly PAY_SUCCESS_TEXT: string = uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.PAY_SUCCESS_TEXT')); + static readonly PAY_SUCCESS_TEXT: string = uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.PAY_SUCCESS_TEXT').id); /** * Pay success button text. */ - static readonly PAY_SUCCESS_BUTTON: string = uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.PAY_SUCCESS_BUTTON')); + static readonly PAY_SUCCESS_BUTTON: string = uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.PAY_SUCCESS_BUTTON').id); } \ No newline at end of file diff --git a/entry/src/main/ets/component/common/constants/ShoppingBagConstants.ets b/entry/src/main/ets/component/common/constants/ShoppingBagConstants.ets index f41c0bc..4214ce8 100644 --- a/entry/src/main/ets/component/common/constants/ShoppingBagConstants.ets +++ b/entry/src/main/ets/component/common/constants/ShoppingBagConstants.ets @@ -46,10 +46,10 @@ export class ShoppingBagConstants { * Product status list. */ static readonly PRODUCT_STATUS_LIST: Array> = - [[uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.SHOPPING_PAID'))], - [uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.SHOPPING_UNPAID'))], - [uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.SHOPPING_PAID'))], - [uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.SHOPPING_UNPAID'))]]; + [[uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.SHOPPING_PAID').id)], + [uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.SHOPPING_UNPAID').id)], + [uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.SHOPPING_PAID').id)], + [uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.SHOPPING_UNPAID').id)]]; /** * Product price list. */ @@ -83,9 +83,9 @@ export class ShoppingBagConstants { * Shopping bag titles. */ static readonly SHOPPING_BAG_TITLES: string[] = [ - uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.SHOPPING_BAG_TITLES1')), - uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.SHOPPING_BAG_TITLES2')), - uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.SHOPPING_BAG_TITLES3'))]; + uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.SHOPPING_BAG_TITLES1').id), + uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.SHOPPING_BAG_TITLES2').id), + uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.SHOPPING_BAG_TITLES3').id)]; /** * Shopping discount title list. */ @@ -101,11 +101,11 @@ export class ShoppingBagConstants { * Shopping card foot title list. */ static readonly SHOPPING_CARD_FOOT_TITLES: string[] = [ - uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.SHOPPING_CARD_FOOT_TITLES1')), - uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.SHOPPING_CARD_FOOT_TITLES2')), + uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.SHOPPING_CARD_FOOT_TITLES1').id), + uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.SHOPPING_CARD_FOOT_TITLES2').id), '￥', '12999', - uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.SHOPPING_CARD_FOOT_TITLES3')), - uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.SHOPPING_CARD_FOOT_TITLES4'))]; + uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.SHOPPING_CARD_FOOT_TITLES3').id), + uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.SHOPPING_CARD_FOOT_TITLES4').id)]; /** * Shopping card name list. */ @@ -121,15 +121,15 @@ export class ShoppingBagConstants { * Shopping card settlement button. */ static readonly SHOPPING_SETTLEMENT_BUTTON: string = - uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.SHOPPING_SETTLEMENT_BUTTON')); + uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.SHOPPING_SETTLEMENT_BUTTON').id); /** * Shopping unpaid. */ static readonly SHOPPING_UNPAID: string = - uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.SHOPPING_UNPAID')); + uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.SHOPPING_UNPAID').id); /** * Shopping paid. */ static readonly SHOPPING_PAID: string = - uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.SHOPPING_PAID')); + uiContext!.getHostContext()!.resourceManager.getStringSync($r('app.string.SHOPPING_PAID').id); } \ No newline at end of file diff --git a/entry/src/main/ets/component/mine/MineContent.ets b/entry/src/main/ets/component/mine/MineContent.ets index 5378106..fd2f9cf 100644 --- a/entry/src/main/ets/component/mine/MineContent.ets +++ b/entry/src/main/ets/component/mine/MineContent.ets @@ -120,9 +120,9 @@ export struct MineContent { .backgroundColor($r('app.color.mine_content_flex_background_color')) .borderRadius(15) .onClick(() => { - // HMRouterMgr.to(MineContent.jumpPageUrl) - // .withNavigation(this.queryNavigationInfo()?.navigationId) - // .pushAsync() + HMRouterMgr.to(MineContent.jumpPageUrl) + .withNavigation(this.queryNavigationInfo()?.navigationId) + .pushAsync() }); } .justifyContent(FlexAlign.Start) diff --git a/entry/src/main/ets/component/shoppingBag/ShoppingBagContent.ets b/entry/src/main/ets/component/shoppingBag/ShoppingBagContent.ets index 53888d7..52b2d10 100644 --- a/entry/src/main/ets/component/shoppingBag/ShoppingBagContent.ets +++ b/entry/src/main/ets/component/shoppingBag/ShoppingBagContent.ets @@ -81,8 +81,10 @@ export struct ShoppingBagContent { // [StartExclude HMRouter_life_cycle_name] @StorageLink('currentBreakpoint') currentBreakpoint: string = BreakpointConstants.BREAKPOINT_SM; @Provide('ShoppingNavModifier') modifier: ShoppingNavModifier = new ShoppingNavModifier(); + private requestModel: RequestModel = new RequestModel(); aboutToAppear(): void { + console.log(this.requestModel.data); let task: taskpool.Task = new taskpool.Task(networkRequest, 'aboutToAppear'); taskpool.execute(task).then((res: Object) => { console.log(JSON.stringify(res)); diff --git a/entry/src/main/ets/lifecycle/ExitAppLifecycle.ets b/entry/src/main/ets/lifecycle/ExitAppLifecycle.ets index 509a386..88430ac 100644 --- a/entry/src/main/ets/lifecycle/ExitAppLifecycle.ets +++ b/entry/src/main/ets/lifecycle/ExitAppLifecycle.ets @@ -30,7 +30,7 @@ export class ExitAppLifecycle implements IHMLifecycle { if (time - this.lastTime > 1000) { this.lastTime = time; ctx.uiContext.getPromptAction().showToast({ - message: 'Return to exit the application again.', + message: '再次返回退出应用', duration: 1000 }); return true; -- Gitee