1 修改移除家庭成员逻辑

YangShuai
1 parent b13145d2
Showing 6 changed files with 82 additions and 97 deletions
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/frame/presenter/SetFriendsRolePresenter.java
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/frame/view/SelectIMFriendView.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/netWork/ApiServiceXiaoJia.java
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/fragment/SelectIMFriendFragment.java
@@ -82,11 +82,6 @@ public class SetFriendsRolePresenter extends MvpBasePresenter&lt;SetFriendsRoleView
         Map<String, String> map = new HashMap<>();
         map.put("type","2");//联系人邀请
         map.put("contactsInvite", contactsInvite);
-//        InvitFamilyBean1 bean1=new InvitFamilyBean1();
-//        bean1.setType("2");
-//        bean1.setContactsInvite(GsonUtil.jsonToList(contactsInvite, InvitFamilyBean1.ContactsInviteBean.class));
-//        String test=GsonUtil.GsonString(bean1);
-//        RequestBody body = RequestBody.create(MediaType.parse("application/json; charset=utf-8"),test);
         Logic.create(map)
                 .action(new Logic.Action< Map<String, String> , APIBaseInfo>() {
                     @Override
@@ -122,10 +117,6 @@ public class SetFriendsRolePresenter extends MvpBasePresenter&lt;SetFriendsRoleView
                 .start();
     }
-    private static RequestBody getRequestString(String value) {
-        RequestBody requestString = RequestBody.create(MediaType.parse("text/plain"), value);
-        return requestString;
-    }
     /**
      * 获取用户角色
@@ -79,21 +79,19 @@ public class SelectIMFriendView implements MvpView, LetterBarView.OnLetterSelect
                     for (int j = 0; j < hasSelectList.size(); j++) {
                         //不可选中
                         if (hasSelectList.get(j).equals(var1.get(i).getFriendId())) {
-                            noLetterInfo.setUserName(var1.get(i).getFriendNickName());
                             noLetterInfo.setCantSelect(true);
-                            noLetterInfo.setId(var1.get(i).getFriendId());
                         } else {
                             //可选中
-                            noLetterInfo.setUserName(var1.get(i).getFriendNickName());
                             noLetterInfo.setCantSelect(false);
-                            noLetterInfo.setId(var1.get(i).getFriendId());
                         }
-
+                        noLetterInfo.setUserName(var1.get(i).getFriendNickName());
+                        noLetterInfo.setId(var1.get(i).getFriendId());
+                        noLetterInfo.setUserIcon(var1.get(i).getFriendFaceUrl());
                     }
                     noLetterInfoList.add(noLetterInfo);
                     //设置
                     initView(noLetterInfoList);
-                    hideLoadingView();
+
                 }
@@ -105,80 +103,80 @@ public class SelectIMFriendView implements MvpView, LetterBarView.OnLetterSelect
         //设置按钮不可点击
         nextBtnCanNotClick();
         //假设这个是原有数据
-        this.noLetterInfoList = noLetterInfoList;
-
-//        this.noLetterInfoList=new ArrayList<>();
-//        IMFriendNoLetterInfo noLetterInfo = new IMFriendNoLetterInfo();
-//        noLetterInfo.setUserName("韩亚云");
-//        noLetterInfo.setCantSelect(true);
-//        noLetterInfo.setId("352660");
-//        noLetterInfoList.add(noLetterInfo);
-//
-//        noLetterInfo = new IMFriendNoLetterInfo();
-//        noLetterInfo.setUserName("杨帅");
-//        noLetterInfo.setId("352668");
-//        noLetterInfoList.add(noLetterInfo);
-//
-//        noLetterInfo = new IMFriendNoLetterInfo();
-//        noLetterInfo.setUserName("杨杨");
-//        noLetterInfo.setId("352700");
-//        noLetterInfoList.add(noLetterInfo);
-//
-//        noLetterInfo = new IMFriendNoLetterInfo();
-//        noLetterInfo.setUserName("杨天");
-//        noLetterInfo.setId("352782");
-//        noLetterInfoList.add(noLetterInfo);
-//
-//        noLetterInfo = new IMFriendNoLetterInfo();
-//        noLetterInfo.setUserName("郭瑞鹏");
-//        noLetterInfo.setId("352898");
-//        noLetterInfoList.add(noLetterInfo);
-//
-//        noLetterInfo = new IMFriendNoLetterInfo();
-//        noLetterInfo.setUserName("殷巧娟");
-//        noLetterInfo.setId("353001");
-//        noLetterInfoList.add(noLetterInfo);
-//
-//        noLetterInfo = new IMFriendNoLetterInfo();
-//        noLetterInfo.setUserName("张晓文");
-//        noLetterInfo.setId("353036");
-//        noLetterInfoList.add(noLetterInfo);
-//
-//
-//        noLetterInfo = new IMFriendNoLetterInfo();
-//        noLetterInfo.setUserName("小明");
-//        noLetterInfo.setId("353360");
-//        noLetterInfoList.add(noLetterInfo);
-//
-//        noLetterInfo = new IMFriendNoLetterInfo();
-//        noLetterInfo.setUserName("小红");
-//        noLetterInfo.setId("353417");
-//        noLetterInfoList.add(noLetterInfo);
-//
-//        noLetterInfo = new IMFriendNoLetterInfo();
-//        noLetterInfo.setUserName("小绿");
-//        noLetterInfo.setId("353557");
-//        noLetterInfoList.add(noLetterInfo);
-//
-//        noLetterInfo = new IMFriendNoLetterInfo();
-//        noLetterInfo.setUserName("小黄");
-//        noLetterInfo.setId("353651");
-//        noLetterInfoList.add(noLetterInfo);
-//
-//        noLetterInfo = new IMFriendNoLetterInfo();
-//        noLetterInfo.setUserName("张三");
-//        noLetterInfo.setId("353728");
-//        noLetterInfoList.add(noLetterInfo);
-//
-//        noLetterInfo = new IMFriendNoLetterInfo();
-//        noLetterInfo.setUserName("李四");
-//        noLetterInfo.setId("353777");
-//        noLetterInfoList.add(noLetterInfo);
-//
-//        noLetterInfo = new IMFriendNoLetterInfo();
-//        noLetterInfo.setUserName("王五");
-//        noLetterInfo.setId("353789");
-//        noLetterInfoList.add(noLetterInfo);
+//        this.noLetterInfoList = noLetterInfoList;
+
+        this.noLetterInfoList=new ArrayList<>();
+        IMFriendNoLetterInfo noLetterInfo = new IMFriendNoLetterInfo();
+        noLetterInfo.setUserName("韩亚云");
+        noLetterInfo.setCantSelect(true);
+        noLetterInfo.setId("352660");
+        noLetterInfoList.add(noLetterInfo);
+
+        noLetterInfo = new IMFriendNoLetterInfo();
+        noLetterInfo.setUserName("杨帅");
+        noLetterInfo.setId("352668");
+        noLetterInfoList.add(noLetterInfo);
+
+        noLetterInfo = new IMFriendNoLetterInfo();
+        noLetterInfo.setUserName("杨杨");
+        noLetterInfo.setId("352700");
+        noLetterInfoList.add(noLetterInfo);
+
+        noLetterInfo = new IMFriendNoLetterInfo();
+        noLetterInfo.setUserName("杨天");
+        noLetterInfo.setId("352782");
+        noLetterInfoList.add(noLetterInfo);
+
+        noLetterInfo = new IMFriendNoLetterInfo();
+        noLetterInfo.setUserName("郭瑞鹏");
+        noLetterInfo.setId("352898");
+        noLetterInfoList.add(noLetterInfo);
+
+        noLetterInfo = new IMFriendNoLetterInfo();
+        noLetterInfo.setUserName("殷巧娟");
+        noLetterInfo.setId("353001");
+        noLetterInfoList.add(noLetterInfo);
+
+        noLetterInfo = new IMFriendNoLetterInfo();
+        noLetterInfo.setUserName("张晓文");
+        noLetterInfo.setId("353036");
+        noLetterInfoList.add(noLetterInfo);
+
+
+        noLetterInfo = new IMFriendNoLetterInfo();
+        noLetterInfo.setUserName("小明");
+        noLetterInfo.setId("353360");
+        noLetterInfoList.add(noLetterInfo);
+
+        noLetterInfo = new IMFriendNoLetterInfo();
+        noLetterInfo.setUserName("小红");
+        noLetterInfo.setId("353417");
+        noLetterInfoList.add(noLetterInfo);
+
+        noLetterInfo = new IMFriendNoLetterInfo();
+        noLetterInfo.setUserName("小绿");
+        noLetterInfo.setId("353557");
+        noLetterInfoList.add(noLetterInfo);
+
+        noLetterInfo = new IMFriendNoLetterInfo();
+        noLetterInfo.setUserName("小黄");
+        noLetterInfo.setId("353651");
+        noLetterInfoList.add(noLetterInfo);
+
+        noLetterInfo = new IMFriendNoLetterInfo();
+        noLetterInfo.setUserName("张三");
+        noLetterInfo.setId("353728");
+        noLetterInfoList.add(noLetterInfo);
+
+        noLetterInfo = new IMFriendNoLetterInfo();
+        noLetterInfo.setUserName("李四");
+        noLetterInfo.setId("353777");
+        noLetterInfoList.add(noLetterInfo);
+
+        noLetterInfo = new IMFriendNoLetterInfo();
+        noLetterInfo.setUserName("王五");
+        noLetterInfo.setId("353789");
+        noLetterInfoList.add(noLetterInfo);
         //对数据进行排序
@@ -222,6 +220,7 @@ public class SelectIMFriendView implements MvpView, LetterBarView.OnLetterSelect
         linearLayoutManager = new LinearLayoutManager(getContext());
         fragment.binding.rvFriends.setLayoutManager(linearLayoutManager);
         fragment.binding.rvFriends.setAdapter(adapter);
+        hideLoadingView();
         //设置选中状态监听
         adapter.setOnItemCheckBoxListener(new SelectIMFriendAdapter.OnItemCheckBoxListener() {
             @Override
@@ -101,7 +101,7 @@ public class SetFriendsRoleView implements MvpView {
                 if (null != adapter) {
                     String result = adapter.getRoleSetResult();
                     if (!TextUtils.isEmpty(result)) {
-                        fragment.getPresenter().queryConfigDeviceNetResult(getContext(), result);
+                        fragment.getPresenter().invitFamilyMember(getContext(), result);
                     } else {
                         AlertUtil.showDeftToast(getContext(), "发送参数异常");
                     }
@@ -139,7 +139,6 @@ public class UserManagerView implements MvpView {
         adapter.setOnDeleteClickListener(new UserＭanagerAdapter.OnDeleteClickListener() {
             @Override
             public void deleteClick(int position, FamilyRoleBean.FamilyRoleListBean bean) {
-                if (null == deleteDialog) {
                     deleteDialog = new SelectDialog(getContext(), "移除后，该用户将不再具备管理\n音箱的权限，确定移除吗？", "取消", new SelectDialog.DialogInterface() {
                         @Override
                         public void onClick(SelectDialog dialog) {
@@ -162,7 +161,6 @@ public class UserManagerView implements MvpView {
                     });
                     deleteDialog.setRightBtnColor(R.color.btn_green);
                     deleteDialog.setTipTextStyle(Typeface.DEFAULT);
-                }
                 if (!deleteDialog.isShowing()) {
                     deleteDialog.show();
                 }
@@ -150,9 +150,6 @@ public interface ApiServiceXiaoJia {
      * @return
      */
     @POST("/Daren/sound/familyGroupInviteYD.action")
-    @Headers({"Content-Type: application/json", "Accept: application/json"})
-//需要添加头
-//    @Multipart
     Observable<Result<APIBaseInfo>> invitFamilyMember(@QueryMap() Map<String, String> map );
     /**
@@ -50,8 +50,8 @@ public class SelectIMFriendFragment extends MvpBindingFragment&lt;SelectIMFriendVie
                 String currentSelectFamilyId = getArguments().getString("currentSelectFamilyId");
                 if (!TextUtils.isEmpty(currentSelectFamilyId)) {
                     getMvpView().setCurrentSelectFamilyId(currentSelectFamilyId);
-//                    getMvpView().initView(null);
-                    getPresenter().getFamilyMember(getActivity(), currentSelectFamilyId);
+                    getMvpView().initView(null);
+//                    getPresenter().getFamilyMember(getActivity(), currentSelectFamilyId);
                 }
             }