From 03a225b4643f0348e63352dca2d2b10ef21197d1 Mon Sep 17 00:00:00 2001 From: fanjiaojiao Date: Tue, 30 Aug 2022 15:00:41 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E4=BC=98=E5=8C=96lite=E5=9B=BE=E7=89=87?= =?UTF-8?q?=E7=BC=96=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: fanjiaojiao --- ace-loader/src/lite/lite-image2bin.js | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/ace-loader/src/lite/lite-image2bin.js b/ace-loader/src/lite/lite-image2bin.js index fdd99f0..986c24c 100644 --- a/ace-loader/src/lite/lite-image2bin.js +++ b/ace-loader/src/lite/lite-image2bin.js @@ -16,6 +16,7 @@ const Jimp = require('jimp'); const fs = require('fs'); const _path = require('path'); +const { readManifest} = require('../../main.product'); /** * Find all image paths in png、jpg、bmp、jpeg format in the directory. * @param {String} imgPath The path of build folder. @@ -36,6 +37,11 @@ async function img2bin(imgPath) { const HEIGHT_BIT_OFFSET = 16; const header = (image.bitmap.width << WIDTH_BIT_OFFSET) + (image.bitmap.height << HEIGHT_BIT_OFFSET); + + process.env.aceManifestPath = process.env.aceManifestPath || path.resolve(process.env.projectPath, 'manifest.json'); + const manifest = readManifest(process.env.aceManifestPath) + const version = parseInt(manifest.minPlatformVersion); + console.log(version) let binFileOffset = 0; binView.setUint32(binFileOffset, COLOR_MODE, true); @@ -64,10 +70,14 @@ async function img2bin(imgPath) { binView.setUint8(binFileOffset, alpha, true); binFileOffset += 1; }); - const binPath1 = imgPath.replace(/(\.png|\.jpg|\.bmp|\.jpeg|\.BMP|\.JPG|\.PNG|\.JPEG)$/, '.bin'); - const binPath2 = imgPath+".bin"; - fs.writeFileSync(binPath1, Buffer.from(binBuffer)); - fs.writeFileSync(binPath2, Buffer.from(binBuffer)); + + if (version <=6) { + const binPath1 = imgPath.replace(/(\.png|\.jpg|\.bmp|\.jpeg|\.BMP|\.JPG|\.PNG|\.JPEG)$/, '.bin'); + fs.writeFileSync(binPath1, Buffer.from(binBuffer)); + }else{ + const binPath2 = imgPath+".bin"; + fs.writeFileSync(binPath2, Buffer.from(binBuffer)); + } } catch (err) { const imageName = _path.basename(imgPath); From bcf1eb346fc3a1eefc690ed2a8b265ffae9d668a Mon Sep 17 00:00:00 2001 From: fanjiaojiao Date: Tue, 30 Aug 2022 18:38:32 +0800 Subject: [PATCH 2/8] =?UTF-8?q?lite=E5=9B=BE=E7=89=87=E7=BC=96=E8=AF=91?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: fanjiaojiao --- ace-loader/src/lite/lite-image2bin.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ace-loader/src/lite/lite-image2bin.js b/ace-loader/src/lite/lite-image2bin.js index 986c24c..f2d624e 100644 --- a/ace-loader/src/lite/lite-image2bin.js +++ b/ace-loader/src/lite/lite-image2bin.js @@ -74,10 +74,10 @@ async function img2bin(imgPath) { if (version <=6) { const binPath1 = imgPath.replace(/(\.png|\.jpg|\.bmp|\.jpeg|\.BMP|\.JPG|\.PNG|\.JPEG)$/, '.bin'); fs.writeFileSync(binPath1, Buffer.from(binBuffer)); - }else{ + } const binPath2 = imgPath+".bin"; fs.writeFileSync(binPath2, Buffer.from(binBuffer)); - } + } catch (err) { const imageName = _path.basename(imgPath); From 6b716075f6726b32ebe470b59ada7382d0c338c1 Mon Sep 17 00:00:00 2001 From: fanjiaojiao Date: Wed, 31 Aug 2022 10:39:33 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E4=BC=98=E5=8C=96lite=E5=9B=BE=E7=89=87?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E7=BC=96=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: fanjiaojiao --- ace-loader/src/lite/lite-image2bin.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ace-loader/src/lite/lite-image2bin.js b/ace-loader/src/lite/lite-image2bin.js index f2d624e..9c59d98 100644 --- a/ace-loader/src/lite/lite-image2bin.js +++ b/ace-loader/src/lite/lite-image2bin.js @@ -41,8 +41,7 @@ async function img2bin(imgPath) { process.env.aceManifestPath = process.env.aceManifestPath || path.resolve(process.env.projectPath, 'manifest.json'); const manifest = readManifest(process.env.aceManifestPath) const version = parseInt(manifest.minPlatformVersion); - console.log(version) - + let binFileOffset = 0; binView.setUint32(binFileOffset, COLOR_MODE, true); binFileOffset += 4; From b02fc316cb435fe8334ca8b81a2e9b03854a898a Mon Sep 17 00:00:00 2001 From: fanjiaojiao Date: Wed, 31 Aug 2022 17:51:47 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E4=BC=98=E5=8C=96lite=E5=B7=A5=E7=A8=8B?= =?UTF-8?q?=E7=9A=84=E5=9B=BE=E7=89=87=E7=BC=96=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: fanjiaojiao --- ace-loader/src/lite/lite-image2bin.js | 7 +------ ace-loader/webpack.lite.config.js | 1 + 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/ace-loader/src/lite/lite-image2bin.js b/ace-loader/src/lite/lite-image2bin.js index 9c59d98..e530705 100644 --- a/ace-loader/src/lite/lite-image2bin.js +++ b/ace-loader/src/lite/lite-image2bin.js @@ -16,7 +16,6 @@ const Jimp = require('jimp'); const fs = require('fs'); const _path = require('path'); -const { readManifest} = require('../../main.product'); /** * Find all image paths in png、jpg、bmp、jpeg format in the directory. * @param {String} imgPath The path of build folder. @@ -38,10 +37,6 @@ async function img2bin(imgPath) { const header = (image.bitmap.width << WIDTH_BIT_OFFSET) + (image.bitmap.height << HEIGHT_BIT_OFFSET); - process.env.aceManifestPath = process.env.aceManifestPath || path.resolve(process.env.projectPath, 'manifest.json'); - const manifest = readManifest(process.env.aceManifestPath) - const version = parseInt(manifest.minPlatformVersion); - let binFileOffset = 0; binView.setUint32(binFileOffset, COLOR_MODE, true); binFileOffset += 4; @@ -70,7 +65,7 @@ async function img2bin(imgPath) { binFileOffset += 1; }); - if (version <=6) { + if (process.env.PLATFORM_VERSION_version <=6) { const binPath1 = imgPath.replace(/(\.png|\.jpg|\.bmp|\.jpeg|\.BMP|\.JPG|\.PNG|\.JPEG)$/, '.bin'); fs.writeFileSync(binPath1, Buffer.from(binBuffer)); } diff --git a/ace-loader/webpack.lite.config.js b/ace-loader/webpack.lite.config.js index 1211a22..918b355 100644 --- a/ace-loader/webpack.lite.config.js +++ b/ace-loader/webpack.lite.config.js @@ -131,6 +131,7 @@ function setConfigs(env) { if (version <= 4) { process.env.PLATFORM_VERSION = PLATFORM.VERSION3; } + process.env.PLATFORM_VERSION_version = version; } module.exports = (env) => { From 02d49fba85ae5182610efc101e942b4308103682 Mon Sep 17 00:00:00 2001 From: fanjiaojiao Date: Wed, 31 Aug 2022 18:03:11 +0800 Subject: [PATCH 5/8] =?UTF-8?q?lite=E5=B7=A5=E7=A8=8B=E7=9A=84=E5=9B=BE?= =?UTF-8?q?=E7=89=87=E7=BC=96=E8=AF=91=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: fanjiaojiao --- ace-loader/src/lite/lite-image2bin.js | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/ace-loader/src/lite/lite-image2bin.js b/ace-loader/src/lite/lite-image2bin.js index e530705..ea52589 100644 --- a/ace-loader/src/lite/lite-image2bin.js +++ b/ace-loader/src/lite/lite-image2bin.js @@ -64,13 +64,12 @@ async function img2bin(imgPath) { binView.setUint8(binFileOffset, alpha, true); binFileOffset += 1; }); - if (process.env.PLATFORM_VERSION_version <=6) { - const binPath1 = imgPath.replace(/(\.png|\.jpg|\.bmp|\.jpeg|\.BMP|\.JPG|\.PNG|\.JPEG)$/, '.bin'); - fs.writeFileSync(binPath1, Buffer.from(binBuffer)); + const binPath1 = imgPath.replace(/(\.png|\.jpg|\.bmp|\.jpeg|\.BMP|\.JPG|\.PNG|\.JPEG)$/, '.bin'); + fs.writeFileSync(binPath1, Buffer.from(binBuffer)); } - const binPath2 = imgPath+".bin"; - fs.writeFileSync(binPath2, Buffer.from(binBuffer)); + const binPath2 = imgPath+".bin"; + fs.writeFileSync(binPath2, Buffer.from(binBuffer)); } catch (err) { From e1c95de56c4a216cbee335466370936f8a538aa0 Mon Sep 17 00:00:00 2001 From: fanjiaojiao Date: Thu, 1 Sep 2022 10:00:35 +0800 Subject: [PATCH 6/8] =?UTF-8?q?lite=E5=85=B3=E4=BA=8E=E5=9B=BE=E7=89=87?= =?UTF-8?q?=E7=BC=96=E8=AF=91=E7=9A=84=E7=9B=B8=E5=85=B3=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: fanjiaojiao --- ace-loader/src/lite/lite-image2bin.js | 4 ++-- ace-loader/webpack.lite.config.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ace-loader/src/lite/lite-image2bin.js b/ace-loader/src/lite/lite-image2bin.js index ea52589..e144128 100644 --- a/ace-loader/src/lite/lite-image2bin.js +++ b/ace-loader/src/lite/lite-image2bin.js @@ -30,7 +30,7 @@ async function img2bin(imgPath) { const binSize = HEAD_SIZE + DATA_SIZE; const binBuffer = new ArrayBuffer(binSize); const binView = new DataView(binBuffer); - + const COLOR_MODE = 1 << 8 + 0; const WIDTH_BIT_OFFSET = 0; const HEIGHT_BIT_OFFSET = 16; @@ -64,7 +64,7 @@ async function img2bin(imgPath) { binView.setUint8(binFileOffset, alpha, true); binFileOffset += 1; }); - if (process.env.PLATFORM_VERSION_version <=6) { + if (process.env.PLATFORM_VERSION_VERSION <=6) { const binPath1 = imgPath.replace(/(\.png|\.jpg|\.bmp|\.jpeg|\.BMP|\.JPG|\.PNG|\.JPEG)$/, '.bin'); fs.writeFileSync(binPath1, Buffer.from(binBuffer)); } diff --git a/ace-loader/webpack.lite.config.js b/ace-loader/webpack.lite.config.js index 918b355..4202075 100644 --- a/ace-loader/webpack.lite.config.js +++ b/ace-loader/webpack.lite.config.js @@ -131,7 +131,7 @@ function setConfigs(env) { if (version <= 4) { process.env.PLATFORM_VERSION = PLATFORM.VERSION3; } - process.env.PLATFORM_VERSION_version = version; + process.env.PLATFORM_VERSION_VERSION = version; } module.exports = (env) => { From 9f9db7954f8bf45c9b3576a42a4a2e8d96d74cb9 Mon Sep 17 00:00:00 2001 From: fanjiaojiao Date: Thu, 1 Sep 2022 10:16:29 +0800 Subject: [PATCH 7/8] =?UTF-8?q?lite=E5=85=B3=E4=BA=8E=E5=9B=BE=E7=89=87?= =?UTF-8?q?=E7=BC=96=E8=AF=91=E7=9A=84=E7=9B=B8=E5=85=B3=E4=BC=98=E5=8C=96?= =?UTF-8?q?-=E6=A0=BC=E5=BC=8F=E8=A7=84=E8=8C=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: fanjiaojiao --- ace-loader/src/lite/lite-image2bin.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ace-loader/src/lite/lite-image2bin.js b/ace-loader/src/lite/lite-image2bin.js index e144128..340a213 100644 --- a/ace-loader/src/lite/lite-image2bin.js +++ b/ace-loader/src/lite/lite-image2bin.js @@ -30,13 +30,13 @@ async function img2bin(imgPath) { const binSize = HEAD_SIZE + DATA_SIZE; const binBuffer = new ArrayBuffer(binSize); const binView = new DataView(binBuffer); - + const COLOR_MODE = 1 << 8 + 0; const WIDTH_BIT_OFFSET = 0; const HEIGHT_BIT_OFFSET = 16; const header = (image.bitmap.width << WIDTH_BIT_OFFSET) + (image.bitmap.height << HEIGHT_BIT_OFFSET); - + let binFileOffset = 0; binView.setUint32(binFileOffset, COLOR_MODE, true); binFileOffset += 4; From 4fd2b9c0a4b73e22fcc639e5fe4b0092204604bb Mon Sep 17 00:00:00 2001 From: fanjiaojiao Date: Thu, 1 Sep 2022 10:18:42 +0800 Subject: [PATCH 8/8] =?UTF-8?q?lite=E5=85=B3=E4=BA=8E=E5=9B=BE=E7=89=87?= =?UTF-8?q?=E7=BC=96=E8=AF=91=E7=9A=84=E4=BC=98=E5=8C=96-=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F=E8=A7=84=E8=8C=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: fanjiaojiao --- ace-loader/src/lite/lite-image2bin.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/ace-loader/src/lite/lite-image2bin.js b/ace-loader/src/lite/lite-image2bin.js index 340a213..6c2a895 100644 --- a/ace-loader/src/lite/lite-image2bin.js +++ b/ace-loader/src/lite/lite-image2bin.js @@ -70,8 +70,6 @@ async function img2bin(imgPath) { } const binPath2 = imgPath+".bin"; fs.writeFileSync(binPath2, Buffer.from(binBuffer)); - - } catch (err) { const imageName = _path.basename(imgPath); console.error('\u001b[31m', `Failed to convert image ${imageName}.`, '\u001b[39m');