feature: 对页面路由路径方法类修改名称

devices/ble_manager.js

@@ -339,11 +339,11 @@ class bleManager {
       }
     }
 
-    const route_util = require('../utils/route_util');
+    const routeUtil = require('../utils/routeUtil');
     const routePath = require('../utils/routePath');
     const indexRoot = routePath.indexRoot;
     const connectBleRoot = routePath.connectBleRoot;
-    var lastPageRoute = route_util.getLastPageRoute();
+    var lastPageRoute = routeUtil.getLastPageRoute();
     if (lastPageRoute != indexRoot && lastPageRoute != connectBleRoot) {
       console.log("搜索蓝牙设备失败，请返回首页0");
       return;

pages/deviceConnect2/deviceConnect2.js

@@ -3,7 +3,7 @@ let xBlufi = require("../../utils/blufi/xBlufi.js");
 import strings from '../../utils/strings.js';
 import lexin_devices from '../../utils/lexin/devices';
 import junzheng_util from '../../utils/junzheng/util';
-import route_util from '../../utils/route_util.js';
+import routeUtil from '../../utils/routeUtil.js';
 Page({
 
   data: {
@@ -186,7 +186,7 @@ Page({
       // var url = "../deviceConnect4/deviceConnect4";
       // var p = JSON.stringify(that.data.connectDevice);
       // var param = "?deviceId=" + deviceId + "&param=" + p;
-      // route_util.jumpParams(url, param);
+      // routeUtil.jumpParams(url, param);
       wx.showToast({
         title: '请短按设备配对键',
         icon: 'none',

pages/deviceDetail/detail.js

@@ -7,7 +7,7 @@ import {
   CmdEvent
 } from '../../devices/cmd_key_event';
 import EventManager from '../../utils/event_bus'
-import route_util from '../../utils/route_util';
+import routeUtil from '../../utils/routeUtil';
 
 Page({
   data: {
@@ -26,7 +26,7 @@ Page({
 
   goToWallpaper: function () {
     let newParam = JSON.stringify(this.data.device);
-    route_util.jumpParam('/pages/piano/wallpaper/wallpaper', newParam)
+    routeUtil.jumpParam('/pages/piano/wallpaper/wallpaper', newParam)
   },
 
   goToOta: function () {
@@ -37,7 +37,7 @@ Page({
     // wx.navigateTo({
     //   url: '/pages/ota/ota' + "?param=" + param
     // });
-    route_util.jumpParam('/pages/ota/ota', newParam)
+    routeUtil.jumpParam('/pages/ota/ota', newParam)
   },
   powerTap(e) {
     console.log(e)

pages/index/index.js

@@ -9,7 +9,7 @@ import time_util from '../../utils/time_util.js';
 import strings from '../../utils/strings.js';
 import store from '../../utils/store.js';
 import routePath from '../../utils/routePath.js';
-import route_util from '../../utils/route_util.js';
+import routeUtil from '../../utils/routeUtil.js';
 
 /// 乐鑫相关
 import lexin_util from '../../utils/lexin/util.js';
@@ -541,7 +541,7 @@ Page({
       that.logOut();
       return;
     }
-    route_util.jump(routePath.login);
+    routeUtil.jump(routePath.login);
   },
 
   ///退出登录
@@ -599,7 +599,7 @@ Page({
     var that = this;
     var isLogin = that.getIsLogin();
     if (!isLogin) {
-      route_util.jump(routePath.login);
+      routeUtil.jump(routePath.login);
       return;
     }
 
@@ -624,7 +624,7 @@ Page({
     var deviceList = that.getDeviceList();
     let curDevice = deviceList[index]
     if (index === deviceListSelect && device.state === "online") {
-      route_util.jumpParam('/pages/deviceDetail/detail', JSON.stringify(curDevice))
+      routeUtil.jumpParam('/pages/deviceDetail/detail', JSON.stringify(curDevice))
     } else if (device.state === "offline") {
 
       var deviceListSelect = that.getDeviceListSelect();
@@ -1016,11 +1016,11 @@ Page({
       }
       // 内链，暂时不支持
       if (item.forwardType == 0) {
-        route_util.jump(item.forwardUrl, item.forwardUrl);
+        routeUtil.jump(item.forwardUrl, item.forwardUrl);
       }
       // 外链
       else if (item.forwardType == 1) {
-        route_util.jumpParam(routePath.webview, item.forwardUrl);
+        routeUtil.jumpParam(routePath.webview, item.forwardUrl);
       } else {
 
       }
@@ -1037,14 +1037,14 @@ Page({
   ///添加设备
   jumpToAddDevice() {
     var that = this;
-    // route_util.jump("../deviceConnect4/deviceConnect4");
+    // routeUtil.jump("../deviceConnect4/deviceConnect4");
     // return;
     var isLogin = that.getIsLogin();
     if (!isLogin) {
-      route_util.jump(routePath.login);
+      routeUtil.jump(routePath.login);
       return;
     }
-    route_util.jump(routePath.deviceList);
+    routeUtil.jump(routePath.deviceList);
   },
 
   // 关于我们

pages/ota/ota.js

@@ -1,7 +1,7 @@
 const { BtHelper } = require("../../devices/bt_helper");
 import { EnumCmdEvent, CmdEvent } from '../../devices/cmd_key_event';
 import EventManager from '../../utils/event_bus'
-import route_util from '../../utils/route_util';
+import routeUtil from '../../utils/routeUtil';
 import routePath from '../../utils/routePath.js';
 import { BtCmd } from '../../devices/bluetooth/bt_cmd.js';
 import strings from '../../utils/strings.js';
@@ -145,7 +145,7 @@ Page({
 
   },
   goToWifi() {
-    route_util.jump(routePath.setWifi)
+    routeUtil.jump(routePath.setWifi)
   },
   sendUrlData() {
     let url = this.data._otaData.url ?? ""
@@ -382,7 +382,7 @@ Page({
       showCancel: false,
       success: function (res) {
         if (res.confirm) {
-          route_util.goBackHomePage();
+          routeUtil.goBackHomePage();
         }
       }
     })

pages/piano/cropper/cropper.js

@@ -3,7 +3,7 @@
 const { BtCmd } = require('../../../devices/bluetooth/bt_cmd');
 import EventManager from '../../../utils/event_bus'
 import { EnumCmdEvent, CmdEvent } from '../../../devices/cmd_key_event';
-import route_util from '../../../utils/route_util';
+import routeUtil from '../../../utils/routeUtil';
 const { BtHelper } = require('../../../devices/bt_helper');
 const { uploadImage } = require('../../../request/imageRequest');
 
@@ -540,7 +540,7 @@ Page({
     console.log("有图片", image.pic, that.data._imgTopPic.length)
   },
   disconnectDevCallback() {
-    route_util.goBackHomePage()
+    routeUtil.goBackHomePage()
     // 设备断开连接回调，请重新连接设备
   },
 

pages/piano/wallpaper/wallpaper.js

@@ -3,7 +3,7 @@ const { deviceWallPaper } = require('../../../request/deviceListRequest')
 // const sharp = require('sharp');
 // const fs = require('fs');
 
-import route_util from '../../../utils/route_util';
+import routeUtil from '../../../utils/routeUtil';
 import store from '../../../utils/store';
 
 Page({
@@ -37,7 +37,7 @@ Page({
       "deviceId": this.data._device.deviceId,
       "topImg": this.data.topImg
     }
-    route_util.jumpParam("../cropper/cropper", JSON.stringify(parma))
+    routeUtil.jumpParam("../cropper/cropper", JSON.stringify(parma))
   },
   imageTopTap() {
     this.setData({

utils/lexin/jump.js

@@ -6,11 +6,11 @@ module.exports = {
 ///选择指定频道
 function toChannelIndex(index, callback) {
   var pages = getCurrentPages();
-  const route_util = require('../route_util');
+  const routeUtil = require('../routeUtil');
   const routePath = require('../routePath');
   var isLogin = pages[0].getIsLogin();
   if (!isLogin) {
-    route_util.jump(routePath.login);
+    routeUtil.jump(routePath.login);
     return;
   }
 
@@ -74,7 +74,7 @@ function toChannelIndex(index, callback) {
 
 ///关于我们
 function toAboutUs() {
-  const route_util = require('../route_util');
+  const routeUtil = require('../routeUtil');
   const routePath = require('../routePath');
-  route_util.jump(routePath.about);
+  routeUtil.jump(routePath.about);
 };