杨帅 / XiaojiaSoundBox · Commits

Commit ca4efd56381ac6318fcf0482ab6007236c13d327

Authored by YangShuai
1 parent 8dd0b3b8

1 根据用户权限,调整设备管理页

Inline Side-by-side
Showing 4 changed files with 9 additions and 9 deletions
app/src/main/java/com/cnlive/strike/xiaojiaspeaker/MainActivity.java
  View file @ca4efd5
@@ -27,11 +27,11 @@ public class MainActivity extends AppCompatActivity { @@ -27,11 +27,11 @@ public class MainActivity extends AppCompatActivity {
27 protected void onCreate(Bundle savedInstanceState) { 27 protected void onCreate(Bundle savedInstanceState) {
28 super.onCreate(savedInstanceState); 28 super.onCreate(savedInstanceState);
29 setContentView(R.layout.activity_speaker_main); 29 setContentView(R.layout.activity_speaker_main);
30 -// XiaoJIaCommInfo.setUserId(this, "10514333".trim());  
31 -// XiaoJIaCommInfo.setUserPhone(this, "18301489586".trim()); 30 + XiaoJIaCommInfo.setUserId(this, "10514333".trim());
  31 + XiaoJIaCommInfo.setUserPhone(this, "18301489586".trim());
32 32
33 - XiaoJIaCommInfo.setUserId(this, "10535072".trim());  
34 - XiaoJIaCommInfo.setUserPhone(this, "15532913679".trim()); 33 +// XiaoJIaCommInfo.setUserId(this, "10535072".trim());
  34 +// XiaoJIaCommInfo.setUserPhone(this, "15532913679".trim());
35 35
36 // XiaoJIaCommInfo.setUserId(this, "10513196"); 36 // XiaoJIaCommInfo.setUserId(this, "10513196");
37 // XiaoJIaCommInfo.setUserPhone(this, "15010140838"); 37 // XiaoJIaCommInfo.setUserPhone(this, "15010140838");
config.gradle
  View file @ca4efd5
@@ -21,7 +21,7 @@ ext { @@ -21,7 +21,7 @@ ext {
21 //编译方式 21 //编译方式
22 debug : false, 22 debug : false,
23 //版本号 23 //版本号
24 - version: "0.1.10", 24 + version: "0.1.11",
25 //Lib库前缀 25 //Lib库前缀
26 packeg : "com.cnlive.module", 26 packeg : "com.cnlive.module",
27 //Lib库名称 27 //Lib库名称
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/frame/view/AllDeviceFragmentView.java
  View file @ca4efd5
@@ -50,7 +50,7 @@ public class AllDeviceFragmentView implements MvpView { @@ -50,7 +50,7 @@ public class AllDeviceFragmentView implements MvpView {
50 for (FamilyListBean.UsersBeanX usersBean : familyListBean.getUsers()) { 50 for (FamilyListBean.UsersBeanX usersBean : familyListBean.getUsers()) {
51 51
52 //存储自己为主人的家庭 52 //存储自己为主人的家庭
53 - if (FamilyListBean.THE_HOST.equals(usersBean.getIsMaster())) { 53 + if (FamilyListBean.THE_HOST==usersBean.getIsMaster()) {
54 Log.e(TAG, "getId: " + usersBean.getUserId()); 54 Log.e(TAG, "getId: " + usersBean.getUserId());
55 Log.e(TAG, "getToken: " + usersBean.getToken()); 55 Log.e(TAG, "getToken: " + usersBean.getToken());
56 //存储家庭id 56 //存储家庭id
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/netWork/bean/FamilyListBean.java
  View file @ca4efd5
@@ -53,7 +53,7 @@ public class FamilyListBean implements Serializable { @@ -53,7 +53,7 @@ public class FamilyListBean implements Serializable {
53 private String userId; 53 private String userId;
54 private String name; 54 private String name;
55 private String img; 55 private String img;
56 - private String isMaster; 56 + private int isMaster;
57 private List<DeviceListBean> deviceList; 57 private List<DeviceListBean> deviceList;
58 58
59 public String getId() { 59 public String getId() {
@@ -104,11 +104,11 @@ public class FamilyListBean implements Serializable { @@ -104,11 +104,11 @@ public class FamilyListBean implements Serializable {
104 this.img = img; 104 this.img = img;
105 } 105 }
106 106
107 - public String getIsMaster() { 107 + public int getIsMaster() {
108 return isMaster; 108 return isMaster;
109 } 109 }
110 110
111 - public void setIsMaster(String isMaster) { 111 + public void setIsMaster(int isMaster) {
112 this.isMaster = isMaster; 112 this.isMaster = isMaster;
113 } 113 }
114 114