1 修改配网逻辑

YangShuai
1 parent 57631099
Showing 2 changed files with 10 additions and 5 deletions
config.gradle
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/frame/view/SelectWifiFragmentView.java
@@ -21,7 +21,7 @@ ext {
             //编译方式
             debug  : false,
             //版本号
-            version: "0.1.29",
+            version: "0.1.30",
             //Lib库前缀
             packeg : "com.cnlive.module",
             //Lib库名称
@@ -285,11 +285,15 @@ public class SelectWifiFragmentView implements MvpView {
                                                 fragment.getPresenter().queryConfigDeviceNetResult(getContext(), familyId, new SelectWifiFragmentPresenter.OnResponseListener() {
                                                     @Override
                                                     public void onSuccess(NetworkResultBean networkResultBean) {
+                                                        if (null==getContext()){
+                                                            return;
+                                                        }
+                                                        QMUITipDialogUtil.dismessDialog();
                                                         //判断是否绑定
                                                         if (networkResultBean.isIsBinded()&&"success".equals(networkResultBean.getResult().trim())) {
                                                             ConnBluetoothSuccessActivity.startActivity(getContext(), networkResultBean);
                                                         } else {
-                                                            AlertUtil.showDeftToast(getContext(), "配网失败,");
+                                                            AlertUtil.showDeftToast(getContext(), "配网失败");
                                                         }
                                                     }
                                                 });
@@ -299,6 +303,9 @@ public class SelectWifiFragmentView implements MvpView {
                                         if (null != failHandler && null != failRunnable) {
                                             failHandler.removeCallbacks(failRunnable);
                                         }
+                                        QMUITipDialogUtil.dismessDialog();
+                                        BleManager.getInstance().stopNotify(bleDevice, BlufiConstants.UUID_WIFI_SERVICE.toString(), BlufiConstants.UUID_NOTIFY_CHARACTERISTIC.toString());
+                                        BleManager.getInstance().disconnect(bleDevice);
                                         if (null != errorDialog) {
                                             if (!TextUtils.isEmpty(SSID)) {
                                                 errorDialog.setTipMsg(SSID + "\n密码错误");
@@ -307,9 +314,7 @@ public class SelectWifiFragmentView implements MvpView {
                                                 }
                                             }
                                         }
-                                        QMUITipDialogUtil.dismessDialog();
-                                        BleManager.getInstance().stopNotify(bleDevice, BlufiConstants.UUID_WIFI_SERVICE.toString(), BlufiConstants.UUID_NOTIFY_CHARACTERISTIC.toString());
-                                        BleManager.getInstance().disconnect(bleDevice);
+
                                     }
                                 } catch (UnsupportedEncodingException e) {
                                     e.printStackTrace();