@ray-js/api 1.5.15 → 1.5.17

package/lib/cloud/interface.d.ts

@@ -1209,7 +1209,16 @@ export type IGetBindRuleListResponse = Array<{
     /**
      * 关联实体的值列表
      */
-    associativeEntityValueList: IGetSceneListResponseV2;
+    associativeEntityValueList: Array<IGetSceneListResponseV2[number] & {
+        /**
+         * 无线开关规则是否启用
+         */
+        triggerRuleEnable: boolean;
+        /**
+         * 无线开关执行规则 id
+         */
+        triggerRuleId: string;
+    }>;
     /**
      * 绑定 id，一般用来解绑
      */

package/lib/nativeRouters/device.d.ts

@@ -4,7 +4,7 @@ type OpenSceneCreateParams = {
 } & ICommon;
 export declare function openSceneCreate(params?: OpenSceneCreateParams): Promise<void>;
 export declare const openCreateScene: typeof openSceneCreate;
-export declare function openCreateOneClickScene(params?: ICommon): Promise<void>;
+export declare function openCreateTapToRunScene(params?: ICommon): Promise<void>;
 export declare function openUniversalCreateScene(params?: OpenSceneCreateParams): Promise<void>;
 type OpenSceneEdit = {
     devId?: string;

package/lib/nativeRouters/device.js

@@ -6,7 +6,7 @@ export function openSceneCreate(params) {
 export const openCreateScene = openSceneCreate;
 
 // App 基线 5.13.0 以上开始支持
-export function openCreateOneClickScene(params) {
+export function openCreateTapToRunScene(params) {
   const p = _objectSpread({
     biz_type: 'click_execution'
   }, params);

package/lib/panel/devInfo/index.d.ts

@@ -1,4 +1,4 @@
-import { DevInfo } from '../types/devInfo';
+import { DevInfo, GroupInfo } from '../types/devInfo';
 export interface InitPanelEnvironmentOptions {
     /**
      * @description 是否需要使用默认离线弹窗
@@ -40,10 +40,21 @@ export interface InitPanelEnvironmentOptions {
      * @default undefined
      */
     groupId?: string;
+    /**
+     * 微信详细页面路由
+     * @default undefined
+     */
+    deviceDetailPage?: string;
+    /**
+     *是否显示故障提示
+     * @default false
+     */
+    showFault?: boolean;
 }
 export declare function parseDevice(dev: ty.device.DeviceInfo | DevInfo): DevInfo;
+export declare function parseGroup(group: ty.device.GroupInfo): GroupInfo;
 /**
- * 初始化面板环境下使用到的设备信息
+ * 初始化面板环境下使用到的设备或群组信息
  * @returns Promise<DevInfo>
  */
 export declare const initDevInfo: (option?: {
@@ -57,3 +68,10 @@ export declare const updateDevInfo: (devInfo: DevInfo) => void;
  * @param config: InitPanelEnvironmentOptions 配置项
  */
 export declare function initPanelEnvironment(options?: InitPanelEnvironmentOptions): Promise<void>;
+/**
+ * 初始化面板环境
+ * @param options 一些配置
+ * @param initCallback 初始化回调整
+ * @param destroyCallback 销毁环境回调整
+ */
+export declare const useInitPanelEnv: (options?: InitPanelEnvironmentOptions, initCallback?: (devId: string) => any, destroyCallback?: (devId: string) => any) => void;

package/lib/panel/devInfo/index.js

@@ -1,6 +1,8 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import { getDeviceInfo, getLaunchOptionsSync, getGroupInfo, registerDeviceListListener, registerGroupChange, exitMiniProgram, subscribeDeviceRemoved, onDeviceRemoved } from '../../all-kits';
+import { useEffect } from 'react';
 import getApp from '../../getApp';
+
 // 本地化缓存 deviceInfo 方便随时调用
 let __deviceInfo = null;
 const defaultPanelEnvironmentOptions = {
@@ -8,14 +10,15 @@ const defaultPanelEnvironmentOptions = {
   bleCover: false,
   customTop: null,
   bleConnectType: 0,
-  showBLEToast: true
+  showBLEToast: true,
+  showFault: false
 };
 export function parseDevice(dev) {
   if (!dev) return null;
-  // @ts-ignore
   const deviceInfo = _objectSpread({}, dev);
+  // tuyalink 协议设备没有 schema 字段。避免崩溃加设置为空数组
   const {
-    schema
+    schema = []
   } = dev;
   const idCodes = {};
   const codeIds = {};
@@ -32,26 +35,50 @@ export function parseDevice(dev) {
   deviceInfo.codeIds = codeIds;
   return deviceInfo;
 }
+export function parseGroup(group) {
+  if (!group) return null;
+  const groupInfo = _objectSpread({}, group);
+  const {
+    schema
+  } = group;
+  const idCodes = {};
+  const codeIds = {};
+  schema.forEach(item => {
+    // @ts-ignore
+    const {
+      id,
+      code
+    } = item;
+    idCodes[id] = code;
+    codeIds[code] = id;
+  });
+  groupInfo.idCodes = idCodes;
+  groupInfo.codeIds = codeIds;
+  return groupInfo;
+}
 
 /**
- * 初始化面板环境下使用到的设备信息
+ * 初始化面板环境下使用到的设备或群组信息
  * @returns Promise<DevInfo>
  */
 export const initDevInfo = option => {
   return new Promise((resolve, reject) => {
+    var _data$query, _data$query2;
     if (__deviceInfo) {
       resolve(__deviceInfo);
     }
     const data = getLaunchOptionsSync();
-    const {
+    let {
       deviceId,
       groupId
-    } = option || data.query;
+    } = option || {};
+    deviceId = deviceId || ((_data$query = data.query) === null || _data$query === void 0 ? void 0 : _data$query.deviceId);
+    groupId = groupId || ((_data$query2 = data.query) === null || _data$query2 === void 0 ? void 0 : _data$query2.groupId);
     if (groupId) {
       getGroupInfo({
         groupId,
         success: groupInfo => {
-          __deviceInfo = groupInfo;
+          __deviceInfo = parseDevice(groupInfo);
           resolve(__deviceInfo);
         }
       });
@@ -95,19 +122,14 @@ export async function initPanelEnvironment() {
     });
     return;
   }
+  let init = false;
   const App = getApp();
-
-  // 基础库版本需要大于 2.6.0
-  // @ts-ignore
-  App.onReady = event => {
+  const initPanel = event => {
     var _options$deviceId, _options$groupId;
     const deviceId = (_options$deviceId = options.deviceId) !== null && _options$deviceId !== void 0 ? _options$deviceId : event.query.deviceId;
     const groupId = (_options$groupId = options.groupId) !== null && _options$groupId !== void 0 ? _options$groupId : event.query.groupId;
-    const {
-      useDefaultOffline
-    } = options;
     // @ts-ignore
-    if (ty.panel && ty.panel.initPanelKit && useDefaultOffline) {
+    if (ty.panel && ty.panel.initPanelKit) {
       // @ts-ignore
       ty.panel.initPanelKit(_objectSpread({
         deviceId,
@@ -136,6 +158,48 @@ export async function initPanelEnvironment() {
       });
     }
   };
+  // 由于手机性能、初始化方法调用时机、框架初始化及界面加载逻辑的差异，
+  // 有时注册 App.onReady 时可能当前界面已经执行完了该事件，导致逻辑无法正常执行。因此增加延时逻辑，保证逻辑正常执行
+  // 若 3s 后仍未执行，则认为当前界面已经执行完了 App.onReady，直接执行逻辑
+  const timeout = setTimeout(() => {
+    if (init) return;
+    initPanel(getLaunchOptionsSync());
+  }, 3000);
+  // 基础库版本需要大于 2.6.0
+  // @ts-ignore
+  App.onReady = event => {
+    init = true;
+    clearTimeout(timeout);
+    initPanel(event);
+  };
+
   // 使用 Promise 确保业务可以通过 initPanelEnvironment 的正常调用明确设备信息初始化完成
   await initDevInfo(options.deviceId || options.groupId ? options : undefined);
-}
+}
+
+/**
+ * 初始化面板环境
+ * @param options 一些配置
+ * @param initCallback 初始化回调整
+ * @param destroyCallback 销毁环境回调整
+ */
+export const useInitPanelEnv = function () {
+  var _data$query3, _data$query4;
+  let options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : defaultPanelEnvironmentOptions;
+  let initCallback = arguments.length > 1 ? arguments[1] : undefined;
+  let destroyCallback = arguments.length > 2 ? arguments[2] : undefined;
+  const data = getLaunchOptionsSync();
+  let {
+    deviceId,
+    groupId
+  } = options || {};
+  deviceId = deviceId || ((_data$query3 = data.query) === null || _data$query3 === void 0 ? void 0 : _data$query3.deviceId);
+  groupId = groupId || ((_data$query4 = data.query) === null || _data$query4 === void 0 ? void 0 : _data$query4.groupId);
+  initPanelEnvironment(options);
+  useEffect(() => {
+    initCallback && initCallback(deviceId || groupId);
+    return () => {
+      destroyCallback && destroyCallback(deviceId || groupId);
+    };
+  }, []);
+};

package/lib/panel/types/devInfo.d.ts

@@ -1,21 +1,21 @@
 export type DpValue = boolean | number | string;
 export type DpState = Record<string, DpValue>;
 export interface DpSchema {
-    attr: number;
-    canTrigger: boolean;
+    attr?: number;
+    canTrigger?: boolean;
     /**
      * 功能点标识码，如 switch
      */
     code: string;
-    defaultRecommend: boolean;
-    editPermission: boolean;
-    executable: boolean;
-    extContent: string;
-    iconname: string;
+    defaultRecommend?: boolean;
+    editPermission?: boolean;
+    executable?: boolean;
+    extContent?: string;
+    iconname?: string;
     /**
      * 功能点 ID
      */
-    id: number;
+    id: number | string;
     /**
      * 功能点模式类型
      * rw: 可下发可上报（可读可写）
@@ -34,7 +34,7 @@ export interface DpSchema {
         /**
          * 功能点类型
          */
-        type: 'bool' | 'value' | 'enum' | 'bitmap' | 'string';
+        type: 'bool' | 'value' | 'enum' | 'bitmap' | 'string' | 'raw';
         /**
          * 枚举值范围，type = enum 时才存在
          */
@@ -103,4 +103,17 @@ export type DevInfo = Omit<ty.device.DeviceInfo, 'schema' | 'panelConfig'> & {
      */
     panelConfig: PanelConfig;
 };
+/**
+ * 群组信息
+ */
+export type GroupInfo = ty.device.GroupInfo & {
+    /**
+     * dp id 与 dp code 的映射
+     */
+    idCodes: Record<string, string>;
+    /**
+     * dp code 与 dp id 的映射
+     */
+    codeIds: Record<string, string>;
+};
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ray-js/api",
-  "version": "1.5.15",
+  "version": "1.5.17",
   "description": "Ray universal api",
   "keywords": [
     "ray"
@@ -29,14 +29,14 @@
     "watch": "ray start --type=component"
   },
   "dependencies": {
-    "@ray-js/framework": "1.5.15",
-    "@ray-js/router": "1.5.15",
+    "@ray-js/framework": "1.5.17",
+    "@ray-js/router": "1.5.17",
     "@ray-js/wechat": "^0.2.9",
     "base64-browser": "^1.0.1",
     "query-string": "^7.1.3"
   },
   "devDependencies": {
-    "@ray-js/cli": "1.5.15",
+    "@ray-js/cli": "1.5.17",
     "art-template": "^4.13.2",
     "fs-extra": "^10.1.0",
     "miniprogram-api-typings": "^3.12.2",
@@ -46,5 +46,5 @@
     "access": "public",
     "registry": "https://registry.npmjs.org"
   },
-  "gitHead": "c6ad2520befad858e6a353cdedfe1d99f4f1ffb1"
+  "gitHead": "75e528047b1398d46fcbab0eb3184c501c63cd64"
 }