杨帅 / XiaojiaSoundBox · Commits

Commit 82fcfd7f99d21cc321cb217ff22e8ae5784ac30c

Authored by YangShuai
1 parent b13145d2

1 修改移除家庭成员逻辑

Inline Side-by-side
Showing 6 changed files with 82 additions and 97 deletions
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/frame/presenter/SetFriendsRolePresenter.java
  View file @82fcfd7
... ... @@ -82,11 +82,6 @@ public class SetFriendsRolePresenter extends MvpBasePresenter<SetFriendsRoleView
82 82 Map<String, String> map = new HashMap<>();
83 83 map.put("type","2");//联系人邀请
84 84 map.put("contactsInvite", contactsInvite);
85   -// InvitFamilyBean1 bean1=new InvitFamilyBean1();
86   -// bean1.setType("2");
87   -// bean1.setContactsInvite(GsonUtil.jsonToList(contactsInvite, InvitFamilyBean1.ContactsInviteBean.class));
88   -// String test=GsonUtil.GsonString(bean1);
89   -// RequestBody body = RequestBody.create(MediaType.parse("application/json; charset=utf-8"),test);
90 85 Logic.create(map)
91 86 .action(new Logic.Action< Map<String, String> , APIBaseInfo>() {
92 87 @Override
... ... @@ -122,10 +117,6 @@ public class SetFriendsRolePresenter extends MvpBasePresenter&lt;SetFriendsRoleView
122 117 .start();
123 118 }
124 119  
125   - private static RequestBody getRequestString(String value) {
126   - RequestBody requestString = RequestBody.create(MediaType.parse("text/plain"), value);
127   - return requestString;
128   - }
129 120  
130 121 /**
131 122 * 获取用户角色
... ...
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/frame/view/SelectIMFriendView.java
  View file @82fcfd7
... ... @@ -79,21 +79,19 @@ public class SelectIMFriendView implements MvpView, LetterBarView.OnLetterSelect
79 79 for (int j = 0; j < hasSelectList.size(); j++) {
80 80 //不可选中
81 81 if (hasSelectList.get(j).equals(var1.get(i).getFriendId())) {
82   - noLetterInfo.setUserName(var1.get(i).getFriendNickName());
83 82 noLetterInfo.setCantSelect(true);
84   - noLetterInfo.setId(var1.get(i).getFriendId());
85 83 } else {
86 84 //可选中
87   - noLetterInfo.setUserName(var1.get(i).getFriendNickName());
88 85 noLetterInfo.setCantSelect(false);
89   - noLetterInfo.setId(var1.get(i).getFriendId());
90 86 }
91   -
  87 + noLetterInfo.setUserName(var1.get(i).getFriendNickName());
  88 + noLetterInfo.setId(var1.get(i).getFriendId());
  89 + noLetterInfo.setUserIcon(var1.get(i).getFriendFaceUrl());
92 90 }
93 91 noLetterInfoList.add(noLetterInfo);
94 92 //设置
95 93 initView(noLetterInfoList);
96   - hideLoadingView();
  94 +
97 95 }
98 96  
99 97  
... ... @@ -105,80 +103,80 @@ public class SelectIMFriendView implements MvpView, LetterBarView.OnLetterSelect
105 103 //设置按钮不可点击
106 104 nextBtnCanNotClick();
107 105 //假设这个是原有数据
108   - this.noLetterInfoList = noLetterInfoList;
109   -
110   -// this.noLetterInfoList=new ArrayList<>();
111   -// IMFriendNoLetterInfo noLetterInfo = new IMFriendNoLetterInfo();
112   -// noLetterInfo.setUserName("韩亚云");
113   -// noLetterInfo.setCantSelect(true);
114   -// noLetterInfo.setId("352660");
115   -// noLetterInfoList.add(noLetterInfo);
116   -//
117   -// noLetterInfo = new IMFriendNoLetterInfo();
118   -// noLetterInfo.setUserName("杨帅");
119   -// noLetterInfo.setId("352668");
120   -// noLetterInfoList.add(noLetterInfo);
121   -//
122   -// noLetterInfo = new IMFriendNoLetterInfo();
123   -// noLetterInfo.setUserName("杨杨");
124   -// noLetterInfo.setId("352700");
125   -// noLetterInfoList.add(noLetterInfo);
126   -//
127   -// noLetterInfo = new IMFriendNoLetterInfo();
128   -// noLetterInfo.setUserName("杨天");
129   -// noLetterInfo.setId("352782");
130   -// noLetterInfoList.add(noLetterInfo);
131   -//
132   -// noLetterInfo = new IMFriendNoLetterInfo();
133   -// noLetterInfo.setUserName("郭瑞鹏");
134   -// noLetterInfo.setId("352898");
135   -// noLetterInfoList.add(noLetterInfo);
136   -//
137   -// noLetterInfo = new IMFriendNoLetterInfo();
138   -// noLetterInfo.setUserName("殷巧娟");
139   -// noLetterInfo.setId("353001");
140   -// noLetterInfoList.add(noLetterInfo);
141   -//
142   -// noLetterInfo = new IMFriendNoLetterInfo();
143   -// noLetterInfo.setUserName("张晓文");
144   -// noLetterInfo.setId("353036");
145   -// noLetterInfoList.add(noLetterInfo);
146   -//
147   -//
148   -// noLetterInfo = new IMFriendNoLetterInfo();
149   -// noLetterInfo.setUserName("小明");
150   -// noLetterInfo.setId("353360");
151   -// noLetterInfoList.add(noLetterInfo);
152   -//
153   -// noLetterInfo = new IMFriendNoLetterInfo();
154   -// noLetterInfo.setUserName("小红");
155   -// noLetterInfo.setId("353417");
156   -// noLetterInfoList.add(noLetterInfo);
157   -//
158   -// noLetterInfo = new IMFriendNoLetterInfo();
159   -// noLetterInfo.setUserName("小绿");
160   -// noLetterInfo.setId("353557");
161   -// noLetterInfoList.add(noLetterInfo);
162   -//
163   -// noLetterInfo = new IMFriendNoLetterInfo();
164   -// noLetterInfo.setUserName("小黄");
165   -// noLetterInfo.setId("353651");
166   -// noLetterInfoList.add(noLetterInfo);
167   -//
168   -// noLetterInfo = new IMFriendNoLetterInfo();
169   -// noLetterInfo.setUserName("张三");
170   -// noLetterInfo.setId("353728");
171   -// noLetterInfoList.add(noLetterInfo);
172   -//
173   -// noLetterInfo = new IMFriendNoLetterInfo();
174   -// noLetterInfo.setUserName("李四");
175   -// noLetterInfo.setId("353777");
176   -// noLetterInfoList.add(noLetterInfo);
177   -//
178   -// noLetterInfo = new IMFriendNoLetterInfo();
179   -// noLetterInfo.setUserName("王五");
180   -// noLetterInfo.setId("353789");
181   -// noLetterInfoList.add(noLetterInfo);
  106 +// this.noLetterInfoList = noLetterInfoList;
  107 +
  108 + this.noLetterInfoList=new ArrayList<>();
  109 + IMFriendNoLetterInfo noLetterInfo = new IMFriendNoLetterInfo();
  110 + noLetterInfo.setUserName("韩亚云");
  111 + noLetterInfo.setCantSelect(true);
  112 + noLetterInfo.setId("352660");
  113 + noLetterInfoList.add(noLetterInfo);
  114 +
  115 + noLetterInfo = new IMFriendNoLetterInfo();
  116 + noLetterInfo.setUserName("杨帅");
  117 + noLetterInfo.setId("352668");
  118 + noLetterInfoList.add(noLetterInfo);
  119 +
  120 + noLetterInfo = new IMFriendNoLetterInfo();
  121 + noLetterInfo.setUserName("杨杨");
  122 + noLetterInfo.setId("352700");
  123 + noLetterInfoList.add(noLetterInfo);
  124 +
  125 + noLetterInfo = new IMFriendNoLetterInfo();
  126 + noLetterInfo.setUserName("杨天");
  127 + noLetterInfo.setId("352782");
  128 + noLetterInfoList.add(noLetterInfo);
  129 +
  130 + noLetterInfo = new IMFriendNoLetterInfo();
  131 + noLetterInfo.setUserName("郭瑞鹏");
  132 + noLetterInfo.setId("352898");
  133 + noLetterInfoList.add(noLetterInfo);
  134 +
  135 + noLetterInfo = new IMFriendNoLetterInfo();
  136 + noLetterInfo.setUserName("殷巧娟");
  137 + noLetterInfo.setId("353001");
  138 + noLetterInfoList.add(noLetterInfo);
  139 +
  140 + noLetterInfo = new IMFriendNoLetterInfo();
  141 + noLetterInfo.setUserName("张晓文");
  142 + noLetterInfo.setId("353036");
  143 + noLetterInfoList.add(noLetterInfo);
  144 +
  145 +
  146 + noLetterInfo = new IMFriendNoLetterInfo();
  147 + noLetterInfo.setUserName("小明");
  148 + noLetterInfo.setId("353360");
  149 + noLetterInfoList.add(noLetterInfo);
  150 +
  151 + noLetterInfo = new IMFriendNoLetterInfo();
  152 + noLetterInfo.setUserName("小红");
  153 + noLetterInfo.setId("353417");
  154 + noLetterInfoList.add(noLetterInfo);
  155 +
  156 + noLetterInfo = new IMFriendNoLetterInfo();
  157 + noLetterInfo.setUserName("小绿");
  158 + noLetterInfo.setId("353557");
  159 + noLetterInfoList.add(noLetterInfo);
  160 +
  161 + noLetterInfo = new IMFriendNoLetterInfo();
  162 + noLetterInfo.setUserName("小黄");
  163 + noLetterInfo.setId("353651");
  164 + noLetterInfoList.add(noLetterInfo);
  165 +
  166 + noLetterInfo = new IMFriendNoLetterInfo();
  167 + noLetterInfo.setUserName("张三");
  168 + noLetterInfo.setId("353728");
  169 + noLetterInfoList.add(noLetterInfo);
  170 +
  171 + noLetterInfo = new IMFriendNoLetterInfo();
  172 + noLetterInfo.setUserName("李四");
  173 + noLetterInfo.setId("353777");
  174 + noLetterInfoList.add(noLetterInfo);
  175 +
  176 + noLetterInfo = new IMFriendNoLetterInfo();
  177 + noLetterInfo.setUserName("王五");
  178 + noLetterInfo.setId("353789");
  179 + noLetterInfoList.add(noLetterInfo);
182 180  
183 181  
184 182 //对数据进行排序
... ... @@ -222,6 +220,7 @@ public class SelectIMFriendView implements MvpView, LetterBarView.OnLetterSelect
222 220 linearLayoutManager = new LinearLayoutManager(getContext());
223 221 fragment.binding.rvFriends.setLayoutManager(linearLayoutManager);
224 222 fragment.binding.rvFriends.setAdapter(adapter);
  223 + hideLoadingView();
225 224 //设置选中状态监听
226 225 adapter.setOnItemCheckBoxListener(new SelectIMFriendAdapter.OnItemCheckBoxListener() {
227 226 @Override
... ...
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/frame/view/SetFriendsRoleView.java
  View file @82fcfd7
... ... @@ -101,7 +101,7 @@ public class SetFriendsRoleView implements MvpView {
101 101 if (null != adapter) {
102 102 String result = adapter.getRoleSetResult();
103 103 if (!TextUtils.isEmpty(result)) {
104   - fragment.getPresenter().queryConfigDeviceNetResult(getContext(), result);
  104 + fragment.getPresenter().invitFamilyMember(getContext(), result);
105 105 } else {
106 106 AlertUtil.showDeftToast(getContext(), "发送参数异常");
107 107 }
... ...
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/frame/view/UserManagerView.java
  View file @82fcfd7
... ... @@ -139,7 +139,6 @@ public class UserManagerView implements MvpView {
139 139 adapter.setOnDeleteClickListener(new UserＭanagerAdapter.OnDeleteClickListener() {
140 140 @Override
141 141 public void deleteClick(int position, FamilyRoleBean.FamilyRoleListBean bean) {
142   - if (null == deleteDialog) {
143 142 deleteDialog = new SelectDialog(getContext(), "移除后，该用户将不再具备管理\n音箱的权限，确定移除吗？", "取消", new SelectDialog.DialogInterface() {
144 143 @Override
145 144 public void onClick(SelectDialog dialog) {
... ... @@ -162,7 +161,6 @@ public class UserManagerView implements MvpView {
162 161 });
163 162 deleteDialog.setRightBtnColor(R.color.btn_green);
164 163 deleteDialog.setTipTextStyle(Typeface.DEFAULT);
165   - }
166 164 if (!deleteDialog.isShowing()) {
167 165 deleteDialog.show();
168 166 }
... ...
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/netWork/ApiServiceXiaoJia.java
  View file @82fcfd7
... ... @@ -150,9 +150,6 @@ public interface ApiServiceXiaoJia {
150 150 * @return
151 151 */
152 152 @POST("/Daren/sound/familyGroupInviteYD.action")
153   - @Headers({"Content-Type: application/json", "Accept: application/json"})
154   -//需要添加头
155   -// @Multipart
156 153 Observable<Result<APIBaseInfo>> invitFamilyMember(@QueryMap() Map<String, String> map );
157 154  
158 155 /**
... ...
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/fragment/SelectIMFriendFragment.java
  View file @82fcfd7
... ... @@ -50,8 +50,8 @@ public class SelectIMFriendFragment extends MvpBindingFragment&lt;SelectIMFriendVie
50 50 String currentSelectFamilyId = getArguments().getString("currentSelectFamilyId");
51 51 if (!TextUtils.isEmpty(currentSelectFamilyId)) {
52 52 getMvpView().setCurrentSelectFamilyId(currentSelectFamilyId);
53   -// getMvpView().initView(null);
54   - getPresenter().getFamilyMember(getActivity(), currentSelectFamilyId);
  53 + getMvpView().initView(null);
  54 +// getPresenter().getFamilyMember(getActivity(), currentSelectFamilyId);
55 55 }
56 56 }
57 57  
... ...