1 修改移除家庭成员逻辑

YangShuai
1 parent 82fcfd7f
Showing 14 changed files with 116 additions and 41 deletions
app/src/main/java/com/cnlive/strike/xiaojiaspeaker/MyApp.java
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/frame/presenter/ChangeDeviceNamePresenter.java
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/frame/presenter/ChangeWifiFragmentPresenter.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/SetFriendsRolePresenter.java
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/frame/presenter/UserManagerPresenter.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/SetFriendsRoleView.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/ui/activity/RemoteControlActivity.java
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/fragment/SelectIMFriendFragment.java
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/fragment/SetFriendsRoleFragment.java
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/fragment/UserManagerFragment.java
@@ -13,13 +13,13 @@ public class MyApp extends Application {
         super.onCreate();
         initARouter();
         String userId = "";
-//        AppConfig.init(this, BuildConfig.APP_ID, BuildConfig.APP_KEY,
-//                BuildConfig.APP_SCERET, BuildConfig.SPECIAL_GROUP_MEMBER_LIMIT,
-//                BuildConfig.VERSION_AS_DEBUG, "","",
-//                "", "",
-//               "","", "",
-//                "", "","",
-//                BuildConfig.BAIDU_MAP_APP_KEY, "");
+        AppConfig.init(this, BuildConfig.APP_ID, BuildConfig.APP_KEY,
+                BuildConfig.APP_SCERET, BuildConfig.SPECIAL_GROUP_MEMBER_LIMIT,
+                BuildConfig.VERSION_AS_DEBUG, "","",
+                "10514333", "",
+               "","", "",
+                "", "","",
+                BuildConfig.BAIDU_MAP_APP_KEY, "");
     }
@@ -9,6 +9,7 @@ import com.cnlive.libs.base.logic.Logic;
 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.libs.base.util.AlertUtil;
 import com.cnlive.strike.xiaojiaspeaker.frame.view.ChangeDeviceNameView;
 import com.cnlive.strike.xiaojiaspeaker.model.message.EventMsg;
 import com.cnlive.strike.xiaojiaspeaker.netWork.ApiServiceXiaoJia;
@@ -54,18 +55,8 @@ public class ChangeDeviceNamePresenter extends MvpBasePresenter&lt;ChangeDeviceName
                         }
                         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);
+                        AlertUtil.showDeftToast(context, "保存成功");
+                        onResponseListener.onSuccess();
                     }
                 })
                 .setFailureCallback(new FailureCallback() {
@@ -77,7 +68,7 @@ public class ChangeDeviceNamePresenter extends MvpBasePresenter&lt;ChangeDeviceName
                             return;
                         }
                         QMUITipDialogUtil.dismessDialog();
-                        QMUITipDialogUtil.failedDialog(context, s, 1);
+                        AlertUtil.showDeftToast(context,s);
                     }
                 })
@@ -7,6 +7,7 @@ import com.cnlive.libs.base.logic.Logic;
 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.libs.base.util.AlertUtil;
 import com.cnlive.strike.xiaojiaspeaker.frame.view.ChangeWifiFragmentView;
 import com.cnlive.strike.xiaojiaspeaker.frame.view.SelectWifiFragmentView;
 import com.cnlive.strike.xiaojiaspeaker.model.message.EventMsg;
@@ -52,7 +53,7 @@ public class ChangeWifiFragmentPresenter extends MvpBasePresenter&lt;ChangeWifiFrag
                             return;
                         }
                         QMUITipDialogUtil.dismessDialog();
-                        QMUITipDialogUtil.successDialog(context, baseInfo.getMessage(), 1);
+                        AlertUtil.showDeftToast(context,baseInfo.getMessage());
                         Log.e(TAG, "onSuccess: " + baseInfo.getMessage());
                         if (null != onResponseListener) {
                             onResponseListener.onSuccess();
@@ -68,7 +69,7 @@ public class ChangeWifiFragmentPresenter extends MvpBasePresenter&lt;ChangeWifiFrag
                             return;
                         }
                         QMUITipDialogUtil.dismessDialog();
-                        QMUITipDialogUtil.failedDialog(context, s, 1);
+                        AlertUtil.showDeftToast(context,s);
                     }
                 })
@@ -7,6 +7,7 @@ import com.cnlive.libs.base.logic.Logic;
 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.libs.base.util.AlertUtil;
 import com.cnlive.strike.xiaojiaspeaker.frame.view.DeviceManagerFragmentView;
 import com.cnlive.strike.xiaojiaspeaker.model.message.EventMsg;
 import com.cnlive.strike.xiaojiaspeaker.netWork.ApiServiceXiaoJia;
@@ -18,6 +19,7 @@ import com.hannesdorfmann.mosby3.mvp.MvpBasePresenter;
 import org.greenrobot.eventbus.EventBus;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
@@ -57,7 +59,7 @@ public class DeviceManagerFragmentPresenter extends MvpBasePresenter&lt;DeviceManag
                             return;
                         }
                         QMUITipDialogUtil.dismessDialog();
-                        QMUITipDialogUtil.failedDialog(context, s, 1);
+                        AlertUtil.showDeftToast(context,s);
                     }
                 })
@@ -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 android.view.View;
@@ -9,7 +10,9 @@ import com.cnlive.libs.base.logic.Logic;
 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.libs.base.util.AlertUtil;
 import com.cnlive.strike.xiaojiaspeaker.frame.view.SetFriendsRoleView;
+import com.cnlive.strike.xiaojiaspeaker.model.message.EventMsg;
 import com.cnlive.strike.xiaojiaspeaker.netWork.ApiServiceCMCC;
 import com.cnlive.strike.xiaojiaspeaker.netWork.ApiServiceXiaoJia;
 import com.cnlive.strike.xiaojiaspeaker.netWork.CmccRequest;
@@ -22,6 +25,8 @@ import com.cnlive.strike.xiaojiaspeaker.util.QMUITipDialogUtil;
 import com.cnlive.strike.xiaojiaspeaker.util.subutil.util.http.Request;
 import com.hannesdorfmann.mosby3.mvp.MvpBasePresenter;
+import org.greenrobot.eventbus.EventBus;
+
 import java.util.HashMap;
 import java.util.Map;
@@ -38,11 +43,11 @@ public class SetFriendsRolePresenter extends MvpBasePresenter&lt;SetFriendsRoleView
     public void queryConfigDeviceNetResult(Activity context, String contactsInvite) {
-        InvitFamilyBean1 bean1=new InvitFamilyBean1();
+        InvitFamilyBean1 bean1 = new InvitFamilyBean1();
         bean1.setType("2");
         bean1.setContactsInvite(GsonUtil.jsonToList(contactsInvite, InvitFamilyBean1.ContactsInviteBean.class));
-        CmccRequest.getInstance(context,ApiServiceCMCC.class)
+        CmccRequest.getInstance(context, ApiServiceCMCC.class)
                 .invitFamilyMember(bean1)
                 .enqueue(new Callback<APIBaseInfo>() {
                     @Override
@@ -80,12 +85,12 @@ public class SetFriendsRolePresenter extends MvpBasePresenter&lt;SetFriendsRoleView
         }
         QMUITipDialogUtil.loadingDialog(context, "请稍后", true);
         Map<String, String> map = new HashMap<>();
-        map.put("type","2");//联系人邀请
+        map.put("type", "2");//联系人邀请
         map.put("contactsInvite", contactsInvite);
         Logic.create(map)
-                .action(new Logic.Action< Map<String, String> , APIBaseInfo>() {
+                .action(new Logic.Action<Map<String, String>, APIBaseInfo>() {
                     @Override
-                    public Disposable action(Map<String, String> map , DataCallback<APIBaseInfo> dataCallback) {
+                    public Disposable action(Map<String, String> map, DataCallback<APIBaseInfo> dataCallback) {
                         return SubscriptionRequest.service(ApiServiceXiaoJia.class, api -> api.invitFamilyMember(map)).subscribe(context, dataCallback);
                     }
                 }).<APIBaseInfo>event()
@@ -98,7 +103,8 @@ public class SetFriendsRolePresenter extends MvpBasePresenter&lt;SetFriendsRoleView
                             return;
                         }
                         QMUITipDialogUtil.dismessDialog();
-                        QMUITipDialogUtil.successDialog(context, "邀请成功", 1);
+                        AlertUtil.showDeftToast(context,"邀请成功");
+                        EventBus.getDefault().post(new EventMsg(EventMsg.INVIT_FRIEND_SUCCESS,null));
                     }
                 })
                 .setFailureCallback(new FailureCallback() {
@@ -110,7 +116,7 @@ public class SetFriendsRolePresenter extends MvpBasePresenter&lt;SetFriendsRoleView
                             return;
                         }
                         QMUITipDialogUtil.dismessDialog();
-                        QMUITipDialogUtil.failedDialog(context, s, 1);
+                        AlertUtil.showDeftToast(context,s);
                     }
                 })
@@ -169,4 +175,8 @@ public class SetFriendsRolePresenter extends MvpBasePresenter&lt;SetFriendsRoleView
                 .start();
     }
+
+    public interface OnResposeListener {
+        void onSuccess();
+    }
 }
@@ -9,6 +9,7 @@ import com.cnlive.libs.base.logic.Logic;
 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.libs.base.util.AlertUtil;
 import com.cnlive.strike.xiaojiaspeaker.frame.view.UserManagerView;
 import com.cnlive.strike.xiaojiaspeaker.netWork.ApiServiceXiaoJia;
 import com.cnlive.strike.xiaojiaspeaker.netWork.bean.FamilyRoleBean;
@@ -76,7 +77,7 @@ public class UserManagerPresenter extends MvpBasePresenter&lt;UserManagerView&gt; {
                             return;
                         }
                         QMUITipDialogUtil.dismessDialog();
-                        QMUITipDialogUtil.failedDialog(context, s, 1);
+                        AlertUtil.showDeftToast(context,s);
                         //显示重试
                         Log.e(TAG, "onFailure: " + s);
                     }
@@ -175,7 +176,7 @@ public class UserManagerPresenter extends MvpBasePresenter&lt;UserManagerView&gt; {
                         }
                         //显示重试
                         QMUITipDialogUtil.dismessDialog();
-                        QMUITipDialogUtil.failedDialog(context, s, 1);
+                        AlertUtil.showDeftToast(context,s);
                     }
                 })
@@ -65,7 +65,7 @@ public class SelectWifiFragmentView implements MvpView {
                 if (isSetNetSuccess) {
                     if (null != getContext()) {
                         QMUITipDialogUtil.dismessDialog();
-                        QMUITipDialogUtil.failedDialog(getContext(), "配网超时", 1);
+                        AlertUtil.showDeftToast(getContext(), "配网超时");
                     }
                 }
             }
@@ -212,7 +212,7 @@ public class SelectWifiFragmentView implements MvpView {
             // 连接失败
             @Override
             public void onConnectFail(BleDevice bleDevice, BleException exception) {
-                QMUITipDialogUtil.failedDialog(getContext(), "连接失败,请重试...", 2);
+                AlertUtil.showDeftToast(getContext(), "连接失败,请重试...");
                 Log.e(TAG, "onConnectFail: " + exception);
             }
@@ -247,7 +247,7 @@ public class SelectWifiFragmentView implements MvpView {
                                             @Override
                                             public void onWriteFailure(BleException exception) {
                                                 Log.e(TAG, "onWriteFailure: ");
-                                                QMUITipDialogUtil.failedDialog(getContext(), "连接失败,请重试...", 2);
+                                                AlertUtil.showDeftToast(getContext(), "连接失败,请重试...");
                                             }
                                         });
@@ -257,8 +257,7 @@ public class SelectWifiFragmentView implements MvpView {
                             @Override
                             public void onNotifyFailure(BleException exception) {
                                 Log.e(TAG, "onNotifyFailure: " + exception);
-                                QMUITipDialogUtil.failedDialog(getContext(), "连接失败,请重试...", 2);
-
+                                AlertUtil.showDeftToast(getContext(), "连接失败,请重试...");
                             }
                             @Override
@@ -9,6 +9,7 @@ import android.view.View;
 import com.cnlive.libs.base.util.AlertUtil;
 import com.cnlive.strike.xiaojiaspeaker.R;
+import com.cnlive.strike.xiaojiaspeaker.frame.presenter.SetFriendsRolePresenter;
 import com.cnlive.strike.xiaojiaspeaker.model.RoleInfo;
 import com.cnlive.strike.xiaojiaspeaker.netWork.bean.RoleNetBean;
 import com.cnlive.strike.xiaojiaspeaker.ui.adapter.SetRoleAdapter;
@@ -190,7 +190,7 @@ public class UserManagerView implements MvpView {
     }
     public void addAdminBtn() {
-        //添加邀请者按钮
+        fragment.binding.topbar.removeAllRightViews();        //添加邀请者按钮
         btn_invit = fragment.binding.topbar.addRightTextButton("邀请使用者", R.id.rightBtn);
         btn_invit.setTextSize(15);
         btn_invit.setTextColor(ContextCompat.getColor(getContext(), R.color.color_282828));
@@ -3,7 +3,8 @@ 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;//关闭配网页面
+    public static final int CLOSE_BLUETOOTH_ACTIVITY = 2;//关闭配网页面
+    public static final int INVIT_FRIEND_SUCCESS = 3;//邀请好友成功页面
     private int eventType;
     private Object data;
@@ -15,6 +15,7 @@ import com.cnlive.libs.base.logic.Logic;
 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.libs.base.util.AlertUtil;
 import com.cnlive.libs.base.util.StatusBarUtil;
 import com.cnlive.libs.base.util.StatusBarUtil2;
 import com.cnlive.strike.xiaojiaspeaker.R;
@@ -215,7 +216,7 @@ public class RemoteControlActivity extends AppCompatActivity {
                         setRemoteBtnState(false);
                         //显示重试
                         QMUITipDialogUtil.dismessDialog();
-                        QMUITipDialogUtil.failedDialog(context, s, 1);
+                        AlertUtil.showDeftToast(context,s);
                     }
                 })
@@ -16,6 +16,11 @@ import com.cnlive.strike.xiaojiaspeaker.R;
 import com.cnlive.strike.xiaojiaspeaker.databinding.FragmentSelectImFriendBinding;
 import com.cnlive.strike.xiaojiaspeaker.frame.presenter.SelectIMFriendPresenter;
 import com.cnlive.strike.xiaojiaspeaker.frame.view.SelectIMFriendView;
+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;
 import java.util.List;
@@ -44,6 +49,7 @@ public class SelectIMFriendFragment extends MvpBindingFragment&lt;SelectIMFriendVie
     @Override
     public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
+        EventBusUtil.register(this);
         initTopBar();
         if (null != getMvpView()) {
             if (null != getArguments()) {
@@ -58,6 +64,12 @@ public class SelectIMFriendFragment extends MvpBindingFragment&lt;SelectIMFriendVie
         }
     }
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        EventBusUtil.unRegister(this);
+
+    }
     private void initTopBar() {
@@ -74,4 +86,13 @@ public class SelectIMFriendFragment extends MvpBindingFragment&lt;SelectIMFriendVie
             });
         }
     }
+
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void event(EventMsg msg) {
+        if (EventMsg.INVIT_FRIEND_SUCCESS == msg.getEventType()) {
+            if (null != getMvpView()) {
+                getActivity().finish();
+            }
+        }
+    }
 }
@@ -13,6 +13,11 @@ import com.cnlive.strike.xiaojiaspeaker.commonInfo.XiaoJIaCommInfo;
 import com.cnlive.strike.xiaojiaspeaker.databinding.FragmentSetFriendRoleBinding;
 import com.cnlive.strike.xiaojiaspeaker.frame.presenter.SetFriendsRolePresenter;
 import com.cnlive.strike.xiaojiaspeaker.frame.view.SetFriendsRoleView;
+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;
 /**
  * 设置角色关系
@@ -44,6 +49,7 @@ public class SetFriendsRoleFragment extends MvpBindingFragment&lt;SetFriendsRoleVie
     @Override
     public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
+        EventBusUtil.register(this);
         initTopBar();
         if (null != getArguments()) {
             selectUid = getArguments().getString("selectUid");
@@ -71,4 +77,19 @@ public class SetFriendsRoleFragment extends MvpBindingFragment&lt;SetFriendsRoleVie
             });
         }
     }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        EventBusUtil.unRegister(this);
+    }
+
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void event(EventMsg msg) {
+        if (EventMsg.INVIT_FRIEND_SUCCESS == msg.getEventType()) {
+            if (null != getMvpView()) {
+                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 android.widget.Button;
@@ -14,12 +15,18 @@ import com.cnlive.strike.xiaojiaspeaker.commonInfo.XiaoJIaCommInfo;
 import com.cnlive.strike.xiaojiaspeaker.databinding.FragmentUserManagerBinding;
 import com.cnlive.strike.xiaojiaspeaker.frame.presenter.UserManagerPresenter;
 import com.cnlive.strike.xiaojiaspeaker.frame.view.UserManagerView;
+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 UserManagerFragment extends MvpBindingFragment<UserManagerView, UserManagerPresenter, Object, FragmentUserManagerBinding> {
+    private String currentSelectFamilyId;
     public static UserManagerFragment newInstance(String currentSelectFamilyId) {
         UserManagerFragment fragment = new UserManagerFragment();
@@ -44,9 +51,10 @@ public class UserManagerFragment extends MvpBindingFragment&lt;UserManagerView, Use
     @Override
     public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
+        EventBusUtil.register(this);
         initTopBar();
         if (null != getArguments()) {
-            String currentSelectFamilyId = getArguments().getString("currentSelectFamilyId");
+            currentSelectFamilyId = getArguments().getString("currentSelectFamilyId");
             if (null != getMvpView()) {
                 if (null != currentSelectFamilyId) {
                     getMvpView().setCurrentSelectFamily(currentSelectFamilyId);
@@ -59,6 +67,13 @@ public class UserManagerFragment extends MvpBindingFragment&lt;UserManagerView, Use
     }
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        EventBusUtil.unRegister(this);
+
+    }
+
     private void initTopBar() {
         if (null != binding) {
             binding.topbar.setTitle("使用者管理").setTextColor(ContextCompat.getColor(getActivity(), R.color.color_282828));
@@ -74,4 +89,15 @@ public class UserManagerFragment extends MvpBindingFragment&lt;UserManagerView, Use
         }
     }
+
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void event(EventMsg msg) {
+        if (EventMsg.INVIT_FRIEND_SUCCESS == msg.getEventType()) {
+            if (null != getMvpView()) {
+                if (!TextUtils.isEmpty(currentSelectFamilyId)) {
+                    getPresenter().getFamilyRole(getActivity(), XiaoJIaCommInfo.getUserId(getActivity()), currentSelectFamilyId, XiaoJIaCommInfo.getUserPhone(getActivity()));
+                }
+            }
+        }
+    }
 }