@tuya-miniapp/ark-extension-virtual-device 0.0.8 → 0.0.9

package/dist/worker/index.js

@@ -21538,16 +21538,6 @@ async function getDeviceInfo2(params) {
   }
   const response = await getDeviceInfo({ deviceId });
   const { result: devInfo } = response || {};
-  let product = {};
-  try {
-    const presponse = await getProductInfo({
-      productIds: [devInfo.productId]
-    });
-    const { result: productInfo } = presponse || {};
-    product = productInfo[0] || {};
-  } catch (e) {
-    console.log("\u672A\u83B7\u53D6\u5230\u4EA7\u54C1\u4FE1\u606F");
-  }
   if (!devInfo) {
     return {
       data: null,
@@ -21555,6 +21545,21 @@ async function getDeviceInfo2(params) {
       errorMsg: import_TYUniCode.TYUniPluginError.DEVICEKIT_DEVICE_ID_INVALID.des
     };
   }
+  let product = {};
+  let dev = {};
+  try {
+    const presponse = await getProductInfo2({
+      productId: devInfo.productId,
+      getDevices: true
+    });
+    const { data: productInfo, devices } = presponse || {};
+    product = productInfo || {};
+    if (devices) {
+      dev = devices.filter((item) => item.devId === deviceId).pop();
+    }
+  } catch (e) {
+    console.log("\u672A\u83B7\u53D6\u5230\u4EA7\u54C1\u4FE1\u606F");
+  }
   const { dps, schema } = devInfo;
   const objSchema = {};
   JSON.parse(schema).map((item) => {
@@ -21570,11 +21575,37 @@ async function getDeviceInfo2(params) {
     ...devInfo,
     dps,
     dpCodes: objSchema,
-    deviceOnline: devInfo.isOnline,
     icon: devInfo.iconUrl,
     schema: JSON.parse(devInfo.schema),
-    capability: product.capability
+    capability: product.capability,
+    category: product.category,
+    attribute: product.attribute,
+    devAttribute: dev.devAttribute,
+    devTimezoneId: dev.timezoneId,
+    isCloudOnline: dev.cloudOnline,
+    latitude: devInfo.lat,
+    longitude: devInfo.lon,
+    ...dev.dataPointInfo,
+    isVirtualDevice: dev.virtual
   };
+  delete deviceInfo["accessType"];
+  delete deviceInfo["appRnVersion"];
+  delete deviceInfo["panelConfig"];
+  delete deviceInfo["rnFind"];
+  delete deviceInfo["runtimeEnv"];
+  delete deviceInfo["supportGroup"];
+  delete deviceInfo["time"];
+  delete deviceInfo["ui"];
+  delete deviceInfo["uiConfig"];
+  delete deviceInfo["uiPhase"];
+  delete deviceInfo["uiType"];
+  delete deviceInfo["verSw"];
+  delete deviceInfo["iconUrl"];
+  delete deviceInfo["isActive"];
+  delete deviceInfo["lat"];
+  delete deviceInfo["lon"];
+  delete deviceInfo["gwType"];
+  delete deviceInfo["dpMaxTime"];
   return {
     data: deviceInfo,
     errorCode: 0,
@@ -21616,8 +21647,53 @@ async function getProductInfo2(params) {
     const productInfo = await getProductInfo({
       productIds: [params.productId]
     });
+    const {
+      uiInfo = { ui: "", type: "SMART_MINIPG" },
+      schemaInfo = {},
+      shortcut = {},
+      ...other
+    } = productInfo.result[0];
+    const productData = {
+      ...other,
+      ...shortcut,
+      ...schemaInfo,
+      ui: uiInfo.ui,
+      uiId: uiInfo.ui.split("_").shift(),
+      uiType: uiInfo.type,
+      uiVersion: uiInfo.ui.split("_").pop()
+    };
+    let devices = null;
+    try {
+      const userInfo = await ark.auth.getCustomerUserInfo();
+      if (userInfo) {
+        const {
+          extras: { homeId }
+        } = userInfo;
+        const deviceList = await ark.http.atop({
+          api: "tuya.m.my.group.device.list",
+          version: "2.1",
+          meta: {
+            gid: homeId
+          }
+        });
+        if (deviceList) {
+          const {
+            data: { result }
+          } = deviceList;
+          devices = result;
+          const p = result.filter((item) => item.productId === params.productId).pop();
+          if (p) {
+            const { productVer } = p;
+            productData["productVer"] = productVer;
+          }
+        }
+      }
+    } catch (error) {
+      console.error(error);
+    }
     return {
-      data: productInfo.result[0],
+      data: productData,
+      devices,
       errorCode: !!productInfo ? 0 : import_TYUniCode.TYUniPluginError.DEVICEKIT_PRODUCT_ID_INVALID.code,
       errorMsg: !!productInfo ? import_TYUniCode.TYUniPluginError.SUCCESS.des : import_TYUniCode.TYUniPluginError.DEVICEKIT_PRODUCT_ID_INVALID.des
     };
@@ -22108,14 +22184,14 @@ function unsubscribeTYBLEConnectStatus(params) {
     data: null
   };
 }
-ark.miniapp.addPluginMethod("TUNIOTAManager", "onTYBLEConnectStatusChange", onTYBLEConnectStatusChange);
-ark.miniapp.addPluginMethod("TUNIOTAManager", "offTYBLEConnectStatusChange", offTYBLEConnectStatusChange);
-ark.miniapp.addPluginMethod("TUNIOTAManager", "subscribeTYBLEConnectStatus", subscribeTYBLEConnectStatus);
-ark.miniapp.addPluginMethod("TUNIOTAManager", "unsubscribeTYBLEConnectStatus", unsubscribeTYBLEConnectStatus);
-ark.miniapp.addPluginMethod("TYUniOTAManager", "onTYBLEConnectStatusChange", onTYBLEConnectStatusChange);
-ark.miniapp.addPluginMethod("TYUniOTAManager", "offTYBLEConnectStatusChange", offTYBLEConnectStatusChange);
-ark.miniapp.addPluginMethod("TYUniOTAManager", "subscribeTYBLEConnectStatus", subscribeTYBLEConnectStatus);
-ark.miniapp.addPluginMethod("TYUniOTAManager", "unsubscribeTYBLEConnectStatus", unsubscribeTYBLEConnectStatus);
+ark.miniapp.addPluginMethod("TUNIBluetoothManager", "onBLEConnectStatusChange", onTYBLEConnectStatusChange);
+ark.miniapp.addPluginMethod("TUNIBluetoothManager", "offBLEConnectStatusChange", offTYBLEConnectStatusChange);
+ark.miniapp.addPluginMethod("TUNIBluetoothManager", "subscribeBLEConnectStatus", subscribeTYBLEConnectStatus);
+ark.miniapp.addPluginMethod("TUNIBluetoothManager", "unsubscribeBLEConnectStatus", unsubscribeTYBLEConnectStatus);
+ark.miniapp.addPluginMethod("TYUniBluetoothManager", "onTYBLEConnectStatusChange", onTYBLEConnectStatusChange);
+ark.miniapp.addPluginMethod("TYUniBluetoothManager", "offTYBLEConnectStatusChange", offTYBLEConnectStatusChange);
+ark.miniapp.addPluginMethod("TYUniBluetoothManager", "subscribeTYBLEConnectStatus", subscribeTYBLEConnectStatus);
+ark.miniapp.addPluginMethod("TYUniBluetoothManager", "unsubscribeTYBLEConnectStatus", unsubscribeTYBLEConnectStatus);
 
 // worker/api/TYUniGroupControlManager.ts
 var import_TYUniCode6 = __toESM(require_dist());

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tuya-miniapp/ark-extension-virtual-device",
-  "version": "0.0.8",
+  "version": "0.0.9",
   "files": [
     "manifest.json",
     "dist/"
@@ -20,7 +20,7 @@
     "@babel/preset-typescript": "^7.16.7",
     "@tuya-fe/react-hooks": "^2.0.7",
     "@tuya-miniapp/TYUniCode": "0.0.75",
-    "@tuya-miniapp/ark-api": "0.5.0",
+    "@tuya-miniapp/ark-api": "^0.5.4",
     "@types/fs-extra": "^9.0.13",
     "@types/node": "^17.0.34",
     "@types/react": "^16.8.19",