From 0d79cb5c293cddd295a119dbce333632374362fc Mon Sep 17 00:00:00 2001
From: wushaocheng <15876365887@163.com>
Date: Thu, 20 Oct 2022 15:35:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8C=87=E7=A4=BA=E5=99=A8?=
 =?UTF-8?q?=E6=A8=A3=E5=BC=8F=EF=BC=8Cpeko=E8=99=9F=E6=94=B9=E7=88=B2ID?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../anotherroompk/RoomPKCreateActivity.kt     |   2 +-
 .../SingleRoomPKCreateActivity.kt             |   2 +-
 .../singleroompk/SingleRoomPKSearchAdapter.kt |   2 +-
 .../adapter/CommonWrapIndicatorAdapter.java   | 104 ++++++++++++++++++
 .../ui/user/view/UserInfoGiftWallFragment.kt  |   4 +-
 .../GradientLineRoundPagerIndicator.java      |  28 +++++
 .../indicators/LinePagerIndicator.java        |   2 +-
 app/src/main/res/drawable/bg_ffffff_8.xml     |   9 ++
 .../layout/fragment_userinfo_gift_wall.xml    |   4 +-
 .../res/layout/fragment_userinfo_userinfo.xml |   6 +-
 app/src/main/res/values/strings.xml           |  52 ++++-----
 .../icon_square_dynamic_like_normal.png       | Bin 1381 -> 0 bytes
 .../icon_square_dynamic_like_normal.webp      | Bin 0 -> 1308 bytes
 .../res/layout/item_userinfo_dynamic.xml      |   2 +-
 .../hall/activity/SuperAdminAddActivity.kt    |   2 +-
 .../hall/adapter/ManageSuperAdminAdapter.kt   |   2 +-
 gradle.properties                             |   4 +-
 17 files changed, 183 insertions(+), 42 deletions(-)
 create mode 100644 app/src/main/java/com/yizhuan/erban/ui/user/adapter/CommonWrapIndicatorAdapter.java
 create mode 100644 app/src/main/java/com/yizhuan/erban/ui/widget/magicindicator/buildins/commonnavigator/indicators/GradientLineRoundPagerIndicator.java
 create mode 100644 app/src/main/res/drawable/bg_ffffff_8.xml
 delete mode 100644 app/src/module_community/res/drawable-xhdpi/icon_square_dynamic_like_normal.png
 create mode 100644 app/src/module_community/res/drawable-xhdpi/icon_square_dynamic_like_normal.webp

diff --git a/app/src/main/java/com/yizhuan/erban/avroom/anotherroompk/RoomPKCreateActivity.kt b/app/src/main/java/com/yizhuan/erban/avroom/anotherroompk/RoomPKCreateActivity.kt
index e2b450e51..64328905a 100644
--- a/app/src/main/java/com/yizhuan/erban/avroom/anotherroompk/RoomPKCreateActivity.kt
+++ b/app/src/main/java/com/yizhuan/erban/avroom/anotherroompk/RoomPKCreateActivity.kt
@@ -129,7 +129,7 @@ class RoomPKCreateActivity : BaseViewBindingActivity<ActivityRoomPkCreateBinding
                 binding.llPkRoom.isVisible = true
                 ImageLoadUtils.loadImage(this, it.avatar, binding.ivAvatar)
                 binding.tvRoomTitle.text = it.title.subAndReplaceDot(7)
-                binding.tvRoomId.text = "Peko號:${it.erbanNo}"
+                binding.tvRoomId.text = "ID:${it.erbanNo}"
                 checkCommitEnable()
             }
         }
diff --git a/app/src/main/java/com/yizhuan/erban/avroom/singleroompk/SingleRoomPKCreateActivity.kt b/app/src/main/java/com/yizhuan/erban/avroom/singleroompk/SingleRoomPKCreateActivity.kt
index 205f94336..507556355 100644
--- a/app/src/main/java/com/yizhuan/erban/avroom/singleroompk/SingleRoomPKCreateActivity.kt
+++ b/app/src/main/java/com/yizhuan/erban/avroom/singleroompk/SingleRoomPKCreateActivity.kt
@@ -129,7 +129,7 @@ class SingleRoomPKCreateActivity : BaseViewBindingActivity<ActivitySingleRoomPkC
                 binding.llPkRoom.isVisible = true
                 ImageLoadUtils.loadImage(this, it.avatar, binding.ivAvatar)
                 binding.tvRoomTitle.text = it.title.subAndReplaceDot(7)
-                binding.tvRoomId.text = "Peko號:${it.erbanNo}"
+                binding.tvRoomId.text = "ID:${it.erbanNo}"
                 checkCommitEnable()
             }
         }
diff --git a/app/src/main/java/com/yizhuan/erban/avroom/singleroompk/SingleRoomPKSearchAdapter.kt b/app/src/main/java/com/yizhuan/erban/avroom/singleroompk/SingleRoomPKSearchAdapter.kt
index b487d764e..b84434b52 100644
--- a/app/src/main/java/com/yizhuan/erban/avroom/singleroompk/SingleRoomPKSearchAdapter.kt
+++ b/app/src/main/java/com/yizhuan/erban/avroom/singleroompk/SingleRoomPKSearchAdapter.kt
@@ -15,7 +15,7 @@ class SingleRoomPKSearchAdapter :
 
     override fun convert(helper: BaseViewHolder, item: SimpleRoomInfo) {
         helper.setText(R.id.tv_room_title, item.nick.subAndReplaceDot(7))
-            .setText(R.id.tv_room_id, "Peko號:${item.erbanNo}")
+            .setText(R.id.tv_room_id, "ID:${item.erbanNo}")
         ImageLoadUtils.loadImage(mContext, item.avatar, helper.getView(R.id.iv_avatar))
         helper.addOnClickListener(R.id.iv_avatar, R.id.tv_select)
         val tvSelect = helper.getView<TextView>(R.id.tv_select)
diff --git a/app/src/main/java/com/yizhuan/erban/ui/user/adapter/CommonWrapIndicatorAdapter.java b/app/src/main/java/com/yizhuan/erban/ui/user/adapter/CommonWrapIndicatorAdapter.java
new file mode 100644
index 000000000..4c0354251
--- /dev/null
+++ b/app/src/main/java/com/yizhuan/erban/ui/user/adapter/CommonWrapIndicatorAdapter.java
@@ -0,0 +1,104 @@
+package com.yizhuan.erban.ui.user.adapter;
+
+import android.content.Context;
+import android.view.Gravity;
+import android.view.ViewGroup;
+import android.widget.FrameLayout;
+import android.widget.TextView;
+
+import androidx.core.content.ContextCompat;
+
+import com.yizhuan.erban.R;
+import com.yizhuan.erban.ui.widget.XRecyclerView.ScaleTransitionPagerTitleView;
+import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil;
+import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter;
+import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator;
+import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView;
+import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.indicators.GradientLinePagerIndicator;
+import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.indicators.GradientLineRoundPagerIndicator;
+import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.indicators.LinePagerIndicator;
+
+import java.util.List;
+
+public class CommonWrapIndicatorAdapter extends CommonNavigatorAdapter {
+    private final Context mContext;
+    private final List<? extends CharSequence> mTitleList;
+
+    private int textSize = 18;
+    private float minScale = 0.75f;
+    private boolean showIndicator = true;
+    private OnItemSelectListener mOnItemSelectListener;
+
+    public CommonWrapIndicatorAdapter(Context context, List<? extends CharSequence> charSequences) {
+        this.mContext = context;
+        this.mTitleList = charSequences;
+    }
+
+    @Override
+    public int getCount() {
+        return mTitleList == null ? 0 : mTitleList.size();
+    }
+
+    @Override
+    public IPagerTitleView getTitleView(Context context, final int i) {
+        ScaleTransitionPagerTitleView scaleTransitionPagerTitleView = new ScaleTransitionPagerTitleView(context, true);
+        scaleTransitionPagerTitleView.setNormalColor(ContextCompat.getColor(context, R.color.color_6D6B89));
+        scaleTransitionPagerTitleView.setSelectedColor(ContextCompat.getColor(context, R.color.color_1F1A4E));
+        scaleTransitionPagerTitleView.setMinScale(minScale);
+        scaleTransitionPagerTitleView.setTextSize(textSize);
+        int padding = UIUtil.dip2px(context, 12);
+        scaleTransitionPagerTitleView.setPadding(padding, 0, padding, 0);
+        scaleTransitionPagerTitleView.setText(mTitleList.get(i));
+        scaleTransitionPagerTitleView.setOnClickListener(view -> {
+            if (mOnItemSelectListener != null) {
+                mOnItemSelectListener.onItemSelect(i, scaleTransitionPagerTitleView);
+            }
+
+        });
+        return scaleTransitionPagerTitleView;
+    }
+
+    @Override
+    public IPagerIndicator getIndicator(Context context) {
+        if (!showIndicator) return null;
+        GradientLineRoundPagerIndicator indicator = new GradientLineRoundPagerIndicator(context);
+        indicator.setMode(LinePagerIndicator.MODE_EXACTLY);
+        FrameLayout.LayoutParams lp = new FrameLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+        lp.gravity = Gravity.END;
+        lp.bottomMargin = UIUtil.dip2px(mContext, 0);
+        indicator.setLayoutParams(lp);
+        return indicator;
+    }
+
+    public int getTextSize() {
+        return textSize;
+    }
+
+    public void setTextSize(int textSize) {
+        this.textSize = textSize;
+    }
+
+    public float getMinScale() {
+        return minScale;
+    }
+
+    public void setMinScale(float minScale) {
+        this.minScale = minScale;
+    }
+
+    public boolean isShowIndicator() {
+        return showIndicator;
+    }
+
+    public void setShowIndicator(boolean showIndicator) {
+        this.showIndicator = showIndicator;
+    }
+
+    public void setOnItemSelectListener(OnItemSelectListener onItemSelectListener) {
+        mOnItemSelectListener = onItemSelectListener;
+    }
+
+    public interface OnItemSelectListener {
+        void onItemSelect(int position, TextView view);
+    }
+}
diff --git a/app/src/main/java/com/yizhuan/erban/ui/user/view/UserInfoGiftWallFragment.kt b/app/src/main/java/com/yizhuan/erban/ui/user/view/UserInfoGiftWallFragment.kt
index ef2951fc2..bf5b7e4e0 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/user/view/UserInfoGiftWallFragment.kt
+++ b/app/src/main/java/com/yizhuan/erban/ui/user/view/UserInfoGiftWallFragment.kt
@@ -9,7 +9,7 @@ import com.yizhuan.erban.R
 import com.yizhuan.erban.base.BaseViewBindingFragment
 import com.yizhuan.erban.databinding.FragmentUserinfoGiftWallBinding
 import com.yizhuan.erban.ui.user.UserInfoGiftFragment
-import com.yizhuan.erban.ui.user.adapter.UserInfoIndicatorAdapter
+import com.yizhuan.erban.ui.user.adapter.CommonWrapIndicatorAdapter
 import com.yizhuan.erban.ui.user.adapter.UserInfoPagerAdapter
 import com.yizhuan.erban.ui.widget.magicindicator.MagicIndicator
 import com.yizhuan.erban.ui.widget.magicindicator.ViewPagerHelper
@@ -42,7 +42,7 @@ class UserInfoGiftWallFragment : BaseViewBindingFragment<FragmentUserinfoGiftWal
         tagList.add(getString(R.string.me_lucky_gift))
         val commonNavigator = CommonNavigator(context)
         commonNavigator.setTitleWrapContent(true)
-        val magicIndicatorAdapter = UserInfoIndicatorAdapter(context, tagList)
+        val magicIndicatorAdapter = CommonWrapIndicatorAdapter(context, tagList)
         magicIndicatorAdapter.setOnItemSelectListener { position: Int, view: TextView? ->
             viewPager.currentItem = position
         }
diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/magicindicator/buildins/commonnavigator/indicators/GradientLineRoundPagerIndicator.java b/app/src/main/java/com/yizhuan/erban/ui/widget/magicindicator/buildins/commonnavigator/indicators/GradientLineRoundPagerIndicator.java
new file mode 100644
index 000000000..3e7d14859
--- /dev/null
+++ b/app/src/main/java/com/yizhuan/erban/ui/widget/magicindicator/buildins/commonnavigator/indicators/GradientLineRoundPagerIndicator.java
@@ -0,0 +1,28 @@
+package com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.indicators;
+
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.LinearGradient;
+
+import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil;
+
+/**
+ * 实现渐变指示器帮助类
+ */
+public class GradientLineRoundPagerIndicator extends LinePagerIndicator {
+
+    private Context mContext;
+
+    public GradientLineRoundPagerIndicator(Context context) {
+        super(context);
+        mContext = context;
+    }
+
+    @Override
+    protected void onDraw(Canvas canvas) {
+        LinearGradient lg = new LinearGradient(getLineRect().left, getLineRect().top, getLineRect().right, getLineRect().bottom, new int[]{0xFF13E2F5, 0xFFCC66FF}, null, LinearGradient.TileMode.CLAMP);
+        getPaint().setShader(lg);
+        canvas.drawRoundRect(getLineRect(), UIUtil.dip2px(mContext, 2), UIUtil.dip2px(mContext, 2), getPaint());
+    }
+
+}
diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/magicindicator/buildins/commonnavigator/indicators/LinePagerIndicator.java b/app/src/main/java/com/yizhuan/erban/ui/widget/magicindicator/buildins/commonnavigator/indicators/LinePagerIndicator.java
index 5815a019d..8b073bc81 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/widget/magicindicator/buildins/commonnavigator/indicators/LinePagerIndicator.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/widget/magicindicator/buildins/commonnavigator/indicators/LinePagerIndicator.java
@@ -54,7 +54,7 @@ public class LinePagerIndicator extends View implements IPagerIndicator {
         mPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
         mPaint.setStyle(Paint.Style.FILL);
         mLineHeight = UIUtil.dip2px(context, 3);
-        mLineWidth = UIUtil.dip2px(context, 10);
+        mLineWidth = UIUtil.dip2px(context, 15);
     }
 
     @Override
diff --git a/app/src/main/res/drawable/bg_ffffff_8.xml b/app/src/main/res/drawable/bg_ffffff_8.xml
new file mode 100644
index 000000000..293b10737
--- /dev/null
+++ b/app/src/main/res/drawable/bg_ffffff_8.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <corners android:radius="@dimen/dp_8"/>
+
+    <solid android:color="@color/color_FFFFFF"/>
+
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_userinfo_gift_wall.xml b/app/src/main/res/layout/fragment_userinfo_gift_wall.xml
index 04c059c85..342e2c0bd 100644
--- a/app/src/main/res/layout/fragment_userinfo_gift_wall.xml
+++ b/app/src/main/res/layout/fragment_userinfo_gift_wall.xml
@@ -9,7 +9,7 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/dp_7"
         android:layout_marginEnd="@dimen/dp_7"
-        android:background="@drawable/bg_user_info_skill"
+        android:background="@drawable/bg_ffffff_8"
         android:orientation="vertical"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintTop_toTopOf="parent"
@@ -18,7 +18,7 @@
         <com.yizhuan.erban.ui.widget.magicindicator.MagicIndicator
             android:id="@+id/magic_indicator_gift"
             android:layout_width="wrap_content"
-            android:layout_height="20dp"
+            android:layout_height="25dp"
             android:layout_gravity="center_horizontal"
             android:layout_marginTop="4dp" />
 
diff --git a/app/src/main/res/layout/fragment_userinfo_userinfo.xml b/app/src/main/res/layout/fragment_userinfo_userinfo.xml
index fea1ee7bd..1df21a733 100644
--- a/app/src/main/res/layout/fragment_userinfo_userinfo.xml
+++ b/app/src/main/res/layout/fragment_userinfo_userinfo.xml
@@ -15,7 +15,7 @@
             android:layout_height="wrap_content"
             android:layout_marginLeft="@dimen/dp_7"
             android:layout_marginRight="@dimen/dp_7"
-            android:background="@drawable/bg_user_info_skill"
+            android:background="@drawable/bg_ffffff_8"
             android:orientation="vertical"
             android:paddingLeft="@dimen/dp_20"
             android:paddingTop="@dimen/dp_18"
@@ -47,7 +47,7 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/dp_7"
             android:layout_marginEnd="@dimen/dp_7"
-            android:background="@drawable/bg_user_info_skill"
+            android:background="@drawable/bg_ffffff_8"
             android:orientation="vertical"
             android:paddingStart="20dp"
             android:paddingTop="18dp"
@@ -285,7 +285,7 @@
             android:layout_height="90dp"
             android:layout_marginStart="@dimen/dp_7"
             android:layout_marginEnd="@dimen/dp_7"
-            android:background="@drawable/bg_user_info_skill"
+            android:background="@drawable/bg_ffffff_8"
             android:orientation="vertical"
             android:paddingStart="20dp"
             android:paddingTop="18dp"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 035a6d3c7..02370966e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -160,7 +160,7 @@
 
 
     <!--我的頁面-->
-    <string name="me_user_id">Peko號:%d</string>
+    <string name="me_user_id">ID:%d</string>
     <string name="my_attention">我的關註</string>
     <string name="my_fan">我的粉絲</string>
 
@@ -369,7 +369,7 @@
     <string name="text_check_damage">查看傷害排行榜</string>
     <string name="title_monster_hunting_reward">獲得獎勵(%s)</string>
     <string name="currency_unit">鉆石</string>
-    <string name="text_user_id">Peko號:%s</string>
+    <string name="text_user_id">ID:%s</string>
     <string name="format_monster_hunting_impact">傷害 %s 點/次</string>
     <string name="format_monster_hunting_magic_value">(%s鉆石)</string>
     <string name="exchange_gold_tips">鉆石可以兌換鉆石，兌換比率：1鉆石=%s鉆石；\n</string>
@@ -866,12 +866,12 @@
 
     <string name="gold_give">鉆石轉贈</string>
     <string name="donee">受贈人</string>
-    <string name="done_hint_input_phone_or_id">請輸入手機號/Peko號</string>
+    <string name="done_hint_input_phone_or_id">請輸入手機號/ID</string>
     <string name="give_value">轉贈金額</string>
     <string name="custom_input">自定義輸入</string>
     <string name="give_immediately">立即轉贈</string>
     <string name="my_give_record">我的轉贈記錄</string>
-    <string name="send_gold_confirm_info">%1$s&#160;(Peko號:&#160;%2$s)</string>
+    <string name="send_gold_confirm_info">%1$s&#160;(ID:&#160;%2$s)</string>
 
     <string name="back_login_page">返回登錄頁</string>
     <string name="privacy_setting">隱私設置</string>
@@ -1010,7 +1010,7 @@
     <string name="me_error_playing">播放出錯，請重試</string>
     <string name="me_roomid">房間ID:</string>
     <string name="me_room_number_people">房間人數:</string>
-    <string name="me_peko_number">Peko號:</string>
+    <string name="me_peko_number">ID:</string>
     <string name="me_association">公會</string>
     <string name="me_association_id">公會ID:</string>
     <string name="me_association_number">公會人數:</string>
@@ -2053,7 +2053,7 @@
     <string name="home_adapter_roomgameadapter_03">等人中</string>
     <string name="home_adapter_roomhotadapter_01">熱門進入房間</string>
     <string name="home_adapter_roomlikeadapter_01">成功進入收藏的房間</string>
-    <string name="home_adapter_visitorlistadapter_01">Peko號：</string>
+    <string name="home_adapter_visitorlistadapter_01">ID：</string>
     <string name="home_dialog_hellomessagedialog_01">Ta給你發送了一條消息~</string>
     <string name="home_dialog_hellomessagedialog_02">Ta們向你發送了多條消息~</string>
     <string name="home_fragment_contactslistfragment_01">暫無未讀消息需要清理</string>
@@ -2375,7 +2375,7 @@
     <string name="im_fragment_messagefragment_02">暫未達到可發起私聊等級</string>
     <string name="im_fragment_messagefragment_03">財富等級≥</string>
     <string name="im_fragment_messagefragment_04">魅力等級≥</string>
-    <string name="im_friend_friendlistadapter_01">Peko號：</string>
+    <string name="im_friend_friendlistadapter_01">ID：</string>
     <string name="im_friend_friendlistfragment_01">界面已銷毀</string>
     <string name="ui_im_messagelistpanelex_01">路徑錯誤</string>
     <string name="ui_im_messagelistpanelex_02">路徑錯誤</string>
@@ -2771,7 +2771,7 @@
     <string name="ui_widget_userinfodialog_03">已關註Ta</string>
     <string name="ui_widget_userinfodialog_04">關註Ta</string>
     <string name="ui_widget_userinfodialog_05">數據加載中,請稍後...</string>
-    <string name="ui_widget_userinfodialog_06">Peko號:</string>
+    <string name="ui_widget_userinfodialog_06">ID:</string>
     <string name="ui_widget_userinfodialog_07">粉絲</string>
     <string name="ui_widget_userinfodialog_08">獲取用戶房間信息異常。</string>
     <string name="ui_widget_userinfodialog_09">獲取用戶房間信息異常。</string>
@@ -2988,7 +2988,7 @@
     <string name="layout_activity_room_pk_create_01">跨房PK</string>
     <string name="layout_activity_room_pk_create_02">選擇PK對象</string>
     <string name="layout_activity_room_pk_create_03">廳的名字000</string>
-    <string name="layout_activity_room_pk_create_04">Peko號:1234</string>
+    <string name="layout_activity_room_pk_create_04">ID:1234</string>
     <string name="layout_activity_room_pk_create_05">選擇PK時長</string>
     <string name="layout_activity_room_pk_create_06">10分鐘</string>
     <string name="layout_activity_room_pk_create_07">20分鐘</string>
@@ -2998,7 +2998,7 @@
     <string name="layout_activity_room_pk_create_011">PK玩法</string>
     <string name="layout_activity_room_pk_create_012">選填，10個字以內</string>
     <string name="layout_activity_room_pk_create_013">發起挑戰</string>
-    <string name="layout_activity_room_pk_search_01">請輸入Peko號</string>
+    <string name="layout_activity_room_pk_search_01">請輸入ID</string>
     <string name="layout_activity_room_pk_search_02">確認選擇</string>
     <string name="layout_activity_room_rank_list_01">房間的背景</string>
     <string name="layout_activity_room_setting_01">房間名</string>
@@ -3028,7 +3028,7 @@
     <string name="layout_activity_single_room_pk_create_01">主播PK</string>
     <string name="layout_activity_single_room_pk_create_02">選擇PK對象:</string>
     <string name="layout_activity_single_room_pk_create_03">廳的名字000</string>
-    <string name="layout_activity_single_room_pk_create_04">Peko號:1234</string>
+    <string name="layout_activity_single_room_pk_create_04">ID:1234</string>
     <string name="layout_activity_single_room_pk_create_05">選擇PK時長:</string>
     <string name="layout_activity_single_room_pk_create_06">10分鐘</string>
     <string name="layout_activity_single_room_pk_create_07">20分鐘</string>
@@ -3038,7 +3038,7 @@
     <string name="layout_activity_single_room_pk_create_011">PK玩法:</string>
     <string name="layout_activity_single_room_pk_create_012">選填，10個字以內</string>
     <string name="layout_activity_single_room_pk_create_013">發起挑戰</string>
-    <string name="layout_activity_single_room_pk_search_01">請輸入Peko號</string>
+    <string name="layout_activity_single_room_pk_search_01">請輸入ID</string>
     <string name="layout_activity_splash_01">點擊進入更多精彩</string>
     <string name="layout_activity_tarot_pay_web_view_01">常見問題</string>
     <string name="layout_activity_team_management_01">群主</string>
@@ -3057,7 +3057,7 @@
     <string name="layout_activity_verify_phone_02">驗證碼:</string>
     <string name="layout_activity_verify_phone_03">請輸入驗證碼</string>
     <string name="layout_activity_verify_phone_04">下一步</string>
-    <string name="layout_activity_verify_phone_05">如果您的手機號已丟失\n請咨詢客服，Peko號：88001</string>
+    <string name="layout_activity_verify_phone_05">如果您的手機號已丟失\n請咨詢客服，ID：88001</string>
     <string name="layout_activity_withdraw_01">請綁定你的支付寶賬號</string>
     <string name="layout_activity_withdraw_02">羅生</string>
     <string name="layout_activity_withdraw_03">鉆石余額</string>
@@ -3376,7 +3376,7 @@
     <string name="layout_fragment_gift_income_01">2017年9月11日</string>
     <string name="layout_fragment_live_01">曾經看過的人</string>
     <string name="layout_fragment_me_01">黨移動黨移動地下黨黨移動地下黨黨移動地下黨地下黨</string>
-    <string name="layout_fragment_me_02">Peko號:123456</string>
+    <string name="layout_fragment_me_02">ID:123456</string>
     <string name="layout_fragment_me_03">摩羯座</string>
     <string name="layout_fragment_me_04">神皇</string>
     <string name="layout_fragment_radish_record_01">2017年9月11日</string>
@@ -3401,7 +3401,7 @@
     <string name="layout_fragment_userinfo_info_06">所屬房間</string>
     <string name="layout_fragment_userinfo_info_07">忘忘憂忘忘憂閣忘憂閣憂閣閣忘憂閣憂閣</string>
     <string name="layout_fragment_userinfo_info_08">公會ID：123456</string>
-    <string name="layout_fragment_userinfo_info_09">Peko號：1234567</string>
+    <string name="layout_fragment_userinfo_info_09">ID：1234567</string>
     <string name="layout_fragment_userinfo_info_010">房間人數：123</string>
     <string name="layout_fragment_userinfo_info_011">申請加入</string>
     <string name="layout_fragment_userinfo_info_012">技能卡</string>
@@ -3411,7 +3411,7 @@
     <string name="layout_fragment_userinfo_userinfo_03">公會人數：123</string>
     <string name="layout_fragment_userinfo_userinfo_04">公會數量：123</string>
     <string name="layout_fragment_userinfo_userinfo_05">公會ID：123456</string>
-    <string name="layout_fragment_userinfo_userinfo_06">Peko號：1234567</string>
+    <string name="layout_fragment_userinfo_userinfo_06">ID：1234567</string>
     <string name="layout_fragment_userinfo_userinfo_07">房間人數：123</string>
     <string name="layout_fragment_voice_card_01">念一下這句話吧念一下這句話吧念一下這句話吧</string>
     <string name="layout_global_broadcast_notice_layout_01">恭喜「Tm.八米大雕青木」保皇成功，哈啊啊啊啊啊啊啊啊啊啊啊</string>
@@ -3511,7 +3511,7 @@
     <string name="layout_item_home_tab_map_03">房間名稱房間名稱房間名稱</string>
     <string name="layout_item_home_two_single_show_01">房間名稱</string>
     <string name="layout_item_home_visitor_list_01">交友廳官方交友廳交友廳官方交友廳</string>
-    <string name="layout_item_home_visitor_list_02">Peko號：1234567</string>
+    <string name="layout_item_home_visitor_list_02">ID：1234567</string>
     <string name="layout_item_home_visitor_list_03">37分鐘前看過你</string>
     <string name="layout_item_ktv_boss_micro_01">紅隊</string>
     <string name="layout_item_ktv_boss_micro_02">狐仙嘎嘎</string>
@@ -3602,7 +3602,7 @@
     <string name="layout_item_room_like_01">PK中</string>
     <string name="layout_item_room_like_02">余生點唱歌曲交友房間</string>
     <string name="layout_item_room_pk_search_01">廳的名字000</string>
-    <string name="layout_item_room_pk_search_02">Peko號:1234</string>
+    <string name="layout_item_room_pk_search_02">ID:1234</string>
     <string name="layout_item_room_rank_layout_01">這是房間標題這是房間標題</string>
     <string name="layout_item_room_rank_layout_02">距離上一名</string>
     <string name="layout_item_room_select_game_01">碰碰我最強</string>
@@ -3610,7 +3610,7 @@
     <string name="layout_item_send_02">什麽也沒留下</string>
     <string name="layout_item_send_broadcast_01">想和大家來聊一聊，有人來聊聊聊聊聊嗎？</string>
     <string name="layout_item_single_room_pk_search_01">廳的名字000</string>
-    <string name="layout_item_single_room_pk_search_02">Peko號:1234</string>
+    <string name="layout_item_single_room_pk_search_02">ID:1234</string>
     <string name="layout_item_single_room_pk_search_03">選擇</string>
     <string name="layout_item_skill_selection_01">QQ區</string>
     <string name="layout_item_system_notice_01">名稱</string>
@@ -3815,7 +3815,7 @@
     <string name="layout_list_withdraw_bills_item_02">+68元</string>
     <string name="layout_maint_tab_red_poin_layout_01">首頁</string>
     <string name="layout_newbie_list_item_01">我的我的我的我的我的我的</string>
-    <string name="layout_newbie_list_item_02">Peko號:666666</string>
+    <string name="layout_newbie_list_item_02">ID:666666</string>
     <string name="layout_newbie_message_item_01">哈哈哈哈</string>
     <string name="layout_nim_recent_contact_list_item_01">你好啊啊啊啊啊啊啊啊</string>
     <string name="layout_nim_recent_contact_list_item_02">我是內容</string>
@@ -4074,7 +4074,7 @@
     <string name="hall_activity_membersearchactivity_01">沒有搜到相關消息</string>
     <string name="hall_activity_membersearchactivity_02">請輸入搜索內容</string>
     <string name="hall_activity_moduleclanactivity_01">我的廳入口</string>
-    <string name="hall_activity_moduleclanactivity_02">Peko號:</string>
+    <string name="hall_activity_moduleclanactivity_02">ID:</string>
     <string name="hall_activity_moduleclanactivity_03">公會房間(</string>
     <string name="hall_activity_moduleclanactivity_04">公會房間數量:</string>
     <string name="hall_activity_moduleclanactivity_05">模廳成員加載失敗...</string>
@@ -4208,7 +4208,7 @@
     <string name="team_activity_teaminfoshowactivity_08">退出群</string>
     <string name="team_activity_teaminfoshowactivity_09">解散群將會清除所有群聊信息，確認解散嗎？</string>
     <string name="team_activity_teaminfoshowactivity_010">退出群將會清除群聊信息，確認退出嗎？</string>
-    <string name="layout_activity_add_member_01">搜索用戶昵稱/Peko號</string>
+    <string name="layout_activity_add_member_01">搜索用戶昵稱/ID</string>
     <string name="layout_activity_admin_add_01">總人數:0人</string>
     <string name="layout_activity_clan_income_01">2019年</string>
     <string name="layout_activity_clan_income_02">01月01日</string>
@@ -4244,7 +4244,7 @@
     <string name="layout_activity_module_hall_04">管理</string>
     <string name="layout_activity_module_hall_05">哈哈哈哈</string>
     <string name="layout_activity_module_hall_06">退出房間</string>
-    <string name="layout_activity_remove_member_01">搜索用戶昵稱/Peko號</string>
+    <string name="layout_activity_remove_member_01">搜索用戶昵稱/ID</string>
     <string name="layout_activity_select_group_member_01">已選擇人數 : 5人</string>
     <string name="layout_activity_single_room_income_01">2019年</string>
     <string name="layout_activity_single_room_income_02">01月01日</string>
@@ -4254,7 +4254,7 @@
     <string name="layout_activity_single_room_income_06">昵稱</string>
     <string name="layout_activity_single_room_income_07">主播(鉆石)</string>
     <string name="layout_activity_single_room_income_08">房間(鉆石)</string>
-    <string name="layout_activity_super_admin_add_01">請輸入公會成員Peko號</string>
+    <string name="layout_activity_super_admin_add_01">請輸入公會成員ID</string>
     <string name="layout_activity_super_admin_manege_01">添加公會超管</string>
     <string name="layout_activity_super_admin_room_set_01">確認</string>
     <string name="layout_activity_team_edit_01">150字內</string>
@@ -4314,7 +4314,7 @@
     <string name="layout_item_manage_room_01">峨眉峨眉派派</string>
     <string name="layout_item_manage_room_set_01">女神沒有大長腿</string>
     <string name="layout_item_manage_super_admin_01">公會會長</string>
-    <string name="layout_item_manage_super_admin_02">Peko號:886887</string>
+    <string name="layout_item_manage_super_admin_02">ID:886887</string>
     <string name="layout_item_manage_super_admin_03">公會房間數量:11</string>
     <string name="layout_item_manage_super_admin_04">管理的房間</string>
     <string name="layout_item_member_01">小澀瑤小澀瑤小澀瑤</string>
@@ -4749,7 +4749,7 @@
     <string name="room_chat_activity_roommsgactivity_02">好友</string>
     <string name="room_chat_activity_roommsgactivity_03">粉絲</string>
     <string name="room_chat_activity_roommsgactivity_04">關註</string>
-    <string name="room_chat_adapter_roomnewbielistadapter_01">Peko號:</string>
+    <string name="room_chat_adapter_roomnewbielistadapter_01">ID:</string>
     <string name="room_chat_fragment_roommsgfriendlistfragment_01">界面已銷毀</string>
     <string name="room_chat_fragment_roommsgrecentcontactsfragment_01">你還沒有聊天記錄哦!\n快去和好友聊天吧!</string>
     <string name="room_chat_fragment_roommsgrecentcontactsfragment_02">刪除該聊天</string>
diff --git a/app/src/module_community/res/drawable-xhdpi/icon_square_dynamic_like_normal.png b/app/src/module_community/res/drawable-xhdpi/icon_square_dynamic_like_normal.png
deleted file mode 100644
index 11975fb98c22322cbc515beaf000c7567ceca29a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1381
zcmV-r1)BPaP)<h;3K|Lk000e1NJLTq001li001lq1^@s69)wx}00001b5ch_0Itp)
z=>Px)A4x<(R9Hvtn16^=RTRg+=gwPYYo!J(NNuH{sB|R_4Xi8!?T^|Y^X_{ub4?PI
zLLsEcf~ZWwNU4aRSW(E8qHNxeWtR>A=!X@CX3|ecqg;X_E3~wAXLs&>C$5ZOwma{=
z8T-T7`|q4{&u6~(ymQXIg!63CdB%%z;Q#u>#uXk{_$&qfzbVn%+dEY$^<W&wcM{PR
z%*+4=0PGe*Y%dfF`>LfwPfyPjt@XXkd>eo(0SF>G%*_3kWo>J3Z$FVHol+?r1i=z!
z-U47!l}!)Car~6)x_xKb6pO_fMD#R(b^z8G{=WzzmK6$xcaxwKfukr|s<qx>6af(B
za=8~88ygRlN+qF`GB9^B^L+rOR)R%DbboVm^Ra<}fel3TFn|UCB_ayrIQE4QUn!-^
zmSxQXu(qQ52s5`ij<c&8bXDMDv3Ly;eGXtEGp}<TXY**A_4oHrER{;Dnb|05PT?m2
zKLeNxKm*ujS=N*7?d?ZK^ACdHS!R9=zzMDOOwaRv91FTCu<!f30W1KpRZ6)k>9~B~
zpH4*EnfX>@OGE=&>rU5o_aym-Vfbbo$9FSxpW`^KnSp)ZH|p#oqF<F#S9_lKXHrn}
z`_7#^b40YnvaEc$T;7qv?~+_DcZi5C0x-+A?XO3RH>Sct5WLFF4-nBt+qNH116!|+
z@B1&BoF<}|Y};O&6?i{0-#|q3ZQK5&UYIogQ54;xwf@kYtd#P`tiZ>ad6Ez!Unms*
zNE5JLo4&rj{P6JbQ6f5S+qOxKf30dMaSC{FaIk6l^5ui|!ld!<?d`o_WMss|8kABt
zWdinn-;|}x8X6j=x3#s6S!U9Jq_r{KP$^|f;%`#QOEUonL9mON7ZXvdZQK9oUTFcc
z+J#}bIF4h}INq01-ku5A_x%k3o&fNQlyXhh;I-HXLGU~?KLlWtl=9I`z)=*nXsy2l
za71g}?0McuEf8saO#RN~az6lQ1~5-b`DrF#W9<9>X8`5^SS6+0nl^YXc3~La6UXrz
z0KSz{UOUzvRa<iuMUK|`Z2*V0)-ycM8>$5+$)~HUt6}ow$zK34pev-5uhj&+e*JpU
z($caYz-$1|NGVNDpY!GW{yG595z)bXK0kBe!iB0PVB=IQ7EQ<5Lqv+17dVcy_goSO
zK`@h<_YzT~)_Rfax>aZ5#Ch1jo$>V!luD&Jot>S>&INRLclU)&O-=il`8p!nYTI_=
zM3@S=l4Bp6ua}5EP)glVZ`G(&g%E%lCBK<4VZyxD*4C3rLZkw&RE%i=%n&q<h~CcU
z^GmDcTD8E;Oko&qVdj-Y^m`n~^Bu?eE(zBBo*LK~_w@A4Qc9Vj{$c~Ilv<WmX=WBd
z5Oe`p3E*Tdms`})(UCadpZ+tMfGbMRB_h+d^QMIgA?&o%TxGa<9YBW}aEPeQw(a-Q
zC|fgdrE<(BA~Ro10r0&L!YLFA=I%G<Di(`Z5mC|HCIB3b<G90h-H)=sW=@GSH;<y|
za;<e#>4d|kPHU|<ot+|;k83r6jR2aM`JfQOD0?U?Y+b;{+1!?ghK9^d+6+hL8Q`!G
zVsp7%4lT<n129hjj{ul)Di~3>QfiIod4JUcTQ~6Opg|Da4B%yEzJ4?iB08kCUhBH<
zJGFw=mBXV2t(2;^IF45cA#P%3^U7noVz<`%Ezk4J`$XL<bCsw&Vx1d|1J@~FqWieQ
ni4xUmFs^W&0w%hjcMAUvls+X(E@Eru00000NkvXXu0mjfS1g&V

diff --git a/app/src/module_community/res/drawable-xhdpi/icon_square_dynamic_like_normal.webp b/app/src/module_community/res/drawable-xhdpi/icon_square_dynamic_like_normal.webp
new file mode 100644
index 0000000000000000000000000000000000000000..ddf8316d5f9e97d6fe0055df016c5b8064fd0860
GIT binary patch
literal 1308
zcmWIYbaNA7Wnc(*bqWXzu!!JdU|=u+Vr4M$baoDqU;=U(m?S_X3s5RIucRo*-AN%L
zGD-m?1_O!7#RV`n7MhWP;oCI^Aj!aRSr>~uAtBC`)Z%2Iq7Oh^QUtV|fq^jv$QDV5
zuq#09BnZ0)#4ZX6at5kd0Ay>VBe9c^*ySY!B|tSNK<bkVia_i;K(<Y8PASMP5CFND
zCp9lL7)VC|u?#~oLlA>IgA<TVRe%W3{6!257GD_{m?t2_l4de6Y;R>?khp~qQ(3^k
zz~92au<d+7Vo@U4F)TomDJ_kG;nQ*k2Hr>p2H^_~3|!GLha&VM;sS?X6@YqVfd0$}
z!gPilhExUx22X}OhGYgkAj=4tNDLXwfGNi38Zdq6D<9wxsDG?BDL3-v=Nr5VOkW<b
zXGSQt_PoiLk?u>rJ*~HNo*kp3Kz~h(nrLuZ+Wz7@*S49;KCjuYD6@Nk++Ph}LnWn)
zXBuy8o2X(L9uj)Lo{@Rp`N_9)-+#0?_qz1k-+R06^M9_>kI@rfe)*Eg+HX~<cJp7q
z{ce5v%ZrLR=I7r}`rm7K=Ci@E55Moq_CMa8+kgD$*2jzg)~ehxQ;oWQ{&}7K?9`vz
z@1IYLwcmZ;e|iSb@Bgp=v%i)2`ahfJ-~ajxN?H%4*FAMe3W?@eB=2%s!h-7nQ;$lF
zw}#_w?=^p&Ij`>$Iq)?8(VzcsBz$J4)NEG}u&ohb;oq{SC3EtMr79c&YlVP_;l#Gw
z+Y^>dow+>cHjuR~R`mCO`RbG-XFCjkF)RH#e<1g^g<I7dGqKzKuo%HlU)p^=zkXld
zwCKm4Vjr(PoxOhk?XUAno@eZxs^Yn8Rr9aa3f;H2J<v1L)bw~>Uhv_%XR^_=<1>~V
zf4FMSo>wQs?H6A^`D)LcRS(%cAMd;Pz;pM{w6wIN&rcRcy-A<AU%RsRq<pdN+te99
zUp_fkUw7^~TV%=`&+CO56X$iG(K(@hc8*Hdyrp6h6PBHUfIFtDx(B9)NV9IeBwFLq
z8W^Clw|U7LjT4ht`hz@0rg-%i=xlX&Y%k#vz7!>r^TR6U<;m5ZAC{=EXSy-vom0Ht
z?&)TetTgK<>dDCZUA*i4a^)TMWzX_oD%qdW*fC+>Y^FnRe@#6%M>OE}%rCcJUZ_7m
zzeFTprgNqGrTqTODz)>r%%7d~#yc*bYcsFMt#f6)Z)83HYRX!wWNKel?AP^lR?M;1
z$~0A8@H^B~dEuV9B~OE9ooDj)RBz*Hkn}9hOv@~uv@E!_<?#K@lct?MHBI&GF(-A;
hB-M<cQ;+Q5!5QEEZ{v&(F|WDp`T6W~|7Sj61ONz;uMz+N

literal 0
HcmV?d00001

diff --git a/app/src/module_community/res/layout/item_userinfo_dynamic.xml b/app/src/module_community/res/layout/item_userinfo_dynamic.xml
index 20775df38..dd8294c4a 100644
--- a/app/src/module_community/res/layout/item_userinfo_dynamic.xml
+++ b/app/src/module_community/res/layout/item_userinfo_dynamic.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/bg_user_info_skill"
+    android:background="@drawable/bg_ffffff_8"
     android:orientation="vertical">
 
     <TextView
diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/SuperAdminAddActivity.kt b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/SuperAdminAddActivity.kt
index 30c2151a5..316bc7a06 100644
--- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/SuperAdminAddActivity.kt
+++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/SuperAdminAddActivity.kt
@@ -58,7 +58,7 @@ class SuperAdminAddActivity : BaseViewBindingActivity<ActivitySuperAdminAddBindi
         binding.tvSearch.setOnClickListener {
             val id = binding.searchEdit.text?.toString()?.toLongOrNull()
             if (id == null) {
-                "請輸入Peko號!".toast()
+                "請輸入ID!".toast()
             } else {
                 searchId = id
                 loadData()
diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/adapter/ManageSuperAdminAdapter.kt b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/adapter/ManageSuperAdminAdapter.kt
index b125de5eb..24e236a12 100644
--- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/adapter/ManageSuperAdminAdapter.kt
+++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/adapter/ManageSuperAdminAdapter.kt
@@ -18,7 +18,7 @@ class ManageSuperAdminAdapter :
         ImageLoadUtils.loadAvatar(item.avatar, helper.getView(R.id.iv_avatar))
 
         helper.setText(R.id.tv_nickname,item.nick)
-            .setText(R.id.tv_id,"Peko號:${item.erbanNo}")
+            .setText(R.id.tv_id,"ID:${item.erbanNo}")
             .addOnClickListener(R.id.iv_more)
 
         val rvRoom = helper.getView<RecyclerView>(R.id.rv_room)
diff --git a/gradle.properties b/gradle.properties
index bba8b643d..841f25d4d 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -24,5 +24,5 @@ only_arm64=false
 
 channel_file=channel.txt
 
-version_name=1.0.3
-version_code=103
\ No newline at end of file
+version_name=1.0.4
+version_code=104
\ No newline at end of file