1:修改清除魅力报错

2：修改进入房间请求接口出现错误，login没有消失

BaseModule/src/main/java/com/xscm/moduleutil/base/CommonAppContext.java

@@ -133,7 +133,7 @@ public class CommonAppContext extends MultiDexApplication implements Application
     @Getter
     public UnreadCountEvent unreadCountEvent;
 
-    public static int selectRelease = -1;
+    public static int selectRelease = 1;
 
     @Override
     public void onCreate() {

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

@@ -2337,12 +2337,18 @@ public class RetrofitClient {
                     }else {
                         observer.onNext(new BeforeJoinRoomCheckBean());
                     }
+                }else {
+                    if (joinRoomLoadListener != null) {
+                        joinRoomLoadListener.onJoinRoomLoad("网络异常");
+                    }
                 }
             }
 
             @Override
             public void onFailure(Call<BaseModel<BeforeJoinRoomCheckBean>> call, Throwable t) {
-
+                if (joinRoomLoadListener != null) {
+                    joinRoomLoadListener.onJoinRoomLoad("网络异常");
+                }
             }
         });
     }

MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/SingSongFragment.java

@@ -1045,7 +1045,7 @@ public class SingSongFragment extends BaseRoomFragment<SingSongPresenter, Fragme
 
         if (roomInfoRespPk == null || roomInfoRespPk.getPk_info() == null) {
             if (pitBean != null) {
-                if (pitBean.getUser_id() != null) {
+                if (pitBean.getUser_id() != null && !pitBean.getUser_id().isEmpty() && !pitBean.getUser_id().equals("0")) {
                     wheatLayoutSingManager.updateSingleWheat(pitBean, Integer.parseInt(pitBean.getPit_number()));
                     return;
                 }