@ray-js/api 1.4.31 → 1.4.33

package/lib/cloud/interface.d.ts

@@ -581,6 +581,14 @@ export interface IGetWeathersResponse {
          * 二氧化氮
          */
         tlow: number;
+        /**
+         * 降雨概率，单位%
+         */
+        pop: number;
+        /**
+         * 降水量，单位毫米
+         */
+        qpf: number;
         /**
          * 日落时间戳
          */

package/lib/index.d.ts

@@ -35,5 +35,6 @@ export * from './openGroupCreate';
 /**
  * 新增跳转Native路由
  * 1.4.23 openSceneCreate/openSceneEdit
+ * 1.4.32 openCreateScene/openEditScene/openGuideScene/openAppScan/openConfigDevice/openUniversalCreateScene
  */
 export * from './nativeRouters';

package/lib/index.js

@@ -39,5 +39,6 @@ export * from './openGroupCreate';
 /**
  * 新增跳转Native路由
  * 1.4.23 openSceneCreate/openSceneEdit
+ * 1.4.32 openCreateScene/openEditScene/openGuideScene/openAppScan/openConfigDevice/openUniversalCreateScene
  */
 export * from './nativeRouters';

package/lib/nativeRouters/device.d.ts

@@ -0,0 +1,80 @@
+type OpenSceneCreateParams = {
+    devId?: string;
+    success?: () => void;
+    fail?: (err?: {
+        errorMsg: string;
+        errorCode: string | number;
+        innerError: {
+            errorCode: string | number;
+            errorMsg: string;
+        };
+    }) => void;
+    complete?: () => void;
+} & {
+    [key: string]: string | boolean | number;
+};
+export declare function openSceneCreate(params?: OpenSceneCreateParams): Promise<void>;
+export declare const openCreateScene: typeof openSceneCreate;
+export declare function openUniversalCreateScene(params?: OpenSceneCreateParams): Promise<void>;
+type OpenSceneEdit = {
+    devId?: string;
+    sceneId?: string;
+    success?: () => void;
+    fail?: (err?: {
+        errorMsg: string;
+        errorCode: string | number;
+        innerError: {
+            errorCode: string | number;
+            errorMsg: string;
+        };
+    }) => void;
+    complete?: () => void;
+} & {
+    [key: string]: string | boolean | number;
+};
+export declare function openSceneEdit(params?: OpenSceneEdit): Promise<void>;
+export declare const openEditScene: typeof openSceneEdit;
+type OpenGuideScene = {
+    action?: 'add' | 'edit';
+    success?: () => void;
+    fail?: (err?: {
+        errorMsg: string;
+        errorCode: string | number;
+        innerError: {
+            errorCode: string | number;
+            errorMsg: string;
+        };
+    }) => void;
+    complete?: () => void;
+} & {
+    [key: string]: string | boolean | number;
+};
+/**
+ * 打开APP引导场景页
+ * @param params { action?: 'add' | 'edit', success?: () => void, fail?: (err?: { errorMsg: string, errorCode: string | number, innerError: { errorCode: string | number, errorMsg: string } }) => void, complete?: () => void, [key: string]: string | boolean | number }
+ * @returns
+ */
+export declare function openGuideScene(params?: OpenGuideScene): Promise<void>;
+type OpenConfigDevice = {
+    devId?: string;
+    sceneId?: string;
+    success?: () => void;
+    fail?: (err?: {
+        errorMsg: string;
+        errorCode: string | number;
+        innerError: {
+            errorCode: string | number;
+            errorMsg: string;
+        };
+    }) => void;
+    complete?: () => void;
+} & {
+    [key: string]: string | boolean | number;
+};
+/**
+ * 打开编辑场景页面
+ * @param params { devId?: string, sceneId?: string, success?: () => void, fail?: (err?: { errorMsg: string, errorCode: string | number, innerError: { errorCode: string | number, errorMsg: string } }) => void, complete?: () => void, [key: string]: string | boolean | number }
+ * @returns
+ */
+export declare function openConfigDevice(params?: OpenConfigDevice): Promise<void>;
+export {};

package/lib/nativeRouters/device.js

@@ -0,0 +1,163 @@
+import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
+const _excluded = ["success", "fail", "complete"],
+  _excluded2 = ["success", "fail", "complete"],
+  _excluded3 = ["success", "fail", "complete"],
+  _excluded4 = ["success", "fail", "complete"],
+  _excluded5 = ["success", "fail", "complete"];
+import { isAndroid } from '@ray-js/env';
+import { stringifyUrl } from '../utils';
+export function openSceneCreate(params) {
+  const _ref = params || {},
+    {
+      success,
+      fail,
+      complete
+    } = _ref,
+    rest = _objectWithoutProperties(_ref, _excluded);
+  return new Promise((resolve, reject) => {
+    ty.router({
+      url: stringifyUrl({
+        url: 'createScene',
+        query: rest
+      }),
+      success() {
+        success === null || success === void 0 ? void 0 : success();
+        resolve();
+      },
+      fail(err) {
+        fail === null || fail === void 0 ? void 0 : fail(err);
+        reject(err);
+      },
+      complete() {
+        complete === null || complete === void 0 ? void 0 : complete();
+      }
+    });
+  });
+}
+export const openCreateScene = openSceneCreate;
+
+// 兼容Android 端仅支持 Zigbee 本地场景, Android使用createSmartScene
+export function openUniversalCreateScene(params) {
+  const _ref2 = params || {},
+    {
+      success,
+      fail,
+      complete
+    } = _ref2,
+    rest = _objectWithoutProperties(_ref2, _excluded2);
+  const url = isAndroid ? 'createSmartScene' : 'createScene';
+  return new Promise((resolve, reject) => {
+    ty.router({
+      url: stringifyUrl({
+        url,
+        query: rest
+      }),
+      success() {
+        success === null || success === void 0 ? void 0 : success();
+        resolve();
+      },
+      fail(err) {
+        fail === null || fail === void 0 ? void 0 : fail(err);
+        reject(err);
+      },
+      complete() {
+        complete === null || complete === void 0 ? void 0 : complete();
+      }
+    });
+  });
+}
+export function openSceneEdit(params) {
+  const _ref3 = params || {},
+    {
+      success,
+      fail,
+      complete
+    } = _ref3,
+    rest = _objectWithoutProperties(_ref3, _excluded3);
+  return new Promise((resolve, reject) => {
+    ty.router({
+      url: stringifyUrl({
+        url: 'editScene',
+        query: rest
+      }),
+      success() {
+        success === null || success === void 0 ? void 0 : success();
+        resolve();
+      },
+      fail(err) {
+        fail === null || fail === void 0 ? void 0 : fail(err);
+        reject(err);
+      },
+      complete() {
+        complete === null || complete === void 0 ? void 0 : complete();
+      }
+    });
+  });
+}
+export const openEditScene = openSceneEdit;
+/**
+ * 打开APP引导场景页
+ * @param params { action?: 'add' | 'edit', success?: () => void, fail?: (err?: { errorMsg: string, errorCode: string | number, innerError: { errorCode: string | number, errorMsg: string } }) => void, complete?: () => void, [key: string]: string | boolean | number }
+ * @returns
+ */
+export function openGuideScene(params) {
+  const _ref4 = params || {},
+    {
+      success,
+      fail,
+      complete
+    } = _ref4,
+    rest = _objectWithoutProperties(_ref4, _excluded4);
+  return new Promise((resolve, reject) => {
+    ty.router({
+      url: stringifyUrl({
+        url: 'thing_add_scene',
+        query: rest
+      }),
+      success() {
+        success === null || success === void 0 ? void 0 : success();
+        resolve();
+      },
+      fail(err) {
+        fail === null || fail === void 0 ? void 0 : fail(err);
+        reject(err);
+      },
+      complete() {
+        complete === null || complete === void 0 ? void 0 : complete();
+      }
+    });
+  });
+}
+/**
+ * 打开编辑场景页面
+ * @param params { devId?: string, sceneId?: string, success?: () => void, fail?: (err?: { errorMsg: string, errorCode: string | number, innerError: { errorCode: string | number, errorMsg: string } }) => void, complete?: () => void, [key: string]: string | boolean | number }
+ * @returns
+ */
+export function openConfigDevice(params) {
+  const _ref5 = params || {},
+    {
+      success,
+      fail,
+      complete
+    } = _ref5,
+    rest = _objectWithoutProperties(_ref5, _excluded5);
+  return new Promise((resolve, reject) => {
+    ty.router({
+      url: stringifyUrl({
+        url: 'config_device',
+        query: rest
+      }),
+      success() {
+        success === null || success === void 0 ? void 0 : success();
+        resolve();
+      },
+      fail(err) {
+        fail === null || fail === void 0 ? void 0 : fail(err);
+        reject(err);
+      },
+      complete() {
+        complete === null || complete === void 0 ? void 0 : complete();
+      }
+    });
+  });
+}

package/lib/nativeRouters/index.d.ts

@@ -1,2 +1,3 @@
-export * from './scene';
+export * from './device';
 export * from './outdoors';
+export * from './root';

package/lib/nativeRouters/index.js

@@ -1,2 +1,3 @@
-export * from './scene';
-export * from './outdoors';
+export * from './device';
+export * from './outdoors';
+export * from './root';

package/lib/nativeRouters/outdoors.d.ts

@@ -18,7 +18,7 @@ type OpenOutdoorCyclingNavigationParams = {
  * @param params {devId: string}
  * @returns
  */
-export declare function openOutdoorCyclingNavigation(params: OpenOutdoorCyclingNavigationParams): Promise<void>;
+export declare function openOutdoorCyclingNavigation(params?: OpenOutdoorCyclingNavigationParams): Promise<void>;
 type OpenAdditionalUnlockMethodsParams = {
     devId?: string;
     success?: () => void;
@@ -60,7 +60,7 @@ type OpenOutdoorAmbientLightingParams = {
  * @param params {devId: string}
  * @returns
  */
-export declare function openOutdoorAmbientLighting(params: OpenOutdoorAmbientLightingParams): Promise<void>;
+export declare function openOutdoorAmbientLighting(params?: OpenOutdoorAmbientLightingParams): Promise<void>;
 type OpenOutdoorShortcutSiriParams = {
     devId?: string;
     success?: () => void;
@@ -102,5 +102,5 @@ type OpenOutdoorConfigDeviceHomeParams = {
  * @param params {devId: string}
  * @returns
  */
-export declare function openOutdoorConfigDeviceHome(params: OpenOutdoorConfigDeviceHomeParams): Promise<void>;
+export declare function openOutdoorConfigDeviceHome(params?: OpenOutdoorConfigDeviceHomeParams): Promise<void>;
 export {};

package/lib/nativeRouters/outdoors.js

@@ -4,26 +4,26 @@ const _excluded = ["success", "fail", "complete"],
   _excluded3 = ["success", "fail", "complete"],
   _excluded4 = ["success", "fail", "complete"],
   _excluded5 = ["success", "fail", "complete"];
-import { objectToUrlParams } from '../utils';
+import { stringifyUrl } from '../utils';
 /**
  * 打开骑行导航页面
  * @param params {devId: string}
  * @returns
  */
 export function openOutdoorCyclingNavigation(params) {
-  const {
+  const _ref = params || {},
+    {
       success,
       fail,
       complete
-    } = params,
-    rest = _objectWithoutProperties(params, _excluded);
-  let paramsStr = '';
-  if (Object.keys(rest).length > 0) {
-    paramsStr = '?' + objectToUrlParams(rest);
-  }
+    } = _ref,
+    rest = _objectWithoutProperties(_ref, _excluded);
   return new Promise((resolve, reject) => {
     ty.router({
-      url: 'tuyaSmart://tsod_cycling_navigation' + paramsStr,
+      url: stringifyUrl({
+        url: 'tsod_outdoor_cycling_navigation',
+        query: rest
+      }),
       success() {
         success === null || success === void 0 ? void 0 : success();
         resolve();
@@ -50,13 +50,12 @@ export function openAdditionalUnlockMethods(params) {
       complete
     } = params,
     rest = _objectWithoutProperties(params, _excluded2);
-  let paramsStr = '';
-  if (Object.keys(rest).length > 0) {
-    paramsStr = '?' + objectToUrlParams(rest);
-  }
   return new Promise((resolve, reject) => {
     ty.router({
-      url: 'tuyaSmart://tsod_additional_unlock_methods' + paramsStr,
+      url: stringifyUrl({
+        url: 'tsod_additional_unlock_methods',
+        query: rest
+      }),
       success() {
         success === null || success === void 0 ? void 0 : success();
         resolve();
@@ -77,19 +76,19 @@ export function openAdditionalUnlockMethods(params) {
  * @returns
  */
 export function openOutdoorAmbientLighting(params) {
-  const {
+  const _ref2 = params || {},
+    {
       success,
       fail,
       complete
-    } = params,
-    rest = _objectWithoutProperties(params, _excluded3);
-  let paramsStr = '';
-  if (Object.keys(rest).length > 0) {
-    paramsStr = '?' + objectToUrlParams(rest);
-  }
+    } = _ref2,
+    rest = _objectWithoutProperties(_ref2, _excluded3);
   return new Promise((resolve, reject) => {
     ty.router({
-      url: 'tuyaSmart://tsod_ambient_lighting' + paramsStr,
+      url: stringifyUrl({
+        url: 'tsod_outdoor_ambient_lighting',
+        query: rest
+      }),
       success() {
         success === null || success === void 0 ? void 0 : success();
         resolve();
@@ -116,13 +115,12 @@ export function openOutdoorShortcutSiri(params) {
       complete
     } = params,
     rest = _objectWithoutProperties(params, _excluded4);
-  let paramsStr = '';
-  if (Object.keys(rest).length > 0) {
-    paramsStr = '?' + objectToUrlParams(rest);
-  }
   return new Promise((resolve, reject) => {
     ty.router({
-      url: 'tuyaSmart://tsod_shortcut_siri' + paramsStr,
+      url: stringifyUrl({
+        url: 'tsod_outdoor_shortcut_siri',
+        query: rest
+      }),
       success() {
         success === null || success === void 0 ? void 0 : success();
         resolve();
@@ -143,19 +141,19 @@ export function openOutdoorShortcutSiri(params) {
  * @returns
  */
 export function openOutdoorConfigDeviceHome(params) {
-  const {
+  const _ref3 = params || {},
+    {
       success,
       fail,
       complete
-    } = params,
-    rest = _objectWithoutProperties(params, _excluded5);
-  let paramsStr = '';
-  if (Object.keys(rest).length > 0) {
-    paramsStr = '?' + objectToUrlParams(rest);
-  }
+    } = _ref3,
+    rest = _objectWithoutProperties(_ref3, _excluded5);
   return new Promise((resolve, reject) => {
     ty.router({
-      url: 'tuyaSmart://config_device_home' + paramsStr,
+      url: stringifyUrl({
+        url: 'tsod_outdoor_config_device_home',
+        query: rest
+      }),
       success() {
         success === null || success === void 0 ? void 0 : success();
         resolve();

package/lib/nativeRouters/root.d.ts

@@ -0,0 +1,23 @@
+type OpenAppScanParams = {
+    gwId?: string;
+    source?: string;
+    success?: () => void;
+    fail?: (err?: {
+        errorMsg: string;
+        errorCode: string | number;
+        innerError: {
+            errorCode: string | number;
+            errorMsg: string;
+        };
+    }) => void;
+    complete?: () => void;
+} & {
+    [key: string]: string | boolean | number;
+};
+/**
+ * 打开APP扫码
+ * @param params {gwId: string, source: string}
+ * @returns
+ */
+export declare function openAppScan(params?: OpenAppScanParams): Promise<void>;
+export {};

package/lib/nativeRouters/root.js

@@ -0,0 +1,36 @@
+import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
+const _excluded = ["success", "fail", "complete"];
+import { stringifyUrl } from '../utils';
+/**
+ * 打开APP扫码
+ * @param params {gwId: string, source: string}
+ * @returns
+ */
+export function openAppScan(params) {
+  const _ref = params || {},
+    {
+      success,
+      fail,
+      complete
+    } = _ref,
+    rest = _objectWithoutProperties(_ref, _excluded);
+  return new Promise((resolve, reject) => {
+    ty.router({
+      url: stringifyUrl({
+        url: 'scan',
+        query: rest
+      }),
+      success() {
+        success === null || success === void 0 ? void 0 : success();
+        resolve();
+      },
+      fail(err) {
+        fail === null || fail === void 0 ? void 0 : fail(err);
+        reject(err);
+      },
+      complete() {
+        complete === null || complete === void 0 ? void 0 : complete();
+      }
+    });
+  });
+}

package/lib/utils.d.ts

@@ -1,8 +1,10 @@
+import { UrlObject } from 'query-string';
 type Opts = {
     deprecated?: boolean;
     namespace?: string;
 };
 export declare function factory(name: string, opts?: Opts): () => any;
 export declare function factoryContants(name: string, opts?: Opts): any;
-export declare function objectToUrlParams(obj: Record<string, string | number | boolean>): string;
+export declare const parseUrl: (url: string) => import("query-string").ParsedUrl;
+export declare const stringifyUrl: (object: UrlObject) => string;
 export {};

package/lib/utils.js

@@ -1,3 +1,4 @@
+import { stringifyUrl as _stringifyUrl, parseUrl as _parseUrl } from 'query-string';
 export function factory(name) {
   let opts = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   return function () {
@@ -11,6 +12,7 @@ export function factory(name) {
       console.warn(`// TODO 暂未实现方法 ${opts.namespace ? opts.namespace + '.' : ''}${name}`);
       return;
     }
+    // eslint-disable-next-line prefer-rest-params
     return method.apply(this, arguments);
   };
 }
@@ -26,16 +28,18 @@ export function factoryContants(name) {
   }
   return inst[name];
 }
-export function objectToUrlParams(obj) {
-  const params = [];
-  for (const key in obj) {
-    // eslint-disable-next-line no-prototype-builtins
-    if (obj.hasOwnProperty(key)) {
-      const value = obj[key];
-      const encodedKey = encodeURIComponent(key);
-      const encodedValue = encodeURIComponent(value);
-      params.push(`${encodedKey}=${encodedValue}`);
-    }
-  }
-  return params.join('&');
-}
+export const parseUrl = url => {
+  return _parseUrl(url, {
+    arrayFormat: 'bracket',
+    // WARN: 这里的参数与微信不一致, 但是无法进行修改了, 存量的项目已经在使用
+    // 例如 url=encodeURIComponent('https://www.baidu.com?name=1&age=2') 在微信中不会进行 decode
+    // 而在涂鸦小程序上会进行 decode, 这里是需要注意的地方
+    decode: true
+  });
+};
+export const stringifyUrl = object => {
+  return _stringifyUrl(object, {
+    arrayFormat: 'bracket',
+    encode: true
+  });
+};

package/package.json

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

package/lib/nativeRouters/scene.d.ts

@@ -1,34 +0,0 @@
-type OpenSceneCreateParams = {
-    devId?: string;
-    success?: () => void;
-    fail?: (err?: {
-        errorMsg: string;
-        errorCode: string | number;
-        innerError: {
-            errorCode: string | number;
-            errorMsg: string;
-        };
-    }) => void;
-    complete?: () => void;
-} & {
-    [key: string]: string | boolean | number;
-};
-export declare function openSceneCreate(params: OpenSceneCreateParams): Promise<void>;
-type OpenSceneEdit = {
-    devId?: string;
-    sceneId?: string;
-    success?: () => void;
-    fail?: (err?: {
-        errorMsg: string;
-        errorCode: string | number;
-        innerError: {
-            errorCode: string | number;
-            errorMsg: string;
-        };
-    }) => void;
-    complete?: () => void;
-} & {
-    [key: string]: string | boolean | number;
-};
-export declare function openSceneEdit(params: OpenSceneEdit): Promise<void>;
-export {};

package/lib/nativeRouters/scene.js

@@ -1,60 +0,0 @@
-import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-const _excluded = ["success", "fail", "complete"],
-  _excluded2 = ["success", "fail", "complete"];
-import { objectToUrlParams } from '../utils';
-export function openSceneCreate(params) {
-  const {
-      success,
-      fail,
-      complete
-    } = params,
-    rest = _objectWithoutProperties(params, _excluded);
-  let paramsStr = '';
-  if (Object.keys(rest).length > 0) {
-    paramsStr = '?' + objectToUrlParams(rest);
-  }
-  return new Promise((resolve, reject) => {
-    ty.router({
-      url: 'tuyaSmart://createScene' + paramsStr,
-      success() {
-        success === null || success === void 0 ? void 0 : success();
-        resolve();
-      },
-      fail(err) {
-        fail === null || fail === void 0 ? void 0 : fail(err);
-        reject(err);
-      },
-      complete() {
-        complete === null || complete === void 0 ? void 0 : complete();
-      }
-    });
-  });
-}
-export function openSceneEdit(params) {
-  const {
-      success,
-      fail,
-      complete
-    } = params,
-    rest = _objectWithoutProperties(params, _excluded2);
-  let paramsStr = '';
-  if (Object.keys(rest).length > 0) {
-    paramsStr = '?' + objectToUrlParams(rest);
-  }
-  return new Promise((resolve, reject) => {
-    ty.router({
-      url: 'tuyaSmart://editScene' + paramsStr,
-      success() {
-        success === null || success === void 0 ? void 0 : success();
-        resolve();
-      },
-      fail(err) {
-        fail === null || fail === void 0 ? void 0 : fail(err);
-        reject(err);
-      },
-      complete() {
-        complete === null || complete === void 0 ? void 0 : complete();
-      }
-    });
-  });
-}