@cpzxrobot/sdk 1.2.37 → 1.2.39

package/device_gateway.ts

@@ -33,7 +33,7 @@ class DeviceFault {
       for (let i = 0; i < columns!.length; i++) {
         const column = columns![i];
         const value = values[i];
-        
+
         if (column === 'category') params.category = value;
         else if (column === 'time') params.time = new Date(value);
         else if (column === 'resolved') params.resolved = value === 'true';
@@ -41,7 +41,7 @@ class DeviceFault {
         else if (column === 'value') params.value = value;
         else if (column === 'message') params.message = value;
       }
-      
+
       this.category = params.category;
       this.time = params.time;
       this.resolved = params.resolved;
@@ -268,6 +268,13 @@ export class DeviceGateway extends Object {
     return this.normalFilter.getData(id, args);
   }
 
+  async info(
+    id: number,
+  ) {
+    let axios = await this.context.ready;
+    return axios.get(`/api/v1/device/info/${id}`);
+  }
+
   async validate(serialNumbers: string[], type: string = "pywl") {
     let axios = await this.context.ready;
     return axios.post(`/api/v2/device/validateSerialNumber`, {
@@ -288,16 +295,16 @@ export class DeviceGateway extends Object {
     const json = response.data;
     var faultsData = json.faults as string;
 
-// #group,false,false,true,true,false,false,true,true,true,true,true,true
-// #datatype,string,long,dateTime:RFC3339,dateTime:RFC3339,dateTime:RFC3339,boolean,string,string,string,string,string,string
-// #default,last,,,,,,,,,,,
-// ,result,table,_start,_stop,_time,_value,DeviceId,_field,_measurement,category,field,status
-// ,,0,2025-04-20T22:07:43.623582865Z,2025-04-21T04:07:43.623582865Z,2025-04-21T00:27:00Z,false,004a05c1-7b5b-471c-ab68-f583039ddcfe,bool_value,DeviceStatus,离线报警,online,fault
-// ,,0,2025-04-20T22:07:43.623582865Z,2025-04-21T04:07:43.623582865Z,2025-04-21T00:30:00Z,true,004a05c1-7b5b-471c-ab68-f583039ddcfe,bool_value,DeviceStatus,离线报警,online,fault
-// ,,1,2025-04-20T22:07:43.623582865Z,2025-04-21T04:07:43.623582865Z,2025-04-21T00:27:00Z,false,004a05c1-7b5b-471c-ab68-f583039ddcfe,repeated,DeviceStatus,离线报警,online,fault
-// ,,1,2025-04-20T22:07:43.623582865Z,2025-04-21T04:07:43.623582865Z,2025-04-21T00:30:00Z,false,004a05c1-7b5b-471c-ab68-f583039ddcfe,repeated,DeviceStatus,离线报警,online,fault
-// ,,2,2025-04-20T22:07:43.623582865Z,2025-04-21T04:07:43.623582865Z,2025-04-21T00:27:00Z,false,004a05c1-7b5b-471c-ab68-f583039ddcfe,resolved,DeviceStatus,离线报警,online,fault
-// ,,2,2025-04-20T22:07:43.623582865Z,2025-04-21T04:07:43.623582865Z,2025-04-21T00:30:00Z,true,004a05c1-7b5b-471c-ab68-f583039ddcfe,resolved,DeviceStatus,离线报警,online,fault
+    // #group,false,false,true,true,false,false,true,true,true,true,true,true
+    // #datatype,string,long,dateTime:RFC3339,dateTime:RFC3339,dateTime:RFC3339,boolean,string,string,string,string,string,string
+    // #default,last,,,,,,,,,,,
+    // ,result,table,_start,_stop,_time,_value,DeviceId,_field,_measurement,category,field,status
+    // ,,0,2025-04-20T22:07:43.623582865Z,2025-04-21T04:07:43.623582865Z,2025-04-21T00:27:00Z,false,004a05c1-7b5b-471c-ab68-f583039ddcfe,bool_value,DeviceStatus,离线报警,online,fault
+    // ,,0,2025-04-20T22:07:43.623582865Z,2025-04-21T04:07:43.623582865Z,2025-04-21T00:30:00Z,true,004a05c1-7b5b-471c-ab68-f583039ddcfe,bool_value,DeviceStatus,离线报警,online,fault
+    // ,,1,2025-04-20T22:07:43.623582865Z,2025-04-21T04:07:43.623582865Z,2025-04-21T00:27:00Z,false,004a05c1-7b5b-471c-ab68-f583039ddcfe,repeated,DeviceStatus,离线报警,online,fault
+    // ,,1,2025-04-20T22:07:43.623582865Z,2025-04-21T04:07:43.623582865Z,2025-04-21T00:30:00Z,false,004a05c1-7b5b-471c-ab68-f583039ddcfe,repeated,DeviceStatus,离线报警,online,fault
+    // ,,2,2025-04-20T22:07:43.623582865Z,2025-04-21T04:07:43.623582865Z,2025-04-21T00:27:00Z,false,004a05c1-7b5b-471c-ab68-f583039ddcfe,resolved,DeviceStatus,离线报警,online,fault
+    // ,,2,2025-04-20T22:07:43.623582865Z,2025-04-21T04:07:43.623582865Z,2025-04-21T00:30:00Z,true,004a05c1-7b5b-471c-ab68-f583039ddcfe,resolved,DeviceStatus,离线报警,online,fault
 
     faultsData = faultsData.replace(/\r/g, "");
     var arr = faultsData.split("\n");
@@ -320,7 +327,7 @@ export class DeviceGateway extends Object {
 
   }
 
-  
+
   // 报告设备问题
   report(id: number, status: number, description: string): Promise<any> {
     return this.context.ready.then(() => {
@@ -340,7 +347,7 @@ export class DeviceGateway extends Object {
   get ctrl() {
     return {
       // 获取设备控制参数
-      get: (deviceId: number,type: string, no: any ): Promise<any> => {
+      get: (deviceId: number, type: string, no: any): Promise<any> => {
         return this.context.ready.then(() => {
           return this.context.axios.get(`/api/v2/device/ctrl/${deviceId}/${type}/${no}`)
             .then((res) => {
@@ -353,7 +360,7 @@ export class DeviceGateway extends Object {
       },
 
       // 配置设备控制参数
-      set: (deviceId: number,type: string, no: any,params: any): Promise<any> => {
+      set: (deviceId: number, type: string, no: any, params: any): Promise<any> => {
         return this.context.ready.then(() => {
           return this.context.axios.post(`/api/v2/device/ctrl/${deviceId}/${type}/${no}`, params)
             .then((res) => {

package/dist/device_gateway.js

@@ -188,6 +188,10 @@ class DeviceGateway extends Object {
     }) {
         return this.normalFilter.getData(id, args);
     }
+    async info(id) {
+        let axios = await this.context.ready;
+        return axios.get(`/api/v1/device/info/${id}`);
+    }
     async validate(serialNumbers, type = "pywl") {
         let axios = await this.context.ready;
         return axios.post(`/api/v2/device/validateSerialNumber`, {

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 = async () => {
+                // @ts-ignoreconst reader = new FileReader();
+                const base64 = reader.result;
+                // @ts-ignore
+                await that.saveBase64(base64, filename);
+                resolve();
+            };
+            reader.onerror = (err) => {
+                reject(err);
+            };
+        });
     }
     //获取当前浏览器的域名
     getDomain() {
@@ -294,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 = async () => {
+        // @ts-ignoreconst reader = new FileReader();
+        const base64 = reader.result as string;
+        // @ts-ignore
+        await that.saveBase64(base64, filename);
+        resolve();
+      };
+      reader.onerror = (err) => {
+        reject(err);
+      };
+    });
   }
 
   //获取当前浏览器的域名
@@ -341,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.37",
+  "version": "1.2.39",
   "description": "提供给上海正芯数智APP第三方H5应用使用的SDK",
   "main": "dist/index.js",
   "scripts": {