Commit c93f2cf08ad8496cc55f3b93c705252f4943ccae
1 parent
886e3e6a
1 修改使用者管理中管理员判断逻辑
Showing
2 changed files
with
5 additions
and
3 deletions
config.gradle
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/frame/view/UserManagerView.java
| @@ -95,7 +95,8 @@ public class UserManagerView implements MvpView { | @@ -95,7 +95,8 @@ public class UserManagerView implements MvpView { | ||
| 95 | // FamilyRoleBean bean1 = GsonUtil.GsonToBean(test, FamilyRoleBean.class); | 95 | // FamilyRoleBean bean1 = GsonUtil.GsonToBean(test, FamilyRoleBean.class); |
| 96 | if (null != familyRoleList) { | 96 | if (null != familyRoleList) { |
| 97 | for (FamilyRoleBean.FamilyRoleListBean bean : familyRoleList) { | 97 | for (FamilyRoleBean.FamilyRoleListBean bean : familyRoleList) { |
| 98 | - if ("管理员".equals(bean.getRoleName())) { | 98 | + //判断是否是管理员 |
| 99 | + if (0 == bean.getId()) { | ||
| 99 | bean.setType(FamilyRoleBean.FamilyRoleListBean.HOST); | 100 | bean.setType(FamilyRoleBean.FamilyRoleListBean.HOST); |
| 100 | } else { | 101 | } else { |
| 101 | bean.setType(FamilyRoleBean.FamilyRoleListBean.MEMBER); | 102 | bean.setType(FamilyRoleBean.FamilyRoleListBean.MEMBER); |
| @@ -103,7 +104,8 @@ public class UserManagerView implements MvpView { | @@ -103,7 +104,8 @@ public class UserManagerView implements MvpView { | ||
| 103 | } | 104 | } |
| 104 | } | 105 | } |
| 105 | for (int i = 0; i < familyRoleList.size(); i++) { | 106 | for (int i = 0; i < familyRoleList.size(); i++) { |
| 106 | - if ("管理员".equals(familyRoleList.get(i).getRoleName())) { | 107 | + //筛选出管理员 |
| 108 | + if (0 == familyRoleList.get(i).getId()) { | ||
| 107 | FamilyRoleBean.FamilyRoleListBean bean = familyRoleList.get(i); | 109 | FamilyRoleBean.FamilyRoleListBean bean = familyRoleList.get(i); |
| 108 | familyRoleList.remove(i); | 110 | familyRoleList.remove(i); |
| 109 | familyRoleList.add(0, bean); | 111 | familyRoleList.add(0, bean); |