feature: 对页eventbus消息通知类修改名称

devices/bt_helper.js

@@ -14,14 +14,14 @@ const {
 } = require('./../devices/cmd_key_event');
 const {
   addNotification
-} = require('./../utils/event_bus');
+} = require('../utils/eventBus');
 const BtParse = require('./../devices/bluetooth/bt_parse');
 // const VolumeUtil = require('./VolumeUtil');
 // const EventManager = require('./EventManager');
 // const CmdBase = require('./../devices/bluetooth/bt_cmd');
 const bleManager = require('./ble_manager');
 const QueueManager = require('./QueueManager');
-const event_bus = require('./../utils/event_bus');
+const eventBus = require('../utils/eventBus');
 
 // const EnumConnectStatus = require('./EnumConnectStatus');
 // const EnumOpen = require('./EnumOpen');
@@ -93,7 +93,7 @@ class BtHelper {
     that.bleManager.initBluetoothAdapter();
     that.bleManager.onBLEConnectionStateChange();
     that.bleManager.setStateChangeCallback(function (e) {
-      event_bus.fire(CmdEvent.onoffline({ deviceId: e.deviceId, state: e.state == "online" ? "online" : "offline" }));
+      eventBus.fire(CmdEvent.onoffline({ deviceId: e.deviceId, state: e.state == "online" ? "online" : "offline" }));
     });
   }
 

pages/deviceDetail/detail.js

@@ -6,7 +6,7 @@ import {
   EnumCmdEvent,
   CmdEvent
 } from '../../devices/cmd_key_event';
-import EventManager from '../../utils/event_bus'
+import eventBus from '../../utils/eventBus'
 import routeUtil from '../../utils/routeUtil';
 
 Page({
@@ -97,7 +97,7 @@ Page({
     // btHelper.getPauseSleep()
 
     let _this = this;
-    EventManager.addNotification(CmdEvent.eventName, function (event) {
+    eventBus.addNotification(CmdEvent.eventName, function (event) {
       let name = event.cmdEvent;
       // console.log("详情页：", name, event)
       switch (name) {
@@ -121,7 +121,7 @@ Page({
   },
 
   onUnload() {
-    EventManager.removeNotification(CmdEvent.eventName, this)
+    eventBus.removeNotification(CmdEvent.eventName, this)
   },
 
 })

pages/index/index.js

@@ -23,7 +23,7 @@ import lexin_message from '../../utils/lexin/message.js';
 import {
   BtHelper
 } from '../../devices/bt_helper.js';
-import event_bus from '../../utils/event_bus.js';
+import eventBus from '../../utils/eventBus.js';
 import {
   EnumCmdEvent,
   CmdEvent
@@ -887,8 +887,8 @@ Page({
   },
   addNotification() {
     let that = this;
-    event_bus.removeNotification(CmdEvent.eventName, that);
-    event_bus.addNotification(CmdEvent.eventName, function (event) {
+    eventBus.removeNotification(CmdEvent.eventName, that);
+    eventBus.addNotification(CmdEvent.eventName, function (event) {
       let deviceList = that.getDeviceList()
 
       if (event.cmdEvent == EnumCmdEvent.btMac) {
@@ -1220,7 +1220,7 @@ Page({
   ///销毁蓝牙
   onUnload() {
     var that = this;
-    event_bus.removeNotification(CmdEvent.eventName, that)
+    eventBus.removeNotification(CmdEvent.eventName, that)
     console.log("界面onUnload")
     that.stopIntervalId1();
     that.stopIntervalId2();

pages/setWifi/setWifi.js

@@ -1,9 +1,16 @@
 // pages/setWifi/setWifi.js
-const { BtHelper } = require("../../devices/bt_helper");
-import EventManager from '../../utils/event_bus'
-import { EnumCmdEvent, CmdEvent } from '../../devices/cmd_key_event';
+const {
+  BtHelper
+} = require("../../devices/bt_helper");
+import eventBus from '../../utils/eventBus'
+import {
+  EnumCmdEvent,
+  CmdEvent
+} from '../../devices/cmd_key_event';
 import store from '../../utils/store';
-import { BtCmd } from '../../devices/bluetooth/bt_cmd';
+import {
+  BtCmd
+} from '../../devices/bluetooth/bt_cmd';
 Page({
   data: {
     navbarData: {
@@ -144,7 +151,10 @@ Page({
   },
 
   onConfirm: function () {
-    const { wifiName, wifiPassword } = this.data;
+    const {
+      wifiName,
+      wifiPassword
+    } = this.data;
     if (!wifiName) {
       wx.showToast({
         title: '请输入完整的Wi-Fi信息',
@@ -157,7 +167,7 @@ Page({
   },
   addNotification() {
     let _this = this;
-    EventManager.addNotification(CmdEvent.eventName, function (event) {
+    eventBus.addNotification(CmdEvent.eventName, function (event) {
       let name = event.cmdEvent;
       let otaCmd = event.otaCmd
       console.log("设置wifi0：", event)
@@ -199,6 +209,6 @@ Page({
     if (!this.data._onNavigateBack) {
       BtHelper.getInstance().otaCmd(2)
     }
-    EventManager.removeNotification(CmdEvent.eventName)
+    eventBus.removeNotification(CmdEvent.eventName)
   },
 });