Merge branch 'release/0.3.1'

zhitaocai · Aug 15, 2020 · 50ac045 · 50ac045
2 parents 75e5140 + c5de18a
commit 50ac045
Show file tree

Hide file tree

Showing 4 changed files with 52 additions and 20 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # CHANGELOG
 
+## 0.3.1
+
+* Cocos Creator 2.3.3
+  * 原生平台
+    * 修复加载远程图片时，可能不正确的问题
+    * 修复windows上注入插件到main.js时可能不正确的问题
+
 ## 0.3.0 
 
 * Cocos Creator 2.3.3

diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # CocosCreator-Build-Encrypt
 
-[![](https://img.shields.io/badge/Release-0.3.0-orange.svg)](CHANGELOG.md)
+[![](https://img.shields.io/badge/Release-0.3.1-orange.svg)](CHANGELOG.md)
 [![](https://img.shields.io/badge/Support-Cocos%20Creator%202.3.3-brightgreen.svg)](http://www.cocos.com/creator)
 [![](https://img.shields.io/badge/Support-Cocos%20Creator%202.3.4-brightgreen.svg)](http://www.cocos.com/creator)
 [![](https://img.shields.io/badge/Unknown%20Support-Cocos%20Creator%202.x.x-lightgrey.svg)](http://www.cocos.com/creator)

diff --git a/src/loaderplugin.js b/src/loaderplugin.js
@@ -254,6 +254,7 @@
 });
 
 if (CC_JSB) {
+
     function downloadText(item) {
         var url = item.url;
         var result = jsb.fileUtils.getStringFromFile(url);
@@ -267,20 +268,37 @@ if (CC_JSB) {
         }
     }
 
+     /**
+     * 加载图片
+     *
+     * @param {string}  data 可以是图片地址，也开始是图片的Base64编码
+     * @param {Function} callback  回调函数
+     */
+    function loadImage(data, callback) {
+        let img = new Image();
+        img.src = data;
+        img.onload = function (info) {
+            callback(null, img);
+        };
+
+        img.onerror = function (event) {
+            callback(new Error("load image fail:" + img.src), null);
+        }; // Don't return anything to use async loading.
+    }
+
+
     function downloadImage(item, callback) {
-        let text = downloadText(item);
-        if (text instanceof Error) {
-            callback(text, null);
+        if (item.url.startsWith("http")) {
+            // 来自网络的图片，直接加载
+            loadImage(item.url, callback);
         } else {
-            let img = new Image();
-            img.src = text;
-            img.onload = function (info) {
-                callback(null, img);
-            };
-
-            img.onerror = function (event) {
-                callback(new Error("load image fail:" + img.src), null);
-            }; // Don't return anything to use async loading.
+            // 本地图片，先读取Base64，然后将Base64给Image加载出原图
+            let text = downloadText(item);
+            if (text instanceof Error) {
+                callback(text, null);
+            } else {
+                loadImage(text, callback);
+            }
         }
     }
 

diff --git a/src/tasks/InjectPluginTask.ts b/src/tasks/InjectPluginTask.ts
@@ -56,18 +56,25 @@ export class InjectPluginTask implements TaskInterface {
         let fileChunks = fileContentText.split("var jsList = settings.jsList;");
         let aopCodeBlock = `
     var jsList = settings.jsList;
-
-    //////////////////////////////////////////
-    // 插入代码：开始
-
     if (jsList == null) {
         jsList = [];
     }
     jsList.unshift("${loaderpluginRelativePath}");
-    
-    // 插入代码：结束
-    //////////////////////////////////////////
 `;
+        //         let aopCodeBlock = `
+        //     var jsList = settings.jsList;
+
+        //     //////////////////////////////////////////
+        //     // 插入代码：开始
+
+        //     if (jsList == null) {
+        //         jsList = [];
+        //     }
+        //     jsList.unshift("${loaderpluginRelativePath}");
+
+        //     // 插入代码：结束
+        //     //////////////////////////////////////////
+        // `;
         let newMainJsFileContent = fileChunks.join(aopCodeBlock);
         fs.writeFileSync(taskConfig.buildOutputMainJsFilePath, newMainJsFileContent);
         console.log(`插件脚本注入：注入 main.js 成功`);