jh5_app_build 1.0.27 → 1.0.29

package/lib/build_std.js

@@ -1,3 +1,5 @@
+/* eslint-disable no-mixed-operators */
+/* eslint-disable no-lonely-if */
 let glob = require("glob")
 let archiver = require('archiver');
 let jutils = require('base_parts');
@@ -9,6 +11,96 @@ let AdmZip = require('adm-zip');
 let child_process = require('child_process');
 
 
+function adler32_buf(buf, seed) {
+    // eslint-disable-next-line
+    var a = 1, b = 0, L = buf.length, M = 0;
+    // eslint-disable-next-line no-bitwise
+    if (typeof seed === 'number') { a = seed & 0xFFFF; b = (seed >>> 16) & 0xFFFF; }
+    for (var i = 0; i < L;) {
+        M = Math.min(L - i, 2654) + i;
+        for (; i < M; i++) {
+            // eslint-disable-next-line no-bitwise
+            a += buf[i] & 0xFF;
+            b += a;
+        }
+        // eslint-disable-next-line no-bitwise
+        a = (15 * (a >>> 16) + (a & 65535));
+        // eslint-disable-next-line no-bitwise
+        b = (15 * (b >>> 16) + (b & 65535));
+    }
+    // eslint-disable-next-line no-bitwise
+    return ((b % 65521) << 16) | (a % 65521);
+}
+
+let jfile_utils = jutils.jfile_utils;
+
+
+function reNameData(anfData, pkgName, codePage) {
+    // 修改应用名
+    let tmpName = Buffer.from("jsmart", codePage);
+    // eslint-disable-next-line no-constant-condition
+    while (true) {
+        let nameIndex = anfData.indexOf(tmpName);
+        if (nameIndex < 0) {
+            break;
+        }
+
+        let toName = Buffer.from(pkgName, codePage);
+        if (tmpName.length !== toName.length) {
+            throw new Error("pkgName length must 6")
+        }
+
+        // 写入名
+        for (let index = 0; index < toName.length; index++) {
+            anfData[nameIndex + index] = toName[index];
+        }
+    }
+}
+
+
+/**
+ * 复制文件夹并重命名数据
+ * @param {*} srcDir 原始目录
+ * @param {*} destDir 目标目录
+ * @param {*} pkgName 目标名
+ * @returns {*} 无
+ */
+async function copyReNameDir(srcDir, destDir, pkgName) {
+    await jfile_utils.mkdir(destDir)
+
+    var fileList = await jfile_utils.readdir(srcDir);
+    for (var index = 0; index < fileList.length; index++) {
+        var fileName = fileList[index];
+        var srcPath = srcDir + "/" + fileName;
+        var destPath = destDir + "/" + fileName;
+        var fileStat;
+        try {
+            fileStat = await jfile_utils.lstat(srcPath);
+            if (fileStat.isDirectory()) {
+                // 目录
+                await copyReNameDir(srcPath, destPath, pkgName);
+            }
+            else {
+                // 文件
+                let anfData = fs.readFileSync(srcPath);
+
+                // 修改数据
+                reNameData(anfData, pkgName, 'utf8');
+                reNameData(anfData, pkgName, 'utf16le');
+
+                if (path.extname(srcPath) === ".dex") {
+                    let sunData = anfData.subarray(0x0C)
+                    anfData.writeInt32LE(adler32_buf(sunData), 0x08)
+                }
+
+                fs.writeFileSync(destPath, anfData);
+            }
+        }
+        catch (error) {
+        }
+    }
+}
+
 /**
  * 创建目录并获取尾部带斜线的路径
  * @param {string} dirPath 路径
@@ -29,7 +121,7 @@ function makeAndGetDir(dirPath) {
  * @returns {void}
  */
 async function makeDirAndCopy(srcFile, dstFile) {
-    await jutils.jfile_utils.createDirs(dstFile, true);
+    await jfile_utils.createDirs(dstFile, true);
     fs.copyFileSync(srcFile, dstFile);
 }
 
@@ -38,7 +130,8 @@ module.exports = async (cmd, buildCfg) => {
 
     try {
         // 模板目录
-        var stdBinDir = `${buildCfg.rootPath}/jbuild_data/std_bins`;
+        var stdBinPriDir = `${buildCfg.rootPath}/jbuild_data/std_bins`;
+        var stdBinDir = `${buildCfg.rootPath}/jbuild_data/std_out`;
 
         // jre目录
         let jreCwd = "C:\\jdev_develop\\jre\\bin";
@@ -57,11 +150,15 @@ module.exports = async (cmd, buildCfg) => {
         // 默认软件名
         if (!apkinfoObj.appName) apkinfoObj.appName = "智能终端"
 
+        // 清理数据
+        console.log(`init dir ...`);
+        await jfile_utils.deleteFolder(stdBinDir);
+        await jfile_utils.mkdir(stdBinDir);
+
         // 存在自定义apk
         var custumApk = `${buildCfg.rootPath}/apk_cfg/app-release.apk`
         if (fs.existsSync(custumApk)) {
             console.warn(`exists custum Apk, unpack custum apk...`);
-            await jutils.jfile_utils.deleteFolder(stdBinDir);
             child_process.execFileSync("C:\\jdev_develop\\jre\\bin\\java.exe", [
                 "-jar", "C:\\jdev_develop\\h5_bin\\apktool.jar",
                 "d", custumApk,
@@ -71,15 +168,25 @@ module.exports = async (cmd, buildCfg) => {
                 cwd: jreCwd
             });
         }
+        else {
+            // 修改应用名
+            if (apkinfoObj.pkgName) {
+                await copyReNameDir(stdBinPriDir, stdBinDir, apkinfoObj.pkgName);
+            }
+            // 不修改
+            else {
+                await jfile_utils.copyFolder(stdBinPriDir, stdBinDir);
+            }
+        }
 
-        // 清理数据
+        // 清理demo内容
         console.log(`delete temp file ...`);
-        await jutils.jfile_utils.deleteFolder(stdBinDir + "/assets/device_webapi");
-        await jutils.jfile_utils.deleteFolder(stdBinDir + "/assets/h5app");
-        await jutils.jfile_utils.deleteFolder(stdBinDir + "/assets/jext");
-        await jutils.jfile_utils.deleteFolder(stdBinDir + "/assets/screen");
-        await jutils.jfile_utils.deleteFolder(stdBinDir + "/assets/sounds");
-        await jutils.jfile_utils.deleteFolder(stdBinDir + "/build");
+        await jfile_utils.deleteFolder(stdBinDir + "/assets/device_webapi");
+        await jfile_utils.deleteFolder(stdBinDir + "/assets/h5app");
+        await jfile_utils.deleteFolder(stdBinDir + "/assets/jext");
+        await jfile_utils.deleteFolder(stdBinDir + "/assets/screen");
+        await jfile_utils.deleteFolder(stdBinDir + "/assets/sounds");
+        await jfile_utils.deleteFolder(stdBinDir + "/build");
 
         // 修改版本号
         let platformVer = jutils.getUUID();
@@ -171,7 +278,7 @@ module.exports = async (cmd, buildCfg) => {
             if (fileList.length === 0) {
                 console.warn("no audio_wav files!");
                 try {
-                    jutils.jfile_utils.createDirs(pathSub)
+                    jfile_utils.createDirs(pathSub)
                 } catch (error) {
                 }
             }
@@ -219,17 +326,12 @@ module.exports = async (cmd, buildCfg) => {
         // 修改其他信息
         try {
             var AndroidManifestPath = stdBinDir + "/AndroidManifest.xml";
-            var AndroidManifestPathBak = stdBinDir + "/AndroidManifestBak.xml";
-            // 备份
-            if (!fs.existsSync(AndroidManifestPathBak)) {
-                fs.copyFileSync(AndroidManifestPath, AndroidManifestPathBak);
-            }
-            var anfData = fs.readFileSync(AndroidManifestPathBak);
+            var anfData = fs.readFileSync(AndroidManifestPath);
 
             // 修改应用名
             if (apkinfoObj.appName) {
                 let tmpName = Buffer.from("7A3657B017788420AE749039F9D25A2E", 'utf16le');
-                var nameIndex = anfData.indexOf(tmpName);
+                let nameIndex = anfData.indexOf(tmpName);
                 if (nameIndex > 0) {
                     let toName = Buffer.from(apkinfoObj.appName, 'utf16le');
                     // 清空
@@ -243,6 +345,22 @@ module.exports = async (cmd, buildCfg) => {
                 }
             }
 
+            // 修改版本名
+            if (apkinfoObj.useAppVer) {
+                let tmpName = Buffer.from("12.34.56.7890", 'utf16le');
+                let nameIndex = anfData.indexOf(tmpName);
+                if (nameIndex > 0) {
+                    let tmpVerStr = buildCfg.dateStr;
+                    let toVerStr = `${tmpVerStr.substr(0, 2)}.${tmpVerStr.substr(2, 2)}.${tmpVerStr.substr(4, 2)}.${tmpVerStr.substr(7, 4)}`
+                    console.log("versionName=" + toVerStr);
+                    let toName = Buffer.from(toVerStr, 'utf16le');
+                    // 写入名
+                    for (let index = 0; index < toName.length; index++) {
+                        anfData[nameIndex + index] = toName[index];
+                    }
+                }
+            }
+
             // 写入
             fs.writeFileSync(AndroidManifestPath, anfData);
         } catch (error) {
@@ -359,7 +477,7 @@ module.exports = async (cmd, buildCfg) => {
     } catch (error) {
         // 清理文件
         try {
-            jutils.jfile_utils.deleteFile(buildCfg.outpath);
+            jfile_utils.deleteFile(buildCfg.outpath);
         } catch (error2) {
         }
         // 延迟报错

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jh5_app_build",
-  "version": "1.0.27",
+  "version": "1.0.29",
   "description": "jaskle jh5_app_build",
   "main": "./bin/jh5_app_build.js",
   "registry": true,