@cpzxrobot/sdk 1.0.11 → 1.0.13

package/device_filter.ts

@@ -309,11 +309,8 @@ export abstract class DeviceFilter<T extends { id: number }> {
         if (res.data.Error) {
           throw res.data.Error;
         } else {
-          if (options == undefined || options.id == undefined) {
-            //当id为空时（获取用户选中工厂的设备），将所有设备保存到devices中
-            this.devices = res.data;
-          }
-          return res.data;
+          return this.wrapList(res.data);
+          // return res.data;
         }
       });
   }

package/dist/camera_gateway.js

@@ -2,29 +2,29 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CameraGateway = void 0;
 class CameraGateway extends Object {
-  constructor(context) {
-    super();
-    this.context = context;
-  }
-  //搜索摄像头
-  async search(data) {
-    var axios = await this.context.ready;
-    const response = axios.post("/api/v1/camera/search", {
-      unit_id: data.id,
-    });
-    return response.data;
-  }
-  //获得摄像头的播放地址
-  async getUrl(data) {
-    var axios = await this.context.ready;
-    const response = axios.get(`/api/v1/camera/${data.id}/url/wss`);
-    return response.data;
-  }
-  //获取工厂天气
-  async weather(id) {
-    var axios = await this.context.ready;
-    const response = axios.get(`/api/v1/weather?code=${id}`);
-    return response.data;
-  }
+    constructor(context) {
+        super();
+        this.context = context;
+    }
+    //搜索摄像头
+    async search(data) {
+        var axios = await this.context.ready;
+        const response = await axios.post("/api/v1/camera/search", {
+            unit_id: data.id,
+        });
+        return response.data;
+    }
+    //获得摄像头的播放地址
+    async getUrl(data) {
+        var axios = await this.context.ready;
+        const response = await axios.get(`/api/v1/camera/${data.id}/url/wss`);
+        return response.data;
+    }
+    //获取工厂天气
+    async weather(id) {
+        var axios = await this.context.ready;
+        const response = await axios.get(`/api/v1/weather?code=${id}`);
+        return response.data;
+    }
 }
 exports.CameraGateway = CameraGateway;

package/dist/device_filter.js

@@ -94,10 +94,6 @@ class DeviceFilter {
             sevenDaysAgo.setDate(sevenDaysAgo.getDate() - 7);
             args.start = this.formateDateToYYYYMMDD(sevenDaysAgo);
         }
-        if (!args.type) {
-            throw new Error("没有提交数据类型，请检查type参数");
-        }
-            
         return this.context.ready
             .then(() => {
             const p1 = this.context.axios.get(`/api/v1/device/${id}/data/${args.type}`, {
@@ -245,11 +241,8 @@ class DeviceFilter {
                 throw res.data.Error;
             }
             else {
-                if (options == undefined || options.id == undefined) {
-                    //当id为空时（获取用户选中工厂的设备），将所有设备保存到devices中
-                    this.devices = res.data;
-                }
-                return res.data;
+                return this.wrapList(res.data);
+                // return res.data;
             }
         });
     }

package/dist/factory_gateway.js

@@ -42,8 +42,8 @@ class FactoryGateway extends Object {
         return response.data;
     }
     async company(data) {
-        await this.context.ready;
-        const response = await this.context.axios.get(`/api/v1/factory/${data.id}/organizaion`, data);
+        var axios = await this.context.ready;
+        const response = await axios.get(`/api/v1/factory/${data.id}/organizaion`, data);
         return response.data;
     }
 }

package/dist/user_gateway.js

@@ -17,7 +17,8 @@ class UserGateway extends Object {
         this.context = context;
     }
     //获得当前用户选择的工厂
-    getSelectedFarm() {
+    async getSelectedFarm() {
+        await this.context.ready;
         return new Promise((resolve, reject) => {
             switch (this.context.mode) {
                 case "dev":

package/package.json

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

package/user_gateway.ts

@@ -19,7 +19,8 @@ export class UserGateway extends Object {
   }
 
   //获得当前用户选择的工厂
-  public getSelectedFarm(): Promise<Factory> {
+  public async getSelectedFarm(): Promise<Factory> {
+    await this.context.ready;
     return new Promise<Factory>((resolve, reject) => {
       switch (this.context.mode) {
         case "dev":