From acffaf04e4593e282b05c972d44334f54574e117 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E5=B0=8F=E6=B1=9F?= <461355754@qq.com> Date: Fri, 17 Oct 2025 14:15:26 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=88=E6=9C=AC=E7=A1=AE=E5=AE=9A=E5=90=8E?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A6=96=E5=85=85=E4=B8=8D=E5=8F=91=E9=80=81?= =?UTF-8?q?=E7=A4=BC=E7=89=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle.properties | 4 ++-- .../com/xscm/moduleutil/base/CommonAppContext.java | 4 ++-- .../com/xscm/moduleutil/dialog/FirstChargeDialog.java | 2 +- .../moduleutil/dialog/RechargeDialogFragment.java | 2 +- .../xscm/moduleutil/utils/config/EnvironmentEnum.java | 2 +- moduleUtil/src/main/res/layout/room_gv_gift_item.xml | 2 +- .../moduleroom/activity/RedResultActivity.java | 2 ++ .../com/example/moduleroom/activity/RoomActivity.kt | 3 +++ .../com/example/moduleroom/contacts/RoomContacts.java | 5 ++++- .../moduleroom/dialog/RoomOnlineDialogFragment.java | 4 +++- .../moduleroom/fragment/RedEnvelopesFragment.java | 6 ++++-- .../com/example/moduleroom/fragment/RoomFragment.java | 3 ++- .../example/moduleroom/fragment/RoomKtvFragment.java | 9 +++------ .../example/moduleroom/presenter/RoomPresenter.java | 11 +++-------- 14 files changed, 32 insertions(+), 27 deletions(-) diff --git a/gradle.properties b/gradle.properties index 6f8d487..059b255 100644 --- a/gradle.properties +++ b/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_CODE=187 +APP_VERSION_NAME=1.3.1.1 +APP_VERSION_CODE=188 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/base/CommonAppContext.java b/moduleUtil/src/main/java/com/xscm/moduleutil/base/CommonAppContext.java index 1b80887..79236ab 100644 --- a/moduleUtil/src/main/java/com/xscm/moduleutil/base/CommonAppContext.java +++ b/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://62.234.12.147","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.mqttClient(); } } diff --git a/moduleUtil/src/main/java/com/xscm/moduleutil/dialog/FirstChargeDialog.java b/moduleUtil/src/main/java/com/xscm/moduleutil/dialog/FirstChargeDialog.java index 93a8487..d5441b5 100644 --- a/moduleUtil/src/main/java/com/xscm/moduleutil/dialog/FirstChargeDialog.java +++ b/moduleUtil/src/main/java/com/xscm/moduleutil/dialog/FirstChargeDialog.java @@ -191,7 +191,7 @@ public class FirstChargeDialog extends BaseDialog { // 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()); diff --git a/moduleUtil/src/main/java/com/xscm/moduleutil/dialog/RechargeDialogFragment.java b/moduleUtil/src/main/java/com/xscm/moduleutil/dialog/RechargeDialogFragment.java index 7bcb4c5..9536ac0 100644 --- a/moduleUtil/src/main/java/com/xscm/moduleutil/dialog/RechargeDialogFragment.java +++ b/moduleUtil/src/main/java/com/xscm/moduleutil/dialog/RechargeDialogFragment.java @@ -111,7 +111,7 @@ public class RechargeDialogFragment extends BaseMvpDialogFragment(), fun setUserInfo() { mRoomInfoResp!!.user_info.is_collect = 1 + mBinding!!.roomTop.btnFollow.background = + resources.getDrawable(com.xscm.moduleutil.R.mipmap.yishouc) + mBinding!!.roomTop.btnFollow.text = "" } /** 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 8216441..7692b20 100644 --- a/moduleroom/src/main/java/com/example/moduleroom/contacts/RoomContacts.java +++ b/moduleroom/src/main/java/com/example/moduleroom/contacts/RoomContacts.java @@ -4,6 +4,7 @@ import android.app.Activity; import com.xscm.moduleutil.activity.IPresenter; import com.xscm.moduleutil.activity.IView; +import com.xscm.moduleutil.bean.RedPacketInfo; import com.xscm.moduleutil.bean.RoomCharmRankBean; import com.xscm.moduleutil.bean.UserOnlineStatusBean; import com.xscm.moduleutil.bean.room.RoomInfoResp; @@ -50,7 +51,7 @@ public class RoomContacts { void findRoom(); - void roomEit(); + void roomRedPackets(List list); } public interface IRoomPre extends IPresenter { @@ -90,5 +91,7 @@ public class RoomContacts { void auctionEnd(String auctionId,String roomId); void auctionDelay(String auctionId); + + void roomRedPackets(String roomId); } } diff --git a/moduleroom/src/main/java/com/example/moduleroom/dialog/RoomOnlineDialogFragment.java b/moduleroom/src/main/java/com/example/moduleroom/dialog/RoomOnlineDialogFragment.java index b97f973..f1ce0da 100644 --- a/moduleroom/src/main/java/com/example/moduleroom/dialog/RoomOnlineDialogFragment.java +++ b/moduleroom/src/main/java/com/example/moduleroom/dialog/RoomOnlineDialogFragment.java @@ -19,6 +19,7 @@ import com.example.moduleroom.contacts.RoomContacts; import com.example.moduleroom.databinding.FragmentRoomOnlineDialogBinding; import com.example.moduleroom.presenter.RoomPresenter; import com.xscm.moduleutil.base.BaseMvpDialogFragment; +import com.xscm.moduleutil.bean.RedPacketInfo; import com.xscm.moduleutil.bean.RoomCharmRankBean; import com.xscm.moduleutil.bean.UserOnlineStatusBean; import com.xscm.moduleutil.bean.room.RoomInfoResp; @@ -465,7 +466,8 @@ public class RoomOnlineDialogFragment extends BaseMvpDialogFragment list) { } + } diff --git a/moduleroom/src/main/java/com/example/moduleroom/fragment/RedEnvelopesFragment.java b/moduleroom/src/main/java/com/example/moduleroom/fragment/RedEnvelopesFragment.java index ce69873..d3ee3b3 100644 --- a/moduleroom/src/main/java/com/example/moduleroom/fragment/RedEnvelopesFragment.java +++ b/moduleroom/src/main/java/com/example/moduleroom/fragment/RedEnvelopesFragment.java @@ -48,9 +48,11 @@ public class RedEnvelopesFragment extends BaseDialog list) { } 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 31b86d2..0878223 100644 --- a/moduleroom/src/main/java/com/example/moduleroom/fragment/RoomKtvFragment.java +++ b/moduleroom/src/main/java/com/example/moduleroom/fragment/RoomKtvFragment.java @@ -28,11 +28,7 @@ import com.example.moduleroom.dialog.RoomOnlineDialogFragment; import com.example.moduleroom.dialog.RoomUserInfoFragment; import com.example.moduleroom.presenter.RoomPresenter; import com.xscm.moduleutil.base.BaseMvpFragment; -import com.xscm.moduleutil.bean.MusicSongBean; -import com.xscm.moduleutil.bean.RoomCharmRankBean; -import com.xscm.moduleutil.bean.RoomMessageEvent; -import com.xscm.moduleutil.bean.UserInfo; -import com.xscm.moduleutil.bean.UserOnlineStatusBean; +import com.xscm.moduleutil.bean.*; import com.xscm.moduleutil.bean.room.RoomInfoResp; import com.xscm.moduleutil.bean.room.RoomOnline; import com.xscm.moduleutil.bean.room.RoomPitBean; @@ -1436,7 +1432,8 @@ public class RoomKtvFragment extends BaseMvpFragment list) { } + } \ No newline at end of file diff --git a/moduleroom/src/main/java/com/example/moduleroom/presenter/RoomPresenter.java b/moduleroom/src/main/java/com/example/moduleroom/presenter/RoomPresenter.java index d914886..cb9316b 100644 --- a/moduleroom/src/main/java/com/example/moduleroom/presenter/RoomPresenter.java +++ b/moduleroom/src/main/java/com/example/moduleroom/presenter/RoomPresenter.java @@ -49,13 +49,6 @@ public class RoomPresenter extends BasePresenter 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 @@ -86,7 +79,9 @@ 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); }