Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	gradle.properties
#	moduleUtil/src/main/java/com/xscm/moduleutil/base/CommonAppContext.java
#	moduleUtil/src/main/java/com/xscm/moduleutil/dialog/FirstChargeDialog.java
#	moduleUtil/src/main/java/com/xscm/moduleutil/dialog/RechargeDialogFragment.java
#	moduleroom/src/main/java/com/example/moduleroom/activity/RedResultActivity.java
#	moduleroom/src/main/java/com/example/moduleroom/activity/RoomActivity.kt
#	moduleroom/src/main/java/com/example/moduleroom/dialog/RoomOnlineDialogFragment.java
#	moduleroom/src/main/java/com/example/moduleroom/fragment/RedEnvelopesFragment.java
#	moduleroom/src/main/java/com/example/moduleroom/fragment/RoomKtvFragment.java

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

@@ -28,8 +28,8 @@ isBuildModule=false
 #org.gradle.deamon=false
 android.injected.testOnly=false
 
-APP_VERSION_NAME=1.2.9.1
+APP_VERSION_NAME=1.3.1.1
-APP_VERSION_CODE=187
+APP_VERSION_CODE=188
 
 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/base/CommonAppContext.java

@@ -528,8 +528,8 @@ public class CommonAppContext extends MultiDexApplication  implements Applicatio
 
     public void upMqtt(){
         if (mqttConnect==null){
-            mqttConnect=MqttConnect.getInstance(this,"tcp://1.13.181.248","android-"+ MqttClient.generateClientId());
+//            mqttConnect=MqttConnect.getInstance(this,"tcp://1.13.181.248","android-"+ MqttClient.generateClientId());
-//                mqttConnect=MqttConnect.getInstance(this,"tcp://62.234.12.147","android-"+ MqttClient.generateClientId());
+                mqttConnect=MqttConnect.getInstance(this,"tcp://62.234.12.147","android-"+ MqttClient.generateClientId());
             mqttConnect.mqttClient();
         }
     }

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 QXRoomSettingTypeRoomFloatingScreen = 29;//关闭飘屏
-    public static final int QXRoomSettingTypeRoomFloatingRed = 30;
+    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/dialog/FirstChargeDialog.java

@@ -191,7 +191,7 @@ public class FirstChargeDialog extends BaseDialog<DialogFirstChargeBinding> {
 //                mBinding.tvTitle2.setText(firstChargeGiftBean.getGift_bag().get(0).getTitle2());
 //                mBinding.btn0.setText(firstChargeGiftBean.getGift_bag().get(0).getName());
                 list.addAll(firstChargeGiftBean.getGift_bag().get(0).getGift_list());
-                mBinding.tvTitle22.setText(firstChargeGiftBean.getGift_bag().get(0).getTitle2());
+                mBinding.tvTitle22.setText("充值"+firstChargeGiftBean.getGift_bag().get(0).getName()+"即可获得"+firstChargeGiftBean.getGift_bag().get(0).getTitle2()+"的道具或装扮");
                 mBinding.bannerViewPager.create(baseListData(list, 4));
 
 //                mBinding.btn1.setText(firstChargeGiftBean.getGift_bag().get(1).getName());

moduleUtil/src/main/java/com/xscm/moduleutil/dialog/RechargeDialogFragment.java

@@ -111,7 +111,7 @@ public class RechargeDialogFragment extends BaseMvpDialogFragment<RechargeDialog
                 ToastUtils.showShort("请选择支付方式");
                 return;
             }
-            MvpPre.appPay(SpUtil.getUserId() + "", money, coin, selectedItem.getType(),gift_bag_id,type_params);
+            MvpPre.appPay(SpUtil.getUserId() + "", money, coin, selectedItem.getType(),type_params,gift_bag_id);
         }
     }
     @Override

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

@@ -1822,7 +1822,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/rtc/AgoraManager.java

@@ -858,13 +858,12 @@ public class AgoraManager {
             screenCaptureParameters.captureVideo = true;
             screenCaptureParameters.videoCaptureParameters.width =  outMetrics.widthPixels;
             screenCaptureParameters.videoCaptureParameters.height =  outMetrics.heightPixels;
-//            screenCaptureParameters.videoCaptureParameters.height = (int) (3840 * 1.0f / outMetrics.widthPixels * outMetrics.heightPixels);
             screenCaptureParameters.videoCaptureParameters.framerate = 15;
             screenCaptureParameters.captureAudio = true;
             screenCaptureParameters.audioCaptureParameters.captureSignalVolume =50;
             screenCaptureParameters.videoCaptureParameters.contentHint=1 ;
             rtcEngine.setVideoEncoderConfiguration(new VideoEncoderConfiguration(
-                    VD_360x360,
+                    VD_1280x720,
                     FRAME_RATE_FPS_15,
                     STANDARD_BITRATE,
                     ORIENTATION_MODE_FIXED_LANDSCAPE

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

@@ -22,7 +22,7 @@ public enum EnvironmentEnum {
             "ZOjTqAJmUL563EKFKySrUwAHtx4hKt",
             "midi01",
             "https://midi01.oss-cn-beijing.aliyuncs.com/",
-            "wxc7681513be9f926b",
+            "wxfc7bf7ca8c71840d",
             1600106397,
             "05b406b4541e413887d8d2bf9be8642c",
             "tcp://1.13.181.248",

moduleUtil/src/main/res/layout/room_gv_gift_item.xml

@@ -69,7 +69,7 @@
                 android:drawableLeft="@mipmap/jinb"
                 android:drawablePadding="@dimen/dp_3"
                 android:layout_marginBottom="3dp"
-                android:textColor="@color/color_FFFFBC00"
+                android:textColor="@color/black"
                 android:textSize="8sp"
                 app:layout_constraintLeft_toLeftOf="@+id/iv_gift_pic"
                 app:layout_constraintRight_toRightOf="@+id/iv_gift_pic"

moduleroom/src/main/java/com/example/moduleroom/activity/RedResultActivity.java

@@ -103,6 +103,8 @@ public class RedResultActivity extends BaseMvpActivity<RedEnvelopesPresenter, Fr
             mBinding.tvJb.setText(redpacketDetail.getRedpacket_info().getCoin_type() == 1 ? "金币" : "钻石");
             if (redpacketDetail.getMy_record() != null) {
                 mBinding.tvRedJb.setText(redpacketDetail.getMy_record().getAmount());
+            }else {
+                mBinding.tvRedJb.setText("0.00");
             }
             mBinding.tvLq.setText("已领取"+redpacketDetail.getRecords().size() + "/" + redpacketDetail.getRedpacket_info().getTotal_count());
             redAdapter.setNewData(redpacketDetail.getRecords());

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

@@ -2567,6 +2567,9 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
 
     fun setUserInfo() {
         mRoomInfoResp!!.user_info.is_collect = 1
+        mBinding!!.roomTop.btnFollow.background =
+            resources.getDrawable(com.xscm.moduleutil.R.mipmap.yishouc)
+        mBinding!!.roomTop.btnFollow.text = ""
     }
 
     /**

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

@@ -72,11 +72,32 @@ public class CustomCenterDialogFragment extends DialogFragment {
 
         fragment.show(fragmentManager, "CustomCenterDialogFragment");
 
+//        new Handler(Looper.getMainLooper()).postDelayed(() -> {
+//            if (fragment.isAdded()) {
+//                fragment.dismiss();
+//            }
+//        }, 4000); // 4秒后关闭
+
         new Handler(Looper.getMainLooper()).postDelayed(() -> {
-            if (fragment != null && fragment.isAdded()) {
+            try {
-                fragment.dismiss();
+                if (fragment.isAdded() &&
+                        !fragment.isRemoving() &&
+                        !fragment.isDetached() &&
+                        fragment.getActivity() != null &&
+                        !fragment.getActivity().isFinishing() &&
+                        !fragment.getActivity().isDestroyed()) {
+
+                    if (fragment.getFragmentManager() != null && !fragment.getFragmentManager().isStateSaved()) {
+                        fragment.dismiss();
+                    } else {
+                        fragment.dismissAllowingStateLoss();
+                    }
+                }
+            } catch (Exception e) {
+                // 安全地忽略异常
             }
         }, 4000); // 4秒后关闭
+
     }
 
     public void setAnimationStyle(int animStyle) {

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

@@ -469,4 +469,5 @@ public class RoomOnlineDialogFragment extends BaseMvpDialogFragment<RoomPresente
     public void roomRedPackets(List<RedPacketInfo> list) {
 
     }
+
 }

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

@@ -48,9 +48,11 @@ public class RedEnvelopesFragment extends BaseDialog<FragmentRedEnvelopesBinding
     public boolean isFromToComment;//是否是发送评论地方过来
 
     private CountDownTimer countDownTimer;
+    private Context mContext;
 
     public RedEnvelopesFragment(@NonNull @NotNull Context context) {
         super(context, com.xscm.moduleutil.R.style.BaseDialogStyleH);
+        mContext=context;
     }
 
     //是否收藏方法
@@ -140,8 +142,8 @@ public class RedEnvelopesFragment extends BaseDialog<FragmentRedEnvelopesBinding
 
                         @Override
                         public void onNext(@NotNull String s) {
-                            if (getContext() instanceof RoomActivity) {
+                            if (mContext instanceof RoomActivity) {
-                                ((RoomActivity) getContext()).setUserInfo();
+                                ((RoomActivity) mContext).setUserInfo();
                             }
 
                             if (mRedPacketInfo.canOpenNow()){

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

@@ -549,21 +549,21 @@ public class RoomAuctionFragment extends BaseMvpFragment<RoomAuctionPresenterTow
                 return;
             }
             RoomCharmDialog.newInstance(roomInfoResp.getRoom_info().getRoom_id(), wheatView2.pitBean.getUser_id()).show(getChildFragmentManager(), "RoomCharmDialog");
-        }else if (id == R.id.question_mark){
+        } else if (id == R.id.question_mark) {
 //            Bundle bundle = new Bundle();
 //            bundle.putString("url", CommonAppContext.getInstance().getCurrentEnvironment().getServerUrl()+"api/Page/page_show?id=22");
 //            WebViewDialog dialog = new WebViewDialog(getActivity(), bundle);
 //            dialog.show();
-            if (type==1) {
+            if (type == 1) {
                 Bundle bundle = new Bundle();
-                bundle.putString("url", CommonAppContext.getInstance().getCurrentEnvironment().getServerUrl()+"api/Page/page_show?id=23");
+                bundle.putString("url", CommonAppContext.getInstance().getCurrentEnvironment().getServerUrl() + "api/Page/page_show?id=23");
                 RoomAuctionWebViewDialog dialog = new RoomAuctionWebViewDialog(getActivity(), bundle);
                 dialog.show();
 //                ARouter.getInstance().build(ARouteConstants.H5).withString("url", CommonAppContext.getInstance().getCurrentEnvironment().getServerUrl() + "/api/Page/page_show?id=23").withString("title", "真爱拍规则").navigation();
-            }else {
+            } else {
 
                 Bundle bundle = new Bundle();
-                bundle.putString("url", CommonAppContext.getInstance().getCurrentEnvironment().getServerUrl()+"api/Page/page_show?id=22");
+                bundle.putString("url", CommonAppContext.getInstance().getCurrentEnvironment().getServerUrl() + "api/Page/page_show?id=22");
                 RoomAuctionWebViewDialog dialog = new RoomAuctionWebViewDialog(getActivity(), bundle);
                 dialog.show();
 //                ARouter.getInstance().build(ARouteConstants.H5).withString("url", CommonAppContext.getInstance().getCurrentEnvironment().getServerUrl() + "/api/Page/page_show?id=22").withString("title", "亲密拍规则").navigation();
@@ -915,7 +915,8 @@ 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());
@@ -1034,7 +1034,7 @@ public class RoomAuctionFragment extends BaseMvpFragment<RoomAuctionPresenterTow
     // TODO: 2025/9/12 清除个人魅力
     public void event1059(RoomMessageEvent messageEvent) {
         RoomPitBean pitBean = wheatView.pitBean;
-        if (pitBean!=null) {
+        if (pitBean != null) {
             if (pitBean.getUser_id().equals(messageEvent.getText().getUser_id())) {
                 pitBean.setCharm("");
                 wheatView.setCharm("0");
@@ -1042,7 +1042,7 @@ public class RoomAuctionFragment extends BaseMvpFragment<RoomAuctionPresenterTow
             }
         }
         RoomPitBean pitBean2 = wheatView2.pitBean;
-        if (pitBean2!=null) {
+        if (pitBean2 != null) {
             if (pitBean2.getUser_id().equals(messageEvent.getText().getUser_id())) {
                 pitBean2.setCharm("");
                 wheatView2.setCharm("0");
@@ -1051,15 +1051,15 @@ public class RoomAuctionFragment extends BaseMvpFragment<RoomAuctionPresenterTow
             }
         }
         RoomPitBean pitBean3 = mBinding.ivAuction1.pitBean;
-        if (pitBean3!=null){
+        if (pitBean3 != null) {
-        if (pitBean3.getUser_id().equals(messageEvent.getText().getUser_id())) {
+            if (pitBean3.getUser_id().equals(messageEvent.getText().getUser_id())) {
-            pitBean3.setCharm("");
+                pitBean3.setCharm("");
-            mBinding.ivAuction1.setmTvTime("0");
+                mBinding.ivAuction1.setmTvTime("0");
-            return;
+                return;
-        }
+            }
         }
         RoomPitBean pitBean4 = mBinding.ivAuction2.pitBean;
-        if (pitBean4!=null) {
+        if (pitBean4 != null) {
             if (pitBean4.getUser_id().equals(messageEvent.getText().getUser_id())) {
                 pitBean4.setCharm("");
                 mBinding.ivAuction2.setmTvTime("0");
@@ -1067,7 +1067,7 @@ public class RoomAuctionFragment extends BaseMvpFragment<RoomAuctionPresenterTow
             }
         }
         RoomPitBean pitBean5 = mBinding.ivAuction3.pitBean;
-        if (pitBean5!=null) {
+        if (pitBean5 != null) {
             if (pitBean5.getUser_id().equals(messageEvent.getText().getUser_id())) {
                 pitBean5.setCharm("");
                 mBinding.ivAuction3.setmTvTime("0");
@@ -1082,7 +1082,7 @@ public class RoomAuctionFragment extends BaseMvpFragment<RoomAuctionPresenterTow
 
 
             RoomPitBean pitBean = wheatView.pitBean;
-            if (pitBean!=null) {
+            if (pitBean != null) {
                 if (pitBean.getUser_id().equals(messageEvent.getText().getUser_id())) {
                     pitBean.setIs_online(type == 1 ? 1 : 2);
                     wheatView.setData(pitBean);
@@ -1090,7 +1090,7 @@ public class RoomAuctionFragment extends BaseMvpFragment<RoomAuctionPresenterTow
                 }
             }
             RoomPitBean pitBean2 = wheatView2.pitBean;
-            if (pitBean2!=null) {
+            if (pitBean2 != null) {
                 if (pitBean2.getUser_id().equals(messageEvent.getText().getUser_id())) {
                     pitBean2.setIs_online(type == 1 ? 1 : 2);
                     wheatView2.setData(pitBean2);
@@ -1098,7 +1098,7 @@ public class RoomAuctionFragment extends BaseMvpFragment<RoomAuctionPresenterTow
                 }
             }
             RoomPitBean pitBean3 = mBinding.ivAuction1.pitBean;
-            if (pitBean3!=null) {
+            if (pitBean3 != null) {
                 if (pitBean3.getUser_id().equals(messageEvent.getText().getUser_id())) {
                     pitBean3.setIs_online(type == 1 ? 1 : 2);
                     mBinding.ivAuction1.setData(pitBean3);
@@ -1106,7 +1106,7 @@ public class RoomAuctionFragment extends BaseMvpFragment<RoomAuctionPresenterTow
                 }
             }
             RoomPitBean pitBean4 = mBinding.ivAuction2.pitBean;
-            if (pitBean4!=null) {
+            if (pitBean4 != null) {
                 if (pitBean4.getUser_id().equals(messageEvent.getText().getUser_id())) {
                     pitBean4.setIs_online(type == 1 ? 1 : 2);
                     mBinding.ivAuction2.setData(pitBean4);
@@ -1114,7 +1114,7 @@ public class RoomAuctionFragment extends BaseMvpFragment<RoomAuctionPresenterTow
                 }
             }
             RoomPitBean pitBean5 = mBinding.ivAuction3.pitBean;
-            if (pitBean5!=null) {
+            if (pitBean5 != null) {
                 if (pitBean5.getUser_id().equals(messageEvent.getText().getUser_id())) {
                     pitBean5.setIs_online(type == 1 ? 1 : 2);
                     mBinding.ivAuction3.setData(pitBean5);
@@ -1291,7 +1291,7 @@ public class RoomAuctionFragment extends BaseMvpFragment<RoomAuctionPresenterTow
 
     public void event1035(RoomMessageEvent messageEvent) {
         RoomPitBean pitBean = mBinding.roomMakeWheat.pitBean;
-        if (pitBean!=null) {
+        if (pitBean != null) {
             if (pitBean.getUser_id().equals(messageEvent.getText().getFromUserInfo().getUser_id() + "")) {
                 pitBean.setAvatar(messageEvent.getText().getFromUserInfo().getAvatar());
                 pitBean.setNickname(messageEvent.getText().getFromUserInfo().getNickname());
@@ -1301,14 +1301,14 @@ public class RoomAuctionFragment extends BaseMvpFragment<RoomAuctionPresenterTow
             }
         }
         RoomPitBean pitBean2 = mBinding.roomMakeWheat2.pitBean;
-        if (pitBean2 != null){
+        if (pitBean2 != null) {
-        if (pitBean2.getUser_id().equals(messageEvent.getText().getFromUserInfo().getUser_id() + "")) {
+            if (pitBean2.getUser_id().equals(messageEvent.getText().getFromUserInfo().getUser_id() + "")) {
-            pitBean2.setAvatar(messageEvent.getText().getFromUserInfo().getAvatar());
+                pitBean2.setAvatar(messageEvent.getText().getFromUserInfo().getAvatar());
-            pitBean2.setNickname(messageEvent.getText().getFromUserInfo().getNickname());
+                pitBean2.setNickname(messageEvent.getText().getFromUserInfo().getNickname());
-            pitBean2.setSex(messageEvent.getText().getFromUserInfo().getSex() + "");
+                pitBean2.setSex(messageEvent.getText().getFromUserInfo().getSex() + "");
-            pitBean2.setDress(messageEvent.getText().getFromUserInfo().getDress());
+                pitBean2.setDress(messageEvent.getText().getFromUserInfo().getDress());
-            mBinding.roomMakeWheat2.setData(pitBean2);
+                mBinding.roomMakeWheat2.setData(pitBean2);
-        }
+            }
         }
 
         if (auctionList != null && auctionList.size() > 0) {

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

@@ -1435,4 +1435,5 @@ public class RoomKtvFragment extends BaseMvpFragment<RoomPresenter, FragmentRoom
     public void roomRedPackets(List<RedPacketInfo> list) {
 
     }
+
 }