From ce360ac43a6b63afaa7955ef98a6e4b71464f67b Mon Sep 17 00:00:00 2001 From: shenzuqiang Date: Fri, 15 May 2026 11:02:22 +0800 Subject: [PATCH] =?UTF-8?q?dev:=201=E3=80=81=E4=BF=AE=E6=94=B9=E9=A6=96?= =?UTF-8?q?=E9=A1=B5=E5=B8=A6=E8=B7=AF=E5=BE=84=E7=9A=84UniMp=E4=B8=8B?= =?UTF-8?q?=E8=BD=BDUI=202=E3=80=81=E6=B7=BB=E5=8A=A0=E5=AE=A2=E6=9C=8D?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=98=BE=E7=A4=BA=E4=B8=8E=E9=9A=90=E8=97=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build-profile.json5 | 4 ++-- common/BuildProfile.ets | 2 +- common/src/main/ets/utils/UniMpManager.ets | 6 +++--- common/src/main/ets/viewmodel/DataBean.ets | 2 ++ features/mainLayout/BuildProfile.ets | 2 +- .../mainLayout/oh_modules/@ohos/common/BuildProfile.ets | 2 +- .../common/src/main/ets/dialog/GlobalDownloadingDialog.ets | 2 +- .../@ohos/common/src/main/ets/utils/UniMpManager.ets | 6 +++--- .../@ohos/common/src/main/ets/viewmodel/DataBean.ets | 2 ++ products/app/build-profile.json5 | 2 +- products/app/src/main/ets/view/MineComponent.ets | 4 ++-- 11 files changed, 19 insertions(+), 15 deletions(-) diff --git a/build-profile.json5 b/build-profile.json5 index de3d768..fd9a7d4 100644 --- a/build-profile.json5 +++ b/build-profile.json5 @@ -43,12 +43,12 @@ "arkOptions": { "buildProfileFields": { "CHANNEL": "harmony", - "BUILD_TIME": "2605131158" + "BUILD_TIME": "2605150933" } } }, "output": { - "artifactName": "rabbit_harmony_debug_v1.0.0_2605131158" + "artifactName": "rabbit_harmony_debug_v1.0.0_2605150933" } } ], diff --git a/common/BuildProfile.ets b/common/BuildProfile.ets index 8b1f3b3..ed42bbf 100644 --- a/common/BuildProfile.ets +++ b/common/BuildProfile.ets @@ -6,7 +6,7 @@ export const BUILD_MODE_NAME = 'debug'; export const DEBUG = true; export const TARGET_NAME = 'default'; export const CHANNEL = 'harmony'; -export const BUILD_TIME = '2605131158'; +export const BUILD_TIME = '2605150929'; /** * BuildProfile Class is used only for compatibility purposes. diff --git a/common/src/main/ets/utils/UniMpManager.ets b/common/src/main/ets/utils/UniMpManager.ets index 59ec51a..072ba43 100644 --- a/common/src/main/ets/utils/UniMpManager.ets +++ b/common/src/main/ets/utils/UniMpManager.ets @@ -69,9 +69,9 @@ export function downStartUpForPath(context: UIContext, uniMpVersions: UniVersion }); const targetPath = uniIconEntity.url??''; - const uniMpUrl = uniMpEntity?.url??'';//'https://cdn.batiao8.com/flaunt/uni_mp/wgt/alipay/__UNI__D535736_2026-4-20-test4.wgt'; + const uniMpUrl = uniMpEntity?.url??''; const uniMpId = uniMpEntity?.unimp_id??''; - const uniMpversion = uniMpEntity?.version??''; + const uniMpVersion = uniMpEntity?.version??''; isUniMpNeedDownloadForPath(uniMpId).then(res => { if(res == true){ // 已释放，直接运行 @@ -83,7 +83,7 @@ export function downStartUpForPath(context: UIContext, uniMpVersions: UniVersion downloadFile(getContext(), uniMpUrl??'', uniMpId + '.wgt', (status, progress, path) => { if(status == 2){ // 设置下载的版本信信 - setUniMpNeedDownload(uniMpId??'', uniMpType??'', uniMpversion??'', path??''); + setUniMpNeedDownload(uniMpId??'', uniMpType??'', uniMpVersion??'', path??''); callback(status, progress, path); // 已下载完成，释放并启动 releaseRunUniMp(context, uniMpId??'', targetPath, (status) => { diff --git a/common/src/main/ets/viewmodel/DataBean.ets b/common/src/main/ets/viewmodel/DataBean.ets index de0d760..62e50d8 100644 --- a/common/src/main/ets/viewmodel/DataBean.ets +++ b/common/src/main/ets/viewmodel/DataBean.ets @@ -116,6 +116,8 @@ export interface UserInfo { weixinAppIdType: string | null; weixinAppOpenId: string | null; weixinOpenId: string | null; + show_contact_menu: string | null; + //以下字段，目前由/api/user/account提供 vip_type: number | 0; create_time: string | null; diff --git a/features/mainLayout/BuildProfile.ets b/features/mainLayout/BuildProfile.ets index ac01c86..e3634ed 100644 --- a/features/mainLayout/BuildProfile.ets +++ b/features/mainLayout/BuildProfile.ets @@ -6,7 +6,7 @@ export const BUILD_MODE_NAME = 'debug'; export const DEBUG = true; export const TARGET_NAME = 'default'; export const CHANNEL = 'harmony'; -export const BUILD_TIME = '2605131158'; +export const BUILD_TIME = '2605150929'; /** * BuildProfile Class is used only for compatibility purposes. diff --git a/features/mainLayout/oh_modules/@ohos/common/BuildProfile.ets b/features/mainLayout/oh_modules/@ohos/common/BuildProfile.ets index 8b1f3b3..ed42bbf 100644 --- a/features/mainLayout/oh_modules/@ohos/common/BuildProfile.ets +++ b/features/mainLayout/oh_modules/@ohos/common/BuildProfile.ets @@ -6,7 +6,7 @@ export const BUILD_MODE_NAME = 'debug'; export const DEBUG = true; export const TARGET_NAME = 'default'; export const CHANNEL = 'harmony'; -export const BUILD_TIME = '2605131158'; +export const BUILD_TIME = '2605150929'; /** * BuildProfile Class is used only for compatibility purposes. diff --git a/features/mainLayout/oh_modules/@ohos/common/src/main/ets/dialog/GlobalDownloadingDialog.ets b/features/mainLayout/oh_modules/@ohos/common/src/main/ets/dialog/GlobalDownloadingDialog.ets index 95f1d80..526899e 100644 --- a/features/mainLayout/oh_modules/@ohos/common/src/main/ets/dialog/GlobalDownloadingDialog.ets +++ b/features/mainLayout/oh_modules/@ohos/common/src/main/ets/dialog/GlobalDownloadingDialog.ets @@ -2,7 +2,7 @@ export struct GlobalDownloadingDialog { controller: CustomDialogController; @State show: boolean = false; - @State progress: number = 0; + @Link progress: number; build() { Stack() { diff --git a/features/mainLayout/oh_modules/@ohos/common/src/main/ets/utils/UniMpManager.ets b/features/mainLayout/oh_modules/@ohos/common/src/main/ets/utils/UniMpManager.ets index 59ec51a..072ba43 100644 --- a/features/mainLayout/oh_modules/@ohos/common/src/main/ets/utils/UniMpManager.ets +++ b/features/mainLayout/oh_modules/@ohos/common/src/main/ets/utils/UniMpManager.ets @@ -69,9 +69,9 @@ export function downStartUpForPath(context: UIContext, uniMpVersions: UniVersion }); const targetPath = uniIconEntity.url??''; - const uniMpUrl = uniMpEntity?.url??'';//'https://cdn.batiao8.com/flaunt/uni_mp/wgt/alipay/__UNI__D535736_2026-4-20-test4.wgt'; + const uniMpUrl = uniMpEntity?.url??''; const uniMpId = uniMpEntity?.unimp_id??''; - const uniMpversion = uniMpEntity?.version??''; + const uniMpVersion = uniMpEntity?.version??''; isUniMpNeedDownloadForPath(uniMpId).then(res => { if(res == true){ // 已释放，直接运行 @@ -83,7 +83,7 @@ export function downStartUpForPath(context: UIContext, uniMpVersions: UniVersion downloadFile(getContext(), uniMpUrl??'', uniMpId + '.wgt', (status, progress, path) => { if(status == 2){ // 设置下载的版本信信 - setUniMpNeedDownload(uniMpId??'', uniMpType??'', uniMpversion??'', path??''); + setUniMpNeedDownload(uniMpId??'', uniMpType??'', uniMpVersion??'', path??''); callback(status, progress, path); // 已下载完成，释放并启动 releaseRunUniMp(context, uniMpId??'', targetPath, (status) => { diff --git a/features/mainLayout/oh_modules/@ohos/common/src/main/ets/viewmodel/DataBean.ets b/features/mainLayout/oh_modules/@ohos/common/src/main/ets/viewmodel/DataBean.ets index de0d760..62e50d8 100644 --- a/features/mainLayout/oh_modules/@ohos/common/src/main/ets/viewmodel/DataBean.ets +++ b/features/mainLayout/oh_modules/@ohos/common/src/main/ets/viewmodel/DataBean.ets @@ -116,6 +116,8 @@ export interface UserInfo { weixinAppIdType: string | null; weixinAppOpenId: string | null; weixinOpenId: string | null; + show_contact_menu: string | null; + //以下字段，目前由/api/user/account提供 vip_type: number | 0; create_time: string | null; diff --git a/products/app/build-profile.json5 b/products/app/build-profile.json5 index 81cae41..fc01685 100644 --- a/products/app/build-profile.json5 +++ b/products/app/build-profile.json5 @@ -26,7 +26,7 @@ { "name": "default", "output": { - "artifactName": "rabbit_harmony_v1.0.0_265131158" + "artifactName": "rabbit_harmony_v1.0.0_26515933" } }, { diff --git a/products/app/src/main/ets/view/MineComponent.ets b/products/app/src/main/ets/view/MineComponent.ets index bd27ec0..9bb4caf 100644 --- a/products/app/src/main/ets/view/MineComponent.ets +++ b/products/app/src/main/ets/view/MineComponent.ets @@ -189,9 +189,9 @@ export struct MineComponent { // 跳转客服 const context = getContext(this) as common.UIAbilityContext; jumpToWeChatCustomerService(context, this.serviceProfile?.corpid??'', this.serviceProfile?.address??'') - }) + }).visibility(this.userInfo?.show_contact_menu ? Visibility.Visible : Visibility.None) - Divider().height(0.5).backgroundColor('#4dd8d8d8').margin({ left: 14, right: 14}) + Divider().height(0.5).backgroundColor('#4dd8d8d8').margin({ left: 14, right: 14}).visibility(this.userInfo?.show_contact_menu ? Visibility.Visible : Visibility.None) Row() { Image($r('app.media.ic_mine_update')).width('19.5vp').height('21.51vp')