From 329d65b41ac627a2824c06c6dcfda26e95703c49 Mon Sep 17 00:00:00 2001
From: Tevin <tingquanren@163.com>
Date: Wed, 20 Jul 2022 17:48:38 +0800
Subject: [PATCH] 修复主机地址管理工具，App的Sever参数为网址时无效的问题
---
common/Bridge.js | 46 ++++++++++++++++++++++++++++++++++------------
1 files changed, 34 insertions(+), 12 deletions(-)
diff --git a/common/Bridge.js b/common/Bridge.js
index cf2b376..811096f 100644
--- a/common/Bridge.js
+++ b/common/Bridge.js
@@ -31,6 +31,8 @@
constructor() {
this._data = {
count: 100,
+ fileSaved: {}, // 已保存图片名称列表 { 'blob:***' : 'bridge:***' }
+ fileLoaded: {}, // 已读取图片名称列表 { 'bridge:***' : 'blob:***' }
};
this._receives = {};
this._earlyInvok = [];
@@ -232,6 +234,10 @@
callback(objUrl);
return;
}
+ if (this._data.fileSaved[objUrl]) {
+ callback(this._data.fileSaved[objUrl]);
+ return;
+ }
// 分段存储
const saveFileChunk = (baseData, index) => {
const writeData = {
@@ -258,22 +264,27 @@
});
};
$fileTrans.transObjUrlToBaseData(objUrl, baseData => {
+ this._data.fileSaved[objUrl] = 'bridge:' + baseData.fileName;
saveFileChunk(baseData, 0);
});
}
/**
* 从 java 读取文件 base64
- * @param fileName
+ * @param bridgeName
* @param callback
*/
- fileLoad(fileName = '', callback) {
+ fileLoad(bridgeName = '', callback) {
// 非存储地址，跳过
- if (fileName.indexOf('bridge:') < 0) {
- callback(fileName);
+ if (bridgeName.indexOf('bridge:') < 0) {
+ callback(bridgeName);
return;
}
- fileName = fileName.split(':')[1];
+ if (this._data.fileLoaded[bridgeName]) {
+ callback(this._data.fileLoaded[bridgeName]);
+ return;
+ }
+ const fileName = bridgeName.split(':')[1];
const chunkSize = $fileTrans.getChunkSize();
const baseArr = [];
let totalSize = 0;
@@ -305,6 +316,7 @@
fileName,
};
$fileTrans.transBaseDataToObjUrl(baseData, objUrl => {
+ this._data.fileLoaded[bridgeName] = objUrl;
callback && callback(objUrl);
});
}
@@ -315,14 +327,20 @@
/**
* 从 java 端移除文件
- * @param fileName
+ * @param bridgeName
*/
- fileRemove(fileName = '') {
- if (fileName.indexOf('bridge:') < 0) {
+ fileRemove(bridgeName = '') {
+ if (bridgeName.indexOf('bridge:') < 0) {
return;
}
- fileName = fileName.split(':')[1];
+ const fileName = bridgeName.split(':')[1];
this.invoking('img_del', { fileName });
+ // 移除
+ Object.keys(this._data.fileSaved).forEach(objUrl => {
+ if (bridgeName === this._data.fileSaved[objUrl]) {
+ delete this._data.fileSaved[objUrl];
+ }
+ });
}
/**
@@ -331,13 +349,17 @@
* @param names
* @param callback
*/
- fileStorehouse(type, names = [], callback) {
+ fileStore(type, names = [], callback) {
+ if (!names || names.length === 0) {
+ callback && callback([]);
+ return;
+ }
// 保存
if (type === 'save') {
const list = [];
const save = index => {
- this.fileSave(names[index], fileName => {
- list.push(fileName);
+ this.fileSave(names[index], bridgeName => {
+ list.push(bridgeName);
// 递归下一个
if (index < names.length - 1) {
setTimeout(() => {
--
Gitblit v1.9.1