From 1157e8a5457d630987b0ede84648c7e1e5aca877 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E5=B0=8F=E6=B1=9F?= <461355754@qq.com> Date: Thu, 11 Sep 2025 11:06:29 +0800 Subject: [PATCH] =?UTF-8?q?1=EF=BC=9A=E6=B7=BB=E5=8A=A0=E5=BF=AB=E9=80=9F?= =?UTF-8?q?=E7=82=B9=E5=87=BB=E5=87=BA=E7=8E=B0=E7=9A=84=E6=89=93=E5=BC=80?= =?UTF-8?q?=E5=A4=9A=E6=AC=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle.properties | 2 +- .../bean/RoomUserCharmListBean.java | 21 ++++ .../com/xscm/moduleutil/utils/ClickUtils.java | 19 ++++ .../main/res/mipmap-xxxhdpi/room_charm_b.png | Bin 0 -> 6375 bytes .../moduleroom/adapter/RoomCharmAdapter.java | 60 ++++++++++++ .../contacts/RoomCharmDialogContacts.java | 20 ++++ .../moduleroom/dialog/RoomCharmDialog.java | 91 ++++++++++++++++++ .../presenter/RoomCharmDialogPresenter.java | 44 +++++++++ .../res/layout/custom_tab_layou_giftt.xml | 15 +++ .../main/res/layout/dialog_charm_fragment.xml | 36 +++++++ .../src/main/res/layout/item_charm_dialog.xml | 82 ++++++++++++++++ .../src/main/res/layout/fragment_revenue.xml | 69 ++++++------- 12 files changed, 424 insertions(+), 35 deletions(-) create mode 100644 moduleUtil/src/main/java/com/xscm/moduleutil/bean/RoomUserCharmListBean.java create mode 100644 moduleUtil/src/main/java/com/xscm/moduleutil/utils/ClickUtils.java create mode 100644 moduleUtil/src/main/res/mipmap-xxxhdpi/room_charm_b.png create mode 100644 moduleroom/src/main/java/com/example/moduleroom/adapter/RoomCharmAdapter.java create mode 100644 moduleroom/src/main/java/com/example/moduleroom/contacts/RoomCharmDialogContacts.java create mode 100644 moduleroom/src/main/java/com/example/moduleroom/dialog/RoomCharmDialog.java create mode 100644 moduleroom/src/main/java/com/example/moduleroom/presenter/RoomCharmDialogPresenter.java create mode 100644 moduleroom/src/main/res/layout/custom_tab_layou_giftt.xml create mode 100644 moduleroom/src/main/res/layout/dialog_charm_fragment.xml create mode 100644 moduleroom/src/main/res/layout/item_charm_dialog.xml diff --git a/gradle.properties b/gradle.properties index da6b6e5..57c9693 100644 --- a/gradle.properties +++ b/gradle.properties @@ -30,7 +30,7 @@ isBuildModule=false android.injected.testOnly=false APP_VERSION_NAME=1.0.0 -APP_VERSION_CODE=119 +APP_VERSION_CODE=120 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/bean/RoomUserCharmListBean.java b/moduleUtil/src/main/java/com/xscm/moduleutil/bean/RoomUserCharmListBean.java new file mode 100644 index 0000000..7fc4fa7 --- /dev/null +++ b/moduleUtil/src/main/java/com/xscm/moduleutil/bean/RoomUserCharmListBean.java @@ -0,0 +1,21 @@ +package com.xscm.moduleutil.bean; + +import java.util.List; + +import lombok.Data; + +/** + *@author qx + *@data 2025/9/10 + *@description: 魅力详情列表 + */ +@Data +public class RoomUserCharmListBean { + private int user_id; + private String total_price; + private String nickname; + private String avatar; + private String user_code; + private int charm; + private List icon ; +} diff --git a/moduleUtil/src/main/java/com/xscm/moduleutil/utils/ClickUtils.java b/moduleUtil/src/main/java/com/xscm/moduleutil/utils/ClickUtils.java new file mode 100644 index 0000000..84c6322 --- /dev/null +++ b/moduleUtil/src/main/java/com/xscm/moduleutil/utils/ClickUtils.java @@ -0,0 +1,19 @@ +package com.xscm.moduleutil.utils; +/** + *@author qx + *@data 2025/9/10 + *@description: 防止重复点击的工具类 + */ +public class ClickUtils { + private static final long CLICK_INTERVAL = 500; // 500ms内不允许重复点击 + private static long lastClickTime = 0; + + public static boolean isFastDoubleClick() { + long currentTime = System.currentTimeMillis(); + if (currentTime - lastClickTime < CLICK_INTERVAL) { + return true; + } + lastClickTime = currentTime; + return false; + } +} diff --git a/moduleUtil/src/main/res/mipmap-xxxhdpi/room_charm_b.png b/moduleUtil/src/main/res/mipmap-xxxhdpi/room_charm_b.png new file mode 100644 index 0000000000000000000000000000000000000000..85d3f1155d56d55f0908403e749bb95e389fb743 GIT binary patch literal 6375 zcmV`y5KIYIA9l0$!)heRJ4hhaGmhunKK?5 z?!RRL|4mdXPn`;r9`gL(T;lonP4>O+iZYRQBQ|rgHJ{-qeF4wNN=J*Gt zdTqK|-SF{DdUP3j^Hkg}a21@bIgx!Baefodf{VZnf&SX_{l~AeW3RY>Xy_|b_yS|A19ah#}srtoQ z{y(>R_52{LtowYrrs-i%?mQXy1h_2NL2wpqf+oIWAI2sOVq zuz5)O!CG(*T!3f&LH1!py)DEE*aVydXTc_rgpiaW-i&d#%m^~Y@7a^TbYEDw<7`!g zy~+b;O|16GXQJY#Kcih2=XjZ@UYd>uZu*a8xc}1wTW3z>S*6kCZ@0-c%RTe-_kHd> zn)oSjlfb1Q-UZfzb&yzaEkwn>ZS2FBVCDv*2SH;n3L-p100BwB7_ckx%$n1^>`9Ak zxa`5o@bHzHoHrC#f4O~k()!+2=_}9q>A-gaCvNu<*frxM{_*U_n)Mt6zZnQ;d15Zu z6|%sInf%ipmz>~TH#|9g|1HU=*Hj)|HYJs*zsfV6uOayrxCm50W`fp%eG;4nWiJH> zc+F^O(-Z8&x8~SYMkhF;tp-oQ7(n?L?d?#5fRM}vP^J`{a)QDf>x4xmR%dPzq~|IetE2KG`5RW+<0eBDnb)OXEk zKK8Tk^tAm|B=-n52B)A3G7-F5Kp}}i9jJmTxGYI=&<*aaE@vO2s^W%j`l%`0cMgGq z=Ytp!;Tgi8i2#BcgBTCI45VH`i8;fMRj1W&OBy5tC=dg69`5MCp4FE3@8SUXLzuj6 z=dgE2Il-ud*g*y5=Q7rtpx`-1qGD76#Q8rwfsrE9$W{Tpo8kgI1(>h7EjUzDNdmsixKmlPd;V%S4zz7&0JRgFi2>nypT%F8Q z)n)=8Ny4}z-iX0>0Wn}a@O;P|$A~$F$4ZkJ3YwTug9~>I9(zh#^Cn(`UlqdHox5a1M_(-So4Prr zWf?7*DukQBS#W^z4CPtMpQYx3jH={RfZyYAe~bMSdqdi1g zYQoT9K^ElJ@{S{xKvITL1t*~VS1KS1%Cpj70*LycvK#f9P?x5%tG(mvpYNKxc*Tl@ z=VACOQTEJO)5#H%7o5atL7zQ36p6aSTxmVFc9>$`vRTF@tyW zif9?bLpyo8H+=QNg$sRNr1|qN4kiT2t52LTz+1=t0!l@wSO^s&2eF0NLTn+n5GN2O zP<2pBLm@y19)Ze}Xv!i%KPDHGozhlw_St0k8+`ss5RCVUn^P1zz$A!xV0rAvqqY|DBSNa-O^AZ4NI`MdyOA8z~q-6-9+&qf>=0Wl!LGXw-M z27CdVf~pVI6r{!z*Bwo{dIqjM0WXA<4?zoHKorP z*vI0!5on?~tEg3+ zf+~Mz42WkizF<;PV^% z>l{uM1&n}a1kV^e@d$i_=Nlvt{>a6OO&r!L);g?HtSU|wPy{f>;ETcc48CVDDTB!y zwBF#&hIq20xo|b9;ubIlN!Os+aiE>JIL+?W>ra_-)k7=UPdLCRssTks6L+6aknUT8?6Zb%R3KDLC z>K-I>ltZ z$8yziBV``A~NG5rI1zzGM4^QnR20u zZ)37vgl7{pwv@{;qoJkhDb7=piegI;MvkI5N;Sez5YsLtAc;Z|7y&H;WrIruml5_fOroiOD>Ce3(`T}0q>V3cpAt09pM1{vGv4;iHMiUl zvmbn(N95dDL7iz0PMgLxOS*XdQ$L|eyBV2$DoG)suG0~8D-44zLX?6^D~#lo;n6CY zlx4wt)-rbHIx>yJXyPdK)-l}K%8uX9r?+z~z4+9mQ`9;TJj!_}m#Wle;FviDCY`vF z-1zNe8oDqhA}-d_|HN^u`}GM7_BA5)8NA41h74K|)H8?$*9hf?JZpE=P}B1OqqTkf zcHw1AI^$TZk;X}Fb1wzH$bJx>!!K1E(@r-hi5yX1f%Qw3Wy=&(b{yMgc=b?7-TD~+ zDM1DWs}PQd!VICSR3x7-bH)|7Qd_rLt6i;Is{_GCp`1=N*zu``(kxRKrh7Nc;)y%o zNJr-wyi^9kLqo@`IaOwyxs>LkA4V(9YKvpK?1;3-p)IFtrPXiQKCf8J^T5|WOmU=v zNj0@(+8wFg9zpCwvqy52VR(VhvLg*UvyRkQkJrwC2~DuE3Imbdu_qon`I=c{yLkaV z&%q1Bb2UgGkxd|DVd3e*Df8h+w|P4ED8%05VM`9LsHg=^3)&#W8B0)s6VHE;`Y}&Z z>Nxh=o@F{XeKcbv&1cb|r5QoQoaH5_^7 z-I#Eq3p-zN*GT8CYjuT43?v>}=%Y#2WpC~Kj>H}QAC5atU z72*<9_at~n2l1?_Uhw7_5cn_i8B?mPY(iQ>-`K<7< z3y?Ib?T`7A{MO*g7EcxN70C->5>wY0&@yKYwp8C+v-9Rpw0*NZyx!2A4rxkCVc=F?jQ5u?sc=xLw*!kE47tQ$WZJj&^lYhro)f@k=F-I?*-8v^n zu~YH$DV!Igs<_AzmXu5jyn7y|u@ypr&_NB*2n-sC0&fia!RI+lGu+l4aaqbTKCs|B z@D+>$ROFb81otLk&-EUKr536VNdeA~A6p@)EfEhltqeZW9`Zbz&;7wp;LPHkmz|%> z3|(!^L_4^q`SLNBeDIbTpga$mG^vt|Y}w$a?wUR37)QC+;H5p(8EA&OHwH|5Z;I4p zL*n6C2flz6$N;rKBihxc$&c6%KF^_5q+?qlK3A=G8!9cn1J8j`5CsGHEyAQvf%}Nh z@O_TK-Ad0^52pd@@|bi`Wk1xsfI+;rLMWJIdtF8$bc_J^paGyrKlEcM5DWKYdd zf0~DB6s!kU!6>ML=fDS?0SRqiv8Q~7!rbo|NppV_dT{Uq#%C)dY|a;jI?WP%d{5AhW|z*rCq zk^nJC4bTc~t)R&Rm2hO~tn8b<)4>5$9PF8!8wl6R?nWQ20i!q{)C2WFeZd*Q`CvVW zEIKd}{b6u4{`4!~P;)%+Mmv>+EcV1a+h=4Sz4p3>lQ;l;UZiq;{4d@a{<>tln!ybfhWcQ~W6Fx3 z4%2!J%v(^;jN@wXgEZoMftRw^S3cX}vi~vld;A@eWzhwuWWGWfp_&j4SJ=97fOSs{ zuyO4G*{V;TJgJ}tofoj@h_vg=RzJc4BD@4YyFdBQ($C`$74GQ9^@KQu1f>vI{J=1! zvBK$Z@i=1Yk@z(}S}hF>4RxQ|eAVnH*bjPNG@oj4A4P3Wb`|J&yo2AZ8fEKf87mRl z0U_gRNJ}kDuBAA?o?Vmt?_U3n=8HK%3@<@=g!d_bVS1ha>PBR&5MW88)Hor@D!YaQ z?zy*}Z9Bfk;1f^dqI7d(eal^yt2a&N1r%=TY0**hQ`=E(9$dAW_U^B9-@_Z|ER}IJ z74ngg*BWwCi)qPIIVwkYYv!rdmF<^t02y9_^Ny9F(#+(d)EjE8JFXtv06t3Ic{F$_ z?9?2?|pOuszlmtBjOkKuWY{-kS6K5DpcWW|n|yVl*v(3tC3 zwR}3os0DX~&`1OI)iGqX0qS#1G#7L+-F3@_2e$EVhpC%Fs#Gn#BX zJ5N%l7=_%3(BOQ`>_$eTxomvsy<|_j8`pLtNn+>Lv`@T!$=ORh_MvAl@oKtrOS>N2 zFfVNV4{Bch3pPJ`Dy3>0GQEk$pqczoJwcR1Ytoe4GW1T((ckEQ>h|l#J;DLzaRA&i z)7yB~tIx1in>jriDM2B|FAG8B;WwtxnR$}IR`8Bz(wpuheQGyJSL>8 z=dWDx&hP(oSvOtQaQ@E-#uZt!^uzRw9!s?~OC}2N+XWf+h;u&0nJN0(vh>fvygVMAVLo@OWjtzeK#PH^G zpSW#Nk%LG$C{#YX#9mkWeepwfRVUf@nA~8RAe+LUk)`3ZEKN-*WRr5t*)ZYQ6%1|) z*>v}7DGpn@8!hEZ6}DEe+Y;=kBdUYK^c2I>YZz_G{Cr^Zb!V?wu{hx%6Am8v!cu$X z;BQNxj()$BOnaGJe?ZDh;T@47J1@(W*JW{!L#hBOmj2MvUl(J$E4cP5w#$;lj%u?| zo|>jGrH*n-=1TfLc;#)k-DWuigoEs!E92jAAzBwx zStTT0LSIwqJHI+VKdrpB@P<-*4@rL+zw8sJhoU6nuvx)xN|R}i)#_;pNem;^%coua^|7NFoS=1|F$Y1{>tGEau9m_EfK4a!KCLJeAv-J2Tr5_r+BH zP{eL4*ivQZq^UnTwVQ*?a4<|yrZv2|zBV^Di)<8FlB;B*8BduhKl_?|zV`HNU3Qj?G1fGBx0ZwCe3WuVpLM z3;e`mBr!`y2CDyd=L5$KRK7Jd#S{OkYHxV%;Fdw{-Lq$Nlte3w$;isx!%yG+ubVzL z$RQvc0=jUqUt08`Gt$}mPkO#NP1DI!mDru?7oxKyEsIvFoahE3_nNWZ8kcadb;;7e zWF8!PV(7@B{yi&(lK!iIojmfu;uVV%4l&^n+IsEQ^o-US_efb!*O72*(ml{t8re0H z%B5<>Pm8m|BPnk}gUQuxEA0xWmqv;!#@~A6B3?#5hfv!`+CqIyd#MV#GH!FTHo7GG z+N>xw;lz|So7B|wDj8nXDI4Zb4>AF@)OGPP^Erf)Zzu1dgR^OcB&lE~1g3V}srk&T z&-|Rdbl{$e+EZ`b=9qL-4i~vIlPe16_+O}9!pp>Ph-|%dYuX#*eILPRyCqIVx0aIu zg3P2}6gIr`m}vXE=TY4C>uPVOjEr>MDOnG%K2>Aty#HLj@CO-QCWb?#?VD{O88+a+ z?x=RLz3JcMn!?Ac!+kSzb#0IPZt{cWp1xyxJ0Jg4I-YQeCdr_9f`tu>R$N%+Wg;9x zdUv%g*{wHJHx}-w{Z`92*{k!OOJAR@39pE%iS60uzC8bfKl~MYRWBd7I2O(t>@8k0 p<@-~%aoAyp9d_7ZhaGlc{Xe0ZIzgzOuiXFu002ovPDHLkV1fz5KG*;N literal 0 HcmV?d00001 diff --git a/moduleroom/src/main/java/com/example/moduleroom/adapter/RoomCharmAdapter.java b/moduleroom/src/main/java/com/example/moduleroom/adapter/RoomCharmAdapter.java new file mode 100644 index 0000000..43021c2 --- /dev/null +++ b/moduleroom/src/main/java/com/example/moduleroom/adapter/RoomCharmAdapter.java @@ -0,0 +1,60 @@ +package com.example.moduleroom.adapter; + +import static com.xscm.moduleutil.utils.UtilConfig.getContext; + +import android.widget.ImageView; +import android.widget.LinearLayout; + +import com.chad.library.adapter.base.BaseQuickAdapter; +import com.chad.library.adapter.base.BaseViewHolder; +import com.example.moduleroom.R; +import com.xscm.moduleutil.bean.RoomUserCharmListBean; +import com.xscm.moduleutil.utils.ImageUtils; +import com.xscm.moduleutil.utils.MeHeadView; + +import java.util.List; + +/** + *@author qx + *@data 2025/9/10 + *@description: 魅力详情适配器 + */ +public class RoomCharmAdapter extends BaseQuickAdapter { + public RoomCharmAdapter() { + super(R.layout.item_charm_dialog); + } + + @Override + protected void convert(BaseViewHolder helper, RoomUserCharmListBean item) { + helper.setText(R.id.tv_nick_name, item.getNickname()); + helper.setText(R.id.tv_charm, item.getCharm()+""); + helper.setText(R.id.tv_user_id,"ID:"+item.getUser_code()); + MeHeadView headView = helper.getView(R.id.im_user); + headView.setData(item.getAvatar(), "", ""); + + LinearLayout llContainer =helper.getView(R.id.ll_in); + llContainer.removeAllViews(); // 清空旧的 ImageView + if (item.getIcon() == null){ + return; + } + List images = item.getIcon(); // 获取图片列表 + + for (String url : images) { + if (url.contains("http")) { + ImageView imageView1 = new ImageView(getContext()); + LinearLayout.LayoutParams params = new LinearLayout.LayoutParams( + getContext().getResources().getDimensionPixelSize(com.xscm.moduleutil.R.dimen.dp_37), + getContext().getResources().getDimensionPixelSize(com.xscm.moduleutil.R.dimen.dp_15) + ); + params.setMargins(0, 0, getContext().getResources().getDimensionPixelSize(com.xscm.moduleutil.R.dimen.dp_5), 0); // 右边距 + imageView1.setLayoutParams(params); + imageView1.setScaleType(ImageView.ScaleType.CENTER_CROP); + + // 使用 Glide 加载图片 + ImageUtils.loadHeadCC(url, imageView1); + + llContainer.addView(imageView1); + } + } + } +} diff --git a/moduleroom/src/main/java/com/example/moduleroom/contacts/RoomCharmDialogContacts.java b/moduleroom/src/main/java/com/example/moduleroom/contacts/RoomCharmDialogContacts.java new file mode 100644 index 0000000..3b83f1b --- /dev/null +++ b/moduleroom/src/main/java/com/example/moduleroom/contacts/RoomCharmDialogContacts.java @@ -0,0 +1,20 @@ +package com.example.moduleroom.contacts; + +import android.app.Activity; + +import com.xscm.moduleutil.activity.IPresenter; +import com.xscm.moduleutil.activity.IView; +import com.xscm.moduleutil.bean.RoomUserCharmListBean; + +import java.util.List; + +public class RoomCharmDialogContacts { + public interface View extends IView { + void roomUserCharmList(List roomUserCharmListBeans); + } + + public interface IRoomPre extends IPresenter { + + void roomUserCharmList(String room_id, String user_id); + } +} diff --git a/moduleroom/src/main/java/com/example/moduleroom/dialog/RoomCharmDialog.java b/moduleroom/src/main/java/com/example/moduleroom/dialog/RoomCharmDialog.java new file mode 100644 index 0000000..628580c --- /dev/null +++ b/moduleroom/src/main/java/com/example/moduleroom/dialog/RoomCharmDialog.java @@ -0,0 +1,91 @@ +package com.example.moduleroom.dialog; + +import android.os.Bundle; +import android.view.Gravity; +import android.view.Window; +import android.view.WindowManager; + +import androidx.recyclerview.widget.LinearLayoutManager; + +import com.example.moduleroom.R; +import com.example.moduleroom.adapter.RoomCharmAdapter; +import com.example.moduleroom.contacts.RoomCharmDialogContacts; +import com.example.moduleroom.databinding.DialogCharmFragmentBinding; +import com.example.moduleroom.presenter.RoomCharmDialogPresenter; +import com.hjq.toast.ToastUtils; +import com.xscm.moduleutil.base.BaseMvpDialogFragment; +import com.xscm.moduleutil.bean.RoomUserCharmListBean; + +import java.util.ArrayList; +import java.util.List; + +/** + *@author qx + *@data 2025/9/10 + *@description: 魅力弹框 + */ +public class RoomCharmDialog extends BaseMvpDialogFragment implements RoomCharmDialogContacts.View{ + + private String mRoomId; + private String mUserId; + private RoomCharmAdapter mAdapter; + public static RoomCharmDialog newInstance(String roomId,String userId) { + RoomCharmDialog fragment = new RoomCharmDialog(); + Bundle bundle = new Bundle(); + bundle.putString("roomId", roomId); + bundle.putString("userId", userId); + fragment.setArguments(bundle); + return fragment; + } + + @Override + public void initArgs(Bundle arguments) { + super.initArgs(arguments); + mRoomId = arguments.getString("roomId"); + mUserId = arguments.getString("userId"); + } + @Override + protected RoomCharmDialogPresenter bindPresenter() { + return new RoomCharmDialogPresenter(this, getActivity()); + } + @Override + protected void initDialogStyle(Window window) { + super.initDialogStyle(window); + window.setGravity(Gravity.BOTTOM); + WindowManager.LayoutParams lp = window.getAttributes(); + lp.dimAmount = 0.5f; + // 固定对话框的宽度和高度 + lp.width = WindowManager.LayoutParams.MATCH_PARENT; // 宽度设置为屏幕宽度 + lp.height = WindowManager.LayoutParams.WRAP_CONTENT; // 高度设置为内容高度 + + window.setAttributes(lp); + window.addFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND); + } + @Override + protected void initData() { + MvpPre.roomUserCharmList(mRoomId, mUserId); + } + + @Override + protected void initView() { + mBinding.rvCharmList.setLayoutManager(new LinearLayoutManager(getContext())); + mAdapter = new RoomCharmAdapter(); + mBinding.rvCharmList.setAdapter(mAdapter); + } + + @Override + protected int getLayoutId() { + return R.layout.dialog_charm_fragment; + } + + @Override + public void roomUserCharmList(List roomUserCharmListBeans) { + if (roomUserCharmListBeans!=null){ + mAdapter.setNewData(roomUserCharmListBeans); + }else { + mAdapter.setNewData(new ArrayList<>()); + ToastUtils.show("暂无数据"); + } + + } +} diff --git a/moduleroom/src/main/java/com/example/moduleroom/presenter/RoomCharmDialogPresenter.java b/moduleroom/src/main/java/com/example/moduleroom/presenter/RoomCharmDialogPresenter.java new file mode 100644 index 0000000..0e4677b --- /dev/null +++ b/moduleroom/src/main/java/com/example/moduleroom/presenter/RoomCharmDialogPresenter.java @@ -0,0 +1,44 @@ +package com.example.moduleroom.presenter; + +import android.content.Context; + +import com.example.moduleroom.contacts.BidListContacts; +import com.example.moduleroom.contacts.RoomCharmDialogContacts; +import com.xscm.moduleutil.bean.RoomUserCharmListBean; +import com.xscm.moduleutil.http.BaseObserver; +import com.xscm.moduleutil.presenter.BasePresenter; + +import java.lang.ref.WeakReference; +import java.util.List; + +import io.reactivex.disposables.Disposable; + +public class RoomCharmDialogPresenter extends BasePresenter implements RoomCharmDialogContacts.IRoomPre { + + RoomCharmDialogContacts.View mView; + + public RoomCharmDialogPresenter(RoomCharmDialogContacts.View view, Context context) { + super(view, context); + mView = view; + } + + + @Override + public void roomUserCharmList(String room_id, String user_id) { + api.roomUserCharmList(room_id, user_id,new BaseObserver>() { + + @Override + public void onSubscribe(Disposable d) { + addDisposable(d); + } + + @Override + public void onNext(List roomUserCharmListBeans) { + if (MvpRef==null){ + MvpRef=new WeakReference<>(mView); + } + MvpRef.get().roomUserCharmList(roomUserCharmListBeans); + } + }); + } +} diff --git a/moduleroom/src/main/res/layout/custom_tab_layou_giftt.xml b/moduleroom/src/main/res/layout/custom_tab_layou_giftt.xml new file mode 100644 index 0000000..f510cbe --- /dev/null +++ b/moduleroom/src/main/res/layout/custom_tab_layou_giftt.xml @@ -0,0 +1,15 @@ + + + + + + diff --git a/moduleroom/src/main/res/layout/dialog_charm_fragment.xml b/moduleroom/src/main/res/layout/dialog_charm_fragment.xml new file mode 100644 index 0000000..0c54c75 --- /dev/null +++ b/moduleroom/src/main/res/layout/dialog_charm_fragment.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/moduleroom/src/main/res/layout/item_charm_dialog.xml b/moduleroom/src/main/res/layout/item_charm_dialog.xml new file mode 100644 index 0000000..70efcee --- /dev/null +++ b/moduleroom/src/main/res/layout/item_charm_dialog.xml @@ -0,0 +1,82 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/modulevocal/src/main/res/layout/fragment_revenue.xml b/modulevocal/src/main/res/layout/fragment_revenue.xml index c4a9c7a..6f8db0a 100644 --- a/modulevocal/src/main/res/layout/fragment_revenue.xml +++ b/modulevocal/src/main/res/layout/fragment_revenue.xml @@ -30,10 +30,10 @@ android:layout_height="wrap_content" android:layout_marginStart="@dimen/dp_12" android:layout_weight="1" - tools:text="开始日期" android:hint="开始日期" android:textColor="@color/color_FF999999" - android:textSize="12sp" /> + android:textSize="12sp" + tools:text="开始日期" /> + android:textSize="12sp" + tools:text="结束日期" /> + + + - - - - + app:srlEnableLoadMore="true" + app:srlEnableRefresh="true"> - - - - - + android:layout_height="wrap_content" + android:orientation="vertical"> + + + + + + + \ No newline at end of file