diff --git a/app/src/main/assets/svga/living_black.svga b/app/src/main/assets/svga/living_black.svga
new file mode 100644
index 000000000..e1d148284
Binary files /dev/null and b/app/src/main/assets/svga/living_black.svga differ
diff --git a/app/src/main/java/com/nnbc123/app/home/adapter/MainMagicIndicatorAdapter.java b/app/src/main/java/com/nnbc123/app/home/adapter/MainMagicIndicatorAdapter.java
index f9e6f90da..294d0880e 100644
--- a/app/src/main/java/com/nnbc123/app/home/adapter/MainMagicIndicatorAdapter.java
+++ b/app/src/main/java/com/nnbc123/app/home/adapter/MainMagicIndicatorAdapter.java
@@ -20,7 +20,7 @@ public class MainMagicIndicatorAdapter extends CommonNavigatorAdapter {
     private int textSize = 24;
     private float minScale = 1f;
     private boolean showIndicator = true;
-    private int resId = R.drawable.ic_home_indicator_top;
+    private int resId = R.drawable.ic_home_indicator_center;
 
     public MainMagicIndicatorAdapter(Context context, List<? extends CharSequence> charSequences ) {
         this.mContext = context;
@@ -36,8 +36,8 @@ public class MainMagicIndicatorAdapter extends CommonNavigatorAdapter {
     @Override
     public IPagerTitleView getTitleView(Context context, final int i) {
         ScaleTransitionPagerTitleView scaleTransitionPagerTitleView = new ScaleTransitionPagerTitleView(context, true);
-        scaleTransitionPagerTitleView.setNormalColor(0xFF8A8CAB);
-        scaleTransitionPagerTitleView.setSelectedColor(0xFF3D3D3D);
+        scaleTransitionPagerTitleView.setNormalColor(0xFF878B9C);
+        scaleTransitionPagerTitleView.setSelectedColor(0xFF282828);
         scaleTransitionPagerTitleView.setMinScale(minScale);
         scaleTransitionPagerTitleView.setTextSize(textSize);
         int padding = UIUtil.dip2px(context, 5);
diff --git a/app/src/main/java/com/nnbc123/app/home/fragment/PartyFragment.kt b/app/src/main/java/com/nnbc123/app/home/fragment/PartyFragment.kt
index 484900af3..793f974d3 100644
--- a/app/src/main/java/com/nnbc123/app/home/fragment/PartyFragment.kt
+++ b/app/src/main/java/com/nnbc123/app/home/fragment/PartyFragment.kt
@@ -74,7 +74,7 @@ class PartyFragment : BaseFragment(), MainMagicIndicatorAdapter.OnItemSelectList
                     .onEvent(StatisticsProtocol.EVENT_HOME_BANNER_CLICK, "首页_banner")
             }
         }
-
+        homeViewModel.getBannerInfo()
     }
 
     override fun onResume() {
diff --git a/app/src/main/java/com/nnbc123/app/home/fragment/RecommendFragment.kt b/app/src/main/java/com/nnbc123/app/home/fragment/RecommendFragment.kt
index d8fe58eea..a0a159631 100644
--- a/app/src/main/java/com/nnbc123/app/home/fragment/RecommendFragment.kt
+++ b/app/src/main/java/com/nnbc123/app/home/fragment/RecommendFragment.kt
@@ -200,7 +200,6 @@ class RecommendFragment : BaseFragment(),
     }
 
     private fun loadData() {
-        homeViewModel.getBannerInfo()
         homeViewModel.getHomeResource()
         homeViewModel.getHomeSingleAnchorList()
     }
diff --git a/app/src/main/java/com/nnbc123/app/ui/user/UserGiftActivity.java b/app/src/main/java/com/nnbc123/app/ui/user/UserGiftActivity.java
index 5de751a42..7caa5a198 100644
--- a/app/src/main/java/com/nnbc123/app/ui/user/UserGiftActivity.java
+++ b/app/src/main/java/com/nnbc123/app/ui/user/UserGiftActivity.java
@@ -9,6 +9,7 @@ import androidx.viewpager.widget.ViewPager;
 import com.netease.nim.uikit.StatusBarUtil;
 import com.nnbc123.app.R;
 import com.nnbc123.app.base.BaseActivity;
+import com.nnbc123.app.home.adapter.MainMagicIndicatorAdapter;
 import com.nnbc123.app.ui.user.adapter.UserInfoIndicatorAdapter;
 import com.nnbc123.app.ui.user.adapter.UserInfoPagerAdapter;
 import com.nnbc123.app.ui.widget.magicindicator.MagicIndicator;
@@ -37,10 +38,14 @@ public class UserGiftActivity extends BaseActivity {
         tagList.add("幸运礼物");
         CommonNavigator commonNavigator = new CommonNavigator(context);
         commonNavigator.setTitleWrapContent(true);
-        UserInfoIndicatorAdapter magicIndicatorAdapter = new UserInfoIndicatorAdapter(context, tagList);
+        MainMagicIndicatorAdapter magicIndicatorAdapter = new MainMagicIndicatorAdapter(context, tagList);
         magicIndicatorAdapter.setOnItemSelectListener((position, view) -> {
             viewPager.setCurrentItem(position);
         });
+        magicIndicatorAdapter.setTextSize(14);
+        magicIndicatorAdapter.setMinScale(1f);
+        magicIndicatorAdapter.setResId(R.drawable.ic_home_indicator_center);
+        commonNavigator.setTitleWrapContent(true);
         commonNavigator.setAdapter(magicIndicatorAdapter);
         magicIndicator.setNavigator(commonNavigator);
         commonNavigator.getTitleContainer().setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE);
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 df4f04c9b..0ab19c4c6 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
@@ -5,6 +5,7 @@ import static com.nnbc123.app.ui.user.UserInfoActivity.IdentityState.OWN;
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.Intent;
+import android.graphics.Color;
 import android.graphics.drawable.Drawable;
 import android.text.TextUtils;
 import android.view.View;
@@ -15,6 +16,7 @@ import android.widget.TextView;
 import androidx.core.content.ContextCompat;
 import androidx.core.widget.NestedScrollView;
 import androidx.fragment.app.Fragment;
+import androidx.lifecycle.Observer;
 import androidx.lifecycle.ViewModelProvider;
 import androidx.viewpager.widget.ViewPager;
 
@@ -36,6 +38,7 @@ import com.nnbc123.app.databinding.ActivityUserInfoBinding;
 import com.nnbc123.app.family.view.activity.FamilyHomeActivity;
 import com.nnbc123.app.family.view.activity.FamilyMemberListActivity;
 import com.nnbc123.app.family.view.activity.FamilyMemberSearchActivity;
+import com.nnbc123.app.home.adapter.MainMagicIndicatorAdapter;
 import com.nnbc123.app.relation.cp.fragment.UserInfoCpFragment;
 import com.nnbc123.app.ui.im.avtivity.NimFriendModel;
 import com.nnbc123.app.ui.im.avtivity.NimP2PMessageActivity;
@@ -46,6 +49,7 @@ import com.nnbc123.app.ui.user.adapter.UserInfoPhotoAdapter;
 import com.nnbc123.app.ui.user.view.UserInfoDynamicFragment;
 import com.nnbc123.app.ui.user.view.UserInfoInfoFragment;
 import com.nnbc123.app.ui.user.viewmodel.UserInfoViewModel;
+import com.nnbc123.app.ui.utils.ImageLoadKt;
 import com.nnbc123.app.ui.utils.ImageLoadUtils;
 import com.nnbc123.app.ui.widget.ButtonItem;
 import com.nnbc123.app.ui.widget.ObservableScrollView;
@@ -56,6 +60,8 @@ import com.nnbc123.app.ui.widget.rollviewpager.RollPagerView;
 import com.nnbc123.app.ui.widget.rollviewpager.adapter.StaticPagerAdapterWrapper;
 import com.nnbc123.app.utils.RegexUtil;
 import com.nnbc123.app.vip.VipHelper;
+import com.nnbc123.core.module_hall.hall.bean.ClanAndHallInfo;
+import com.nnbc123.core.module_hall.hall.bean.ClanInfo;
 import com.nnbc123.xchat_android_constants.XChatConstants;
 import com.nnbc123.core.auth.AuthModel;
 import com.nnbc123.core.im.friend.IMFriendModel;
@@ -117,7 +123,7 @@ public class UserInfoActivity extends BaseBindingActivity<ActivityUserInfoBindin
 
     private boolean audioPlaying = false;
 
-    @SuppressLint("CheckResult")
+    @SuppressLint({"CheckResult", "SetTextI18n"})
     @Override
     protected void init() {
         mActivity = this;
@@ -137,6 +143,20 @@ public class UserInfoActivity extends BaseBindingActivity<ActivityUserInfoBindin
         if (userId != AuthModel.get().getCurrentUid() && !VipHelper.isHideLookUser()) {
             UserModel.get().visitUserDetail(userId).subscribe();
         }
+        viewModel.getHallData().observe(this, clanAndHallInfo -> {
+            if (clanAndHallInfo != null && clanAndHallInfo.getClan() != null && clanAndHallInfo.getClan().getId() != 0) {
+                ClanInfo clanInfo = clanAndHallInfo.getClan();
+                mBinding.tvHallDesc.setVisibility(View.VISIBLE);
+                if (clanInfo.isUserIsElder()) {
+                    mBinding.tvHallDesc.setText(clanInfo.getName() + "公会会长");
+                } else {
+                    mBinding.tvHallDesc.setText(clanInfo.getName() + "公会签约成员");
+                }
+            } else {
+                mBinding.tvHallDesc.setVisibility(View.GONE);
+            }
+        });
+
     }
 
 
@@ -152,7 +172,6 @@ public class UserInfoActivity extends BaseBindingActivity<ActivityUserInfoBindin
         if (AuthModel.get().getCurrentUid() == userId) {
             identityState = OWN;
             mBinding.tvFansCount.setOnClickListener(this);
-            mBinding.ivWhere.setVisibility(View.GONE);
             if (bottomViewLayout != null)
                 bottomViewLayout.setVisibility(View.GONE);
         } else {
@@ -177,15 +196,21 @@ public class UserInfoActivity extends BaseBindingActivity<ActivityUserInfoBindin
     private void onSetListener() {
         mBinding.ivUserBack.setOnClickListener(this);
         mBinding.ivEdit.setOnClickListener(this);
-        mBinding.tvEdit.setOnClickListener(this);
-        mBinding.ivWhere.setOnClickListener(this);
+        mBinding.flAvatar.setOnClickListener(this);
     }
 
     /**
      * 找到TA, 主态不展示
      */
     private void setWhereVisible() {
-        mBinding.ivWhere.setVisibility(viewModel.getMRoomUid() != 0 ? View.VISIBLE : View.GONE);
+        if (viewModel.getMRoomUid() != 0) {
+            mBinding.flLiving.setVisibility(View.VISIBLE);
+            ImageLoadKt.loadFromAssets(mBinding.svgaLiving, "svga/living_black.svga");
+            mBinding.ivAvatar.setBorderColor(Color.parseColor("#FFE710"));
+        } else {
+            mBinding.flLiving.setVisibility(View.GONE);
+            mBinding.ivAvatar.setBorderColor(Color.WHITE);
+        }
     }
 
     private void getUserInfo() {
@@ -216,11 +241,14 @@ public class UserInfoActivity extends BaseBindingActivity<ActivityUserInfoBindin
         tagList.add("动态");
         tagList.add("亲密关系");
         CommonNavigator commonNavigator = new CommonNavigator(context);
-        commonNavigator.setTitleWrapContent(true);
-        UserInfoIndicatorAdapter magicIndicatorAdapter = new UserInfoIndicatorAdapter(context, tagList);
+        MainMagicIndicatorAdapter magicIndicatorAdapter = new MainMagicIndicatorAdapter(context, tagList);
         magicIndicatorAdapter.setOnItemSelectListener((position, view) -> {
             mBinding.viewPager.setCurrentItem(position);
         });
+        magicIndicatorAdapter.setTextSize(18);
+        magicIndicatorAdapter.setMinScale(0.77f);
+        magicIndicatorAdapter.setResId(R.drawable.ic_home_indicator_center);
+        commonNavigator.setTitleWrapContent(true);
         commonNavigator.setAdapter(magicIndicatorAdapter);
         mBinding.magicIndicator.setNavigator(commonNavigator);
         commonNavigator.getTitleContainer().setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE);
@@ -324,6 +352,7 @@ public class UserInfoActivity extends BaseBindingActivity<ActivityUserInfoBindin
             }
 
             VipHelper.loadVipIcon(mBinding.ivVipIcon, userInfo.getUserVipInfoVO());
+            ImageLoadKt.loadAvatar(mBinding.ivAvatar, userInfo.getAvatar());
         }
     }
 
@@ -407,15 +436,13 @@ public class UserInfoActivity extends BaseBindingActivity<ActivityUserInfoBindin
 
     private void setEditButton(int identityState, boolean isExpanded) {
         if (identityState == OWN) {
-            mBinding.ivEdit.setVisibility(View.GONE);
-            mBinding.tvEdit.setVisibility(View.VISIBLE);
+            mBinding.ivEdit.setVisibility(View.VISIBLE);
+            mBinding.ivEdit.setImageResource(R.drawable.icon_home_page_edit);
         } else if (identityState == IdentityState.OTHER) {
             mBinding.ivEdit.setVisibility(View.VISIBLE);
-            mBinding.tvEdit.setVisibility(View.GONE);
-            mBinding.ivEdit.setImageResource(R.drawable.icon_home_page_more_black);
+            mBinding.ivEdit.setImageResource(isExpanded ? R.drawable.icon_home_page_more_black : R.drawable.icon_home_page_more);
         } else {
             mBinding.ivEdit.setVisibility(View.GONE);
-            mBinding.tvEdit.setVisibility(View.GONE);
         }
     }
 
@@ -530,7 +557,7 @@ public class UserInfoActivity extends BaseBindingActivity<ActivityUserInfoBindin
                     PraiseModel.get().praise(userInfo.getUid(), true).subscribe();
                 }
                 break;
-            case R.id.iv_where:
+            case R.id.fl_avatar:
                 if (userInfo == null) {
                     toast("用户信息为空。");
                     return;
diff --git a/app/src/main/java/com/nnbc123/app/ui/user/adapter/UserInfoDynamicAdapter.java b/app/src/main/java/com/nnbc123/app/ui/user/adapter/UserInfoDynamicAdapter.java
index b8d9ff898..1bb2d0a74 100644
--- a/app/src/main/java/com/nnbc123/app/ui/user/adapter/UserInfoDynamicAdapter.java
+++ b/app/src/main/java/com/nnbc123/app/ui/user/adapter/UserInfoDynamicAdapter.java
@@ -178,7 +178,6 @@ public class UserInfoDynamicAdapter extends BaseQuickAdapter<WorldDynamicBean, B
         }
         //跳转去详情
         helper.itemView.setOnClickListener(toDetailListener);
-        helper.setGone(R.id.line_bottom, getItemCount() - 1 != helper.getLayoutPosition());
     }
 
     private void setLikeCount(BaseViewHolder helper, int likeCount, boolean isLike, boolean isAnim) {
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 64070b151..45de8fbb5 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
@@ -1,6 +1,5 @@
 package com.nnbc123.app.ui.user.view
 
-import android.annotation.SuppressLint
 import android.content.Intent
 import android.graphics.Color
 import android.graphics.drawable.GradientDrawable
@@ -9,27 +8,22 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.LinearLayout
 import android.widget.TextView
-import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.viewpager.widget.ViewPager
-import androidx.viewpager.widget.ViewPager.OnPageChangeListener
-import com.netease.nim.uikit.support.glide.GlideApp
+import com.netease.nim.uikit.common.util.sys.ScreenUtil
 import com.nnbc123.app.R
 import com.nnbc123.app.base.BaseViewBindingFragment
 import com.nnbc123.app.databinding.FragmentUserinfoUserinfoBinding
-import com.nnbc123.app.module_hall.hall.activity.ModuleClanActivity
-import com.nnbc123.app.module_hall.hall.activity.ModuleHallActivity
+import com.nnbc123.app.home.adapter.MainMagicIndicatorAdapter
 import com.nnbc123.app.skill.activity.SkillHomeActivity
 import com.nnbc123.app.skill.activity.SkillHomeActivity.Companion.PAGE_TYPE_CUSTOM
 import com.nnbc123.app.skill.activity.SkillHomeActivity.Companion.PAGE_TYPE_SELF
 import com.nnbc123.app.ui.user.UserGiftActivity
 import com.nnbc123.app.ui.user.UserInfoActivity
 import com.nnbc123.app.ui.user.UserInfoGiftFragment
-import com.nnbc123.app.ui.user.adapter.GiftAdapter
 import com.nnbc123.app.ui.user.adapter.SkillCardAdapter
-import com.nnbc123.app.ui.user.adapter.UserInfoIndicatorAdapter
 import com.nnbc123.app.ui.user.adapter.UserInfoPagerAdapter
 import com.nnbc123.app.ui.user.decorationsend.UserInfoSkillDecoration
 import com.nnbc123.app.ui.user.viewmodel.UserInfoViewModel
@@ -38,104 +32,17 @@ import com.nnbc123.app.ui.widget.magicindicator.ViewPagerHelper
 import com.nnbc123.app.ui.widget.magicindicator.buildins.UIUtil
 import com.nnbc123.app.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator
 import com.nnbc123.core.auth.AuthModel
-import com.nnbc123.core.module_hall.hall.HallModel
-import com.nnbc123.core.module_hall.hall.bean.ClanAndHallInfo
-import com.nnbc123.core.module_hall.hall.bean.ClanInfo
-import com.nnbc123.core.module_hall.hall.bean.HallInfo
 import com.nnbc123.core.user.bean.UserInfoSkillEntity
-import com.nnbc123.core.utils.net.BeanObserver
-import com.nnbc123.core.utils.net.RxHelper
 import com.nnbc123.library.annatation.ActLayoutRes
-import com.netease.nim.uikit.common.util.sys.ScreenUtil
 
 
 @ActLayoutRes(R.layout.fragment_userinfo_userinfo)
 class UserInfoInfoFragment : BaseViewBindingFragment<FragmentUserinfoUserinfoBinding>(),
     View.OnClickListener {
 
-    private var giftAdapter: GiftAdapter? = null
     private var skillAdapter: SkillCardAdapter? = null
     private val vm: UserInfoViewModel by activityViewModels()
 
-    @SuppressLint("SetTextI18n")
-    private fun initClanAndHall(clanAndHallInfo: ClanAndHallInfo) {
-        val hallInfo: HallInfo? = clanAndHallInfo.hall
-        val clanInfo: ClanInfo? = clanAndHallInfo.clan
-        val showApply = false
-        if (hallInfo != null && hallInfo.hallId > 0) {
-            binding.llModuleHall.visibility = View.VISIBLE
-            binding.tvHallId.text = "房间ID:" + hallInfo.hallId.toString()
-            binding.tvHallName.text = hallInfo.hallName
-            binding.tvHallMemberNum.text = "房间人数:" + hallInfo.memberCount
-            binding.tvHallErbanId.text = "ID:" + hallInfo.ownerErbanNo
-            GlideApp.with(this)
-                .load(hallInfo.ownerAvatar)
-                .placeholder(R.drawable.default_avatar)
-                .into(binding.ivHallAvatar)
-            if (showApply) {
-                binding.tvApplyHall.visibility = View.VISIBLE
-                binding.tvApplyHall.setOnClickListener { applyJoinHall(hallInfo.hallId) }
-            } else {
-                binding.tvApplyHall.visibility = View.GONE
-            }
-        } else {
-            binding.llHall.isVisible = false
-            binding.ivClanArrow.isVisible = false
-            binding.tvHallDetail.text = "公会"
-        }
-
-        if (clanInfo != null && clanInfo.id > 0) {
-            binding.llModuleHall.visibility = View.VISIBLE
-            binding.llClan.visibility = View.VISIBLE
-            binding.tvClanId.text = "公会ID:" + clanInfo.id
-            binding.tvClanName.text = clanInfo.name
-            binding.tvClanMemberNum.text = "公会人数:" + clanInfo.clanMemberNum
-            binding.tvClanHallNum.text = "房间数量:" + clanInfo.clanHallNum
-            GlideApp.with(this)
-                .load(clanInfo.avatar)
-                .placeholder(R.drawable.default_cover)
-                .into(binding.ivClanAvatar)
-            GlideApp.with(this)
-                .load(clanInfo.levelIcon)
-                .placeholder(R.drawable.default_cover)
-                .into(binding.ivClanLevel)
-            if (hallInfo != null && hallInfo.hallId > 0) {
-                binding.tvHallDetail.text = "公会·房间"
-            }
-        } else {
-            binding.llClan.visibility = View.GONE
-            if (hallInfo == null || hallInfo.hallId <= 0) {
-                binding.llModuleHall.visibility = View.GONE
-            } else {
-                binding.llHall.isVisible = true
-                binding.tvHallDetail.text = "房间"
-            }
-        }
-
-        binding.ivHallAvatar.setOnClickListener {
-            if (hallInfo != null && hallInfo.hallId != 0L) {
-                ModuleHallActivity.start(
-                    context,
-                    hallInfo.hallId,
-                    hallInfo.ownerUid,
-                    vm.userId
-                )
-            }
-        }
-
-        binding.ivClanAvatar.setOnClickListener {
-            ModuleClanActivity.start(context, vm.userId)
-        }
-
-        binding.ivClanArrow.setOnClickListener {
-            binding.ivClanArrow.animate()
-                .rotationBy(180f)
-                .setDuration(200)
-                .start()
-            binding.llHall.isVisible = !binding.llHall.isVisible
-        }
-    }
-
     /**
      * 礼物列表
      *
@@ -154,31 +61,20 @@ class UserInfoInfoFragment : BaseViewBindingFragment<FragmentUserinfoUserinfoBin
         tagList.add("幸运礼物")
         val commonNavigator = CommonNavigator(context)
         commonNavigator.setTitleWrapContent(true)
-        val magicIndicatorAdapter = UserInfoIndicatorAdapter(context, tagList)
+        commonNavigator.titleMargin = ScreenUtil.dip2px(7.0F)
+        val magicIndicatorAdapter = MainMagicIndicatorAdapter(context, tagList)
         magicIndicatorAdapter.setOnItemSelectListener { position: Int, view: TextView? ->
             viewPager.currentItem = position
         }
+        magicIndicatorAdapter.textSize = 14
+        magicIndicatorAdapter.minScale = 1f
+        magicIndicatorAdapter.setResId(R.drawable.ic_home_indicator_center)
         commonNavigator.adapter = magicIndicatorAdapter
         magicIndicator.navigator = commonNavigator
         commonNavigator.titleContainer.showDividers = LinearLayout.SHOW_DIVIDER_MIDDLE
         viewPager.offscreenPageLimit = 2
         viewPager.adapter = pagerAdapter
         ViewPagerHelper.bind(magicIndicator, viewPager)
-        viewPager.addOnPageChangeListener(object : OnPageChangeListener {
-            override fun onPageScrolled(
-                position: Int,
-                positionOffset: Float,
-                positionOffsetPixels: Int
-            ) {
-            }
-
-            override fun onPageSelected(position: Int) {
-                viewPager.requestLayout()
-            }
-
-            override fun onPageScrollStateChanged(state: Int) {}
-        })
-
     }
 
     /**
@@ -216,20 +112,6 @@ class UserInfoInfoFragment : BaseViewBindingFragment<FragmentUserinfoUserinfoBin
         }
     }
 
-    private fun applyJoinHall(hallId: Long) {
-        HallModel.get().applyJoinHall(hallId)
-            .compose(RxHelper.bindFragment(this))
-            .subscribe(object : BeanObserver<String?>() {
-                override fun onErrorMsg(error: String) {
-                    toast(error)
-                }
-
-                override fun onSuccess(s: String) {
-                    toast(s)
-                }
-            })
-    }
-
     private fun createSkillEmptyView(): View {
         val textView = TextView(mContext)
         val textViewHeight = UIUtil.dip2px(mContext, 47.0)
@@ -248,7 +130,7 @@ class UserInfoInfoFragment : BaseViewBindingFragment<FragmentUserinfoUserinfoBin
             textView.setOnClickListener {
                 SkillHomeActivity.start(mContext, PAGE_TYPE_SELF, vm.userId)
             }
-            textView.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.arrow_right, 0)
+            textView.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.ic_userinfo_arrow_right, 0)
             textView.setPadding(0, 0, ScreenUtil.dip2px(10f), 0)
         }
         return textView
@@ -256,14 +138,10 @@ class UserInfoInfoFragment : BaseViewBindingFragment<FragmentUserinfoUserinfoBin
 
     override fun init() {
         initGiftList()
-        vm.hallData.observe(this) {
-            initClanAndHall(it)
-        }
         vm.userInfoSkillData.observe(this) {
             initSkillCardList(it)
         }
         binding.tvGiftDetail.setOnClickListener(this)
     }
 
-
 }
\ No newline at end of file
diff --git a/app/src/main/res/drawable-xhdpi/ic_userinfo_arrow_right.png b/app/src/main/res/drawable-xhdpi/ic_userinfo_arrow_right.png
new file mode 100644
index 000000000..4078db185
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_userinfo_arrow_right.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_userinfo_hall.png b/app/src/main/res/drawable-xhdpi/ic_userinfo_hall.png
new file mode 100644
index 000000000..5bfc9cca9
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_userinfo_hall.png differ
diff --git a/app/src/main/res/drawable-xhdpi/icon_home_page_edit.png b/app/src/main/res/drawable-xhdpi/icon_home_page_edit.png
new file mode 100644
index 000000000..59f2dd68c
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/icon_home_page_edit.png differ
diff --git a/app/src/main/res/drawable/shape_58559d.xml b/app/src/main/res/drawable/shape_58559d.xml
index 185d4a2f0..2728a98d0 100644
--- a/app/src/main/res/drawable/shape_58559d.xml
+++ b/app/src/main/res/drawable/shape_58559d.xml
@@ -1,9 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <gradient android:startColor="#6DADFF" android:endColor="#6B68F8"/>
-    <corners android:topLeftRadius="@dimen/dp_10"
-        android:bottomLeftRadius="@dimen/dp_10"
-        android:bottomRightRadius="@dimen/dp_10"
-        android:topRightRadius="@dimen/dp_3"/>
-</shape>
\ No newline at end of file
+<shape android:shape="rectangle"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <gradient
+        android:angle="90"
+        android:startColor="#ffffd390"
+        android:endColor="#ffffa34e"
+        android:type="linear"
+        android:useLevel="true" />
+    <corners
+        android:bottomLeftRadius="7dp"
+        android:bottomRightRadius="7dp"
+        android:topLeftRadius="7dp"
+        android:topRightRadius="7dp" />
+</shape>
diff --git a/app/src/main/res/drawable/shape_bg_userinfo_top.xml b/app/src/main/res/drawable/shape_bg_userinfo_top.xml
new file mode 100644
index 000000000..805687a99
--- /dev/null
+++ b/app/src/main/res/drawable/shape_bg_userinfo_top.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <gradient
+        android:angle="90"
+        android:endColor="@color/transparent"
+        android:startColor="#80000000"
+        android:type="linear"
+        android:useLevel="true" />
+    <corners
+        android:bottomLeftRadius="0dp"
+        android:bottomRightRadius="0dp"
+        android:topLeftRadius="0dp"
+        android:topRightRadius="0dp" />
+</shape>
diff --git a/app/src/main/res/drawable/shape_circle_fef411.xml b/app/src/main/res/drawable/shape_circle_fef411.xml
new file mode 100644
index 000000000..1c8b39f41
--- /dev/null
+++ b/app/src/main/res/drawable/shape_circle_fef411.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval"
+    android:useLevel="false">
+
+    <solid android:color="#FEF411" />
+
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_f3f5fa_corner_8dp.xml b/app/src/main/res/drawable/shape_f3f5fa_corner_8dp.xml
new file mode 100644
index 000000000..c5ced74fb
--- /dev/null
+++ b/app/src/main/res/drawable/shape_f3f5fa_corner_8dp.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners android:radius="8dp" />
+    <solid android:color="@color/color_f5f5f5" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_f8f8fb_radius_4dp.xml b/app/src/main/res/drawable/shape_f8f8fb_radius_4dp.xml
new file mode 100644
index 000000000..2a13c73d4
--- /dev/null
+++ b/app/src/main/res/drawable/shape_f8f8fb_radius_4dp.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners android:radius="4dp" />
+    <solid android:color="#F8F8FB" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_user_gift.xml b/app/src/main/res/layout/activity_user_gift.xml
index 802e7fd94..3ee4fbd45 100644
--- a/app/src/main/res/layout/activity_user_gift.xml
+++ b/app/src/main/res/layout/activity_user_gift.xml
@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/bg_normal_1c1b22"
+    android:background="@color/white"
     android:orientation="vertical">
 
     <com.nnbc123.app.base.TitleBar
@@ -16,7 +16,7 @@
     <com.nnbc123.app.ui.widget.magicindicator.MagicIndicator
         android:id="@+id/magic_indicator"
         android:layout_width="wrap_content"
-        android:layout_height="20dp"
+        android:layout_height="25dp"
         android:layout_gravity="center_horizontal"
         android:paddingLeft="13dp"
         android:paddingRight="10dp" />
diff --git a/app/src/main/res/layout/activity_user_info.xml b/app/src/main/res/layout/activity_user_info.xml
index 706429199..ed367c3e7 100644
--- a/app/src/main/res/layout/activity_user_info.xml
+++ b/app/src/main/res/layout/activity_user_info.xml
@@ -7,8 +7,7 @@
 
     </data>
 
-
-    <RelativeLayout
+    <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="@color/white">
@@ -32,7 +31,7 @@
                     app:contentScrim="@color/white"
                     app:layout_scrollFlags="scroll|exitUntilCollapsed">
 
-                    <LinearLayout
+                    <FrameLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:orientation="vertical">
@@ -44,36 +43,36 @@
                             <com.nnbc123.app.ui.widget.rollviewpager.RollPagerView
                                 android:id="@+id/roll_view"
                                 android:layout_width="match_parent"
-                                android:layout_height="375dp"
+                                android:layout_height="237dp"
                                 app:rollviewpager_play_delay="5000" />
 
                             <View
                                 android:layout_width="match_parent"
-                                android:layout_height="375dp"
-                                android:background="@mipmap/bg_userinfo_photo_cover" />
+                                android:layout_height="237dp"
+                                android:background="@drawable/shape_bg_userinfo_top" />
 
                             <TextView
                                 android:id="@+id/tv_roll_hint"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
+                                android:layout_width="42dp"
+                                android:layout_height="22dp"
                                 android:layout_gravity="end|bottom"
                                 android:layout_marginEnd="12dp"
-                                android:layout_marginBottom="28dp"
-                                android:background="@drawable/bg_roll_hint"
+                                android:layout_marginBottom="34dp"
+                                android:background="@drawable/shape_white_alpha_20_radius_100"
                                 android:gravity="center"
                                 android:includeFontPadding="false"
                                 android:text="1/1"
                                 android:textColor="@color/white"
-                                android:textSize="10dp" />
+                                android:textSize="12dp" />
 
                             <LinearLayout
                                 android:id="@+id/ll_audio"
                                 android:layout_width="63dp"
                                 android:layout_height="@dimen/dp_25"
+                                android:layout_gravity="end|center_vertical"
                                 android:background="@drawable/bg_userinfo_skill_audio"
                                 android:gravity="center_vertical"
                                 android:orientation="horizontal"
-                                android:layout_gravity="end|center_vertical"
                                 android:visibility="gone"
                                 tools:visibility="visible">
 
@@ -97,12 +96,22 @@
 
                             </LinearLayout>
 
+
+                        </FrameLayout>
+
+                        <LinearLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="211dp"
+                            android:background="@drawable/shape_white_top_14dp"
+                            android:orientation="vertical"
+                            android:paddingStart="15dp"
+                            android:paddingEnd="15dp">
+
                             <androidx.constraintlayout.widget.ConstraintLayout
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
-                                android:layout_gravity="bottom"
-                                android:layout_marginBottom="12dp"
-                                android:padding="@dimen/dp_15">
+                                android:layout_marginTop="47dp">
 
                                 <ImageView
                                     android:id="@+id/iv_vip_icon"
@@ -122,102 +131,36 @@
                                     android:layout_height="wrap_content"
                                     android:layout_centerHorizontal="true"
                                     android:layout_marginStart="3dp"
-                                    android:layout_marginEnd="@dimen/dp_20"
-                                    android:layout_marginBottom="6dp"
                                     android:drawablePadding="@dimen/space_normal"
                                     android:ellipsize="end"
-                                    android:maxLength="20"
+                                    android:maxLength="15"
                                     android:maxLines="1"
-                                    android:textColor="@color/white"
-                                    android:textSize="15dp"
+                                    android:textColor="@color/text_normal_282828"
+                                    android:textSize="18dp"
                                     android:textStyle="bold"
                                     app:layout_constraintStart_toEndOf="@id/iv_vip_icon"
                                     app:layout_constraintTop_toTopOf="parent"
                                     app:layout_goneMarginStart="0dp"
                                     tools:drawableRight="@drawable/ic_gender_male"
-                                    tools:text="King天地天地" />
+                                    tools:text="KiKing天地天地King天地天地ng天地天地" />
 
                                 <TextView
-                                    android:id="@+id/iv_where"
+                                    android:id="@+id/tv_constellation"
                                     android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:layout_marginStart="8dp"
-                                    android:background="@drawable/shape_ffcb47_to_ffa936"
+                                    android:layout_height="14dp"
+                                    android:layout_gravity="center_vertical"
+                                    android:layout_marginStart="5dp"
+                                    android:background="@drawable/shape_58559d"
                                     android:gravity="center"
                                     android:includeFontPadding="false"
-                                    android:paddingStart="7dp"
-                                    android:paddingTop="2dp"
-                                    android:paddingEnd="7dp"
-                                    android:paddingBottom="2dp"
-                                    android:text="直播中"
+                                    android:paddingLeft="6dp"
+                                    android:paddingRight="6dp"
                                     android:textColor="@color/white"
-                                    android:textSize="12dp"
-                                    android:textStyle="bold"
-                                    android:visibility="gone"
+                                    android:textSize="10dp"
                                     app:layout_constraintBottom_toBottomOf="@id/tv_nick"
                                     app:layout_constraintStart_toEndOf="@id/tv_nick"
                                     app:layout_constraintTop_toTopOf="@id/tv_nick"
-                                    tools:visibility="visible" />
-
-
-                                <LinearLayout
-                                    android:id="@+id/ll_id"
-                                    android:layout_width="match_parent"
-                                    android:layout_height="wrap_content"
-                                    android:layout_marginTop="@dimen/dp_8"
-                                    android:gravity="center_vertical"
-                                    android:orientation="horizontal"
-                                    app:layout_constraintStart_toStartOf="parent"
-                                    app:layout_constraintTop_toBottomOf="@id/tv_nick">
-
-                                    <TextView
-                                        android:id="@+id/tv_erban_id"
-                                        android:layout_width="wrap_content"
-                                        android:layout_height="wrap_content"
-                                        android:gravity="center_vertical"
-                                        android:includeFontPadding="false"
-                                        android:maxLines="1"
-                                        android:textColor="@color/white"
-                                        android:textSize="11dp"
-                                        tools:text="ID:7958626" />
-
-                                    <ImageView
-                                        android:id="@+id/iv_good_number"
-                                        android:layout_width="wrap_content"
-                                        android:layout_height="wrap_content"
-                                        android:layout_marginStart="@dimen/dp_5"
-                                        android:src="@mipmap/ic_good_num"
-                                        android:visibility="gone"
-                                        tools:visibility="visible" />
-
-                                    <LinearLayout
-                                        android:layout_width="wrap_content"
-                                        android:layout_height="wrap_content"
-                                        android:layout_marginStart="@dimen/dp_30"
-                                        android:baselineAligned="true"
-                                        android:orientation="horizontal">
-
-                                        <TextView
-                                            android:id="@+id/tv_fans_count"
-                                            android:layout_width="wrap_content"
-                                            android:layout_height="wrap_content"
-                                            android:maxLines="1"
-                                            android:textColor="@color/white"
-                                            android:textSize="12dp"
-                                            tools:text="19" />
-
-                                        <TextView
-                                            android:id="@+id/tv_user_fan_text"
-                                            android:layout_width="wrap_content"
-                                            android:layout_height="wrap_content"
-                                            android:text="@string/fan"
-                                            android:textColor="@color/white"
-                                            android:textSize="10dp" />
-
-                                    </LinearLayout>
-
-
-                                </LinearLayout>
+                                    tools:text="金牛座" />
 
                                 <LinearLayout
                                     android:id="@+id/ll_level"
@@ -225,13 +168,13 @@
                                     android:layout_height="wrap_content"
                                     android:layout_marginTop="@dimen/dp_8"
                                     android:orientation="horizontal"
-                                    app:layout_constraintTop_toBottomOf="@id/ll_id">
+                                    app:layout_constraintTop_toBottomOf="@id/tv_nick">
 
                                     <androidx.appcompat.widget.AppCompatImageView
                                         android:id="@+id/iv_user_level"
                                         android:layout_width="wrap_content"
                                         android:layout_height="@dimen/dp_20"
-                                        android:layout_marginEnd="@dimen/dp_3"
+                                        android:layout_marginEnd="@dimen/dp_4"
                                         android:adjustViewBounds="true"
                                         android:visibility="visible"
                                         tools:src="@mipmap/ic_user_level" />
@@ -283,57 +226,133 @@
                                     </androidx.constraintlayout.widget.ConstraintLayout>
 
                                     <TextView
-                                        android:id="@+id/tv_constellation"
+                                        android:id="@+id/tv_hall_desc"
                                         android:layout_width="wrap_content"
-                                        android:layout_height="18dp"
+                                        android:layout_height="wrap_content"
                                         android:layout_gravity="center_vertical"
-                                        android:layout_marginStart="5dp"
-                                        android:background="@drawable/shape_58559d"
+                                        android:layout_marginStart="3dp"
+                                        android:drawableStart="@drawable/ic_userinfo_hall"
+                                        android:drawablePadding="2dp"
                                         android:gravity="center"
-                                        android:includeFontPadding="false"
-                                        android:paddingLeft="6dp"
-                                        android:paddingRight="6dp"
-                                        android:textColor="@color/white"
-                                        android:textSize="10dp"
-                                        tools:text="金牛座" />
+                                        android:textColor="@color/text_normal_282828"
+                                        android:textSize="13sp"
+                                        android:visibility="gone"
+                                        tools:text="XX公会签约成员"
+                                        tools:visibility="visible" />
 
                                 </LinearLayout>
 
                             </androidx.constraintlayout.widget.ConstraintLayout>
 
-
-                        </FrameLayout>
-
-                        <LinearLayout
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="-15dp"
-                            android:background="@drawable/shape_white_top_14dp"
-                            android:orientation="vertical"
-                            android:paddingStart="15dp"
-                            android:paddingEnd="15dp">
-
                             <TextView
                                 android:id="@+id/tv_desc"
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
-                                android:layout_marginTop="@dimen/dp_23"
+                                android:layout_marginTop="@dimen/dp_10"
+                                android:background="@drawable/shape_f8f8fb_radius_4dp"
                                 android:ellipsize="end"
                                 android:maxLines="2"
-                                android:textColor="@color/color_999999"
+                                android:padding="10dp"
+                                android:textColor="@color/text_secondary_878b9c"
                                 android:textSize="@dimen/dp_12"
-                                app:layout_constraintTop_toBottomOf="@id/ll_id"
                                 tools:text="关注我喜欢我就关注我喜欢我就关注我我就关注我" />
 
-                            <View
-                                android:layout_width="match_parent"
-                                android:layout_height="1px"
-                                android:layout_marginTop="20dp"
-                                android:background="#0f979797" />
-
                         </LinearLayout>
 
-                    </LinearLayout>
+                        <FrameLayout
+                            android:id="@+id/fl_avatar"
+                            android:layout_width="72dp"
+                            android:layout_height="72dp"
+                            android:layout_marginStart="22dp"
+                            android:layout_marginTop="175dp">
+
+                            <com.nnbc123.app.common.widget.CircleImageView
+                                android:id="@+id/iv_avatar"
+                                android:layout_width="72dp"
+                                android:layout_height="72dp"
+                                android:src="@drawable/default_avatar"
+                                app:cborder_color="@color/white"
+                                app:cborder_width="1dp" />
+
+                            <FrameLayout
+                                android:id="@+id/fl_living"
+                                android:layout_width="20dp"
+                                android:layout_height="20dp"
+                                android:layout_gravity="bottom|end"
+                                android:background="@drawable/shape_circle_fef411"
+                                android:visibility="gone">
+
+                                <com.opensource.svgaplayer.SVGAImageView
+                                    android:id="@+id/svga_living"
+                                    android:layout_width="12dp"
+                                    android:layout_height="12dp"
+                                    android:layout_gravity="center"
+                                    app:autoPlay="false" />
+
+                            </FrameLayout>
+
+
+                        </FrameLayout>
+
+                        <LinearLayout
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="106dp"
+                            android:layout_marginTop="189dp"
+                            android:gravity="center">
+
+                            <ImageView
+                                android:id="@+id/iv_good_number"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:src="@mipmap/ic_good_num"
+                                android:visibility="gone"
+                                tools:visibility="visible" />
+
+                            <TextView
+                                android:id="@+id/tv_erban_id"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_marginStart="3dp"
+                                android:gravity="center_vertical"
+                                android:includeFontPadding="false"
+                                android:maxLines="1"
+                                android:textColor="@color/white"
+                                android:textSize="12dp"
+                                tools:text="ID:7958626" />
+
+                        </LinearLayout>
+
+                        <LinearLayout
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="106dp"
+                            android:layout_marginTop="221dp"
+                            android:baselineAligned="true"
+                            android:orientation="horizontal">
+
+                            <TextView
+                                android:id="@+id/tv_user_fan_text"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:text="@string/fan"
+                                android:textColor="@color/text_secondary_878b9c"
+                                android:textSize="13dp" />
+
+                            <TextView
+                                android:id="@+id/tv_fans_count"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_marginStart="5dp"
+                                android:maxLines="1"
+                                android:textColor="@color/text_normal_282828"
+                                android:textSize="13dp"
+                                tools:text="19" />
+
+                        </LinearLayout>
+
+
+                    </FrameLayout>
 
                     <androidx.appcompat.widget.Toolbar
                         android:id="@+id/tb_user_info"
@@ -370,23 +389,13 @@
 
                             <ImageView
                                 android:id="@+id/iv_edit"
-                                android:layout_width="24dp"
-                                android:layout_height="24dp"
+                                android:layout_width="30dp"
+                                android:layout_height="30dp"
                                 android:layout_alignParentEnd="true"
                                 android:layout_centerVertical="true"
+                                android:scaleType="center"
                                 android:src="@drawable/icon_home_page_more" />
 
-                            <TextView
-                                android:id="@+id/tv_edit"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_alignParentEnd="true"
-                                android:layout_centerVertical="true"
-                                android:text="编辑"
-                                android:textColor="@color/white"
-                                android:textSize="@dimen/sp_13"
-                                android:visibility="gone" />
-
                         </RelativeLayout>
 
                     </androidx.appcompat.widget.Toolbar>
@@ -398,13 +407,12 @@
                     android:id="@+id/fl_indicator"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:paddingTop="20dp"
-                    android:paddingBottom="5dp">
+                    android:paddingTop="11dp">
 
                     <com.nnbc123.app.ui.widget.magicindicator.MagicIndicator
                         android:id="@+id/magic_indicator"
                         android:layout_width="wrap_content"
-                        android:layout_height="20dp"
+                        android:layout_height="31dp"
                         android:paddingLeft="13dp"
                         android:paddingRight="10dp" />
 
@@ -416,7 +424,6 @@
                 android:id="@+id/view_pager"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:layout_marginTop="@dimen/dp_14"
                 android:layout_marginBottom="@dimen/dp_60"
                 app:layout_behavior="@string/appbar_scrolling_view_behavior" />
 
@@ -426,9 +433,9 @@
             android:id="@+id/vs_bottom_layout"
             android:layout_width="match_parent"
             android:layout_height="74dp"
-            android:layout_alignParentBottom="true"
+            android:layout_gravity="bottom"
             android:layout="@layout/user_info_bottom_layout" />
 
-    </RelativeLayout>
+    </FrameLayout>
 
 </layout>
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index 73a22147d..51281726a 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -37,7 +37,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:gravity="bottom"
-                android:paddingTop="40dp"
+                android:paddingTop="50dp"
                 android:paddingBottom="@dimen/dp_10"
                 app:layout_constraintTop_toTopOf="parent">
 
@@ -46,6 +46,7 @@
                     android:layout_width="0dp"
                     android:layout_height="30dp"
                     android:layout_gravity="end"
+                    android:layout_marginStart="15dp"
                     android:layout_marginEnd="15dp"
                     android:layout_weight="1"
                     android:background="@drawable/shape_room_temp"
diff --git a/app/src/main/res/layout/fragment_party.xml b/app/src/main/res/layout/fragment_party.xml
index 9099f8978..41ebfb5fc 100644
--- a/app/src/main/res/layout/fragment_party.xml
+++ b/app/src/main/res/layout/fragment_party.xml
@@ -44,7 +44,7 @@
                             android:layout_width="0dp"
                             android:layout_height="0dp"
                             android:layout_marginBottom="15dp"
-                            android:visibility="gone"
+                            android:visibility="visible"
                             app:layout_constraintBottom_toBottomOf="parent"
                             app:layout_constraintDimensionRatio="345:80"
                             app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/fragment_user_info_gift.xml b/app/src/main/res/layout/fragment_user_info_gift.xml
index d794a10e1..e29933be2 100644
--- a/app/src/main/res/layout/fragment_user_info_gift.xml
+++ b/app/src/main/res/layout/fragment_user_info_gift.xml
@@ -7,15 +7,15 @@
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-
-        >
+        android:layout_height="match_parent">
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/rv_gift"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"/>
+            android:layout_height="match_parent"
+            android:paddingStart="12dp"
+            android:paddingEnd="12dp" />
+
     </LinearLayout>
 
-
 </layout>
diff --git a/app/src/main/res/layout/fragment_userinfo_cp.xml b/app/src/main/res/layout/fragment_userinfo_cp.xml
index bbeb20bdb..fdc42d357 100644
--- a/app/src/main/res/layout/fragment_userinfo_cp.xml
+++ b/app/src/main/res/layout/fragment_userinfo_cp.xml
@@ -3,13 +3,15 @@
 
     <androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:background="#F8F8FB">
 
         <FrameLayout
             android:id="@+id/container"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginLeft="@dimen/dp_15"
+            android:layout_marginTop="12dp"
             android:layout_marginRight="@dimen/dp_15">
 
             <com.opensource.svgaplayer.SVGAImageView
@@ -24,8 +26,7 @@
                 android:id="@+id/cp_card_view"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center"
-               />
+                android:layout_gravity="center" />
 
         </FrameLayout>
 
diff --git a/app/src/main/res/layout/fragment_userinfo_dynamic.xml b/app/src/main/res/layout/fragment_userinfo_dynamic.xml
index 1f894c2f4..57290aff6 100644
--- a/app/src/main/res/layout/fragment_userinfo_dynamic.xml
+++ b/app/src/main/res/layout/fragment_userinfo_dynamic.xml
@@ -5,8 +5,6 @@
         android:id="@+id/rv_dynamic"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:paddingStart="7dp"
-        android:paddingEnd="7dp"
-        android:layout_marginTop="@dimen/dp_14" />
+        android:background="#F8F8FB" />
 
 </layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_userinfo_userinfo.xml b/app/src/main/res/layout/fragment_userinfo_userinfo.xml
index c3e164fbf..eefa799a5 100644
--- a/app/src/main/res/layout/fragment_userinfo_userinfo.xml
+++ b/app/src/main/res/layout/fragment_userinfo_userinfo.xml
@@ -7,15 +7,15 @@
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:background="#F8F8FB">
 
         <LinearLayout
             android:id="@+id/ll_skill"
             android:layout_width="match_parent"
             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:layout_marginTop="12dp"
+            android:background="@color/white"
             android:orientation="vertical"
             android:paddingLeft="@dimen/dp_20"
             android:paddingTop="@dimen/dp_18"
@@ -41,275 +41,33 @@
         </LinearLayout>
 
         <LinearLayout
-            android:id="@+id/ll_module_hall"
             android:layout_width="match_parent"
             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:orientation="vertical"
-            android:paddingStart="20dp"
-            android:paddingTop="18dp"
-            android:paddingEnd="5dp"
-            android:paddingBottom="20dp"
-            android:visibility="gone"
-            app:layout_constraintTop_toBottomOf="@id/ll_skill"
-            tools:visibility="visible">
-
-            <TextView
-                android:id="@+id/tv_hall_detail"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="公会·房间"
-                android:textColor="@color/text_normal_282828"
-                android:textSize="@dimen/sp_14"
-                android:textStyle="bold"
-                android:visibility="visible" />
-
-            <LinearLayout
-                android:id="@+id/ll_clan"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="12dp"
-                android:layout_marginBottom="10dp"
-                android:visibility="gone"
-                tools:visibility="visible">
-
-                <com.nnbc123.app.common.widget.RectRoundImageView
-                    android:id="@+id/iv_clan_avatar"
-                    android:layout_width="48dp"
-                    android:layout_height="48dp"
-                    android:layout_marginEnd="@dimen/dp_10"
-                    android:src="@drawable/default_cover"
-                    app:borderRadius="8dp"
-                    app:type="round" />
-
-                <LinearLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:orientation="vertical"
-                    android:paddingEnd="10dp">
-
-                    <TextView
-                        android:id="@+id/tv_clan_name"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:ellipsize="end"
-                        android:fontFamily="sans-serif-medium"
-                        android:includeFontPadding="false"
-                        android:lines="1"
-                        android:maxLength="9"
-                        android:textColor="@color/text_title_282828"
-                        android:textSize="@dimen/dp_12"
-                        tools:text="忘忧忘忧忘忧忘忧阁忘忧阁阁阁忘忧阁阁" />
-
-                    <TextView
-                        android:id="@+id/tv_clan_id"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="@dimen/dp_3"
-                        android:ellipsize="end"
-                        android:lines="1"
-                        android:textColor="@color/color_999999"
-                        android:textSize="@dimen/dp_11"
-                        android:visibility="gone"
-                        tools:text="公会ID：123456" />
-
-                    <TextView
-                        android:id="@+id/tv_clan_member_num"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="6dp"
-                        android:ellipsize="end"
-                        android:lines="1"
-                        android:textColor="@color/color_666666"
-                        android:textSize="@dimen/dp_11"
-                        android:visibility="gone"
-                        tools:text="公会人数：123" />
-
-                    <TextView
-                        android:id="@+id/tv_clan_hall_num"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="6dp"
-                        android:ellipsize="end"
-                        android:lines="1"
-                        android:textColor="@color/text_normal_282828"
-                        android:textSize="@dimen/dp_11"
-                        android:visibility="gone"
-                        tools:text="公会数量：123" />
-
-                </LinearLayout>
-
-                <View
-                    android:layout_width="0dp"
-                    android:layout_height="0dp"
-                    android:layout_weight="1" />
-
-                <ImageView
-                    android:id="@+id/iv_clan_level"
-                    android:layout_width="70dp"
-                    android:layout_height="65dp"
-                    android:layout_marginEnd="24dp"
-                    android:src="@drawable/default_cover"
-                    android:visibility="gone" />
-
-                <ImageView
-                    android:id="@+id/iv_clan_arrow"
-                    android:layout_width="40dp"
-                    android:layout_height="40dp"
-                    android:layout_gravity="center_vertical"
-                    android:layout_marginEnd="10dp"
-                    android:rotation="90"
-                    android:scaleType="center"
-                    android:src="@drawable/arrow_right" />
-
-            </LinearLayout>
-
-            <LinearLayout
-                android:id="@+id/ll_hall"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="15dp"
-                android:background="@drawable/top_line"
-                android:gravity="center_vertical"
-                android:orientation="horizontal"
-                android:paddingTop="7dp"
-                android:visibility="gone"
-                tools:visibility="visible">
-
-                <com.nnbc123.app.common.widget.RectRoundImageView
-                    android:id="@+id/iv_hall_avatar"
-                    android:layout_width="40dp"
-                    android:layout_height="40dp"
-                    android:layout_marginEnd="@dimen/dp_10"
-                    android:src="@drawable/default_cover"
-                    app:borderRadius="8dp"
-                    app:type="round" />
-
-                <LinearLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical"
-                    android:paddingEnd="10dp">
-
-                    <TextView
-                        android:id="@+id/tv_hall_name"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:ellipsize="end"
-                        android:fontFamily="sans-serif-medium"
-                        android:hint="没有加入房间"
-                        android:includeFontPadding="false"
-                        android:lines="1"
-                        android:maxLength="9"
-                        android:textColor="@color/text_title_282828"
-                        android:textColorHint="@color/color_999999"
-                        android:textSize="@dimen/dp_12" />
-
-                    <TextView
-                        android:id="@+id/tv_hall_id"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="@dimen/dp_5"
-                        android:ellipsize="end"
-                        android:lines="1"
-                        android:textColor="@color/text_normal_282828"
-                        android:textSize="@dimen/dp_11"
-                        android:visibility="gone"
-                        tools:text="公会ID：123456" />
-
-                    <LinearLayout
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="6dp"
-                        android:orientation="horizontal"
-                        android:visibility="gone">
-
-                        <TextView
-                            android:id="@+id/tv_hall_erban_id"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:ellipsize="end"
-                            android:lines="1"
-                            android:textColor="@color/color_999999"
-                            android:textSize="@dimen/dp_11"
-                            tools:text="ID：1234567" />
-
-                        <TextView
-                            android:id="@+id/tv_hall_member_num"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginStart="10dp"
-                            android:ellipsize="end"
-                            android:lines="1"
-                            android:textColor="@color/color_999999"
-                            android:textSize="@dimen/dp_11"
-                            tools:text="房间人数：123" />
-                    </LinearLayout>
-
-
-                </LinearLayout>
-
-                <View
-                    android:layout_width="0dp"
-                    android:layout_height="0dp"
-                    android:layout_weight="1" />
-
-                <TextView
-                    android:id="@+id/tv_apply_hall"
-                    android:layout_width="80dp"
-                    android:layout_height="@dimen/dp_28"
-                    android:layout_gravity="center"
-                    android:layout_marginEnd="15dp"
-                    android:background="@drawable/shape_stroke_app_color_1dp"
-                    android:gravity="center"
-                    android:includeFontPadding="false"
-                    android:text="申请加入"
-                    android:textColor="@color/app_248cfe"
-                    android:textSize="14sp"
-                    android:visibility="gone"
-                    tools:visibility="visible" />
-
-            </LinearLayout>
-
-        </LinearLayout>
-
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            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:layout_marginTop="12dp"
+            android:background="@color/white"
             android:orientation="vertical"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/ll_module_hall"
+            app:layout_constraintTop_toBottomOf="@id/ll_skill"
             app:layout_constraintVertical_bias="0">
 
             <TextView
                 android:id="@+id/tv_gift_detail"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="4dp"
-                android:layout_marginEnd="10dp"
-                android:drawableEnd="@drawable/arrow_right"
-                android:paddingStart="20dp"
-                android:paddingTop="18dp"
-                android:paddingEnd="20dp"
-                android:paddingBottom="10dp"
+                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_13"
+                android:textSize="@dimen/sp_14"
                 android:textStyle="bold" />
 
             <com.nnbc123.app.ui.widget.magicindicator.MagicIndicator
                 android:id="@+id/magic_indicator_gift"
                 android:layout_width="wrap_content"
-                android:layout_height="20dp"
-                android:layout_gravity="center_horizontal"
-               />
+                android:layout_height="25dp"
+                android:layout_gravity="center_horizontal" />
 
             <androidx.viewpager.widget.ViewPager
                 android:id="@+id/view_pager_gift"
diff --git a/app/src/main/res/layout/list_item_gift_wall_info.xml b/app/src/main/res/layout/list_item_gift_wall_info.xml
index 0fbd7f397..d1b263829 100644
--- a/app/src/main/res/layout/list_item_gift_wall_info.xml
+++ b/app/src/main/res/layout/list_item_gift_wall_info.xml
@@ -3,9 +3,14 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:layout_marginStart="8dp"
+    android:layout_marginTop="7dp"
+    android:layout_marginEnd="8dp"
+    android:layout_marginBottom="7dp"
+    android:background="@drawable/shape_f3f5fa_corner_8dp"
     android:gravity="center"
     android:orientation="vertical"
-   >
+    android:paddingBottom="5dp">
 
     <ImageView
         android:id="@+id/gift_img"
@@ -18,12 +23,11 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
-        android:background="@drawable/bg_user_gift_item"
         android:gravity="center"
         android:includeFontPadding="false"
         android:paddingStart="8dp"
         android:paddingEnd="@dimen/dp_8"
-        android:textColor="@color/color_333333"
+        android:textColor="#6D6B89"
         android:textSize="12dp"
         tools:text="x120" />
 
@@ -47,9 +51,8 @@
         android:layout_marginTop="3dp"
         android:drawableStart="@drawable/ic_gift_diamond"
         android:gravity="center_vertical"
-        android:textColor="@color/color_999999"
+        android:textColor="@color/text_secondary_878b9c"
         android:textSize="11dp"
         tools:text="10" />
 
-
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/module_community/res/drawable-xhdpi/icon_dy_list_comment.png b/app/src/module_community/res/drawable-xhdpi/icon_dy_list_comment.png
index ffb423a2a..63df1c5ec 100644
Binary files a/app/src/module_community/res/drawable-xhdpi/icon_dy_list_comment.png and b/app/src/module_community/res/drawable-xhdpi/icon_dy_list_comment.png differ
diff --git a/app/src/module_community/res/drawable-xhdpi/icon_dy_list_like.png b/app/src/module_community/res/drawable-xhdpi/icon_dy_list_like.png
index 1d167021e..06509679d 100644
Binary files a/app/src/module_community/res/drawable-xhdpi/icon_dy_list_like.png and b/app/src/module_community/res/drawable-xhdpi/icon_dy_list_like.png differ
diff --git a/app/src/module_community/res/drawable-xhdpi/icon_dy_list_like_false.png b/app/src/module_community/res/drawable-xhdpi/icon_dy_list_like_false.png
index a507d8902..d50d131a2 100644
Binary files a/app/src/module_community/res/drawable-xhdpi/icon_dy_list_like_false.png and b/app/src/module_community/res/drawable-xhdpi/icon_dy_list_like_false.png differ
diff --git a/app/src/module_community/res/drawable-xhdpi/icon_dy_list_share.png b/app/src/module_community/res/drawable-xhdpi/icon_dy_list_share.png
index 170e6b61f..a98b740c3 100644
Binary files a/app/src/module_community/res/drawable-xhdpi/icon_dy_list_share.png and b/app/src/module_community/res/drawable-xhdpi/icon_dy_list_share.png differ
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 2522dc61f..8d1c726fa 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,8 @@
     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="@color/white"
+    android:layout_marginTop="12dp"
     android:orientation="vertical">
 
     <TextView
@@ -154,7 +155,7 @@
                 android:layout_marginStart="6.5dp"
                 android:layout_weight="1"
                 android:gravity="center_vertical"
-                android:textColor="@color/text_normal_282828"
+                android:textColor="@color/text_secondary_878b9c"
                 android:textSize="@dimen/sp_12"
                 tools:text="0" />
         </LinearLayout>
@@ -180,7 +181,7 @@
                 android:layout_height="@dimen/dp_30"
                 android:layout_marginStart="6.5dp"
                 android:gravity="center_vertical"
-                android:textColor="@color/text_normal_282828"
+                android:textColor="@color/text_secondary_878b9c"
                 android:textSize="@dimen/sp_12"
                 tools:text="0" />
         </LinearLayout>
@@ -207,6 +208,7 @@
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:padding="@dimen/dp_6"
+            android:rotation="90"
             android:scaleType="centerInside"
             android:src="@drawable/icon_dy_item_more"
             android:layout_alignParentEnd="true"
@@ -214,16 +216,4 @@
 
     </RelativeLayout>
 
-    <View
-        android:id="@+id/line_bottom"
-        android:layout_width="match_parent"
-        android:layout_height="1px"
-        android:layout_marginStart="15dp"
-        android:layout_marginTop="10dp"
-        android:layout_marginEnd="15dp"
-        android:background="@color/line_353548"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/rl_option" />
-
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file