From 4abc8bbf94b952b8934f31c33b4342c1d1586fbf Mon Sep 17 00:00:00 2001
From: Tevin <tingquanren@163.com>
Date: Thu, 23 Mar 2023 10:31:35 +0800
Subject: [PATCH] 二维码增加保存功能
---
common/Bridge.js | 39 ++++++++++++++++++++++++++++++++-------
1 files changed, 32 insertions(+), 7 deletions(-)
diff --git a/common/Bridge.js b/common/Bridge.js
index daa7d07..f46cf14 100644
--- a/common/Bridge.js
+++ b/common/Bridge.js
@@ -256,7 +256,8 @@
fileName: writeData.fileName,
currentIdx: writeData.currentIdx,
totalIdx: writeData.total,
- data: '(' + writeData.data.length + '个base64字符...)',
+ data: (writeData.data || '').substr(0, 10)
+ + '...(共' + (writeData.data || '').length + '个base64字符)',
},
response: res,
});
@@ -312,12 +313,16 @@
Tools.toast('离线图片读取：' + res.msg);
onError({
method: 'img_read',
- request: loadData,
+ request: {
+ ...loadData,
+ totalCount,
+ },
response: {
result: res.result,
msg: res.msg,
'total_size': res.totalSize,
- data: '(' + (res.data || '').length + '个base64字符...)',
+ data: (res.data || '').substr(0, 10)
+ + '...(共' + (res.data || '').length + '个base64字符)',
},
});
return;
@@ -337,10 +342,30 @@
baseArr,
fileName,
};
- $fileTrans.transBaseDataToObjUrl(baseData, objUrl => {
- this._data.fileLoaded[bridgeName] = objUrl;
- callback && callback(objUrl);
- });
+ try {
+ $fileTrans.transBaseDataToObjUrl(baseData, objUrl => {
+ this._data.fileLoaded[bridgeName] = objUrl;
+ callback && callback(objUrl);
+ });
+ } catch (e) {
+ onError({
+ method: 'img_read@merge_after_base64_loaded',
+ request: {
+ ...loadData,
+ totalCount,
+ },
+ response: {
+ result: res.result,
+ msg: res.msg,
+ 'total_size': res.totalSize,
+ data: (res.data || '').substr(0, 10)
+ + '...(共' + (res.data || '').length + '个base64字符)',
+ },
+ base64Arr: baseData.baseArr.map(baseItem => (baseItem || []).substr(0, 10)
+ + '...(共' + (res.data || '').length + '个base64字符)'),
+ message: 'Base64合并解析异常！',
+ });
+ }
}
});
};
--
Gitblit v1.9.1