Browse Source

feature: 解决丢失部份图片的问题

332777428@qq.com 4 months ago
parent
commit
85f36376d9

+ 6 - 6
components/navbar/navbar.wxml

@@ -1,8 +1,8 @@
 <view class='nav-wrap nav-bgc-class' style='height: calc({{navBarHeight}}px - {{MenuButtonTop}}px); padding-top: {{MenuButtonTop}}px;'>
 <view class='nav-wrap nav-bgc-class' style='height: calc({{navBarHeight}}px - {{MenuButtonTop}}px); padding-top: {{MenuButtonTop}}px;'>
-     <view class="nav-info" style="height: {{ MenuButtonheight }}px;">
-        <view  bindtap='_navback' style="height: {{ MenuButtonheight }}px;" class="device-pic">
-          <image wx:if='{{navbarData.showCapsule}}' bindtap=""  mode="heightFix"  src="./../../../img/goback.png"></image>
-        </view>
-        <text class="nav-title-class" style="height: {{ MenuButtonheight }}px; line-height: {{ MenuButtonheight }}px;">{{navbarData.title}}</text>
-     </view>
+  <view class="nav-info" style="height: {{ MenuButtonheight }}px;">
+    <view bindtap='_navback' style="height: {{ MenuButtonheight }}px;" class="device-pic">
+      <image wx:if='{{navbarData.showCapsule}}' bindtap="" mode="heightFix" src="./../../img/goback.png"></image>
+    </view>
+    <text class="nav-title-class" style="height: {{ MenuButtonheight }}px; line-height: {{ MenuButtonheight }}px;">{{navbarData.title}}</text>
   </view>
   </view>
+</view>

+ 1 - 1
pages/channelDetails/channelDetails.js

@@ -1,7 +1,7 @@
 // pages/channelDetails/channelDetails.js
 // pages/channelDetails/channelDetails.js
 const {
 const {
   pageByDevice
   pageByDevice
-} = require('../../utils/api_util.js');
+} = require('../../utils/apiUtil.js');
 const app = getApp();
 const app = getApp();
 Page({
 Page({
 
 

+ 1 - 1
pages/login/login.js

@@ -1,7 +1,7 @@
 const {
 const {
   login,
   login,
   register
   register
-} = require('./../../utils/api.js')
+} = require('./../../utils/apiUtil.js')
 
 
 import routePath from '../../utils/routePath.js';
 import routePath from '../../utils/routePath.js';
 import routeUtil from '../../utils/routeUtil.js';
 import routeUtil from '../../utils/routeUtil.js';

+ 3 - 3
pages/ota/ota.js

@@ -1,6 +1,6 @@
 const { BtHelper } = require("../../devices/bt_helper");
 const { BtHelper } = require("../../devices/bt_helper");
 import { EnumCmdEvent, CmdEvent } from '../../devices/cmd_key_event';
 import { EnumCmdEvent, CmdEvent } from '../../devices/cmd_key_event';
-import EventManager from '../../utils/event_bus'
+import eventBus from '../../utils/eventBus'
 import routeUtil from '../../utils/routeUtil';
 import routeUtil from '../../utils/routeUtil';
 import routePath from '../../utils/routePath.js';
 import routePath from '../../utils/routePath.js';
 import { BtCmd } from '../../devices/bluetooth/bt_cmd.js';
 import { BtCmd } from '../../devices/bluetooth/bt_cmd.js';
@@ -402,7 +402,7 @@ Page({
   },
   },
   addNotification() {
   addNotification() {
     let _this = this;
     let _this = this;
-    EventManager.addNotification(CmdEvent.eventName, function (event) {
+    eventBus.addNotification(CmdEvent.eventName, function (event) {
       let name = event.cmdEvent;
       let name = event.cmdEvent;
       let kind = event.heiJiaoKind;
       let kind = event.heiJiaoKind;
       // 74,1,1是wifi连接成功,74,0 2连接wifi失败/没有wifi。   
       // 74,1,1是wifi连接成功,74,0 2连接wifi失败/没有wifi。   
@@ -517,7 +517,7 @@ Page({
   },
   },
   onUnload() {
   onUnload() {
     console.log("移除OTA通知")
     console.log("移除OTA通知")
-    EventManager.removeNotification(CmdEvent.eventName, this)
+    eventBus.removeNotification(CmdEvent.eventName, this)
   },
   },
 
 
 })
 })

+ 3 - 3
pages/piano/cropper/cropper.js

@@ -1,7 +1,7 @@
 // pages/piano/cropper/cropper.js
 // pages/piano/cropper/cropper.js
 
 
 const { BtCmd } = require('../../../devices/bluetooth/bt_cmd');
 const { BtCmd } = require('../../../devices/bluetooth/bt_cmd');
-import EventManager from '../../../utils/event_bus'
+import eventBus from '../../../utils/eventBus'
 import { EnumCmdEvent, CmdEvent } from '../../../devices/cmd_key_event';
 import { EnumCmdEvent, CmdEvent } from '../../../devices/cmd_key_event';
 import routeUtil from '../../../utils/routeUtil';
 import routeUtil from '../../../utils/routeUtil';
 const { BtHelper } = require('../../../devices/bt_helper');
 const { BtHelper } = require('../../../devices/bt_helper');
@@ -568,7 +568,7 @@ Page({
     //   scr:json,
     //   scr:json,
     // })
     // })
 
 
-    EventManager.addNotification(CmdEvent.eventName, function (event) {
+    eventBus.addNotification(CmdEvent.eventName, function (event) {
       let name = event.cmdEvent;
       let name = event.cmdEvent;
       let value = event.wallpaper;
       let value = event.wallpaper;
       let kind = event.heiJiaoKind;
       let kind = event.heiJiaoKind;
@@ -671,7 +671,7 @@ Page({
    * 生命周期函数--监听页面卸载
    * 生命周期函数--监听页面卸载
    */
    */
   onUnload() {
   onUnload() {
-    EventManager.removeNotification(CmdEvent.eventName, this);
+    eventBus.removeNotification(CmdEvent.eventName, this);
   },
   },
 
 
   /**
   /**

+ 1 - 1
pages/wakeList/wakeList.js

@@ -7,7 +7,7 @@ const {
   listByDevice,
   listByDevice,
   pageByDevice,
   pageByDevice,
   radioList
   radioList
-} = require('../../utils/api_util.js');
+} = require('../../utils/apiUtil.js');
 
 
 Page({
 Page({
   data: {
   data: {

+ 1 - 1
utils/blufi/xBlufi-wx-impl.js

@@ -1,6 +1,6 @@
 const {
 const {
   isCN
   isCN
-} = require('./../util.js');
+} = require('./../requestUtil.js');
 const {
 const {
   TextEncoder
   TextEncoder
 } = require('text-encoding');
 } = require('text-encoding');