From 3aa011900ba7b516f91727de1c00c5c5814d43df Mon Sep 17 00:00:00 2001
From: huangjian <huangjian@xuanyinyy.com>
Date: Wed, 17 Nov 2021 17:41:00 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=8E=A8=E8=8D=90=E6=88=BF?=
 =?UTF-8?q?=E9=97=B4=E5=A2=9E=E5=8A=A0PK=E4=B8=ADTAG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../home/adapter/HomeRoomFragmentAdapter.java |  13 ++-
 .../res/drawable-xhdpi/bg_room_pk_tag.png     | Bin 0 -> 1027 bytes
 .../main/res/layout/activity_user_info.xml    |   1 +
 app/src/main/res/layout/item_home_tab_map.xml |  14 +++
 .../home/bean/HomeTabMapInfo.java             | 107 ++++++++++--------
 5 files changed, 80 insertions(+), 55 deletions(-)
 create mode 100644 app/src/main/res/drawable-xhdpi/bg_room_pk_tag.png

diff --git a/app/src/main/java/com/yizhuan/erban/home/adapter/HomeRoomFragmentAdapter.java b/app/src/main/java/com/yizhuan/erban/home/adapter/HomeRoomFragmentAdapter.java
index 0827f20fe..7b24e5187 100644
--- a/app/src/main/java/com/yizhuan/erban/home/adapter/HomeRoomFragmentAdapter.java
+++ b/app/src/main/java/com/yizhuan/erban/home/adapter/HomeRoomFragmentAdapter.java
@@ -1,19 +1,19 @@
 package com.yizhuan.erban.home.adapter;
 
 import android.content.Context;
-import android.graphics.Color;
 import android.text.TextUtils;
 import android.view.View;
 import android.widget.ImageView;
 
+import androidx.annotation.NonNull;
+
 import com.chad.library.adapter.base.BaseMultiItemQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
 import com.netease.nim.uikit.support.glide.GlideApp;
 import com.yizhuan.erban.R;
 import com.yizhuan.erban.avroom.activity.AVRoomActivity;
-import com.yizhuan.xchat_android_core.home.bean.HomeTabMapInfo;
 import com.yizhuan.erban.ui.utils.ImageLoadUtils;
-import com.yizhuan.erban.ui.widget.LivingIconView;
+import com.yizhuan.xchat_android_core.home.bean.HomeTabMapInfo;
 import com.yizhuan.xchat_android_core.statistic.StatisticManager;
 import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol;
 
@@ -41,7 +41,7 @@ public class HomeRoomFragmentAdapter extends BaseMultiItemQuickAdapter<HomeTabMa
     }
 
 
-    protected void convert(BaseViewHolder helper, HomeTabMapInfo item) {
+    protected void convert(@NonNull BaseViewHolder helper, HomeTabMapInfo item) {
         if (item == null) {
             return;
         }
@@ -62,12 +62,13 @@ public class HomeRoomFragmentAdapter extends BaseMultiItemQuickAdapter<HomeTabMa
                 helper.setText(R.id.tv_online_number,item.getOnlineNum()+"")
                         .setText(R.id.tv_title, item.getTitle());
 
-                helper.setGone(R.id.iv_tab_label, mIsHome);
+                helper.setGone(R.id.tv_tag_in_pk, item.isCrossPking());
+                helper.setGone(R.id.iv_tab_label, mIsHome || item.isCrossPking());
                 helper.setGone(R.id.tv_tag_content, mIsHome && !TextUtils.isEmpty(item.getIconContent()))
                         .setText(R.id.tv_tag_content,item.getIconContent());
 
                 ImageView mIvTabLabel = helper.getView(R.id.iv_tab_label);
-                if (!TextUtils.isEmpty(item.getTagPict()) && !mIsHome) {
+                if (!TextUtils.isEmpty(item.getTagPict()) && !mIsHome && !item.isCrossPking()) {
                     mIvTabLabel.setVisibility(View.VISIBLE);
                     ImageLoadUtils.loadAvatarBig(item.getTagPict(), mIvTabLabel);
                 } else {
diff --git a/app/src/main/res/drawable-xhdpi/bg_room_pk_tag.png b/app/src/main/res/drawable-xhdpi/bg_room_pk_tag.png
new file mode 100644
index 0000000000000000000000000000000000000000..311d7a471c400081e17b272be53b6dfb7f7f2ecb
GIT binary patch
literal 1027
zcmV+e1pNDnP)<h;3K|Lk000e1NJLTq00341001Ni1^@s66THnm00001b5ch_0Itp)
z=>Px&y-7qtRA@u(nqO#BR~*N`zobpFwiZF>P=_#3)F%}Mecjt0#s-2QqCSiyR*Rx+
z;)5XdLDXmy#Zjd%14YCa2Sf02kDJqN3c9f=SemrNHPf_Kt8LHu%DKtCxmjzI^ybN(
zK;WEnbMLwN-0%JUIp-&6!sl^UehH{PCBj=YxQ4(d1U}S|b}fh!fQCQ=D767C{(h<L
zj(fi;pQELG3{pAY9P^EP*DhbTbUokitLF0^6LU|M`OVx;-x)8>Yx<RTX`E6TBQQ?L
z11-GP(HXte(<74xsmzyat~<9#Pla}CV21`aQXu|6;=%N8@Vy1=0yYoeo`U*3lW7}j
z80<iDU}*~@-)P|;8by{>NJl-@Pu5ZC{|l^ve1CE}vbk=s>|slOc=(V8j%lF7du1$G
zzha#>$OCnO{bx^hm7-iHWJ9&Bsl47+u@zfP;OClP^YNiCA^I{!I%gVj3%2aQ%BuAo
z+M7ASj>L0GE$AZ<Hj1=h%Mn3!R4~I77})OwTS(^ilIZh0Ckr+p*pbB07XsceO0{5X
z#<BG&wh$j!E7I}{%bwqYZ30*(@3ubUM|S{O=Ne@Twh3UL#j}SgNEy>>!PcG9&TR@t
zz8YK>4$EK01X!>Qtrg4$cG8Oqo+q>4lIV6a2dmgd7GY*)UckQ&*s<jBVnsDb-~$V`
z;nl6#6#Li#`#hdI2w}#xt5&hWOo0Y&Ibe&4++BhjEm$`J2nLpvbMm4qzeK62JOQy_
zn*>&{OGXoe+X=bmUrey3Adq4iZk_&EMw5dXQVv?M?lw$d=k;rECb~(A@$4-KKC@t(
z16B*aPN!pODJHUy0IalNn*w%%p~#BfUMU!`V*nOdu+0FAzO$KFx07NO6WP)>jqhun
zSL4o01LL7qwK|n*AGTnf`i8)D1tn2Zj+{9cO}XU+R<X?i`+M<abaQ{dOj)pQ4McFT
zFG7M%C)2UN{lza<vBAJ9E!dh$$A0*4MUe#?0IU}5JDrYQoUKgDf}I~&rA79g%EbEL
zRr_YZz5x)i;a1&o>^OwGPh{G@pR1tIfc*);77Ml>u)MESc*n^L(LZWcY079adw|4w
z3wBPh69i6#7RJuF^{+L-a{r^~=<C>R0^XLl&AhzK>y-k&gTkrf7us^QU{-}&rc>z3
zE)Of*B(UD@d4YudrbD=@Lep1zdOHh^0QC|Cx4~@>BgKWCdo{5WB5Mh>SCwqOe?@U7
xOBz?e2t}S~@J}*yTZ#Vh==qMP^MUC<=PjCY!Vvxs)$RZQ002ovPDHLkV1mGV=HCDS

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 b7adacbce..f1c1b67ee 100644
--- a/app/src/main/res/layout/activity_user_info.xml
+++ b/app/src/main/res/layout/activity_user_info.xml
@@ -84,6 +84,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:src="@drawable/ic_dy_in_room"
+                        android:visibility="gone"
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintTop_toTopOf="@id/tv_nick" />
 
diff --git a/app/src/main/res/layout/item_home_tab_map.xml b/app/src/main/res/layout/item_home_tab_map.xml
index ce809033b..56646e04a 100644
--- a/app/src/main/res/layout/item_home_tab_map.xml
+++ b/app/src/main/res/layout/item_home_tab_map.xml
@@ -74,6 +74,20 @@
             android:visibility="invisible"
             tools:visibility="visible" />
 
+        <TextView
+            android:id="@+id/tv_tag_in_pk"
+            android:layout_width="43dp"
+            android:layout_height="18dp"
+            android:background="@drawable/bg_room_pk_tag"
+            android:gravity="center"
+            android:includeFontPadding="false"
+            android:text="PK中"
+            android:textColor="@color/white"
+            android:textSize="11dp"
+            android:visibility="gone"
+            tools:visibility="visible" />
+
+
     </com.yizhuan.erban.ui.widget.SquareLayout>
 
     <TextView
diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/bean/HomeTabMapInfo.java b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/bean/HomeTabMapInfo.java
index 3d819ccc0..d6ff5f2ac 100644
--- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/bean/HomeTabMapInfo.java
+++ b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/bean/HomeTabMapInfo.java
@@ -6,26 +6,27 @@ import java.io.Serializable;
 
 public class HomeTabMapInfo implements MultiItemEntity, Serializable {
 
-        /**
-         * onlineNum : 1
-         * roomUid : 935007
-         * roomTitle : 大幽魂上衣的房间
-         * avatar : https://image.zhongjialx.com/rotate_picture_1587010848888.jpg?imageslim
-         * seq : 0
-         * isTop : true
-         */
+    public static final int TYPE_EMPTY = 0;
+    public static final int TYPE_NORMAL = 1;
+    /**
+     * onlineNum : 1
+     * roomUid : 935007
+     * roomTitle : 大幽魂上衣的房间
+     * avatar : https://image.zhongjialx.com/rotate_picture_1587010848888.jpg?imageslim
+     * seq : 0
+     * isTop : true
+     */
 
-        private int onlineNum;
-        private int roomUid;
-        private String title;
-        private String avatar;
-        private int seq;
-        private boolean isTop;
-        public static final int TYPE_EMPTY = 0;
-        public static final int TYPE_NORMAL = 1;
-        private int itemType=0;
-        private String tagPict;
-        private String iconContent;
+    private int onlineNum;
+    private int roomUid;
+    private String title;
+    private String avatar;
+    private int seq;
+    private boolean isTop;
+    private int itemType = 0;
+    private String tagPict;
+    private String iconContent;
+    private boolean crossPking;
 
     public String getIconContent() {
         return iconContent;
@@ -44,20 +45,20 @@ public class HomeTabMapInfo implements MultiItemEntity, Serializable {
     }
 
     public int getOnlineNum() {
-            return onlineNum;
-        }
+        return onlineNum;
+    }
 
-        public void setOnlineNum(int onlineNum) {
-            this.onlineNum = onlineNum;
-        }
+    public void setOnlineNum(int onlineNum) {
+        this.onlineNum = onlineNum;
+    }
 
-        public int getRoomUid() {
-            return roomUid;
-        }
+    public int getRoomUid() {
+        return roomUid;
+    }
 
-        public void setRoomUid(int roomUid) {
-            this.roomUid = roomUid;
-        }
+    public void setRoomUid(int roomUid) {
+        this.roomUid = roomUid;
+    }
 
     public String getTitle() {
         return title;
@@ -68,35 +69,43 @@ public class HomeTabMapInfo implements MultiItemEntity, Serializable {
     }
 
     public String getAvatar() {
-            return avatar;
-        }
+        return avatar;
+    }
 
-        public void setAvatar(String avatar) {
-            this.avatar = avatar;
-        }
+    public void setAvatar(String avatar) {
+        this.avatar = avatar;
+    }
 
-        public int getSeq() {
-            return seq;
-        }
+    public int getSeq() {
+        return seq;
+    }
 
-        public void setSeq(int seq) {
-            this.seq = seq;
-        }
+    public void setSeq(int seq) {
+        this.seq = seq;
+    }
 
-        public boolean isIsTop() {
-            return isTop;
-        }
+    public boolean isIsTop() {
+        return isTop;
+    }
 
-        public void setIsTop(boolean isTop) {
-            this.isTop = isTop;
-        }
+    public void setIsTop(boolean isTop) {
+        this.isTop = isTop;
+    }
 
-    public void setItemType(int itemType) {
-        this.itemType = itemType;
+    public boolean isCrossPking() {
+        return crossPking;
+    }
+
+    public void setCrossPking(boolean crossPking) {
+        this.crossPking = crossPking;
     }
 
     @Override
     public int getItemType() {
         return itemType;
     }
+
+    public void setItemType(int itemType) {
+        this.itemType = itemType;
+    }
 }