Merge branch 'branch_new' into branch_new_69
This commit is contained in:
@@ -161,7 +161,7 @@ public class CommonAppContext extends MultiDexApplication implements Applicatio
|
||||
//设置mqtt环境 false 测试环境 true 正式环境
|
||||
// ExternalResConstants.INSTANCE.setIS_MQTT_RELEASE(false);
|
||||
//设置http环境 false 测试环境 true 正式环境
|
||||
ExternalResConstants.INSTANCE.setIS_HTTP_RELEASE(true);
|
||||
ExternalResConstants.INSTANCE.setIS_HTTP_RELEASE(false);
|
||||
currentEnvironment = ExternalResConstants.INSTANCE.HTTP_PATH();
|
||||
|
||||
initialization();
|
||||
|
||||
@@ -9,4 +9,5 @@ public class RoomOnline {
|
||||
|
||||
private List<RoomOnlineBean> on_pit;//麦上用户
|
||||
private List<RoomOnlineBean> off_pit;//麦下用户
|
||||
private int count;//在线人数
|
||||
}
|
||||
|
||||
@@ -2402,6 +2402,8 @@ public class RetrofitClient {
|
||||
BaseModel<RoomOnline> roomOnlineBaseModel = response.body();
|
||||
if (roomOnlineBaseModel.getCode() == 1) {
|
||||
observer.onNext(roomOnlineBaseModel.getData());
|
||||
}else if (roomOnlineBaseModel.getCode() == 0) {
|
||||
ToastUtils.showLong(roomOnlineBaseModel.getMsg());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user