|
@@ -96,9 +96,7 @@ export const api = !global.android
|
|
: {
|
|
: {
|
|
shareImage(filename: string) {
|
|
shareImage(filename: string) {
|
|
return new Promise((resolve) => {
|
|
return new Promise((resolve) => {
|
|
- console.log("shareImage", filename);
|
|
|
|
global.shareImageCallback = (data) => {
|
|
global.shareImageCallback = (data) => {
|
|
- console.log("shareImage返回", data);
|
|
|
|
delete global.shareImageCallback;
|
|
delete global.shareImageCallback;
|
|
resolve(data);
|
|
resolve(data);
|
|
};
|
|
};
|
|
@@ -107,9 +105,7 @@ export const api = !global.android
|
|
},
|
|
},
|
|
setStore(data) {
|
|
setStore(data) {
|
|
return new Promise((resolve) => {
|
|
return new Promise((resolve) => {
|
|
- console.log("调用setSceneStore参数", JSON.stringify(data));
|
|
|
|
global.setSceneStoreCallback = (data) => {
|
|
global.setSceneStoreCallback = (data) => {
|
|
- console.log("setSceneStoreCallback返回", data);
|
|
|
|
resolve(data);
|
|
resolve(data);
|
|
};
|
|
};
|
|
global.android.setSceneStore(
|
|
global.android.setSceneStore(
|
|
@@ -121,19 +117,22 @@ export const api = !global.android
|
|
},
|
|
},
|
|
getStore() {
|
|
getStore() {
|
|
return new Promise((resolve) => {
|
|
return new Promise((resolve) => {
|
|
- console.log("调用getSceneStore");
|
|
|
|
global.getSceneStoreCallback = (data) => {
|
|
global.getSceneStoreCallback = (data) => {
|
|
- console.log("getSceneStoreCallback返回", data);
|
|
|
|
resolve(data);
|
|
resolve(data);
|
|
};
|
|
};
|
|
- global.android.getSceneStore(params.m + "/store.json", "getSceneStoreCallback");
|
|
|
|
|
|
+ global.android.getSceneStore(
|
|
|
|
+ params.m + "/store.json",
|
|
|
|
+ "getSceneStoreCallback"
|
|
|
|
+ );
|
|
});
|
|
});
|
|
},
|
|
},
|
|
// genUseLoading()
|
|
// genUseLoading()
|
|
async getFile(fileUrl: string) {
|
|
async getFile(fileUrl: string) {
|
|
fileUrl = fileUrl.trim();
|
|
fileUrl = fileUrl.trim();
|
|
if (fileUrl.includes(params.m)) {
|
|
if (fileUrl.includes(params.m)) {
|
|
- fileUrl = fileUrl.substring(fileUrl.indexOf(params.m) + params.m.length);
|
|
|
|
|
|
+ fileUrl = fileUrl.substring(
|
|
|
|
+ fileUrl.indexOf(params.m) + params.m.length
|
|
|
|
+ );
|
|
}
|
|
}
|
|
fileUrl = new URL(fileUrl, "http://www.a.com").pathname;
|
|
fileUrl = new URL(fileUrl, "http://www.a.com").pathname;
|
|
fileUrl = (params.realPath || params.m) + fileUrl;
|
|
fileUrl = (params.realPath || params.m) + fileUrl;
|
|
@@ -151,14 +150,16 @@ export const api = !global.android
|
|
return await new Promise<string>((resolve) => {
|
|
return await new Promise<string>((resolve) => {
|
|
const apiName = `getImageCallback${count++}`;
|
|
const apiName = `getImageCallback${count++}`;
|
|
global[apiName] = (base64) => {
|
|
global[apiName] = (base64) => {
|
|
- console.error("请求url:" + fileUrl, "返回:" + base64.substring(0, 60));
|
|
|
|
|
|
+ console.error(
|
|
|
|
+ "请求url:" + fileUrl,
|
|
|
|
+ "返回:" + base64.substring(0, 60)
|
|
|
|
+ );
|
|
resolve(URL.createObjectURL(base64ToBlob(base64)));
|
|
resolve(URL.createObjectURL(base64ToBlob(base64)));
|
|
delete global[apiName];
|
|
delete global[apiName];
|
|
};
|
|
};
|
|
global.android.getImage(fileUrl, apiName);
|
|
global.android.getImage(fileUrl, apiName);
|
|
});
|
|
});
|
|
} else {
|
|
} else {
|
|
- console.log("图片文件直接文件系统读取", fileUrl);
|
|
|
|
return fileUrl;
|
|
return fileUrl;
|
|
}
|
|
}
|
|
},
|
|
},
|
|
@@ -166,12 +167,10 @@ export const api = !global.android
|
|
return new Promise<string>(async (resolve) => {
|
|
return new Promise<string>(async (resolve) => {
|
|
const apiName = `uploadImageCallback${count++}`;
|
|
const apiName = `uploadImageCallback${count++}`;
|
|
global[apiName] = (data) => {
|
|
global[apiName] = (data) => {
|
|
- console.log("上传图片成功,返回路径为:", data);
|
|
|
|
resolve(data);
|
|
resolve(data);
|
|
delete global[apiName];
|
|
delete global[apiName];
|
|
};
|
|
};
|
|
const data = await blobToBase64(file);
|
|
const data = await blobToBase64(file);
|
|
- // console.log("上传图片", params.m + "/" + file.name, "参数:", data);
|
|
|
|
global.android.uploadImage(
|
|
global.android.uploadImage(
|
|
params.m + "/attach/upload/" + file.name,
|
|
params.m + "/attach/upload/" + file.name,
|
|
data,
|
|
data,
|
|
@@ -183,13 +182,11 @@ export const api = !global.android
|
|
return new Promise<boolean>(async (resolve) => {
|
|
return new Promise<boolean>(async (resolve) => {
|
|
const apiName = `downloadImageCallback${count++}`;
|
|
const apiName = `downloadImageCallback${count++}`;
|
|
global[apiName] = () => {
|
|
global[apiName] = () => {
|
|
- console.log("已成功下载");
|
|
|
|
resolve(true);
|
|
resolve(true);
|
|
delete global[apiName];
|
|
delete global[apiName];
|
|
};
|
|
};
|
|
const data = await blobToBase64(file);
|
|
const data = await blobToBase64(file);
|
|
// file为base64
|
|
// file为base64
|
|
- console.log("下载图片", file.name);
|
|
|
|
global.android.downloadImage(file.name, data, apiName);
|
|
global.android.downloadImage(file.name, data, apiName);
|
|
});
|
|
});
|
|
},
|
|
},
|
|
@@ -197,7 +194,6 @@ export const api = !global.android
|
|
return new Promise<string>((resolve) => {
|
|
return new Promise<string>((resolve) => {
|
|
const apiName = `photograph${count++}`;
|
|
const apiName = `photograph${count++}`;
|
|
global[apiName] = (data) => {
|
|
global[apiName] = (data) => {
|
|
- console.log("拍照后路径:", data);
|
|
|
|
data
|
|
data
|
|
? rotate
|
|
? rotate
|
|
? normalImage(data).then(resolve)
|
|
? normalImage(data).then(resolve)
|
|
@@ -212,7 +208,6 @@ export const api = !global.android
|
|
return new Promise<string>((resolve) => {
|
|
return new Promise<string>((resolve) => {
|
|
const apiName = `selectPhotoAlbum${count++}`;
|
|
const apiName = `selectPhotoAlbum${count++}`;
|
|
global[apiName] = (data) => {
|
|
global[apiName] = (data) => {
|
|
- console.log("获得相册图片路径:", data);
|
|
|
|
data
|
|
data
|
|
? rotate
|
|
? rotate
|
|
? normalImage(data).then(resolve)
|
|
? normalImage(data).then(resolve)
|
|
@@ -247,7 +242,6 @@ const loadStore = async () => {
|
|
uses.value = data?.uses || defaultUses;
|
|
uses.value = data?.uses || defaultUses;
|
|
|
|
|
|
syncSceneStore();
|
|
syncSceneStore();
|
|
- console.log("开始同步syncSceneStore");
|
|
|
|
};
|
|
};
|
|
|
|
|
|
export const updateSceneStore = debounce(api.setStore, 300);
|
|
export const updateSceneStore = debounce(api.setStore, 300);
|
|
@@ -256,7 +250,10 @@ export const uploadImage = (blob: Blob, name = `${getId()}.jpg`) => {
|
|
return api.uploadImage(file);
|
|
return api.uploadImage(file);
|
|
};
|
|
};
|
|
|
|
|
|
-export const downloadImage = async (data: Blob | string, name: string = getId()) => {
|
|
|
|
|
|
+export const downloadImage = async (
|
|
|
|
+ data: Blob | string,
|
|
|
|
+ name = `${getId()}.jpg`
|
|
|
|
+) => {
|
|
const blob: Blob =
|
|
const blob: Blob =
|
|
typeof data === "string"
|
|
typeof data === "string"
|
|
? (await axios.get(data, { responseType: "blob" })).data
|
|
? (await axios.get(data, { responseType: "blob" })).data
|
|
@@ -279,7 +276,6 @@ const syncSceneStore = () => {
|
|
roadPhotos: roadPhotos.value,
|
|
roadPhotos: roadPhotos.value,
|
|
}),
|
|
}),
|
|
(data) => {
|
|
(data) => {
|
|
- console.log("监听到数据变化,自动保存store");
|
|
|
|
updateSceneStore(data);
|
|
updateSceneStore(data);
|
|
},
|
|
},
|
|
{ deep: true }
|
|
{ deep: true }
|