feature: 调整首页banner UI

pages/index/index.js

@@ -238,7 +238,6 @@ Page({
         that.compareList();
       }, isFirst ? 6 * 1000 : 12 * 1000);
     }
-
   },
 
   /// 对比蓝牙数据
@@ -270,8 +269,11 @@ Page({
         lexin_connect.searchOnlineDevice(payloads, function (list) {
           that.updateDeviceList(list, false, false);
         }, function () {
+          var indexPage = that.data.indexPage;
           that.setData({
+            actionIndex: null,
             deviceListSelect: null,
+            indexPage: indexPage == 1 ? 0 : indexPage,
           });
         }, function () {
           var indexPage = that.data.indexPage;

pages/index/index.wxml

@@ -12,7 +12,7 @@
         <swiper style="width: calc(100vw - 64rpx);   border-radius: 16rpx;" indicator-dots="{{bannerList.length>1}}" autoplay="{{autoplay}}" interval="{{interval}}" duration="{{duration}}" circular="{{circular}}" indicator-active-color="#FFFFFF" indicator-color="#999999">
           <block wx:for="{{bannerList}}" wx:key="index">
             <swiper-item style="width: calc(100vw - 64rpx); border-radius: 16rpx;">
-              <image class="banner_item" style="width: calc(100vw - 64rpx);   border-radius: 16px;" src="{{item.pic}}" mode="aspectFill" bindtap="onTapBanner" data-item="{{item}}" lazy-load="true"></image>
+              <image class="banner_item" style="width: calc(100vw - 64rpx); border-radius: 16px;" src="{{item.pic}}" mode="aspectFill" bindtap="onTapBanner" data-item="{{item}}" lazy-load="true"></image>
             </swiper-item>
           </block>
         </swiper>
@@ -68,7 +68,7 @@
     <view wx:else>
 
       <!-- 频道 -->
-      <view wx:if="{{indexPage==1&&deviceListSelect!=null&&deviceList.length>deviceListSelect&&deviceList[deviceListSelect].connectType===3}}" class="mair" style="height: calc(100vh - 105rpx - {{safeBottomHeight}}rpx - 22rpx - {{navBarHeight}}px);">
+      <view wx:if="{{deviceListSelect!=null&&deviceList.length>deviceListSelect&&deviceList[deviceListSelect].connectType===3}}" class="mair" style="height: calc(100vh - 105rpx - {{safeBottomHeight}}rpx - 22rpx - {{navBarHeight}}px);">
         <view class="play-info">
           <view class="info">
             <image src="./../../img/blak.png" class="black" mode="scaleToFill"></image>

utils/lexin/connect.js

@@ -17,6 +17,7 @@ function searchOnlineDevice(payloads, changeCallback, offlineConnectedCallback,
   var deviceList = pages[0].getDeviceList();
 
   /// 处理在线设备
+  var isOfflineCurrent = false;
   if (!strings.isEmpty(deviceList)) {
     for (var i = 0; i < deviceList.length; i++) {
       if (payloads && payloads.uuid) {
@@ -35,7 +36,7 @@ function searchOnlineDevice(payloads, changeCallback, offlineConnectedCallback,
               if (device.state == "offline") {
                 var currentConnnectDeviceId = pages[0].getCurrentDeviceId();
                 if (currentConnnectDeviceId == deviceId) {
-                  offlineConnectedCallback();
+                  isOfflineCurrent = true;
                 }
               }
             }
@@ -49,6 +50,9 @@ function searchOnlineDevice(payloads, changeCallback, offlineConnectedCallback,
   if (isChanged) {
     changeCallback(deviceList);
   }
+  if (isOfflineCurrent) {
+    offlineConnectedCallback();
+  }
   _connectToDevice(resetCallback);
 };