From 028bffb769414b26ba76a287e2aa3f65c1bf673f Mon Sep 17 00:00:00 2001 From: sunhaiyang Date: Fri, 28 Apr 2023 18:11:25 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8C=85=E5=90=8D=E4=BF=AE=E6=94=B9=E4=B8=BAsc?= =?UTF-8?q?eneboard?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AppScope/app.json5 | 2 +- AppScope/resources/base/element/string.json | 2 +- build-profile.json5 | 6 +++--- .../ets/default/configs/SystemApplication.ts | 2 +- .../ets/default/constants/CommonConstants.ts | 10 +++++----- common/src/main/module.json5 | 2 +- feature/settings/build-profile.json5 | 2 +- feature/settings/src/main/module.json5 | 4 ++-- .../model/NotificationDistributionManager.ts | 2 +- .../noticeItem/view/item/settingDialog.ets | 2 +- .../build-profile.json5 | 2 +- package.json | 2 +- product/pad/package.json | 2 +- product/pad/src/main/module.json5 | 6 +++--- .../main/resources/base/element/string.json | 2 +- .../main/resources/en_US/element/string.json | 2 +- .../main/resources/zh_CN/element/string.json | 2 +- product/phone/package.json | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/SceneBoard/SCBScreen.ets | 2 +- .../SceneBoard/dropdownpanel/notification.ets | 2 +- product/phone/src/main/module.json5 | 6 +++--- .../main/resources/base/element/string.json | 2 +- .../main/resources/en_US/element/string.json | 2 +- .../main/resources/zh_CN/element/string.json | 2 +- signature/{launcher.p7b => sceneboard.p7b} | Bin 3950 -> 3952 bytes 26 files changed, 36 insertions(+), 36 deletions(-) rename signature/{launcher.p7b => sceneboard.p7b} (75%) diff --git a/AppScope/app.json5 b/AppScope/app.json5 index df6d54c9..9e63c6ee 100644 --- a/AppScope/app.json5 +++ b/AppScope/app.json5 @@ -1,6 +1,6 @@ { "app": { - "bundleName": "com.ohos.launcher", + "bundleName": "com.ohos.sceneboard", "vendor": "ohos", "versionCode": 1000000, "versionName": "1.0.0", diff --git a/AppScope/resources/base/element/string.json b/AppScope/resources/base/element/string.json index 4131987c..63d7a29c 100644 --- a/AppScope/resources/base/element/string.json +++ b/AppScope/resources/base/element/string.json @@ -2,7 +2,7 @@ "string": [ { "name": "app_name", - "value": "Launcher" + "value": "SceneBoard" } ] } diff --git a/build-profile.json5 b/build-profile.json5 index f55d2746..0de1d1d1 100644 --- a/build-profile.json5 +++ b/build-profile.json5 @@ -10,7 +10,7 @@ }, "modules": [ { - "name": "launcher_common", + "name": "sceneboard_common", "srcPath": "./common", "targets": [ { @@ -118,7 +118,7 @@ ], }, { - "name": "phone-launcher", + "name": "phone-sceneboard", "srcPath": "./product/phone", "targets": [ { @@ -130,7 +130,7 @@ ], }, { - "name": "pad-launcher", + "name": "pad-sceneboard", "srcPath": "./product/pad", "targets": [ { diff --git a/common/src/main/ets/default/configs/SystemApplication.ts b/common/src/main/ets/default/configs/SystemApplication.ts index d2519002..79733019 100644 --- a/common/src/main/ets/default/configs/SystemApplication.ts +++ b/common/src/main/ets/default/configs/SystemApplication.ts @@ -14,7 +14,7 @@ */ const SystemApplication = { - SystemApplicationName: 'com.ohos.launcher,com.ohos.systemui,com.ohos.devicemanagerui,com.ohos.callui,com.example.kikakeyboard,com.ohos.contactdataability,com.ohos.telephonydataability,com.ohos.medialibrary.MediaLibraryDataA,com.ohos.medialibrary.MediaScannerAbilityA,com.ohos.adminprovisioning' + SystemApplicationName: 'com.ohos.sceneboard,com.ohos.launcher,com.ohos.systemui,com.ohos.devicemanagerui,com.ohos.callui,com.example.kikakeyboard,com.ohos.contactdataability,com.ohos.telephonydataability,com.ohos.medialibrary.MediaLibraryDataA,com.ohos.medialibrary.MediaScannerAbilityA,com.ohos.adminprovisioning' }; export default SystemApplication; \ No newline at end of file diff --git a/common/src/main/ets/default/constants/CommonConstants.ts b/common/src/main/ets/default/constants/CommonConstants.ts index 0a4b0464..c589f75f 100644 --- a/common/src/main/ets/default/constants/CommonConstants.ts +++ b/common/src/main/ets/default/constants/CommonConstants.ts @@ -26,7 +26,7 @@ export class CommonConstants { /** * Bundle name of launcher */ - static LAUNCHER_BUNDLE = 'com.ohos.launcher'; + static LAUNCHER_BUNDLE = 'com.ohos.sceneboard'; /** * Module name of AppCenter. @@ -36,12 +36,12 @@ export class CommonConstants { /** * Ability name of AppCenter. */ - static APPCENTER_ABILITY = 'com.ohos.launcher.appcenter.MainAbility'; + static APPCENTER_ABILITY = 'com.ohos.sceneboard.appcenter.MainAbility'; /** * Ability name of launcher settings. */ - static SETTING_ABILITY = 'com.ohos.launcher.settings.MainAbility'; + static SETTING_ABILITY = 'com.ohos.sceneboard.settings.MainAbility'; /** * Module name of launcher settings. @@ -51,12 +51,12 @@ export class CommonConstants { /** * Ability name of launcher Recents. */ - static RECENT_ABILITY = 'com.ohos.launcher.recents.MainAbility'; + static RECENT_ABILITY = 'com.ohos.sceneboard.recents.MainAbility'; /** * Launcher Ability name. */ - static LAUNCHER_ABILITY = 'com.ohos.launcher.MainAbility'; + static LAUNCHER_ABILITY = 'com.ohos.sceneboard.MainAbility'; /** * Default invalid value. diff --git a/common/src/main/module.json5 b/common/src/main/module.json5 index 37b01840..525b9ad4 100644 --- a/common/src/main/module.json5 +++ b/common/src/main/module.json5 @@ -1,6 +1,6 @@ { "module": { - "name": "launcher_common", + "name": "sceneboard_common", "type": "har", "deviceTypes": [ "default", diff --git a/feature/settings/build-profile.json5 b/feature/settings/build-profile.json5 index 06fa1ec6..accb9e5b 100644 --- a/feature/settings/build-profile.json5 +++ b/feature/settings/build-profile.json5 @@ -7,5 +7,5 @@ "name": "default", } ], - "entryModules": ["pad-launcher","phone-launcher"] + "entryModules": ["pad-sceneboard","phone-sceneboard"] } \ No newline at end of file diff --git a/feature/settings/src/main/module.json5 b/feature/settings/src/main/module.json5 index fbf4c62a..4485c39b 100644 --- a/feature/settings/src/main/module.json5 +++ b/feature/settings/src/main/module.json5 @@ -4,7 +4,7 @@ "type": "feature", "srcEntrance": "./ets/Application/AbilityStage.ts", "description": "$string:mainability_description", - "mainElement": "com.ohos.launcher.settings.MainAbility", + "mainElement": "com.ohos.sceneboard.settings.MainAbility", "deviceTypes": [ "default", "tablet" @@ -21,7 +21,7 @@ "uiSyntax": "ets", "abilities": [ { - "name": "com.ohos.launcher.settings.MainAbility", + "name": "com.ohos.sceneboard.settings.MainAbility", "srcEntrance": "./ets/MainAbility/MainAbility.ts", "startWindowIcon": "$media:startWindowIcon", "startWindowBackground": "$color:startWindowBackground", diff --git a/feature/systemui/noticeitem/src/main/ets/com/ohos/noticeItem/model/NotificationDistributionManager.ts b/feature/systemui/noticeitem/src/main/ets/com/ohos/noticeItem/model/NotificationDistributionManager.ts index beac9b13..83e7e3cd 100644 --- a/feature/systemui/noticeitem/src/main/ets/com/ohos/noticeItem/model/NotificationDistributionManager.ts +++ b/feature/systemui/noticeitem/src/main/ets/com/ohos/noticeItem/model/NotificationDistributionManager.ts @@ -41,7 +41,7 @@ export default class NotificationDistributionManager { initDeviceManager(): void { Log.showInfo(TAG, 'initDeviceManager'); - DeviceManager.createDeviceManager('com.ohos.launcher', (err, data) => { + DeviceManager.createDeviceManager('com.ohos.sceneboard', (err, data) => { Log.showInfo(TAG, `initDeviceManager createDeviceManager err:${JSON.stringify(err)} data:${JSON.stringify(data)}`); if (data) { this.deviceManager = data; diff --git a/feature/systemui/noticeitem/src/main/ets/com/ohos/noticeItem/view/item/settingDialog.ets b/feature/systemui/noticeitem/src/main/ets/com/ohos/noticeItem/view/item/settingDialog.ets index a200e0e8..b554469a 100644 --- a/feature/systemui/noticeitem/src/main/ets/com/ohos/noticeItem/view/item/settingDialog.ets +++ b/feature/systemui/noticeitem/src/main/ets/com/ohos/noticeItem/view/item/settingDialog.ets @@ -124,7 +124,7 @@ export default struct SettingDialog { openAbility() { Log.showInfo(TAG, ` openAbility:showNotificationManagement`); - EventManager.publish(obtainStartAbility('com.ohos.launcher', 'com.ohos.sceneboard.notificationmanagement.MainAbility', + EventManager.publish(obtainStartAbility('com.ohos.sceneboard', 'com.ohos.sceneboard.notificationmanagement.MainAbility', { 'migrateUri': 'pages/setEnable', 'migrateBundle': this.itemData.bundleName })) this.closeAbility() } diff --git a/feature/systemui/notificationmanagement/build-profile.json5 b/feature/systemui/notificationmanagement/build-profile.json5 index 5f5cd5aa..451c3df7 100644 --- a/feature/systemui/notificationmanagement/build-profile.json5 +++ b/feature/systemui/notificationmanagement/build-profile.json5 @@ -5,5 +5,5 @@ "name": "default", } ], - "entryModules": ["pad-launcher","phone-launcher"] + "entryModules": ["pad-sceneboard","phone-sceneboard"] } \ No newline at end of file diff --git a/package.json b/package.json index 47de8136..0c7ecff5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "devDependencies": {}, - "name": "launcher", + "name": "sceneboard", "ohos": { "org": "huawei", "directoryLevel": "project", diff --git a/product/pad/package.json b/product/pad/package.json index 36dbac1e..7375e9d5 100644 --- a/product/pad/package.json +++ b/product/pad/package.json @@ -1,6 +1,6 @@ { "devDependencies": {}, - "name": "launcher", + "name": "sceneboard", "ohos": { "org": "huawei", "directoryLevel": "module", diff --git a/product/pad/src/main/module.json5 b/product/pad/src/main/module.json5 index 1d8b1a17..8ca50388 100644 --- a/product/pad/src/main/module.json5 +++ b/product/pad/src/main/module.json5 @@ -1,10 +1,10 @@ { "module": { - "name": "pad-launcher", + "name": "pad-sceneboard", "type": "entry", "srcEntrance": "./ets/Application/AbilityStage.ts", "description": "$string:mainability_description", - "mainElement": "com.ohos.launcher.MainAbility", + "mainElement": "com.ohos.sceneboard.MainAbility", "deviceTypes": [ "default", "tablet" @@ -36,7 +36,7 @@ } ], "visible": false, - "name": "com.ohos.launcher.MainAbility", + "name": "com.ohos.sceneboard.MainAbility", "icon": "$media:icon", "description": "$string:mainability_description", "label": "$string:entry_MainAbility", diff --git a/product/pad/src/main/resources/base/element/string.json b/product/pad/src/main/resources/base/element/string.json index 04bfac4e..c09d536a 100644 --- a/product/pad/src/main/resources/base/element/string.json +++ b/product/pad/src/main/resources/base/element/string.json @@ -2,7 +2,7 @@ "string": [ { "name": "entry_MainAbility", - "value": "Launcher" + "value": "SceneBoard" }, { "name": "mainability_description", diff --git a/product/pad/src/main/resources/en_US/element/string.json b/product/pad/src/main/resources/en_US/element/string.json index 08ad7856..abbf6a9f 100644 --- a/product/pad/src/main/resources/en_US/element/string.json +++ b/product/pad/src/main/resources/en_US/element/string.json @@ -2,7 +2,7 @@ "string": [ { "name": "entry_MainAbility", - "value": "Launcher" + "value": "SceneBoard" }, { "name": "mainability_description", diff --git a/product/pad/src/main/resources/zh_CN/element/string.json b/product/pad/src/main/resources/zh_CN/element/string.json index 7d3690d0..e15bc971 100644 --- a/product/pad/src/main/resources/zh_CN/element/string.json +++ b/product/pad/src/main/resources/zh_CN/element/string.json @@ -2,7 +2,7 @@ "string": [ { "name": "entry_MainAbility", - "value": "Launcher" + "value": "SceneBoard" }, { "name": "mainability_description", diff --git a/product/phone/package.json b/product/phone/package.json index a86f43aa..366cf2ce 100644 --- a/product/phone/package.json +++ b/product/phone/package.json @@ -1,6 +1,6 @@ { "devDependencies": {}, - "name": "launcher", + "name": "sceneboard", "ohos": { "org": "huawei", "directoryLevel": "module", diff --git a/product/phone/src/main/ets/MainAbility/MainAbility.ts b/product/phone/src/main/ets/MainAbility/MainAbility.ts index db5623d0..7a1c9977 100644 --- a/product/phone/src/main/ets/MainAbility/MainAbility.ts +++ b/product/phone/src/main/ets/MainAbility/MainAbility.ts @@ -33,7 +33,7 @@ import ScreenLockManager from '@ohos/common/src/main/ets/default/manager/ScreenL import ServiceExtensionContext from 'application/ServiceExtensionContext'; import TimeManager from '@ohos/common/src/main/ets/default/manager/TimeManager'; -const TAG = 'LauncherMainAbility'; +const TAG = 'SceneBoardMainAbility'; export default class MainAbility extends ServiceExtensionAbility { onCreate(want: Want): void { diff --git a/product/phone/src/main/ets/SceneBoard/SCBScreen.ets b/product/phone/src/main/ets/SceneBoard/SCBScreen.ets index ef8ac91b..85c78061 100644 --- a/product/phone/src/main/ets/SceneBoard/SCBScreen.ets +++ b/product/phone/src/main/ets/SceneBoard/SCBScreen.ets @@ -32,7 +32,7 @@ import WindowPanelManager, { SystemUi_VolumePanel } from '@ohos/common/src/main/ets/default/manager/WindowPanelManager'; -const MODULE_NAME = "phone-launcher"; +const MODULE_NAME = "phone-sceneboard"; const TAG = 'SCBScreen'; @Component diff --git a/product/phone/src/main/ets/SceneBoard/dropdownpanel/notification.ets b/product/phone/src/main/ets/SceneBoard/dropdownpanel/notification.ets index 2cbb0516..af0f8c79 100644 --- a/product/phone/src/main/ets/SceneBoard/dropdownpanel/notification.ets +++ b/product/phone/src/main/ets/SceneBoard/dropdownpanel/notification.ets @@ -269,7 +269,7 @@ struct CenterTitle { settingClick() { Log.showDebug(TAG, ` settingClick `) // TODO 修改为合一服务的Ability - EventManager.publish(obtainStartAbility('com.ohos.launcher', 'com.ohos.sceneboard.notificationmanagement.MainAbility')) + EventManager.publish(obtainStartAbility('com.ohos.sceneboard', 'com.ohos.sceneboard.notificationmanagement.MainAbility')) } touchEvent(event: TouchEvent) { diff --git a/product/phone/src/main/module.json5 b/product/phone/src/main/module.json5 index 2b0272b9..2539e7d5 100644 --- a/product/phone/src/main/module.json5 +++ b/product/phone/src/main/module.json5 @@ -1,10 +1,10 @@ { "module": { - "name": "phone-launcher", + "name": "phone-sceneboard", "type": "entry", "srcEntrance": "./ets/Application/AbilityStage.ts", "description": "$string:mainability_description", - "mainElement": "com.ohos.launcher.MainAbility", + "mainElement": "com.ohos.sceneboard.MainAbility", "deviceTypes": [ "default", "tablet" @@ -36,7 +36,7 @@ } ], "visible": true, - "name": "com.ohos.launcher.MainAbility", + "name": "com.ohos.sceneboard.MainAbility", "icon": "$media:icon", "description": "$string:mainability_description", "label": "$string:entry_MainAbility", diff --git a/product/phone/src/main/resources/base/element/string.json b/product/phone/src/main/resources/base/element/string.json index 97bf4ff9..7aac3ae6 100644 --- a/product/phone/src/main/resources/base/element/string.json +++ b/product/phone/src/main/resources/base/element/string.json @@ -2,7 +2,7 @@ "string": [ { "name": "entry_MainAbility", - "value": "Launcher" + "value": "SceneBoard" }, { "name": "mainability_description", diff --git a/product/phone/src/main/resources/en_US/element/string.json b/product/phone/src/main/resources/en_US/element/string.json index f23e17e1..64d41586 100644 --- a/product/phone/src/main/resources/en_US/element/string.json +++ b/product/phone/src/main/resources/en_US/element/string.json @@ -2,7 +2,7 @@ "string": [ { "name": "entry_MainAbility", - "value": "Launcher" + "value": "SceneBoard" }, { "name": "mainability_description", diff --git a/product/phone/src/main/resources/zh_CN/element/string.json b/product/phone/src/main/resources/zh_CN/element/string.json index 97f01352..caaaebe1 100644 --- a/product/phone/src/main/resources/zh_CN/element/string.json +++ b/product/phone/src/main/resources/zh_CN/element/string.json @@ -2,7 +2,7 @@ "string": [ { "name": "entry_MainAbility", - "value": "Launcher" + "value": "SceneBoard" }, { "name": "mainability_description", diff --git a/signature/launcher.p7b b/signature/sceneboard.p7b similarity index 75% rename from signature/launcher.p7b rename to signature/sceneboard.p7b index eebe2f01476ce27c35b7861253daf005221e311a..d81e1dd5a7b2d90178a966b40a7577ba7b7d921f 100644 GIT binary patch delta 234 zcmaDS_d(9Vpou?+jZ>@5qwPB{BRkWACjMBUP$Uy0qam*WHydX{n+IbmGYb==K@&SK zLLuXVCboYpO>Dn5Iux^T6(^_Wr6%Pk7Nu<7&7#6pZ)9O$ZenR{7GDzY1dcHpNd7)gDM&&ZaD{-?vY@L+1P|kphjRWYIbG9tZOf2pOu1tyy z&DDiZ-U@SX6x0l`DqEpx9s2Br)->m?S=^~pz4rgqd(5O@7Ni;%yZP%o7TJpYZx`k) X5?B`KkaosJj+5p5D)F6btX}{CBf?PX delta 232 zcmew$_fF2ipou?=jZ>@5qwPB{BRkWACjMxkP&gAKqam*WHydX{n+IbmGYb==K@&TW z3scCrpo#4dOB36VjSj^u965=ldC3{6MVt4ssBqOA0)eTasdDPX2=jicC||J!PK(}Ou$ZEtOyvVy~ai;V+l!#P_PW+oPQ16L*m)yIW9 z8=0Oj{=1^6j8xcth!t#LW)&h-M4 Um)P<+_Hooo{5VnaZM)QR0184=umAu6 -- Gitee