From 9c558ceb3d0e81d1a013d3033d851a423d95c8f7 Mon Sep 17 00:00:00 2001 From: huangjian Date: Mon, 25 Jul 2022 15:34:15 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=83=A8=E5=88=86=E8=B7=B3?= =?UTF-8?q?=E8=BD=AC=E5=8D=8F=E8=AE=AE=E5=92=8C=E6=88=91=E7=9A=84=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2new=E8=A7=92=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../erban/home/adapter/MeCenterAdapter.kt | 3 +- .../yizhuan/erban/ui/im/RouterHandler.java | 13 +++++++ app/src/main/res/drawable-xhdpi/ic_me_new.png | Bin 0 -> 1062 bytes app/src/main/res/layout/fragment_me.xml | 2 +- app/src/main/res/layout/item_me_center.xml | 34 ++++++++++++------ .../im/custom/bean/RouterType.java | 10 ++++++ .../room/bean/MeCenterInfo.kt | 2 +- 7 files changed, 51 insertions(+), 13 deletions(-) create mode 100644 app/src/main/res/drawable-xhdpi/ic_me_new.png diff --git a/app/src/main/java/com/yizhuan/erban/home/adapter/MeCenterAdapter.kt b/app/src/main/java/com/yizhuan/erban/home/adapter/MeCenterAdapter.kt index fa2613398..c2f981c97 100644 --- a/app/src/main/java/com/yizhuan/erban/home/adapter/MeCenterAdapter.kt +++ b/app/src/main/java/com/yizhuan/erban/home/adapter/MeCenterAdapter.kt @@ -16,10 +16,11 @@ class MeCenterAdapter : helper.getView(R.id.iv_pic).load(item.centerPic) helper.setText(R.id.tv_name, item.centerName) + helper.setGone(R.id.iv_new,!item.centerBadge.isNullOrEmpty()) + helper.getView(R.id.iv_new).load(item.centerBadge) helper.itemView.setOnClickListener { RouterHandler.handle(mContext, item.skipType, item.centerUrl) } - } } \ No newline at end of file diff --git a/app/src/main/java/com/yizhuan/erban/ui/im/RouterHandler.java b/app/src/main/java/com/yizhuan/erban/ui/im/RouterHandler.java index d621f5530..0dbae12fb 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/im/RouterHandler.java +++ b/app/src/main/java/com/yizhuan/erban/ui/im/RouterHandler.java @@ -90,6 +90,7 @@ public class RouterHandler { return false; } lastClickTime = System.currentTimeMillis(); + int intRouterValue = JavaUtil.str2int(routerValue); DialogManagerInterface dmi; switch (routerType) { case RouterType.ROOM: @@ -347,6 +348,18 @@ public class RouterHandler { //粉丝团列表 FansTeamListActivity.start(context); break; + case RouterType.DECORATION_STORE: + if (intRouterValue < 0 || intRouterValue > 4) { + intRouterValue = 0; + } + DecorationStoreActivity.start(context, AuthModel.get().getCurrentUid(), intRouterValue); + break; + case RouterType.MY_DECORATION: + if (intRouterValue < 0 || intRouterValue > 4) { + intRouterValue = 0; + } + MyDecorationActivity.start(context, intRouterValue); + break; default: SingleToastUtil.showToast("暂不支持哟！"); return false; diff --git a/app/src/main/res/drawable-xhdpi/ic_me_new.png b/app/src/main/res/drawable-xhdpi/ic_me_new.png new file mode 100644 index 0000000000000000000000000000000000000000..0c0a2ae6a9834d475be9fa3a0bd975aa7f95a956 GIT binary patch literal 1062 zcmV+>1ljwEP)Px&;7LS5R9HvVmw!xEWf;dl&p8*A6rC*ALRNv&L<`H-Obh#A4u*5F9JV6Hl92(+ zG;+;gqG204s#Ta9Y7Vs&Y71K$KQt-YjIHU`N?D;Tm0D7ikp1Dk@B6lME^xbYukc4i z_iSf7JMa5G&*%L<=Xu`e2oZ8ggm4lP)MS<{ReNhQ+pe}N3BD805Z^BrYfP;X|@vGEUgxG0&nsHW`?ijz1#%#l#j!_%7>WmZSbQ19wMHl$HY$SWa1E;Q7}fx=Bqc(^^{Db~@a-9Qi7c9j^;|CI zn=a_PjHIPtzWWhfT?bcu*n2mlKl%*Q(BgLyGXc9{E9OWC`i=L7+}e9Kqd)lqv%hIL zieZO%GfPf`nH3Jye18u0!fSBF3nEyXiomweWi@a^9CqynRMk6h{A<673DMZqYtii| zT{vsia=7&tbm^=9jV+jq_4IP^*r>cR|C$+zcxu+;E7%A>^@Iqnbc!#txG!X#98~o6 zeVCTxLyIM2Ay(c})RSdM{xamQRP^etLB?hAe5~9o)XEA-O~S5z9`(d}xb!F1>c=tN zJy=WAQI)muLpPF}g>_FF>e;FgkZ#8Ji#M~lk5C1D5cH+DFef_$p!eQ^Rhox-v=pnn z5V>szT(}tQ;JS%$^NpxS)__l8*HxnT9m2GJi4$T~UgLtA-!8eT+i$*zZa;x}zcnN% z1E8mYu%TDi0$rC6aZ}KBABT3}B%)7Y6=Xv~JbLdT?21*Wrz+s?IaoPM&|7w6?|B8a zas&KwRgwm*c8;7(*8r8AC0JSap$ayE)&a8%(y(SHqjxp>-=*Ayy=4vhgH~i}EP8tb zL`PxouRXs*GG-Saa4XCp?X*#y^2_(cr|6edU23_BR zIS^cCoW!%TA408I2VS4Q0xY{9>zN!>emVU5M;Oq7g71v}D@W+GDG)mee(o6p2`kYk z2b}Xh=m>RHjfAFTaDx%i=KV7oZsTmsV@4!hF#l2GEZt&EyDd^bV&go@PiI`FMfN|_ gxJWjF(}+>@Z{}pN=~bT%nE(I)07*qoM6N<$f|%CzkpKVy literal 0 HcmV?d00001 diff --git a/app/src/main/res/layout/fragment_me.xml b/app/src/main/res/layout/fragment_me.xml index eb9381e29..9f6180745 100644 --- a/app/src/main/res/layout/fragment_me.xml +++ b/app/src/main/res/layout/fragment_me.xml @@ -507,7 +507,7 @@ android:id="@+id/view_pager_entrance" android:layout_width="match_parent" android:layout_marginTop="10dp" - android:layout_height="150dp" /> + android:layout_height="146dp" /> + android:orientation="vertical"> + + - \ No newline at end of file + \ No newline at end of file diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RouterType.java b/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RouterType.java index 455e22fde..ae4280a0a 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RouterType.java +++ b/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RouterType.java @@ -256,4 +256,14 @@ public class RouterType { * 71-粉丝团列表 */ public static final int FANS_TEAM_LIST = 72; + + /** + * 72-装扮商城 + */ + public static final int DECORATION_STORE = 73; + + /** + * 72-我的装扮 + */ + public static final int MY_DECORATION = 74; } diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/MeCenterInfo.kt b/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/MeCenterInfo.kt index 1b7abcb2a..f2c68204a 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/MeCenterInfo.kt +++ b/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/MeCenterInfo.kt @@ -1,7 +1,7 @@ package com.yizhuan.xchat_android_core.room.bean data class MeCenterInfo( - val centerBadge: String = "", + val centerBadge: String?= null, val centerId: Int = 0, val centerName: String = "", val centerPic: String = "",