From 4c3287c8ecfb861abb62a1a595d0e2f4478b13ff Mon Sep 17 00:00:00 2001 From: guowei Date: Wed, 20 Aug 2025 15:36:40 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: guowei --- product/phone/src/main/module.json5 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/product/phone/src/main/module.json5 b/product/phone/src/main/module.json5 index 61d280f0..0878e3c4 100644 --- a/product/phone/src/main/module.json5 +++ b/product/phone/src/main/module.json5 @@ -265,6 +265,9 @@ { "name": "ohos.permission.ACCESS_CERT_MANAGER" }, + { + "name": "ohos.permission.ACCESS_CERT_MANAGER_INTERNAL" + }, { "name": "ohos.permission.MANAGE_USB_CONFIG" } -- Gitee From f5f38551f34e8dafb11a828b91f8c205891bbccc Mon Sep 17 00:00:00 2001 From: guowei Date: Wed, 20 Aug 2025 16:45:00 +0800 Subject: [PATCH 2/5] =?UTF-8?q?settings=E5=9B=9E=E9=80=80=E6=B5=8B?= =?UTF-8?q?=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: guowei --- .../ets/controller/bluetooth/BluetoothDeviceController.ts | 2 +- .../main/ets/model/aboutDeviceImpl/AboutDeviceModel.ts | 1 + .../src/main/ets/model/bluetoothImpl/BluetoothModel.ts | 4 ++-- .../src/main/ets/pages/abilityDialog/BluetoothDialog.ets | 8 ++------ product/phone/src/main/ets/pages/appManagement.ets | 2 ++ product/phone/src/main/module.json5 | 3 --- 6 files changed, 8 insertions(+), 12 deletions(-) diff --git a/product/phone/src/main/ets/controller/bluetooth/BluetoothDeviceController.ts b/product/phone/src/main/ets/controller/bluetooth/BluetoothDeviceController.ts index ef5720b6..a395ce3d 100644 --- a/product/phone/src/main/ets/controller/bluetooth/BluetoothDeviceController.ts +++ b/product/phone/src/main/ets/controller/bluetooth/BluetoothDeviceController.ts @@ -79,7 +79,7 @@ export default class BluetoothDeviceController extends BaseSettingsController { deviceId: string; pinCode: string; }) => { - LogUtil.log(this.TAG + 'bluetooth subscribePinRequired callback'); + LogUtil.log(this.TAG + 'bluetooth subscribePinRequired callback. pinRequiredParam = ' + pinRequiredParam.pinCode); let pairData = this.getAvailableDevice(pinRequiredParam.deviceId); this.pairPinCode = pinRequiredParam.pinCode; AppStorage.SetOrCreate('pairData', pairData); diff --git a/product/phone/src/main/ets/model/aboutDeviceImpl/AboutDeviceModel.ts b/product/phone/src/main/ets/model/aboutDeviceImpl/AboutDeviceModel.ts index 154c6f89..f6fba575 100644 --- a/product/phone/src/main/ets/model/aboutDeviceImpl/AboutDeviceModel.ts +++ b/product/phone/src/main/ets/model/aboutDeviceImpl/AboutDeviceModel.ts @@ -69,6 +69,7 @@ export class AboutDeviceModel extends BaseModel { @Log setOnAboutDeviceListener(): any { LogUtil.info('settings setOnAboutDeviceListener in'); + LogUtil.info('settings setOnAboutDeviceListener deviceInfo ' + JSON.stringify(deviceInfo)); return deviceInfo; } diff --git a/product/phone/src/main/ets/model/bluetoothImpl/BluetoothModel.ts b/product/phone/src/main/ets/model/bluetoothImpl/BluetoothModel.ts index 7737782d..3bcb6e14 100644 --- a/product/phone/src/main/ets/model/bluetoothImpl/BluetoothModel.ts +++ b/product/phone/src/main/ets/model/bluetoothImpl/BluetoothModel.ts @@ -308,7 +308,7 @@ export class BluetoothModel extends BaseModel { deviceId: string; pinCode: string; }) => { - LogUtil.info(`${this.TAG} subscribePinRequired->pinRequired`); + LogUtil.info(`${this.TAG} subscribePinRequired->pinRequired return: ${data.pinCode}`); if (callback) { callback(data) } @@ -331,7 +331,7 @@ export class BluetoothModel extends BaseModel { LogUtil.error(`${this.TAG} unsubscribePinRequired->pinRequired error`); return; } - LogUtil.info(`${this.TAG} unsubscribePinRequired->pinRequired`); + LogUtil.info(`${this.TAG} unsubscribePinRequired->pinRequired return: ${data.pinCode}`); if (callback) { callback(data) } diff --git a/product/phone/src/main/ets/pages/abilityDialog/BluetoothDialog.ets b/product/phone/src/main/ets/pages/abilityDialog/BluetoothDialog.ets index 1fcc5fc1..70c201a1 100644 --- a/product/phone/src/main/ets/pages/abilityDialog/BluetoothDialog.ets +++ b/product/phone/src/main/ets/pages/abilityDialog/BluetoothDialog.ets @@ -29,9 +29,7 @@ struct BluetoothSwitchWindowDialog { autoCancel: true, customStyle: true, cancel: () => { - let dialogSession: UIExtensionContentSession | undefined = - AppStorage.get('accessibilityDialogSession'); - dialogSession?.terminateSelf(); + (AppStorage.get('bluetoothDialogSession') as UIExtensionContentSession).terminateSelf(); } }); @@ -152,9 +150,7 @@ struct BluetoothSwitchDialog { onDialogClose(): void { LogUtil.info(`${TAG} onDialogClose in`); this.controller?.close(); - let dialogSession: UIExtensionContentSession | undefined = - AppStorage.get('accessibilityDialogSession'); - dialogSession?.terminateSelf(); + (AppStorage.get('accessibilityDialogSession') as UIExtensionContentSession).terminateSelf(); } aboutToAppear(): void { diff --git a/product/phone/src/main/ets/pages/appManagement.ets b/product/phone/src/main/ets/pages/appManagement.ets index 2a855933..5993b467 100644 --- a/product/phone/src/main/ets/pages/appManagement.ets +++ b/product/phone/src/main/ets/pages/appManagement.ets @@ -111,6 +111,8 @@ struct AppManagement { AppStorage.SetOrCreate('appManagementList', []); AppManagementModel.setAppManagementListener(); ResourceUtil.getString($r('app.float.wh_value_80')).then(value => this.whtl = value); + LogUtil.info('settings AppManagement aboutToAppear appList:' + JSON.stringify(this.appList)); + LogUtil.info('settings AppManagement aboutToAppear out'); } diff --git a/product/phone/src/main/module.json5 b/product/phone/src/main/module.json5 index 0878e3c4..61d280f0 100644 --- a/product/phone/src/main/module.json5 +++ b/product/phone/src/main/module.json5 @@ -265,9 +265,6 @@ { "name": "ohos.permission.ACCESS_CERT_MANAGER" }, - { - "name": "ohos.permission.ACCESS_CERT_MANAGER_INTERNAL" - }, { "name": "ohos.permission.MANAGE_USB_CONFIG" } -- Gitee From 4c5760bc7e80cfd50e9d5670dd5e5666228795b3 Mon Sep 17 00:00:00 2001 From: guowei Date: Wed, 20 Aug 2025 17:42:36 +0800 Subject: [PATCH 3/5] =?UTF-8?q?settings=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: guowei --- .../phone/src/main/ets/pages/compatibilityAssessment.ets | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/product/phone/src/main/ets/pages/compatibilityAssessment.ets b/product/phone/src/main/ets/pages/compatibilityAssessment.ets index 1ea7e848..96ed2a09 100644 --- a/product/phone/src/main/ets/pages/compatibilityAssessment.ets +++ b/product/phone/src/main/ets/pages/compatibilityAssessment.ets @@ -40,6 +40,10 @@ struct compatibilityAssessment { .height($r("app.float.wh_value_64")) .width($r("app.float.wh_value_64")) .margin({top: $r("app.float.wh_value_32")}) + .onError((error)=>{ + LogUtil.info(MODULE_TAG + "load image error: " + this.assessmentImage + "code: " + error?.code + + "message: " + error?.message); + }) Text(this.assessmentResult) .fontFamily('HarmonyHeiTi') .fontSize($r("app.float.font_20")) @@ -107,24 +111,28 @@ struct compatibilityAssessment { this.assessmentResult =JSON.parse(JSON.stringify($r("app.string.assessmentQueryFailed"))) this.assessmentImage = '/res/image/assessmentQueryFailed-light.svg' this.assessmentResultText = JSON.parse(JSON.stringify($r("app.string.assessmentQueryFailedText"))) + LogUtil.info(MODULE_TAG + "load image path1: " + this.assessmentImage); }else{ this.assessmentResult =JSON.parse(JSON.stringify($r("app.string.assessmentPassFailed"))) this.assessmentImage = '/res/image/assessmentPassFailed-light.svg' this.assessmentResultText = JSON.parse(JSON.stringify($r("app.string.assessmentPassFailedText"))) } LogUtil.info(MODULE_TAG + "attestResultInfo success"+JSON.stringify(attestResultInfo)); + LogUtil.info(MODULE_TAG + "load image path2: " + this.assessmentImage); }) .catch((error: BusinessError) => { this.assessmentResult =JSON.parse(JSON.stringify($r("app.string.assessmentQueryFailed"))) this.assessmentImage = '/res/image/assessmentQueryFailed-light.svg' this.assessmentResultText = JSON.parse(JSON.stringify($r("app.string.assessmentQueryFailedText"))) LogUtil.info(MODULE_TAG + "assessmentQueryFailed"+error); + LogUtil.info(MODULE_TAG + "load image path3: " + this.assessmentImage); }); }catch (error){ this.assessmentResult =JSON.parse(JSON.stringify($r("app.string.assessmentQueryFailed"))) this.assessmentImage = '/res/image/assessmentQueryFailed-light.svg' this.assessmentResultText = JSON.parse(JSON.stringify($r("app.string.assessmentQueryFailedText"))) LogUtil.info(MODULE_TAG + "assessmentQueryFailed"+error); + LogUtil.info(MODULE_TAG + "load image path4: " + this.assessmentImage); } } -- Gitee From f58be6c708d8c6f4ed9445f59080eba9d0cb06ee Mon Sep 17 00:00:00 2001 From: guowei Date: Wed, 20 Aug 2025 18:04:50 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9api=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: guowei --- build-profile.json5 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build-profile.json5 b/build-profile.json5 index b58430fa..5cdb162d 100644 --- a/build-profile.json5 +++ b/build-profile.json5 @@ -4,9 +4,9 @@ { "name": "default", "signingConfig": "release", - "compileSdkVersion": 20, - "compatibleSdkVersion": 20, - "targetSdkVersion": 20, + "compileSdkVersion": 18, + "compatibleSdkVersion": 18, + "targetSdkVersion": 18, "runtimeOS": "OpenHarmony" } ] -- Gitee From 930f51653b05c4c2bf9791d8e79e0096b57a8c68 Mon Sep 17 00:00:00 2001 From: guowei Date: Thu, 21 Aug 2025 11:42:09 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9sdk=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: guowei --- build-profile.json5 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build-profile.json5 b/build-profile.json5 index 5cdb162d..6594e58b 100644 --- a/build-profile.json5 +++ b/build-profile.json5 @@ -4,9 +4,9 @@ { "name": "default", "signingConfig": "release", - "compileSdkVersion": 18, - "compatibleSdkVersion": 18, - "targetSdkVersion": 18, + "compileSdkVersion": 14, + "compatibleSdkVersion": 14, + "targetSdkVersion": 14, "runtimeOS": "OpenHarmony" } ] -- Gitee