@cpzxrobot/sdk 1.0.18 → 1.0.20

package/device_filter.ts

@@ -1,19 +1,7 @@
-import { Cpzxrobot } from ".";
+import { Cpzxrobot, DataQueryArgs } from ".";
 import type { AxiosResponse } from "axios";
 
-export interface DataQueryArgs {
-  start?: string;
-  stop?: string;
-  type?:
-    | "diffPerDay"
-    | "sumPerDay"
-    | "latest"
-    | "latestInRangePerDay"
-    | "last"
-    | "difference";
-  period?: "1mo" | "1d" | null;
-  [key: string]: any;
-}
+
 
 export abstract class DeviceFilter<T extends { id: number }> {
   context: Cpzxrobot;

package/device_gateway.ts

@@ -1,6 +1,6 @@
 import { DeviceTypeGateway } from "./device_type_gateway";
 import { DeviceFilter } from "./device_filter";
-import type { ElectricMeter, Cpzxrobot } from ".";
+import type { ElectricMeter, Cpzxrobot, DataQueryArgs } from ".";
 import { FeedTowerGateway } from "./device_types/feedtower";
 import { ElectricMeterGateway } from "./device_types/electricmeter";
 import { NormalGateway } from "./device_types/normal_type";
@@ -88,4 +88,15 @@ export class DeviceGateway extends Object {
   get getHistoryDatas() {
     return this.normalFilter.getHistoryDatas;
   }
+
+  data(
+    id: number,
+    args: DataQueryArgs = {
+      start: "",
+      stop: "",
+      type: "diffPerDay", // diffPerDay, sumPerDay, latest
+    }
+  ) {
+    return this.normalFilter.getData(id,args);
+  }
 }

package/device_types/feedtower.ts

@@ -1,5 +1,5 @@
-import { type FodderOrderList, type FeedTower,type FeedTowerExtraInfo } from '..'
-import { DeviceFilter, type DataQueryArgs } from '../device_filter'
+import { type FodderOrderList, type FeedTower,type FeedTowerExtraInfo, DataQueryArgs } from '..'
+import { DeviceFilter } from '../device_filter'
 
 export class FeedTowerGateway extends DeviceFilter<FeedTower> {
   // Add properties and methods specific to the FeedTower type here

package/dist/device_gateway.js

@@ -53,5 +53,12 @@ class DeviceGateway extends Object {
     get getHistoryDatas() {
         return this.normalFilter.getHistoryDatas;
     }
+    data(id, args = {
+        start: "",
+        stop: "",
+        type: "diffPerDay", // diffPerDay, sumPerDay, latest
+    }) {
+        return this.normalFilter.getData(id, args);
+    }
 }
 exports.DeviceGateway = DeviceGateway;

package/package.json

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

package/readme.md

@@ -74,8 +74,8 @@ baseURL: "/"
 | 调用入口                | 功能说明             |
 | ----------------------- | -------------------- |
 | cpzxrobot().factory.xxx | 获得工厂的相关信息   |
-| cpzxrobot().device.normalFilter.list | 获得常见设备的列表（当没有特殊类型需求时调用）   |
-| cpzxrobot().device.normalFilter.getData | 获得设备的数据   |
+| cpzxrobot().device.list | 获得常见设备的列表（当没有特殊类型需求时调用）   |
+| cpzxrobot().device.data | 获得设备的数据   |
 | cpzxrobot().device.feedTower.list | 获得料塔设备的列表   |
 | cpzxrobot().device.xxx  | 获得设备的相关信息   |
 | cpzxrobot().camera.xxx  | 获得摄像头的相关信息 |

package/types.d.ts

@@ -3,6 +3,7 @@ import { FactoryGateway } from "@cpzxrobot/sdk/factory_gateway";
 import { TransportGateway } from "@cpzxrobot/sdk/transport_gateway";
 import { UserGateway } from "@cpzxrobot/sdk/user_gateway";
 import { CameraGateway } from "@cpzxrobot/sdk/camera_gateway";
+import { PigfarmGateway } from "@cpzxrobot/sdk/pigfarm_gateway";
 
 type Device = {
   id: number;
@@ -123,6 +124,20 @@ export interface ElectricMeter extends Device {
   status: string;
 }
 
+export interface DataQueryArgs {
+  start?: string;
+  stop?: string;
+  type?:
+    | "diffPerDay"
+    | "sumPerDay"
+    | "latest"
+    | "latestInRangePerDay"
+    | "last"
+    | "difference";
+  period?: "1mo" | "1d" | null;
+  [key: string]: any;
+}
+
 export class Cpzxrobot {
   transport: TransportGateway;
   ready: Promise<MyAxiosInstance>;
@@ -132,8 +147,11 @@ export class Cpzxrobot {
   mode: string;
   axios: MyAxiosInstance;
   camera: CameraGateway;
+  pigfarm: PigfarmGateway;
   _getSelectedFarmFromMiniApp: () => Promise<Factory>;
   _getSelectedUnitFromMiniApp: () => Promise<Unit>;
+  openMiniApp: (url: string) => void;
+  on: (event: string, callback: (data: any) => void) => void;
   setTitle:  (title: string) => void;
   saveBase64:  (base64: string, filename: string) => void;
   saveBlob:  (blob: Blob, filename: string) => void;
@@ -147,7 +165,7 @@ declare module "@cpzxrobot/sdk" {
   export default function (
     args: {
       devAuth: string;
-      baseURL: string;
+      baseURL?: string;
       appCode: string;
       selectedFarm: Factory;
       selectedUnit: Unit;