1 修复用户在首次打开蓝牙后,在设备搜索页,无法显示搜索结果的问题

YangShuai
1 parent 5346c2c5
Showing 4 changed files with 48 additions and 19 deletions
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/frame/view/SearchDevicefragmentView.java
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/frame/view/SelectWifiFragmentView.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
@@ -7,6 +7,7 @@ import android.support.v4.content.ContextCompat;
 import android.support.v7.widget.DefaultItemAnimator;
 import android.support.v7.widget.LinearLayoutManager;
 import android.text.TextUtils;
+import android.util.Log;
 import android.view.View;
 import com.clj.fastble.BleManager;
@@ -45,6 +46,12 @@ public class SearchDevicefragmentView implements MvpView {
         if (null == getContext()) {
             return;
         }
+        //设置配对按钮不可点击
+        setBondDeviceCantClick();
+        //隐藏重试
+        hideView(fragment.binding.llRetry);
+        //显示loading
+        showView(fragment.binding.llLoading);
         initWifiDialog();
         wifiUtils = new WifiUtils(getContext());
         //重试按钮点击事件
@@ -114,8 +121,6 @@ public class SearchDevicefragmentView implements MvpView {
         if (null == getContext()) {
             return;
         }
-        //设置配对按钮不可点击
-        setBondDeviceCantClick();
         adapter = new BluetoothDeviceAdapter(getContext(), bleDevices);
         adapter.setHasStableIds(true);
         fragment.binding.rvBlueTooth.setLayoutManager(new LinearLayoutManager(getContext()));
@@ -222,10 +227,8 @@ public class SearchDevicefragmentView implements MvpView {
         if (null == getContext()) {
             return;
         }
-        if (fragment.binding.btnBondDevice.isClickable()) {
-            fragment.binding.btnBondDevice.setClickable(false);
-            fragment.binding.btnBondDevice.setBackground(ContextCompat.getDrawable(getContext(), R.drawable.shape_xiaojia_btn_press));
-        }
+        fragment.binding.btnBondDevice.setClickable(false);
+        fragment.binding.btnBondDevice.setBackground(ContextCompat.getDrawable(getContext(), R.drawable.shape_xiaojia_btn_press));
     }
     /**
@@ -235,9 +238,7 @@ public class SearchDevicefragmentView implements MvpView {
         if (null == getContext()) {
             return;
         }
-        if (!fragment.binding.btnBondDevice.isClickable()) {
-            fragment.binding.btnBondDevice.setClickable(true);
-            fragment.binding.btnBondDevice.setBackground(ContextCompat.getDrawable(getContext(), R.drawable.selector_xiaojia_btn_green));
-        }
+        fragment.binding.btnBondDevice.setClickable(true);
+        fragment.binding.btnBondDevice.setBackground(ContextCompat.getDrawable(getContext(), R.drawable.selector_xiaojia_btn_green));
     }
 }
@@ -271,6 +271,7 @@ public class SelectWifiFragmentView implements MvpView {
                                 }
                                 try {
                                     String result = new String(data, "UTF-8");
+                                    Log.e(TAG, "onCharacteristicChanged: " + result);
                                     if (result.indexOf(BlufiConstants.WIFI_LINK_OK) != -1) {
                                         isSetNetSuccess = true;
                                         BleManager.getInstance().stopNotify(bleDevice, BlufiConstants.UUID_WIFI_SERVICE.toString(), BlufiConstants.UUID_NOTIFY_CHARACTERISTIC.toString());
@@ -60,10 +60,22 @@ import java.util.List;
     }
     public void addListData(BleDevice bleDevice) {
+        if (null == bleDevice) {
+            return;
+        }
         if (null != bluetoothDeviceList) {
-            bluetoothDeviceList.add(bleDevice);
-            hashMap.put(bleDevice, false);
-            notifyDataSetChanged();
+            boolean isHave = false;
+            for (int i = 0; i < bluetoothDeviceList.size(); i++) {
+                if (bleDevice.getName().equals(bluetoothDeviceList.get(i).getName())) {
+                    isHave = true;
+                    break;
+                }
+            }
+            if (!isHave) {
+                bluetoothDeviceList.add(bleDevice);
+                hashMap.put(bleDevice, false);
+                notifyDataSetChanged();
+            }
         }
     }
@@ -91,7 +103,7 @@ import java.util.List;
         //设备名称
         final BluetoothDevice bluetoothDevice = bluetoothDeviceList.get(position).getDevice();
         String deviceName = bluetoothDevice.getName();
-        binding.tvDeviceName.setText("小家智能音箱" + (position + 1));
+        binding.tvDeviceName.setText(deviceName);
         String deviceAddress = bluetoothDevice.getAddress();
         //设备的状态（BOND_BONDED：已绑定 常量值：12, BOND_BONDING：绑定中 常量值：11, BOND_NONE：未匹配 常量值：10）
         binding.tvDeviceAddress.setText(deviceAddress);
 package com.cnlive.strike.xiaojiaspeaker.ui.fragment;
 import android.os.Bundle;
+import android.os.Handler;
 import android.support.annotation.Nullable;
 import android.support.v4.content.ContextCompat;
 import android.view.View;
@@ -38,11 +39,26 @@ public class SearchDevicefragment extends MvpBindingFragment&lt;SearchDevicefragmen
         EventBusUtil.register(this);
         initTopBar();
-        initBlueToothScanConfig();
+        if (BleManager.getInstance().isBlueEnable()) {
+            initBlueToothScanConfig();
+            if (null != getMvpView()) {
+                getMvpView().initListAdapter();
+            }
+        } else {
+            new Handler().postDelayed(new Runnable() {
+                @Override
+                public void run() {
+                    initBlueToothScanConfig();
+                    if (null != getMvpView()) {
+                        getMvpView().initListAdapter();
+                    }
+                }
+            }, 2 * 1000);
+        }
         if (null != getMvpView()) {
             getMvpView().initView();
-            getMvpView().initListAdapter();
         }
+
     }
     @Override
@@ -50,6 +66,7 @@ public class SearchDevicefragment extends MvpBindingFragment&lt;SearchDevicefragmen
         super.onActivityCreated(savedInstanceState);
         StatusBarUtil.setStatusBarWrite(getActivity());
         StatusBarUtil2.setColor(getActivity(), ContextCompat.getColor(getActivity(), R.color.white), 0);
+
     }
     private void initTopBar() {
@@ -81,8 +98,6 @@ public class SearchDevicefragment extends MvpBindingFragment&lt;SearchDevicefragmen
                 .setScanTimeOut(1000 * 60)              // 扫描超时时间，可选，默认10秒；小于等于0表示不限制扫描时间
                 .build();
         BleManager.getInstance().initScanRule(scanRuleConfig);
-        //检查蓝牙是否打开
-//        if (BleManager.getInstance().isBlueEnable())
     }
     @Override
@@ -99,7 +114,7 @@ public class SearchDevicefragment extends MvpBindingFragment&lt;SearchDevicefragmen
     public void event(EventMsg msg) {
         if (EventMsg.CLOSE_BLUETOOTH_ACTIVITY == msg.getEventType()) {
             getActivity().finish();
-        }else if (EventMsg.GO_TO_CHINA_LISTEN_PAGE== msg.getEventType()){
+        } else if (EventMsg.GO_TO_CHINA_LISTEN_PAGE == msg.getEventType()) {
             getActivity().finish();
         }
     }