@ray-js/api 1.6.0-beta.6 → 1.6.0-beta.8

package/lib/cloud/device.d.ts

@@ -84,4 +84,24 @@ export interface GetRemoteLocalRelationResponse {
  * @returns
  */
 declare const getRemoteLocalRelation: (params: GetRemoteLocalRelationParams) => Promise<GetRemoteLocalRelationResponse>;
-export { getDpsInfos, updateDpName, getGroupDpsInfos, updateGroupDpName, getWeatherQuality, getWeathers, saveCustomizePosition, getCustomizePosition, getDevProperty, saveDevProperty, getRemoteLocalRelation, };
+declare enum BizType {
+    Device = 0,
+    Group = 1
+}
+type GetLightHighPowerParams = {
+    bizId: string;
+    bizType: BizType;
+    abilityCodes: string;
+};
+type GetLightHighPowerResponse = {
+    abilityCode: string;
+    buyableForCustomer?: boolean;
+    vasEnabled: boolean;
+}[] | [];
+/**
+ * 判断当前设备是否支持高级能力 @ray-js/ray^1.5.7 新增
+ * @param params { devId: string, type: number }
+ * @returns
+ */
+declare const getLightHighPower: (params: GetLightHighPowerParams) => Promise<GetLightHighPowerResponse>;
+export { getDpsInfos, updateDpName, getGroupDpsInfos, updateGroupDpName, getWeatherQuality, getWeathers, saveCustomizePosition, getCustomizePosition, getDevProperty, saveDevProperty, getRemoteLocalRelation, getLightHighPower, };

package/lib/cloud/device.js

@@ -148,4 +148,21 @@ const getRemoteLocalRelation = params => {
     version: '1.0'
   });
 };
-export { getDpsInfos, updateDpName, getGroupDpsInfos, updateGroupDpName, getWeatherQuality, getWeathers, saveCustomizePosition, getCustomizePosition, getDevProperty, saveDevProperty, getRemoteLocalRelation };
+var BizType = /*#__PURE__*/function (BizType) {
+  BizType[BizType["Device"] = 0] = "Device";
+  BizType[BizType["Group"] = 1] = "Group";
+  return BizType;
+}(BizType || {});
+/**
+ * 判断当前设备是否支持高级能力 @ray-js/ray^1.5.7 新增
+ * @param params { devId: string, type: number }
+ * @returns
+ */
+const getLightHighPower = params => {
+  return requestCloud({
+    api: "".concat(THING, ".m.light.high.power.get"),
+    data: params,
+    version: '1.2'
+  });
+};
+export { getDpsInfos, updateDpName, getGroupDpsInfos, updateGroupDpName, getWeatherQuality, getWeathers, saveCustomizePosition, getCustomizePosition, getDevProperty, saveDevProperty, getRemoteLocalRelation, getLightHighPower };

package/lib/cloud/interface.d.ts

@@ -1,3 +1,11 @@
+/**
+ * 与面板/设备建立绑定关系,通常为设备ID、DP点、群组、规则，dpId#value等
+ */
+type AssociativeEntityId = string;
+/**
+ * 当associativeEntityId不足以区分情况下使用，通常可关联设备、DP值、群组、规则等
+ */
+type AssociativeEntityValue = string;
 export interface Scene {
     dpId: number;
     bindType: number;
@@ -322,36 +330,117 @@ export interface IGetAstronomicalList {
     bizId: string;
 }
 export interface IGetAstronomicalListResponse {
-    categoryStatus: number;
-    id: string;
-    category: string;
-    timers: Array<{
-        status: number;
-        loops: string;
-        time: string;
-        id: number;
-        isAppPush: boolean;
-        dps: string;
-        groupOrder: number;
-        groupId: string;
-        aliasName: string;
-    }>;
+    /**
+     * 日出日落类型
+     */
+    astronomicalType: number;
+    /**
+     * 设备或群组 ID
+     */
+    bizId: string;
+    /**
+     * 资源类型。0：单设备。1：群组设备。
+     */
+    bizType: number;
+    /**
+     * DP 值
+     */
+    dps: string;
+    /**
+     * 定时任务 ID
+     */
+    id: number;
+    /**
+     * 经度
+     */
+    lat: number;
+    /**
+     * 纬度
+     */
+    lon: number;
+    /**
+     * 周循环
+     */
+    loops: string;
+    /**
+     * 下一个日出时间
+     */
+    nextSunSet: string;
+    /**
+     * 定时偏移执行类型
+     */
+    offsetType: number;
+    /**
+     * 定时任务状态，0 关闭，1 开启，2 无效/已删除
+     */
+    status: number;
+    /**
+     * 定时时间
+     */
+    time: string;
+    /**
+     * 时区
+     */
+    timezone: string;
 }
 export interface IAstronomical {
+    /**
+     * 定时任务 ID
+     */
+    id: number;
+    /**
+     * 设备或群组 ID
+     */
     bizId: string;
+    /**
+     * 资源类型。0：单设备。1：群组设备。
+     */
     bizType: number;
+    /**
+     * 周循环
+     */
     loops: string;
-    dps: any;
+    /**
+     * DP 值
+     */
+    dps: string;
+    /**
+     * 日出日落类型
+     */
     astronomicalType: number;
+    /**
+     * 时区
+     */
     timezone: string;
+    /**
+     * 定时日期 yyyyMMdd
+     */
     date: string;
+    /**
+     * 定时时间
+     */
     time: string;
+    /**
+     * 定时偏移执行类型
+     */
     offsetType: number;
+    /**
+     * 经度
+     */
     lat: number;
+    /**
+     * 纬度
+     */
     lon: number;
 }
 export interface IUpdateAstronomicalStatus {
+    /**
+     * 定时任务 ID
+     */
     id: string;
+    /**
+     * 0：关闭。1：开启
+     */
     status: number;
 }
 export interface IUpdateBillConfigure {
@@ -867,23 +956,215 @@ export type IGetSceneListResponse = Array<{
     name: string;
     id: string;
 }>;
+export interface ISceneAction {
+    /**
+     * 执行动作的显示名称
+     */
+    actionDisplay: string;
+    /**
+     * 执行动作的执行者
+     */
+    actionExecutor: string;
+    /**
+     * 执行动作的策略
+     */
+    actionStrategy: string;
+    /**
+     * 属性值
+     */
+    attribute: number;
+    /**
+     * 设备删除标记，表示设备是否被删除
+     */
+    devDelMark: boolean;
+    /**
+     * 动作是否启用
+     */
+    enabled: boolean;
+    /**
+     * 实体ID，表示动作所属的实体的ID
+     */
+    entityId: string;
+    /**
+     * 修改时间戳
+     */
+    gmtModified: number;
+    /**
+     * 动作的唯一ID
+     */
+    id: string;
+    /**
+     * 网关同步标记，表示是否网关同步
+     */
+    offGwSync: boolean;
+    /**
+     * 动作的顺序号
+     */
+    orderNum: number;
+    /**
+     * 规则ID，表示动作所属的规则的ID
+     */
+    ruleId: string;
+    /**
+     * 动作状态
+     */
+    status: boolean;
+    /**
+     * 用户ID，表示动作所属的用户的ID
+     */
+    uid: string;
+}
+/**
+ * 一键执行类型的联动规则数据
+ */
+export type IGetSceneListResponseV2 = Array<{
+    /**
+     * 执行动作
+     */
+    actions: ISceneAction[];
+    alarmIssue: boolean;
+    /**
+     * 属性
+     * 根据枚举值的2次幂进行位运算
+     */
+    attribute: number;
+    /**
+     * 审核状态
+     * 0. 未审核
+     * 1. 审核通过
+     * 2. 审核不通过
+     */
+    auditStatus: number;
+    /**
+     * 背景图地址
+     */
+    background?: string;
+    /**
+     * 面板绑定
+     */
+    boundForPanel: boolean;
+    boundForWiFiPanel: boolean;
+    /**
+     * 规则 code
+     */
+    code: string;
+    /**
+     * 通用json字段，比如本地联动会存网关id，gwId
+     */
+    commonField: string;
+    containDeviceDelete: boolean;
+    /**
+     * 图标
+     */
+    coverIcon: string;
+    description?: string;
+    disableTime?: number;
+    /**
+     * 背景颜色
+     */
+    displayColor: string;
+    /**
+     * 规则是否启用
+     */
+    enabled: boolean;
+    forceCloudTrigger: boolean;
+    /**
+     * 执行规则 id
+     */
+    id: string;
+    iotAutoAlarm: boolean;
+    isAlarmIssue: boolean;
+    isLogicRule: boolean;
+    /**
+     * 联动类型
+     */
+    linkageType: number;
+    /**
+     * 是否本地联动
+     */
+    localLinkage: boolean;
+    logicRule: boolean;
+    /**
+     * 匹配类型
+     * 1. 任意条件，多个条件里只要有一个即触发（即 或关系）。
+     * 2. 全部满足，多个条件全部满足才触发。
+     * 3. 表态式匹配， 根据 rule 字段的 expr 确定是否满足，条件满足时触发。
+     */
+    matchType: number;
+    /**
+     * 联动名称或备注
+     */
+    name: string;
+    needCleanGidSid: boolean;
+    needValidOutOfWork: boolean;
+    newLocalScene: boolean;
+    offGwSync: boolean;
+    offGwSyncSuccess: boolean;
+    orderWeight: number;
+    outOfWork: number;
+    /**
+     * 家庭id
+     */
+    ownerId: string;
+    panelType: number;
+    permissionCode: string;
+    ruleGenre: number;
+    ruleSource: number;
+    /**
+     * 规则类型
+     * 1. 系统定义
+     * 2. 商家定义
+     * 3. 用户定义
+     * 4. 安防规则
+     * 5. 服务定义（如 dp 点转发）
+     */
+    ruleType: number;
+    /**
+     * 运行环境
+     */
+    runtimeEnv: string;
+    scenarioRule: boolean;
+    status: boolean;
+    statusConditions: any[];
+    /**
+     * 是否显示在首页顶部
+     */
+    stickyOnTop: boolean;
+    subMatchType: number;
+    /**
+     * 用户 id
+     */
+    uid: string;
+}>;
 export interface IBindRule {
     devId: string;
-    associativeEntityId: string;
+    /**
+     * 与面板/设备建立绑定关系,通常为设备ID、DP点、群组、规则，dpId#value等
+     */
+    sourceEntityId?: string;
+    /**
+     * 当associativeEntityId不足以区分情况下使用，通常可关联设备、DP值、群组、规则等
+     */
+    associativeEntityId: AssociativeEntityId;
     ruleId: string;
     entitySubIds: string;
     expr: [string[]];
     bizDomain: string;
+    gid: string;
+    /**
+     * 拓展字段，非必传
+     */
+    property?: Record<string, any>;
 }
 export interface IBindRuleResponse {
     /**
-     * 关联 DP 点和 DP 点值的组合
+     * 与面板/设备建立绑定关系,通常为设备ID、DP点、群组、规则，dpId#value等
      */
-    associativeEntityId: string;
+    associativeEntityId: AssociativeEntityId;
     /**
-     * 动作 ID
+     * 当associativeEntityId不足以区分情况下使用，通常可关联设备、DP值、群组、规则等
      */
-    associativeEntityValue: string;
+    associativeEntityValue: AssociativeEntityValue;
     /**
      * 业务域
      */
@@ -909,25 +1190,69 @@ export interface IBindRuleResponse {
      */
     triggerRuleVO: any;
 }
+declare enum EntityType {
+    DEVICE = 1,// 关联实体为设备
+    RULE = 2
+}
 export interface IGetBindRuleList {
     bizDomain: string;
     devId: string;
     sourceEntityId?: string;
-    entityType: number;
+    entityType: EntityType;
     gid: string;
 }
 export type IGetBindRuleListResponse = Array<{
-    associativeEntityId: string;
-    associativeEntityValueList: any[];
+    /**
+     * 与面板/设备建立绑定关系,通常为设备ID、DP点、群组、规则，dpId#value等
+     */
+    associativeEntityId: AssociativeEntityId;
+    /**
+     * 关联实体的值列表
+     */
+    associativeEntityValueList: Array<IGetSceneListResponseV2[number] & {
+        /**
+         * 无线开关规则是否启用
+         */
+        triggerRuleEnable: boolean;
+        /**
+         * 无线开关执行规则 id
+         */
+        triggerRuleId: string;
+    }>;
+    /**
+     * 绑定 id，一般用来解绑
+     */
+    bindId: number;
+    /**
+     * 业务域
+     */
     bizDomain: string;
+    /**
+     * 是否启用
+     */
+    enable: boolean;
+    /**
+     * 设备 ID
+     */
     sourceEntityId: string;
 }>;
+export interface IUnbindRule {
+    /**
+     * 解绑 id
+     */
+    bindId: string;
+    /**
+     * 家庭 id
+     */
+    gid: string;
+}
 export interface IRemoveRule {
     bizDomain: string;
     sourceEntityId?: string;
     devId: string;
-    associativeEntityId: string;
-    associativeEntityValue: string;
+    associativeEntityId: AssociativeEntityId;
+    associativeEntityValue: AssociativeEntityValue;
+    gid: string;
 }
 export interface IGetDevProperty {
     /**
@@ -1057,3 +1382,4 @@ export type IGetZigbeeLocalGroupDeviceListResponse = Array<{
      */
     gwOnline: boolean;
 }>;
+export {};

package/lib/cloud/interface.js

@@ -1 +1,22 @@
+// 场景相关接口
+/**
+ * 与面板/设备建立绑定关系,通常为设备ID、DP点、群组、规则，dpId#value等
+ */
+/**
+ * 当associativeEntityId不足以区分情况下使用，通常可关联设备、DP值、群组、规则等
+ */
+// 云端定时接口
+// 电费统计接口
+// 设备接口
+// 数据统计接口
+// 告警相关接口
+// 联动相关
+/**
+ * 一键执行类型的联动规则数据
+ */
+var EntityType = /*#__PURE__*/function (EntityType) {
+  EntityType[EntityType["DEVICE"] = 1] = "DEVICE";
+  EntityType[EntityType["RULE"] = 2] = "RULE";
+  return EntityType;
+}(EntityType || {}); // 关联实体为联动规则
 export {};

package/lib/cloud/linkage.d.ts

@@ -1,4 +1,4 @@
-import { IGetLinkageDeviceList, IBindRule, IGetBindRuleList, IRemoveRule, IGetLinkageDeviceListResponse, IGetSceneListResponse, IGetBindRuleListResponse, IBindRuleResponse } from './interface';
+import { IGetLinkageDeviceList, IBindRule, IGetBindRuleList, IRemoveRule, IGetLinkageDeviceListResponse, IGetSceneListResponse, IGetBindRuleListResponse, IBindRuleResponse, IUnbindRule, IGetSceneListResponseV2 } from './interface';
 /**
  * 获取家庭下支持联动的设备列表
  * @param {number} gid 家庭id
@@ -6,20 +6,30 @@ import { IGetLinkageDeviceList, IBindRule, IGetBindRuleList, IRemoveRule, IGetLi
  */
 declare const getLinkageDeviceList: (params: IGetLinkageDeviceList) => Promise<IGetLinkageDeviceListResponse>;
 /**
- * 查询家庭下一键执行场景列表
+ * 查询家庭下联动规则列表，包含失效及自动化规则
  * @param {number} devId 设备id
  * @param {number} gid 家庭Id
  */
-declare const getSceneList: ({ devId, gid }: {
+declare const getSceneList: ({ devId, gid, }: {
     devId: string;
     gid: string;
 }) => Promise<IGetSceneListResponse>;
+/**
+ * 查询家庭下一键执行列表，会去掉失效或自动化规则
+ * @param {number} devId 设备id
+ * @param {boolean} containStandardZigBee 是否包含标准场景，默认不包含
+ * @param {number} gid 家庭Id
+ */
+declare const getSceneListV2: ({ devId, gid, containStandardZigBee, }: {
+    devId: string;
+    gid: string;
+    containStandardZigBee?: boolean;
+}) => Promise<IGetSceneListResponseV2>;
 /**
  * 查询家庭下已绑定的列表
  * @param {string} bizDomain 业务范围
  * @param {string} devId 设备id
  * @param {number} entityType 实体类型
- * @param {string} gid 家庭Id
  */
 declare const getBindRuleList: (params: IGetBindRuleList) => Promise<IGetBindRuleListResponse>;
 /**
@@ -30,14 +40,22 @@ declare const getBindRuleList: (params: IGetBindRuleList) => Promise<IGetBindRul
  * @param {string} entitySubIds 关联 DP 点
  * @param {Array} expr 关联DP点、动作组合
  * @param {string} bizDomain 业务域
+ * @param {string} bizDomain 业务域
+ */
+declare const bindRule: (params: IBindRule) => Promise<IBindRuleResponse>;
+/**
+ * 解绑联动
+ * @param {string} bindId 绑定 id
+ * @param {string} gid 家庭id
  */
-declare const bindRule: ({ devId, associativeEntityId, ruleId, entitySubIds, expr, bizDomain, }: IBindRule) => Promise<IBindRuleResponse>;
+declare const unbindRule: (params: IUnbindRule) => Promise<boolean>;
 /**
  * 解除联动
  * @param {string} bizDomain 业务范围
  * @param {string} devId 设备id
  * @param {string} associativeEntityId 关联dp组合
  * @param {string} associativeEntityValue 规则id
+ * @param {string} gid 家庭id
  */
 declare const removeRule: (params: IRemoveRule) => Promise<boolean>;
 /**
@@ -61,4 +79,4 @@ declare const enableRule: ({ ruleId }: {
 declare const disableRule: ({ ruleId }: {
     ruleId: string;
 }) => Promise<boolean>;
-export { getLinkageDeviceList, getSceneList, getBindRuleList, bindRule, removeRule, triggerRule, enableRule, disableRule, };
+export { getLinkageDeviceList, getSceneList, getSceneListV2, getBindRuleList, bindRule, unbindRule, removeRule, triggerRule, enableRule, disableRule, };

package/lib/cloud/linkage.js

@@ -1,6 +1,7 @@
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-const _excluded = ["gid", "devId", "sourceEntityId"];
+const _excluded = ["gid", "devId", "sourceEntityId"],
+  _excluded2 = ["sourceEntityId", "devId", "gid"];
 import { requestCloud } from '../';
 import { THING } from '../constants';
 /**
@@ -14,13 +15,13 @@ const getLinkageDeviceList = params => {
     version: '3.0',
     data: _objectSpread({}, params),
     extData: {
-      gid: params.gid
+      gid: "".concat(params.gid)
     }
   });
 };
 
 /**
- * 查询家庭下一键执行场景列表
+ * 查询家庭下联动规则列表，包含失效及自动化规则
  * @param {number} devId 设备id
  * @param {number} gid 家庭Id
  */
@@ -36,7 +37,32 @@ const getSceneList = _ref => {
       devId
     },
     extData: {
-      gid
+      gid: "".concat(gid)
+    }
+  });
+};
+
+/**
+ * 查询家庭下一键执行列表，会去掉失效或自动化规则
+ * @param {number} devId 设备id
+ * @param {boolean} containStandardZigBee 是否包含标准场景，默认不包含
+ * @param {number} gid 家庭Id
+ */
+const getSceneListV2 = _ref2 => {
+  let {
+    devId,
+    gid,
+    containStandardZigBee = false
+  } = _ref2;
+  return requestCloud({
+    api: "".concat(THING, ".m.linkage.rule.brief.query"),
+    version: '2.0',
+    data: {
+      devId,
+      containStandardZigBee
+    },
+    extData: {
+      gid: "".concat(gid)
     }
   });
 };
@@ -46,7 +72,6 @@ const getSceneList = _ref => {
  * @param {string} bizDomain 业务范围
  * @param {string} devId 设备id
  * @param {number} entityType 实体类型
- * @param {string} gid 家庭Id
  */
 const getBindRuleList = async params => {
   const {
@@ -62,7 +87,7 @@ const getBindRuleList = async params => {
       sourceEntityId: sourceEntityId || devId
     }),
     extData: {
-      gid
+      gid: "".concat(gid)
     }
   });
 };
@@ -75,22 +100,26 @@ const getBindRuleList = async params => {
  * @param {string} entitySubIds 关联 DP 点
  * @param {Array} expr 关联DP点、动作组合
  * @param {string} bizDomain 业务域
+ * @param {string} bizDomain 业务域
  */
-const bindRule = _ref2 => {
-  let {
+const bindRule = params => {
+  const {
     devId,
+    sourceEntityId,
     associativeEntityId,
     ruleId,
     entitySubIds,
     expr,
-    bizDomain
-  } = _ref2;
+    bizDomain,
+    gid,
+    property
+  } = params;
   return requestCloud({
     api: "".concat(THING, ".m.linkage.associative.entity.bind"),
     version: '1.0',
     data: {
       relationExpr: {
-        sourceEntityId: devId,
+        sourceEntityId: sourceEntityId || devId,
         associativeEntityId,
         associativeEntityValue: ruleId,
         triggerRuleVO: {
@@ -107,9 +136,32 @@ const bindRule = _ref2 => {
             actionExecutor: 'ruleTrigger'
           }]
         },
+        ruleIds: [ruleId],
+        property,
         bizDomain,
         uniqueType: 3
       }
+    },
+    extData: {
+      gid: "".concat(gid)
+    }
+  });
+};
+
+/**
+ * 解绑联动
+ * @param {string} bindId 绑定 id
+ * @param {string} gid 家庭id
+ */
+const unbindRule = params => {
+  return requestCloud({
+    api: "".concat(THING, ".m.linkage.bind.delete"),
+    version: '1.0',
+    data: {
+      bindId: params.bindId
+    },
+    extData: {
+      gid: "".concat(params.gid)
     }
   });
 };
@@ -120,12 +172,24 @@ const bindRule = _ref2 => {
  * @param {string} devId 设备id
  * @param {string} associativeEntityId 关联dp组合
  * @param {string} associativeEntityValue 规则id
+ * @param {string} gid 家庭id
  */
 const removeRule = params => {
+  const {
+      sourceEntityId,
+      devId,
+      gid
+    } = params,
+    rest = _objectWithoutProperties(params, _excluded2);
   return requestCloud({
     api: "".concat(THING, ".m.linkage.associative.entity.remove"),
     version: '1.0',
-    data: _objectSpread({}, params)
+    data: _objectSpread({
+      sourceEntityId: sourceEntityId || devId
+    }, rest),
+    extData: {
+      gid: "".concat(gid)
+    }
   });
 };
 
@@ -179,4 +243,4 @@ const disableRule = _ref5 => {
     }
   });
 };
-export { getLinkageDeviceList, getSceneList, getBindRuleList, bindRule, removeRule, triggerRule, enableRule, disableRule };
+export { getLinkageDeviceList, getSceneList, getSceneListV2, getBindRuleList, bindRule, unbindRule, removeRule, triggerRule, enableRule, disableRule };

package/lib/nativeRouters/common.d.ts

@@ -1,15 +1,17 @@
+export type ErrorMsg = {
+    errorMsg: string;
+    errorCode: string | number;
+    innerError: {
+        errorCode: string | number;
+        errorMsg: string;
+    };
+};
 export type ICommon = {
     success?: () => void;
-    fail?: (err?: {
-        errorMsg: string;
-        errorCode: string | number;
-        innerError: {
-            errorCode: string | number;
-            errorMsg: string;
-        };
-    }) => void;
+    fail?: (err?: ErrorMsg) => void;
     complete?: () => void;
-} & {
+};
+export type RecordRest = {
     [key: string]: string | boolean | number;
 };
 export declare function nativeRouter<T extends ICommon>(uri: string, params?: T): Promise<void>;

package/lib/nativeRouters/device.d.ts

@@ -4,6 +4,7 @@ type OpenSceneCreateParams = {
 } & ICommon;
 export declare function openSceneCreate(params?: OpenSceneCreateParams): Promise<void>;
 export declare const openCreateScene: typeof openSceneCreate;
+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

@@ -1,9 +1,18 @@
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import { nativeRouter } from './common';
 export function openSceneCreate(params) {
   return nativeRouter('createScene', params);
 }
 export const openCreateScene = openSceneCreate;
 
+// App 基线 5.13.0 以上开始支持
+export function openCreateTapToRunScene(params) {
+  const p = _objectSpread({
+    biz_type: 'click_execution'
+  }, params);
+  return nativeRouter('addScene', p);
+}
+
 // 兼容Android 端仅支持 Zigbee 本地场景, Android使用createSmartScene
 export function openUniversalCreateScene(params) {
   const url = ty.getSystemInfoSync().platform === 'android' ? 'createSmartScene' : 'createScene';

package/lib/nativeRouters/root.d.ts

@@ -21,7 +21,10 @@ type OpenMoreService = {} & ICommon;
  * 跳转到更多服务
  */
 export declare function openMoreService(params?: OpenMoreService): Promise<void>;
-type OpenAppHelpCenter = {} & ICommon;
+type OpenAppHelpCenter = {
+    bizCode?: string;
+    key?: string;
+} & ICommon;
 /**
  * 跳转到App帮助与反馈页
  */

package/lib/nativeRouters/root.js

@@ -1,3 +1,6 @@
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
+const _excluded = ["bizCode", "key"];
 import { nativeRouter } from './common';
 /**
  * 打开APP扫码
@@ -31,7 +34,17 @@ export function openMoreService(params) {
  * 跳转到App帮助与反馈页
  */
 export function openAppHelpCenter(params) {
-  return nativeRouter('helpCenter', params);
+  const _ref = params || {},
+    {
+      bizCode = 'help_center',
+      key = 'main_page'
+    } = _ref,
+    rest = _objectWithoutProperties(_ref, _excluded);
+  const p = _objectSpread({
+    bizCode,
+    key
+  }, rest);
+  return nativeRouter('helpCenter', p);
 }
 
 // messageCenter

package/lib/nativeRouters//347/231/275/345/220/215/345/215/225.md

@@ -0,0 +1,64 @@
+```
+createScene
+tysh_family_add_member_rn
+presentGatewayCategroy
+device_detail
+helpAndFeedBack
+sceneUiUpdate
+createAuto
+member_info
+more_service
+createScene_allDevices
+editScene
+ty_home_security_page
+createAutoWithCondition
+config_device
+device_only_search_config_gw_sub
+grid_update_firmware
+dev_network_check
+helpCenter
+camera_base_setting
+device_gw_sub_device_help_list
+zigbee_pair
+devManualAndSmart
+device_offline_reconnect
+ihcImportDevice
+complete_user_information
+ty_user_setting
+addRelationDeviceWithoutMesh
+editLocalSceneWithoutMesh
+philipsImportDevice
+msg_media_play
+gotoGeekLock
+devMultiLink
+scene/createScene
+camera_video_view
+config_device_home
+messageCenter
+smartScene
+jumpHome
+tysh_family_setting
+camera_motion_monitor
+tutorial_tips
+sleep_stages_guide
+editZigbeeGroupScene
+ty_scene_device_related_scenes
+range-finder-canvas
+settingVoiceServiceConfigListRouter
+createAutoWithCondition
+scan
+upgrade_detail
+tsod_cycling_navigation
+tsod_additional_unlock_methods
+tsod_ambient_lighting
+tsod_shortcut_siri
+config_device_home
+thing_add_scene
+// 6.13新增
+createSmartScene
+addScene
+camera_playback_panel
+ipc_album_panel
+camera_cloud_panel
+modeSetting
+```

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.6.0-beta.6",
+  "version": "1.6.0-beta.8",
   "description": "Ray universal api",
   "keywords": [
     "ray"
@@ -29,14 +29,14 @@
     "watch": "ray start --type=component"
   },
   "dependencies": {
-    "@ray-js/framework": "^1.6.0-beta.6",
-    "@ray-js/router": "^1.6.0-beta.6",
+    "@ray-js/framework": "^1.6.0-beta.8",
+    "@ray-js/router": "^1.6.0-beta.8",
     "@ray-js/wechat": "^0.2.9",
     "base64-browser": "^1.0.1",
     "query-string": "^7.1.3"
   },
   "devDependencies": {
-    "@ray-js/cli": "^1.6.0-beta.6",
+    "@ray-js/cli": "^1.6.0-beta.8",
     "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": "d7f01ca1b85707f2e7696e820b45aa271a39126d"
+  "gitHead": "b1d4118961bba4f3f2a889ec5bb9444d165df0dc"
 }