From c3f9221d92f5bc08d3819f3bb3f9700b4fcaac34 Mon Sep 17 00:00:00 2001
From: houhaoyu <houhaoyu@huawei.com>
Date: Thu, 23 Dec 2021 17:40:47 +0800
Subject: [PATCH] houhaoyu@huawei.com

fix standard problem

Signed-off-by: houhaoyu <houhaoyu@huawei.com>
Change-Id: I2e80cd5d92687f5ac3f297650dfba3a4f0b572a6
---
 compiler/main.js | 44 ++++++++++++++++++++++++--------------------
 1 file changed, 24 insertions(+), 20 deletions(-)

diff --git a/compiler/main.js b/compiler/main.js
index c57f8b03e..c2e4d00be 100644
--- a/compiler/main.js
+++ b/compiler/main.js
@@ -165,29 +165,33 @@ function readAppResource(resources, filePath) {
     const appResource = fs.readFileSync(filePath, "utf-8");
     const resourceArr = appResource.split(/\n/);
     let resourceMap = new Map();
-    for (let i = 0; i < resourceArr.length; i++) {
-      if (!resourceArr[i].length) {
-        continue;
-      }
-      const resourceData = resourceArr[i].split(/\s/);
-      if (resourceData.length === 3 && Number(resourceData[2]) !== NaN ) {
-        if (resourceMap.get(resourceData[0])) {
-          const resourceKeys = resourceMap.get(resourceData[0]);
-          if (!resourceKeys[resourceData[1]] || resourceKeys[resourceData[1]] !== Number(resourceData[2])) {
-            resourceKeys[resourceData[1]] = Number(resourceData[2]);
-          }
-        } else {
-          let obj = {};
-          obj[resourceData[1]] = Number(resourceData[2]);
-          resourceMap.set(resourceData[0], obj);
+    processResourceArr(resourceArr, resourceMap, filePath);
+    for (let [key, value] of resourceMap) {
+      resources.app[key] = value;
+    }
+  }
+}
+
+function processResourceArr(resourceArr, resourceMap, filePath) {
+  for (let i = 0; i < resourceArr.length; i++) {
+    if (!resourceArr[i].length) {
+      continue;
+    }
+    const resourceData = resourceArr[i].split(/\s/);
+    if (resourceData.length === 3 && !isNaN(Number(resourceData[2])) ) {
+      if (resourceMap.get(resourceData[0])) {
+        const resourceKeys = resourceMap.get(resourceData[0]);
+        if (!resourceKeys[resourceData[1]] || resourceKeys[resourceData[1]] !== Number(resourceData[2])) {
+          resourceKeys[resourceData[1]] = Number(resourceData[2]);
         }
       } else {
-        logger.warn(`\u001b[31m ETS:WARN The format of file '${filePath}' is incorrect. \u001b[39m`);
-        break;
+        let obj = {};
+        obj[resourceData[1]] = Number(resourceData[2]);
+        resourceMap.set(resourceData[0], obj);
       }
-    }
-    for (let [key, value] of resourceMap) {
-      resources.app[key] = value;
+    } else {
+      logger.warn(`\u001b[31m ETS:WARN The format of file '${filePath}' is incorrect. \u001b[39m`);
+      break;
     }
   }
 }
-- 
Gitee