From 2d5a93043b786cf3ced103aac49556d7dc0fe2bd Mon Sep 17 00:00:00 2001
From: yangbo <1442420648@qq.com>
Date: Tue, 25 Jan 2022 15:18:33 +0800
Subject: [PATCH] yangbo198@huawei.com

Signed-off-by: yangbo <1442420648@qq.com>
Change-Id: Ie78954a5baf1cbb907678f4e192cb93d03318b95
---
 ace-loader/package.json           | 2 +-
 ace-loader/src/resource-plugin.js | 6 +++---
 ace-loader/webpack.rich.config.js | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/ace-loader/package.json b/ace-loader/package.json
index 144c452..72f15e6 100644
--- a/ace-loader/package.json
+++ b/ace-loader/package.json
@@ -19,7 +19,7 @@
     "postinstall": "node npm-install.js",
     "richtest": "cd test/rich/testcase && webpack --config ../../../webpack.rich.config.js && mocha ../test.js",
     "litetest": "cd test/lite/testcase && webpack --config ../../../webpack.lite.config.js && mocha ../test.js",
-    "cardtest": "cd test/card/testcase && webpack --env utTestForCard --config ../../../webpack.rich.config.js && mocha ../test.js",
+    "cardtest": "cd test/card/testcase && webpack --config ../../../webpack.rich.config.js && mocha ../test.js",
     "test": "npm run build && npm run richtest && npm run litetest && npm run cardtest"
   },
   "devDependencies": {
diff --git a/ace-loader/src/resource-plugin.js b/ace-loader/src/resource-plugin.js
index 392bd12..e16e49a 100644
--- a/ace-loader/src/resource-plugin.js
+++ b/ace-loader/src/resource-plugin.js
@@ -226,7 +226,7 @@ function readManifest(manifestFilePath) {
 function readModulePages(moduleJson) {
   if (moduleJson.module.uiSyntax === 'hml' && moduleJson.module.pages) {
     const modulePagePath = path.resolve(process.env.aceProfilePath,
-      `${moduleJson.module.pages.replace(/\@profile\:/, '')}.json`);
+      `${moduleJson.module.pages.replace(/\$profile\:/, '')}.json`);
     if (fs.existsSync(modulePagePath)) {
       const pagesConfig = JSON.parse(fs.readFileSync(modulePagePath, 'utf-8'));
       return pagesConfig.src;
@@ -241,7 +241,7 @@ function readFormPages(moduleJson) {
       if (extensionAbility.type && extensionAbility.type === 'form' && extensionAbility.metadata &&
         extensionAbility.metadata.length) {
         extensionAbility.metadata.forEach(item => {
-          if (item.resource && /\@profile\:/.test(item.resource)) {
+          if (item.resource && /\$profile\:/.test(item.resource)) {
             parseFormConfig(item.resource, pages);
           }
         });
@@ -253,7 +253,7 @@ function readFormPages(moduleJson) {
 
 function parseFormConfig(resource, pages) {
   const resourceFile = path.resolve(process.env.aceProfilePath,
-    `${resource.replace(/\@profile\:/, '')}.json`);
+    `${resource.replace(/\$profile\:/, '')}.json`);
   if (fs.existsSync(resourceFile)) {
     const pagesConfig = JSON.parse(fs.readFileSync(resourceFile, 'utf-8'));
     if (pagesConfig.forms && pagesConfig.forms.length) {
diff --git a/ace-loader/webpack.rich.config.js b/ace-loader/webpack.rich.config.js
index 7099b8a..b1a08c7 100644
--- a/ace-loader/webpack.rich.config.js
+++ b/ace-loader/webpack.rich.config.js
@@ -178,9 +178,6 @@ let config = {
 }
 
 function setConfigs(env) {
-  if (env.utTestForCard) {
-    env.DEVICE_LEVEL = "card";
-  }
   if (process.env.aceModuleJsonPath || env.aceModuleJsonPath) {
     process.env.compileMode = 'moduleJson';
   }
@@ -203,6 +200,9 @@ function setConfigs(env) {
     (env.watchMode && env.watchMode === 'true') || false;
   if (process.env.abilityType === 'page' || process.env.abilityType === 'form') {
     const manifest = readManifest(process.env.aceManifestPath)
+    if (process.env.compileMode !== 'moduleJson') {
+      process.env.DEVICE_LEVEL = manifest.type === 'form' ? 'card' : 'rich'
+    }
     process.env.PLATFORM_VERSION = PLATFORM.VERSION6;
     const version = parseInt(manifest.minPlatformVersion);
     if (version == 5) {