杨帅 / XiaojiaSoundBox · Commits

Commit 74cc09eea7ce8f51363c243e065e6a403efc0634

Authored by YangShuai
1 parent 3edc6cd6

1 修改配网逻辑

Inline Side-by-side
Showing 3 changed files with 5 additions and 3 deletions
config.gradle
  View file @74cc09e
@@ -21,7 +21,7 @@ ext { @@ -21,7 +21,7 @@ ext {
21 //编译方式 21 //编译方式
22 debug : false, 22 debug : false,
23 //版本号 23 //版本号
24 - version: "0.1.30", 24 + version: "0.2.0",
25 //Lib库前缀 25 //Lib库前缀
26 packeg : "com.cnlive.module", 26 packeg : "com.cnlive.module",
27 //Lib库名称 27 //Lib库名称
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/frame/presenter/SelectWifiFragmentPresenter.java
  View file @74cc09e
@@ -47,7 +47,6 @@ public class SelectWifiFragmentPresenter extends MvpBasePresenter<SelectWifiFrag @@ -47,7 +47,6 @@ public class SelectWifiFragmentPresenter extends MvpBasePresenter<SelectWifiFrag
47 if (null == getView()) { 47 if (null == getView()) {
48 return; 48 return;
49 } 49 }
50 - EventBus.getDefault().post(new EventMsg(EventMsg.CLOSE_BLUETOOTH_ACTIVITY,null));  
51 QMUITipDialogUtil.dismessDialog(); 50 QMUITipDialogUtil.dismessDialog();
52 Log.e(TAG, "onSuccess: " + baseInfo.getMessage()); 51 Log.e(TAG, "onSuccess: " + baseInfo.getMessage());
53 if (null!=onResponseListener){ 52 if (null!=onResponseListener){
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/frame/view/SelectWifiFragmentView.java
  View file @74cc09e
@@ -22,6 +22,7 @@ import com.cnlive.strike.xiaojiaspeaker.R; @@ -22,6 +22,7 @@ import com.cnlive.strike.xiaojiaspeaker.R;
22 import com.cnlive.strike.xiaojiaspeaker.commonInfo.XiaoJIaCommInfo; 22 import com.cnlive.strike.xiaojiaspeaker.commonInfo.XiaoJIaCommInfo;
23 import com.cnlive.strike.xiaojiaspeaker.constants.BlufiConstants; 23 import com.cnlive.strike.xiaojiaspeaker.constants.BlufiConstants;
24 import com.cnlive.strike.xiaojiaspeaker.frame.presenter.SelectWifiFragmentPresenter; 24 import com.cnlive.strike.xiaojiaspeaker.frame.presenter.SelectWifiFragmentPresenter;
  25 +import com.cnlive.strike.xiaojiaspeaker.model.message.EventMsg;
25 import com.cnlive.strike.xiaojiaspeaker.netWork.bean.NetworkResultBean; 26 import com.cnlive.strike.xiaojiaspeaker.netWork.bean.NetworkResultBean;
26 import com.cnlive.strike.xiaojiaspeaker.ui.activity.ConnBluetoothSuccessActivity; 27 import com.cnlive.strike.xiaojiaspeaker.ui.activity.ConnBluetoothSuccessActivity;
27 import com.cnlive.strike.xiaojiaspeaker.ui.adapter.WifiRecycleAdapter; 28 import com.cnlive.strike.xiaojiaspeaker.ui.adapter.WifiRecycleAdapter;
@@ -33,6 +34,8 @@ import com.cnlive.strike.xiaojiaspeaker.util.QMUITipDialogUtil; @@ -33,6 +34,8 @@ import com.cnlive.strike.xiaojiaspeaker.util.QMUITipDialogUtil;
33 import com.cnlive.strike.xiaojiaspeaker.util.WifiUtils; 34 import com.cnlive.strike.xiaojiaspeaker.util.WifiUtils;
34 import com.hannesdorfmann.mosby3.mvp.MvpView; 35 import com.hannesdorfmann.mosby3.mvp.MvpView;
35 36
  37 +import org.greenrobot.eventbus.EventBus;
  38 +
36 import java.io.UnsupportedEncodingException; 39 import java.io.UnsupportedEncodingException;
37 import java.util.ArrayList; 40 import java.util.ArrayList;
38 import java.util.List; 41 import java.util.List;
@@ -288,9 +291,9 @@ public class SelectWifiFragmentView implements MvpView { @@ -288,9 +291,9 @@ public class SelectWifiFragmentView implements MvpView {
288 if (null==getContext()){ 291 if (null==getContext()){
289 return; 292 return;
290 } 293 }
291 - QMUITipDialogUtil.dismessDialog();  
292 //判断是否绑定 294 //判断是否绑定
293 if (networkResultBean.isIsBinded()&&"success".equals(networkResultBean.getResult().trim())) { 295 if (networkResultBean.isIsBinded()&&"success".equals(networkResultBean.getResult().trim())) {
  296 + EventBus.getDefault().post(new EventMsg(EventMsg.CLOSE_BLUETOOTH_ACTIVITY,null));
294 ConnBluetoothSuccessActivity.startActivity(getContext(), networkResultBean); 297 ConnBluetoothSuccessActivity.startActivity(getContext(), networkResultBean);
295 } else { 298 } else {
296 AlertUtil.showDeftToast(getContext(), "配网失败"); 299 AlertUtil.showDeftToast(getContext(), "配网失败");