diff --git a/build-profile.json5 b/build-profile.json5 index b58430fa284b234f9e348748ce82568cf3c735a6..6594e58bb73992a52105fc9fb7d40af7fb5bef11 100644 --- a/build-profile.json5 +++ b/build-profile.json5 @@ -4,9 +4,9 @@ { "name": "default", "signingConfig": "release", - "compileSdkVersion": 20, - "compatibleSdkVersion": 20, - "targetSdkVersion": 20, + "compileSdkVersion": 14, + "compatibleSdkVersion": 14, + "targetSdkVersion": 14, "runtimeOS": "OpenHarmony" } ] diff --git a/product/phone/src/main/ets/controller/bluetooth/BluetoothDeviceController.ts b/product/phone/src/main/ets/controller/bluetooth/BluetoothDeviceController.ts index ef5720b626656d532472276a044af558470d83e2..a395ce3d9530e023534549cf08814013a802af6e 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 154c6f89e028c6a102ddfc9f6627ab28cfa8cc7c..f6fba57528236cbc36c285dae6294478c01d1fef 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 7737782da8ab79e8429b69e9c16f91edf081a3f6..3bcb6e14efb9550923c0ed5cc76fc1b259a8e83f 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 1fcc5fc1a8719d6a010936805d50828a1b117c30..70c201a10d6cc33fa92da247369129801d98a360 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 2a855933ef5d8881aee2b487d93e377ba19fb552..5993b4671dbf31732af6e224a338f7c507af092f 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/ets/pages/compatibilityAssessment.ets b/product/phone/src/main/ets/pages/compatibilityAssessment.ets index 1ea7e8486814b5bab5180db2f8ead1889b0c3917..96ed2a091992276b7198aeac7a0e20c111c19dcb 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); } }