diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index de7696e..565a032 100644 --- a/app/src/main/AndroidManifest.xml +++ b/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" diff --git a/gradle.properties b/gradle.properties index 4be87ab..c866e4f 100644 --- a/gradle.properties +++ b/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 diff --git a/moduleUtil/src/main/java/com/xscm/moduleutil/bean/room/RoomSettingBean.java b/moduleUtil/src/main/java/com/xscm/moduleutil/bean/room/RoomSettingBean.java index 79a687e..868bd09 100644 --- a/moduleUtil/src/main/java/com/xscm/moduleutil/bean/room/RoomSettingBean.java +++ b/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; diff --git a/moduleUtil/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java b/moduleUtil/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java index 9db8c84..c4e97f8 100644 --- a/moduleUtil/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java +++ b/moduleUtil/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java @@ -1817,7 +1817,18 @@ public class RetrofitClient { BaseModel 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); } } diff --git a/moduleUtil/src/main/java/com/xscm/moduleutil/utils/config/EnvironmentPrefs.java b/moduleUtil/src/main/java/com/xscm/moduleutil/utils/config/EnvironmentPrefs.java index 6fac379..a1d591a 100644 --- a/moduleUtil/src/main/java/com/xscm/moduleutil/utils/config/EnvironmentPrefs.java +++ b/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; // 出错时默认返回生产环境 } } } \ No newline at end of file diff --git a/moduleroom/src/main/java/com/example/moduleroom/activity/RoomActivity.kt b/moduleroom/src/main/java/com/example/moduleroom/activity/RoomActivity.kt index 9897ba9..347af4a 100644 --- a/moduleroom/src/main/java/com/example/moduleroom/activity/RoomActivity.kt +++ b/moduleroom/src/main/java/com/example/moduleroom/activity/RoomActivity.kt @@ -2164,7 +2164,8 @@ class RoomActivity : BaseMvpActivity(), 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(), } override fun quitRoom() { + } //退出房间进行销毁 @@ -4194,6 +4196,10 @@ class RoomActivity : BaseMvpActivity(), override fun findRoom() { } + override fun roomEit() { + performExitRoom(1) + } + private fun queren1(nickname: String) { // 创建并显示确认对话框 ConfirmDialog( diff --git a/moduleroom/src/main/java/com/example/moduleroom/contacts/RoomContacts.java b/moduleroom/src/main/java/com/example/moduleroom/contacts/RoomContacts.java index 86fe9c7..8216441 100644 --- a/moduleroom/src/main/java/com/example/moduleroom/contacts/RoomContacts.java +++ b/moduleroom/src/main/java/com/example/moduleroom/contacts/RoomContacts.java @@ -49,6 +49,8 @@ public class RoomContacts { void userOnlineStatus(List list); void findRoom(); + + void roomEit(); } public interface IRoomPre extends IPresenter { diff --git a/moduleroom/src/main/java/com/example/moduleroom/dialog/RoomGiftDialogFragment.java b/moduleroom/src/main/java/com/example/moduleroom/dialog/RoomGiftDialogFragment.java index 419fceb..a514b82 100644 --- a/moduleroom/src/main/java/com/example/moduleroom/dialog/RoomGiftDialogFragment.java +++ b/moduleroom/src/main/java/com/example/moduleroom/dialog/RoomGiftDialogFragment.java @@ -582,7 +582,7 @@ public class RoomGiftDialogFragment extends BaseMvpDialogFragment 0) { diff --git a/moduleroom/src/main/java/com/example/moduleroom/fragment/RoomFragment.java b/moduleroom/src/main/java/com/example/moduleroom/fragment/RoomFragment.java index 09d950b..fc10a3e 100644 --- a/moduleroom/src/main/java/com/example/moduleroom/fragment/RoomFragment.java +++ b/moduleroom/src/main/java/com/example/moduleroom/fragment/RoomFragment.java @@ -1203,6 +1203,11 @@ public class RoomFragment extends BaseMvpFragment auctionListBeans, String user_id) { boolean haveMe = false; diff --git a/moduleroom/src/main/java/com/example/moduleroom/fragment/RoomKtvFragment.java b/moduleroom/src/main/java/com/example/moduleroom/fragment/RoomKtvFragment.java index b849995..31b86d2 100644 --- a/moduleroom/src/main/java/com/example/moduleroom/fragment/RoomKtvFragment.java +++ b/moduleroom/src/main/java/com/example/moduleroom/fragment/RoomKtvFragment.java @@ -1434,4 +1434,9 @@ public class RoomKtvFragment extends BaseMvpFragment 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 implements R // 2. 加入房间 // rtcCore.joinRoom(token, roomId, uid, enableMic); - if (MvpRef==null){ - MvpRef=new WeakReference<>(mView); - } + MvpRef.get().roomInfo(resp); }