部件名特性名目录名宏名称测试套件名修改 scene_board_ext ——》window_scene_board-window_scene

MBUILD.gn+26-26

	@@ -15,7 +15,7 @@ import("//build/ohos.gni")
15	import("//vendor/openharmony/build/framework/templates/ohos_app.gni")	15	import("//vendor/openharmony/build/framework/templates/ohos_app.gni")
16		16
17	declare_args() {	17	declare_args() {
18	- scene_board_ext_feature_product = "default"	18	+ window_scene_board_feature_product = "default"
19	}	19	}
20		20
21		21
	@@ -31,11 +31,11 @@ ohos_app("SceneBoard_hsp") {
31	certificate_profile = "signature/sceneboard.p7b"	31	certificate_profile = "signature/sceneboard.p7b"
32	module_install_dir = "app/com.ohos.sceneboard"	32	module_install_dir = "app/com.ohos.sceneboard"
33		33
34	- part_name = "scene_board_ext"	34	+ part_name = "window_scene_board"
35	subsystem_name = "window"	35	subsystem_name = "window"
36		36
37	if (defined(sign_hap_py_path)) {	37	if (defined(sign_hap_py_path)) {
38	- certificate_profile = "//vendor/tools/hap_sign_conf/window/scene_board_ext/sceneboard.p7b"	38	+ certificate_profile = "//vendor/tools/hap_sign_conf/window/window_scene_board/sceneboard.p7b"
39	key_alias = "SceneBoard"	39	key_alias = "SceneBoard"
40	private_key_path = "SceneBoard"	40	private_key_path = "SceneBoard"
41	compatible_version = "10"	41	compatible_version = "10"
	@@ -53,15 +53,15 @@ ohos_app("SceneBoard_phone_dt") {
53	build_profile = "build-profile.json5"	53	build_profile = "build-profile.json5"
54	certificate_profile = "signature/sceneboard.p7b"	54	certificate_profile = "signature/sceneboard.p7b"
55	module_install_dir = "app/com.ohos.sceneboard"	55	module_install_dir = "app/com.ohos.sceneboard"
56	- if (scene_board_ext_feature_product == "phone" \|\| scene_board_ext_feature_product == "pad") {	56	+ if (window_scene_board_feature_product == "phone" \|\| window_scene_board_feature_product == "pad") {
57	build_modules = [	57	build_modules = [
58	"phone_sceneboard@ohosTest",	58	"phone_sceneboard@ohosTest",
59	]	59	]
60	}	60	}
61	- part_name = "scene_board_ext"	61	+ part_name = "window_scene_board"
62	subsystem_name = "window"	62	subsystem_name = "window"
63	if (defined(sign_hap_py_path)) {	63	if (defined(sign_hap_py_path)) {
64	- certificate_profile = "//vendor/tools/hap_sign_conf/window/scene_board_ext/sceneboard.p7b"	64	+ certificate_profile = "//vendor/tools/hap_sign_conf/window/window_scene_board/sceneboard.p7b"
65	key_alias = "SceneBoard"	65	key_alias = "SceneBoard"
66	private_key_path = "SceneBoard"	66	private_key_path = "SceneBoard"
67	compatible_version = "10"	67	compatible_version = "10"
	@@ -80,7 +80,7 @@ ohos_app("SceneBoard_app") {
80	build_profile = "build-profile.json5"	80	build_profile = "build-profile.json5"
81	certificate_profile = "signature/sceneboard.p7b"	81	certificate_profile = "signature/sceneboard.p7b"
82	module_install_dir = "app/com.ohos.sceneboard"	82	module_install_dir = "app/com.ohos.sceneboard"
83	- if (scene_board_ext_feature_product == "phone") {	83	+ if (window_scene_board_feature_product == "phone") {
84	build_modules = [	84	build_modules = [
85	"phone_sceneboard",	85	"phone_sceneboard",
86	"default_notificationmanagement",	86	"default_notificationmanagement",
	@@ -88,7 +88,7 @@ ohos_app("SceneBoard_app") {
88	"themeservice_core",	88	"themeservice_core",
89	"themecomponent",	89	"themecomponent",
90	]	90	]
91	- } else if (scene_board_ext_feature_product == "pad") {	91	+ } else if (window_scene_board_feature_product == "pad") {
92	build_modules = [	92	build_modules = [
93	"pad_sceneboard",	93	"pad_sceneboard",
94	"default_notificationmanagement",	94	"default_notificationmanagement",
	@@ -97,7 +97,7 @@ ohos_app("SceneBoard_app") {
97	"themecomponent",	97	"themecomponent",
98	"pcresourcesoverlay",	98	"pcresourcesoverlay",
99	]	99	]
100	- } else if (scene_board_ext_feature_product == "pc") {	100	+ } else if (window_scene_board_feature_product == "pc") {
101	build_modules = [	101	build_modules = [
102	"pc_sceneboard",	102	"pc_sceneboard",
103	"default_notificationmanagement",	103	"default_notificationmanagement",
	@@ -105,7 +105,7 @@ ohos_app("SceneBoard_app") {
105	"themeservice_core",	105	"themeservice_core",
106	"themecomponent",	106	"themecomponent",
107	]	107	]
108	- } else if (scene_board_ext_feature_product == "car") {	108	+ } else if (window_scene_board_feature_product == "car") {
109	build_modules = [	109	build_modules = [
110	"car_sceneboard",	110	"car_sceneboard",
111	]	111	]
	@@ -121,11 +121,11 @@ ohos_app("SceneBoard_app") {
121	]	121	]
122	}	122	}
123		123
124	- part_name = "scene_board_ext"	124	+ part_name = "window_scene_board"
125	subsystem_name = "window"	125	subsystem_name = "window"
126		126
127	if (defined(sign_hap_py_path)) {	127	if (defined(sign_hap_py_path)) {
128	- certificate_profile = "//vendor/tools/hap_sign_conf/window/scene_board_ext/sceneboard.p7b"	128	+ certificate_profile = "//vendor/tools/hap_sign_conf/window/window_scene_board/sceneboard.p7b"
129	key_alias = "SceneBoard"	129	key_alias = "SceneBoard"
130	private_key_path = "SceneBoard"	130	private_key_path = "SceneBoard"
131	compatible_version = "10"	131	compatible_version = "10"
	@@ -139,33 +139,33 @@ action("SceneBoard_rename") {
139	script = "scripts/rename_hap.py"	139	script = "scripts/rename_hap.py"
140	args = [	140	args = [
141	"--path",	141	"--path",
142	- rebase_path("$root_out_dir/obj/foundation/window/scene_board_ext/SceneBoard_app"),	142	+ rebase_path("$root_out_dir/obj/foundation/window/window_scene_board/SceneBoard_app"),
143	"--product",	143	"--product",
144	- scene_board_ext_feature_product,	144	+ window_scene_board_feature_product,
145	]	145	]
146		146
147	- if (scene_board_ext_feature_product == "phone" \|\| scene_board_ext_feature_product == "pad" ) {	147	+ if (window_scene_board_feature_product == "phone" \|\| window_scene_board_feature_product == "pad" ) {
148	outputs = [	148	outputs = [
149	- "$root_out_dir/obj/foundation/window/scene_board_ext/SceneBoard_app/SceneBoard.hap",	149	+ "$root_out_dir/obj/foundation/window/window_scene_board/SceneBoard_app/SceneBoard.hap",
150	- "$root_out_dir/obj/foundation/window/scene_board_ext/SceneBoard_app/SceneBoard_Settings.hap",	150	+ "$root_out_dir/obj/foundation/window/window_scene_board/SceneBoard_app/SceneBoard_Settings.hap",
151	- "$root_out_dir/obj/foundation/window/scene_board_ext/SceneBoard_app/SceneBoard_NotificationManagement.hap",	151	+ "$root_out_dir/obj/foundation/window/window_scene_board/SceneBoard_app/SceneBoard_NotificationManagement.hap",
152	]	152	]
153	- } else if (scene_board_ext_feature_product == "pc") {	153	+ } else if (window_scene_board_feature_product == "pc") {
154	outputs = [	154	outputs = [
155	- "$root_out_dir/obj/foundation/window/scene_board_ext/SceneBoard_app/SceneBoard.hap",	155	+ "$root_out_dir/obj/foundation/window/window_scene_board/SceneBoard_app/SceneBoard.hap",
156	- "$root_out_dir/obj/foundation/window/scene_board_ext/SceneBoard_app/SceneBoard_NotificationManagement.hap",	156	+ "$root_out_dir/obj/foundation/window/window_scene_board/SceneBoard_app/SceneBoard_NotificationManagement.hap",
157	]	157	]
158	- } else if (scene_board_ext_feature_product == "car"){	158	+ } else if (window_scene_board_feature_product == "car"){
159	outputs = [	159	outputs = [
160	- "$root_out_dir/obj/foundation/window/scene_board_ext/SceneBoard_app/SceneBoard.hap",	160	+ "$root_out_dir/obj/foundation/window/window_scene_board/SceneBoard_app/SceneBoard.hap",
161	]	161	]
162	} else {	162	} else {
163	# By default, the compilation product is in the mobile phone form.	163	# By default, the compilation product is in the mobile phone form.
164	# If a new product is launched in the future, the compilation product must be specified.	164	# If a new product is launched in the future, the compilation product must be specified.
165	outputs = [	165	outputs = [
166	- "$root_out_dir/obj/foundation/window/scene_board_ext/SceneBoard_app/SceneBoard.hap",	166	+ "$root_out_dir/obj/foundation/window/window_scene_board/SceneBoard_app/SceneBoard.hap",
167	- "$root_out_dir/obj/foundation/window/scene_board_ext/SceneBoard_app/SceneBoard_Settings.hap",	167	+ "$root_out_dir/obj/foundation/window/window_scene_board/SceneBoard_app/SceneBoard_Settings.hap",
168	- "$root_out_dir/obj/foundation/window/scene_board_ext/SceneBoard_app/SceneBoard_NotificationManagement.hap",	168	+ "$root_out_dir/obj/foundation/window/window_scene_board/SceneBoard_app/SceneBoard_NotificationManagement.hap",
169	]	169	]
170	}	170	}
171	outputs += [ "$target_gen_dir/$target_name.stamp" ]	171	outputs += [ "$target_gen_dir/$target_name.stamp" ]

Mbundle.json+5-5

	@@ -1,20 +1,20 @@
1	{	1	{
2	- "name": "@ohos/scene_board_ext",	2	+ "name": "@ohos/window_scene_board",
3	"description": "SceneBoard",	3	"description": "SceneBoard",
4	"version": "3.1",	4	"version": "3.1",
5	"license": "Apache License 2.0",	5	"license": "Apache License 2.0",
6	"publishAs": "code-segment",	6	"publishAs": "code-segment",
7	"segment": {	7	"segment": {
8	- "destPath": "//foundation/window/scene_board_ext"	8	+ "destPath": "//foundation/window/window_scene_board"
9	},	9	},
10	"dirs": {},	10	"dirs": {},
11	"scripts": {},	11	"scripts": {},
12	"component": {	12	"component": {
13	- "name": "scene_board_ext",	13	+ "name": "window_scene_board",
14	"subsystem": "window",	14	"subsystem": "window",
15	"syscap": [],	15	"syscap": [],
16	"features": [	16	"features": [
17	- "scene_board_ext_feature_product"	17	+ "window_scene_board_feature_product"
18	],	18	],
19	"adapted_system_type": [	19	"adapted_system_type": [
20	"standard"	20	"standard"
	@@ -29,7 +29,7 @@
29	},	29	},
30	"build": {	30	"build": {
31	"sub_component": [	31	"sub_component": [
32	- "//foundation/window/scene_board_ext:SceneBoard"	32	+ "//foundation/window/window_scene_board:SceneBoard"
33	],	33	],
34	"inner_kits": [],	34	"inner_kits": [],
35	"test": []	35	"test": []

Mfeature/foldeffect/src/main/cpp/render/plugin_render.h+2-2

	@@ -13,8 +13,8 @@
13	* limitations under the License.	13	* limitations under the License.
14	*/	14	*/
15		15
16	-#ifndef SCENE_BOARD_EXT_PLUGIN_RENDER_H	16	+#ifndef window_scene_board_PLUGIN_RENDER_H
17	-#define SCENE_BOARD_EXT_PLUGIN_RENDER_H	17	+#define window_scene_board_PLUGIN_RENDER_H
18		18
19	#include "egl_core.h"	19	#include "egl_core.h"
20	#include "napi/native_api.h"	20	#include "napi/native_api.h"

Mfeature/pcmode/src/ohosTest/ets/test/Suite.test.ets+1-1

	@@ -26,7 +26,7 @@ import { SCBFreeWindowsViewModelManagerTest } from './ets/viewmodel/SCBFreeWindo
26	import { SCBSystemSceneUtilsTest } from './ets/utils/SCBSystemSceneUtilsTest.test';	26	import { SCBSystemSceneUtilsTest } from './ets/utils/SCBSystemSceneUtilsTest.test';
27		27
28	export default function PipelineDemoSuite() {	28	export default function PipelineDemoSuite() {
29	- describe("scene_board_ext", () => {	29	+ describe("window_scene_board", () => {
30	InstanceTest();	30	InstanceTest();
31	UtilsTest();	31	UtilsTest();
32	ViewModelTest();	32	ViewModelTest();

Mpackage.json+1-1

	@@ -1,5 +1,5 @@
1	{	1	{
2	- "name": "scene_board_ext",	2	+ "name": "window_scene_board",
3	"version": "1.0.0",	3	"version": "1.0.0",
4	"scripts": {	4	"scripts": {
5	"build": "node scripts/Build.js",	5	"build": "node scripts/Build.js",

Mproduct/phonebase/src/main/ets/SceneBoard/keyboard/SCBKeyboardPanel.ets+0-6

	@@ -42,12 +42,6 @@ import { SCBKeyboardDialog } from './SCBKeyboardDialog';
42	import { FoldExpandAnimUtils, FoldAnimationConstants } from '@ohos/launchercommon/Index';	42	import { FoldExpandAnimUtils, FoldAnimationConstants } from '@ohos/launchercommon/Index';
43	import { uiEffect } from '@kit.ArkGraphics2D';	43	import { uiEffect } from '@kit.ArkGraphics2D';
44	import lazy { SectorComponent } from './SectorComponent';	44	import lazy { SectorComponent } from './SectorComponent';
45	-import {
46	- // HdsVisualComponent,
47	- // HdsSceneController,
48	- // HdsSceneType,
49	- // hdsEffect
50	-} from '@kit.UIDesignKit';
51		45
52	const TAG: string = 'SCBIMFKeyboardPanel';	46	const TAG: string = 'SCBIMFKeyboardPanel';
53	const log = LogHelper.getLogHelper(LogDomain.WINDOW, TAG);	47	const log = LogHelper.getLogHelper(LogDomain.WINDOW, TAG);

Mstaticcommon/basecommon/windowscene/src/ohosTest/ets/test/Suite.test.ets+1-1

	@@ -128,7 +128,7 @@ export default function PipelineDemoSuite() {
128	SCBSceneContainerSessionArrayTest();	128	SCBSceneContainerSessionArrayTest();
129	});	129	});
130		130
131	- describe("scene_board_ext", () => {	131	+ describe("window_scene_board", () => {
132	SCBSceneContainerSessionTest();	132	SCBSceneContainerSessionTest();
133	SCBSceneContainerSessionTest2();	133	SCBSceneContainerSessionTest2();
134	SCBSceneInfoTest();	134	SCBSceneInfoTest();