From 220070c4a827ca65efb3cb8f6b96406dcfc22f36 Mon Sep 17 00:00:00 2001
From: hu0475 <huyanqiang5@huawei.com>
Date: Thu, 13 Jul 2023 19:14:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90graphic=E5=AD=90=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9FDisplay=E6=A8=A1=E5=9D=97=E7=9A=84=E8=B7=A8=E5=B9=B3?=
 =?UTF-8?q?=E5=8F=B0=E6=B5=8B=E8=AF=95=E5=A5=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: hu0475 <huyanqiang5@huawei.com>
---
 graphic/BUILD.gn                                         | 2 +-
 graphic/crossplatform/.idea/.gitignore                   | 3 ---
 graphic/crossplatform/.idea/crossplatform.iml            | 9 ---------
 .../.idea/libraries/arkui_android_adapter.xml            | 9 ---------
 .../.idea/libraries/arkui_android_adapter1.xml           | 9 ---------
 .../.idea/libraries/arkui_android_adapter2.xml           | 9 ---------
 .../.idea/libraries/arkui_android_adapter3.xml           | 9 ---------
 .../.idea/libraries/arkui_android_adapter4.xml           | 9 ---------
 .../.idea/libraries/arkui_android_adapter5.xml           | 9 ---------
 graphic/crossplatform/.idea/misc.xml                     | 6 ------
 graphic/crossplatform/.idea/modules.xml                  | 8 --------
 graphic/crossplatform/.idea/vcs.xml                      | 6 ------
 graphic/crossplatform/BUILD.gn                           | 4 +---
 graphic/crossplatform/graphicDisplayetstest/BUILD.gn     | 6 +++++-
 14 files changed, 7 insertions(+), 91 deletions(-)
 delete mode 100644 graphic/crossplatform/.idea/.gitignore
 delete mode 100644 graphic/crossplatform/.idea/crossplatform.iml
 delete mode 100644 graphic/crossplatform/.idea/libraries/arkui_android_adapter.xml
 delete mode 100644 graphic/crossplatform/.idea/libraries/arkui_android_adapter1.xml
 delete mode 100644 graphic/crossplatform/.idea/libraries/arkui_android_adapter2.xml
 delete mode 100644 graphic/crossplatform/.idea/libraries/arkui_android_adapter3.xml
 delete mode 100644 graphic/crossplatform/.idea/libraries/arkui_android_adapter4.xml
 delete mode 100644 graphic/crossplatform/.idea/libraries/arkui_android_adapter5.xml
 delete mode 100644 graphic/crossplatform/.idea/misc.xml
 delete mode 100644 graphic/crossplatform/.idea/modules.xml
 delete mode 100644 graphic/crossplatform/.idea/vcs.xml

diff --git a/graphic/BUILD.gn b/graphic/BUILD.gn
index a7dccb27a..df3180a9a 100755
--- a/graphic/BUILD.gn
+++ b/graphic/BUILD.gn
@@ -16,6 +16,7 @@ group("graphic") {
   testonly = true
   if (is_standard_system) {
     deps = [
+      "crossplatform:crossplatform",
       "effectKit:EffectKitTest",
       "graphicColorSpace:ActsColorSpaceManagerTest",
       "graphicnapidrawingtest:ActsGraphicNapiDrawingTest",
@@ -23,7 +24,6 @@ group("graphic") {
       "webGL:webGL_hap_test",
       "windowStage:ActsWindowStageTest",
       "windowstandard:window_hap_test",
-      "crossplatform:crossplatform",
     ]
     if (!(product_name == "ohcore")) {
       deps += [ "vkgl:cpvkgl" ]
diff --git a/graphic/crossplatform/.idea/.gitignore b/graphic/crossplatform/.idea/.gitignore
deleted file mode 100644
index 26d33521a..000000000
--- a/graphic/crossplatform/.idea/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
diff --git a/graphic/crossplatform/.idea/crossplatform.iml b/graphic/crossplatform/.idea/crossplatform.iml
deleted file mode 100644
index d6ebd4805..000000000
--- a/graphic/crossplatform/.idea/crossplatform.iml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/graphic/crossplatform/.idea/libraries/arkui_android_adapter.xml b/graphic/crossplatform/.idea/libraries/arkui_android_adapter.xml
deleted file mode 100644
index 34c36371a..000000000
--- a/graphic/crossplatform/.idea/libraries/arkui_android_adapter.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<component name="libraryTable">
-  <library name="arkui_android_adapter">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/commonlibraryListetstest/src/main/libs/arkui_android_adapter.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/graphic/crossplatform/.idea/libraries/arkui_android_adapter1.xml b/graphic/crossplatform/.idea/libraries/arkui_android_adapter1.xml
deleted file mode 100644
index 53ec233c8..000000000
--- a/graphic/crossplatform/.idea/libraries/arkui_android_adapter1.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<component name="libraryTable">
-  <library name="arkui_android_adapter1">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/commonlibraryArrayListetstest/src/main/libs/arkui_android_adapter.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/graphic/crossplatform/.idea/libraries/arkui_android_adapter2.xml b/graphic/crossplatform/.idea/libraries/arkui_android_adapter2.xml
deleted file mode 100644
index d2e0262f1..000000000
--- a/graphic/crossplatform/.idea/libraries/arkui_android_adapter2.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<component name="libraryTable">
-  <library name="arkui_android_adapter2">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/commonlibraryDisplayetstest/src/main/libs/arkui_android_adapter.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/graphic/crossplatform/.idea/libraries/arkui_android_adapter3.xml b/graphic/crossplatform/.idea/libraries/arkui_android_adapter3.xml
deleted file mode 100644
index 155627ed4..000000000
--- a/graphic/crossplatform/.idea/libraries/arkui_android_adapter3.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<component name="libraryTable">
-  <library name="arkui_android_adapter3">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/commonlibraryLightWeightSetetstest/src/main/libs/arkui_android_adapter.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/graphic/crossplatform/.idea/libraries/arkui_android_adapter4.xml b/graphic/crossplatform/.idea/libraries/arkui_android_adapter4.xml
deleted file mode 100644
index 5e619b0ef..000000000
--- a/graphic/crossplatform/.idea/libraries/arkui_android_adapter4.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<component name="libraryTable">
-  <library name="arkui_android_adapter4">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/commonlibraryWebSocketetstest/src/main/libs/arkui_android_adapter.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/graphic/crossplatform/.idea/libraries/arkui_android_adapter5.xml b/graphic/crossplatform/.idea/libraries/arkui_android_adapter5.xml
deleted file mode 100644
index 7de8c0eb0..000000000
--- a/graphic/crossplatform/.idea/libraries/arkui_android_adapter5.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<component name="libraryTable">
-  <library name="arkui_android_adapter5">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/commonlibraryConnectionetstest/src/main/libs/arkui_android_adapter.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/graphic/crossplatform/.idea/misc.xml b/graphic/crossplatform/.idea/misc.xml
deleted file mode 100644
index 639900d13..000000000
--- a/graphic/crossplatform/.idea/misc.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectRootManager">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/graphic/crossplatform/.idea/modules.xml b/graphic/crossplatform/.idea/modules.xml
deleted file mode 100644
index cdb75f80a..000000000
--- a/graphic/crossplatform/.idea/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/crossplatform.iml" filepath="$PROJECT_DIR$/.idea/crossplatform.iml" />
-    </modules>
-  </component>
-</project>
\ No newline at end of file
diff --git a/graphic/crossplatform/.idea/vcs.xml b/graphic/crossplatform/.idea/vcs.xml
deleted file mode 100644
index b2bdec2d7..000000000
--- a/graphic/crossplatform/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$/../.." vcs="Git" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/graphic/crossplatform/BUILD.gn b/graphic/crossplatform/BUILD.gn
index 3a0a35187..e411c1841 100644
--- a/graphic/crossplatform/BUILD.gn
+++ b/graphic/crossplatform/BUILD.gn
@@ -15,8 +15,6 @@ import("//test/xts/tools/build/suite.gni")
 group("crossplatform") {
   testonly = true
   if (is_standard_system) {
-    deps = [
-      "graphicDisplayetstest:Display_ets_test",
-    ]
+    deps = [ "graphicDisplayetstest:ActsCrossPlatformDisplayTest" ]
   }
 }
diff --git a/graphic/crossplatform/graphicDisplayetstest/BUILD.gn b/graphic/crossplatform/graphicDisplayetstest/BUILD.gn
index b382d3740..098433b3d 100644
--- a/graphic/crossplatform/graphicDisplayetstest/BUILD.gn
+++ b/graphic/crossplatform/graphicDisplayetstest/BUILD.gn
@@ -20,6 +20,7 @@ ohos_js_hap_suite("ActsCrossPlatformDisplayTest") {
   ]
   ets2abc = true
   certificate_profile = "./signature/openharmony_sx.p7b"
+
   # hap_name: HAP的名字，可选，默认为目标名
   hap_name = "ActsCrossPlatformDisplayTest"
   subsystem_name = "window"
@@ -28,6 +29,7 @@ ohos_js_hap_suite("ActsCrossPlatformDisplayTest") {
 ohos_app_scope("windowStage_app_profile") {
   # app_profile: HAP的AppScope中的app.json，只在Stage模型下使用
   app_profile = "AppScope/app.json"
+
   # sources: 资源文件路径
   sources = [ "AppScope/resources" ]
 }
@@ -38,8 +40,10 @@ ohos_js_assets("windowStage_js_assets") {
 ohos_resources("windowStage_resources") {
   # sources: 资源文件路径
   sources = [ "src/main/resources" ]
+
   # deps: 当前目标的依赖
   deps = [ ":windowStage_app_profile" ]
+
   # hap_profile: HAP的config.json，Stage模型对应module.json
   hap_profile = "src/main/module.json"
-}
\ No newline at end of file
+}
-- 
GitLab