@ray-js/api 1.4.30 → 1.4.32

package/lib/cloud/alarm.js

@@ -8,7 +8,7 @@ import { THING } from '../constants';
  */
 const getDevAlarmList = devId => {
   return requestCloud({
-    api: "".concat(THING, ".m.linkage.rule.product.query"),
+    api: `${THING}.m.linkage.rule.product.query`,
     version: '1.0',
     data: {
       devId
@@ -24,7 +24,7 @@ const getDevAlarmList = devId => {
  */
 const setAlarmSwitch = params => {
   return requestCloud({
-    api: "".concat(THING, ".m.linkage.dev.warn.set"),
+    api: `${THING}.m.linkage.dev.warn.set`,
     version: '1.0',
     data: _objectSpread({}, params)
   });

package/lib/cloud/core.js

@@ -7,7 +7,7 @@ import { THING } from '../constants';
  */
 const getAssetHostname = () => {
   return requestCloud({
-    api: "".concat(THING, ".m.app.panel.url.get"),
+    api: `${THING}.m.app.panel.url.get`,
     version: '1.0',
     data: {}
   });

package/lib/cloud/device.js

@@ -52,7 +52,7 @@ const getGroupDpsInfos = groupId => {
  */
 const updateGroupDpName = params => {
   return requestCloud({
-    api: "".concat(THING, ".m.group.dpname.update"),
+    api: `${THING}.m.group.dpname.update`,
     version: '1.0',
     data: _objectSpread({}, params)
   });
@@ -65,7 +65,7 @@ const updateGroupDpName = params => {
  */
 const getWeatherQuality = params => {
   return requestCloud({
-    api: "".concat(THING, ".m.public.weather.get"),
+    api: `${THING}.m.public.weather.get`,
     version: '2.0',
     data: _objectSpread({}, params)
   });
@@ -78,7 +78,7 @@ const getWeatherQuality = params => {
  */
 const getWeathers = params => {
   return requestCloud({
-    api: "".concat(THING, ".m.public.weathers.get"),
+    api: `${THING}.m.public.weathers.get`,
     version: '2.0',
     data: _objectSpread({}, params)
   });
@@ -93,7 +93,7 @@ const getWeathers = params => {
  */
 const saveCustomizePosition = params => {
   return requestCloud({
-    api: "".concat(THING, ".m.device.customize.position.save"),
+    api: `${THING}.m.device.customize.position.save`,
     version: '1.0',
     data: _objectSpread({}, params)
   });
@@ -105,7 +105,7 @@ const saveCustomizePosition = params => {
  */
 const getCustomizePosition = params => {
   return requestCloud({
-    api: "".concat(THING, ".m.device.customize.position.get"),
+    api: `${THING}.m.device.customize.position.get`,
     version: '1.0',
     data: _objectSpread({}, params)
   });

package/lib/cloud/linkage.js

@@ -8,7 +8,7 @@ import { THING } from '../constants';
  */
 const getLinkageDeviceList = params => {
   return requestCloud({
-    api: "".concat(THING, ".m.linkage.dev.list"),
+    api: `${THING}.m.linkage.dev.list`,
     version: '3.0',
     data: _objectSpread({}, params)
   });
@@ -23,7 +23,7 @@ const getSceneList = _ref => {
     devId
   } = _ref;
   return requestCloud({
-    api: "".concat(THING, ".m.linkage.rule.brief.query"),
+    api: `${THING}.m.linkage.rule.brief.query`,
     version: '1.0',
     data: {
       devId
@@ -40,7 +40,7 @@ const getSceneList = _ref => {
 
 const getBindRuleList = params => {
   return requestCloud({
-    api: "".concat(THING, ".m.linkage.associative.entity.id.category.query"),
+    api: `${THING}.m.linkage.associative.entity.id.category.query`,
     version: '1.0',
     data: _objectSpread({}, params)
   });
@@ -65,7 +65,7 @@ const bindRule = _ref2 => {
     bizDomain
   } = _ref2;
   return requestCloud({
-    api: "".concat(THING, ".m.linkage.associative.entity.bind"),
+    api: `${THING}.m.linkage.associative.entity.bind`,
     version: '1.0',
     data: {
       relationExpr: {
@@ -102,7 +102,7 @@ const bindRule = _ref2 => {
  */
 const removeRule = params => {
   return requestCloud({
-    api: "".concat(THING, ".m.linkage.associative.entity.remove"),
+    api: `${THING}.m.linkage.associative.entity.remove`,
     version: '1.0',
     data: _objectSpread({}, params)
   });
@@ -117,7 +117,7 @@ const triggerRule = _ref3 => {
     ruleId
   } = _ref3;
   return requestCloud({
-    api: "".concat(THING, ".m.linkage.rule.trigger"),
+    api: `${THING}.m.linkage.rule.trigger`,
     version: '1.0',
     data: {
       ruleId
@@ -134,7 +134,7 @@ const enableRule = _ref4 => {
     ruleId
   } = _ref4;
   return requestCloud({
-    api: "".concat(THING, ".m.linkage.rule.enable"),
+    api: `${THING}.m.linkage.rule.enable`,
     version: '1.0',
     data: {
       ruleId
@@ -151,7 +151,7 @@ const disableRule = _ref5 => {
     ruleId
   } = _ref5;
   return requestCloud({
-    api: "".concat(THING, ".m.linkage.rule.disable"),
+    api: `${THING}.m.linkage.rule.disable`,
     version: '1.0',
     data: {
       ruleId

package/lib/cloud/statistic.js

@@ -14,7 +14,7 @@ import { THING } from '../constants';
  */
 const getLogInSpecifiedTime = params => {
   return requestCloud({
-    api: "".concat(THING, ".m.smart.operate.all.log"),
+    api: `${THING}.m.smart.operate.all.log`,
     version: '1.0',
     data: _objectSpread({}, params)
   });
@@ -62,7 +62,7 @@ const getLogUserAction = params => {
  */
 const getDpLogDays = params => {
   return requestCloud({
-    api: "".concat(THING, ".m.dp.stat.days.list"),
+    api: `${THING}.m.dp.stat.days.list`,
     version: '1.0',
     data: _objectSpread({}, params)
   });
@@ -76,7 +76,7 @@ const getDpLogDays = params => {
  */
 const getDpResultByMonth = params => {
   return requestCloud({
-    api: "".concat(THING, ".m.dp.stat.month.list"),
+    api: `${THING}.m.dp.stat.month.list`,
     version: '1.0',
     data: _objectSpread({}, params)
   });
@@ -93,7 +93,7 @@ const getDpResultByMonth = params => {
  */
 const getDpResultByHour = params => {
   return requestCloud({
-    api: "".concat(THING, ".m.dp.rang.stat.hour.list"),
+    api: `${THING}.m.dp.rang.stat.hour.list`,
     version: '1.0',
     data: _objectSpread({}, params)
   });
@@ -111,7 +111,7 @@ const getDpResultByHour = params => {
  */
 const getDataWithSpecified = params => {
   return requestCloud({
-    api: "".concat(THING, ".m.dp.rang.stat.day.list"),
+    api: `${THING}.m.dp.rang.stat.day.list`,
     version: '2.0',
     data: _objectSpread({}, params)
   });
@@ -127,7 +127,7 @@ const getDataWithSpecified = params => {
  */
 const getWeekWithSpecified = params => {
   return requestCloud({
-    api: "".concat(THING, ".m.dp.rang.stat.week.list"),
+    api: `${THING}.m.dp.rang.stat.week.list`,
     version: '1.0',
     data: _objectSpread({}, params)
   });
@@ -145,7 +145,7 @@ const getWeekWithSpecified = params => {
  */
 const getMonthWithSpecified = params => {
   return requestCloud({
-    api: "".concat(THING, ".m.dp.rang.stat.month.list"),
+    api: `${THING}.m.dp.rang.stat.month.list`,
     version: '2.0',
     data: _objectSpread({}, params)
   });
@@ -159,7 +159,7 @@ const getMonthWithSpecified = params => {
  */
 const getDpAllStatistResult = params => {
   return requestCloud({
-    api: "".concat(THING, ".m.dp.stat.total"),
+    api: `${THING}.m.dp.stat.total`,
     version: '1.0',
     data: _objectSpread({}, params)
   });
@@ -179,7 +179,7 @@ const getDpAllStatistResult = params => {
  */
 const getMultiDpsAllResult = params => {
   return requestCloud({
-    api: "".concat(THING, ".m.device.query.device.log"),
+    api: `${THING}.m.device.query.device.log`,
     version: '1.0',
     data: _objectSpread({}, params)
   });

package/lib/cloud/timer.js

@@ -15,7 +15,7 @@ import { THING } from '../constants';
  */
 const addSingleTimer = params => {
   return requestCloud({
-    api: "".concat(THING, ".m.clock.dps.add"),
+    api: `${THING}.m.clock.dps.add`,
     version: '1.0',
     data: _objectSpread({}, params)
   });
@@ -29,7 +29,7 @@ const addSingleTimer = params => {
  */
 const queryTimerTasks = params => {
   return requestCloud({
-    api: "".concat(THING, ".m.clock.dps.list"),
+    api: `${THING}.m.clock.dps.list`,
     version: '1.0',
     data: _objectSpread({}, params)
   });
@@ -48,7 +48,7 @@ const queryTimerTasks = params => {
  */
 const modifySingleTimer = params => {
   return requestCloud({
-    api: "".concat(THING, ".m.clock.dps.update"),
+    api: `${THING}.m.clock.dps.update`,
     version: '1.0',
     data: _objectSpread({}, params)
   });
@@ -67,7 +67,7 @@ const modifySingleTimer = params => {
  */
 const addGroupTimer = params => {
   return requestCloud({
-    api: "".concat(THING, ".m.clock.dps.group.add"),
+    api: `${THING}.m.clock.dps.group.add`,
     version: '1.0',
     data: _objectSpread({}, params)
   });
@@ -81,7 +81,7 @@ const addGroupTimer = params => {
  */
 const queryGroupTimerTasks = params => {
   return requestCloud({
-    api: "".concat(THING, ".m.clock.dps.group.list"),
+    api: `${THING}.m.clock.dps.group.list`,
     version: '1.0',
     data: _objectSpread({}, params)
   });
@@ -99,7 +99,7 @@ const queryGroupTimerTasks = params => {
  */
 const modifyGroupTimer = params => {
   return requestCloud({
-    api: "".concat(THING, ".m.clock.dps.group.update"),
+    api: `${THING}.m.clock.dps.group.update`,
     version: '1.0',
     data: _objectSpread({}, params)
   });
@@ -114,7 +114,7 @@ const modifyGroupTimer = params => {
  */
 const modDeleteTaskByIds = params => {
   return requestCloud({
-    api: "".concat(THING, ".m.clock.batch.status.update"),
+    api: `${THING}.m.clock.batch.status.update`,
     version: '1.0',
     data: _objectSpread({}, params)
   });
@@ -129,7 +129,7 @@ const modDeleteTaskByIds = params => {
  */
 const modDeleteTaskByCategory = params => {
   return requestCloud({
-    api: "".concat(THING, ".m.clock.category.status.update"),
+    api: `${THING}.m.clock.category.status.update`,
     version: '1.0',
     data: _objectSpread({}, params)
   });
@@ -170,7 +170,7 @@ const getDpsLastTimer = params => {
  */
 const getLastTimerPeriod = params => {
   return requestCloud({
-    api: "".concat(THING, ".m.timer.nearest.get"),
+    api: `${THING}.m.timer.nearest.get`,
     version: '1.0',
     data: _objectSpread({}, params)
   });
@@ -181,7 +181,7 @@ const getLastTimerPeriod = params => {
  */
 const getAstronomicalList = params => {
   return requestCloud({
-    api: "".concat(THING, ".m.timer.astronomical.list"),
+    api: `${THING}.m.timer.astronomical.list`,
     version: '1.0',
     data: _objectSpread({}, params)
   });
@@ -203,7 +203,7 @@ const getAstronomicalList = params => {
  */
 const addAstronomical = params => {
   return requestCloud({
-    api: "".concat(THING, ".m.timer.astronomical.add"),
+    api: `${THING}.m.timer.astronomical.add`,
     version: '1.0',
     data: _objectSpread({}, params)
   });
@@ -225,7 +225,7 @@ const addAstronomical = params => {
  */
 const updateAstronomical = params => {
   return requestCloud({
-    api: "".concat(THING, ".m.timer.astronomical.update"),
+    api: `${THING}.m.timer.astronomical.update`,
     version: '1.0',
     data: _objectSpread({}, params)
   });
@@ -238,7 +238,7 @@ const updateAstronomical = params => {
  */
 const updateAstronomicalStatus = params => {
   return requestCloud({
-    api: "".concat(THING, ".m.timer.astronomical.status.update"),
+    api: `${THING}.m.timer.astronomical.status.update`,
     version: '1.0',
     data: _objectSpread({}, params)
   });
@@ -250,7 +250,7 @@ const updateAstronomicalStatus = params => {
  */
 const removeAstronomical = params => {
   return requestCloud({
-    api: "".concat(THING, ".m.timer.astronomical.remove"),
+    api: `${THING}.m.timer.astronomical.remove`,
     version: '1.0',
     data: _objectSpread({}, params)
   });

package/lib/getElementById/index.thing.js

@@ -1,6 +1,6 @@
 export default function getElementById(id) {
   return new Promise(resolve => {
-    const nodeRef = ty.createSelectorQuery().select("#".concat(id));
+    const nodeRef = ty.createSelectorQuery().select(`#${id}`);
     resolve(nodeRef);
   });
 }

package/lib/getElementById/index.wechat.js

@@ -1,6 +1,6 @@
 export default function getElementById(id) {
   return new Promise(resolve => {
-    const nodeRef = wx.createSelectorQuery().select("#".concat(id));
+    const nodeRef = wx.createSelectorQuery().select(`#${id}`);
     resolve(nodeRef);
   });
 }

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/panel/i18n/index.js

@@ -1,4 +1,3 @@
-import "core-js/modules/es.string.replace.js";
 import { requestCloud, getSystemInfoSync, THING } from '../..';
 import { getBitValue } from '../utils';
 export default class I18N {
@@ -11,7 +10,7 @@ export default class I18N {
   }
   forceUpdateNetworkLang(productId) {
     requestCloud({
-      api: "".concat(THING, ".m.i18n.get"),
+      api: `${THING}.m.i18n.get`,
       version: '1.0',
       data: {
         productId,
@@ -102,14 +101,14 @@ export default class I18N {
   formatString(str) {
     let res = str;
     for (let i = 0; i < (arguments.length <= 1 ? 0 : arguments.length - 1); i++) {
-      res = this._replaceAll("{".concat(i, "}"), i + 1 < 1 || arguments.length <= i + 1 ? undefined : arguments[i + 1], res);
+      res = this._replaceAll(`{${i}}`, i + 1 < 1 || arguments.length <= i + 1 ? undefined : arguments[i + 1], res);
     }
     return res;
   }
   formatValue(key) {
     let res = typeof this[key] !== 'undefined' ? this[key] : I18n.t(key);
     for (let i = 0; i < (arguments.length <= 1 ? 0 : arguments.length - 1); i++) {
-      res = this._replaceAll("{".concat(i, "}"), i + 1 < 1 || arguments.length <= i + 1 ? undefined : arguments[i + 1], res);
+      res = this._replaceAll(`{${i}}`, i + 1 < 1 || arguments.length <= i + 1 ? undefined : arguments[i + 1], res);
     }
     return res;
   }
@@ -122,17 +121,17 @@ export default class I18N {
   getDpLang(code, value) {
     let key;
     if (typeof value === 'undefined') {
-      key = "dp_".concat(code).toLowerCase();
+      key = `dp_${code}`.toLowerCase();
     } else if (typeof value === 'boolean') {
       const valStr = value ? 'on' : 'off';
-      key = "dp_".concat(code, "_").concat(valStr).toLowerCase();
+      key = `dp_${code}_${valStr}`.toLowerCase();
     } else {
-      key = "dp_".concat(code, "_").concat(value).toLowerCase();
+      key = `dp_${code}_${value}`.toLowerCase();
     }
     return I18n.t(key) !== key ? I18n.t(key) : typeof this[key] !== 'undefined' ? this[key] : I18n.t(key);
   }
   getDpName(code, defaultName) {
-    const key = "dp_".concat(code).toLowerCase();
+    const key = `dp_${code}`.toLowerCase();
     return I18n.t(key) !== key ? I18n.t(key) : typeof this[key] !== 'undefined' ? this[key] : defaultName;
   }
   getDpsLang(key) {
@@ -164,7 +163,7 @@ export default class I18N {
     if (typeof schema === 'undefined') return result;
     const lists = schema.range;
     lists.map(v => {
-      const key = "dp_".concat(dpCode, "_").concat(v).toLowerCase();
+      const key = `dp_${dpCode}_${v}`.toLowerCase();
       result[v] = I18n.t(key) !== key ? I18n.t(key) : typeof this[key] !== 'undefined' ? this[key] : I18n.t(key);
       return null;
     });
@@ -178,12 +177,12 @@ export default class I18N {
    * @param {*} power 设备当前的开关状态 (如果当前设备为开启状态， 则倒计时显示为关闭)
    */
   parseCountdown(t, power) {
-    const h = parseFloat("".concat(t / 3600));
-    const m = parseFloat("".concat(t / 60 - h * 60));
+    const h = parseFloat(`${t / 3600}`);
+    const m = parseFloat(`${t / 60 - h * 60}`);
     const tHour = I18n.t('t_hour') !== 't_hour' ? I18n.t('t_hour') : typeof this.t_hour !== 'undefined' ? this.t_hour : I18n.t('t_hour');
     const tMinute = I18n.t('t_minute') !== 't_minute' ? I18n.t('t_minute') : typeof this.t_minute !== 'undefined' ? this.t_minute : I18n.t('t_minute');
-    const time = h >= 1.0 ? "".concat(Math.round(h)).concat(tHour) : "".concat(Math.round(m)).concat(tMinute);
-    const key = "countdown_".concat(power ? 'on' : 'off');
+    const time = h >= 1.0 ? `${Math.round(h)}${tHour}` : `${Math.round(m)}${tMinute}`;
+    const key = `countdown_${power ? 'on' : 'off'}`;
     const str = I18n.t(key) !== key ? I18n.t(key) : typeof this[key] !== 'undefined' ? this[key] : I18n.t(key);
     return this.formatString(str, time);
   }

package/lib/panel/i18n/index.wechat.js

@@ -1,4 +1,3 @@
-import "core-js/modules/es.string.replace.js";
 import { requestCloud, getSystemInfoSync, THING } from '../..';
 import { getBitValue } from '../utils';
 
@@ -16,7 +15,7 @@ export default class I18N {
   }
   forceUpdateNetworkLang(productId) {
     requestCloud({
-      api: "".concat(THING, ".m.i18n.get"),
+      api: `${THING}.m.i18n.get`,
       version: '1.0',
       data: {
         productId,
@@ -107,14 +106,14 @@ export default class I18N {
   formatString(str) {
     let res = str;
     for (let i = 0; i < (arguments.length <= 1 ? 0 : arguments.length - 1); i++) {
-      res = this._replaceAll("{".concat(i, "}"), i + 1 < 1 || arguments.length <= i + 1 ? undefined : arguments[i + 1], res);
+      res = this._replaceAll(`{${i}}`, i + 1 < 1 || arguments.length <= i + 1 ? undefined : arguments[i + 1], res);
     }
     return res;
   }
   formatValue(key) {
     let res = typeof this[key] !== 'undefined' ? this[key] : I18n.t(key);
     for (let i = 0; i < (arguments.length <= 1 ? 0 : arguments.length - 1); i++) {
-      res = this._replaceAll("{".concat(i, "}"), i + 1 < 1 || arguments.length <= i + 1 ? undefined : arguments[i + 1], res);
+      res = this._replaceAll(`{${i}}`, i + 1 < 1 || arguments.length <= i + 1 ? undefined : arguments[i + 1], res);
     }
     return res;
   }
@@ -127,17 +126,17 @@ export default class I18N {
   getDpLang(code, value) {
     let key;
     if (typeof value === 'undefined') {
-      key = "dp_".concat(code).toLowerCase();
+      key = `dp_${code}`.toLowerCase();
     } else if (typeof value === 'boolean') {
       const valStr = value ? 'on' : 'off';
-      key = "dp_".concat(code, "_").concat(valStr).toLowerCase();
+      key = `dp_${code}_${valStr}`.toLowerCase();
     } else {
-      key = "dp_".concat(code, "_").concat(value).toLowerCase();
+      key = `dp_${code}_${value}`.toLowerCase();
     }
     return I18n.t(key) !== key ? I18n.t(key) : typeof this[key] !== 'undefined' ? this[key] : I18n.t(key);
   }
   getDpName(code, defaultName) {
-    const key = "dp_".concat(code).toLowerCase();
+    const key = `dp_${code}`.toLowerCase();
     return I18n.t(key) !== key ? I18n.t(key) : typeof this[key] !== 'undefined' ? this[key] : defaultName;
   }
   getDpsLang(key) {
@@ -169,7 +168,7 @@ export default class I18N {
     if (typeof schema === 'undefined') return result;
     const lists = schema.range;
     lists.map(v => {
-      const key = "dp_".concat(dpCode, "_").concat(v).toLowerCase();
+      const key = `dp_${dpCode}_${v}`.toLowerCase();
       result[v] = I18n.t(key) !== key ? I18n.t(key) : typeof this[key] !== 'undefined' ? this[key] : I18n.t(key);
       return null;
     });
@@ -183,12 +182,12 @@ export default class I18N {
    * @param {*} power 设备当前的开关状态 (如果当前设备为开启状态， 则倒计时显示为关闭)
    */
   parseCountdown(t, power) {
-    const h = parseFloat("".concat(t / 3600));
-    const m = parseFloat("".concat(t / 60 - h * 60));
+    const h = parseFloat(`${t / 3600}`);
+    const m = parseFloat(`${t / 60 - h * 60}`);
     const tHour = I18n.t('t_hour') !== 't_hour' ? I18n.t('t_hour') : typeof this.t_hour !== 'undefined' ? this.t_hour : I18n.t('t_hour');
     const tMinute = I18n.t('t_minute') !== 't_minute' ? I18n.t('t_minute') : typeof this.t_minute !== 'undefined' ? this.t_minute : I18n.t('t_minute');
-    const time = h >= 1.0 ? "".concat(Math.round(h)).concat(tHour) : "".concat(Math.round(m)).concat(tMinute);
-    const key = "countdown_".concat(power ? 'on' : 'off');
+    const time = h >= 1.0 ? `${Math.round(h)}${tHour}` : `${Math.round(m)}${tMinute}`;
+    const key = `countdown_${power ? 'on' : 'off'}`;
     const str = I18n.t(key) !== key ? I18n.t(key) : typeof this[key] !== 'undefined' ? this[key] : I18n.t(key);
     return this.formatString(str, time);
   }

package/lib/panel/publishDps.js

@@ -25,7 +25,7 @@ export function sendDps(data) {
   const codeIds = (devInfo === null || devInfo === void 0 ? void 0 : devInfo.codeIds) || {};
   Object.keys(data).forEach(code => {
     if (codeIds[code] !== undefined) {
-      dps["".concat(codeIds[code])] = data[code];
+      dps[`${codeIds[code]}`] = data[code];
     } else {
       dps[code] = data[code];
     }

package/lib/redirectTo/index.js

@@ -1,4 +1,3 @@
-import "core-js/modules/es.string.replace.js";
 /// <reference path="../../@types/api.d.ts" />
 
 import router from '@ray-js/router';

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,41 +1,45 @@
+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 () {
     var _inst$opts$namespace;
     if (opts.deprecated) {
-      console.warn("\u8BE5\u65B9\u6CD5 ".concat(name, " \u5DF2\u5F03\u7528"));
+      console.warn(`该方法 ${name} 已弃用`);
     }
     const inst = typeof ty === 'undefined' ? {} : ty;
     const method = opts.namespace ? ((_inst$opts$namespace = inst[opts.namespace]) !== null && _inst$opts$namespace !== void 0 ? _inst$opts$namespace : {})[name] : inst[name];
     if (!method) {
-      console.warn("// TODO \u6682\u672A\u5B9E\u73B0\u65B9\u6CD5 ".concat(opts.namespace ? opts.namespace + '.' : '').concat(name));
+      console.warn(`// TODO 暂未实现方法 ${opts.namespace ? opts.namespace + '.' : ''}${name}`);
       return;
     }
+    // eslint-disable-next-line prefer-rest-params
     return method.apply(this, arguments);
   };
 }
 export function factoryContants(name) {
   let opts = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   if (opts.deprecated) {
-    console.warn("\u8BE5\u53D8\u91CF ".concat(name, " \u5DF2\u5F03\u7528"));
+    console.warn(`该变量 ${name} 已弃用`);
   }
   const inst = typeof ty === 'undefined' ? {} : ty;
   if (!inst[name]) {
-    console.warn("// TODO \u6682\u672A\u5B9E\u73B0\u53D8\u91CF ".concat(name));
+    console.warn(`// TODO 暂未实现变量 ${name}`);
     return;
   }
   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("".concat(encodedKey, "=").concat(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/lib/utils.wechat.js

@@ -5,7 +5,7 @@ export function factory(name) {
   if (/(set|get|remove|clear)+Storage(Sync)?$/.test(name)) {
     return function (option) {
       if (opts.deprecated) {
-        console.warn("\u8BE5\u65B9\u6CD5 ".concat(name, " \u5DF2\u5F03\u7528"));
+        console.warn(`该方法 ${name} 已弃用`);
       }
       // eslint-disable-next-line prefer-rest-params
       return wx[name].call(this, option.key, option.data);
@@ -13,10 +13,10 @@ export function factory(name) {
   }
   return function () {
     if (opts.deprecated) {
-      console.warn("\u8BE5\u65B9\u6CD5 ".concat(name, " \u5DF2\u5F03\u7528"));
+      console.warn(`该方法 ${name} 已弃用`);
     }
     if (!tyWx[name] && !wx[name]) {
-      console.warn("// TODO \u6682\u672A\u5B9E\u73B0\u65B9\u6CD5 wx.".concat(name));
+      console.warn(`// TODO 暂未实现方法 wx.${name}`);
       return;
     }
     // 优先取得 TTT 能力的方法
@@ -30,11 +30,11 @@ export function factory(name) {
 export function factoryContants(name) {
   let opts = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   if (opts.deprecated) {
-    console.warn("\u8BE5\u53D8\u91CF ".concat(name, " \u5DF2\u5F03\u7528"));
+    console.warn(`该变量 ${name} 已弃用`);
   }
   const inst = typeof wx === 'undefined' ? {} : wx;
   if (!inst[name]) {
-    console.warn("// TODO \u6682\u672A\u5B9E\u73B0\u53D8\u91CF ".concat(name));
+    console.warn(`// TODO 暂未实现变量 ${name}`);
     return;
   }
   return inst[name];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ray-js/api",
-  "version": "1.4.30",
+  "version": "1.4.32",
   "description": "Ray universal api",
   "keywords": [
     "ray"
@@ -29,13 +29,14 @@
     "watch": "ray start --type=component"
   },
   "dependencies": {
-    "@ray-js/framework": "^1.4.30",
-    "@ray-js/router": "^1.4.30",
+    "@ray-js/framework": "1.4.32",
+    "@ray-js/router": "1.4.32",
     "@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.30",
+    "@ray-js/cli": "1.4.32",
     "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": "3fd8c1689f3cc6c461f192189056f67f6314f812"
+  "gitHead": "883f1ad59b1036a84b026e280e27c71ebdbc12cd"
 }

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();
-      }
-    });
-  });
-}