From 63ce2d5cf238ea00061decf10df348967df035bc Mon Sep 17 00:00:00 2001 From: dy_study Date: Mon, 15 May 2023 09:19:19 +0000 Subject: [PATCH] Update deviceType acquisition method. Signed-off-by: dy_study Change-Id: I0cc462ed77b63e4c1034472a494aa236da6885fd --- services/abilitymgr/src/ability_manager_service.cpp | 3 +-- services/abilitymgr/src/implicit_start_processor.cpp | 4 +++- .../ServiceExtAbility/JumpInterceptorServiceExtAbility.ts | 3 +-- .../ets/ServiceExtAbility/SelectorServiceExtAbility.ts | 7 +++---- .../main/ets/ServiceExtAbility/TipsServiceExtAbility.ts | 3 +-- 5 files changed, 9 insertions(+), 11 deletions(-) diff --git a/services/abilitymgr/src/ability_manager_service.cpp b/services/abilitymgr/src/ability_manager_service.cpp index d24ac26352..918d90e85e 100644 --- a/services/abilitymgr/src/ability_manager_service.cpp +++ b/services/abilitymgr/src/ability_manager_service.cpp @@ -300,8 +300,7 @@ bool AbilityManagerService::Init() } #endif #ifdef SUPPORT_GRAPHICS - DelayedSingleton::GetInstance()->SetDeviceType( - AmsConfigurationParameter::GetInstance().GetDeviceType()); + DelayedSingleton::GetInstance()->SetDeviceType(OHOS::system::GetDeviceType()); implicitStartProcessor_ = std::make_shared(); #endif diff --git a/services/abilitymgr/src/implicit_start_processor.cpp b/services/abilitymgr/src/implicit_start_processor.cpp index 53f05d8a9f..1a4c80b86b 100644 --- a/services/abilitymgr/src/implicit_start_processor.cpp +++ b/services/abilitymgr/src/implicit_start_processor.cpp @@ -23,6 +23,7 @@ #include "event_report.h" #include "hilog_wrapper.h" #include "in_process_call_wrapper.h" +#include "parameters.h" #include "want.h" namespace OHOS { @@ -69,7 +70,8 @@ int ImplicitStartProcessor::ImplicitStartAbility(AbilityRequest &request, int32_ CHECK_POINTER_AND_RETURN(sysDialogScheduler, ERR_INVALID_VALUE); std::vector dialogAppInfos; - auto deviceType = sysDialogScheduler->GetDeviceType(); + auto deviceType = OHOS::system::GetDeviceType(); + HILOG_DEBUG("deviceType is %{public}s", deviceType.c_str()); auto ret = GenerateAbilityRequestByAction(userId, request, dialogAppInfos, deviceType, false); if (ret != ERR_OK) { HILOG_ERROR("generate ability request by action failed."); diff --git a/services/dialog_ui/ams_system_dialog/entry/src/main/ets/ServiceExtAbility/JumpInterceptorServiceExtAbility.ts b/services/dialog_ui/ams_system_dialog/entry/src/main/ets/ServiceExtAbility/JumpInterceptorServiceExtAbility.ts index b340dbd908..c50aab5f2e 100644 --- a/services/dialog_ui/ams_system_dialog/entry/src/main/ets/ServiceExtAbility/JumpInterceptorServiceExtAbility.ts +++ b/services/dialog_ui/ams_system_dialog/entry/src/main/ets/ServiceExtAbility/JumpInterceptorServiceExtAbility.ts @@ -13,7 +13,6 @@ * limitations under the License. */ -import deviceInfo from '@ohos.deviceInfo'; import display from '@ohos.display'; import extension from '@ohos.app.ability.ServiceExtensionAbility'; import window from '@ohos.window'; @@ -50,7 +49,7 @@ export default class JumpInterceptorServiceExtAbility extends extension { win.destroy(); winNum--; } - if (deviceInfo.deviceType === 'phone') { + if (globalThis.params.deviceType === 'phone' || globalThis.params.deviceType === 'default') { this.createWindow('JumpInterceptorDialog' + startId, window.WindowType.TYPE_SYSTEM_ALERT, navigationBarRect); } else { this.createWindow('JumpInterceptorDialog' + startId, window.WindowType.TYPE_FLOAT, navigationBarRect); diff --git a/services/dialog_ui/ams_system_dialog/entry/src/main/ets/ServiceExtAbility/SelectorServiceExtAbility.ts b/services/dialog_ui/ams_system_dialog/entry/src/main/ets/ServiceExtAbility/SelectorServiceExtAbility.ts index b10561d457..fef3ec6564 100644 --- a/services/dialog_ui/ams_system_dialog/entry/src/main/ets/ServiceExtAbility/SelectorServiceExtAbility.ts +++ b/services/dialog_ui/ams_system_dialog/entry/src/main/ets/ServiceExtAbility/SelectorServiceExtAbility.ts @@ -16,7 +16,6 @@ import extension from '@ohos.app.ability.ServiceExtensionAbility'; import window from '@ohos.window'; import display from '@ohos.display'; -import deviceInfo from '@ohos.deviceInfo'; import defaultAppManager from '@ohos.bundle.defaultAppManager'; import bundleManager from '@ohos.bundle.bundleManager'; @@ -104,7 +103,7 @@ export default class SelectorServiceExtensionAbility extends extension { globalThis.modelFlag = Boolean(globalThis.params.modelFlag); globalThis.action = Boolean(globalThis.params.action); } - if (globalThis.params.deviceType === 'phone') { + if (globalThis.params.deviceType === 'phone' || globalThis.params.deviceType === 'default') { await this.getPhoneShowHapList(); } else { await this.getPcShowHapList(); @@ -121,7 +120,7 @@ export default class SelectorServiceExtensionAbility extends extension { win.destroy(); winNum--; } - if (deviceInfo.deviceType === 'phone') { + if (globalThis.params.deviceType === 'phone' || globalThis.params.deviceType === 'default') { this.createWindow('SelectorDialog' + startId, window.WindowType.TYPE_SYSTEM_ALERT, navigationBarRect); } else { console.debug(TAG, 'onRequest, params: ' + JSON.stringify(globalThis.params)); @@ -148,7 +147,7 @@ export default class SelectorServiceExtensionAbility extends extension { }); await win.moveTo(rect.left, rect.top); await win.resetSize(rect.width, rect.height); - if (globalThis.params.deviceType == 'phone') { + if (globalThis.params.deviceType === 'phone' || globalThis.params.deviceType === 'default') { await win.loadContent('pages/selectorPhoneDialog'); } else { await win.loadContent('pages/selectorPcDialog'); diff --git a/services/dialog_ui/ams_system_dialog/entry/src/main/ets/ServiceExtAbility/TipsServiceExtAbility.ts b/services/dialog_ui/ams_system_dialog/entry/src/main/ets/ServiceExtAbility/TipsServiceExtAbility.ts index 7ec908c777..3fa73901fa 100644 --- a/services/dialog_ui/ams_system_dialog/entry/src/main/ets/ServiceExtAbility/TipsServiceExtAbility.ts +++ b/services/dialog_ui/ams_system_dialog/entry/src/main/ets/ServiceExtAbility/TipsServiceExtAbility.ts @@ -16,7 +16,6 @@ import extension from '@ohos.app.ability.ServiceExtensionAbility'; import window from '@ohos.window'; import display from '@ohos.display'; -import deviceInfo from '@ohos.deviceInfo'; const TAG = 'TipsDialog_Service'; @@ -47,7 +46,7 @@ export default class TipsServiceExtensionAbility extends extension { win.destroy(); winNum--; } - if (deviceInfo.deviceType === 'phone') { + if (globalThis.params.deviceType === 'phone' || globalThis.params.deviceType === 'default') { this.createWindow('TipsDialog' + startId, window.WindowType.TYPE_SYSTEM_ALERT, navigationBarRect); } else { this.createWindow('TipsDialog' + startId, window.WindowType.TYPE_DIALOG, navigationBarRect);