1:修改BUG

moduleUtil/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java

@@ -86,6 +86,7 @@ import com.xscm.moduleutil.bean.room.RoomBean;
 import com.xscm.moduleutil.bean.room.RoomInfoResp;
 import com.xscm.moduleutil.bean.room.RoomOnline;
 import com.xscm.moduleutil.bean.zhuangb.ZhuangBanShangChengBean;
+import com.xscm.moduleutil.listener.MessageListenerSingleton;
 import com.xscm.moduleutil.utils.SpUtil;
 import com.xscm.moduleutil.utils.SystemUtils;
 import com.xscm.moduleutil.utils.logger.DataLogger;
@@ -101,6 +102,7 @@ import java.security.SecureRandom;
 import java.security.cert.X509Certificate;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.EventListener;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
@@ -518,6 +520,10 @@ public class RetrofitClient {
         });
     }
 
+    public void roomUserReconnect(String roomId){
+        sApiServer.roomUserReconnect(roomId).compose(new DefaultTransformer<>()).subscribe();
+    }
+
     public void tasksLihen(BaseObserver<GiftBoxBean> observer) {
         sApiServer.tasksLihen().enqueue(new Callback<ResponseBody>() {
             @Override
@@ -1096,7 +1102,25 @@ public class RetrofitClient {
     }
 
     public void roomGetIn(String roomId, String password, BaseObserver<RoomInfoResp> observer) {
-        sApiServer.roomGetIn(roomId, password).compose(new DefaultTransformer<>()).subscribe(observer);
+        sApiServer.roomGetIn(roomId, password).enqueue(new Callback<BaseModel<RoomInfoResp>>() {
+
+            @Override
+            public void onResponse(Call<BaseModel<RoomInfoResp>> call, Response<BaseModel<RoomInfoResp>> response) {
+                if (response.code() == 200){
+                    BaseModel<RoomInfoResp> roomInfoRespBaseModel = response.body();
+                    if (roomInfoRespBaseModel.getCode()==1){
+                        observer.onNext(roomInfoRespBaseModel.getData());
+                    }else {
+                        MessageListenerSingleton.getInstance().quitGroup(roomId);
+                    }
+                }
+            }
+
+            @Override
+            public void onFailure(Call<BaseModel<RoomInfoResp>> call, Throwable t) {
+
+            }
+        });
     }
 
     public void updatePassword(String roomId, String password, BaseObserver<String> observer) {
@@ -1231,7 +1255,12 @@ public class RetrofitClient {
             public void onResponse(Call<BaseModel<RoomAuction.AuctionListBean>> call, Response<BaseModel<RoomAuction.AuctionListBean>> response) {
                 if (response.code() == 200){
                     BaseModel<RoomAuction.AuctionListBean> baseModel = response.body();
-                    observer.onNext(baseModel.getData());
+
+                    if (baseModel.getCode()==1) {
+                        observer.onNext(baseModel.getData());
+                    }else {
+                        ToastUtils.showShort(baseModel.getMsg());
+                    }
                 }
             }
 
@@ -1550,7 +1579,7 @@ public class RetrofitClient {
                 if (response.code() == 200) {
                     BaseModel<String> baseModel = response.body();
                     if (baseModel.getCode() != 1) {
-//                        com.hjq.toast.ToastUtils.show(baseModel.getMsg());
+                        com.hjq.toast.ToastUtils.show(baseModel.getMsg());
                     }
                 }
             }
@@ -2333,12 +2362,15 @@ public class RetrofitClient {
 
                 } else if (code == 301) {
                     try {
-                        com.blankj.utilcode.util.ToastUtils.showShort("提示当前账号已在别的地方登陆，如果不是本人操作请修改密码");
+//                        com.blankj.utilcode.util.ToastUtils.showShort("提示当前账号已在别的地方登陆，如果不是本人操作请修改密码");
+                        ToastUtils.showShort(string.getMsg());
                         CommonAppContext.getInstance().clearLoginInfo();
                     } catch (ClassNotFoundException e) {
                         throw new RuntimeException(e);
                     }
                     ToastUtils.showShort(string.getMsg());
+                }else {
+                    ToastUtils.showShort(string.getMsg());
                 }
             }
 
@@ -2351,7 +2383,11 @@ public class RetrofitClient {
             public void onResponse(Call<BaseModel<BlindBoxBean>> call, Response<BaseModel<BlindBoxBean>> response) {
                 if (response.code() == 200) {
                     BaseModel<BlindBoxBean> baseModel = response.body();
-                    observer.onNext(baseModel.getData());
+                    if (baseModel.getCode()==1) {
+                        observer.onNext(baseModel.getData());
+                    }else {
+                        observer.onNext(null);
+                    }
                 }
             }
 
@@ -2392,6 +2428,7 @@ public class RetrofitClient {
                         }
                     }else {
                         observer.onNext(null);
+                        ToastUtils.showShort(baseModel.getMsg());
                     }
 
                 }
@@ -2412,7 +2449,12 @@ public class RetrofitClient {
             public void onResponse(Call<BaseModel<BlindReslutBean>> call, Response<BaseModel<BlindReslutBean>> response) {
                 if (response.code() == 200) {
                     BaseModel<BlindReslutBean> baseModel = response.body();
-                    observer.onNext(baseModel.getData());
+                    if (baseModel.getCode()==1) {
+                        observer.onNext(baseModel.getData());
+                    }else {
+                        observer.onNext(null);
+                        ToastUtils.showShort(baseModel.getMsg());
+                    }
                 }
             }