@cpzxrobot/sdk 1.0.24 → 1.0.26

package/device_filter.ts

@@ -271,6 +271,7 @@ export abstract class DeviceFilter<T extends { id: number }> {
           status?: string;
           unit?: Number;
           detail?: boolean;
+          type?: string;
           supplier?: string; //供应商,可用于过滤设备
         } = undefined
   ): Promise<T[]> {
@@ -293,7 +294,7 @@ export abstract class DeviceFilter<T extends { id: number }> {
         return this.context.axios.get("/api/v1/device/list?rand=" + rand, {
           params: {
             location: farm,
-            type: this.deviceType,
+            type: options?.type || this.deviceType,
             unit: options?.unit,
             data: options?.data,
             status: options?.status,

package/dist/device_filter.js

@@ -234,7 +234,7 @@ class DeviceFilter {
             return this.context.axios.get("/api/v1/device/list?rand=" + rand, {
                 params: {
                     location: farm,
-                    type: this.deviceType,
+                    type: (options === null || options === void 0 ? void 0 : options.type) || this.deviceType,
                     unit: options === null || options === void 0 ? void 0 : options.unit,
                     data: options === null || options === void 0 ? void 0 : options.data,
                     status: options === null || options === void 0 ? void 0 : options.status,

package/dist/index.js

@@ -128,15 +128,25 @@ class Cpzxrobot {
                     return platform.callHandler("axios_post", url, data);
                 },
             };
-            this.platformReady = new Promise((resolve, reject) => {
-                window.addEventListener("flutterInAppWebViewPlatformReady", function () {
-                    console.log("flutter android/ios platform is ready");
-                    resolve(true);
+            if (
+            // @ts-ignore
+            window.flutter_inappwebview != null &&
+                // @ts-ignore
+                window.flutter_inappwebview.callHandler != null) {
+                this.platformReady = Promise.resolve(true);
+            }
+            else {
+                this.platformReady = new Promise((resolve, reject) => {
+                    window.addEventListener("flutterInAppWebViewPlatformReady", function () {
+                        console.log("flutter android/ios platform is ready");
+                        resolve(true);
+                    });
+                    setTimeout(() => {
+                        console.log("flutter android/ios platform is timeout");
+                        reject("timeout");
+                    }, 1500);
                 });
-                setTimeout(() => {
-                    reject("timeout");
-                }, 1500);
-            });
+            }
         }
         else if (this.isLocalDomain(domain)) {
             this.mode = "dev";
@@ -182,6 +192,10 @@ class Cpzxrobot {
                 // @ts-ignore
                 window._notifyUnitChanged = cb;
                 break;
+            case "factoryChanged":
+                // @ts-ignore
+                window._notifyFactoryChanged = cb;
+                break;
         }
     }
     //打开其他小程序

package/dist/pigfarm_gateway.js

@@ -26,7 +26,7 @@ class PigfarmGateway extends Object {
             });
         });
     }
-    //获得周/月/季度统计
+    //获得周/月/季度统计，如果出现跨批次的情况时，传回的数据的起始时间可能不是周/月/季度的开始时间，而是本批次的开始时间
     periodReportForUnit(unit, time, type) {
         return this.context.ready.then((axios) => {
             return axios.post(`/api/v1/pigfarm/statistics/${unit.id}`, {

package/index.ts

@@ -31,9 +31,9 @@ export class Cpzxrobot {
   _getSelectedFarmFromMiniApp!: () => any;
   _getSelectedUnitFromMiniApp!: () => any;
   _jumpToMiniApp!: (url: string) => any;
-  setTitle!:  (title: string) => void;
-  saveBase64!:  (base64: string, filename: string) => void;
-  saveBlob!:  (blob: Blob, filename: string) => void;
+  setTitle!: (title: string) => void;
+  saveBase64!: (base64: string, filename: string) => void;
+  saveBlob!: (blob: Blob, filename: string) => void;
   assistant: AssistantGateway;
   energy: EnergyGateway;
   camera: CameraGateway;
@@ -157,18 +157,28 @@ export class Cpzxrobot {
           return platform.callHandler("axios_post", url, data);
         },
       };
-      this.platformReady = new Promise<boolean>((resolve, reject) => {
-        window.addEventListener(
-          "flutterInAppWebViewPlatformReady",
-          function () {
-            console.log("flutter android/ios platform is ready");
-            resolve(true);
-          }
-        );
-        setTimeout(() => {
-          reject("timeout");
-        }, 1500);
-      });
+      if (
+        // @ts-ignore
+        window.flutter_inappwebview != null &&
+        // @ts-ignore
+        window.flutter_inappwebview.callHandler != null
+      ) {
+        this.platformReady = Promise.resolve(true);
+      } else {
+        this.platformReady = new Promise<boolean>((resolve, reject) => {
+          window.addEventListener(
+            "flutterInAppWebViewPlatformReady",
+            function () {
+              console.log("flutter android/ios platform is ready");
+              resolve(true);
+            }
+          );
+          setTimeout(() => {
+            console.log("flutter android/ios platform is timeout");
+            reject("timeout");
+          }, 1500);
+        });
+      }
     } else if (this.isLocalDomain(domain)) {
       this.mode = "dev";
       this.setTitle = function (title: string) {
@@ -216,6 +226,10 @@ export class Cpzxrobot {
         // @ts-ignore
         window._notifyUnitChanged = cb;
         break;
+      case "factoryChanged":
+        // @ts-ignore
+        window._notifyFactoryChanged = cb;
+        break;
     }
   }
 

package/package.json

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

package/pigfarm_gateway.ts

@@ -29,7 +29,7 @@ export class PigfarmGateway extends Object {
     });
   }
 
-  //获得周/月/季度统计
+  //获得周/月/季度统计，如果出现跨批次的情况时，传回的数据的起始时间可能不是周/月/季度的开始时间，而是本批次的开始时间
   periodReportForUnit(
     unit: Unit,
     time: "week" | "month" | "season",