@cpzxrobot/sdk 1.2.36 → 1.2.38

package/dist/index.js

@@ -131,14 +131,21 @@ class Cpzxrobot {
         }
     }
     _saveBlobAsBase64(blob, filename) {
-        const reader = new FileReader();
         var that = this;
-        reader.onload = function () {
-            const base64 = reader.result;
-            // @ts-ignore
-            that.saveBase64(base64, filename);
-        };
-        reader.readAsDataURL(blob);
+        return new Promise((resolve, reject) => {
+            const reader = new FileReader();
+            reader.readAsDataURL(blob);
+            reader.onloadend = () => {
+                // @ts-ignoreconst reader = new FileReader();
+                const base64 = reader.result;
+                // @ts-ignore
+                await that.saveBase64(base64, filename);
+                resolve();
+            };
+            reader.onerror = (err) => {
+                reject(err);
+            };
+        });
     }
     //获取当前浏览器的域名
     getDomain() {
@@ -208,9 +215,7 @@ class Cpzxrobot {
             this.setTitle = function (title) {
                 platform.callHandler("app.setTitle", title);
             };
-            this.saveBlob = function (blob, filename) {
-                return platform.callHandler("app.saveBlob", blob, filename);
-            };
+            this.saveBlob = this._saveBlobAsBase64;
             this.saveBase64 = function (base64, filename) {
                 return platform.callHandler("app.saveBase64", base64, filename);
             };
@@ -296,16 +301,27 @@ class Cpzxrobot {
                 const blob = new Blob([byteArray], {
                     type: "application/octet-stream",
                 });
-                this.saveBlob(blob, filename);
+                return this.saveBlob(blob, filename);
             };
             this.saveBlob = function (blob, filename) {
-                const url = URL.createObjectURL(blob);
-                const a = document.createElement("a");
-                a.href = url;
-                a.download = filename;
-                a.click();
-                URL.revokeObjectURL(url);
-                document.body.removeChild(a);
+                return new Promise((resolve, reject) => {
+                    try {
+                        const url = URL.createObjectURL(blob);
+                        const a = document.createElement("a");
+                        a.href = url;
+                        a.download = filename;
+                        document.body.appendChild(a);
+                        a.click();
+                        setTimeout(() => {
+                            URL.revokeObjectURL(url);
+                            document.body.removeChild(a);
+                            resolve();
+                        }, 0);
+                    }
+                    catch (error) {
+                        reject(error);
+                    }
+                });
             };
             this.getGeo = async function () {
                 return new Promise((resolve, reject) => {

package/index.ts

@@ -46,8 +46,8 @@ export class Cpzxrobot {
   _getSelectedUnitFromMiniApp!: () => any;
   _jumpToMiniApp!: (url: string) => any;
   setTitle!: (title: string) => void;
-  saveBase64!: (base64: string, filename: string) => void;
-  saveBlob!: (blob: Blob, filename: string) => void;
+  saveBase64!: (base64: string, filename: string) => Promise<void>;
+  saveBlob!: (blob: Blob, filename: string) => Promise<void>;
   scanQrcode!: () => Promise<string>;
   vibrate!: (time?: number) => void;
   reloadGroup!: (key: string) => void;
@@ -170,15 +170,22 @@ export class Cpzxrobot {
     }
   }
 
-  _saveBlobAsBase64(blob: Blob, filename: string) {
-    const reader = new FileReader();
+  _saveBlobAsBase64(blob: Blob, filename: string): Promise<void> {
     var that = this;
-    reader.onload = function () {
-      const base64 = reader.result as string;
-      // @ts-ignore
-      that.saveBase64(base64, filename);
-    };
-    reader.readAsDataURL(blob);
+    return new Promise<void>((resolve, reject) => {
+      const reader = new FileReader();
+      reader.readAsDataURL(blob);
+      reader.onloadend = () => {
+        // @ts-ignoreconst reader = new FileReader();
+        const base64 = reader.result as string;
+        // @ts-ignore
+        await that.saveBase64(base64, filename);
+        resolve();
+      };
+      reader.onerror = (err) => {
+        reject(err);
+      };
+    });
   }
 
   //获取当前浏览器的域名
@@ -252,9 +259,7 @@ export class Cpzxrobot {
       this.setTitle = function (title: string) {
         platform.callHandler("app.setTitle", title);
       };
-      this.saveBlob = function (blob: Blob, filename: string) {
-        return platform.callHandler("app.saveBlob", blob, filename);
-      };
+      this.saveBlob = this._saveBlobAsBase64;
       this.saveBase64 = function (base64: string, filename: string) {
         return platform.callHandler("app.saveBase64", base64, filename);
       };
@@ -343,16 +348,26 @@ export class Cpzxrobot {
         const blob = new Blob([byteArray], {
           type: "application/octet-stream",
         });
-        this.saveBlob(blob, filename);
+        return this.saveBlob(blob, filename);
       };
-      this.saveBlob = function (blob: Blob, filename: string) {
-        const url = URL.createObjectURL(blob);
-        const a = document.createElement("a");
-        a.href = url;
-        a.download = filename;
-        a.click();
-        URL.revokeObjectURL(url);
-        document.body.removeChild(a);
+      this.saveBlob = function (blob: Blob, filename: string): Promise<void> {
+        return new Promise((resolve, reject) => {
+          try {
+            const url = URL.createObjectURL(blob);
+            const a = document.createElement("a");
+            a.href = url;
+            a.download = filename;
+            document.body.appendChild(a);
+            a.click();
+            setTimeout(() => {
+              URL.revokeObjectURL(url);
+              document.body.removeChild(a);
+              resolve();
+            }, 0);
+          } catch (error) {
+            reject(error);
+          }
+        });
       };
       this.getGeo = async function () {
         return new Promise((resolve, reject) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cpzxrobot/sdk",
-  "version": "1.2.36",
+  "version": "1.2.38",
   "description": "提供给上海正芯数智APP第三方H5应用使用的SDK",
   "main": "dist/index.js",
   "scripts": {