1 优化配网

YangShuai
1 parent afee32f4
Showing 32 changed files with 631 additions and 55 deletions
app/src/main/java/com/cnlive/strike/xiaojiaspeaker/MainActivity.java
config.gradle
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/frame/presenter/ChangeDeviceNamePresenter.java
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/frame/presenter/DeviceManagerFragmentPresenter.java
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/frame/presenter/SelectWifiFragmentPresenter.java
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/frame/view/AllDeviceFragmentView.java
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/frame/view/ChangeDeviceNameView.java
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/frame/view/InvitFriendView.java
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/frame/view/UserManagerView.java
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/model/message/EventMsg.java
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/netWork/bean/FamilyListBean.java
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/netWork/bean/NetworkResultBean.java
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/netWork/bean/XiaoJiaContactInfo.java
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/activity/BlueToothStep1Activity.java
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/activity/BlueToothStep2Activity.java
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/activity/ChangeWifiActivity.java
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/activity/ConnBluetoothSuccessActivity.java
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/activity/InvitFriendActivity.java
@@ -26,16 +26,16 @@ public class MainActivity extends AppCompatActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_speaker_main);
-        XiaoJIaCommInfo.setUserId(this, "10514333");
-        XiaoJIaCommInfo.setUserPhone(this, " 18301489586");
+        XiaoJIaCommInfo.setUserId(this, "10514333".trim());
+        XiaoJIaCommInfo.setUserPhone(this, "18301489586".trim());
 //        XiaoJIaCommInfo.setUserId(this, "10513196");
 //        XiaoJIaCommInfo.setUserPhone(this, "15010140838");
 //        startActivity(new Intent(MainActivity.this, ToolBarTestActivity.class));
 //        startActivity(new Intent(MainActivity.this, BluetoothConnActivity.class));
 //        startActivity(new Intent(MainActivity.this, BlueToothStep1Activity.class));
-            startActivity(new Intent(MainActivity.this, ConnBluetoothSuccessActivity.class));
-//        startActivity(new Intent(MainActivity.this, AllDeviceActivity.class));
+//            startActivity(new Intent(MainActivity.this, ConnBluetoothSuccessActivity.class));
+        startActivity(new Intent(MainActivity.this, AllDeviceActivity.class));
 //        startActivity(new Intent(MainActivity.this, DeviceInstructionActivity.class));
 //        startActivity(new Intent(MainActivity.this, DeviceManagerActivity.class));
 //        startActivity(new Intent(MainActivity.this, FirmwareUpdateActivity.class));
@@ -21,7 +21,7 @@ ext {
             //编译方式
             debug  : false,
             //版本号
-            version: "0.0.9",
+            version: "0.0.10",
             //Lib库前缀
             packeg : "com.cnlive.module",
             //Lib库名称
@@ -2,6 +2,7 @@ package com.cnlive.strike.xiaojiaspeaker.frame.presenter;
 import android.app.Activity;
 import android.content.Context;
+import android.os.Handler;
 import android.util.Log;
 import com.cnlive.libs.base.logic.Logic;
@@ -28,7 +29,7 @@ public class ChangeDeviceNamePresenter extends MvpBasePresenter&lt;ChangeDeviceName
     private String TAG = "ChangeDeviceNamePresenter";
-    public void changeDeviceName(Activity context, String deviceId, String newName) {
+    public void changeDeviceName(Activity context, String deviceId, String newName, OnResponseListener onResponseListener) {
         if (null == getView()) {
             return;
         }
@@ -51,9 +52,20 @@ public class ChangeDeviceNamePresenter extends MvpBasePresenter&lt;ChangeDeviceName
                         if (null == getView()) {
                             return;
                         }
-                        EventBus.getDefault().post(new EventMsg(EventMsg.CHANGE_DEVICE_NAME_SUCCESS, null));
+                        EventBus.getDefault().post(new EventMsg(EventMsg.CHANGE_DEVICE_NAME_SUCCESS, newName));
                         QMUITipDialogUtil.dismessDialog();
                         QMUITipDialogUtil.successDialog(context, "保存成功", 1);
+                        new Handler().postDelayed(new Runnable() {
+                            @Override
+                            public void run() {
+                                if (null != onResponseListener) {
+                                    if (null == getView()) {
+                                        return;
+                                    }
+                                    onResponseListener.onSuccess();
+                                }
+                            }
+                        }, 1000);
                     }
                 })
                 .setFailureCallback(new FailureCallback() {
@@ -71,4 +83,8 @@ public class ChangeDeviceNamePresenter extends MvpBasePresenter&lt;ChangeDeviceName
                 .start();
     }
+
+    public interface OnResponseListener {
+        void onSuccess();
+    }
 }
@@ -110,4 +110,5 @@ public class DeviceManagerFragmentPresenter extends MvpBasePresenter&lt;DeviceManag
                 .start();
     }
+
 }
@@ -8,6 +8,7 @@ import com.cnlive.libs.base.logic.callback.DataCallback;
 import com.cnlive.libs.base.logic.callback.FailureCallback;
 import com.cnlive.libs.base.logic.callback.SuccessCallback;
 import com.cnlive.strike.xiaojiaspeaker.frame.view.SelectWifiFragmentView;
+import com.cnlive.strike.xiaojiaspeaker.model.message.EventMsg;
 import com.cnlive.strike.xiaojiaspeaker.netWork.ApiServiceXiaoJia;
 import com.cnlive.strike.xiaojiaspeaker.netWork.bean.NetworkResultBean;
 import com.cnlive.strike.xiaojiaspeaker.netWork.bean.APIBaseInfo;
@@ -15,6 +16,8 @@ import com.cnlive.strike.xiaojiaspeaker.netWork.result.SubscriptionRequest;
 import com.cnlive.strike.xiaojiaspeaker.util.QMUITipDialogUtil;
 import com.hannesdorfmann.mosby3.mvp.MvpBasePresenter;
+import org.greenrobot.eventbus.EventBus;
+
 import java.util.HashMap;
 import java.util.Map;
@@ -24,7 +27,7 @@ public class SelectWifiFragmentPresenter extends MvpBasePresenter&lt;SelectWifiFrag
     private String TAG = "SelectWifiFragmentPresenter";
-    public void queryConfigDeviceNetResult(Activity context, String familyId) {
+    public void queryConfigDeviceNetResult(Activity context, String familyId,OnResponseListener onResponseListener) {
         if (null == getView()) {
             return;
         }
@@ -44,15 +47,19 @@ public class SelectWifiFragmentPresenter extends MvpBasePresenter&lt;SelectWifiFrag
                         if (null == getView()) {
                             return;
                         }
+                        EventBus.getDefault().post(new EventMsg(EventMsg.CLOSE_BLUETOOTH_ACTIVITY,null));
                         QMUITipDialogUtil.dismessDialog();
-                        Log.e(TAG, "onSuccess: "+baseInfo.getMessage());
+                        Log.e(TAG, "onSuccess: " + baseInfo.getMessage());
+                        if (null!=onResponseListener){
+                            onResponseListener.onSuccess(baseInfo.getData());
+                        }
                     }
                 })
                 .setFailureCallback(new FailureCallback() {
                     @Override
                     public void onFailure(int i, String s) {
                         //显示重试
-                        Log.e(TAG, "onFailure: "+s);
+                        Log.e(TAG, "onFailure: " + s);
                         QMUITipDialogUtil.dismessDialog();
                     }
                 })
@@ -99,4 +106,8 @@ public class SelectWifiFragmentPresenter extends MvpBasePresenter&lt;SelectWifiFrag
 //                    }
 //                });
 //    }
+
+    public interface OnResponseListener {
+        void onSuccess(NetworkResultBean networkResultBean);
+    }
 }
@@ -24,7 +24,7 @@ public class AllDeviceFragmentView implements MvpView {
     private AllDeviceFragment fragment;
     private AllDeviceAdapter adapter;
     private List<FamilyListBean.UsersBeanX.DeviceListBean> allDeviceInfoList;
-//    private List<PopMenuInfo> popMenuInfoList = null;
+    //    private List<PopMenuInfo> popMenuInfoList = null;
 //    private PopMenu mPopMenu;
     private String TAG = "AllDeviceFragmentView";
     private FamilyListBean familyListBean;
@@ -50,7 +50,7 @@ public class AllDeviceFragmentView implements MvpView {
             for (FamilyListBean.UsersBeanX usersBean : familyListBean.getUsers()) {
                 //存储自己为主人的家庭
-                if (usersBean.getIsMaster() == FamilyListBean.THE_HOST) {
+                if (FamilyListBean.THE_HOST.equals(usersBean.getIsMaster())) {
                     Log.e(TAG, "getId: " + usersBean.getUserId());
                     Log.e(TAG, "getToken: " + usersBean.getToken());
                     //存储家庭id
@@ -83,7 +83,7 @@ public class AllDeviceFragmentView implements MvpView {
         adapter.setOnItemClickListener(new AllDeviceAdapter.OnItemClickListener() {
             @Override
             public void onItemClick(int position, FamilyListBean.UsersBeanX.DeviceListBean AllDeviceInfo) {
-                DeviceDetailActivity.startActivity(fragment.getActivity(), AllDeviceInfo,familyListBean.getUsers().get(AllDeviceInfo.getParentPosition()).getId());
+                DeviceDetailActivity.startActivity(fragment.getActivity(), AllDeviceInfo, familyListBean.getUsers().get(AllDeviceInfo.getParentPosition()).getId());
             }
         });
     }
@@ -8,6 +8,7 @@ import android.text.TextWatcher;
 import android.view.View;
 import com.cnlive.strike.xiaojiaspeaker.R;
+import com.cnlive.strike.xiaojiaspeaker.frame.presenter.ChangeDeviceNamePresenter;
 import com.cnlive.strike.xiaojiaspeaker.netWork.bean.DeviceDetail;
 import com.cnlive.strike.xiaojiaspeaker.ui.activity.ChangeDeviceNameActivity;
 import com.cnlive.strike.xiaojiaspeaker.ui.fragment.ChangeDeviceNameFragment;
@@ -61,7 +62,14 @@ public class ChangeDeviceNameView implements MvpView {
         fragment.binding.btnNext.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                fragment.getPresenter().changeDeviceName(getContext(), deviceId, fragment.binding.etName.getText().toString());
+                fragment.getPresenter().changeDeviceName(getContext(), deviceId, fragment.binding.etName.getText().toString(), new ChangeDeviceNamePresenter.OnResponseListener() {
+                    @Override
+                    public void onSuccess() {
+                        if (null != getContext()) {
+                            getContext().finish();
+                        }
+                    }
+                });
             }
         });
     }
@@ -39,7 +39,8 @@ public class InvitFriendView implements MvpView {
     private InvitFriendFragment fragment;
     private List<RoleInfo> roleInfoList;
     private SetRoleAdapter setRoleAdapter;
-    private  String encryptionContent;
+    private String encryptionContent;
+    private String currentSelectFamilyId;
     public InvitFriendView(InvitFriendFragment fragment) {
         this.fragment = fragment;
@@ -49,11 +50,12 @@ public class InvitFriendView implements MvpView {
         return fragment == null ? null : fragment.getActivity();
     }
-    public void initView(){
+    public void initView(String currentSelectFamilyId) {
+        this.currentSelectFamilyId = currentSelectFamilyId;
         fragment.binding.btnShare.setOnClickListener(v -> {
-            if(!TextUtils.isEmpty(encryptionContent)){
-                ShareFriendActivity.startActivity(fragment.getActivity(),"","",encryptionContent);
-            }else {
+            if (!TextUtils.isEmpty(encryptionContent)) {
+                ShareFriendActivity.startActivity(fragment.getActivity(), "", "", encryptionContent);
+            } else {
                 //提示跳转失败原因
             }
         });
@@ -75,7 +75,7 @@ public class SearchDevicefragmentView implements MvpView {
         fragment.binding.tvPreviousStep.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                BlueToothStep2Activity.startActivity(getContext());
+//                BlueToothStep2Activity.startActivity(getContext());
                 fragment.getActivity().finish();
             }
         });
@@ -21,6 +21,9 @@ import com.cnlive.libs.base.util.AlertUtil;
 import com.cnlive.strike.xiaojiaspeaker.R;
 import com.cnlive.strike.xiaojiaspeaker.commonInfo.XiaoJIaCommInfo;
 import com.cnlive.strike.xiaojiaspeaker.constants.BlufiConstants;
+import com.cnlive.strike.xiaojiaspeaker.frame.presenter.SelectWifiFragmentPresenter;
+import com.cnlive.strike.xiaojiaspeaker.netWork.bean.NetworkResultBean;
+import com.cnlive.strike.xiaojiaspeaker.ui.activity.ConnBluetoothSuccessActivity;
 import com.cnlive.strike.xiaojiaspeaker.ui.adapter.WifiRecycleAdapter;
 import com.cnlive.strike.xiaojiaspeaker.ui.fragment.SelectWifiFragment;
 import com.cnlive.strike.xiaojiaspeaker.ui.widget.TipDialog;
@@ -48,10 +51,25 @@ public class SelectWifiFragmentView implements MvpView {
     private String familyId;
     private String cmccId;//移动id
     private final int DELAY_TIME = 10;//延时查询10秒
+    private Runnable failRunnable;
+    private boolean isSetNetSuccess = false;
+    private final int FAIL_DELAY_TIME = 40;//配网中等待时间40秒
     public SelectWifiFragmentView(SelectWifiFragment fragment) {
         this.fragment = fragment;
         wifiUtils = new WifiUtils(fragment.getActivity());
+        failHandler = new Handler();
+        failRunnable = new Runnable() {
+            @Override
+            public void run() {
+                if (isSetNetSuccess) {
+                    if (null != getContext()) {
+                        QMUITipDialogUtil.dismessDialog();
+                        QMUITipDialogUtil.failedDialog(getContext(), "配网超时", 1);
+                    }
+                }
+            }
+        };
     }
     public Activity getContext() {
@@ -201,6 +219,11 @@ public class SelectWifiFragmentView implements MvpView {
             // 连接成功，BleDevice即为所连接的BLE设备
             @Override
             public void onConnectSuccess(final BleDevice bleDevice, BluetoothGatt gatt, int status) {
+                isSetNetSuccess = false;
+                if (null != failHandler && null != failRunnable) {
+                    failHandler.removeCallbacks(failRunnable);
+                    failHandler.postDelayed(failRunnable, FAIL_DELAY_TIME * 1000);
+                }
                 BleManager.getInstance().notify(
                         bleDevice,
                         BlufiConstants.UUID_WIFI_SERVICE.toString(),
@@ -247,6 +270,7 @@ public class SelectWifiFragmentView implements MvpView {
                                     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());
                                         BleManager.getInstance().disconnect(bleDevice);
                                         //查询配网是否成功
@@ -257,10 +281,18 @@ public class SelectWifiFragmentView implements MvpView {
                                         new Handler().postDelayed(new Runnable() {
                                             @Override
                                             public void run() {
-                                                fragment.getPresenter().queryConfigDeviceNetResult(getContext(), familyId);
+                                                fragment.getPresenter().queryConfigDeviceNetResult(getContext(), familyId, new SelectWifiFragmentPresenter.OnResponseListener() {
+                                                    @Override
+                                                    public void onSuccess(NetworkResultBean networkResultBean) {
+                                                        ConnBluetoothSuccessActivity.startActivity(getContext(), networkResultBean);
+                                                    }
+                                                });
                                             }
-                                        }, DELAY_TIME*1000);
+                                        }, DELAY_TIME * 1000);
                                     } else if (result.indexOf(BlufiConstants.WIFI_LINK_FAIL) != -1) {
+                                        if (null != failHandler && null != failRunnable) {
+                                            failHandler.removeCallbacks(failRunnable);
+                                        }
                                         if (null != errorDialog) {
                                             if (!TextUtils.isEmpty(SSID)) {
                                                 errorDialog.setTipMsg(SSID + "\n密码错误");
@@ -179,7 +179,14 @@ public class UserManagerView implements MvpView {
         fragment.binding.btnQrcode.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                InvitFriendActivity.startActivity(getContext());
+                InvitFriendActivity.startActivity(getContext(), currentSelectFamilyId);
+            }
+        });
+        //关闭提示按钮
+        fragment.binding.llCloseTip.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                fragment.binding.flCloseView.setVisibility(View.GONE);
             }
         });
     }
@@ -349,7 +356,7 @@ public class UserManagerView implements MvpView {
             @Override
             public void onClick(int position, PopMenuInfo popMenuInfo) {
                 if (position == 1) {
-                    BlueToothStep1Activity.startActivity(fragment.getActivity());
+                    InvitFriendActivity.startActivity(getContext(), currentSelectFamilyId);
                 }
             }
         });
@@ -3,6 +3,7 @@ package com.cnlive.strike.xiaojiaspeaker.model.message;
 public class EventMsg {
     public static final int CHANGE_DEVICE_NAME_SUCCESS = 0;//修改时设备名称成功
     public static final int DELETE_DEVICE_NAME_SUCCESS = 1;//删除设备成功
+    public static final int CLOSE_BLUETOOTH_ACTIVITY = 0;//关闭配网页面
     private int eventType;
     private Object data;
@@ -7,8 +7,8 @@ import java.util.List;
  * 家庭id
  */
 public class FamilyListBean implements Serializable {
-    public static final int THE_HOST = 0;//主人
-    public static final int THE_MEMBER = 1;//成员
+    public static final String THE_HOST = "0";//主人
+    public static final String THE_MEMBER = "1";//成员
     /**
@@ -53,7 +53,7 @@ public class FamilyListBean implements Serializable {
         private String userId;
         private String name;
         private String img;
-        private int isMaster;
+        private String isMaster;
         private List<DeviceListBean> deviceList;
         public String getId() {
@@ -104,11 +104,11 @@ public class FamilyListBean implements Serializable {
             this.img = img;
         }
-        public int getIsMaster() {
+        public String getIsMaster() {
             return isMaster;
         }
-        public void setIsMaster(int isMaster) {
+        public void setIsMaster(String isMaster) {
             this.isMaster = isMaster;
         }
@@ -985,4 +985,5 @@ public class FamilyListBean implements Serializable {
             }
         }
     }
+
 }
 package com.cnlive.strike.xiaojiaspeaker.netWork.bean;
+import java.io.Serializable;
+
 /**
  * 配网结果查询
  */
-public class NetworkResultBean {
+public class NetworkResultBean implements Serializable {
     /**
      * mainctl : 4000119C000011AE
+package com.cnlive.strike.xiaojiaspeaker.netWork.bean;
+
+import java.util.List;
+
+public class XiaoJiaContactInfo {
+
+    private List<String> sids;
+
+    public List<String> getSids() {
+        return sids;
+    }
+
+    public void setSids(List<String> sids) {
+        this.sids = sids;
+    }
+}
@@ -11,7 +11,14 @@ import android.view.View;
 import com.cnlive.libs.base.util.StatusBarUtil;
 import com.cnlive.libs.base.util.StatusBarUtil2;
 import com.cnlive.strike.xiaojiaspeaker.R;
+import com.cnlive.strike.xiaojiaspeaker.commonInfo.XiaoJIaCommInfo;
 import com.cnlive.strike.xiaojiaspeaker.databinding.ActivityBlueToothStep1Binding;
+import com.cnlive.strike.xiaojiaspeaker.model.message.EventMsg;
+import com.cnlive.strike.xiaojiaspeaker.util.EventBusUtil;
+
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
 public class BlueToothStep1Activity extends AppCompatActivity {
     private ActivityBlueToothStep1Binding binding;
@@ -20,17 +27,23 @@ public class BlueToothStep1Activity extends AppCompatActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         binding = DataBindingUtil.setContentView(this, R.layout.activity_blue_tooth_step1);
+        EventBusUtil.register(this);
         initTopBar();
         initView();
     }
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        EventBusUtil.unRegister(this);
+    }
+
     private void initView() {
         //下一步
         binding.btnNext.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
                 BlueToothStep2Activity.startActivity(BlueToothStep1Activity.this);
-                finish();
             }
         });
     }
@@ -52,4 +65,11 @@ public class BlueToothStep1Activity extends AppCompatActivity {
     public static void startActivity(Activity activity) {
         activity.startActivity(new Intent(activity, BlueToothStep1Activity.class));
     }
+
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void event(EventMsg msg) {
+        if (EventMsg.CLOSE_BLUETOOTH_ACTIVITY == msg.getEventType()) {
+            finish();
+        }
+    }
 }
@@ -26,11 +26,16 @@ import com.cnlive.libs.base.util.StatusBarUtil;
 import com.cnlive.libs.base.util.StatusBarUtil2;
 import com.cnlive.strike.xiaojiaspeaker.R;
 import com.cnlive.strike.xiaojiaspeaker.databinding.ActivityBlueToothStep2Binding;
+import com.cnlive.strike.xiaojiaspeaker.model.message.EventMsg;
 import com.cnlive.strike.xiaojiaspeaker.ui.widget.SelectDialog;
+import com.cnlive.strike.xiaojiaspeaker.util.EventBusUtil;
 import com.cnlive.strike.xiaojiaspeaker.util.lib_permisshelper.PermissionsListener;
 import com.cnlive.strike.xiaojiaspeaker.util.lib_permisshelper.PermissionsUtils;
 import com.cnlive.strike.xiaojiaspeaker.util.utilcode.CheckUtil;
+import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
+
 public class BlueToothStep2Activity extends AppCompatActivity {
     private ActivityBlueToothStep2Binding binding;
     private PermissionsUtils mPermissionsUtils = new PermissionsUtils();//权限申请
@@ -43,6 +48,8 @@ public class BlueToothStep2Activity extends AppCompatActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         binding = DataBindingUtil.setContentView(this, R.layout.activity_blue_tooth_step2);
+        EventBusUtil.register(this);
+
         initTopBar();
         initView();
         initPermissionDefineTip();
@@ -55,6 +62,7 @@ public class BlueToothStep2Activity extends AppCompatActivity {
         if (null != mStatusReceive) {
             unregisterReceiver(mStatusReceive);
         }
+        EventBusUtil.unRegister(this);
     }
     private void initBlueToothReceiver() {
@@ -69,7 +77,7 @@ public class BlueToothStep2Activity extends AppCompatActivity {
         binding.tvPreviousStep.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                BlueToothStep1Activity.startActivity(BlueToothStep2Activity.this);
+//                BlueToothStep1Activity.startActivity(BlueToothStep2Activity.this);
                 finish();
             }
         });
@@ -127,7 +135,6 @@ public class BlueToothStep2Activity extends AppCompatActivity {
                         //判断蓝牙是否打开
                         if (BleManager.getInstance().isBlueEnable()) {
                             SearchDeviceActivity.startActivity(BlueToothStep2Activity.this);
-                            finish();
                         } else {
                             BleManager.getInstance().enableBluetooth();
                         }
@@ -244,4 +251,10 @@ public class BlueToothStep2Activity extends AppCompatActivity {
         }
     };
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void event(EventMsg msg) {
+        if (EventMsg.CLOSE_BLUETOOTH_ACTIVITY == msg.getEventType()) {
+            finish();
+        }
+    }
 }
+package com.cnlive.strike.xiaojiaspeaker.ui.activity;
+
+import android.Manifest;
+import android.app.Activity;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.net.Uri;
+import android.os.Bundle;
+import android.os.Handler;
+import android.provider.Settings;
+import android.support.annotation.NonNull;
+import android.support.v4.app.ActivityCompat;
+import android.support.v7.app.AppCompatActivity;
+import android.util.Log;
+
+import com.clj.fastble.data.BleDevice;
+import com.cnlive.strike.xiaojiaspeaker.R;
+import com.cnlive.strike.xiaojiaspeaker.ui.fragment.SelectWifiFragment;
+import com.cnlive.strike.xiaojiaspeaker.ui.widget.SelectDialog;
+import com.cnlive.strike.xiaojiaspeaker.util.WifiUtils;
+import com.cnlive.strike.xiaojiaspeaker.util.lib_permisshelper.PermissionsListener;
+import com.cnlive.strike.xiaojiaspeaker.util.lib_permisshelper.PermissionsUtils;
+
+public class ChangeWifiActivity extends AppCompatActivity {
+    private PermissionsUtils mPermissionsUtils = new PermissionsUtils();//权限申请
+    private int permissionRequestCount = 0;//权限请求次数
+    private SelectDialog selectDialog;
+    private WifiUtils wifiUtils;
+    private String TAG = "ChangeWifiActivity";
+    private BleDevice bleDevice;
+    private boolean isFirstCheckWifi = true;
+    private Runnable wifiRunable;
+    private Handler handler;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_select_wifi);
+        if (null != getIntent().getExtras()) {
+            bleDevice = (BleDevice) getIntent().getExtras().get("bleDevice");
+        }
+        wifiUtils = new WifiUtils(this);
+//        registerBroadcast();
+//        getPermissionsWithTip();
+        getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container,  SelectWifiFragment.newInstance(bleDevice)).commitAllowingStateLoss();
+    }
+
+
+    private void initPermissionDefineTip() {
+        selectDialog = new SelectDialog(ChangeWifiActivity.this, "您尚未授予程序运行所需权限\n是否设置?",
+                "返回", new SelectDialog.DialogInterface() {
+            @Override
+            public void onClick(SelectDialog dialog) {
+                dialog.dismiss();
+                finish();
+            }
+        }, "设置", new SelectDialog.DialogInterface() {
+            @Override
+            public void onClick(SelectDialog dialog) {
+                dialog.dismiss();
+                Intent intent = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
+                Uri uri = Uri.fromParts("package", getPackageName(), null);
+                intent.setData(uri);
+                startActivityForResult(intent, 0);
+                permissionRequestCount = 0;
+            }
+        });
+        selectDialog.setRightBtnColor(R.color.green);
+
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        Log.e(TAG, "onResume: " + wifiUtils.isOpenWifi());
+    }
+
+    /**
+     * 一次申请一组权限（使用拒绝弹框）点击事件
+     */
+    public void getPermissionsWithTip() {
+        if (1 == permissionRequestCount) {
+            return;
+        }
+        mPermissionsUtils
+                .setPermissionsListener(new PermissionsListener() {
+                    @Override
+                    public void onDenied(String[] deniedPermissions) {
+//                        getPermissionsWithTip();
+                    }
+
+                    @Override
+                    public void onGranted() {
+                        //判断蓝牙是否打开
+                        if (null == getSupportFragmentManager().findFragmentById(R.id.fragment_container)) {
+                            //判断wifi是否打开
+                            if (!wifiUtils.isOpenWifi()) {
+                                wifiUtils.openWifi();
+                            }
+                        }
+                    }
+                })
+                .withActivity(ChangeWifiActivity.this)
+                .getPermissions(ChangeWifiActivity.this
+                        , 100
+                        , Manifest.permission.INTERNET
+                        , Manifest.permission.ACCESS_FINE_LOCATION
+                        , Manifest.permission.ACCESS_COARSE_LOCATION
+                );
+//                .getPermissionsWithTips(MainActivity.this
+//                        ,100
+//                        , new String[]{"人家要录音","我们需要读取你的信息，磨磨唧唧的","我要上网","我要读内存卡","我要看日历","我要定位"}
+//                        , Manifest.permission.RECORD_AUDIO
+//                        , Manifest.permission.READ_SMS
+//                        , Manifest.permission.INTERNET
+//                        , Manifest.permission.READ_EXTERNAL_STORAGE
+//                        , Manifest.permission.READ_CALENDAR
+//                        , Manifest.permission.ACCESS_FINE_LOCATION);
+    }
+
+    /**
+     * 权限回调
+     *
+     * @param requestCode
+     * @param permissions
+     * @param grantResults
+     */
+    @Override
+    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions,
+                                           @NonNull int[] grantResults) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
+        if (1 == permissionRequestCount) {
+            return;
+        }
+        boolean isShowPermissionTip = true;
+        for (int i = 0; i < grantResults.length; i++) {//判断权限的结果，如果有被拒绝，就return
+            if (grantResults[i] == PackageManager.PERMISSION_DENIED) {
+                if (!ActivityCompat.shouldShowRequestPermissionRationale(this, permissions[i])) {
+                    isShowPermissionTip = false;
+                    break;
+                }
+            }
+        }
+        if (isShowPermissionTip) {
+            mPermissionsUtils.dealResult(requestCode, permissions, grantResults);
+        } else {
+            if (0 == permissionRequestCount) {
+                selectDialog.setCancelable(false);
+                selectDialog.setCanceledOnTouchOutside(false);
+                if (!selectDialog.isShowing()) {
+                    selectDialog.show();
+                    permissionRequestCount = 1;
+                }
+            } else {
+                return;
+            }
+        }
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+//        if (null != mBroadcastReceiver) {
+//            unregisterReceiver(mBroadcastReceiver);
+//        }
+    }
+
+//    private void registerBroadcast() {
+//        IntentFilter intentFilter = new IntentFilter();
+//        intentFilter.addAction(WifiManager.SCAN_RESULTS_AVAILABLE_ACTION);
+//        intentFilter.addAction(WifiManager.NETWORK_STATE_CHANGED_ACTION);
+//        intentFilter.addAction(WifiManager.WIFI_STATE_CHANGED_ACTION);
+//        intentFilter.addAction(WifiManager.SUPPLICANT_STATE_CHANGED_ACTION);
+//        registerReceiver(mBroadcastReceiver, intentFilter);
+//    }
+
+//    private BroadcastReceiver mBroadcastReceiver = new BroadcastReceiver() {
+//        @Override
+//        public void onReceive(Context context, final Intent intent) {
+//            String resultAction = intent.getAction();
+//            //当扫描结果后，进行刷新列表
+//            if (intent.getAction().equals(WifiManager.SCAN_RESULTS_AVAILABLE_ACTION)) {
+//                Log.e(TAG, "onReceive: SCAN_RESULTS_AVAILABLE_ACTION");
+//                if (null == getSupportFragmentManager().findFragmentById(R.id.fragment_container)) {
+//                    getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new SelectWifiFragment()).commitAllowingStateLoss();
+//                }
+//            } else if (intent.getAction().equals(WifiManager.NETWORK_STATE_CHANGED_ACTION)) {//wifi连接网络状态变化
+//                NetworkInfo.DetailedState state = ((NetworkInfo) intent.getParcelableExtra(WifiManager.EXTRA_NETWORK_INFO)).getDetailedState();
+//                Log.e(TAG, "onReceive: NETWORK_STATE_CHANGED_ACTION" + wifiUtils.isOpenWifi());
+//                if (null == getSupportFragmentManager().findFragmentById(R.id.fragment_container)) {
+//                    new Handler().postDelayed(new Runnable() {
+//                        @Override
+//                        public void run() {
+//                            if (null == getSupportFragmentManager().findFragmentById(R.id.fragment_container)) {
+//                                int mWifiState = intent.getIntExtra(WifiManager.EXTRA_WIFI_STATE, 0);
+//                                if (mWifiState!=WifiManager.WIFI_STATE_ENABLING||mWifiState!=WifiManager.WIFI_STATE_ENABLED) {
+//                                    finish();
+//                                }else {
+//                                    getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new SelectWifiFragment()).commitAllowingStateLoss();
+//                                }
+//                            }
+//                        }
+//                    }, 2000);
+//                }
+//
+//            }
+//            if (intent.getAction().equals(WifiManager.WIFI_STATE_CHANGED_ACTION)) {//wifi状态变化
+//            } else if (intent.getAction().equals(WifiManager.SUPPLICANT_STATE_CHANGED_ACTION)) {
+//
+//            }
+//        }
+//    };
+
+    public static void StartActivity(Activity activity, BleDevice bleDevice) {
+        Intent intent = new Intent(activity, ChangeWifiActivity.class);
+        intent.putExtra("bleDevice", bleDevice);
+        activity.startActivity(intent);
+    }
+}
@@ -6,6 +6,7 @@ import android.databinding.DataBindingUtil;
 import android.support.v4.content.ContextCompat;
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
+import android.text.TextUtils;
 import android.view.View;
 import com.cnlive.libs.base.util.StatusBarUtil;
@@ -13,6 +14,7 @@ import com.cnlive.libs.base.util.StatusBarUtil2;
 import com.cnlive.strike.xiaojiaspeaker.R;
 import com.cnlive.strike.xiaojiaspeaker.commonInfo.XiaoJIaCommInfo;
 import com.cnlive.strike.xiaojiaspeaker.databinding.ActivityConnBluetoothSuccessBinding;
+import com.cnlive.strike.xiaojiaspeaker.netWork.bean.NetworkResultBean;
 import com.daimajia.androidanimations.library.Techniques;
 import com.daimajia.androidanimations.library.YoYo;
@@ -23,11 +25,15 @@ import com.daimajia.androidanimations.library.YoYo;
  */
 public class ConnBluetoothSuccessActivity extends AppCompatActivity {
     private ActivityConnBluetoothSuccessBinding binding;
+    private NetworkResultBean networkResultBean;
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         binding = DataBindingUtil.setContentView(this, R.layout.activity_conn_bluetooth_success);
+        if (null != getIntent().getExtras()) {
+            networkResultBean = (NetworkResultBean) getIntent().getExtras().getSerializable("networkResultBean");
+        }
         initTopBar();
         initView();
     }
@@ -59,6 +65,29 @@ public class ConnBluetoothSuccessActivity extends AppCompatActivity {
                 XiaoJIaCommInfo.setIsShowConnGift(ConnBluetoothSuccessActivity.this, false);
             }
         });
+        //邀请使用者
+        binding.btnInvitFriend.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+
+            }
+        });
+        //修改音箱名称
+        binding.tvSetDeviceName.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                if (null != networkResultBean && !TextUtils.isEmpty(networkResultBean.getMainctl())) {
+                    ChangeDeviceNameActivity.startActivity(ConnBluetoothSuccessActivity.this, networkResultBean.getMainctl());
+                }
+            }
+        });
+        //完成
+        binding.btnFinish.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                finish();
+            }
+        });
     }
     public void showGift() {
@@ -86,7 +115,9 @@ public class ConnBluetoothSuccessActivity extends AppCompatActivity {
         }
     }
-    public static void startActivity(Activity activity) {
-        activity.startActivity(new Intent(activity, ConnBluetoothSuccessActivity.class));
+    public static void startActivity(Activity activity, NetworkResultBean networkResultBean) {
+        Intent intent = new Intent(activity, ConnBluetoothSuccessActivity.class);
+        intent.putExtra("networkResultBean", networkResultBean);
+        activity.startActivity(intent);
     }
 }
@@ -4,6 +4,7 @@ import android.app.Activity;
 import android.content.Intent;
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
+import android.text.TextUtils;
 import com.cnlive.strike.xiaojiaspeaker.R;
 import com.cnlive.strike.xiaojiaspeaker.ui.fragment.AllDeviceFragment;
@@ -18,12 +19,19 @@ public class InvitFriendActivity extends AppCompatActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_invit_friend);
-        getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, InvitFriendFragment.newInstance()).commitAllowingStateLoss();
+        if (null != getIntent().getExtras()) {
+            String currentSelectFamilyId = getIntent().getExtras().getString("currentSelectFamilyId");
+            if (!TextUtils.isEmpty(currentSelectFamilyId)) {
+                getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, InvitFriendFragment.newInstance(currentSelectFamilyId)).commitAllowingStateLoss();
+            }
+        }
+
     }
-    public static void startActivity(Activity activity) {
+    public static void startActivity(Activity activity, String currentSelectFamilyId) {
         Intent intent = new Intent(activity, InvitFriendActivity.class);
+        intent.putExtra("currentSelectFamilyId", currentSelectFamilyId);
         activity.startActivity(intent);
     }
 }
@@ -160,7 +160,7 @@ public class SelectIMFriendAdapter extends RecyclerView.Adapter {
                     //设置是否选中
                     binding.checkBox.toggle();
                 } else {
-                    AlertUtil.showDeftToast(context, "该联系人不可选择");
+                    AlertUtil.showDeftToast(context, "该好友已加入");
                     return;
                 }
                 hasSelectMap.put(imFriendInfoList.get(getAdapterPosition()).getId(), binding.checkBox.isChecked());
+package com.cnlive.strike.xiaojiaspeaker.ui.fragment;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.net.NetworkInfo;
+import android.net.wifi.WifiManager;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v4.content.ContextCompat;
+import android.util.Log;
+import android.view.View;
+
+import com.clj.fastble.data.BleDevice;
+import com.cnlive.libs.base.frame.fragment.MvpBindingFragment;
+import com.cnlive.libs.base.util.StatusBarUtil;
+import com.cnlive.libs.base.util.StatusBarUtil2;
+import com.cnlive.strike.xiaojiaspeaker.R;
+import com.cnlive.strike.xiaojiaspeaker.databinding.FragmentSelectWifiBinding;
+import com.cnlive.strike.xiaojiaspeaker.frame.presenter.SelectWifiFragmentPresenter;
+import com.cnlive.strike.xiaojiaspeaker.frame.view.SelectWifiFragmentView;
+import com.cnlive.strike.xiaojiaspeaker.model.message.EventMsg;
+import com.cnlive.strike.xiaojiaspeaker.util.EventBusUtil;
+
+import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
+
+public class ChangeWifiFragment extends MvpBindingFragment<SelectWifiFragmentView, SelectWifiFragmentPresenter, Object, FragmentSelectWifiBinding> {
+    private String TAG = "SelectWifiFragment";
+
+    public static ChangeWifiFragment newInstance(BleDevice bleDevice) {
+        Bundle bundle = new Bundle();
+        bundle.putParcelable("bleDevice", bleDevice);
+        ChangeWifiFragment fragment = new ChangeWifiFragment();
+        fragment.setArguments(bundle);
+        return fragment;
+    }
+
+    @Override
+    protected int getLayoutId() {
+        return R.layout.fragment_select_wifi;
+    }
+
+    @Override
+    public void onActivityCreated(@Nullable Bundle savedInstanceState) {
+        super.onActivityCreated(savedInstanceState);
+        StatusBarUtil.setStatusBarWrite(getActivity());
+        StatusBarUtil2.setColor(getActivity(), ContextCompat.getColor(getActivity(), R.color.white), 0);
+    }
+
+    @Override
+    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        EventBusUtil.register(this);
+
+        initTopBar();
+        if (null != getArguments()) {
+            BleDevice bleDevice = (BleDevice) getArguments().get("bleDevice");
+            if (null != getMvpView() && null != bleDevice) {
+                getMvpView().initWifiList(bleDevice);
+                registerBroadcast();
+            }
+        }
+
+    }
+
+
+    private void initTopBar() {
+        StatusBarUtil.setStatusBarWrite(getActivity());
+        StatusBarUtil2.setColor(getActivity(), ContextCompat.getColor(getActivity(), R.color.white), 0);
+        if (null != binding) {
+            binding.topbar.setTitle("请选择WIFI网络").setTextColor(ContextCompat.getColor(getActivity(), R.color.color_282828));
+            //设置返回按钮
+            binding.topbar.addLeftImageButton(R.drawable.icon_back, R.id.left_back).setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View view) {
+                    if (null != getActivity()) {
+                        getActivity().finish();
+                    }
+                }
+            });
+        }
+    }
+
+    private void registerBroadcast() {
+        IntentFilter intentFilter = new IntentFilter();
+        intentFilter.addAction(WifiManager.SCAN_RESULTS_AVAILABLE_ACTION);
+        intentFilter.addAction(WifiManager.NETWORK_STATE_CHANGED_ACTION);
+        intentFilter.addAction(WifiManager.WIFI_STATE_CHANGED_ACTION);
+        intentFilter.addAction(WifiManager.SUPPLICANT_STATE_CHANGED_ACTION);
+        getActivity().registerReceiver(mBroadcastReceiver, intentFilter);
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        EventBusUtil.unRegister(this);
+        if (null != mBroadcastReceiver) {
+            getActivity().unregisterReceiver(mBroadcastReceiver);
+        }
+    }
+
+    private BroadcastReceiver mBroadcastReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            String resultAction = intent.getAction();
+            //当扫描结果后，进行刷新列表
+            if (intent.getAction().equals(WifiManager.SCAN_RESULTS_AVAILABLE_ACTION)) {
+                Log.e(TAG, "onReceive: SCAN_RESULTS_AVAILABLE_ACTION");
+                //扫描wifi
+                if (null != getMvpView()) {
+                    getMvpView().updateWifiList();
+                }
+            } else if (intent.getAction().equals(WifiManager.NETWORK_STATE_CHANGED_ACTION)) {
+                Log.e(TAG, "onReceive: NETWORK_STATE_CHANGED_ACTION");
+                //wifi连接网络状态变化
+                NetworkInfo.DetailedState state = ((NetworkInfo) intent.getParcelableExtra(WifiManager.EXTRA_NETWORK_INFO)).getDetailedState();
+            } else if (intent.getAction().equals(WifiManager.WIFI_STATE_CHANGED_ACTION)) {//wifi状态变化
+                int wifiState = intent.getIntExtra(WifiManager.EXTRA_WIFI_STATE, WifiManager.WIFI_STATE_DISABLED);
+            } else if (intent.getAction().equals(WifiManager.SUPPLICANT_STATE_CHANGED_ACTION)) {
+            }
+        }
+    };
+
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void event(EventMsg msg) {
+        if (EventMsg.CLOSE_BLUETOOTH_ACTIVITY == msg.getEventType()) {
+            getActivity().finish();
+        }
+    }
+}
@@ -3,6 +3,7 @@ package com.cnlive.strike.xiaojiaspeaker.ui.fragment;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.v4.content.ContextCompat;
+import android.text.TextUtils;
 import android.view.View;
 import com.cnlive.libs.base.frame.fragment.MvpBindingFragment;
@@ -38,7 +39,7 @@ public class DeviceDetailFragment extends MvpBindingFragment&lt;DeviceDetailView, D
             String currentSelectFamilyId = getArguments().getString("currentSelectFamilyId");
             if (null != getMvpView()) {
                 initTopBar(allDeviceInfo.getName());
-                getMvpView().initView(allDeviceInfo,currentSelectFamilyId);
+                getMvpView().initView(allDeviceInfo, currentSelectFamilyId);
             }
         }
     }
@@ -74,7 +75,19 @@ public class DeviceDetailFragment extends MvpBindingFragment&lt;DeviceDetailView, D
     public void event(EventMsg msg) {
         if (EventMsg.DELETE_DEVICE_NAME_SUCCESS == msg.getEventType()) {
             getActivity().finish();
+        } else if (EventMsg.CHANGE_DEVICE_NAME_SUCCESS == msg.getEventType()) {
+            if (null==getMvpView()){
+                return;
+            }
+            String deviceName = (String) msg.getData();
+            if (!TextUtils.isEmpty(deviceName)) {
+                if (null != getActivity()) {
+                    binding.topbar.setTitle(deviceName);
+                }
+            }
         }
+
+
     }
 }
@@ -77,6 +77,7 @@ public class DeviceManagerFragment extends MvpBindingFragment&lt;DeviceManagerFragm
             if (null != getMvpView()) {
                 if (null != currentDeviceInfo && !TextUtils.isEmpty(currentDeviceInfo.getMcid())) {
                     getPresenter().getDeviceDetailMsg(getActivity(), currentDeviceInfo.getMcid());
+
                 }
             }
         } else if (EventMsg.DELETE_DEVICE_NAME_SUCCESS == msg.getEventType()) {
@@ -3,6 +3,7 @@ package com.cnlive.strike.xiaojiaspeaker.ui.fragment;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.v4.content.ContextCompat;
+import android.text.TextUtils;
 import android.view.View;
 import com.cnlive.libs.base.frame.fragment.MvpBindingFragment;
@@ -18,8 +19,11 @@ import com.cnlive.strike.xiaojiaspeaker.frame.view.InvitFriendView;
  * 二维码邀请加入
  */
 public class InvitFriendFragment extends MvpBindingFragment<InvitFriendView, InvitFriendPresenter, Object, FragmentInvitFriendBinding> {
-    public static InvitFriendFragment newInstance() {
+    public static InvitFriendFragment newInstance(String currentSelectFamilyId) {
         InvitFriendFragment fragment = new InvitFriendFragment();
+        Bundle bundle = new Bundle();
+        bundle.putString("currentSelectFamilyId", currentSelectFamilyId);
+        fragment.setArguments(bundle);
         return fragment;
     }
@@ -32,8 +36,15 @@ public class InvitFriendFragment extends MvpBindingFragment&lt;InvitFriendView, Inv
     public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
         initTopBar();
-        if(getMvpView() != null) getMvpView().initView();
-        getPresenter().getSetRoleList(getActivity(), XiaoJIaCommInfo.getUserId(getActivity()), XiaoJIaCommInfo.getFamilyId(getActivity()));
+        if (getMvpView() != null) {
+            if (null != getArguments()) {
+                String currentSelectFamilyId = getArguments().getString("currentSelectFamilyId");
+                if (!TextUtils.isEmpty(currentSelectFamilyId)) {
+                    getMvpView().initView(currentSelectFamilyId);
+                    getPresenter().getSetRoleList(getActivity(), XiaoJIaCommInfo.getUserId(getActivity()), currentSelectFamilyId);
+                }
+            }
+        }
     }
     private void initTopBar() {
@@ -15,8 +15,13 @@ import com.cnlive.strike.xiaojiaspeaker.R;
 import com.cnlive.strike.xiaojiaspeaker.databinding.FragmentSearchDeviceBinding;
 import com.cnlive.strike.xiaojiaspeaker.frame.presenter.SearchDevicefragmentPresenter;
 import com.cnlive.strike.xiaojiaspeaker.frame.view.SearchDevicefragmentView;
+import com.cnlive.strike.xiaojiaspeaker.model.message.EventMsg;
+import com.cnlive.strike.xiaojiaspeaker.util.EventBusUtil;
 import com.hannesdorfmann.mosby3.mvp.MvpFragment;
+import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
+
 /**
  * 搜索音箱界面
  *
@@ -32,6 +37,8 @@ public class SearchDevicefragment extends MvpBindingFragment&lt;SearchDevicefragmen
     @Override
     public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
+        EventBusUtil.register(this);
+
         initTopBar();
         initBlueToothScanConfig();
         if (null != getMvpView()) {
@@ -87,5 +94,13 @@ public class SearchDevicefragment extends MvpBindingFragment&lt;SearchDevicefragmen
             BleManager.getInstance().cancelScan();
         } catch (Exception e) {
         }
+        EventBusUtil.unRegister(this);
+    }
+
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void event(EventMsg msg) {
+        if (EventMsg.CLOSE_BLUETOOTH_ACTIVITY == msg.getEventType()) {
+            getActivity().finish();
+        }
     }
 }
@@ -20,7 +20,12 @@ import com.cnlive.strike.xiaojiaspeaker.R;
 import com.cnlive.strike.xiaojiaspeaker.databinding.FragmentSelectWifiBinding;
 import com.cnlive.strike.xiaojiaspeaker.frame.presenter.SelectWifiFragmentPresenter;
 import com.cnlive.strike.xiaojiaspeaker.frame.view.SelectWifiFragmentView;
+import com.cnlive.strike.xiaojiaspeaker.model.message.EventMsg;
 import com.cnlive.strike.xiaojiaspeaker.netWork.bean.ConfigDeviceNetParam;
+import com.cnlive.strike.xiaojiaspeaker.util.EventBusUtil;
+
+import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
 import java.io.Serializable;
@@ -50,6 +55,8 @@ public class SelectWifiFragment extends MvpBindingFragment&lt;SelectWifiFragmentVie
     @Override
     public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
+        EventBusUtil.register(this);
+
         initTopBar();
         if (null != getArguments()) {
             BleDevice bleDevice = (BleDevice) getArguments().get("bleDevice");
@@ -59,12 +66,9 @@ public class SelectWifiFragment extends MvpBindingFragment&lt;SelectWifiFragmentVie
             }
         }
-
-
     }
-
     private void initTopBar() {
         StatusBarUtil.setStatusBarWrite(getActivity());
         StatusBarUtil2.setColor(getActivity(), ContextCompat.getColor(getActivity(), R.color.white), 0);
@@ -94,6 +98,7 @@ public class SelectWifiFragment extends MvpBindingFragment&lt;SelectWifiFragmentVie
     @Override
     public void onDestroy() {
         super.onDestroy();
+        EventBusUtil.unRegister(this);
         if (null != mBroadcastReceiver) {
             getActivity().unregisterReceiver(mBroadcastReceiver);
         }
@@ -120,4 +125,11 @@ public class SelectWifiFragment extends MvpBindingFragment&lt;SelectWifiFragmentVie
             }
         }
     };
+
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void event(EventMsg msg) {
+        if (EventMsg.CLOSE_BLUETOOTH_ACTIVITY == msg.getEventType()) {
+            getActivity().finish();
+        }
+    }
 }
@@ -50,12 +50,12 @@ public class UserManagerFragment extends MvpBindingFragment&lt;UserManagerView, Use
             if (null != getMvpView()) {
                 if (null != currentSelectFamilyId) {
                     getMvpView().setCurrentSelectFamily(currentSelectFamilyId);
+                    getPresenter().getFamilyRole(getActivity(), XiaoJIaCommInfo.getUserId(getActivity()), currentSelectFamilyId, XiaoJIaCommInfo.getUserPhone(getActivity()));
                 }
                 getMvpView().initPopView();
 //            getMvpView().initView(null);
             }
         }
-        getPresenter().getFamilyRole(getActivity(), XiaoJIaCommInfo.getUserId(getActivity()), XiaoJIaCommInfo.getFamilyId(getActivity()), XiaoJIaCommInfo.getUserPhone(getActivity()));
     }
@@ -21,7 +21,7 @@
             android:layout_height="50dp"
             android:layout_marginTop="10dp"
             android:layout_marginBottom="10dp"
-            android:background="@drawable/selectable_item_white"
+            android:background="@color/white"
             android:clickable="true">
             <LinearLayout
@@ -78,7 +78,7 @@
             android:layout_height="50dp"
             android:layout_marginTop="10dp"
             android:layout_marginBottom="10dp"
-            android:background="@drawable/selectable_item_white"
+            android:background="@color/white"
             android:clickable="true">
             <LinearLayout
@@ -134,7 +134,7 @@
             android:layout_height="50dp"
             android:layout_marginTop="10dp"
             android:layout_marginBottom="10dp"
-            android:background="@drawable/selectable_item_white"
+            android:background="@color/white"
             android:clickable="true">
             <LinearLayout
@@ -87,7 +87,7 @@
                 <TextView
                     android:layout_width="15dp"
                     android:layout_height="15dp"
-                    android:background="@drawable/shape_green_circle"
+                    android:background="@drawable/shape_xiaojia_green_circle"
                     android:gravity="center"
                     android:text="1"
                     android:textColor="@color/white"
@@ -107,7 +107,7 @@
                 <TextView
                     android:layout_width="15dp"
                     android:layout_height="15dp"
-                    android:background="@drawable/shape_green_circle"
+                    android:background="@drawable/shape_xiaojia_green_circle"
                     android:gravity="center"
                     android:text="2"
                     android:textColor="@color/white"
@@ -127,7 +127,7 @@
                 <TextView
                     android:layout_width="15dp"
                     android:layout_height="15dp"
-                    android:background="@drawable/shape_green_circle"
+                    android:background="@drawable/shape_xiaojia_green_circle"
                     android:gravity="center"
                     android:text="3"
                     android:textColor="@color/white"
@@ -60,8 +60,7 @@
             <android.support.v7.widget.RecyclerView
                 android:id="@+id/rv_friends"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_marginTop="10dp" />
+                android:layout_height="match_parent" />
             <com.cnlive.strike.ui.widget.LetterBarView
                 android:id="@+id/letterBarView"
@@ -80,7 +79,10 @@
             android:id="@+id/btn_next"
             android:layout_width="match_parent"
             android:layout_height="45dp"
-            android:layout_margin="30dp"
+            android:layout_marginLeft="30dp"
+            android:layout_marginTop="10dp"
+            android:layout_marginRight="30dp"
+            android:layout_marginBottom="10dp"
             android:background="@drawable/selector_btn_green"
             android:text="下一步"
             android:textColor="@color/white"
@@ -12,6 +12,7 @@
             android:layout_height="?attr/qmui_topbar_height" />
         <FrameLayout
+            android:id="@+id/fl_close_view"
             android:layout_width="match_parent"
             android:layout_height="45dp"
             android:background="@color/color_F7B054">
@@ -25,6 +26,7 @@
                 android:textSize="14sp" />
             <LinearLayout
+                android:id="@+id/ll_close_tip"
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
                 android:layout_gravity="right"