@ray-js/api 1.4.61-beta.1 → 1.4.61

package/lib/cloud/doorlock.d.ts

@@ -23,7 +23,7 @@ export declare const getLockActivePeriod: ({ devId }: {
  */
 export declare const getLockMemberInfo: ({ devId, userId }: {
     devId: string;
-    userId?: string;
+    userId?: string | undefined;
 }) => void;
 /**
  * 远程开门

package/lib/cloud/interface.d.ts

@@ -911,8 +911,10 @@ export interface IBindRuleResponse {
 }
 export interface IGetBindRuleList {
     bizDomain: string;
-    sourceEntityId: string;
+    devId: string;
+    sourceEntityId?: string;
     entityType: number;
+    gid: string;
 }
 export type IGetBindRuleListResponse = Array<{
     associativeEntityId: string;
@@ -922,7 +924,8 @@ export type IGetBindRuleListResponse = Array<{
 }>;
 export interface IRemoveRule {
     bizDomain: string;
-    sourceEntityId: string;
+    sourceEntityId?: string;
+    devId: string;
     associativeEntityId: string;
     associativeEntityValue: string;
 }

package/lib/cloud/linkage.d.ts

@@ -6,17 +6,20 @@ 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 }: {
+declare const getSceneList: ({ devId, gid }: {
     devId: string;
+    gid: string;
 }) => Promise<IGetSceneListResponse>;
 /**
- * 查询已绑定的列表
+ * 查询家庭下已绑定的列表
  * @param {string} bizDomain 业务范围
- * @param {string} sourceEntityId 设备id
+ * @param {string} devId 设备id
  * @param {number} entityType 实体类型
+ * @param {string} gid 家庭Id
  */
 declare const getBindRuleList: (params: IGetBindRuleList) => Promise<IGetBindRuleListResponse>;
 /**
@@ -32,7 +35,7 @@ declare const bindRule: ({ devId, associativeEntityId, ruleId, entitySubIds, exp
 /**
  * 解除联动
  * @param {string} bizDomain 业务范围
- * @param {string} sourceEntityId 设备id
+ * @param {string} devId 设备id
  * @param {string} associativeEntityId 关联dp组合
  * @param {string} associativeEntityValue 规则id
  */

package/lib/cloud/linkage.js

@@ -1,4 +1,6 @@
+import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+const _excluded = ["gid", "devId", "sourceEntityId"];
 import { requestCloud } from '../';
 import { THING } from '../constants';
 /**
@@ -10,39 +12,58 @@ const getLinkageDeviceList = params => {
   return requestCloud({
     api: "".concat(THING, ".m.linkage.dev.list"),
     version: '3.0',
-    data: _objectSpread({}, params)
+    data: _objectSpread({}, params),
+    extData: {
+      gid: params.gid
+    }
   });
 };
 
 /**
- * 查询一键执行场景列表
+ * 查询家庭下一键执行场景列表
  * @param {number} devId 设备id
+ * @param {number} gid 家庭Id
  */
 const getSceneList = _ref => {
   let {
-    devId
+    devId,
+    gid
   } = _ref;
   return requestCloud({
     api: "".concat(THING, ".m.linkage.rule.brief.query"),
     version: '1.0',
     data: {
       devId
+    },
+    extData: {
+      gid
     }
   });
 };
 
 /**
- * 查询已绑定的列表
+ * 查询家庭下已绑定的列表
  * @param {string} bizDomain 业务范围
- * @param {string} sourceEntityId 设备id
+ * @param {string} devId 设备id
  * @param {number} entityType 实体类型
+ * @param {string} gid 家庭Id
  */
-
-const getBindRuleList = params => {
+const getBindRuleList = async params => {
+  const {
+      gid,
+      devId,
+      sourceEntityId
+    } = params,
+    rest = _objectWithoutProperties(params, _excluded);
   return requestCloud({
     api: "".concat(THING, ".m.linkage.associative.entity.id.category.query"),
     version: '1.0',
-    data: _objectSpread({}, params)
+    data: _objectSpread(_objectSpread({}, rest), {}, {
+      sourceEntityId: sourceEntityId || devId
+    }),
+    extData: {
+      gid
+    }
   });
 };
 
@@ -96,7 +117,7 @@ const bindRule = _ref2 => {
 /**
  * 解除联动
  * @param {string} bizDomain 业务范围
- * @param {string} sourceEntityId 设备id
+ * @param {string} devId 设备id
  * @param {string} associativeEntityId 关联dp组合
  * @param {string} associativeEntityValue 规则id
  */

package/lib/nativeRouters/common.js

@@ -20,6 +20,10 @@ export function nativeRouter(uri, params) {
         resolve();
       },
       fail(err) {
+        if (+err.errorCode === 40016) {
+          // 该环境不可使用，请使用真机预览和线上包
+          err.errorMsg = 'Cannot use in this environment. Please use real device preview.';
+        }
         fail === null || fail === void 0 || fail(err);
         reject(err);
       },

package/package.json

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