1 修复配网成功后,点击完成按钮,所有设备列表未刷新的情况

YangShuai
1 parent da6e9875
Showing 5 changed files with 13 additions and 1 deletions
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/frame/view/SelectWifiFragmentView.java
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/model/message/EventMsg.java
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/adapter/BluetoothDeviceAdapter.java
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/fragment/SearchDevicefragment.java
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/fragment/SelectWifiFragment.java
@@ -218,6 +218,7 @@ public class SelectWifiFragmentView implements MvpView {
             public void onConnectFail(BleDevice bleDevice, BleException exception) {
                 QMUITipDialogUtil.dismessDialog();
                 AlertUtil.showDeftToast(getContext(), "连接无响应，请稍后重试");
+                EventBus.getDefault().post(new EventMsg(EventMsg.DEVICE_NOT_RESPONSE,""));
             }
             // 连接成功，BleDevice即为所连接的BLE设备
@@ -10,6 +10,7 @@ public class EventMsg {
     public static final int HAS_FRIEND_REMOVE_FRIMALY = 6;//有好友移除家庭
     public static final int HAS_ROLE_USED = 7;//已经有角色被占用了
     public static final int CONFIG_NET_SUCCESS = 8;//配网成功
+    public static final int DEVICE_NOT_RESPONSE = 9;//蓝牙设备无响应
     private int eventType;
     private Object data;
@@ -66,7 +66,7 @@ import java.util.List;
         if (null != bluetoothDeviceList) {
             boolean isHave = false;
             for (int i = 0; i < bluetoothDeviceList.size(); i++) {
-                if (bleDevice.getName().equals(bluetoothDeviceList.get(i).getName())) {
+                if (bleDevice.getMac().equals(bluetoothDeviceList.get(i).getMac())) {
                     isHave = true;
                     break;
                 }
@@ -117,5 +117,12 @@ public class SearchDevicefragment extends MvpBindingFragment&lt;SearchDevicefragmen
         } else if (EventMsg.GO_TO_CHINA_LISTEN_PAGE == msg.getEventType()) {
             getActivity().finish();
         }
+//        else if (EventMsg.DEVICE_NOT_RESPONSE == msg.getEventType()) {
+//            BleManager.getInstance().cancelScan();
+//            //设备无响应
+//            if (null != getMvpView()) {
+//                getMvpView().initListAdapter();
+//            }
+//        }
     }
 }
@@ -129,6 +129,9 @@ public class SelectWifiFragment extends MvpBindingFragment&lt;SelectWifiFragmentVie
             getActivity().finish();
         } else if (EventMsg.GO_TO_CHINA_LISTEN_PAGE == msg.getEventType()) {
             getActivity().finish();
+        } else if (EventMsg.DEVICE_NOT_RESPONSE == msg.getEventType()) {
+            //设备无响应
+            getActivity().finish();
         }
     }
 }