@cpzxrobot/sdk 1.2.67 → 1.2.69

package/device_gateway.ts

@@ -202,19 +202,29 @@ export class DeviceGateway extends Object {
     return this.getFilter("ElectricMeter", ElectricMeterGateway);
   }
 
-  share(id: number){
-    this.context.shareDevice(id);
+  //获取设备详情
+  //ID：点位ID，设备UUID，当type是device时，为设备ID（UUID）；当type是datapoint时，为点位ID（number）
+  show(id: any, type: "device"|"datapoint" = "datapoint"){
+    this.context.showInDeviceManager(id,type);
   }
 
   private getFilter<T extends { id: number }>(
     type: string,
     cls: new (context: Cpzxrobot) => DeviceFilter<T>
   ): DeviceFilter<T> {
+    // 如果filters中已经有对应type的过滤器，则直接返回该过滤器
     if (this.filters.has(type)) {
       return this.filters.get(type) as DeviceFilter<T>;
     }
+
+    // 否则，创建一个新的过滤器实例
     const filter = new cls(this.context);
+
+    // 将新创建的过滤器实例添加到filters中，并返回该过滤器实例
+    // 将新创建的过滤器实例添加到filters中
     this.filters.set(type, filter);
+
+    // 返回新创建的过滤器实例
     return filter;
   }
 

package/dist/device_gateway.js

@@ -154,15 +154,22 @@ class DeviceGateway extends Object {
     get electricMeter() {
         return this.getFilter("ElectricMeter", electricmeter_1.ElectricMeterGateway);
     }
-    share(id) {
-        this.context.shareDevice(id);
+    //获取设备详情
+    //ID：点位ID，设备UUID，当type是device时，为设备ID（UUID）；当type是datapoint时，为点位ID（number）
+    show(id, type = "datapoint") {
+        this.context.showInDeviceManager(id, type);
     }
     getFilter(type, cls) {
+        // 如果filters中已经有对应type的过滤器，则直接返回该过滤器
         if (this.filters.has(type)) {
             return this.filters.get(type);
         }
+        // 否则，创建一个新的过滤器实例
         const filter = new cls(this.context);
+        // 将新创建的过滤器实例添加到filters中，并返回该过滤器实例
+        // 将新创建的过滤器实例添加到filters中
         this.filters.set(type, filter);
+        // 返回新创建的过滤器实例
         return filter;
     }
     // addDevice(device: Device) {

package/dist/index.js

@@ -119,7 +119,7 @@ class Cpzxrobot {
                                 if (value && typeof value === 'object' && !Array.isArray(value)) {
                                     Object.assign(result, flattenParams(value, fullKey));
                                 }
-                                else {
+                                else if (value) {
                                     result[fullKey] = value.toString();
                                 }
                             });
@@ -243,7 +243,7 @@ class Cpzxrobot {
             // @ts-ignore
             this.setProgress = window.miniapp.setProgress;
             // @ts-ignore
-            this.shareDevice = window.miniapp.shareDevice;
+            this.showInDeviceManager = window.miniapp.showInDeviceManager;
         }
         else if (domain == "appassets.androidplatform.net" || domain == "webc.cpzxrobot.com" ||
             this.isIosMiniApp(window.location)) {
@@ -283,8 +283,8 @@ class Cpzxrobot {
             this.vibrate = function (time) {
                 return platform.callHandler("app.vibrate", time);
             };
-            this.shareDevice = function (deviceId) {
-                return platform.callHandler("app.shareDevice", deviceId);
+            this.showInDeviceManager = function (deviceId, type) {
+                return platform.callHandler("app.showInDeviceManager", deviceId, type);
             };
             this.reloadGroup = function (group) {
                 return platform.callHandler("app.reloadGroup", group);
@@ -408,8 +408,8 @@ class Cpzxrobot {
                     }
                 });
             };
-            this.shareDevice = function (deviceId) {
-                return this.axios.get("/api/v1/device/share/" + deviceId);
+            this.showInDeviceManager = function (deviceId, type) {
+                return this.axios.get(`/api/v1/${type}/share/` + deviceId);
             };
         }
     }

package/index.ts

@@ -51,7 +51,7 @@ export class Cpzxrobot {
   saveBlob!: (blob: Blob, filename: string) => Promise<void>;
   scanQrcode!: () => Promise<string>;
   vibrate!: (time?: number) => void;
-  shareDevice!: (deviceId: number) => Promise<void>;
+  showInDeviceManager!: (deviceId: any, type: string) => Promise<void>;
   reloadGroup!: (key: string) => void;
   getGeo!: () => Promise<{
     lat: number;
@@ -137,7 +137,7 @@ export class Cpzxrobot {
                 const fullKey = prefix ? `${prefix}[${key}]` : key;
                 if (value && typeof value === 'object' && !Array.isArray(value)) {
                   Object.assign(result, flattenParams(value, fullKey));
-                } else {
+                } else if(value){
                   result[fullKey] = value.toString();
                 }
               });
@@ -265,7 +265,7 @@ export class Cpzxrobot {
       // @ts-ignore
       this.setProgress = window.miniapp.setProgress;
       // @ts-ignore
-      this.shareDevice = window.miniapp.shareDevice;
+      this.showInDeviceManager = window.miniapp.showInDeviceManager;
     } else if (
       domain == "appassets.androidplatform.net" || domain == "webc.cpzxrobot.com" ||
       this.isIosMiniApp(window.location)
@@ -308,8 +308,8 @@ export class Cpzxrobot {
       this.vibrate = function (time?: number) {
         return platform.callHandler("app.vibrate", time);
       };
-      this.shareDevice = function (deviceId: number) {
-        return platform.callHandler("app.shareDevice", deviceId);
+      this.showInDeviceManager = function (deviceId: number,type:string) {
+        return platform.callHandler("app.showInDeviceManager", deviceId,type);
       };
       this.reloadGroup = function (group: string) {
         return platform.callHandler("app.reloadGroup", group);
@@ -437,8 +437,8 @@ export class Cpzxrobot {
           }
         });
       };
-      this.shareDevice = function (deviceId: number) {
-        return this.axios.get("/api/v1/device/share/" + deviceId);
+      this.showInDeviceManager = function (deviceId: number,type: string) {
+        return this.axios.get(`/api/v1/${type}/share/` + deviceId);
       };
     }
   }

package/package.json

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

package/types.d.ts

@@ -363,7 +363,7 @@ class Cpzxrobot {
   vibrate: (time?: number) => void;
   reloadGroup: (key: string) => void;
   getGeo: () => Promise<{ lat: number; lng: number }>;
-  shareDevice: (deviceId: number) => Promise<void>;
+  showInDeviceManager: (deviceId: number, type: string) => Promise<void>;
 }
 
 declare global {