jiyong@huawei.com

Signed-off-by: Njiyong <jiyong@huawei.com>

aafwk/aafwk_standard/formmanager/formsystemtestservice/formsystemtestservicea/BUILD.gn

@@ -10,11 +10,10 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("ActsFormSystemTestServiceA") {
-  hap_profile = "./formmodule001/src/main/config.json"
+ohos_hap("ActsFormSystemTestServiceA") {
+  hap_profile = "./src/main/config.json"
   hap_name = "ActsFormSystemTestServiceA"
   subsystem_name = XTS_SUITENAME
   final_hap_path =
@@ -27,9 +26,9 @@ ohos_js_hap_suite("ActsFormSystemTestServiceA") {
   certificate_profile = "./signature/openharmony_sx.p7b"
 }
 ohos_js_assets("hjs_demo_js_assets") {
-  source_dir = "./formmodule001/src/main/js/default"
+  source_dir = "./src/main/js/default"
 }
 ohos_resources("hjs_demo_resources") {
-  sources = [ "./formmodule001/src/main/resources" ]
-  hap_profile = "./formmodule001/src/main/config.json"
+  sources = [ "./src/main/js/resources" ]
+  hap_profile = "./src/main/config.json"
 }

aafwk/aafwk_standard/formmanager/formsystemtestservice/formsystemtestservicea/formmodule001/src/main/config.json → aafwk/aafwk_standard/formmanager/formsystemtestservice/formsystemtestservicea/src/main/config.json

-{
-  "app": {
-    "bundleName": "com.form.formsystemtestservicea",
-    "vendor": "ohos",
-    "version": {
-      "code": 1,
-      "name": "1.0"
-    },
-    "apiVersion": {
-      "compatible": 5,
-      "target": 5,
-      "releaseType": "Beta1"
-    }
-  },
-  "deviceConfig": {},
-  "module": {
-    "package": "com.form.formsystemtestservicea",
-    "name": ".MyApplication",
-    "deviceType": [
-      "phone"
-    ],
-    "distro": {
-      "deliveryWithInstall": true,
-      "moduleName": "formmodule001",
-      "moduleType": "entry"
-    },
-    "abilities": [
-      {
-        "skills": [
-          {
-            "entities": [
-              "entity.system.home"
-            ],
-            "actions": [
-              "action.system.home"
-            ]
-          }
-        ],
-        "visible": true,
-        "name": "FormStServiceAbilityA",
-        "icon": "$media:icon",
-        "description": "$string:mainability_description",
-        "label": "$string:entry_MainAbility",
-        "type": "service",
-        "launchType": "standard",
-        "formsEnabled": true,
-        "srcLanguage": "c++",
-        "forms": [
-          {
-            "name": "Form_Js001",
-            "description": "form_description",
-            "isDefault": true,
-            "type": "JS",
-            "colorMode": "auto",
-            "supportDimensions":[ "1*2", "2*2" ],
-            "defaultDimension": "1*2",
-            "updateEnabled": true,
-            "scheduledUpdateTime": "10:30",
-            "jsComponentName": "card",
-            "formVisibleNotify" : true,
-            "metaData": {
-              "customizeData": [
-                {
-                  "name": "originWidgetName",
-                  "value": "myTest"
-                }
-              ]
-            }
-          },
-          {
-            "name": "Form_Js002",
-            "description": "form_description",
-            "isDefault": true,
-            "type": "JS",
-            "colorMode": "auto",
-            "supportDimensions":[ "1*2", "2*2" ],
-            "defaultDimension": "1*2",
-            "updateEnabled": true,
-            "updateDuration": 1,
-            "jsComponentName": "card",
-            "formVisibleNotify" : true,
-            "metaData": {
-              "customizeData": [
-                {
-                  "name": "originWidgetName",
-                  "value": "myTest"
-                }
-              ]
-            }
-          }
-        ]
-      }
-    ],
-    "js": [
-      {
-        "pages": [
-          "pages/index/index"
-        ],
-        "name": "default",
-        "window": {
-          "designWidth": 720,
-          "autoDesignWidth": true
-        }
-      }
-    ]
-  }
+{
+  "app": {
+    "bundleName": "com.form.formsystemtestservicea",
+    "vendor": "ohos",
+    "version": {
+      "code": 1,
+      "name": "1.0"
+    },
+    "apiVersion": {
+      "compatible": 5,
+      "target": 5,
+      "releaseType": "Beta1"
+    }
+  },
+  "deviceConfig": {},
+  "module": {
+    "package": "com.form.formsystemtestservicea",
+    "name": ".MyApplication",
+    "deviceType": [
+      "phone"
+    ],
+    "distro": {
+      "deliveryWithInstall": true,
+      "moduleName": "formmodule001",
+      "moduleType": "entry"
+    },
+    "abilities": [
+      {
+        "skills": [
+          {
+            "entities": [
+              "entity.system.home"
+            ],
+            "actions": [
+              "action.system.home"
+            ]
+          }
+        ],
+        "visible": true,
+        "name": "FormStServiceAbilityA",
+        "icon": "$media:icon",
+        "description": "$string:mainability_description",
+        "label": "$string:entry_MainAbility",
+        "type": "service",
+        "launchType": "standard",
+        "formsEnabled": true,
+        "srcLanguage": "c++",
+        "forms": [
+          {
+            "name": "Form_Js001",
+            "description": "form_description",
+            "isDefault": true,
+            "type": "JS",
+            "colorMode": "auto",
+            "supportDimensions":[ "1*2", "2*2" ],
+            "defaultDimension": "1*2",
+            "updateEnabled": true,
+            "scheduledUpdateTime": "10:30",
+            "jsComponentName": "card",
+            "formVisibleNotify" : true,
+            "metaData": {
+              "customizeData": [
+                {
+                  "name": "originWidgetName",
+                  "value": "myTest"
+                }
+              ]
+            }
+          },
+          {
+            "name": "Form_Js002",
+            "description": "form_description",
+            "isDefault": true,
+            "type": "JS",
+            "colorMode": "auto",
+            "supportDimensions":[ "1*2", "2*2" ],
+            "defaultDimension": "1*2",
+            "updateEnabled": true,
+            "updateDuration": 1,
+            "jsComponentName": "card",
+            "formVisibleNotify" : true,
+            "metaData": {
+              "customizeData": [
+                {
+                  "name": "originWidgetName",
+                  "value": "myTest"
+                }
+              ]
+            }
+          }
+        ]
+      }
+    ],
+    "js": [
+      {
+        "pages": [
+          "pages/index/index"
+        ],
+        "name": "default",
+        "window": {
+          "designWidth": 720,
+          "autoDesignWidth": true
+        }
+      }
+    ]
+  }
 }
\ No newline at end of file

aafwk/aafwk_standard/formmanager/formsystemtestservice/formsystemtestservicea/formmodule001/src/main/resources/base/element/string.json → aafwk/aafwk_standard/formmanager/formsystemtestservice/formsystemtestservicea/src/main/js/resources/base/element/string.json

-{
-  "string": [
-    {
-      "name": "entry_MainAbility",
-      "value": "A_fms"
-    },
-    {
-      "name": "mainability_description",
-      "value": "JS_Empty Ability"
-    }
-  ]
+{
+  "string": [
+    {
+      "name": "entry_MainAbility",
+      "value": "A_fms"
+    },
+    {
+      "name": "mainability_description",
+      "value": "JS_Empty Ability"
+    }
+  ]
 }
\ No newline at end of file