diff --git a/moduleUtil/src/main/java/com/xscm/moduleutil/bean/GiftBean.java b/moduleUtil/src/main/java/com/xscm/moduleutil/bean/GiftBean.java index 471fcbd..69f773a 100644 --- a/moduleUtil/src/main/java/com/xscm/moduleutil/bean/GiftBean.java +++ b/moduleUtil/src/main/java/com/xscm/moduleutil/bean/GiftBean.java @@ -12,6 +12,7 @@ import lombok.Data; public class GiftBean { private String gift_id; + private String periods; private String gift_name; private String gift_price; private int file_type; diff --git a/moduleUtil/src/main/java/com/xscm/moduleutil/dialog/LotteryFragment.java b/moduleUtil/src/main/java/com/xscm/moduleutil/dialog/LotteryFragment.java new file mode 100644 index 0000000..5f8ff0d --- /dev/null +++ b/moduleUtil/src/main/java/com/xscm/moduleutil/dialog/LotteryFragment.java @@ -0,0 +1,130 @@ +package com.xscm.moduleutil.dialog; + +import android.os.Bundle; +import android.view.Choreographer; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.LinearLayoutManager; + +import com.scwang.smartrefresh.layout.api.RefreshLayout; +import com.scwang.smartrefresh.layout.listener.OnRefreshLoadMoreListener; +import com.xscm.moduleutil.R; +import com.xscm.moduleutil.base.BaseMvpDialogFragment; +import com.xscm.moduleutil.bean.GiftBean; +import com.xscm.moduleutil.bean.WalletBean; +import com.xscm.moduleutil.bean.blindboxwheel.BlindBoxBean; +import com.xscm.moduleutil.bean.blindboxwheel.BlindReslutBean; +import com.xscm.moduleutil.bean.blindboxwheel.XlhDrawBean; +import com.xscm.moduleutil.databinding.DialogNewRankingXlhFragmentBinding; +import com.xscm.moduleutil.databinding.FframentDataBinding; +import com.xscm.moduleutil.dialog.giftLottery.GiftLotteryContacts; +import com.xscm.moduleutil.dialog.giftLottery.GiftLotteryPresenter; +import com.xscm.moduleutil.dialog.giftLottery.GiftRecordAdapte; +import com.xscm.moduleutil.dialog.giftLottery.NewGiftRecordAdapte; + +import java.util.List; + +public class LotteryFragment extends BaseMvpDialogFragment implements GiftLotteryContacts.View { + private int page=1; + private String roomId; + private int type=-1; + private GiftRecordAdapte giftRecordAdapte; + + @Override + protected GiftLotteryPresenter bindPresenter() { + return new GiftLotteryPresenter(this,getSelfActivity()); + } + public static LotteryFragment newInstance(String giftBagId,int type) { + Bundle args = new Bundle(); + LotteryFragment fragment = new LotteryFragment(); + args.putString("roomId", giftBagId); + args.putInt("type",type); + fragment.setArguments(args); + return fragment; + } + + @Override + protected void initData() { + roomId = getArguments().getString("roomId"); + type = getArguments().getInt("type"); + MvpPre.xlhAllRecord(roomId, "1", "20",type); + } + + @Override + protected void initView() { + + mBinding.smartRefreshLayout.setOnRefreshLoadMoreListener(new OnRefreshLoadMoreListener() { + @Override + public void onRefresh(@NonNull RefreshLayout refreshLayout) { + page = 1; + MvpPre.xlhAllRecord(roomId, page+"", "20",type); + + } + + @Override + public void onLoadMore(@NonNull RefreshLayout refreshLayout) { + page++; + MvpPre.xlhAllRecord(roomId, page+"", "20",type); + } + }); + + + giftRecordAdapte=new GiftRecordAdapte(); + mBinding.recyclerView.setLayoutManager(new LinearLayoutManager(getActivity(), LinearLayoutManager.VERTICAL, false)); + mBinding.recyclerView.setAdapter(giftRecordAdapte); + } + + + @Override + protected int getLayoutId() { + return R.layout.fframent_data; + } + + @Override + public void getGiftListSuccess(BlindBoxBean blindBoxBean) { + + } + + @Override + public void drawGiftListSuccess(BlindReslutBean blindReslutBean) { + + } + + @Override + public void getMyRecordSuccess(List data) { + + } + + @Override + public void getAllRecordSuccess(List data) { + + if (data != null){ + if (page==1){ + giftRecordAdapte.setNewData(data); + }else { + giftRecordAdapte.addData(data); + } + }else { + if (page == 1) { + giftRecordAdapte.setNewData(null); + } + } + } + + + @Override + public void finishRefreshLoadMore() { + mBinding.smartRefreshLayout.finishRefresh(); + mBinding.smartRefreshLayout.finishLoadMore(); + } + + @Override + public void wallet(WalletBean walletBean) { + + } + + @Override + public void xlhChouSuccess(List data) { + + } +} diff --git a/moduleUtil/src/main/java/com/xscm/moduleutil/dialog/giftLottery/GiftLotteryContacts.java b/moduleUtil/src/main/java/com/xscm/moduleutil/dialog/giftLottery/GiftLotteryContacts.java index 8934fa2..c9c1e3f 100644 --- a/moduleUtil/src/main/java/com/xscm/moduleutil/dialog/giftLottery/GiftLotteryContacts.java +++ b/moduleUtil/src/main/java/com/xscm/moduleutil/dialog/giftLottery/GiftLotteryContacts.java @@ -42,7 +42,7 @@ public class GiftLotteryContacts { void xlhChou(String room_id,String num); - void xlhAllRecord(String room_id,String page,String pageSize); + void xlhAllRecord(String room_id,String page,String pageSize,int type); void xlhMyRecord(String room_id,String page,String pageSize); } diff --git a/moduleUtil/src/main/java/com/xscm/moduleutil/dialog/giftLottery/GiftLotteryPresenter.java b/moduleUtil/src/main/java/com/xscm/moduleutil/dialog/giftLottery/GiftLotteryPresenter.java index 6a2c49d..1247283 100644 --- a/moduleUtil/src/main/java/com/xscm/moduleutil/dialog/giftLottery/GiftLotteryPresenter.java +++ b/moduleUtil/src/main/java/com/xscm/moduleutil/dialog/giftLottery/GiftLotteryPresenter.java @@ -173,22 +173,26 @@ public class GiftLotteryPresenter extends BasePresenter>() { - @Override - public void onSubscribe(Disposable d) { - addDisposable(d); - } + public void xlhAllRecord(String room_id, String page, String pageSize,int type) { - @Override - public void onNext(List giftBean) { - if (MvpRef==null){ - MvpRef=new WeakReference<>(mView); + + api.xlhAllRecord(room_id, page, pageSize,type, new BaseObserver>() { + @Override + public void onSubscribe(Disposable d) { + addDisposable(d); } - MvpRef.get().getAllRecordSuccess(giftBean); - MvpRef.get().finishRefreshLoadMore(); - } - }); + + @Override + public void onNext(List giftBean) { + if (MvpRef == null) { + MvpRef = new WeakReference<>(mView); + } + MvpRef.get().getAllRecordSuccess(giftBean); + MvpRef.get().finishRefreshLoadMore(); + } + }); + + } @Override diff --git a/moduleUtil/src/main/java/com/xscm/moduleutil/dialog/giftLottery/GiftRecordAdapte.java b/moduleUtil/src/main/java/com/xscm/moduleutil/dialog/giftLottery/GiftRecordAdapte.java index 4f65ef4..e3a9367 100644 --- a/moduleUtil/src/main/java/com/xscm/moduleutil/dialog/giftLottery/GiftRecordAdapte.java +++ b/moduleUtil/src/main/java/com/xscm/moduleutil/dialog/giftLottery/GiftRecordAdapte.java @@ -13,6 +13,7 @@ public class GiftRecordAdapte extends BaseQuickAdapter @Override protected void convert(BaseViewHolder helper, GiftBean item) { + helper.setText(R.id.tv_user_name, item.getNickname()); helper.setText(R.id.tv_gift_count_name,"x"+item.getCount()+" "+ item.getGift_name()); helper.setText(R.id.tv_time, item.getCreatetime()); diff --git a/moduleUtil/src/main/java/com/xscm/moduleutil/dialog/giftLottery/GiftXlhChouAdapter.java b/moduleUtil/src/main/java/com/xscm/moduleutil/dialog/giftLottery/GiftXlhChouAdapter.java index 12ed670..6dbaec3 100644 --- a/moduleUtil/src/main/java/com/xscm/moduleutil/dialog/giftLottery/GiftXlhChouAdapter.java +++ b/moduleUtil/src/main/java/com/xscm/moduleutil/dialog/giftLottery/GiftXlhChouAdapter.java @@ -82,8 +82,11 @@ public class GiftXlhChouAdapter extends BaseQuickAdapter implements GiftLotteryContacts.View { + private int page=1; + private String roomId; + private int type=-1; + private NewGiftRecordAdapte giftRecordAdapte; + + @Override + protected GiftLotteryPresenter bindPresenter() { + return new GiftLotteryPresenter(this,getSelfActivity()); + } + public static LuckyFragment newInstance(String giftBagId, int type) { + Bundle args = new Bundle(); + LuckyFragment fragment = new LuckyFragment(); + args.putString("roomId", giftBagId); + args.putInt("type",type); + fragment.setArguments(args); + return fragment; + } + + @Override + protected void initData() { + roomId = getArguments().getString("roomId"); + type = getArguments().getInt("type"); + MvpPre.xlhAllRecord(roomId, "1", "20",type); + } + + @Override + protected void initView() { + + mBinding.smartRefreshLayout.setOnRefreshLoadMoreListener(new OnRefreshLoadMoreListener() { + @Override + public void onRefresh(@NonNull RefreshLayout refreshLayout) { + page = 1; + MvpPre.xlhAllRecord(roomId, page+"", "20",type); + + } + + @Override + public void onLoadMore(@NonNull RefreshLayout refreshLayout) { + page++; + MvpPre.xlhAllRecord(roomId, page+"", "20",type); + } + }); + + + giftRecordAdapte=new NewGiftRecordAdapte(); + mBinding.recyclerView.setLayoutManager(new LinearLayoutManager(getActivity(), LinearLayoutManager.VERTICAL, false)); + mBinding.recyclerView.setAdapter(giftRecordAdapte); + } + + + @Override + protected int getLayoutId() { + return R.layout.fframent_data; + } + + @Override + public void getGiftListSuccess(BlindBoxBean blindBoxBean) { + + } + + @Override + public void drawGiftListSuccess(BlindReslutBean blindReslutBean) { + + } + + @Override + public void getMyRecordSuccess(List data) { + + } + + @Override + public void getAllRecordSuccess(List data) { + + if (data != null){ + if (page==1){ + giftRecordAdapte.setNewData(data); + }else { + giftRecordAdapte.addData(data); + } + }else { + if (page == 1) { + giftRecordAdapte.setNewData(null); + } + } + } + + + @Override + public void finishRefreshLoadMore() { + mBinding.smartRefreshLayout.finishRefresh(); + mBinding.smartRefreshLayout.finishLoadMore(); + } + + @Override + public void wallet(WalletBean walletBean) { + + } + + @Override + public void xlhChouSuccess(List data) { + + } +} diff --git a/moduleUtil/src/main/java/com/xscm/moduleutil/dialog/giftLottery/NewGiftRecordAdapte.java b/moduleUtil/src/main/java/com/xscm/moduleutil/dialog/giftLottery/NewGiftRecordAdapte.java new file mode 100644 index 0000000..72138f9 --- /dev/null +++ b/moduleUtil/src/main/java/com/xscm/moduleutil/dialog/giftLottery/NewGiftRecordAdapte.java @@ -0,0 +1,23 @@ +package com.xscm.moduleutil.dialog.giftLottery; + +import com.chad.library.adapter.base.BaseQuickAdapter; +import com.chad.library.adapter.base.BaseViewHolder; +import com.xscm.moduleutil.R; +import com.xscm.moduleutil.bean.GiftBean; +import com.xscm.moduleutil.utils.ImageUtils; + +public class NewGiftRecordAdapte extends BaseQuickAdapter { + public NewGiftRecordAdapte() { + super(R.layout.item_gift_record_new); + } + + @Override + protected void convert(BaseViewHolder helper, GiftBean item) { + helper.setText(R.id.tv_issue,item.getPeriods()); + helper.setText(R.id.tv_user_name, item.getNickname()); + helper.setText(R.id.tv_gift_count_name, item.getGift_name()); + helper.setText(R.id.tv_time, item.getCreatetime()); + ImageUtils.loadHeadCC(item.getBase_image(),helper.getView(R.id.iv_gift_icon)); + + } +} diff --git a/moduleUtil/src/main/java/com/xscm/moduleutil/dialog/giftLottery/NewXlhRankingDialog.java b/moduleUtil/src/main/java/com/xscm/moduleutil/dialog/giftLottery/NewXlhRankingDialog.java new file mode 100644 index 0000000..c698d1b --- /dev/null +++ b/moduleUtil/src/main/java/com/xscm/moduleutil/dialog/giftLottery/NewXlhRankingDialog.java @@ -0,0 +1,174 @@ +package com.xscm.moduleutil.dialog.giftLottery; + +import android.app.Dialog; +import android.content.Context; +import android.os.Bundle; +import android.view.Gravity; +import android.view.ViewGroup; +import android.view.Window; +import android.widget.RadioGroup; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; + +import com.xscm.moduleutil.R; +import com.xscm.moduleutil.adapter.MyPagerAdapter; +import com.xscm.moduleutil.base.BaseMvpDialogFragment; +import com.xscm.moduleutil.bean.GiftBean; +import com.xscm.moduleutil.bean.WalletBean; +import com.xscm.moduleutil.bean.blindboxwheel.BlindBoxBean; +import com.xscm.moduleutil.bean.blindboxwheel.BlindReslutBean; +import com.xscm.moduleutil.bean.blindboxwheel.XlhDrawBean; +import com.xscm.moduleutil.databinding.DialogNewRankingXlhFragmentBinding; +import com.xscm.moduleutil.dialog.LotteryFragment; + +import java.util.ArrayList; +import java.util.List; + +/** + *@author qx + *@data 2025/9/4 + *@description:巡乐会榜单 + */ + public class NewXlhRankingDialog extends BaseMvpDialogFragment implements GiftLotteryContacts.View{ + private String roomId; + + private MyPagerAdapter pagerAdapter; + private List fragmentList; + private List titleList = new ArrayList(); + + @Override + protected GiftLotteryPresenter bindPresenter() { + return new GiftLotteryPresenter(this,getSelfActivity()); + } + + public static NewXlhRankingDialog newInstance(String giftBagId) { + Bundle args = new Bundle(); + NewXlhRankingDialog fragment = new NewXlhRankingDialog(); + args.putString("roomId", giftBagId); + fragment.setArguments(args); + return fragment; + } + @Nullable + @Override + public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) { + Dialog dialog = super.onCreateDialog(savedInstanceState); + dialog.requestWindowFeature(Window.FEATURE_NO_TITLE); + dialog.setCancelable(true); + return dialog; + } + + @Override + public void onStart() { + super.onStart(); + Window window = getDialog().getWindow(); + if (window != null) { + // 获取屏幕高度 + android.util.DisplayMetrics displayMetrics = new android.util.DisplayMetrics(); + requireActivity().getWindowManager().getDefaultDisplay().getMetrics(displayMetrics); + int screenHeight = displayMetrics.heightPixels; + // 设置高度为屏幕高度的100%（全屏） + int heightInPx = (int) (screenHeight * 0.8);; + window.setLayout(ViewGroup.LayoutParams.MATCH_PARENT, heightInPx); + window.setBackgroundDrawableResource(android.R.color.transparent); + + // 可选：设置动画样式（从底部弹出） + window.setWindowAnimations(R.style.CommonShowDialogBottom); + } + } + + @Override + protected void initDialogStyle(Window window) { + super.initDialogStyle(window); + window.setGravity(Gravity.BOTTOM); + } + @Override + public void onAttach(@NonNull Context context) { + super.onAttach(context); + + + } + + @Override + protected void initData() { + roomId = getArguments().getString("roomId"); + // MvpPre.xlhAllRecord(roomId, "1", "20"); + // 初始化Fragment列表 + initFragments(); + initViewPager(); + } + + // 初始化Fragment列表 + private void initFragments() { + fragmentList = new ArrayList<>(); + fragmentList.add(new LotteryFragment().newInstance(roomId,1)); // 第1页：抽奖榜单 + fragmentList.add(new LuckyFragment().newInstance(roomId,2)); // 第1页：抽奖榜单 + + } + + // 初始化ViewPager + private void initViewPager() { + titleList.add(""); + titleList.add(""); + FragmentManager childFragmentManager = getChildFragmentManager(); + pagerAdapter = new MyPagerAdapter(childFragmentManager, fragmentList,titleList ); + mBinding.ivViewPager.setAdapter(pagerAdapter); + mBinding.ivViewPager.setCurrentItem(0); // 默认显示第1页 + } + @Override + protected void initView() { + mBinding.rbBtn.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() { + @Override + public void onCheckedChanged(RadioGroup group, int checkedId) { + if (checkedId==R.id.radio_all){ + mBinding.ivViewPager.setCurrentItem(0); + }else { + mBinding.ivViewPager.setCurrentItem(1); + } + } + }); + } + + + @Override + protected int getLayoutId() { + return R.layout.dialog_new_ranking_xlh_fragment; + } + + @Override + public void getGiftListSuccess(BlindBoxBean blindBoxBean) { + + } + + @Override + public void drawGiftListSuccess(BlindReslutBean blindReslutBean) { + + } + + @Override + public void getMyRecordSuccess(List data) { + } + + @Override + public void getAllRecordSuccess(List data) { + + + } + + @Override + public void finishRefreshLoadMore() { + + } + + @Override + public void wallet(WalletBean walletBean) { + + } + + @Override + public void xlhChouSuccess(List data) { + + } +} diff --git a/moduleUtil/src/main/java/com/xscm/moduleutil/dialog/giftLottery/TourClubDialogFragment.java b/moduleUtil/src/main/java/com/xscm/moduleutil/dialog/giftLottery/TourClubDialogFragment.java index f0cf1f0..f0bfa2c 100644 --- a/moduleUtil/src/main/java/com/xscm/moduleutil/dialog/giftLottery/TourClubDialogFragment.java +++ b/moduleUtil/src/main/java/com/xscm/moduleutil/dialog/giftLottery/TourClubDialogFragment.java @@ -2,7 +2,6 @@ package com.xscm.moduleutil.dialog.giftLottery; import android.app.Dialog; import android.content.Context; -import android.content.DialogInterface; import android.os.Bundle; import android.os.CountDownTimer; import android.os.Handler; @@ -17,23 +16,18 @@ import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.LinearSnapHelper; import androidx.recyclerview.widget.RecyclerView; -import com.alibaba.android.arouter.launcher.ARouter; -import com.blankj.utilcode.util.GsonUtils; import com.xscm.moduleutil.R; import com.xscm.moduleutil.base.BaseMvpDialogFragment; import com.xscm.moduleutil.bean.GiftBean; import com.xscm.moduleutil.bean.MqttXlhEnd; import com.xscm.moduleutil.bean.RoomMessageEvent; import com.xscm.moduleutil.bean.WalletBean; -import com.xscm.moduleutil.bean.XLHBean; import com.xscm.moduleutil.bean.blindboxwheel.BlindBoxBean; import com.xscm.moduleutil.bean.blindboxwheel.BlindReslutBean; import com.xscm.moduleutil.bean.blindboxwheel.XlhDrawBean; import com.xscm.moduleutil.databinding.FragmentTourClubDialogBinding; import com.xscm.moduleutil.dialog.RechargeDialogFragment; import com.xscm.moduleutil.dialog.WebViewDialog; -import com.xscm.moduleutil.event.MqttBean; -import com.xscm.moduleutil.utils.ARouteConstants; import com.xscm.moduleutil.utils.ImageUtils; import com.xscm.moduleutil.widget.CenterScrollHelper; import com.xscm.moduleutil.widget.EqualSpaceItemDecoration; @@ -57,7 +51,7 @@ public class TourClubDialogFragment extends BaseMvpDialogFragment>> xlhAllRecord(@Field("room_id") String room_id, @Field("page") String page, @Field("page_size") String page_size); + @FormUrlEncoded + @POST(Constants.Get_XH_RANking) + Call>> xlXH_RANking(@Field("room_id") String room_id, @Field("page") String page, @Field("page_size") String page_size); @GET(Constants.GET_XLH_MY_RECORD) Call>> xlhMyRecord(@Query("room_id") String room_id, @Query("page") String page, @Query("page_size") String page_size); diff --git a/moduleUtil/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java b/moduleUtil/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java index b044e51..c1e760d 100644 --- a/moduleUtil/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java +++ b/moduleUtil/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java @@ -3562,23 +3562,45 @@ public class RetrofitClient { } public void xlhAllRecord(String roomId, String page, String - pageSize, BaseObserver> observer) { - sApiServer.xlhAllRecord(roomId, page, pageSize).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()); + pageSize,int type, BaseObserver> observer) { + if (type==1) { + + + sApiServer.xlhAllRecord(roomId, page, pageSize).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()); + } } } - } - @Override - public void onFailure(Call>> call, Throwable t) { - t.printStackTrace(); - } - }); + @Override + public void onFailure(Call>> call, Throwable t) { + t.printStackTrace(); + } + }); + }else { + sApiServer.xlXH_RANking(roomId,page,pageSize).enqueue(new Callback>>() { + @Override + public void onResponse(Call>> call, Response>> response) { + if (response.code() == 200) { + BaseModel> baseModel = response.body(); + if (baseModel.getCode() == 1) { + LogUtils.e("xlXH_RANking", response.body().toString()); + observer.onNext(baseModel.getData()); + } + } + } + + @Override + public void onFailure(Call>> call, Throwable t) { + t.printStackTrace(); + } + }); + } } public void xlhMyRecord(String roomId, String page, String pageSize, BaseObserver> observer) { diff --git a/moduleUtil/src/main/java/com/xscm/moduleutil/widget/Constants.java b/moduleUtil/src/main/java/com/xscm/moduleutil/widget/Constants.java index d07654b..7ec677c 100644 --- a/moduleUtil/src/main/java/com/xscm/moduleutil/widget/Constants.java +++ b/moduleUtil/src/main/java/com/xscm/moduleutil/widget/Constants.java @@ -384,6 +384,7 @@ public class Constants { public static final String GET_BOX_GIFT_LIST_XLH = "/api/BlindBoxTurntable/xlh";//巡乐会 public static final String POST_DRAW_GIFT_LIST_XLH = "/api/BlindBoxTurntable/xlh_draw_gift";//巡乐会抽奖 public static final String POST_XLH_ALL_RECORD = "/api/BlindBoxTurntable/get_xlh_all_record";//巡乐会榜单 + public static final String Get_XH_RANking = "/api/BlindBoxTurntable/get_xlh_ranking";//巡乐会幸运 public static final String GET_XLH_MY_RECORD = "/api/BlindBoxTurntable/get_xlh_my_record";//巡乐会记录 public static final String POST_GIFT_ALL_CLEAR = "/api/Room/room_gift_all_clear";//背包礼物全清 public static final String POST_ROOM_USER_CHARM_LIST = "/api/Room/room_user_charm_list";//房间用户当前魅力值列表 diff --git a/moduleUtil/src/main/res/drawable/bg_radio_selector.xml b/moduleUtil/src/main/res/drawable/bg_radio_selector.xml new file mode 100644 index 0000000..db0541f --- /dev/null +++ b/moduleUtil/src/main/res/drawable/bg_radio_selector.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/moduleUtil/src/main/res/drawable/text_color_radio_selector.xml b/moduleUtil/src/main/res/drawable/text_color_radio_selector.xml new file mode 100644 index 0000000..e0d8d6e --- /dev/null +++ b/moduleUtil/src/main/res/drawable/text_color_radio_selector.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/moduleUtil/src/main/res/layout/dialog_new_ranking_xlh_fragment.xml b/moduleUtil/src/main/res/layout/dialog_new_ranking_xlh_fragment.xml new file mode 100644 index 0000000..aa14412 --- /dev/null +++ b/moduleUtil/src/main/res/layout/dialog_new_ranking_xlh_fragment.xml @@ -0,0 +1,84 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/moduleUtil/src/main/res/layout/dialog_ranking_xlh_fragment.xml b/moduleUtil/src/main/res/layout/dialog_ranking_xlh_fragment.xml index e41d337..6ff9c6e 100644 --- a/moduleUtil/src/main/res/layout/dialog_ranking_xlh_fragment.xml +++ b/moduleUtil/src/main/res/layout/dialog_ranking_xlh_fragment.xml @@ -34,48 +34,50 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/im_jc"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/moduleUtil/src/main/res/layout/fframent_data.xml b/moduleUtil/src/main/res/layout/fframent_data.xml new file mode 100644 index 0000000..1bbec3d --- /dev/null +++ b/moduleUtil/src/main/res/layout/fframent_data.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + diff --git a/moduleUtil/src/main/res/layout/fragment_tour_club_dialog.xml b/moduleUtil/src/main/res/layout/fragment_tour_club_dialog.xml index a3817f1..906b842 100644 --- a/moduleUtil/src/main/res/layout/fragment_tour_club_dialog.xml +++ b/moduleUtil/src/main/res/layout/fragment_tour_club_dialog.xml @@ -312,7 +312,6 @@ android:text="跳过动画" android:textColor="#ABABAB" android:textSize="@dimen/sp_10" - android:visibility="gone" app:layout_constraintBottom_toBottomOf="@+id/exchange_layout" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="@+id/exchange_layout" /> @@ -324,7 +323,6 @@ android:background="@drawable/selector_custom_checkbox" android:clickable="true" android:focusable="false" - android:visibility="gone" app:layout_constraintBottom_toBottomOf="@+id/exchange_layout" app:layout_constraintEnd_toStartOf="@+id/tv_option" app:layout_constraintTop_toTopOf="@+id/exchange_layout" /> diff --git a/moduleUtil/src/main/res/layout/item_gift_record_new.xml b/moduleUtil/src/main/res/layout/item_gift_record_new.xml new file mode 100644 index 0000000..85fd877 --- /dev/null +++ b/moduleUtil/src/main/res/layout/item_gift_record_new.xml @@ -0,0 +1,89 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/moduleUtil/src/main/res/layout/item_xlh.xml b/moduleUtil/src/main/res/layout/item_xlh.xml index 3493f3c..a82c0da 100644 --- a/moduleUtil/src/main/res/layout/item_xlh.xml +++ b/moduleUtil/src/main/res/layout/item_xlh.xml @@ -3,6 +3,7 @@ android:layout_width="@dimen/dp_100" android:layout_height="@dimen/dp_154" android:background="@mipmap/xlh_cj_item" + android:id="@+id/ll_bg" xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools"> diff --git a/moduleUtil/src/main/res/mipmap-xxxhdpi/ke_bg.png b/moduleUtil/src/main/res/mipmap-xxxhdpi/ke_bg.png new file mode 100644 index 0000000..261800f Binary files /dev/null and b/moduleUtil/src/main/res/mipmap-xxxhdpi/ke_bg.png differ diff --git a/moduleUtil/src/main/res/values/attr.xml b/moduleUtil/src/main/res/values/attr.xml index 7e1e090..8881441 100644 --- a/moduleUtil/src/main/res/values/attr.xml +++ b/moduleUtil/src/main/res/values/attr.xml @@ -470,28 +470,4 @@ - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/modulemain/src/main/java/com/xscm/modulemain/activity/MainActivity.java b/modulemain/src/main/java/com/xscm/modulemain/activity/MainActivity.java index 6baeedf..7e47d7b 100644 --- a/modulemain/src/main/java/com/xscm/modulemain/activity/MainActivity.java +++ b/modulemain/src/main/java/com/xscm/modulemain/activity/MainActivity.java @@ -332,6 +332,7 @@ public class MainActivity extends BaseMvpActivity