openharmony/developtools_ace-ets2bundle
1
0
Fork 0
mirror of https://github.com/openharmony/developtools_ace-ets2bundle.git synced 2026-07-19 16:43:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

houhaoyu@huawei.com

Browse Source 
fix standard problem

Signed-off-by: houhaoyu <houhaoyu@huawei.com>
Change-Id: I2e80cd5d92687f5ac3f297650dfba3a4f0b572a6
This commit is contained in:
houhaoyu
2021-12-23 17:40:47 +08:00
parent 0e7ad56988
commit c3f9221d92
1 changed files with 25 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/main.js
+25 -21
View File
@@ -165,33 +165,37 @@ 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);
}
} else {
logger.warn(`\u001b[31m ETS:WARN The format of file '${filePath}' is incorrect. \u001b[39m`);
break;
}
}
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 {
let obj = {};
obj[resourceData[1]] = Number(resourceData[2]);
resourceMap.set(resourceData[0], obj);
}
} else {
logger.warn(`\u001b[31m ETS:WARN The format of file '${filePath}' is incorrect. \u001b[39m`);
break;
}
}
}
exports.projectConfig = projectConfig;
exports.loadEntryObj = loadEntryObj;
exports.readAppResource = readAppResource;