1:修改送礼物不选择礼物的时候，直接提示错误信息

2：修改小黑屋不能发布横屏数据

app/src/main/AndroidManifest.xml

@@ -124,7 +124,7 @@
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"
         android:requestLegacyExternalStorage="true"
-        android:resizeableActivity="false"
+        android:resizeableActivity="true"
         android:icon="@mipmap/ic_launcher_app"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round_app"

gradle.properties

@@ -29,7 +29,7 @@ isBuildModule=false
 android.injected.testOnly=false
 
 APP_VERSION_NAME=1.2.9
-APP_VERSION_CODE=183
+APP_VERSION_CODE=184
 
 org.gradle.jvm.toolchain.useLegacyAdapters=false
 #org.gradle.java.home=C\:\\Users\\qx\\.jdks\\ms-17.0.15

moduleUtil/src/main/java/com/xscm/moduleutil/bean/room/RoomSettingBean.java

@@ -49,8 +49,8 @@ public class RoomSettingBean implements MultiItemEntity {
     public static final int QXRoomSettingTypeRoomCloseEffects = 25;
     /// 意见反馈
     public static final int QXRoomSettingTypeRoomReport = 26;
-    public static final int QXRoomSettingTypeRoomFloatingScreen = 29;
-    public static final int QXRoomSettingTypeRoomFloatingRed = 30;
+    public static final int QXRoomSettingTypeRoomFloatingScreen = 29;//关闭飘屏
+    public static final int QXRoomSettingTypeRoomFloatingRed = 30;//红包
 
     public static final int ITEM_TYPE_DEFAULT = 0;
     public static final int ITEM_TYPE_WITH_ICON = 1;

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

@@ -1817,7 +1817,18 @@ public class RetrofitClient {
                     BaseModel<RoomInfoResp> roomInfoRespBaseModel = response.body();
                     if (roomInfoRespBaseModel.getCode() == 1) {
                         observer.onNext(roomInfoRespBaseModel.getData());
-                    } else {
+                    }else if (roomInfoRespBaseModel.getCode() == 301){
+                        ToastUtils.showShort(roomInfoRespBaseModel.getMsg());
+                        try {
+                            CommonAppContext.getInstance().clearLoginInfo();
+                        } catch (ClassNotFoundException e) {
+                            throw new RuntimeException(e);
+                        }
+                    }else if (roomInfoRespBaseModel.getCode() == 0){
+                        ToastUtils.showShort(roomInfoRespBaseModel.getMsg());
+                        observer.onNext(null);
+                    }
+                    else {
                         MessageListenerSingleton.getInstance().quitGroup(roomId);
                     }
                 }

moduleUtil/src/main/java/com/xscm/moduleutil/utils/config/EnvironmentPrefs.java

@@ -51,11 +51,11 @@ public class EnvironmentPrefs {
 //        }
         
         // 默认使用生产环境
-        String envName = sharedPreferences.getString(KEY_ENV, EnvironmentEnum.TEST.name());
+        String envName = sharedPreferences.getString(KEY_ENV, EnvironmentEnum.PRODUCTION.name());
         try {
             return EnvironmentEnum.valueOf(envName);
         } catch (IllegalArgumentException e) {
-            return EnvironmentEnum.TEST; // 出错时默认返回生产环境
+            return EnvironmentEnum.PRODUCTION; // 出错时默认返回生产环境
         }
     }
 }

moduleroom/src/main/java/com/example/moduleroom/activity/RoomActivity.kt

@@ -2164,7 +2164,8 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
 
         if (text.fromUserInfo.user_id == SpUtil.getUserId()) {
             LogUtils.e("退出房间")
-            MvpPre!!.quitRoom(roomId, SpUtil.getUserId().toString() + "")
+//            MvpPre!!.quitRoom(roomId, SpUtil.getUserId().toString() + "")
+            performExitRoom(1)
         }
     }
 
@@ -4113,6 +4114,7 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
     }
 
     override fun quitRoom() {
+
     }
 
     //退出房间进行销毁
@@ -4194,6 +4196,10 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
     override fun findRoom() {
     }
 
+    override fun roomEit() {
+        performExitRoom(1)
+    }
+
     private fun queren1(nickname: String) {
         // 创建并显示确认对话框
         ConfirmDialog(

moduleroom/src/main/java/com/example/moduleroom/contacts/RoomContacts.java

@@ -49,6 +49,8 @@ public class RoomContacts {
         void userOnlineStatus(List<UserOnlineStatusBean> list);
 
         void findRoom();
+
+        void roomEit();
     }
 
     public interface IRoomPre extends IPresenter {

moduleroom/src/main/java/com/example/moduleroom/dialog/RoomGiftDialogFragment.java

@@ -582,7 +582,7 @@ public class RoomGiftDialogFragment extends BaseMvpDialogFragment<RewardGiftPres
 //                return;
 //            }
 //        } else {
-        if (roonGiftModel == null) {
+        if (roonGiftModel == null|| roonGiftModel.getGift_id() == null) {
             ToastUtils.show("请选择礼物");
             return;
         }

moduleroom/src/main/java/com/example/moduleroom/dialog/RoomOnlineDialogFragment.java

@@ -463,4 +463,9 @@ public class RoomOnlineDialogFragment extends BaseMvpDialogFragment<RoomPresente
         mBinding.srl.finishRefresh();
         mBinding.srl.finishLoadMore();
     }
+
+    @Override
+    public void roomEit() {
+
+    }
 }

moduleroom/src/main/java/com/example/moduleroom/fragment/RoomAuctionFragment.java

@@ -915,6 +915,7 @@ public class RoomAuctionFragment extends BaseMvpFragment<RoomAuctionPresenterTow
 //                                ((RoomActivity) getActivity()).switchMic(2);
 //                            }
 //                        }
+
     /// /                    }
 //                }
 //                yinc();
@@ -1018,7 +1019,6 @@ public class RoomAuctionFragment extends BaseMvpFragment<RoomAuctionPresenterTow
 //        }
 //
 //    }
-
     private void gengv() {
         if (auctionUserBean != null) {
             mBinding.tvRelation.setText(auctionUserBean.getRelation_name());

moduleroom/src/main/java/com/example/moduleroom/fragment/RoomFragment.java

@@ -1203,6 +1203,11 @@ public class RoomFragment extends BaseMvpFragment<RoomPresenter, FragmentRoomBin
 
     }
 
+    @Override
+    public void roomEit() {
+
+    }
+
 
     public void getVoiceStatus(RoomAuction.AuctionUserBean auctionUserBean, List<RoomAuction.AuctionListBean> auctionListBeans, String user_id) {
         boolean haveMe = false;

moduleroom/src/main/java/com/example/moduleroom/fragment/RoomKtvFragment.java

@@ -1434,4 +1434,9 @@ public class RoomKtvFragment extends BaseMvpFragment<RoomPresenter, FragmentRoom
     public void findRoom() {
 
     }
+
+    @Override
+    public void roomEit() {
+
+    }
 }

moduleroom/src/main/java/com/example/moduleroom/presenter/RoomPresenter.java

@@ -47,6 +47,13 @@ public class RoomPresenter extends BasePresenter<RoomContacts.View> implements R
 
             @Override
             public void onNext(RoomInfoResp resp) {
+                if (MvpRef==null){
+                    MvpRef=new WeakReference<>(mView);
+                }
+                if (resp==null){
+                    MvpRef.get().roomEit();
+                    return;
+                }
                 String appId = CommonAppContext.getInstance().getCurrentEnvironment().getSwSdkAppId();
                 String token = resp.getUser_info().getAgora_token(); // 如果启用了鉴权才需要
                 String roomId = resp.getRoom_info().getRoom_id(); // 房间 ID
@@ -77,9 +84,7 @@ public class RoomPresenter extends BasePresenter<RoomContacts.View> implements R
 
 // 2. 加入房间
 //                rtcCore.joinRoom(token, roomId, uid, enableMic);
-                if (MvpRef==null){
-                    MvpRef=new WeakReference<>(mView);
-                }
+
                 MvpRef.get().roomInfo(resp);
 
             }