diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/adapter/GiftRoomAdapter.java b/BaseModule/src/main/java/com/xscm/moduleutil/adapter/GiftRoomAdapter.java index 52e1e5a5..be5435b9 100644 --- a/BaseModule/src/main/java/com/xscm/moduleutil/adapter/GiftRoomAdapter.java +++ b/BaseModule/src/main/java/com/xscm/moduleutil/adapter/GiftRoomAdapter.java @@ -7,6 +7,7 @@ import android.annotation.SuppressLint; import android.content.Context; import android.text.Spannable; import android.text.SpannableStringBuilder; +import android.text.TextUtils; import android.text.style.ForegroundColorSpan; import android.view.GestureDetector; import android.view.LayoutInflater; @@ -152,20 +153,25 @@ public class GiftRoomAdapter extends BaseAdapter { } else { viewHolder.iv_gift_select.setVisibility(VISIBLE); } - - if (giftModel.getIs_cp() == 0 && giftModel.getIs_teacher() == 0 ) {//这是cp礼物 + if (TextUtils.isEmpty(giftModel.getIcon())) { viewHolder.im_heart.setVisibility(GONE); - } else { - if (viewHolder.im_heart != null) { - viewHolder.im_heart.setVisibility(VISIBLE); - if (giftModel.getIs_cp() == 1) { - viewHolder.im_heart.setImageResource(R.mipmap.icon_heart); - }else if (giftModel.getIs_teacher() == 1) { - viewHolder.im_heart.setImageResource(R.mipmap.icon_teacher); - } - } + }else { + ImageUtils.loadHead(giftModel.getIcon(), viewHolder.im_heart); } +// if (giftModel.getIs_cp() == 0 && giftModel.getIs_teacher() == 0 ) {//这是cp礼物 +// viewHolder.im_heart.setVisibility(GONE); +// } else { +// if (viewHolder.im_heart != null) { +// viewHolder.im_heart.setVisibility(VISIBLE); +// if (giftModel.getIs_cp() == 1) { +// viewHolder.im_heart.setImageResource(R.mipmap.icon_heart); +// }else if (giftModel.getIs_teacher() == 1) { +// viewHolder.im_heart.setImageResource(R.mipmap.icon_teacher); +// } +// } +// } + /* * 在给View绑定显示的数据时，计算正确的position = position + curIndex * pageSize， diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/bean/GiftBoxBean.java b/BaseModule/src/main/java/com/xscm/moduleutil/bean/GiftBoxBean.java index acece401..03fc20e6 100644 --- a/BaseModule/src/main/java/com/xscm/moduleutil/bean/GiftBoxBean.java +++ b/BaseModule/src/main/java/com/xscm/moduleutil/bean/GiftBoxBean.java @@ -62,6 +62,7 @@ public class GiftBoxBean { private int task_type_id; private String task_type_name; private int is_lock;//锁:0 不开启锁 1 开启锁 + private int wait_reward_num;//待领取奖励数量 @Data public static class DailyTasksBean { diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/bean/MyRoomBean.java b/BaseModule/src/main/java/com/xscm/moduleutil/bean/MyRoomBean.java index d9c5c1ca..b49505a9 100644 --- a/BaseModule/src/main/java/com/xscm/moduleutil/bean/MyRoomBean.java +++ b/BaseModule/src/main/java/com/xscm/moduleutil/bean/MyRoomBean.java @@ -54,6 +54,7 @@ public class MyRoomBean { private String come_count; //房间进入数 private Double today_income; //今日收益; private int earnings_ratio;//房间收益比例 + private String lucky_water="";//房间幸运流水 @Data static class CpRoom { diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/bean/RoomMessageEvent.java b/BaseModule/src/main/java/com/xscm/moduleutil/bean/RoomMessageEvent.java index c7a31fec..cd95924b 100644 --- a/BaseModule/src/main/java/com/xscm/moduleutil/bean/RoomMessageEvent.java +++ b/BaseModule/src/main/java/com/xscm/moduleutil/bean/RoomMessageEvent.java @@ -47,7 +47,7 @@ public class RoomMessageEvent extends BaseEvent { private List auction_list; //拍卖列表 private long duration;//时间 private RoomAuction.AuctionListBean recipient;//是否成功，有值的是成功的，没有值的时候，是失败的 - private int type;//拍卖者，1：上麦、2：下麦 + private int type;//拍卖者，1：上麦、2：下麦 暴币的时候，1是大奖 2：是小奖 private String hot_value; private String SendRoomId;//发起者所在的房间ID private String AcceptRoomId;//接收者所在的房间id @@ -114,6 +114,8 @@ public class RoomMessageEvent extends BaseEvent { private String status = ""; private String from_id = ""; + private String play_image;//暴币播放动画地址 + } @Data diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/bean/RoonGiftModel.java b/BaseModule/src/main/java/com/xscm/moduleutil/bean/RoonGiftModel.java index 641e19da..91cb2d94 100644 --- a/BaseModule/src/main/java/com/xscm/moduleutil/bean/RoonGiftModel.java +++ b/BaseModule/src/main/java/com/xscm/moduleutil/bean/RoonGiftModel.java @@ -34,6 +34,7 @@ public class RoonGiftModel { private int activities_id;//4：盲盒 ；5：天空之境； private int gift_bag;//10：天空之境 11：岁月之城 12：时空之巅 private int is_lock;//爵位礼物 0：不锁 1：锁 + private String icon="";//礼物标签图片 private int is_cp;//1:是 0：不是 是不是cp心动礼物 private int is_teacher;//1:是 0：不是 是不是师徒礼物 diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/bean/room/EMMessageInfo.java b/BaseModule/src/main/java/com/xscm/moduleutil/bean/room/EMMessageInfo.java index 02b467e8..e1e73737 100644 --- a/BaseModule/src/main/java/com/xscm/moduleutil/bean/room/EMMessageInfo.java +++ b/BaseModule/src/main/java/com/xscm/moduleutil/bean/room/EMMessageInfo.java @@ -158,6 +158,8 @@ public class EMMessageInfo implements MultiItemEntity { /// 被签约者提示弹窗 public static final int QXRoomMessageTypeSignTipText = 1094; + /// 暴币展示动画列表 + public static final int QXRoomMessageTypeSignChat = 1100; private RoomMessageEvent emMessage; private int custom = 0; @@ -212,6 +214,7 @@ public class EMMessageInfo implements MultiItemEntity { case QXRoomMessageTypeRoomFriendPartDidChanged: case QXRoomMessageTypeSeatDidChanged: case QXRoomMessageTypehm: + case QXRoomMessageTypeSignChat: return 1; case QXRoomMessageTypeRoomOMh: case QXRoomMessageTypeGift: diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/bean/room/RoomSettingBean.java b/BaseModule/src/main/java/com/xscm/moduleutil/bean/room/RoomSettingBean.java index b61da368..ef010848 100644 --- a/BaseModule/src/main/java/com/xscm/moduleutil/bean/room/RoomSettingBean.java +++ b/BaseModule/src/main/java/com/xscm/moduleutil/bean/room/RoomSettingBean.java @@ -2,6 +2,8 @@ package com.xscm.moduleutil.bean.room; import com.chad.library.adapter.base.entity.MultiItemEntity; +import java.util.List; + import lombok.Data; @Data @@ -57,6 +59,10 @@ public class RoomSettingBean implements MultiItemEntity { public static final int QXRoomSettingTypeRoomFloatingScreen = 29;//关闭飘屏 public static final int QXRoomSettingTypeRoomFloatingRed = 30;//红包 + public static final int QXRoomSettingTypeRoomTheCityYears = 33;//岁月之城 + public static final int QXRoomSettingTypeRoomTimeSpace = 34;//时空之巅 + public static final int QXRoomSettingTypeRoomTimeRedSound = 35;//红包声音 + public static final int ITEM_TYPE_DEFAULT = 0; public static final int ITEM_TYPE_WITH_ICON = 1; @@ -70,7 +76,7 @@ public class RoomSettingBean implements MultiItemEntity { private boolean isSelected;//是否在麦位上 private boolean status; private boolean select;//是否选中 - + private List children; // 新增子项列表 public RoomSettingBean(String name, String icon, String selectName, String selectIcon, int type, int read, boolean isSelected, boolean status, boolean select) { this.name = name; @@ -96,6 +102,7 @@ public class RoomSettingBean implements MultiItemEntity { this.itemType = ITEM_TYPE_WITH_ICON; } } + // public void updateItemType() { // switch (type) { // case QXRoomSettingTypeRoomSubsidy: diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/dialog/giftLottery/GiftLotteryAdapter.java b/BaseModule/src/main/java/com/xscm/moduleutil/dialog/giftLottery/GiftLotteryAdapter.java index fb0db0b3..92b8c47c 100644 --- a/BaseModule/src/main/java/com/xscm/moduleutil/dialog/giftLottery/GiftLotteryAdapter.java +++ b/BaseModule/src/main/java/com/xscm/moduleutil/dialog/giftLottery/GiftLotteryAdapter.java @@ -45,13 +45,13 @@ public class GiftLotteryAdapter extends BaseQuickAdapter> agreeSong(@Field("room_id") String roomId, @Field("type") String type); + @GET(Constants.GET_BLIND_BOX_STATUS) + Call>> blindBoxStatus(); + @FormUrlEncoded @POST(Constants.POST_END_SONG) Call> endSong(@Field("room_id") String roomId); diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java b/BaseModule/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java index 5422c35c..3aaa676f 100644 --- a/BaseModule/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java +++ b/BaseModule/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java @@ -209,6 +209,9 @@ public class RetrofitClient { private void handleNetworkUnavailable(BaseObserver observer) { ToastUtils.showShort("网络不可用，请检查网络设置"); observer.onError(new Throwable("网络不可用，请检查网络设置")); + if (joinRoomLoadListener != null) { + joinRoomLoadListener.onJoinRoomLoad("网络部可用"); + } } public T createApiClient(Class apiClientClass) { @@ -241,8 +244,8 @@ public class RetrofitClient { }); } - public void mobileView(String mobile, String new_mobile, String sms_code,String new_sms_code, BaseObserver observer) { - sApiServer.mobileView(mobile, new_mobile, sms_code,new_sms_code).enqueue(new Callback>() { + public void mobileView(String mobile, String new_mobile, String sms_code, String new_sms_code, BaseObserver observer) { + sApiServer.mobileView(mobile, new_mobile, sms_code, new_sms_code).enqueue(new Callback>() { @Override public void onResponse(Call> call, Response> response) { if (response.code() == 200) { @@ -2080,9 +2083,9 @@ public class RetrofitClient { BaseModel listBaseModel = response.body(); if (listBaseModel.getCode() == 1) { observer.onNext(listBaseModel.getData()); - }else if (listBaseModel.getCode() == 0){ + } else if (listBaseModel.getCode() == 0) { ToastUtils.showShort(listBaseModel.getMsg()); - if (ActivityUtils.getTopActivity().getComponentName().getClassName().contains("UserHomepageActivity")){ + if (ActivityUtils.getTopActivity().getComponentName().getClassName().contains("UserHomepageActivity")) { ActivityUtils.getTopActivity().finish(); } } @@ -2312,6 +2315,9 @@ public class RetrofitClient { MessageListenerSingleton.getInstance().quitGroup(roomId); CommonAppContext.getInstance().isRoomJoininj = false; observer.onError(t); + if (joinRoomLoadListener != null) { + joinRoomLoadListener.onJoinRoomLoad("网络异常"); + } } }); } @@ -3623,6 +3629,35 @@ public class RetrofitClient { }); } + public void blindBoxStatus(BaseObserver> observer) { + sApiServer.blindBoxStatus().enqueue(new Callback>>() { + + @Override + public void onResponse(Call>> call, Response>> response) { + if (response.code() == 200) { + BaseModel> baseModel = response.body(); + if (baseModel.getCode() == 1) { + observer.onNext(baseModel.getData()); + } else if (baseModel.getCode() == 301) { + try { + ToastUtils.showShort(baseModel.getMsg()); + CommonAppContext.getInstance().clearLoginInfo(); + } catch (ClassNotFoundException e) { + throw new RuntimeException(e); + } + } else { + ToastUtils.showShort(baseModel.getMsg()); + } + } + } + + @Override + public void onFailure(Call>> call, Throwable t) { + LogUtils.e("盲盒转盘", t.fillInStackTrace()); + } + }); + } + public void endSong(String room_id, BaseObserver observer) { sApiServer.endSong(room_id).enqueue(new Callback>() { @Override @@ -3717,8 +3752,8 @@ public class RetrofitClient { }); } - public void changeSong(String room_id, String now_did,String isAutoNext, BaseObserver observer) { - sApiServer.changeSong(room_id, now_did,isAutoNext).enqueue(new Callback>() { + public void changeSong(String room_id, String now_did, String isAutoNext, BaseObserver observer) { + sApiServer.changeSong(room_id, now_did, isAutoNext).enqueue(new Callback>() { @Override public void onResponse(Call> call, Response> response) { onNextRetu(response, observer); diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/utils/SPConstants.java b/BaseModule/src/main/java/com/xscm/moduleutil/utils/SPConstants.java index 4c92a822..5091f987 100644 --- a/BaseModule/src/main/java/com/xscm/moduleutil/utils/SPConstants.java +++ b/BaseModule/src/main/java/com/xscm/moduleutil/utils/SPConstants.java @@ -18,6 +18,7 @@ public class SPConstants { public static final String VOLUME = "VOLUME"; //音量 public static final String CURRENT_MUSIC = "CURRENT_MUSIC"; //当前播放音乐 public static final String OPEN_EFFECT = "OPEN_EFFECT"; //开启特效 + public static final String RED_SOUND = "RED_SOUND"; //开启红包声音 public static final String OPEN_AU_BACK = "OPEN_AU_BACK"; //开启耳返 public static final String ORDER_NEWS_COUNT = "orderNewsCount"; public static final String ORDER_LAST_MSG = "lastOrderMsg"; diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/utils/SpUtil.java b/BaseModule/src/main/java/com/xscm/moduleutil/utils/SpUtil.java index e0f50975..c616cc7e 100644 --- a/BaseModule/src/main/java/com/xscm/moduleutil/utils/SpUtil.java +++ b/BaseModule/src/main/java/com/xscm/moduleutil/utils/SpUtil.java @@ -370,6 +370,14 @@ public class SpUtil { SPUtils.getInstance(SPConstants.PREFERENCE_NAME).put(SPConstants.OPEN_EFFECT, i); } + public static void setRedSound(int i){ + SPUtils.getInstance(SPConstants.PREFERENCE_NAME).put(SPConstants.RED_SOUND, i); + } + + public static int getRedSound(){ + return SPUtils.getInstance(SPConstants.PREFERENCE_NAME).getInt(SPConstants.RED_SOUND, 1); + } + //获取开启特效 public static int getOpenEffect() { return SPUtils.getInstance(SPConstants.PREFERENCE_NAME).getInt(SPConstants.OPEN_EFFECT, 1); diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/widget/Constants.java b/BaseModule/src/main/java/com/xscm/moduleutil/widget/Constants.java index bd309247..35f6b6ce 100644 --- a/BaseModule/src/main/java/com/xscm/moduleutil/widget/Constants.java +++ b/BaseModule/src/main/java/com/xscm/moduleutil/widget/Constants.java @@ -300,6 +300,7 @@ public class Constants { public static final String HELP_APPLY = "/api/RoomPit/help_apply_pit";//上麦助力 public static final String POST_APPLY_SONG = "/api/RoomSong/apply_song";//申请点歌 public static final String POST_AGREE_SONG = "/api/RoomSong/agree_song";//同意、拒绝点歌 + public static final String GET_BLIND_BOX_STATUS = "/api/BlindBoxTurntable/blind_box_status";//盲盒转盘状态 public static final String POST_SONG_LIST = "/api/RoomSong/song_list";//获取已点歌曲 public static final String POST_SONG = "/api/RoomSong/song";//点歌 public static final String POST_UP_SONG = "/api/RoomSong/up_song";//移动歌曲 diff --git a/BaseModule/src/main/res/layout/dialog_gift_lottery_fragment.xml b/BaseModule/src/main/res/layout/dialog_gift_lottery_fragment.xml index 552697f0..abb97316 100644 --- a/BaseModule/src/main/res/layout/dialog_gift_lottery_fragment.xml +++ b/BaseModule/src/main/res/layout/dialog_gift_lottery_fragment.xml @@ -67,7 +67,8 @@ app:layout_constraintStart_toEndOf="@+id/textView1" app:layout_constraintTop_toTopOf="@+id/textView1" app:layout_constraintWidth_default="percent" - app:layout_constraintWidth_percent="0.2" /> + app:layout_constraintWidth_percent="0.2" + android:visibility="gone" /> + android:textSize="@dimen/sp_14" + android:visibility="gone"/> #A9A9A9 #EDF2F8 #E24171 + #FFEA00 #E2E2E2 #FFB8CD #F0EDF2F8 diff --git a/MainModule/src/main/java/com/xscm/modulemain/BaseMvpActivity.java b/MainModule/src/main/java/com/xscm/modulemain/BaseMvpActivity.java index fabcfb66..98189ca1 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/BaseMvpActivity.java +++ b/MainModule/src/main/java/com/xscm/modulemain/BaseMvpActivity.java @@ -1,5 +1,7 @@ package com.xscm.modulemain; +import static android.view.View.GONE; +import static android.view.View.VISIBLE; import static com.xscm.moduleutil.base.CommonAppContext.postDelayed; import android.animation.Animator; @@ -14,6 +16,7 @@ import android.media.MediaPlayer; import android.os.Bundle; import android.text.Spannable; import android.text.SpannableStringBuilder; +import android.text.TextUtils; import android.text.style.ForegroundColorSpan; import android.util.DisplayMetrics; import android.view.Gravity; @@ -528,8 +531,8 @@ public abstract class BaseMvpActivity

{ // 清理当前视图 if (currentRedView != null && currentRedView.getParent() != null) { @@ -1061,12 +1066,18 @@ public abstract class BaseMvpActivity

(), roomFragment?.handleRoomMessage(messageEvent) } else if (msgType == EMMessageInfo.QXRoomMessageTypeSignTipText) { roomFragment?.handleRoomMessage(messageEvent) + }else if (msgType == EMMessageInfo.QXRoomMessageTypeSignChat) {//暴币展示 + QXGiftPlayerManager.getInstance(this).displayFullEffectView(messageEvent.text.play_image) } } diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/room/contacts/RoomSettingContacts.java b/MainModule/src/main/java/com/xscm/modulemain/activity/room/contacts/RoomSettingContacts.java index 775ec77f..d5b76be4 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/activity/room/contacts/RoomSettingContacts.java +++ b/MainModule/src/main/java/com/xscm/modulemain/activity/room/contacts/RoomSettingContacts.java @@ -4,8 +4,11 @@ import android.app.Activity; import com.xscm.moduleutil.activity.IPresenter; import com.xscm.moduleutil.activity.IView; +import com.xscm.moduleutil.bean.BlindBoxStatus; import com.xscm.moduleutil.bean.room.RoomSettingBean; +import java.util.List; + public class RoomSettingContacts { public interface View extends IView { void changeRoomSuccess(String s,int position,RoomSettingBean bean); @@ -13,6 +16,8 @@ public class RoomSettingContacts { void changeRoomType(String s); void agreeSong(String s); + + void blindBoxStatus(List blindBoxStatus); } public interface IRoomPre extends IPresenter { @@ -22,5 +27,7 @@ public class RoomSettingContacts { void changeRoomType(String roomId,String type);//修改房间类型 type：1点唱、2拍卖、3男神、4女神 void agreeSong(String roomId, String type); + + void blindBoxStatus(); } } diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/ChatRoomFragment.java b/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/ChatRoomFragment.java index a73323e6..c2261373 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/ChatRoomFragment.java +++ b/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/ChatRoomFragment.java @@ -599,18 +599,16 @@ public class ChatRoomFragment extends BaseMvpFragment 0) { - mBinding.recycleViewPublic.smoothScrollToPosition(itemCount - 1); + mBinding.recycleViewPublic.smoothScrollToPosition(itemCount - 1); } } else { count++; diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/room/presenter/RoomSettingPresenter.java b/MainModule/src/main/java/com/xscm/modulemain/activity/room/presenter/RoomSettingPresenter.java index 8ed3cb53..1fe1b3d9 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/activity/room/presenter/RoomSettingPresenter.java +++ b/MainModule/src/main/java/com/xscm/modulemain/activity/room/presenter/RoomSettingPresenter.java @@ -3,12 +3,14 @@ package com.xscm.modulemain.activity.room.presenter; import android.content.Context; import com.xscm.modulemain.activity.room.contacts.RoomSettingContacts; +import com.xscm.moduleutil.bean.BlindBoxStatus; import com.xscm.moduleutil.bean.room.RoomSettingBean; import com.xscm.moduleutil.http.BaseObserver; import com.xscm.moduleutil.http.RetrofitClient; import com.xscm.moduleutil.presenter.BasePresenter; import java.lang.ref.WeakReference; +import java.util.List; import io.reactivex.disposables.Disposable; @@ -92,4 +94,23 @@ public class RoomSettingPresenter extends BasePresenter>() { + + @Override + public void onSubscribe(Disposable d) { + addDisposable(d); + } + + @Override + public void onNext(List blindBoxStatus) { + if (MvpRef==null){ + MvpRef = new WeakReference<>(mView); + } + MvpRef.get().blindBoxStatus(blindBoxStatus); + } + }); + } + } diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/DailyTasksActivity.java b/MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/DailyTasksActivity.java index 985564bf..d9761a7a 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/DailyTasksActivity.java +++ b/MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/DailyTasksActivity.java @@ -99,6 +99,7 @@ public class DailyTasksActivity extends BaseMvpActivity0){ + tabCount.setVisibility(View.VISIBLE); + }else { + tabCount.setVisibility(View.GONE); + } if (taskItem.getIs_lock() == 1) { if (i == 0) { iconView.setImageResource(R.mipmap.icon_task_select_lock); diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/user/fragment/VocalRangeFragment.java b/MainModule/src/main/java/com/xscm/modulemain/activity/user/fragment/VocalRangeFragment.java index 2383ab23..f3f32481 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/activity/user/fragment/VocalRangeFragment.java +++ b/MainModule/src/main/java/com/xscm/modulemain/activity/user/fragment/VocalRangeFragment.java @@ -83,6 +83,10 @@ public class VocalRangeFragment extends BaseMvpFragment implements MeConacts.IMePre { MeConacts.View mView; + public MePresenter(MeConacts.View view, Context context) { super(view, context); mView = view; @@ -33,6 +34,9 @@ public class MePresenter extends BasePresenter implements MeCona @Override public void onNext(UserInfo userInfo) { + if (MvpRef == null) { + MvpRef = new WeakReference<>(mView); + } MvpRef.get().myInfoSuccess(userInfo); } }); @@ -182,6 +186,9 @@ public class MePresenter extends BasePresenter implements MeCona @Override public void onNext(WalletBean walletBean) { + if (MvpRef == null) { + MvpRef = new WeakReference<>(mView); + } MvpRef.get().wallet(walletBean); } }); @@ -189,7 +196,7 @@ public class MePresenter extends BasePresenter implements MeCona @Override public void getTasksMessage() { - api.getTasksMessage(new BaseObserver () { + api.getTasksMessage(new BaseObserver() { @Override public void onSubscribe(Disposable d) { @@ -198,8 +205,8 @@ public class MePresenter extends BasePresenter implements MeCona @Override public void onNext(TasksMessage s) { - if (MvpRef==null){ - MvpRef=new WeakReference<>(mView); + if (MvpRef == null) { + MvpRef = new WeakReference<>(mView); } MvpRef.get().getTasksMessage(s); } @@ -210,7 +217,7 @@ public class MePresenter extends BasePresenter implements MeCona // Type listType = new TypeToken>() {}.getType(); // List restoredRoomModels = GsonUtils.getGSON().fromJson(SpUtils.getHomeBanner(), listType); // MvpRef.get().setBanners(restoredRoomModels); - api.getBanners(s,new BaseObserver>() { + api.getBanners(s, new BaseObserver>() { @Override public void onSubscribe(Disposable d) { addDisposable(d); @@ -218,8 +225,8 @@ public class MePresenter extends BasePresenter implements MeCona @Override public void onNext(List bannerModels) { - if (MvpRef==null){ - MvpRef=new WeakReference<>(mView); + if (MvpRef == null) { + MvpRef = new WeakReference<>(mView); } MvpRef.get().setBanners(bannerModels); } diff --git a/MainModule/src/main/java/com/xscm/modulemain/adapter/HorizontalListAdapter.java b/MainModule/src/main/java/com/xscm/modulemain/adapter/HorizontalListAdapter.java new file mode 100644 index 00000000..44270a73 --- /dev/null +++ b/MainModule/src/main/java/com/xscm/modulemain/adapter/HorizontalListAdapter.java @@ -0,0 +1,147 @@ +package com.xscm.modulemain.adapter; + +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.ImageView; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import com.xscm.modulemain.R; +import com.xscm.moduleutil.bean.room.RoomSettingBean; + +import java.util.List; + +public class HorizontalListAdapter extends RecyclerView.Adapter { + private List mData; + private OnItemClickListener mListener; + + public interface OnItemClickListener { + void onItemClick(RoomSettingBean item); + } + + public HorizontalListAdapter(List data) { + mData = data; + } + + public void setOnItemClickListener(OnItemClickListener listener) { + mListener = listener; + } + + @NonNull + @Override + public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = LayoutInflater.from(parent.getContext()) + .inflate(R.layout.item_setting, parent, false); + return new ViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull ViewHolder holder, int position) { + RoomSettingBean item = mData.get(position); + if (item.isStatus()) { + holder.tvName.setText(getName(item.getType(), item.isSelect(), item.getName())); + holder.ivIcon.setImageResource(getIconResId(item.getType(), item.isSelect())); + } + holder.itemView.setOnClickListener(v -> { + if (mListener != null) { + mListener.onItemClick(item); + } + }); + } + + private String getName(int type, boolean isSelected, String name) { + boolean b = isSelected; + switch (type) { + case RoomSettingBean.QXRoomSettingTypeRoomOrderMic: + return b ? "排麦模式" : "自由模式"; + case RoomSettingBean.QXRoomSettingTypeRoomCloseEffects: + return b ? "关闭特效" : "开启特效"; + case RoomSettingBean.QXRoomSettingTypeRoomFloatingScreen: + return b ? "关闭飘屏" : "开启飘屏"; + case RoomSettingBean.QXRoomSettingTypeRoomTimeRedSound: + return b ? "关闭红包声音" : "开启红包声音"; + default: + return name; + } + } + + @Override + public int getItemCount() { + return mData.size(); + } + + static class ViewHolder extends RecyclerView.ViewHolder { + ImageView ivIcon; + TextView tvName; + + ViewHolder(View view) { + super(view); + ivIcon = view.findViewById(R.id.iv_icon); + tvName = view.findViewById(R.id.tv_name); + } + } + + // 根据 type 获取对应的图标资源 ID + private int getIconResId(int type, boolean isSelected) { + boolean b = isSelected; + switch (type) { + case RoomSettingBean.QXRoomSettingTypeRoomTypeSing: + return com.xscm.moduleutil.R.mipmap.ic_jiaoy; + case RoomSettingBean.QXRoomSettingTypeRoomTypeAuction: + return com.xscm.moduleutil.R.mipmap.ic_auction; + case RoomSettingBean.QXRoomSettingTypeRoomTypeBoy: + return com.xscm.moduleutil.R.mipmap.ic_boy; + case RoomSettingBean.QXRoomSettingTypeRoomTypeGirl: + return com.xscm.moduleutil.R.mipmap.ic_girl; + case RoomSettingBean.QXRoomSettingTypeRoomTypeJiaoy: + return com.xscm.moduleutil.R.mipmap.ic_sing; + case RoomSettingBean.QXRoomSettingTypeRoomTypeHUYU: + return com.xscm.moduleutil.R.mipmap.huyu; + case RoomSettingBean.QXRoomSettingTypeRoomTypeLianG: + return com.xscm.moduleutil.R.mipmap.icon_liang; + case RoomSettingBean.QXRoomSettingTypeRoomTypeSIGNCONTRACT: + return com.xscm.moduleutil.R.mipmap.icon_sign_contract; + // 常用工具 + case RoomSettingBean.QXRoomSettingTypeRoomSubsidy: + return com.xscm.moduleutil.R.mipmap.ic_subsidy; + case RoomSettingBean.QXRoomSettingTypeRoomCompere: + return com.xscm.moduleutil.R.mipmap.ic_compere; + case RoomSettingBean.QXRoomSettingTypeRoomClearMessage: + return com.xscm.moduleutil.R.mipmap.ic_clear_message; + case RoomSettingBean.QXRoomSettingTypeRoomOrderMic: + return b ? com.xscm.moduleutil.R.mipmap.ic_order_mic : com.xscm.moduleutil.R.mipmap.ic_order_mic_selected; + case RoomSettingBean.QXRoomSettingTypeRoomBgMusic: + return com.xscm.moduleutil.R.mipmap.ic_bg_music; + case RoomSettingBean.QXRoomSettingTypeRoomBgImage: + return com.xscm.moduleutil.R.mipmap.ic_bg_image; + // 更多操作 + case RoomSettingBean.QXRoomSettingTypeRoomShare: + return com.xscm.moduleutil.R.mipmap.ic_share; + case RoomSettingBean.QXRoomSettingTypeRoomMyDress: + return com.xscm.moduleutil.R.mipmap.tiaoyint; + case RoomSettingBean.QXRoomSettingTypeRoomSetting: + return com.xscm.moduleutil.R.mipmap.ic_room_setting; + case RoomSettingBean.QXRoomSettingTypeRoomWelcome: + return com.xscm.moduleutil.R.mipmap.ic_welcome; + case RoomSettingBean.QXRoomSettingTypeRoomCloseEffects: + return b ? com.xscm.moduleutil.R.mipmap.ic_close_effects : com.xscm.moduleutil.R.mipmap.ic_open_effects; + case RoomSettingBean.QXRoomSettingTypeRoomReport: + return com.xscm.moduleutil.R.mipmap.ic_report; + case RoomSettingBean.QXRoomSettingTypeRoomFloatingScreen: + return b ? com.xscm.moduleutil.R.mipmap.ic_close_floating_screen : com.xscm.moduleutil.R.mipmap.ic_open_floating_screen; + case RoomSettingBean.QXRoomSettingTypeRoomFloatingRed: + return com.xscm.moduleutil.R.mipmap.red_tx; + case RoomSettingBean.QXRoomSettingTypeRoomTheCityYears: + return com.xscm.moduleutil.R.mipmap.the_city_years; + case RoomSettingBean.QXRoomSettingTypeRoomTimeSpace: + return com.xscm.moduleutil.R.mipmap.time_space; + case RoomSettingBean.QXRoomSettingTypeRoomTimeRedSound: + return b ? com.xscm.moduleutil.R.mipmap.room_voice_g : com.xscm.moduleutil.R.mipmap.y_won; + default: + return 0; + } + } +} diff --git a/MainModule/src/main/java/com/xscm/modulemain/adapter/MyCreateAdapter.java b/MainModule/src/main/java/com/xscm/modulemain/adapter/MyCreateAdapter.java index 8bdaa210..1f72f3c0 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/adapter/MyCreateAdapter.java +++ b/MainModule/src/main/java/com/xscm/modulemain/adapter/MyCreateAdapter.java @@ -253,7 +253,7 @@ public class MyCreateAdapter extends RecyclerView.Adapter { +public class RoomSettingAdapter extends BaseQuickAdapter { - public RoomSettingAdapter(List data) { - super(data); - addItemType(RoomSettingBean.ITEM_TYPE_DEFAULT, R.layout.item_title); - addItemType(RoomSettingBean.ITEM_TYPE_WITH_ICON, R.layout.item_setting); + private OnItemClickListener mListener; + + public interface OnItemClickListener { + void onItemClick(RoomSettingBean item,int position); } + public void setOnItemClickListener(OnItemClickListener listener) { + mListener = listener; + } + + public RoomSettingAdapter() { + super(R.layout.item_title); + } + +// public RoomSettingAdapter(List data) { +// super(data); +// addItemType(RoomSettingBean.ITEM_TYPE_DEFAULT, R.layout.item_title); +// addItemType(RoomSettingBean.ITEM_TYPE_WITH_ICON, R.layout.item_setting); +// } + @Override protected void convert(BaseViewHolder holder, RoomSettingBean item) { - if (item.getItemType() == RoomSettingBean.ITEM_TYPE_DEFAULT) { - holder.setVisible(R.id.tv_title, true); + + if (item.isStatus() && item.getChildren()!=null && !item.getChildren().isEmpty()) { + holder.setVisible(R.id.tv_title, item.isStatus()); holder.setText(R.id.tv_title, item.getName()); - } else { - holder.setText(R.id.tv_name, getName(item.getType(), item.isSelect(), item.getName())); - holder.setImageResource(R.id.iv_icon, getIconResId(item.getType(), item.isSelect())); + RecyclerView rvContent = holder.getView(R.id.rv_content); + rvContent.setLayoutManager(new LinearLayoutManager(mContext, LinearLayoutManager.HORIZONTAL, false)); + HorizontalListAdapter adapter = new HorizontalListAdapter(item.getChildren()); + rvContent.setAdapter(adapter); + adapter.setOnItemClickListener(new HorizontalListAdapter.OnItemClickListener() { + @Override + public void onItemClick(RoomSettingBean item) { + if (mListener != null) + mListener.onItemClick(item, holder.getAdapterPosition()); + } + }); } + + +// if (item.getItemType() == RoomSettingBean.ITEM_TYPE_DEFAULT) { +// holder.setVisible(R.id.tv_title, true); +// holder.setText(R.id.tv_title, item.getName()); +// } else { +// holder.setText(R.id.tv_name, getName(item.getType(), item.isSelect(), item.getName())); +// holder.setImageResource(R.id.iv_icon, getIconResId(item.getType(), item.isSelect())); +// } } private String getName(int type, boolean isSelected, String name) { @@ -59,7 +97,7 @@ public class RoomSettingAdapter extends BaseMultiItemQuickAdapter dataList; + // 创建父级列表 + List parentList = new ArrayList<>(); private RoomInfoResp roomInfoResp; private int read; private boolean isSelected; private boolean effectOn = false;//开启/关闭特效 + private boolean redSound = false;//开启/关闭红包声音 private boolean floatingScreen = false;//开启/关闭飘屏 + List filteredList = new ArrayList<>(); + + List blindList = new ArrayList<>();//盲盒列表 + @Override protected RoomSettingPresenter bindPresenter() { return new RoomSettingPresenter(this, getActivity()); @@ -82,7 +95,7 @@ public class RoomSettingFragment extends BaseMvpDialogFragment(); effectOn = SpUtil.getOpenEffect() == 1; floatingScreen = SpUtil.getFloatingScreen() == 1; + redSound = SpUtil.getRedSound() == 1; boolean b = roomInfoResp.getRoom_info().getRoom_up_pit_type().equals("1"); LogUtils.e("effectOn=" + effectOn); +// 房间类型组 + RoomSettingBean roomTypeParent = new RoomSettingBean("房间类型", null, null, null, -1, read, isSelected, false, false); + List roomTypeChildren = new ArrayList<>(); + roomTypeChildren.add(new RoomSettingBean("交友", "ic_sing", null, null, RoomSettingBean.QXRoomSettingTypeRoomTypeSing, read, isSelected, false, false)); + roomTypeChildren.add(new RoomSettingBean("拍卖", "ic_auction", null, null, RoomSettingBean.QXRoomSettingTypeRoomTypeAuction, read, isSelected, false, false)); + roomTypeChildren.add(new RoomSettingBean("点唱", "jiao_y", null, null, RoomSettingBean.QXRoomSettingTypeRoomTypeJiaoy, read, isSelected, false, false)); + roomTypeChildren.add(new RoomSettingBean("互娱", "ic_jiaoy", null, null, RoomSettingBean.QXRoomSettingTypeRoomTypeHUYU, read, isSelected, false, false)); + roomTypeChildren.add(new RoomSettingBean("练歌房", "ic_liang", null, null, RoomSettingBean.QXRoomSettingTypeRoomTypeLianG, read, isSelected, false, false)); + roomTypeChildren.add(new RoomSettingBean("签约", "sing_contract", null, null, RoomSettingBean.QXRoomSettingTypeRoomTypeSIGNCONTRACT, read, isSelected, false, false)); + roomTypeParent.setChildren(roomTypeChildren); + parentList.add(roomTypeParent); + + // 常用工具组 + RoomSettingBean toolsParent = new RoomSettingBean("常用工具", null, null, null, -1, read, isSelected, false, false); + List toolsChildren = new ArrayList<>(); + toolsChildren.add(new RoomSettingBean("房间补贴", "ic_subsidy", null, null, RoomSettingBean.QXRoomSettingTypeRoomSubsidy, read, isSelected, false, false)); + toolsChildren.add(new RoomSettingBean("主持设置", "ic_compere", null, null, RoomSettingBean.QXRoomSettingTypeRoomCompere, read, isSelected, false, false)); + toolsChildren.add(new RoomSettingBean("清空消息", "ic_clear_message", null, null, RoomSettingBean.QXRoomSettingTypeRoomClearMessage, read, isSelected, false, false)); + toolsChildren.add(new RoomSettingBean("排麦模式", "ic_order_mic", null, null, QXRoomSettingTypeRoomOrderMic, read, isSelected, false, roomInfoResp.getRoom_info().getRoom_up_pit_type().equals("1"))); + toolsChildren.add(new RoomSettingBean("背景音乐", "ic_bg_music", null, null, RoomSettingBean.QXRoomSettingTypeRoomBgMusic, read, isSelected, false, false)); + toolsChildren.add(new RoomSettingBean("背景图片", "ic_bg_image", null, null, RoomSettingBean.QXRoomSettingTypeRoomBgImage, read, isSelected, false, false)); + toolsParent.setChildren(toolsChildren); + parentList.add(toolsParent); + + // 更多操作组 + RoomSettingBean moreParent = new RoomSettingBean("更多操作", null, null, null, -1, read, isSelected, false, false); + List moreChildren = new ArrayList<>(); + moreChildren.add(new RoomSettingBean("发红包", "ic_red", null, null, RoomSettingBean.QXRoomSettingTypeRoomFloatingRed, read, isSelected, false, false)); + moreChildren.add(new RoomSettingBean("房间设置", "ic_room_setting", null, null, RoomSettingBean.QXRoomSettingTypeRoomSetting, read, isSelected, false, false)); + moreChildren.add(new RoomSettingBean("关闭特效", "ic_close_effects", null, null, RoomSettingBean.QXRoomSettingTypeRoomCloseEffects, read, isSelected, false, effectOn)); + moreChildren.add(new RoomSettingBean("关闭飘屏", "ic_close_floating_screen", null, null, RoomSettingBean.QXRoomSettingTypeRoomFloatingScreen, read, isSelected, false, floatingScreen)); + moreChildren.add(new RoomSettingBean("举报", "ic_report", null, null, RoomSettingBean.QXRoomSettingTypeRoomReport, read, isSelected, false, false)); + moreChildren.add(new RoomSettingBean("岁月之城", "the_city_years", null, null, RoomSettingBean.QXRoomSettingTypeRoomTheCityYears, read, isSelected, false, false)); + moreChildren.add(new RoomSettingBean("时空之巅", "time_space", null, null, QXRoomSettingTypeRoomTimeSpace, read, isSelected, false, false)); + moreChildren.add(new RoomSettingBean("关闭红包声音", "crossing", null, null, QXRoomSettingTypeRoomTimeRedSound, read, isSelected, false, redSound)); + moreParent.setChildren(moreChildren); + parentList.add(moreParent); + /* // 添加标题和对应的内容项 dataList.add(new RoomSettingBean("房间类型", null, null, null, -1, read, isSelected, false, false)); dataList.add(new RoomSettingBean("交友", "ic_sing", null, null, RoomSettingBean.QXRoomSettingTypeRoomTypeSing, read, isSelected, false, false)); @@ -164,9 +218,62 @@ public class RoomSettingFragment extends BaseMvpDialogFragment filteredList = new ArrayList<>(); -// 更新 itemType - for (RoomSettingBean bean : dataList) { + + dataList.add(new RoomSettingBean("岁月之城", "the_city_years", null, null, RoomSettingBean.QXRoomSettingTypeRoomTheCityYears, read, isSelected, false, false)); + dataList.add(new RoomSettingBean("时空之巅", "time_space", null, null, RoomSettingBean.QXRoomSettingTypeRoomTimeSpace, read, isSelected, false, false)); +*/ + + // 更新 itemType + for (RoomSettingBean bean : parentList) { + bean.setRead(read); + bean.setSelected(isSelected); + switch (read) { + case 1, 2, 3: + bean.setStatus(true); + break; + case 4: + if (bean.getName().equals("房间类型") || bean.getName().equals("常用工具")) { + bean.setStatus(false); + bean.setChildren(null); + } else { + bean.setStatus(true); + } + break; + } + + // 如果是父级项目(type = -1) + // 检查父级是否可见 + // 处理子项 + List children = bean.getChildren(); + List children2 = new ArrayList<>(); + + if (children != null && !children.isEmpty()) { + for (RoomSettingBean child : children) { + child.setRead(read); + child.setSelected(isSelected); + if (isItemVisible(child)) { + child.setStatus(true); + + if (child.getType() == RoomSettingBean.QXRoomSettingTypeRoomTheCityYears || child.getType() == RoomSettingBean.QXRoomSettingTypeRoomTimeSpace) { + blindList.add(child); + } + children2.add(child); + } else { + child.setStatus(false); + + } + child.updateItemType(); + } + } + bean.setChildren(children2); + if (bean.isStatus()) { + filteredList.add(bean); + } + + } + + // 更新 itemType + /* for (RoomSettingBean bean : dataList) { bean.setRead(read); bean.setSelected(isSelected); // 根据角色和状态设置 isVisible @@ -181,12 +288,9 @@ public class RoomSettingFragment extends BaseMvpDialogFragment { if (type.equals("-1")) { - MvpPre.agreeSong(roomId,"1"); + MvpPre.agreeSong(roomId, "1"); } else // 点击“确认”按钮时执行删除操作 MvpPre.changeRoomType(roomId, type); @@ -388,12 +698,12 @@ public class RoomSettingFragment extends BaseMvpDialogFragment= RoomSettingBean.QXRoomSettingTypeRoomLeave && - type <= RoomSettingBean.QXRoomSettingTypeRoomReport || type == RoomSettingBean.QXRoomSettingTypeRoomFloatingRed) { + type <= RoomSettingBean.QXRoomSettingTypeRoomReport || type == RoomSettingBean.QXRoomSettingTypeRoomFloatingRed || type == RoomSettingBean.QXRoomSettingTypeRoomTheCityYears || + type == QXRoomSettingTypeRoomTimeSpace || type == QXRoomSettingTypeRoomTimeRedSound) { return true; } else { if (type == RoomSettingBean.QXRoomSettingTypeRoomBgMusic || type == RoomSettingBean.QXRoomSettingTypeRoomSubsidy - || type == RoomSettingBean.QXRoomSettingTypeRoomMyDress ) { + || type == RoomSettingBean.QXRoomSettingTypeRoomMyDress) { return false; } @@ -449,14 +753,14 @@ public class RoomSettingFragment extends BaseMvpDialogFragment blindBoxStatus) { + for (int i = 0; i < blindBoxStatus.size(); i++) { + int giftBagId = blindBoxStatus.get(i).getGift_bag_id(); + int status = blindBoxStatus.get(i).getStatus(); + for (int j = 0; j < filteredList.size(); j++) { + for (int k = 0; k < filteredList.get(j).getChildren().size(); k++) { + + if ((giftBagId == 11 && filteredList.get(j).getChildren().get(k).getType() == RoomSettingBean.QXRoomSettingTypeRoomTheCityYears) || + (giftBagId == 12 && filteredList.get(j).getChildren().get(k).getType() == RoomSettingBean.QXRoomSettingTypeRoomTimeSpace)) { + if (status != 1) { + filteredList.get(j).getChildren().remove(k); + } + } + } + } + } + adapter.notifyDataSetChanged(); + } } diff --git a/MainModule/src/main/java/com/xscm/modulemain/dialog/RoomUserInfoFragment.java b/MainModule/src/main/java/com/xscm/modulemain/dialog/RoomUserInfoFragment.java index be61960b..d3380504 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/dialog/RoomUserInfoFragment.java +++ b/MainModule/src/main/java/com/xscm/modulemain/dialog/RoomUserInfoFragment.java @@ -67,7 +67,7 @@ import java.util.Map; public class RoomUserInfoFragment extends BaseMvpDialogFragment implements RoomUserContacts.View { private String room_id, user_id, pit_number; - private UserInfo userInfo; + private UserInfo userInfo=new UserInfo(); CustomPopWindow mCustomPopWindow; private String is_room_owner;//是否是房主 private String is_host;//是否是主持 @@ -460,6 +460,10 @@ public class RoomUserInfoFragment extends BaseMvpDialogFragment + android:background="@mipmap/home_bj"> @@ -80,6 +81,7 @@ android:layout_height="match_parent" android:layout_marginHorizontal="@dimen/dp_12" android:background="@drawable/bg_r16_fff" + android:backgroundTint="@color/transparent" android:layout_marginBottom="@dimen/dp_10" android:orientation="vertical"> @@ -91,16 +93,16 @@ android:layout_marginTop="@dimen/dp_12" android:layout_marginRight="@dimen/dp_16" android:textSize="@dimen/sp_16" - app:tabIndicatorColor="@color/colorPrimary" + app:tabIndicatorColor="@color/transparent" app:tabIndicatorFullWidth="false" app:tabIndicatorGravity="bottom" android:background="@color/transparent" app:tabRippleColor="@color/transparent" - app:tabIndicatorHeight="@dimen/dp_2" + app:tabIndicatorHeight="0dp" app:tabMinWidth="@dimen/dp_20" app:tabMode="scrollable" - app:tabSelectedTextColor="@color/black" - app:tabTextColor="@color/colorBlack45" /> + app:tabSelectedTextColor="@color/white" + app:tabTextColor="@color/colorWhite45" /> + + + diff --git a/MainModule/src/main/res/layout/item_task_box.xml b/MainModule/src/main/res/layout/item_task_box.xml index 4d0df284..5cfa64b9 100644 --- a/MainModule/src/main/res/layout/item_task_box.xml +++ b/MainModule/src/main/res/layout/item_task_box.xml @@ -27,7 +27,7 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" android:text="最高可获得？金币" - android:textColor="@color/color_FF999999" + android:textColor="#F1F1F1" android:textSize="@dimen/sp_12" /> @@ -49,7 +49,7 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" android:text="满？金币" - android:textColor="@color/color_FF999999" + android:textColor="@color/white" android:textSize="@dimen/sp_12" /> diff --git a/MainModule/src/main/res/layout/item_task_data.xml b/MainModule/src/main/res/layout/item_task_data.xml index 516ceedb..f123d12d 100644 --- a/MainModule/src/main/res/layout/item_task_data.xml +++ b/MainModule/src/main/res/layout/item_task_data.xml @@ -4,7 +4,11 @@ android:layout_width="match_parent" android:layout_height="wrap_content" xmlns:tools="http://schemas.android.com/tools" - android:layout_marginBottom="@dimen/dp_20"> + android:background="@drawable/bg_r12_f9f9f9" + android:backgroundTint="#332A46" + android:paddingVertical="@dimen/dp_10" + android:paddingHorizontal="@dimen/dp_15" + android:layout_marginBottom="@dimen/dp_8"> diff --git a/MainModule/src/main/res/layout/item_title.xml b/MainModule/src/main/res/layout/item_title.xml index 61d5ee72..e66e6a80 100644 --- a/MainModule/src/main/res/layout/item_title.xml +++ b/MainModule/src/main/res/layout/item_title.xml @@ -1,12 +1,30 @@ - \ No newline at end of file + android:orientation="vertical" + > + + + + + + + \ No newline at end of file diff --git a/MainModule/src/main/res/layout/room_fragment_my_room_list.xml b/MainModule/src/main/res/layout/room_fragment_my_room_list.xml index eeaa609a..3afacf61 100644 --- a/MainModule/src/main/res/layout/room_fragment_my_room_list.xml +++ b/MainModule/src/main/res/layout/room_fragment_my_room_list.xml @@ -181,7 +181,18 @@ android:text="房间补贴" android:visibility="gone" /> - + { @@ -39,6 +39,15 @@ public class AppContext extends Application { // }); // L.setDeBug(BuildConfig.DEBUG); } + + public static boolean isKilled() { + return isKilled; + } + + public static void setKilled(boolean killed) { + isKilled = killed; + } + public static void initSdk() { // CommonAppContext context = CommonAppContext.getInstance(); diff --git a/app/src/main/java/com/qxcm/qxlive/LaunchPageActivity.java b/app/src/main/java/com/qxcm/qxlive/LaunchPageActivity.java index 017610e1..c5b8c22a 100644 --- a/app/src/main/java/com/qxcm/qxlive/LaunchPageActivity.java +++ b/app/src/main/java/com/qxcm/qxlive/LaunchPageActivity.java @@ -3,15 +3,25 @@ package com.qxcm.qxlive; import android.app.Activity; import android.content.Intent; +import android.media.MediaPlayer; +import android.net.Uri; import android.os.Bundle; import android.os.Handler; import android.os.PersistableBundle; import android.util.Log; +import android.view.Gravity; +import android.view.ViewGroup; +import android.widget.FrameLayout; +import android.widget.VideoView; +import androidx.annotation.NonNull; import androidx.annotation.Nullable; import com.alibaba.android.arouter.launcher.ARouter; +import com.blankj.utilcode.util.LogUtils; import com.qxcm.qxlive.databinding.ActivityLaunchPageBinding; +import com.tencent.qgame.animplayer.AnimConfig; +import com.tencent.qgame.animplayer.inter.IAnimListener; import com.xscm.modulemain.BaseMvpActivity; import com.xscm.modulemain.activity.WebViewActivity; import com.xscm.moduleutil.activity.IPresenter; @@ -60,11 +70,12 @@ public class LaunchPageActivity extends BaseMvpActivity - + + + + + + + + \ No newline at end of file diff --git a/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/input/InputView.java b/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/input/InputView.java index 183b201e..dc4ea2ce 100644 --- a/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/input/InputView.java +++ b/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/input/InputView.java @@ -1159,24 +1159,24 @@ public class InputView extends LinearLayout implements View.OnClickListener, Tex if (TUIChatConfigClassic.isShowInputBarCustom() && getChatInfo().isEnableCustomHelloMessage() && !excludeItems.contains(TUIChatConfigClassic.CUSTOM)) { - actionUnit = new InputMoreItem() {}; - actionUnit.setIconResId(R.drawable.chat_more_input_custom_message); - actionUnit.setName(getResources().getString(R.string.test_custom_action)); - actionUnit.setActionId(CustomHelloMessage.CUSTOM_HELLO_ACTION_ID); - actionUnit.setPriority(10); - actionUnit.setOnClickListener(actionUnit.new OnActionClickListener() { - @Override - public void onClick() { - Gson gson = new Gson(); - CustomHelloMessage customHelloMessage = new CustomHelloMessage(); - customHelloMessage.version = TUIChatConstants.version; - - String data = gson.toJson(customHelloMessage); - TUIMessageBean info = ChatMessageBuilder.buildCustomMessage(data, customHelloMessage.text, customHelloMessage.text.getBytes()); - mChatLayout.sendMessage(info, false); - } - }); - mInputMoreActionList.add(actionUnit); +// actionUnit = new InputMoreItem() {}; +// actionUnit.setIconResId(R.drawable.chat_more_input_custom_message); +// actionUnit.setName(getResources().getString(R.string.test_custom_action)); +// actionUnit.setActionId(CustomHelloMessage.CUSTOM_HELLO_ACTION_ID); +// actionUnit.setPriority(10); +// actionUnit.setOnClickListener(actionUnit.new OnActionClickListener() { +// @Override +// public void onClick() { +// Gson gson = new Gson(); +// CustomHelloMessage customHelloMessage = new CustomHelloMessage(); +// customHelloMessage.version = TUIChatConstants.version; +// +// String data = gson.toJson(customHelloMessage); +// TUIMessageBean info = ChatMessageBuilder.buildCustomMessage(data, customHelloMessage.text, customHelloMessage.text.getBytes()); +// mChatLayout.sendMessage(info, false); +// } +// }); +// mInputMoreActionList.add(actionUnit); } List extensionList = getExtensionInputMoreList(); diff --git a/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/input/InputView.java b/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/input/InputView.java index 05568b68..a07bd8fc 100644 --- a/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/input/InputView.java +++ b/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/input/InputView.java @@ -1336,24 +1336,24 @@ public class InputView extends LinearLayout implements View.OnClickListener, Tex } if (!excludeItems.contains(TUIChatConfigMinimalist.CUSTOM) && TUIChatConfigMinimalist.isShowInputBarCustom()) { - InputMoreItem helloMessage = new InputMoreItem() {}; - helloMessage.setIconResId(R.drawable.chat_minimalist_more_action_custom_icon); - helloMessage.setName(getResources().getString(R.string.test_custom_action)); - helloMessage.setActionId(CustomHelloMessage.CUSTOM_HELLO_ACTION_ID); - helloMessage.setPriority(10); - helloMessage.setOnClickListener(helloMessage.new OnActionClickListener() { - @Override - public void onClick() { - Gson gson = new Gson(); - CustomHelloMessage customHelloMessage = new CustomHelloMessage(); - customHelloMessage.version = TUIChatConstants.version; - - String data = gson.toJson(customHelloMessage); - TUIMessageBean info = ChatMessageBuilder.buildCustomMessage(data, customHelloMessage.text, customHelloMessage.text.getBytes()); - mChatLayout.sendMessage(info, false); - } - }); - mInputMoreActionList.add(helloMessage); +// InputMoreItem helloMessage = new InputMoreItem() {}; +// helloMessage.setIconResId(R.drawable.chat_minimalist_more_action_custom_icon); +// helloMessage.setName(getResources().getString(R.string.test_custom_action)); +// helloMessage.setActionId(CustomHelloMessage.CUSTOM_HELLO_ACTION_ID); +// helloMessage.setPriority(10); +// helloMessage.setOnClickListener(helloMessage.new OnActionClickListener() { +// @Override +// public void onClick() { +// Gson gson = new Gson(); +// CustomHelloMessage customHelloMessage = new CustomHelloMessage(); +// customHelloMessage.version = TUIChatConstants.version; +// +// String data = gson.toJson(customHelloMessage); +// TUIMessageBean info = ChatMessageBuilder.buildCustomMessage(data, customHelloMessage.text, customHelloMessage.text.getBytes()); +// mChatLayout.sendMessage(info, false); +// } +// }); +// mInputMoreActionList.add(helloMessage); } mInputMoreActionList.addAll(getExtensionInputMoreList());