From 4490a5e54e333abe382d13aee429de8aeb61a175 Mon Sep 17 00:00:00 2001
From: huangjian <huangjian@xuanyinyy.com>
Date: Thu, 16 Mar 2023 15:19:31 +0800
Subject: [PATCH] bug fix

---
 .../java/com/nnbc123/app/MainActivity.java    |  27 ++--------
 .../app/avroom/widget/MessageView.java        |   5 ++
 .../app/ui/login/BindCodeActivity.java        |   3 +-
 .../nnbc123/app/ui/user/UserInfoActivity.java |   3 +-
 .../app/ui/user/view/UserInfoInfoFragment.kt  |   4 +-
 .../res/color/color_selector_gift_all.xml     |   2 +-
 .../drawable-xhdpi/bg_room_main_entrance.png  | Bin 0 -> 6101 bytes
 .../drawable-xhdpi/bg_room_main_entrance.webp | Bin 3906 -> 0 bytes
 .../res/drawable-xhdpi/bg_send_all_gift.png   | Bin 0 -> 3054 bytes
 .../ic_gift_dialog_top_indicator.png          | Bin 336 -> 298 bytes
 .../res/drawable-xhdpi/icon_send_magic.png    | Bin 941 -> 848 bytes
 .../res/drawable/bg_dialog_room_operation.xml |   2 +-
 .../main/res/drawable/bg_gift_dialog_all.xml  |   2 +-
 .../main/res/layout/activity_login_code.xml   |   1 +
 app/src/main/res/layout/activity_main.xml     |  29 ++++++-----
 .../main/res/layout/activity_user_info.xml    |  15 ++++--
 .../main/res/layout/dialog_bottom_gift.xml    |  49 +++++++++++++-----
 .../res/layout/fragment_userinfo_userinfo.xml |  11 +++-
 .../res/layout/item_square_topic_banner.xml   |   9 ----
 app/src/main/res/values/dimens.xml            |   6 +--
 .../app/community/square/SquareFragment.java  |  13 +----
 .../res/layout/fragment_square.xml            |  37 ++++++++-----
 .../res/layout/head_dynamic_detail.xml        |  30 +++++------
 .../res/layout/activity_topic_main.xml        |  11 ++--
 .../res/layout/fragment_av_room_game.xml      |   2 +-
 .../res/layout/fragment_single_room.xml       |   2 +-
 .../res/layout/fragment_box_rule.xml          |   2 +-
 .../nnbc123/core/initial/bean/InitInfo.java   |  12 ++---
 .../nnbc123/core/room/bean/BoxSwitchVo.java   |   6 +--
 29 files changed, 152 insertions(+), 131 deletions(-)
 create mode 100644 app/src/main/res/drawable-xhdpi/bg_room_main_entrance.png
 delete mode 100644 app/src/main/res/drawable-xhdpi/bg_room_main_entrance.webp
 create mode 100644 app/src/main/res/drawable-xhdpi/bg_send_all_gift.png

diff --git a/app/src/main/java/com/nnbc123/app/MainActivity.java b/app/src/main/java/com/nnbc123/app/MainActivity.java
index 5bbc47d09..fa893b264 100644
--- a/app/src/main/java/com/nnbc123/app/MainActivity.java
+++ b/app/src/main/java/com/nnbc123/app/MainActivity.java
@@ -17,6 +17,7 @@ import android.view.KeyEvent;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.animation.LinearInterpolator;
+import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
@@ -153,17 +154,14 @@ public class MainActivity extends BaseMvpActivity<IMainView, MainPresenter>
     private DragLayout avatarLayout;
     private TextView tvName;//最小化窗口名称
     private TextView tvId;//最小化窗口ID
-    private CircleImageView avatarImage;
+    private ImageView avatarImage;
     private LinearLayout llDragInfo;
     private LivingIconView userLivingView;
     private View viewClose;
     private MainTabLayout mMainTabLayout;
     private AnchorCardView anchorCardView;
     private int mCurrentTabType = MainTabType.TAB_TYPE_HOME;
-    /**
-     * 房间最小化动画，换成属性动画，原先的补间动画影响了activity的生命周期
-     */
-    private ObjectAnimator roomMinAnim;
+
     /**
      * 管理限制进房
      */
@@ -293,7 +291,6 @@ public class MainActivity extends BaseMvpActivity<IMainView, MainPresenter>
     }
 
     private void closeOpenRoomAnimation() {
-        stopRoomMinAnim();
         avatarLayout.setVisibility(View.GONE);
     }
 
@@ -425,7 +422,6 @@ public class MainActivity extends BaseMvpActivity<IMainView, MainPresenter>
         super.onDestroy();
         ImInitHelper.get().unInit();
         EventBus.getDefault().unregister(this);
-        stopRoomMinAnim();
         if (limitEnterRoomHelper != null) {
             limitEnterRoomHelper.release();
         }
@@ -584,21 +580,6 @@ public class MainActivity extends BaseMvpActivity<IMainView, MainPresenter>
         }
     }
 
-    private void startRoomMinAnim() {
-        roomMinAnim = ObjectAnimator.ofFloat(avatarImage, "rotation", 0f, 360f);
-        roomMinAnim.setDuration(10000);
-        roomMinAnim.setRepeatCount(-1);
-        roomMinAnim.setInterpolator(new LinearInterpolator());
-        roomMinAnim.start();
-    }
-
-    private void stopRoomMinAnim() {
-        if (roomMinAnim != null) {
-            roomMinAnim.cancel();
-            roomMinAnim = null;
-        }
-    }
-
     @SuppressLint("SetTextI18n")
     private void displayAvatarLayout(String avatar, String nickName, long uid) {
         avatarLayout.clearAnimation();
@@ -606,8 +587,6 @@ public class MainActivity extends BaseMvpActivity<IMainView, MainPresenter>
         tvName.setText(nickName);
         tvId.setText("ID:" + uid);
         userLivingView.start();
-        stopRoomMinAnim();
-        startRoomMinAnim();
         ImageLoadUtils.loadAvatar(MainActivity.this, avatar, avatarImage);
     }
 
diff --git a/app/src/main/java/com/nnbc123/app/avroom/widget/MessageView.java b/app/src/main/java/com/nnbc123/app/avroom/widget/MessageView.java
index a62fba03f..6ea4b7851 100644
--- a/app/src/main/java/com/nnbc123/app/avroom/widget/MessageView.java
+++ b/app/src/main/java/com/nnbc123/app/avroom/widget/MessageView.java
@@ -2017,6 +2017,11 @@ public class MessageView extends FrameLayout {
                     return true;
                 });
             }
+            viewHolder.ivAvatar.setOnClickListener(v -> {
+                if (clickConsumer != null) {
+                    Single.just(chatRoomMessage.getFromAccount()).subscribe(clickConsumer);
+                }
+            });
 
         }
 
diff --git a/app/src/main/java/com/nnbc123/app/ui/login/BindCodeActivity.java b/app/src/main/java/com/nnbc123/app/ui/login/BindCodeActivity.java
index 97015165b..f120d5c2b 100644
--- a/app/src/main/java/com/nnbc123/app/ui/login/BindCodeActivity.java
+++ b/app/src/main/java/com/nnbc123/app/ui/login/BindCodeActivity.java
@@ -176,8 +176,7 @@ public class BindCodeActivity extends BaseLoginAct {
                     public void onSuccess(String s) {
                         tvDesc.setText(getString(R.string.str_send_code_success) + mPhone);
                         startCountDownTimer();
-                        toast(s);
-
+                        toast(getString(R.string.str_send_code_success) + mPhone);
                     }
 
                     @Override
diff --git a/app/src/main/java/com/nnbc123/app/ui/user/UserInfoActivity.java b/app/src/main/java/com/nnbc123/app/ui/user/UserInfoActivity.java
index 0ab19c4c6..75350507c 100644
--- a/app/src/main/java/com/nnbc123/app/ui/user/UserInfoActivity.java
+++ b/app/src/main/java/com/nnbc123/app/ui/user/UserInfoActivity.java
@@ -342,7 +342,8 @@ public class UserInfoActivity extends BaseBindingActivity<ActivityUserInfoBindin
             mBinding.tvFansCount.setText(String.valueOf(userInfo.getFansNum()));
             mBinding.tvErbanId.setText(getString(R.string.me_user_id, userInfo.getErbanNo()));
             mBinding.ivGoodNumber.setVisibility(userInfo.isHasPrettyErbanNo() ? View.VISIBLE : View.GONE);
-
+            mBinding.ivNewUser.setVisibility(userInfo.isNewUser() ? View.VISIBLE : View.GONE);
+            mBinding.ivNewUser.setImageResource(userInfo.isFromSayHelloChannel() ? R.drawable.ic_new_user_hello : R.drawable.ic_new_user);
             //等级魅力值
             setUserLevel(userInfo.getUserLevelVo());
             //铭牌
diff --git a/app/src/main/java/com/nnbc123/app/ui/user/view/UserInfoInfoFragment.kt b/app/src/main/java/com/nnbc123/app/ui/user/view/UserInfoInfoFragment.kt
index 45de8fbb5..14cd420a9 100644
--- a/app/src/main/java/com/nnbc123/app/ui/user/view/UserInfoInfoFragment.kt
+++ b/app/src/main/java/com/nnbc123/app/ui/user/view/UserInfoInfoFragment.kt
@@ -108,7 +108,7 @@ class UserInfoInfoFragment : BaseViewBindingFragment<FragmentUserinfoUserinfoBin
 
     override fun onClick(v: View) {
         when (v.id) {
-            R.id.tv_gift_detail -> startActivity(Intent(mContext, UserGiftActivity::class.java))
+            R.id.iv_more_gift -> startActivity(Intent(mContext, UserGiftActivity::class.java))
         }
     }
 
@@ -141,7 +141,7 @@ class UserInfoInfoFragment : BaseViewBindingFragment<FragmentUserinfoUserinfoBin
         vm.userInfoSkillData.observe(this) {
             initSkillCardList(it)
         }
-        binding.tvGiftDetail.setOnClickListener(this)
+        binding.ivMoreGift.setOnClickListener(this)
     }
 
 }
\ No newline at end of file
diff --git a/app/src/main/res/color/color_selector_gift_all.xml b/app/src/main/res/color/color_selector_gift_all.xml
index 90c165fc1..1ff92bf31 100644
--- a/app/src/main/res/color/color_selector_gift_all.xml
+++ b/app/src/main/res/color/color_selector_gift_all.xml
@@ -3,6 +3,6 @@
 
     <item android:color="@color/text_normal_282828" android:state_selected="true" />
 
-    <item android:color="@color/text_secondary_878b9c" />
+    <item android:color="@color/white" />
 
 </selector>
diff --git a/app/src/main/res/drawable-xhdpi/bg_room_main_entrance.png b/app/src/main/res/drawable-xhdpi/bg_room_main_entrance.png
new file mode 100644
index 0000000000000000000000000000000000000000..d1066c04a68bfa2fbbf0341fe6ec3e4e2a16d928
GIT binary patch
literal 6101
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

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xhdpi/bg_room_main_entrance.webp b/app/src/main/res/drawable-xhdpi/bg_room_main_entrance.webp
deleted file mode 100644
index 6b7e6373e313c084bb479f2157011954132ab30c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3906
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
Q5O`c0zXJ~FFIC0>08<2tod5s;

diff --git a/app/src/main/res/drawable-xhdpi/bg_send_all_gift.png b/app/src/main/res/drawable-xhdpi/bg_send_all_gift.png
new file mode 100644
index 0000000000000000000000000000000000000000..e1e0ab2504ef8c9a8dcf344ea13ce740d29712bf
GIT binary patch
literal 3054
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

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xhdpi/ic_gift_dialog_top_indicator.png b/app/src/main/res/drawable-xhdpi/ic_gift_dialog_top_indicator.png
index e3e97f56d4254555fc448743d981f16ad7d96526..e432a0a6a39cd0843c2c353dcfc351ee1783d648 100644
GIT binary patch
literal 298
zcmV+_0oDGAP)<h;3K|Lk000e1NJLTq000yK000XJ1^@s6e+jKa00001b5ch_0Itp)
z=>Px#<Vi$9R5(wikugpJVGxDCXF@?iWk*SA4a7=AWkcctw58w#a0Ix37L>#TkkC*e
z9YJeLOQ@(QwBnJU?3z_rcGYPnnR)NaWS+<<+f85)$y$=erz|?Pv|R&cKrzyN09TS;
z(|oBw+hyPd2t8R#peku~40;r3J6!Y()Ke~50N0W}f9?-}w!>@)+-1D?Nz#2DU<c@B
zg%$0)lKM&Qw+o|0N5EN5;1;+|CjSMreF4mYQchSb+W?o6-ojuHw0#bQM^}Cci{<Yj
wKuK%aE&vmt@kdx}n*uih_yDy335)HIJ99fcp@N61@c;k-07*qoM6N<$g4#xO{r~^~

literal 336
zcmV-W0k8gvP)<h;3K|Lk000e1NJLTq000mG000XJ1^@s6cH#{=00001b5ch_0Itp)
z=>Px$3Q0skR47xGkwHqsP!vV)4JAQw0Xo)E5bAG}S?5aUK}p0-SXW_Pgkp=*dC_@i
zY5OfmMmn}DP#Q{}gknr3Y3m#QbMN8tKCxn|Zg8IBN!YnBi?IwG)=&2<tmu@_Wv*UF
zkMBj<LV<02rnzkn2)JoUfH3}y8&TAY|4Ir4M|J<2WGf#Qk@m}|d$m?jt@+0!`y`BI
z0TK~uPR8Bm{QJ@dw(IR$VvYgqmE7iI#<&)Rz3C6n3#go+58!0g&j5JR!%lN?8Xyy>
zdT<G%y{5dtf|ee2ZZd&VXO0-gfTXpFKtyItl7`j~L)x~tV{Mrl#K9)zEF*ZEeZ`8(
i@oxcM{Hy$Hx%&oC0#qS_&owgu0000<MNUMnLSTZMk&yiW

diff --git a/app/src/main/res/drawable-xhdpi/icon_send_magic.png b/app/src/main/res/drawable-xhdpi/icon_send_magic.png
index 2e1b226b414dd064796f37418975ecc3141a37c9..63732633ab4b149403ac52dc0c254aa2bf896d66 100644
GIT binary patch
literal 848
zcmV-W1F!svP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px&3Q0skRCr$Po7ryDP!NXypB=FYu_LhxUV=-Wi%Xu1OCF<aQdmlaphYdE?Vvx5
zgKM0`_HkT0laYLr*gl?b&N4G+4zXl0vr_=h0XPfb41m)B^xFvl^yUq~A%J}VzX9w4
z_yu5>q<&kPWFOFK17;?LF9EpVN~gSEFn$8qBDtILqOxaO17K#d=oP<Y>1BvueAh)%
zJtkR_0l4B<0q7EhE=0<I)0GM$34oc&;@1J3>_Y33HVy!MC8=J~NE!h!GfiZ-0i18t
zYWolE0Qf{w6KE}|4ZzGU1Gw2?cdx3DhQ$|>KdL^U`)UC&vl~9v>$K7Jy_y#`t2SB*
zfSKvOI{+?Leep5hw+-MUN%<FZWg!4p{;sd-i{96#|K&T37D1>2K*|rr@<jt|lN`;n
z%3J^g8S{&J-P}20CIFx9wbZSGXo)Oc9ZCWCI{%=DOI=fAXo-AR<|oVoaIZ&BPE)0e
z&+U->Q2g;f0Pf!2YOB?rz2|e$Z9W3P1Di+3=-V%wmtu!E`2ea2;2Hp3t1M%Z<4nOR
z0Jr|*go*DtfR`Nr)W^R7@T#GeG$C$ey&w-j@w|Nfrt-Q2<+E=SglA1Z6u>4)<rDq|
zLuU3cF?}^80DC0gP62oh?|uSNJvx*jkg54zImXElSP_@EuKgx1at0u^``2x}5BE=o
z0X=W8**~Ie2!KLeg}f1EBmfbdpIOEo3xHBx+Qo?|TLPfvPg_|LWmf<+0cx`{qU;O6
zlLY@i4{d0UkiPv;0G`&}ADGcqhU5xoD%cvpdI+p1!Sym2-VqA#3WpDd<ORkJhdm<{
zHzBf4iT%w9DjJNN6m4l33@H{knih8e;WtK9<r#Nt%zHrur>J~$)B&g$#N8fu2&(^$
zSs*b@lbFRVk?~%jV(7R<QVu~y(J{;9azkMV#nFq>`OOL?a}eT|%KA{y7JA%b=^TWZ
z<?{IfHjqk^_76-HAjCZ~lbaah9-1ojhM33Z3J?@P#XLA!0wUhg*)lgQ<l*UA{%GHi
a&;J3kb$6=N!qu1n0000<MNUMnLSTYzTzJX=

literal 941
zcmeAS@N?(olHy`uVBq!ia0vp^HXzKw3=&b&bO2J51AIbU|Ns9FWCF>-1L{on@B`gs
zP!i-9?8~ssn%z)2+C%u8-{he9Unybt-Y#fwa4{Db`}q9C&We((o9m{ZJvcl6!Q#Hl
zTjoD9oW;M5fq`kJr;B5V$ML1pUryU(z|;15DwEQprp0~SN{{#Xz5D-a-vXKCoJXI2
z`15hWo@F;@iT#Vb7<|6;m~O+h8-;sUZrjglw)A<!fsbFJA3cy>Q^T%*w2^tM#lhf>
zWe+vitrPc;`p|T3iQk)p(iLSJx$_@J9l6zLURdJlb8Gw6pf`uucf`Co=w7j`f=S-!
zr*L+3-R`+pzt!AZcda&h-&fz9a*KWc9yB+9dYdQyh=Ju{RYT9WaF(V8BByn}3aeDj
zeyw@BZTFVmBR1QgaIb2czWLG9U>?<r9|9!gLwzSle96D2yn1)X&WoCB_+9J8lXS27
zl(BmYJSpC^m%UBRaDD#^hg*6fAG+Vy25KrCDoqhP(xs=AvS24;(K_ZZHxaHleW_({
zDqCl?wC$Yy@Gn~-H=D{+z2L$bnm08??d85b2|O}~ZTiv~i-e@k$Ddkrrscn}XXGA{
zM@%g{{)Mw2dzO64%dyM&h`fOW^J}-PrKx*&_=leUB_t8ze)rOEzs8^}U-`w=GD==z
zSDafP+`k{(W3)fyt0Kp3oq3fvxt4vaIzPSNA~{HI!&zm?h4)qayq<m$v=y4Wq2XhQ
zu0a1+#@7nVbVB!dv`yjBOzVu<tn~1y<adobrH^LJYAbD1mr6d|ow4HD!pMZq44$*!
z6}(dOw!N6Y?e;Y5iPL5~dd0aXDBkI)Xb8U9_DSw_)U}s0PUd>#HOQ)LU)*)qshXv2
zTh3nbs<&^tUrtU+b-cgL*FHuhdXG_$`|c#3B}tZzwRhf}$e*Lz_VMhC7e)?FCkunk
zUu;@3C;#((vwJ^e8x>Z_Z(MFE#j_%W<=y3n`@%hcr`bm8I-f46uUymdtCA;7&6m%_
zw=c+-uduhTpO<f)Z{HbTzSq9%IDPds&aQVmtDoAtuK7RXwF^$4OH5uK0VZ$;Pgg&e
IbxsLQ0MkAOWB>pF

diff --git a/app/src/main/res/drawable/bg_dialog_room_operation.xml b/app/src/main/res/drawable/bg_dialog_room_operation.xml
index 4347b517f..aa2320bcb 100644
--- a/app/src/main/res/drawable/bg_dialog_room_operation.xml
+++ b/app/src/main/res/drawable/bg_dialog_room_operation.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <solid android:color="#161722" />
+    <solid android:color="#CC161722" />
 
     <corners
         android:bottomLeftRadius="0dp"
diff --git a/app/src/main/res/drawable/bg_gift_dialog_all.xml b/app/src/main/res/drawable/bg_gift_dialog_all.xml
index 2b26625d3..2993ca380 100644
--- a/app/src/main/res/drawable/bg_gift_dialog_all.xml
+++ b/app/src/main/res/drawable/bg_gift_dialog_all.xml
@@ -10,7 +10,7 @@
     
     <item>
         <shape android:shape="rectangle">
-            <solid android:color="#FFD2D5D7" />
+            <solid android:color="#878B9C" />
             <corners android:radius="100dp" />
         </shape>
     </item>
diff --git a/app/src/main/res/layout/activity_login_code.xml b/app/src/main/res/layout/activity_login_code.xml
index 8c87f1538..101310507 100644
--- a/app/src/main/res/layout/activity_login_code.xml
+++ b/app/src/main/res/layout/activity_login_code.xml
@@ -44,6 +44,7 @@
         android:text="验证码已发送\n+86 15565758987"
         android:textColor="@color/white"
         android:textSize="@dimen/sp_20"
+        android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="@id/iv_logo"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index ad7a5787b..748899ec4 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -26,8 +26,9 @@
         app:layout_constraintStart_toStartOf="parent" />
 
     <FrameLayout
-        android:layout_width="match_parent"
+        android:layout_width="@dimen/dp_drag_layout_bg_width"
         android:layout_height="0dp"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintBottom_toTopOf="@+id/main_tab_layout"
         app:layout_constraintTop_toTopOf="parent">
 
@@ -36,7 +37,6 @@
             android:layout_width="@dimen/dp_drag_layout_bg_width"
             android:layout_height="@dimen/dp_drag_layout_bg_height"
             android:layout_gravity="bottom|end"
-            android:layout_marginEnd="@dimen/dp_15"
             android:layout_marginBottom="50dp"
             android:background="@drawable/bg_room_main_entrance"
             android:visibility="visible">
@@ -45,20 +45,24 @@
                 android:id="@+id/fl_avatar"
                 android:layout_width="@dimen/dp_drag_layout_avatar_size"
                 android:layout_height="@dimen/dp_drag_layout_avatar_size"
-                android:layout_centerVertical="true"
-                android:layout_marginStart="12.5dp">
+                android:layout_marginStart="15dp"
+                android:layout_marginTop="13dp">
 
-                <com.nnbc123.app.common.widget.CircleImageView
+                <com.nnbc123.app.common.widget.RectRoundImageView
                     android:id="@+id/avatar_image"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    tools:src="@drawable/default_avatar" />
+                    app:borderRadius="7dp"
+                    app:type="round"
+                    tools:src="@drawable/default_cover" />
 
-                <com.nnbc123.app.common.widget.CircleImageView
+                <com.makeramen.roundedimageview.RoundedImageView
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
+                    android:src="@color/black"
+                    app:riv_corner_radius="7dp"
                     android:alpha="0.1"
-                    android:src="@color/black" />
+                     />
 
                 <com.nnbc123.app.ui.widget.LivingIconView
                     android:id="@+id/liv_user"
@@ -76,9 +80,9 @@
                 android:layout_centerVertical="true"
                 android:layout_marginStart="@dimen/dp_5"
                 android:layout_toStartOf="@id/view_close"
-                android:visibility="gone"
                 android:layout_toEndOf="@id/fl_avatar"
-                android:orientation="vertical">
+                android:orientation="vertical"
+                android:visibility="gone">
 
                 <TextView
                     android:id="@+id/tv_name"
@@ -109,8 +113,9 @@
                 android:layout_width="@dimen/dp_22"
                 android:layout_height="@dimen/dp_22"
                 android:layout_alignParentEnd="true"
-                android:layout_centerVertical="true"
-                android:layout_marginEnd="@dimen/dp_18"
+                android:layout_marginTop="24dp"
+                android:layout_marginEnd="5dp"
+                android:scaleType="center"
                 android:src="@drawable/ic_room_main_entrance_close" />
 
         </com.nnbc123.app.common.widget.DragLayout>
diff --git a/app/src/main/res/layout/activity_user_info.xml b/app/src/main/res/layout/activity_user_info.xml
index ed367c3e7..e8b05b3c2 100644
--- a/app/src/main/res/layout/activity_user_info.xml
+++ b/app/src/main/res/layout/activity_user_info.xml
@@ -255,7 +255,7 @@
                                 android:padding="10dp"
                                 android:textColor="@color/text_secondary_878b9c"
                                 android:textSize="@dimen/dp_12"
-                                tools:text="关注我喜欢我就关注我喜欢我就关注我我就关注我" />
+                                tools:text="关注我喜欢关注我喜欢我就关注我喜欢我就关注我我就关注我我就关注我喜欢我就关注我我就关注我" />
 
                         </LinearLayout>
 
@@ -301,10 +301,19 @@
                             android:layout_marginTop="189dp"
                             android:gravity="center">
 
+                            <androidx.appcompat.widget.AppCompatImageView
+                                android:id="@+id/iv_new_user"
+                                android:layout_width="@dimen/dp_13"
+                                android:layout_height="@dimen/dp_13"
+                                android:layout_marginEnd="3dp"
+                                android:src="@mipmap/ic_user_new_13dp"
+                                android:visibility="gone"
+                                tools:visibility="visible" />
+
                             <ImageView
                                 android:id="@+id/iv_good_number"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
+                                android:layout_width="@dimen/dp_13"
+                                android:layout_height="@dimen/dp_13"
                                 android:src="@mipmap/ic_good_num"
                                 android:visibility="gone"
                                 tools:visibility="visible" />
diff --git a/app/src/main/res/layout/dialog_bottom_gift.xml b/app/src/main/res/layout/dialog_bottom_gift.xml
index 00f0e17ba..0ddec2c2e 100644
--- a/app/src/main/res/layout/dialog_bottom_gift.xml
+++ b/app/src/main/res/layout/dialog_bottom_gift.xml
@@ -141,15 +141,34 @@
 
     </LinearLayout>
 
+    <com.nnbc123.app.ui.widget.TopRoundLinearLayout
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:background="#01ffffff"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="@id/ll_dialog_bottom_gift">
+
+        <com.github.mmin18.widget.RealtimeBlurView
+            android:id="@+id/realtime_blur_view"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:realtimeBlurRadius="30dp"
+            app:realtimeDownsampleFactor="3"
+            app:realtimeOverlayColor="#CC161722" />
+
+    </com.nnbc123.app.ui.widget.TopRoundLinearLayout>
+
     <LinearLayout
         android:id="@+id/ll_dialog_bottom_gift"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:background="@drawable/bg_dialog_room_operation"
         android:orientation="vertical"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent">
+        app:layout_constraintStart_toStartOf="parent"
+        tools:background="@drawable/bg_dialog_room_operation">
 
         <LinearLayout
             android:id="@+id/ll_draw_gift"
@@ -240,6 +259,18 @@
                 android:background="@drawable/shap_red_point"
                 android:visibility="gone" />
 
+            <View
+                android:layout_width="0dp"
+                android:layout_height="0dp"
+                android:layout_weight="1" />
+
+            <com.nnbc123.app.ui.widget.rollviewpager.RollPagerView
+                android:id="@+id/pager_view_vip"
+                android:layout_width="58dp"
+                android:layout_height="23dp"
+                android:layout_marginStart="8dp"
+                android:layout_marginEnd="15dp" />
+
         </LinearLayout>
 
         <View
@@ -287,9 +318,9 @@
                 android:layout_width="match_parent"
                 android:layout_height="35dp"
                 android:layout_marginTop="10dp"
-                android:visibility="gone"
                 android:gravity="center_vertical"
-                android:orientation="horizontal">
+                android:orientation="horizontal"
+                android:visibility="gone">
 
                 <TextView
                     android:layout_width="wrap_content"
@@ -310,7 +341,7 @@
                 <FrameLayout
                     android:layout_width="66dp"
                     android:layout_height="35dp"
-                    android:background="#ff21202f">
+                    android:background="@drawable/bg_send_all_gift">
 
                     <TextView
                         android:id="@+id/tv_select_all"
@@ -528,14 +559,6 @@
 
             </LinearLayout>
 
-            <com.nnbc123.app.ui.widget.rollviewpager.RollPagerView
-                android:id="@+id/pager_view_vip"
-                android:layout_width="58dp"
-                android:layout_height="23dp"
-                android:layout_centerVertical="true"
-                android:layout_marginStart="8dp"
-                android:layout_toEndOf="@id/ll_gold" />
-
             <LinearLayout
                 android:id="@+id/send_container"
                 android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/fragment_userinfo_userinfo.xml b/app/src/main/res/layout/fragment_userinfo_userinfo.xml
index eefa799a5..665ec6437 100644
--- a/app/src/main/res/layout/fragment_userinfo_userinfo.xml
+++ b/app/src/main/res/layout/fragment_userinfo_userinfo.xml
@@ -57,7 +57,6 @@
                 android:layout_marginStart="15dp"
                 android:layout_marginTop="24dp"
                 android:layout_marginEnd="15dp"
-                android:drawableEnd="@drawable/ic_userinfo_arrow_right"
                 android:text="礼物墙"
                 android:textColor="@color/text_normal_282828"
                 android:textSize="@dimen/sp_14"
@@ -69,6 +68,16 @@
                 android:layout_height="25dp"
                 android:layout_gravity="center_horizontal" />
 
+            <ImageView
+                android:id="@+id/iv_more_gift"
+                android:layout_width="20dp"
+                android:layout_height="20dp"
+                android:layout_gravity="end"
+                android:layout_marginTop="-25dp"
+                android:scaleType="center"
+                android:layout_marginEnd="15dp"
+                android:src="@drawable/ic_userinfo_arrow_right" />
+
             <androidx.viewpager.widget.ViewPager
                 android:id="@+id/view_pager_gift"
                 android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/item_square_topic_banner.xml b/app/src/main/res/layout/item_square_topic_banner.xml
index c2cd90a11..162288199 100644
--- a/app/src/main/res/layout/item_square_topic_banner.xml
+++ b/app/src/main/res/layout/item_square_topic_banner.xml
@@ -14,14 +14,5 @@
         android:layout_height="match_parent"
         android:background="@drawable/shape_dynamic_topic" />
 
-    <TextView
-        android:id="@+id/tv_topic"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:textColor="@color/white"
-        android:textSize="16sp"
-        tools:text="#话题话题" />
-
 </FrameLayout>
 
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index f0da3b454..ed960c464 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -204,9 +204,9 @@
     <dimen name="dp_me_icon_height">55dp</dimen>
     <dimen name="dp_me_padding_left">12dp</dimen>
     <dimen name="dp_me_text_padding_to_icon">15dp</dimen>
-    <dimen name="dp_drag_layout_bg_width">190dp</dimen>
-    <dimen name="dp_drag_layout_bg_height">63dp</dimen>
-    <dimen name="dp_drag_layout_avatar_size">38dp</dimen>
+    <dimen name="dp_drag_layout_bg_width">96dp</dimen>
+    <dimen name="dp_drag_layout_bg_height">78dp</dimen>
+    <dimen name="dp_drag_layout_avatar_size">45dp</dimen>
 
     <dimen name="dp_setting_item_height">50dp</dimen>
     <dimen name="dp_setting_sys_notice_item_height">70.5dp</dimen>
diff --git a/app/src/module_community/java/com/nnbc123/app/community/square/SquareFragment.java b/app/src/module_community/java/com/nnbc123/app/community/square/SquareFragment.java
index dd6b52956..c67576303 100644
--- a/app/src/module_community/java/com/nnbc123/app/community/square/SquareFragment.java
+++ b/app/src/module_community/java/com/nnbc123/app/community/square/SquareFragment.java
@@ -93,7 +93,7 @@ public class SquareFragment extends BaseFragment implements MainMagicIndicatorAd
     @BindView(R.id.fl_contact_list)
     FrameLayout flContactList;
     @BindView(R.id.msg_number)
-    TextView tvCommunityUnread;
+    View tvCommunityUnread;
     @BindView(R.id.roll_view)
     RollPagerView rollView;
 
@@ -192,8 +192,6 @@ public class SquareFragment extends BaseFragment implements MainMagicIndicatorAd
                                 View flRoot = LayoutInflater.from(container.getContext()).inflate(R.layout.item_square_topic_banner, container, false);
                                 ImageView imgBanner = flRoot.findViewById(R.id.iv_cover);
                                 ImageLoadKt.load(imgBanner, worldInfo.getIcon(), 12);
-                                TextView tvTopic = flRoot.findViewById(R.id.tv_topic);
-                                tvTopic.setText("#" + worldInfo.getName());
                                 flRoot.setOnClickListener(v -> TopicMainActivity.start(mContext, String.valueOf(worldInfo.getId())));
                                 return flRoot;
                             }
@@ -261,18 +259,9 @@ public class SquareFragment extends BaseFragment implements MainMagicIndicatorAd
 
     @SuppressLint("SetTextI18n")
     public void setNumber(int number) {
-        if (tvCommunityUnread instanceof BubbleView) {
-            ((BubbleView) tvCommunityUnread).setNumText(number);
-            return;
-        }
         tvCommunityUnread.setVisibility(number <= 0 ? GONE : VISIBLE);
-        if (number > 99) {
-            tvCommunityUnread.setText("99+");
-        } else
-            tvCommunityUnread.setText(String.valueOf(number));
     }
 
-
     @Subscribe(threadMode = ThreadMode.MAIN)
     public void onLoginUserInfoUpdateEvent(LoadLoginUserInfoEvent event) {
         getUnReadCount();
diff --git a/app/src/module_community/res/layout/fragment_square.xml b/app/src/module_community/res/layout/fragment_square.xml
index 532e932c7..bb06dba0c 100644
--- a/app/src/module_community/res/layout/fragment_square.xml
+++ b/app/src/module_community/res/layout/fragment_square.xml
@@ -71,11 +71,12 @@
                         android:scaleType="center"
                         android:src="@drawable/ic_community_notice_rink" />
 
-                    <com.netease.nim.uikit.common.ui.draggablebubbles.BubbleView
+                    <View
                         android:id="@+id/msg_number"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="@dimen/dp_10"
+                        android:layout_width="8dp"
+                        android:layout_height="8dp"
+                        android:background="@drawable/shape_circle_red_small"
+                        android:layout_marginStart="@dimen/dp_12"
                         android:gravity="center"
                         android:visibility="visible"
                         tools:text="123"
@@ -96,19 +97,27 @@
 
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
-    <com.nnbc123.app.common.widget.DragLayout
-        android:id="@+id/iv_square_publish"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="bottom|end"
-        android:layout_marginEnd="@dimen/dp_15"
-        android:layout_marginBottom="90dp">
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
 
-        <ImageView
+        <com.nnbc123.app.common.widget.DragLayout
+            android:id="@+id/iv_square_publish"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:src="@drawable/ic_square_publish" />
+            android:layout_gravity="bottom|end"
+            android:layout_marginEnd="@dimen/dp_15"
+            android:layout_marginBottom="90dp">
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@drawable/ic_square_publish" />
+
+        </com.nnbc123.app.common.widget.DragLayout>
+
+
+    </FrameLayout>
 
-    </com.nnbc123.app.common.widget.DragLayout>
 
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/module_community/res/layout/head_dynamic_detail.xml b/app/src/module_community/res/layout/head_dynamic_detail.xml
index 05898f2b1..cb2445a0d 100644
--- a/app/src/module_community/res/layout/head_dynamic_detail.xml
+++ b/app/src/module_community/res/layout/head_dynamic_detail.xml
@@ -150,30 +150,30 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <TextView
-            android:id="@+id/tv_time_detail"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_24"
-            android:gravity="center"
-            android:textColor="@color/text_secondary_878b9c"
-            android:textSize="@dimen/sp_11"
-            android:visibility="visible"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            android:text="刚刚" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
-
+    <TextView
+        android:id="@+id/tv_time_detail"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:layout_marginStart="25dp"
+        android:textColor="@color/text_secondary_878b9c"
+        android:textSize="@dimen/sp_11"
+        android:visibility="visible"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/layout_root_mini_world"
+        app:layout_constraintBottom_toTopOf="@id/cl_option"
+        android:text="刚刚" />
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/cl_option"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginTop="5dp"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/layout_root_mini_world">
+        app:layout_constraintTop_toBottomOf="@id/tv_time_detail">
 
         <ImageView
             android:id="@+id/iv_like_pic"
diff --git a/app/src/module_mini_world/res/layout/activity_topic_main.xml b/app/src/module_mini_world/res/layout/activity_topic_main.xml
index 327210e8a..6d8d5e6b7 100644
--- a/app/src/module_mini_world/res/layout/activity_topic_main.xml
+++ b/app/src/module_mini_world/res/layout/activity_topic_main.xml
@@ -35,7 +35,7 @@
                 <ImageView
                     android:id="@+id/iv_bg"
                     android:layout_width="match_parent"
-                    android:layout_height="225dp"
+                    android:layout_height="80dp"
                     android:scaleType="centerCrop"
                     app:layout_collapseMode="parallax"
                     app:layout_collapseParallaxMultiplier="0.4"
@@ -44,20 +44,21 @@
 
                 <View
                     android:layout_width="match_parent"
-                    android:layout_height="225dp"
+                    android:layout_height="80dp"
                     android:background="#66000000" />
 
                 <TextView
                     android:id="@+id/tv_world_description"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="@dimen/dp_32"
-                    android:layout_marginTop="112dp"
-                    android:layout_marginEnd="20dp"
+                    android:layout_marginStart="@dimen/dp_50"
+                    android:layout_marginEnd="50dp"
                     android:layout_marginBottom="15dp"
+                    android:layout_marginTop="20dp"
                     android:lineSpacingExtra="5dp"
                     android:textColor="#CCFFFFFF"
                     android:textSize="13sp"
+                    android:lines="2"
                     app:layout_collapseMode="parallax"
                     app:layout_collapseParallaxMultiplier="0.4"
                     tools:text="故事的小黄花，从出生那年就飘着，童年的荡秋千，随记忆一直晃到现在故事的小黄花，从出生那年就飘着，童年的荡秋千，随记忆一直晃到现在~" />
diff --git a/app/src/module_mini_world/res/layout/fragment_av_room_game.xml b/app/src/module_mini_world/res/layout/fragment_av_room_game.xml
index 362336f58..541a5fa95 100644
--- a/app/src/module_mini_world/res/layout/fragment_av_room_game.xml
+++ b/app/src/module_mini_world/res/layout/fragment_av_room_game.xml
@@ -250,7 +250,7 @@
             android:layout_marginBottom="6dp"
             android:src="@drawable/icon_room_treasure_box"
             android:visibility="gone"
-            tools:contentDescription="许愿池" />
+            tools:contentDescription="魔法帽" />
 
         <ImageView
             android:id="@+id/iv_queuing_micro"
diff --git a/app/src/module_mini_world/res/layout/fragment_single_room.xml b/app/src/module_mini_world/res/layout/fragment_single_room.xml
index 645bc6332..f8d3abf2c 100644
--- a/app/src/module_mini_world/res/layout/fragment_single_room.xml
+++ b/app/src/module_mini_world/res/layout/fragment_single_room.xml
@@ -252,7 +252,7 @@
             android:visibility="gone"
             app:layout_constraintBottom_toTopOf="@id/iv_first_charge_enter"
             app:layout_constraintEnd_toEndOf="parent"
-            tools:contentDescription="许愿池" />
+            tools:contentDescription="魔法帽" />
 
         <com.nnbc123.app.avroom.widget.MessageView
             android:id="@+id/message_view"
diff --git a/app/src/module_treasure_box/res/layout/fragment_box_rule.xml b/app/src/module_treasure_box/res/layout/fragment_box_rule.xml
index 3457184a6..f504797f6 100644
--- a/app/src/module_treasure_box/res/layout/fragment_box_rule.xml
+++ b/app/src/module_treasure_box/res/layout/fragment_box_rule.xml
@@ -41,7 +41,7 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="2dp"
             android:lineSpacingExtra="3dp"
-            android:text="通过许愿池许愿获得的礼物放到礼物包裹，点开礼物面板即可查看"
+            android:text="通过魔法帽许愿获得的礼物放到礼物包裹，点开礼物面板即可查看"
             android:textColor="@color/white"
             android:textSize="10sp" />
 
diff --git a/core/src/main/java/com/nnbc123/core/initial/bean/InitInfo.java b/core/src/main/java/com/nnbc123/core/initial/bean/InitInfo.java
index d0af71cb9..4023dd193 100644
--- a/core/src/main/java/com/nnbc123/core/initial/bean/InitInfo.java
+++ b/core/src/main/java/com/nnbc123/core/initial/bean/InitInfo.java
@@ -47,7 +47,7 @@ public class InitInfo implements Serializable {
      */
     private int openBoxSwitchLevelNo;
     /**
-     * 梦幻许愿池开关
+     * 梦幻魔法帽开关
      */
     private boolean diamondBoxSwitch;
     /**
@@ -55,7 +55,7 @@ public class InitInfo implements Serializable {
      */
     private int defaultHomeTab;
     /**
-     * 许愿池图标
+     * 魔法帽图标
      */
     private String openBoxIcon;
     /**
@@ -291,7 +291,7 @@ public class InitInfo implements Serializable {
     }
 
     /**
-     * 梦幻许愿池开关
+     * 梦幻魔法帽开关
      */
     @SuppressWarnings("all")
     public boolean isDiamondBoxSwitch() {
@@ -307,7 +307,7 @@ public class InitInfo implements Serializable {
     }
 
     /**
-     * 许愿池图标
+     * 魔法帽图标
      */
     @SuppressWarnings("all")
     public String getOpenBoxIcon() {
@@ -574,7 +574,7 @@ public class InitInfo implements Serializable {
     }
 
     /**
-     * 梦幻许愿池开关
+     * 梦幻魔法帽开关
      */
     @SuppressWarnings("all")
     public void setDiamondBoxSwitch(final boolean diamondBoxSwitch) {
@@ -590,7 +590,7 @@ public class InitInfo implements Serializable {
     }
 
     /**
-     * 许愿池图标
+     * 魔法帽图标
      */
     @SuppressWarnings("all")
     public void setOpenBoxIcon(final String openBoxIcon) {
diff --git a/core/src/main/java/com/nnbc123/core/room/bean/BoxSwitchVo.java b/core/src/main/java/com/nnbc123/core/room/bean/BoxSwitchVo.java
index 1b17ab556..da61ace12 100644
--- a/core/src/main/java/com/nnbc123/core/room/bean/BoxSwitchVo.java
+++ b/core/src/main/java/com/nnbc123/core/room/bean/BoxSwitchVo.java
@@ -8,11 +8,11 @@ import java.io.Serializable;
 public class BoxSwitchVo implements Parcelable, Serializable {
     /**宝箱开关*/
     private boolean openBoxSwitch;
-    /**梦幻许愿池开关*/
+    /**梦幻魔法帽开关*/
     private boolean diamondBoxSwitch;
-    /**许愿池图标*/
+    /**魔法帽图标*/
     private String openBoxIcon;
-    /**梦幻许愿池开启时间*/
+    /**梦幻魔法帽开启时间*/
     private String diamondBoxOpenTime;
 
     public boolean isOpenBoxSwitch() {