From e431ab26a0ec942b3ffc283ae0e481aba368f708 Mon Sep 17 00:00:00 2001 From: huangjian Date: Mon, 13 Dec 2021 19:02:13 +0800 Subject: [PATCH] =?UTF-8?q?1.=E7=BA=AF=E5=9B=BE=E7=89=87=E9=93=AD=E7=89=8C?= =?UTF-8?q?=E9=80=82=E9=85=8D(=E4=B9=B1=E5=85=A5...)=202.=E9=A6=96?= =?UTF-8?q?=E9=A1=B5=E6=B4=BE=E5=AF=B9=E5=B0=8F=E6=B8=B8=E6=88=8Ftab?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../erban/avroom/fragment/GameRoomFragment.kt | 6 - .../yizhuan/erban/avroom/game/GameDelegate.kt | 13 -- .../com/yizhuan/erban/home/HomeViewModel.kt | 34 ++++- .../erban/home/adapter/RoomGameAdapter.kt | 39 ++++- .../erban/home/fragment/RoomGameFragment.kt | 21 ++- .../drawable-xhdpi/bg_home_common_avatar.png | Bin 2014 -> 1897 bytes .../res/drawable-xhdpi/bg_home_game_item.png | Bin 0 -> 11045 bytes .../drawable-xhdpi/ic_home_game_go_room.png | Bin 0 -> 9459 bytes .../main/res/layout/activity_user_info.xml | 7 +- app/src/main/res/layout/dialog_user_info.xml | 5 +- .../main/res/layout/fragment_room_game.xml | 46 +++++- .../main/res/layout/item_home_hall_left.xml | 5 +- .../main/res/layout/item_home_hall_right.xml | 6 +- app/src/main/res/layout/item_room_game.xml | 136 ++++++++++-------- app/src/main/res/layout/item_user.xml | 6 +- .../main/res/layout/layout_official_mask.xml | 6 +- .../main/res/layout/list_item_online_user.xml | 4 +- .../res/layout/layout_dy_nick_detail.xml | 5 +- .../layout/item_message_public_chat_hall.xml | 5 +- .../home/bean/HomeRoomInfo.java | 3 + .../home/model/HomeModel.kt | 17 +++ 21 files changed, 235 insertions(+), 129 deletions(-) create mode 100644 app/src/main/res/drawable-xhdpi/bg_home_game_item.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_home_game_go_room.png diff --git a/app/src/main/java/com/yizhuan/erban/avroom/fragment/GameRoomFragment.kt b/app/src/main/java/com/yizhuan/erban/avroom/fragment/GameRoomFragment.kt index b7c188692..a5d45a416 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/fragment/GameRoomFragment.kt +++ b/app/src/main/java/com/yizhuan/erban/avroom/fragment/GameRoomFragment.kt @@ -58,7 +58,6 @@ import com.yizhuan.erban.event.OpenRoomIntroEvent import com.yizhuan.erban.friend.view.SelectFriendActivity import com.yizhuan.erban.home.adapter.RoomActAdapter import com.yizhuan.erban.home.adapter.RoomActAdapter.RoomActClickListener -import com.yizhuan.erban.treasure_box.widget.GoldBoxHelper import com.yizhuan.erban.ui.webview.DialogWebViewActivity import com.yizhuan.erban.ui.widget.ButtonItem import com.yizhuan.erban.ui.widget.GiftDialog @@ -67,12 +66,10 @@ import com.yizhuan.erban.ui.widget.GiftDialog.SenGiftCallback import com.yizhuan.erban.ui.widget.UserInfoDialog import com.yizhuan.erban.ui.widget.dialog.OpenNobleDialog import com.yizhuan.erban.ui.widget.dynamicface.DynamicFaceDialog -import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil import com.yizhuan.erban.ui.widget.rollviewpager.RollPagerView import com.yizhuan.erban.ui.widget.rollviewpager.Util import com.yizhuan.erban.ui.widget.rollviewpager.hintview.ColorPointHintView import com.yizhuan.erban.utils.KeyBoardUtils -import com.yizhuan.erban.utils.UserUtils import com.yizhuan.tutu.room_chat.activity.RoomMsgActivity import com.yizhuan.xchat_android_core.Constants import com.yizhuan.xchat_android_core.UriProvider @@ -99,7 +96,6 @@ import com.yizhuan.xchat_android_core.room.bean.RoomInfo import com.yizhuan.xchat_android_core.room.event.RoomClearScreenEvent import com.yizhuan.xchat_android_core.room.face.FaceInfo import com.yizhuan.xchat_android_core.room.giftvalue.helper.GiftValueMrg -import com.yizhuan.xchat_android_core.room.model.AvRoomModel import com.yizhuan.xchat_android_core.room.model.MicQueueModel import com.yizhuan.xchat_android_core.room.queue.bean.MicMemberInfo import com.yizhuan.xchat_android_core.share.bean.SessionType @@ -111,7 +107,6 @@ import com.yizhuan.xchat_android_core.super_admin.util.SuperAdminUtil import com.yizhuan.xchat_android_core.user.UserModel import com.yizhuan.xchat_android_core.user.bean.BaseInfo import com.yizhuan.xchat_android_core.user.bean.UserInfo -import com.yizhuan.xchat_android_core.utils.LogUtils import com.yizhuan.xchat_android_library.base.factory.CreatePresenter import com.yizhuan.xchat_android_library.net.rxnet.utils.RxNetWorkUtils import com.yizhuan.xchat_android_library.rxbus.RxBus @@ -120,7 +115,6 @@ import com.yizhuan.xchat_android_library.utils.config.BasicConfig import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.disposables.Disposable import io.reactivex.functions.BiConsumer -import io.reactivex.functions.Consumer import org.greenrobot.eventbus.EventBus import org.greenrobot.eventbus.Subscribe import org.greenrobot.eventbus.ThreadMode diff --git a/app/src/main/java/com/yizhuan/erban/avroom/game/GameDelegate.kt b/app/src/main/java/com/yizhuan/erban/avroom/game/GameDelegate.kt index 7f5c1f1da..3cdcd49c9 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/game/GameDelegate.kt +++ b/app/src/main/java/com/yizhuan/erban/avroom/game/GameDelegate.kt @@ -674,19 +674,6 @@ class GameDelegate(val activity: Activity, val container: FrameLayout, var mgId: } } - fun isPlaying(): Boolean { - val dataJson = iSudFSTAPP?.getGameState(SudMGPMGState.MG_COMMON_PLAYER_PLAYING) - LogUtils.d(dataJson) - try { - val jsonObject = JSONObject(dataJson) - return jsonObject.getBoolean("isPlaying") - } catch (e: Exception) { - e.printStackTrace() - } - return false - } - - fun onStart() { iSudFSTAPP?.startMG() //启动游戏 } diff --git a/app/src/main/java/com/yizhuan/erban/home/HomeViewModel.kt b/app/src/main/java/com/yizhuan/erban/home/HomeViewModel.kt index f2961ab3d..0e18556cd 100644 --- a/app/src/main/java/com/yizhuan/erban/home/HomeViewModel.kt +++ b/app/src/main/java/com/yizhuan/erban/home/HomeViewModel.kt @@ -19,6 +19,9 @@ class HomeViewModel : BaseViewModel() { private val _hotRoomLiveData = MutableLiveData>() val hotRoomLiveData: LiveData> = _hotRoomLiveData + private val _gameRoomLiveData = MutableLiveData>() + val gameRoomLiveData: LiveData> = _gameRoomLiveData + private val _concernsLiveData = MutableLiveData>() val concernsLiveData: LiveData> = _concernsLiveData @@ -98,6 +101,17 @@ class HomeViewModel : BaseViewModel() { ) } + fun getGameRoom(pageNum: Int, pageSize: Int) { + safeLaunch( + onError = { + _gameRoomLiveData.value = ListResult.failed(pageNum) + }, + block = { + val result = HomeModel.getGameRoom(pageNum, pageSize) + _gameRoomLiveData.value = ListResult.success(result, pageNum) + } + ) + } fun getCollectRoom(pageNum: Int, pageSize: Int) { safeLaunch( @@ -113,11 +127,21 @@ class HomeViewModel : BaseViewModel() { val collectRooms = async(Dispatchers.IO) { HomeModel.getCollectRoom(pageNum, pageSize) } - _concernsLiveData.value = concernsRooms.await() - _collectLiveData.value = - ListResult.success(collectRooms.await()?.fansRoomList, pageNum) - _emptyLiveData.value = concernsRooms.await().isNullOrEmpty() && - collectRooms.await()?.fansRoomList.isNullOrEmpty() + try { + _concernsLiveData.value = concernsRooms.await() + } catch (e: Exception) { + _concernsLiveData.value = null + } + + try { + _collectLiveData.value = + ListResult.success(collectRooms.await()?.fansRoomList, pageNum) + } catch (e: Exception) { + _collectLiveData.value = ListResult.failed(pageNum) + } + + _emptyLiveData.value = _concernsLiveData.value.isNullOrEmpty() && + _collectLiveData.value?.data.isNullOrEmpty() } else { val result = HomeModel.getCollectRoom(pageNum, pageSize) _collectLiveData.value = ListResult.success(result?.fansRoomList, pageNum) diff --git a/app/src/main/java/com/yizhuan/erban/home/adapter/RoomGameAdapter.kt b/app/src/main/java/com/yizhuan/erban/home/adapter/RoomGameAdapter.kt index c29d8d04f..8798ac218 100644 --- a/app/src/main/java/com/yizhuan/erban/home/adapter/RoomGameAdapter.kt +++ b/app/src/main/java/com/yizhuan/erban/home/adapter/RoomGameAdapter.kt @@ -1,14 +1,17 @@ package com.yizhuan.erban.home.adapter +import android.graphics.Color +import android.graphics.LinearGradient +import android.graphics.Shader import android.widget.ImageView +import android.widget.TextView +import androidx.core.view.isGone import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder import com.yizhuan.erban.R import com.yizhuan.erban.avroom.activity.AVRoomActivity -import com.yizhuan.erban.ui.utils.ImageLoadUtilsV2 import com.yizhuan.erban.ui.utils.load import com.yizhuan.xchat_android_core.home.bean.HomeRoomInfo -import com.yizhuan.xchat_android_core.utils.TextUtils class RoomGameAdapter : BaseQuickAdapter(R.layout.item_room_game) { @@ -17,15 +20,41 @@ class RoomGameAdapter : BaseQuickAdapter(R.layout. override fun convert(helper: BaseViewHolder, item: HomeRoomInfo) { helper.apply { getView(R.id.iv_room_image).load(item.avatar) - setText(R.id.tv_online_number, "${item.onlineNum}人热聊中") setText(R.id.tv_room_title, item.title) itemView.setOnClickListener { AVRoomActivity.start(mContext, item.uid) } + val tvRoomGame = helper.getView(R.id.tv_room_game) + tvRoomGame.text = item.mgName + helper.setText(R.id.tv_game_status, if (item.state == 1) "游戏中" else "等人中") + setGradient(tvRoomGame) } - helper.setVisible(R.id.iv_room_tag, !TextUtils.isEmptyText(item.tagPict)) - ImageLoadUtilsV2.loadImage(helper.getView(R.id.iv_room_tag), item.tagPict) + val avatars: Array = arrayOf( + helper.getView(R.id.iv_avatar_0), + helper.getView(R.id.iv_avatar_1), + helper.getView(R.id.iv_avatar_2), + helper.getView(R.id.iv_avatar_3), + helper.getView(R.id.iv_avatar_4) + ) + for (i in avatars.indices) { + val avatarUrl = item.micUsers?.getOrNull(i)?.avatar + avatars[i].isGone = avatarUrl.isNullOrBlank() + avatars[i].load(avatarUrl) + } + + } + + private fun setGradient(textView: TextView) { + val endX = textView.paint.textSize * textView.text.length + val linearGradient = LinearGradient( + 0f, 0f, endX, 0f, + Color.parseColor("#FF61C4FE"), + Color.parseColor("#FFA979FF"), + Shader.TileMode.CLAMP + ) + textView.paint.shader = linearGradient + textView.invalidate() } } \ No newline at end of file diff --git a/app/src/main/java/com/yizhuan/erban/home/fragment/RoomGameFragment.kt b/app/src/main/java/com/yizhuan/erban/home/fragment/RoomGameFragment.kt index 94cdbe8f0..e6314b3a0 100644 --- a/app/src/main/java/com/yizhuan/erban/home/fragment/RoomGameFragment.kt +++ b/app/src/main/java/com/yizhuan/erban/home/fragment/RoomGameFragment.kt @@ -11,7 +11,6 @@ import com.yizhuan.erban.home.adapter.RoomGameAdapter import com.yizhuan.erban.ui.utils.RVDelegate import com.yizhuan.xchat_android_core.home.bean.HomeRoomInfo - class RoomGameFragment : BaseViewBindingFragment() { companion object { @@ -35,22 +34,38 @@ class RoomGameFragment : BaseViewBindingFragment() { .setRecyclerView(binding.recyclerView) .setEmptyView(EmptyViewHelper.createEmptyView(context, "暂无房间")) .setLayoutManager(LinearLayoutManager(mContext)) + .setRefreshLayout(binding.refreshLayout) .setPageSize(pageSize) .build() + roomHotAdapter.setOnLoadMoreListener({ loadData(false) }, binding.recyclerView) - homeViewModel.hotRoomLiveData.observe(this) { + binding.refreshLayout.setOnRefreshListener { + loadData(true) + } + homeViewModel.gameRoomLiveData.observe(this) { rvDelegate.loadData(it) } + + binding.tvMatch.setOnClickListener { + + } + } + + override fun onResume() { + super.onResume() loadData(true) } private fun loadData(isRefresh: Boolean) { + + binding.refreshLayout.isRefreshing = isRefresh + if (isRefresh) { page = 1 } else { page++ } - homeViewModel.getHotRoom(page, pageSize) + homeViewModel.getGameRoom(page, pageSize) } } \ No newline at end of file diff --git a/app/src/main/res/drawable-xhdpi/bg_home_common_avatar.png b/app/src/main/res/drawable-xhdpi/bg_home_common_avatar.png index b9612e2ebb1232a9c7c7026869ce89325bbad42e..be9ae269afad4ca45f1a5a6aa06763d958404755 100644 GIT binary patch literal 1897 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 diff --git a/app/src/main/res/drawable-xhdpi/bg_home_game_item.png b/app/src/main/res/drawable-xhdpi/bg_home_game_item.png new file mode 100644 index 0000000000000000000000000000000000000000..a87b0caeeb87257e6daac3a3d715c1df50c32818 GIT binary patch literal 11045 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 Uii0%Z-s?F9Syh>$hbBS)2Sl89>Hq)$ literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi/ic_home_game_go_room.png b/app/src/main/res/drawable-xhdpi/ic_home_game_go_room.png new file mode 100644 index 0000000000000000000000000000000000000000..e85ac84d7f44530ac5e2d10020561ba0ef3dfcfe GIT binary patch literal 9459 zcmVPyA07*naRCr$Poe7*BRh{p@raTaIV_s_&@b``Kn}g`4vQm?0OYV}=0m^8BLF${x;re6 zd|Uw{rF>k!?@zS_g%I-by0*up!HR%z)m0?lweH^d@dc09W&V+W&$YVz8%`hr#uZnj zkImIR7QlJb0FnoV0>l--wd)WYHXxn`Y}~Gav12J>9k6pG1yQ_0Kwbsp0rO~q<@W}N4GbF;3pXGXAO@Er6cG9rAV$X!M+2k%i0XJZ zI4bocfKdQw)VkSWvKKixhTH}W_9G9DAQf;%w<8r`_Dlhm-xnx{43Io9RM^;X0%A!F zirx{#?>wBIe#GE7i=@vvz!@Q|6|hQ51|;-JNeLuUVMD5WeUnnXs)}b`6G-)9^ooAp zJWlSTW76aE?`Mv&KO3J@9sF1xpFe-{U72gnmLF(IAr2zh4{R2Kjlivb$j^q4X4k|R z^0*G+cnp>uOOfmDMXGRQv&x|YWzGPZ2^bULw7{9yW`QTUP{Kt>P7jeH`X4tz77(WK z_4|d56gS?K4QK%-dYA)1{<#555#Sz=5*69WFV=JB!ReQXbU2@FsM zpGml3gT|a;l)13UtN~(!!-SJ{;26f}ZBQ;b{4J8VA?VTJz-nxvLP*?rag8J)B>JcV zk*?W%2+^lXLr_-_*I$(hJNa;8-p__Gi_T{{-h{Sk!a=6dGS`{{uZRI>!)BRqnGcU~ zT_c$guK2()J|A}%(KL**0m6LPnJq|W1&|ClV%BJuaTa?xd-`$bH(2Ald>+Y3QHZeY zj(z1RIlRzu_*5h~^UM(SI$L~ZwMKVk zn9ru-v`dUeUt(z)t8u2Q-08GSzHy2|#dOE#d-rsqW;*SW4>fZEOIkj|+#K|Tc;lKO zzSXG_EE^%%dI%ty79d67C@sZRTEpqVt#)`FQhrDx+-$aCX9H=d(G{1|BT?pJWh>Lg z{``A+F_+gh`QD!I>ACl9Fct!04#yX=&!cdB27FQZt@@3U0ITjHaD{m5Nz3?LI6kf=?mVna+uFm13GgBNg+UH0>`k+3qtrj0=L^+uo=M! z)3m@EKqf@k!ZhcDbcLs!2(`3FzPBeJu^1&!-(7J$uVwPb&cH^6!a3WUv);`VY%*mi zD=1$^6es1&cg_gFLDdtlS-yZ9<_eN20ise_m92~p;wa6rw~VKlW2nSh5pq*(a>aZR zvqmgVwU=Si0z-SMMr@xWYkZj#WhgQqGOQ4juv1|}nyS;^ZEmSJ&NE&C_+|oxb>gVZ zQUS%Y0u-)@!k40!oevl1!$^^qM+zsr16YuweH#NxP|=)c_`G zfLue^jgx1IsD!GbbkwrIJo^TnvPT!3FVmy{AU;aW9#P|To014|_v)H>cK<@^6M{~2 zgkawS0wA0!vnd2fY=k+==U@!?ppVyA!}r=;4!l!0N*p#!tHeG=TA|srHt%y}JrQs` z!PzfR_po(La^H<z)HaC^#5OHs7Fvlx8NwB9&p7 ze=5|L3I$zSV{l-zWaMs1rx61xZZ%;Ua|UXfO-%2y808Sek5TZL#P=Oa{et%h z!6gw|Beuv7qQzPxe%}nd75N~lof445jT5L*yX7IhO9UhLhseDyP9$bEKo*=13(t(7 ztILoOh9E=e)Fs<)l8ir+R(yJ4@gtk@OjM4wz-$_OE}T2yHdLT4%#N$RnPJ;FM^=TdTEQO)623AL^`pYt(h8idOTI;-a@ zfK14MHX%MPRVfg{iGVb?9u}P|A}~Z9B8Cp`sj`!VcRbOsko#kn)qk2jk?x|ztl1DaW;#n_Y_E!Vsavq(lp~%1#4a-z)itX zpM;5VeV%FsDr(Rng!Z^(<8>in+XOguuP;%9MHf~$@SIl(<}ZR9u7(4nX;x$R{^Oqr z&wI7tx=%?q- zam_@=Slq=@XEgOe5^w;e`7nGo^c*8_RS>Mh_!h~?oiMgp*NO=(L#GKAJw>xes|8yg zh64xU%8WnM(*s8@0nde9cZBS`J&XXMz!BZYjH0j-0Y<_}XT#H83XQtpn^#MAZb^Y| z+S&l*8=sPFnk7K&9=>Kh{MoazpwZ9tt#1J4FBFXImK+?j-mqgHaQzoy_YMOfd+v;- zGZMXK+Qnj#g84Q=h~FGHUp&87p<%PgB})mo0%>%Jc0uFOwQH}%VFRwx9;N-1T#u3v z9NkmmHW_ulR5W&lnp`1LA4D^UVT-;sl4D-tAUxgcZ7rcbGjgY7&+QVg27N09^H0!J z83gdV`=HT)XPmr+wp-%nJBMkuBA1_%567+m*_Ld$E+A}Z7Ew&3?vylL`!g;UO z<@m-YVdq0BFxB-HF^DS5-&zb(BreTsr#=#b6SYLDQP@0D!boE7$6 zMxUjz3WRBr)fjU^N+Flb6Hi=LWn0jp)f%9sv7;z8ZeiY=nQ zSZ}DuJ9onN9XhhU?3{bp+v?{(Zy%!Bsp0uhKM2D^Ff<6e?+Mxd>i{PQ4g(g=BD&F^8WXX2ii5|S+4!%>O6uMNZKJP-x*QP#(5mZ*Fi5}+JCC$SP zd#w0NLGLOUI{jmTcVb@j|9ES5=rHfVVfq@~x zzTJ}MWZM6SkA|QPdw0eF*$v+@#4A`l6++H~DO@dY%e(@Vcf#UcURvjJ8w9%03@gM9zyAvQng(BJQK`qMp{NN)aaorV2X)*t6a?6dvOfL(WM z7E$3v-^aQ{lU}4v3@e)EHk45UHdr~Z$5c9J_F8vw%`+Sh%ui_>o;bI47(c*XZs+g?Ah6Rt`I+a(n9g7dYOh-rdjR90`Ay2%+_sv^v@UU-4(K9XFbvpt5?=| z!b&&l9j$T6z29m_AW)#ofFw52j4IJwXVSv7Aq_yT{e)z*T6YllyvyFNvls)Aj2^Hu z4;5mb|H{JQu9S{u@kjwA2{D-@LHis!*vEjd-nYT7!IhnF17gc*M~P?n4wKDEn$0Gy zz@@G1_baX-NC0x>mC{lA<00@&_CkY77*Ol);}&H_Xk*M2!iu-KRMz%Eq9h|eZs25C zdY<6cdtvloWQ6jhm9YLOI5-Jg_rN_{VfUm?ThBT!t3h_}hKC-iQ}V~z`bdSR{&_Dw z3mqQb7_eiL#C08(A0-&*(;1KYyYGi>CPyT$VUQRo14GciKr>5}{z9ZP_V3MJ-zjIq zv;IQxr4LCSc`%LVm&GFW8kOeSVIgj8(<-D#Uq6x#2& zS#V&izyY4t2k8bxVk;zk?~I;4$detHI#xEb0y;{ETzRDkh00)*K(+Np3(ELZq(^PQ z=PqS(+L>2ozNv-EM8sMs4rAYAU_C57UvSGkFj0r+p9p;wotoag1s>cD`x`LUgq{jK z_4rh*s>%yGaQB9Qt=pQE%PuFL?$f(eaMv#;nH=?4wxquj;F&Lhjd#N@evqEeu$3LUQl^?}zKuCPO?A5`V;RO#gzdCWUBXGC zL!CB_5;VJXhz*dz9=y>KrD{OAC8@elomb&b8z6J>K}>q9K+?M!mcLA}VYAL&md%5n zGOStz_iu+yDx+yY$%Fa5aMJR)LamIZ(}r!^C8J|H?cF;v$$Xo?}WY|LgdN~AvjV!{9YwB)z3NKJG^{GeQg|M5ZCzYjk8j_ypT8zA-| zXsR=&cChsq<(XY|Iw73a>BF2Hz+_1g!9n~nmx^do zDY?{oe154HIT=)1>8_P~cNapbZZ-C*)pz+QSoI3Q*f`w!TTq};tZ?)I)F)uPt^dkC ztUDSO^meDZeo1oFuw-mpvT2K;J*m^)TGhdGVwE2QL>2eI&X7(2uN?s=0*4a|R`odc zMSA+-l6MJizEN`P4+L-iUx%g{Zu_a^dtb@=D9R*z*2@If{BOy;K{)A2nWQawvUCMh zYl6+cliC}~-Biure=q#xyVEdMUVCJ$2V(-J?4esz?0@nSaaJp!F3U9f0~({Fw0Dfs zSqFg{yo*AN0thFh2AK*kxKw1D+PpH~m2ixvJUdfKzbuKFkwA-IkCnB0uE5~+OV+&J ziL}9%o$$aTy7#HU)xI+9KA`RJ<->5|qBcYRBnQVOdr>*B2Fse2oyb7@<(?Mz-6^Q- z_c(sJAF)Q_nONS*fn6aF{Jb577X=7cs9+PPyapii;L>*se)T=cE#DKU6joiO#Gh_R#22^S43*nse1y{dMvhoS=4Jbc^6+FJCV}L<;c2Z*_x0CXz|c47~Lk={{TGui4{s-dS2UL+xKw5 zmRmbI#5i$?F@iPrL=1!6a--l^--$f}VEGf^!pj6VeO+?vk7DB_Zp$~lANK8mM1$yl z)3q+=yo=yT=L$ahb{T!%9zuBYyP>BK-g9|;+_dva%m{imIVfINWcyTU8lL)8sSn}` z@yqo~#U&!3?g=L8p)mxlN#&@{79jH-{y_>}kqWHtJUdONZ1za$RslePW$h&buP4ni zA^{s~3}d+uwD)szbvJCd5Bbm*zOrvUH;p`zC2fb*PxII_956C2*}q9G>UB8x)UpmQ zIrmka@8LVzj64{|8pOeky%3YVsQU;YSE&#KH!G1Er?M}5Bdj=H@R@hYh%M~Q!Ujlp zDwzV|m6yZvweY?->2PZFgzLjQ{uy>|g-^Vvdko0VXiRz1@6XQn&_S#n{1VPqn z%talg8ARLf>S9#b>6s_E^eQ3-Q2<%I9A5s{n(sgNKHb1Jd#LZcJPt8mP-$*{NIqtu zzCrlA_X}?Sx#XMIWV4eC{z?f}!NZ#*t$6Nj7fb}KK3;Io?UHLgoKRX}lj zC2L;mP;=U}0*7Xh1&Ik0do~3;bX%K)Bf5e0pUy5!j$x)0YBG}yE_3Ny)@Qtg9=78k2g*s;fkPoKs+v%vP zq%)ol&-+WkwV##TeQOG`1;g;BcfsCW@Ubi65S!F%`Z+a{d*#OkxBp7=mCwenC#GEL zbC|}@t|G8~kgRYvvvwUJHk`It{5KI&pE1py&M1=|YP}^c7J|3vc$Xql7s^U|bL!d9 zuR6v|2s-+Cg27b*RncU;U8Ws+T_d;u`Q;|{u`mHf1d7-NwLzjEr_&PcF(Fee(VURj z|Im-j(7#~qDRAB^1-{y$M8bEjfrmH3{Kc^K{#4-Qy@)r*Ax1Gsk@=;*`_*rOrOV-; z-b%s}YIOMZZ-b%5@Nb`l-~J|dyj7QjLz1_Bz~SdVlzi*U#u(FGG?{y2)qmCpF^rX6 zZD8-O(pPdmymo+p6CU+xjWYF>(^>7IN6q(HTz0r#4RB657d7!oOeT=dTQzQ~3Nxhz zu<`;2Pjsj;9x=&yFfU0}>!XrezpBU9qlrE-Wu%R4V39&4JO9D*8qCx~YhH)}$ zFMWfWs{udws^qkDVC^XmH-BGp+fTF+HkFND?bVsrq#8fU4oF9U89oZ$@OC2Rxb9!{ zX_VIai%VhoYQe95B>9i8Of62;=U1$OH~zig#_J_NydefgytLAQBs)LVSn)+u0J01O zVsh<(cu8N0olb}Pv{t*07?IsxI9L~UsQCf4Qi-<+AumiRZK?~j%$T@GL^>p%QmDW( zbOsEarstc=P$I)LP2F)%z@}fcW4NW^#h%-tXNFl^5>KE`db$;Z4Im7x6yPcqxcIG3 zG~eT^A5rr$9GtS7KS5BPIqjDQ_q6uUZ~BmUn@=WMePI|aH(=HUrjWx#dSe>B!BjFIObTv7e5(t*KKp( zU&T(TbsMLgTJz=CP8x7N+;*uu9`zXq>msu(H=E21_Xh#B(4{6}S=Hyu5sTzaGt*d! zIcDYjad^>TMiQudDH(o>VE#G-5`6(mH{5-Fi;0m?n`marU=$V{-7q;lVnCsapulHt zCcI@dORQlQEfc)#je=j?Ai3+8@fdtO!nhYGY)L2Sh{@(?spOw0}3Z%ci6R!D$N|ALo zn9Zha(=45jV*-9A^hJ^+$zUc|4Tx6^mD%b9)LobQY=`?Z19oP@P+L+}qq?3$&3AdV z5b{!Ufzz>xDWC#_vDx7LLFLs!Q`wa3{5rV zuq~)MC8|oSN-d-N4fdjJUF2jwYFuaq7zK`K278?T2BD1D#h$yW5uyO1 z=W3W#)qqA1x~EQP#U+5|3kj zhfjx6*3$fX>KzCT+oU7A8VCv?(STjN)Iq1hw!lmwVDv{CaY-p#+3O;pG2^6VjWQ{iV%dY^QE}DqzoZ&Kwd``PD|km3jj-fb>F2-_4YcVP zYSLXr>qd)2AW`gL^h?}0dEX-qFR45=V-cF-vkjcY;<&<;Z<3_JQSHSu$fj9}SqO++ z19yQlMoz*$c|h3DbsSA*{HLI^=6j^tA+hSyoelD<9OLUUs~!`ei(sfC-hE6zKXzd< z5c)6d(3sV-2Lq6)7EYBUWjrd)keXkj5<=C77rTPXq*SJ)zEXQObrKT|RT}z_MQapN zV!>*&i(TQ#nieb7O}WDobXKL?CY~vSj?*T)%HHdVqH(OZ8n;N>7`jg0o38P@!mq6- zEQX6wn1V5_%c*^)x$Lik>@UfGUOnXey91N$7LBq)oeqtbpgFgNQ!30@3%AYmLq|}O zEgfobsHk~11XLWC7de8zmPpqIM6qy8E66ODP%NU3i-c_QIF17*xro(6l8wYYKYlwF zefryzDUtb&^z7-9)-+|a*p;B_F$bgEPEQVl(>+ttTRvC84r+!HT z8ehZ)Oya9_dl@mGWCum!aF%2qMRY#JAX+z=(r?J5uX8!RNK4F+xnzv2$n>!Rou8Z) z=lU6TGLEUqtWu5TI%4zD^ThjyN<1W>DO?(@kcJFtlzkel7#wrn{-KCP>iqDMhLx@JNFTT2_pX(hZM4{;jnhF?r zG@KSq51QoxnuoN3jLjlOu-aQt1ugteK-qC9wc1oXN!jx#E0BnQQXnWHS>(D3C_Eb} z6~lB5XhqX5qd6klGl;-svKZSjOlGYm=+KU0^x<^>u`c5(pJ`aFGnE#|=#Uuz)fJxd z;bhuyly;63Kqj>4FD~{$tWcBjL88|iRZo0>Ne|c0E3wO!v{AnlWdHyKp-DtRRHREw zfuqx**%35LK8-M><+(K76756Yg34x*qD}1jI{1?=B?Xc&q^$lFP=uoaqJR<#JO>7a zUXk~7B&*Z;B$gJj#AGZj()GT2@BhS^N|>c6e*aen#1!Et)je52810k-IZb7a28q*L z={n+p9-p5qs`0a`&!{8mC}2bY327-{IF9~P;HU<)4tlhIuTAXoEMhk7Hyh}xoemR_ zv?#S54Hl``#KjMSh(&z$=ef9HfG0f$Q5)Y0*2<8hKrRUpYAdTsi1gFcH10u$FmkKK z@?z3vgXFy_QqMfaC%re{+h<5!4SN(Fe<{MOgv_UomOt_BN;W|80cGS<1Oy1w^!>K$Mwv-l2n`B9q!pI3;F!x^saZ=h)oaO?5Ycv+@&4>KNGfWj z!6c=yjNfi)kaPk{zKbtofG8$WAPGWTwV{ui#3h_~GFP02gif?gvl=a(vMg4y4x5LL z6RkYO(L+?U1d>pJL;X_>5-NZ=v;#>;F@|txHyzq|wEIi6TawPB zz7@A=qnS4IZ#sAtf#)kQjN>=T_@2O1APL&~UWB+E7uNtpc5sBNL4q1eKf)e`T|z35 zbfP&YQU*xjDIy_M0Pz9>=|sC>bX=c~y6;Fjl_qVcmv&oi{3z*^LpqPyX8zNG#Qr%D zZxUC9oK_vL|2dFCki@@F zXaAs(`e_iSh3iytMH^RiaN7=ES>QB%ToK@g3LHVKK|Dl9Nh?(eYF(stGp`?RQ1RSk zJTAKQK#gJ&EpV4%M{AGJMLNoWb_vRDf~F+&LpstUkUl{;Nf4F@6l*+gKPXfL67^cq zPm;AA90im>;M5$Pi85|QX{|{d^_l{S>mxcHgzITwD9{vvL4D?M0Ey>ifnly$fgu7) z2dO?2v^6+fN$6CgZP>z|CP6*auPI>oA>kk7C&}_4QP0hW|Mst4nx80Bp|gJkr|oKB z_!UH;cG_+unk9s~Z}|wd@oMWZ0m59tUh2=zN{q2CYC1$mZ ztW}Wv_ea}h$W|TMtRfrZNNa_4Vdd$7V#3dnpJsn_!1G7_ z)9gi6V6%#O-~85YByR7G!^#DZP6htSpXFM8h3bcY%(dFTs%>7I?N6P~rM@25ETITE zb1CeR&*~a@EPyao-9D}WInuy?d^KxHQlDT0CxZY002ovPDHLk FV1gHPE1&=X literal 0 HcmV?d00001 diff --git a/app/src/main/res/layout/activity_user_info.xml b/app/src/main/res/layout/activity_user_info.xml index 253083cc5..8c7b19b52 100644 --- a/app/src/main/res/layout/activity_user_info.xml +++ b/app/src/main/res/layout/activity_user_info.xml @@ -113,7 +113,7 @@ tools:src="@drawable/ic_user_charm_level" /> - diff --git a/app/src/main/res/layout/dialog_user_info.xml b/app/src/main/res/layout/dialog_user_info.xml index 5c7542361..640bac9ac 100644 --- a/app/src/main/res/layout/dialog_user_info.xml +++ b/app/src/main/res/layout/dialog_user_info.xml @@ -129,11 +129,10 @@ diff --git a/app/src/main/res/layout/fragment_room_game.xml b/app/src/main/res/layout/fragment_room_game.xml index 3d7ae06d1..5616787a5 100644 --- a/app/src/main/res/layout/fragment_room_game.xml +++ b/app/src/main/res/layout/fragment_room_game.xml @@ -1,9 +1,43 @@ - + android:layout_height="match_parent"> + + + + + + + + + + + diff --git a/app/src/main/res/layout/item_home_hall_left.xml b/app/src/main/res/layout/item_home_hall_left.xml index b499574d4..d51ddd1f1 100644 --- a/app/src/main/res/layout/item_home_hall_left.xml +++ b/app/src/main/res/layout/item_home_hall_left.xml @@ -72,11 +72,10 @@ diff --git a/app/src/main/res/layout/item_home_hall_right.xml b/app/src/main/res/layout/item_home_hall_right.xml index 067b69617..d1eb69a42 100644 --- a/app/src/main/res/layout/item_home_hall_right.xml +++ b/app/src/main/res/layout/item_home_hall_right.xml @@ -67,15 +67,13 @@ - @@ -23,6 +22,7 @@ android:layout_width="74dp" android:layout_height="74dp" android:layout_marginStart="3dp" + android:layout_marginTop="8dp" android:src="@drawable/default_cover" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" @@ -60,108 +60,122 @@ android:layout_height="wrap_content" android:layout_marginStart="10dp" android:ellipsize="end" + android:includeFontPadding="false" android:maxLines="1" android:textColor="@color/text_primary" - android:textSize="14sp" + android:textSize="14dp" android:textStyle="bold" - app:layout_constraintBottom_toTopOf="@id/iv_room_tag" + app:layout_constraintBottom_toTopOf="@id/tv_room_game" app:layout_constraintStart_toEndOf="@id/view_room_cover" app:layout_constraintTop_toTopOf="parent" app:layout_constraintVertical_chainStyle="packed" tools:text="余生点唱歌曲交友房间" /> - + tools:text="你画我猜" /> + + + - - + android:textColor="@color/color_999999" + android:textSize="10sp" + app:layout_constraintBottom_toBottomOf="@id/tv_room_game" + app:layout_constraintStart_toEndOf="@id/view_line" + app:layout_constraintTop_toTopOf="@id/tv_room_game" + tools:text="游戏中" /> + app:layout_constraintStart_toStartOf="@id/tv_room_title" + app:layout_constraintTop_toBottomOf="@id/tv_room_game"> + app:cborder_width="2dp" /> - - + app:cborder_width="2dp" /> + + + app:cborder_width="2dp" /> + app:cborder_width="2dp" /> + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_user.xml b/app/src/main/res/layout/item_user.xml index 5aa99abfd..4f46f320d 100644 --- a/app/src/main/res/layout/item_user.xml +++ b/app/src/main/res/layout/item_user.xml @@ -56,15 +56,13 @@ - - diff --git a/app/src/module_community/res/layout/layout_dy_nick_detail.xml b/app/src/module_community/res/layout/layout_dy_nick_detail.xml index 8cf8de3d2..9c379bebf 100644 --- a/app/src/module_community/res/layout/layout_dy_nick_detail.xml +++ b/app/src/module_community/res/layout/layout_dy_nick_detail.xml @@ -103,11 +103,10 @@ diff --git a/app/src/module_public_chat_hall/res/layout/item_message_public_chat_hall.xml b/app/src/module_public_chat_hall/res/layout/item_message_public_chat_hall.xml index d989cb67d..6222d02ab 100644 --- a/app/src/module_public_chat_hall/res/layout/item_message_public_chat_hall.xml +++ b/app/src/module_public_chat_hall/res/layout/item_message_public_chat_hall.xml @@ -67,11 +67,10 @@ diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/bean/HomeRoomInfo.java b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/bean/HomeRoomInfo.java index 93799fc1e..79c46b11d 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/bean/HomeRoomInfo.java +++ b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/bean/HomeRoomInfo.java @@ -30,6 +30,9 @@ public class HomeRoomInfo implements MultiItemEntity { private boolean crossPking; private boolean valid; private boolean isBanner; + private long mgId; + private String mgName; + public int state; @Override public int getItemType() { diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/model/HomeModel.kt b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/model/HomeModel.kt index 63eb02f09..1a099b06e 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/model/HomeModel.kt +++ b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/model/HomeModel.kt @@ -129,6 +129,12 @@ object HomeModel : BaseModel() { api.getCommonRoom(tabId, pageNum, pageSize) } + suspend fun getGameRoom(pageNum: Int, pageSize: Int): List? = + launchRequest { + api.getGameRoom(pageNum, pageSize) + } + + suspend fun getHomeTag(): List? = launchRequest { @@ -251,6 +257,17 @@ object HomeModel : BaseModel() { @Query("pageSize") pageSize: Int ): ServiceResult> + /** + * 首页游戏房间 + * + * @return + */ + @GET("home/miniGameTabList") + suspend fun getGameRoom( + @Query("pageNum") pageNum: Int, + @Query("pageSize") pageSize: Int + ): ServiceResult> + /** * 首页派对 Tag List *