MIDI/midi-android
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

版本确定后修改首充不发送礼物

Browse Source
This commit is contained in:
梁小江
2025-10-17 14:15:26 +08:00
parent 7cccd650bc
commit acffaf04e4
14 changed files with 32 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gradle.properties
View File

@@ -28,8 +28,8 @@ isBuildModule=false
#org.gradle.deamon=false #org.gradle.deamon=false
android.injected.testOnly=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.jvm.toolchain.useLegacyAdapters=false
#org.gradle.java.home=C\:\\Users\\qx\\.jdks\\ms-17.0.15 #org.gradle.java.home=C\:\\Users\\qx\\.jdks\\ms-17.0.15

4
moduleUtil/src/main/java/com/xscm/moduleutil/base/CommonAppContext.java
View File

@@ -528,8 +528,8 @@ public class CommonAppContext extends MultiDexApplication implements Applicatio
public void upMqtt(){ public void upMqtt(){
if (mqttConnect==null){ 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(); mqttConnect.mqttClient();
} }
} }

2
moduleUtil/src/main/java/com/xscm/moduleutil/dialog/FirstChargeDialog.java
View File

@@ -191,7 +191,7 @@ public class FirstChargeDialog extends BaseDialog<DialogFirstChargeBinding> {
// mBinding.tvTitle2.setText(firstChargeGiftBean.getGift_bag().get(0).getTitle2()); // mBinding.tvTitle2.setText(firstChargeGiftBean.getGift_bag().get(0).getTitle2());
// mBinding.btn0.setText(firstChargeGiftBean.getGift_bag().get(0).getName()); // mBinding.btn0.setText(firstChargeGiftBean.getGift_bag().get(0).getName());
list.addAll(firstChargeGiftBean.getGift_bag().get(0).getGift_list()); 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.bannerViewPager.create(baseListData(list, 4));
// mBinding.btn1.setText(firstChargeGiftBean.getGift_bag().get(1).getName()); // mBinding.btn1.setText(firstChargeGiftBean.getGift_bag().get(1).getName());

2
moduleUtil/src/main/java/com/xscm/moduleutil/dialog/RechargeDialogFragment.java
View File

@@ -111,7 +111,7 @@ public class RechargeDialogFragment extends BaseMvpDialogFragment<RechargeDialog
ToastUtils.showShort("请选择支付方式"); ToastUtils.showShort("请选择支付方式");
return; 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 @Override

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

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

2
moduleUtil/src/main/res/layout/room_gv_gift_item.xml
View File

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

2
moduleroom/src/main/java/com/example/moduleroom/activity/RedResultActivity.java
View File

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

3
moduleroom/src/main/java/com/example/moduleroom/activity/RoomActivity.kt
View File

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

5
moduleroom/src/main/java/com/example/moduleroom/contacts/RoomContacts.java
View File

@@ -4,6 +4,7 @@ import android.app.Activity;
import com.xscm.moduleutil.activity.IPresenter; import com.xscm.moduleutil.activity.IPresenter;
import com.xscm.moduleutil.activity.IView; import com.xscm.moduleutil.activity.IView;
import com.xscm.moduleutil.bean.RedPacketInfo;
import com.xscm.moduleutil.bean.RoomCharmRankBean; import com.xscm.moduleutil.bean.RoomCharmRankBean;
import com.xscm.moduleutil.bean.UserOnlineStatusBean; import com.xscm.moduleutil.bean.UserOnlineStatusBean;
import com.xscm.moduleutil.bean.room.RoomInfoResp; import com.xscm.moduleutil.bean.room.RoomInfoResp;
@@ -50,7 +51,7 @@ public class RoomContacts {
void findRoom(); void findRoom();
void roomEit(); void roomRedPackets(List<RedPacketInfo> list);
} }
public interface IRoomPre extends IPresenter { public interface IRoomPre extends IPresenter {
@@ -90,5 +91,7 @@ public class RoomContacts {
void auctionEnd(String auctionId,String roomId); void auctionEnd(String auctionId,String roomId);
void auctionDelay(String auctionId); void auctionDelay(String auctionId);
void roomRedPackets(String roomId);
} }
} }

4
moduleroom/src/main/java/com/example/moduleroom/dialog/RoomOnlineDialogFragment.java
View File

@@ -19,6 +19,7 @@ import com.example.moduleroom.contacts.RoomContacts;
import com.example.moduleroom.databinding.FragmentRoomOnlineDialogBinding; import com.example.moduleroom.databinding.FragmentRoomOnlineDialogBinding;
import com.example.moduleroom.presenter.RoomPresenter; import com.example.moduleroom.presenter.RoomPresenter;
import com.xscm.moduleutil.base.BaseMvpDialogFragment; import com.xscm.moduleutil.base.BaseMvpDialogFragment;
import com.xscm.moduleutil.bean.RedPacketInfo;
import com.xscm.moduleutil.bean.RoomCharmRankBean; import com.xscm.moduleutil.bean.RoomCharmRankBean;
import com.xscm.moduleutil.bean.UserOnlineStatusBean; import com.xscm.moduleutil.bean.UserOnlineStatusBean;
import com.xscm.moduleutil.bean.room.RoomInfoResp; import com.xscm.moduleutil.bean.room.RoomInfoResp;
@@ -465,7 +466,8 @@ public class RoomOnlineDialogFragment extends BaseMvpDialogFragment<RoomPresente
} }
@Override @Override
public void roomEit() { public void roomRedPackets(List<RedPacketInfo> list) {
} }
} }

6
moduleroom/src/main/java/com/example/moduleroom/fragment/RedEnvelopesFragment.java
View File

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

3
moduleroom/src/main/java/com/example/moduleroom/fragment/RoomFragment.java
View File

@@ -28,6 +28,7 @@ import com.example.moduleroom.presenter.RoomPresenter;
import com.hjq.toast.ToastUtils; import com.hjq.toast.ToastUtils;
import com.xscm.moduleutil.base.BaseMvpFragment; import com.xscm.moduleutil.base.BaseMvpFragment;
import com.xscm.moduleutil.base.CommonAppContext; import com.xscm.moduleutil.base.CommonAppContext;
import com.xscm.moduleutil.bean.RedPacketInfo;
import com.xscm.moduleutil.bean.RoomCharmRankBean; import com.xscm.moduleutil.bean.RoomCharmRankBean;
import com.xscm.moduleutil.bean.RoomMessageEvent; import com.xscm.moduleutil.bean.RoomMessageEvent;
import com.xscm.moduleutil.bean.UserOnlineStatusBean; import com.xscm.moduleutil.bean.UserOnlineStatusBean;
@@ -1204,7 +1205,7 @@ public class RoomFragment extends BaseMvpFragment<RoomPresenter, FragmentRoomBin
} }
@Override @Override
public void roomEit() { public void roomRedPackets(List<RedPacketInfo> list) {
} }

9
moduleroom/src/main/java/com/example/moduleroom/fragment/RoomKtvFragment.java
View File

@@ -28,11 +28,7 @@ import com.example.moduleroom.dialog.RoomOnlineDialogFragment;
import com.example.moduleroom.dialog.RoomUserInfoFragment; import com.example.moduleroom.dialog.RoomUserInfoFragment;
import com.example.moduleroom.presenter.RoomPresenter; import com.example.moduleroom.presenter.RoomPresenter;
import com.xscm.moduleutil.base.BaseMvpFragment; import com.xscm.moduleutil.base.BaseMvpFragment;
import com.xscm.moduleutil.bean.MusicSongBean; import com.xscm.moduleutil.bean.*;
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.room.RoomInfoResp; import com.xscm.moduleutil.bean.room.RoomInfoResp;
import com.xscm.moduleutil.bean.room.RoomOnline; import com.xscm.moduleutil.bean.room.RoomOnline;
import com.xscm.moduleutil.bean.room.RoomPitBean; import com.xscm.moduleutil.bean.room.RoomPitBean;
@@ -1436,7 +1432,8 @@ public class RoomKtvFragment extends BaseMvpFragment<RoomPresenter, FragmentRoom
} }
@Override @Override
public void roomEit() { public void roomRedPackets(List<RedPacketInfo> list) {
} }
} }

11
moduleroom/src/main/java/com/example/moduleroom/presenter/RoomPresenter.java
View File

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