修改ui，修復測試提的bug

app/src/main/java/com/yizhuan/erban/MainActivity.java

@@ -146,12 +146,8 @@ public class MainActivity extends BaseMvpActivity<IMainView, MainPresenter>
     private static final String EXTRA_APP_QUIT = "APP_QUIT";
     private final SparseArray<Fragment> fragmentArray = new SparseArray<>();
     private DragLayout avatarLayout;
-    private TextView tvName;//最小化窗口名称
-    private TextView tvId;//最小化窗口ID
     private CircleImageView avatarImage;
-    private LinearLayout llDragInfo;
     private LivingIconView userLivingView;
-    private View viewClose;
     private MainTabLayout mMainTabLayout;
     private AnchorCardView anchorCardView;
     private int mCurrentTabType = MainTabType.TAB_TYPE_HOME;
@@ -356,13 +352,9 @@ public class MainActivity extends BaseMvpActivity<IMainView, MainPresenter>
     private void initView() {
         mMainTabLayout = findViewById(R.id.main_tab_layout);
         avatarLayout = findViewById(R.id.avatar_image_layout);
-        tvName = findViewById(R.id.tv_name);
-        tvId = findViewById(R.id.tv_id);
 
         avatarImage = findViewById(R.id.avatar_image);
         userLivingView = findViewById(R.id.liv_user);
-        viewClose = findViewById(R.id.view_close);
-        llDragInfo = findViewById(R.id.ll_drag_info);
         userLivingView.setColor(Color.WHITE);
         mMainTabLayout.setOnTabClickListener(this);
         anchorCardView = findViewById(R.id.vs_anchor_card);
@@ -406,8 +398,6 @@ public class MainActivity extends BaseMvpActivity<IMainView, MainPresenter>
     private void initMaterialView() {
         avatarLayout.setVisibility(View.GONE);
         avatarImage.setOnClickListener(this);
-        llDragInfo.setOnClickListener(this);
-        viewClose.setOnClickListener(this);
     }
 
     @Override
@@ -593,8 +583,6 @@ public class MainActivity extends BaseMvpActivity<IMainView, MainPresenter>
     private void displayAvatarLayout(String avatar, String nickName, long uid) {
         avatarLayout.clearAnimation();
         avatarLayout.setVisibility(View.VISIBLE);
-        tvName.setText(nickName);
-        tvId.setText("ID:" + uid);
         userLivingView.start();
         stopRoomMinAnim();
         startRoomMinAnim();
@@ -923,7 +911,6 @@ public class MainActivity extends BaseMvpActivity<IMainView, MainPresenter>
     public void onClick(View v) {
         switch (v.getId()) {
             case R.id.avatar_image:
-            case R.id.ll_drag_info:
                 RoomInfo roomInfo = AvRoomDataManager.get().mCurrentRoomInfo;
                 if (roomInfo != null) {
                     AVRoomActivity.start(MainActivity.this, roomInfo.getUid());
@@ -931,11 +918,6 @@ public class MainActivity extends BaseMvpActivity<IMainView, MainPresenter>
                     toast(getString(R.string.room_information_is_empty));
                 }
 
-                break;
-            case R.id.view_close:
-                StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_ROOM_MINIMIZE_CLOSED,
-                        getString(R.string.room_minimization_close_button));
-                MainActivity.this.getMvpPresenter().exitRoom();
                 break;
         }
     }

app/src/main/java/com/yizhuan/erban/application/GlobalHandleManager.java

@@ -18,6 +18,7 @@ import com.yizhuan.xchat_android_core.recall.event.CheckLostUserEvent;
 import com.yizhuan.xchat_android_core.relation.cp.CpInviteInfo;
 import com.yizhuan.xchat_android_core.upgrade.event.ImPushUpdateAppEvent;
 import com.yizhuan.xchat_android_core.user.UserModel;
+import com.yizhuan.xchat_android_core.utils.Logger;
 import com.yizhuan.xchat_android_core.utils.SharedPreferenceUtils;
 import com.yizhuan.xchat_android_core.vip.VipUpgradeEvent;
 

app/src/main/java/com/yizhuan/erban/application/XChatApplication.java

@@ -114,6 +114,7 @@ import io.realm.RealmConfiguration;
 
 public class XChatApplication extends Application {
     public static final String TAG = "XChatApplication";
+    public static Application gContext;
     private static final MessageNotifierCustomization messageNotifierCustomization = new MessageNotifierCustomization() {
         @Override
         public String makeNotifyContent(String nick, IMMessage message) {
@@ -526,6 +527,21 @@ public class XChatApplication extends Application {
         if (!isShowPrivacyAgreement) {
             initOtherSDK();
         }
+        initContext(this);
+    }
+
+    /**
+     * 初始化Application实例
+     */
+    public void initContext(Application application) {
+        gContext = application;
+    }
+
+    /**
+     * @return 获取Application实例
+     */
+    public static Application getApplication() {
+        return gContext;
     }
 
     @Override

app/src/main/java/com/yizhuan/erban/avroom/fragment/BaseRoomFragment.kt

@@ -266,8 +266,9 @@ open class BaseRoomFragment<V : IBaseRoomView?, P : BaseRoomPresenter<V>?> :
         mvpPresenter?.loadRoomRank()
         GiftValueMrg.get().updateRoomGiftValue(false)
 
-        ivRadishEntrance?.isVisible =
+        //先隐藏航海冒险
-            !GoldBoxHelper.needIntegrateBoxEntrance() && GoldBoxHelper.isShowRadish()
+//        ivRadishEntrance?.isVisible =
+//            !GoldBoxHelper.needIntegrateBoxEntrance() && GoldBoxHelper.isShowRadish()
 
     }
 

app/src/main/java/com/yizhuan/erban/avroom/fragment/HomePartyFragment.java

@@ -34,7 +34,11 @@ import com.yizhuan.erban.databinding.FragmentChatroomGameMainBinding;
 import com.yizhuan.erban.friend.view.SelectFriendActivity;
 import com.yizhuan.erban.home.helper.OpenRoomHelper;
 import com.yizhuan.erban.ui.widget.ShareDialog;
+import com.yizhuan.erban.utils.ClipboardUtils;
 import com.yizhuan.erban.utils.RegexUtil;
+import com.yizhuan.xchat_android_constants.XChatConstants;
+import com.yizhuan.xchat_android_core.UriProvider;
+import com.yizhuan.xchat_android_core.auth.AuthModel;
 import com.yizhuan.xchat_android_core.gift.bean.GiftMultiReceiverInfo;
 import com.yizhuan.xchat_android_core.gift.bean.GiftReceiveInfo;
 import com.yizhuan.xchat_android_core.gift.bean.LuckyBagGifts;
@@ -70,6 +74,7 @@ import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
 
 import java.lang.reflect.Field;
+import java.net.URLEncoder;
 import java.util.Objects;
 
 import cn.sharesdk.framework.Platform;
@@ -602,7 +607,6 @@ public class HomePartyFragment extends BaseFragment implements View.OnClickListe
         }
     }
 
-
     @Override
     public void onDestroy() {
         if (giftView != null) {

app/src/main/java/com/yizhuan/erban/home/HomeViewModel.kt

@@ -77,7 +77,7 @@ class HomeViewModel : BaseViewModel() {
 
     fun getBannerInfo() {
         safeLaunch {
-            _bannerLiveData.value = HomeModel.getHomeBanner("9")
+            _bannerLiveData.value = HomeModel.getHomeBanner("1")
         }
     }
 

app/src/main/java/com/yizhuan/erban/home/adapter/HomeRoomFragmentAdapter.java

@@ -45,12 +45,9 @@ public class HomeRoomFragmentAdapter extends BaseMultiItemQuickAdapter<HomeTabMa
         switch (helper.getItemViewType()) {
 
             case HomeTabMapInfo.TYPE_NORMAL:
-                helper.itemView.setOnClickListener(new View.OnClickListener() {
+                helper.itemView.setOnClickListener(v -> {
-                    @Override
+                    StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_TJ_ROOM_SUCCESS, ResUtil.getString(R.string.home_adapter_homeroomfragmentadapter_01));
-                    public void onClick(View v) {
+                    AVRoomActivity.startForFromType(mContext, item.getRoomUid(), AVRoomActivity.FROM_TYPE_RECOMMEND);
-                        StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_TJ_ROOM_SUCCESS, ResUtil.getString(R.string.home_adapter_homeroomfragmentadapter_01));
-                        AVRoomActivity.startForFromType(mContext, item.getRoomUid(), AVRoomActivity.FROM_TYPE_RECOMMEND);
-                    }
                 });
                 helper.setText(R.id.tv_online_number, item.getOnlineNum() + "")
                         .setText(R.id.tv_title, item.getTitle());

app/src/main/java/com/yizhuan/erban/home/adapter/HomeTopAdapter.java

@@ -0,0 +1,62 @@
+package com.yizhuan.erban.home.adapter;
+
+import static com.umeng.commonsdk.stateless.UMSLEnvelopeBuild.mContext;
+
+import android.text.TextUtils;
+import android.view.View;
+import android.widget.ImageView;
+
+import com.netease.nim.uikit.support.glide.GlideApp;
+import com.yizhuan.erban.R;
+import com.yizhuan.erban.ui.utils.ImageLoadUtils;
+import com.yizhuan.xchat_android_core.home.bean.HomeTabMapInfo;
+import com.zhpan.bannerview.BaseBannerAdapter;
+import com.zhpan.bannerview.BaseViewHolder;
+
+public class HomeTopAdapter extends BaseBannerAdapter<HomeTabMapInfo> {
+
+    @Override
+    public int getLayoutId(int viewType) {
+        return R.layout.activity_home_top_banner;
+    }
+
+    @Override
+    protected void bindData(BaseViewHolder<HomeTabMapInfo> helper, HomeTabMapInfo item, int position, int pageSize) {
+        helper.setText(R.id.tv_online_number, item.getOnlineNum() + "");
+        helper.setText(R.id.tv_title, item.getTitle());
+
+
+        //注意这里有三个标签,展示优先级 PK中>自定义>房间标签
+        if (item.isCrossPking()) {
+            helper.findViewById(R.id.tv_tag_in_pk).setVisibility(View.VISIBLE);
+        } else {
+            helper.findViewById(R.id.tv_tag_in_pk).setVisibility(View.GONE);
+        }
+
+        if (!TextUtils.isEmpty(item.getIconContent()) && !item.isCrossPking()) {
+            helper.findViewById(R.id.tv_tag_content).setVisibility(View.VISIBLE);
+        } else {
+            helper.findViewById(R.id.tv_tag_content).setVisibility(View.GONE);
+        }
+        helper.setText(R.id.tv_tag_content, item.getIconContent());
+
+        ImageView mIvTabLabel = helper.findViewById(R.id.iv_tab_label);
+        if (!TextUtils.isEmpty(item.getTagPict()) && !item.isCrossPking() && TextUtils.isEmpty(item.getIconContent())) {
+            mIvTabLabel.setVisibility(View.VISIBLE);
+            ImageLoadUtils.loadAvatarBig(item.getTagPict(), mIvTabLabel);
+        } else {
+            mIvTabLabel.setVisibility(View.GONE);
+        }
+
+        ImageView ivCover = helper.findViewById(R.id.iv_cover);
+        if (!TextUtils.isEmpty(item.getAvatar())) {
+            ImageLoadUtils.loadAvatarBig(item.getAvatar(), ivCover, R.drawable.default_cover);
+        } else {
+            GlideApp.with(mContext)
+                    .load(R.drawable.default_cover)
+                    .placeholder(R.drawable.default_cover)
+                    .into(ivCover);
+        }
+    }
+
+}

app/src/main/java/com/yizhuan/erban/home/fragment/HomeFragment.kt

@@ -7,11 +7,14 @@ import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.databinding.DataBindingUtil
 import androidx.fragment.app.Fragment
+import androidx.fragment.app.activityViewModels
+import com.coorchice.library.utils.LogUtils
 import com.netease.nim.uikit.common.util.sys.ScreenUtil
 import com.yizhuan.erban.R
 import com.yizhuan.erban.avroom.adapter.RoomVPAdapter
 import com.yizhuan.erban.base.BaseFragment
 import com.yizhuan.erban.databinding.FragmentHomeBinding
+import com.yizhuan.erban.home.HomeViewModel
 import com.yizhuan.erban.home.adapter.MainMagicIndicatorAdapter
 import com.yizhuan.erban.home.adapter.PartyMagicIndicatorAdapter
 import com.yizhuan.erban.home.helper.OpenRoomHelper
@@ -21,16 +24,25 @@ import com.yizhuan.erban.ui.widget.magicindicator.ViewPagerHelper
 import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator
 import com.yizhuan.xchat_android_core.DemoCache
 import com.yizhuan.xchat_android_core.UriProvider
+import com.yizhuan.xchat_android_core.home.bean.HomeTagInfo
+import com.yizhuan.xchat_android_core.home.event.RefreshHomeDataEvent
 import com.yizhuan.xchat_android_core.statistic.StatisticManager
 import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol
 import com.yizhuan.xchat_android_library.utils.ResUtil
+import org.greenrobot.eventbus.Subscribe
+import org.greenrobot.eventbus.ThreadMode
 
 /**
  * Peko首页
  */
 class HomeFragment : BaseFragment(), View.OnClickListener,
     PartyMagicIndicatorAdapter.OnItemSelectListener {
+
     private lateinit var mBinding: FragmentHomeBinding
+    private val mFragments: ArrayList<Fragment> = ArrayList()
+    private val mTabInfoList: ArrayList<CharSequence> = ArrayList()
+    private val homeViewModel: HomeViewModel by activityViewModels()
+
     override fun onClick(v: View) {
         when (v.id) {
             R.id.iv_search -> {
@@ -69,30 +81,95 @@ class HomeFragment : BaseFragment(), View.OnClickListener,
     @SuppressLint("CheckResult")
     override fun initiate() {
         initTitleTab()
+        homeViewModel.tagLiveData.observe(this) {
+            it?.let {
+                onGetHomeTagSuccess(it)
+            }
+        }
+        homeViewModel.getTagInfo()
+    }
+
+    private fun onGetHomeTagSuccess(info: List<HomeTagInfo>) {
+        var changed = false
+        mTabInfoList.remove(ResUtil.getString(R.string.home_fragment_homefragment_04))
+        val oldTabInfoList: List<CharSequence> = ArrayList<CharSequence>(mTabInfoList)
+        for (tagInfo in info) {
+            if (!oldTabInfoList.contains(tagInfo.name)) {
+                changed = true
+                break
+            }
+        }
+        //只有HomeTagInfo发生改变才刷新数据
+        if (changed) {
+            LogUtils.e("$changed:oldTabInfoList")
+            mTabInfoList.clear()
+            mFragments.clear()
+            mTabInfoList.add(ResUtil.getString(R.string.home_fragment_homefragment_04))
+            mFragments.add(RecommendFragment.newInstance())
+            for (i in info.indices) {
+                //过滤对象是空和没有标签名同时也没有子标签的情况
+                var title: CharSequence?
+                var fragment: Fragment?
+                var name = info[i].name
+                if (name != null) {
+                    name = name.trim { it <= ' ' }
+                }
+                title = name
+                mTabInfoList.add(title)
+                val tabId: Int = info[i].id
+                fragment = when (title) {
+                    ResUtil.getString(R.string.home_fragment_partyfragment_01) -> {
+                        RoomLikeFragment.newInstance()
+                    }
+                    ResUtil.getString(R.string.home_fragment_partyfragment_02) -> {
+                        RoomGameFragment.newInstance()
+                    }
+                    else -> {
+                        RoomCommonFragment.newInstance(tabId)
+                    }
+                }
+                mFragments.add(fragment)
+            }
+            val commonNavigator = CommonNavigator(context)
+            commonNavigator.setTitleWrapContent(false)
+            commonNavigator.titleMargin = ScreenUtil.dip2px(2.0F)
+            commonNavigator.setTitleGravity(Gravity.CENTER_VERTICAL)
+            val magicIndicatorAdapter = PartyMagicIndicatorAdapter(mTabInfoList)
+            magicIndicatorAdapter.textSize = 14
+            magicIndicatorAdapter.setOnItemSelectListener(this)
+            commonNavigator.adapter = magicIndicatorAdapter
+            mBinding.magicIndicator.navigator = commonNavigator
+            mBinding.viewPager.offscreenPageLimit = 2
+            mBinding.viewPager.adapter = RoomVPAdapter(
+                childFragmentManager,
+                mFragments
+            )
+            ViewPagerHelper.bind(mBinding.magicIndicator, mBinding.viewPager)
+        }
+    }
+
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    fun onRefreshHomeDataEvent(event: RefreshHomeDataEvent?) {
+        if (isResumed) homeViewModel.getTagInfo()
     }
 
     /**
      * 初始化推荐和派对tab
      */
     private fun initTitleTab() {
-        val fragmentPos: MutableList<Fragment> = ArrayList()
+        mTabInfoList.add(ResUtil.getString(R.string.home_fragment_homefragment_04))
-        val tagList: MutableList<String> = ArrayList()
+        mFragments.add(RecommendFragment.newInstance())
-        tagList.add(ResUtil.getString(R.string.home_fragment_homefragment_04))
-        tagList.add(ResUtil.getString(R.string.home_fragment_homefragment_05))
-        fragmentPos.add(RecommendFragment.newInstance())
-        fragmentPos.add(PartyFragment.newInstance())
         val commonNavigator = CommonNavigator(context)
         commonNavigator.setTitleWrapContent(false)
         commonNavigator.titleMargin = ScreenUtil.dip2px(2.0F)
         commonNavigator.setTitleGravity(Gravity.CENTER_VERTICAL)
-        val magicIndicatorAdapter = PartyMagicIndicatorAdapter(tagList)
+        val magicIndicatorAdapter = PartyMagicIndicatorAdapter(mTabInfoList)
         magicIndicatorAdapter.textSize = 14
         magicIndicatorAdapter.setOnItemSelectListener(this)
         commonNavigator.adapter = magicIndicatorAdapter
         mBinding.magicIndicator.navigator = commonNavigator
-        mBinding.viewPager.offscreenPageLimit = 6
+        mBinding.viewPager.offscreenPageLimit = 2
-        mBinding.viewPager.adapter =
+        mBinding.viewPager.adapter = RoomVPAdapter(childFragmentManager, mFragments)
-            RoomVPAdapter(childFragmentManager, fragmentPos)
         ViewPagerHelper.bind(mBinding.magicIndicator, mBinding.viewPager)
     }
 

app/src/main/java/com/yizhuan/erban/home/fragment/HomeTabHomeFragment.java

@@ -3,22 +3,27 @@ package com.yizhuan.erban.home.fragment;
 import android.annotation.SuppressLint;
 import android.os.Bundle;
 import android.view.View;
-import android.view.ViewGroup;
 
 import androidx.annotation.Nullable;
-import androidx.recyclerview.widget.GridLayoutManager;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
 
 import com.trello.rxlifecycle3.android.FragmentEvent;
 import com.yizhuan.erban.R;
+import com.yizhuan.erban.application.XChatApplication;
+import com.yizhuan.erban.avroom.activity.AVRoomActivity;
 import com.yizhuan.erban.base.BaseFragment;
-import com.yizhuan.erban.home.adapter.HomeRoomFragmentAdapter;
+import com.yizhuan.erban.home.adapter.HomeTopAdapter;
+import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil;
 import com.yizhuan.xchat_android_core.home.bean.HomeTabMapInfo;
 import com.yizhuan.xchat_android_core.home.event.RefreshHomeDataEvent;
 import com.yizhuan.xchat_android_core.home.model.GameHomeModel;
+import com.yizhuan.xchat_android_core.statistic.StatisticManager;
+import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol;
 import com.yizhuan.xchat_android_core.utils.net.RxHelper;
 import com.yizhuan.xchat_android_library.utils.ListUtils;
+import com.yizhuan.xchat_android_library.utils.ResUtil;
+import com.zhpan.bannerview.BannerViewPager;
+import com.zhpan.bannerview.annotation.APageStyle;
+import com.zhpan.bannerview.constants.PageStyle;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
@@ -34,13 +39,12 @@ import java.util.Random;
  *
  */
 public class HomeTabHomeFragment extends BaseFragment {
-    public static final int ROWS = 3;
     private static final Comparator<HomeTabMapInfo> comp = (o1, o2) -> {
         int seq = o1.getSeq() - o2.getSeq();
         return Integer.compare(seq, 0);
     };
-    private RecyclerView recyclerView;
+
-    private HomeRoomFragmentAdapter mHomeRoomAdapter;
+    private BannerViewPager<HomeTabMapInfo> mBanner;
 
     public static HomeTabHomeFragment newInstance() {
         HomeTabHomeFragment fragment = new HomeTabHomeFragment();
@@ -55,8 +59,7 @@ public class HomeTabHomeFragment extends BaseFragment {
     @Override
     public void onFindViews() {
         super.onFindViews();
-        recyclerView = mView.findViewById(R.id.recycler_view);
+        mBanner = mView.findViewById(R.id.mBanner);
-        initRecyclerView();
     }
 
     /**
@@ -101,23 +104,31 @@ public class HomeTabHomeFragment extends BaseFragment {
     private void refreshRoomData(List<HomeTabMapInfo> finalList, List<HomeTabMapInfo> randomList) {
         List<HomeTabMapInfo> finalList1 = new ArrayList<>(finalList);//最终的6条数据
         List<HomeTabMapInfo> randomList1 = new ArrayList<>(randomList);//不是置顶的
-        mHomeRoomAdapter.setNewData(getConvertData(finalList1, randomList1));
+        mBanner.setAdapter(new HomeTopAdapter());
+        setupBanner(
+                PageStyle.MULTI_PAGE_SCALE,
+                UIUtil.dip2px(mContext, 110),
+                UIUtil.dip2px(mContext, 110),
+                getConvertData(finalList1, randomList1)
+        );
     }
 
-    private void initRecyclerView() {
+    private void setupBanner(
-        recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
+            @APageStyle int pageStyle,
-        recyclerView.setItemAnimator(null);
+            int leftRevealWidth,
-        mHomeRoomAdapter = new HomeRoomFragmentAdapter(getContext());
+            int rightRevealWidth,
-        mHomeRoomAdapter.setEnableLoadMore(false);
+            List<HomeTabMapInfo> list
-        GridLayoutManager gridLayoutManager = new GridLayoutManager(getContext(), ROWS);
+    ) {
-        mHomeRoomAdapter.setEnableLoadMore(false);
+        mBanner.setPageMargin(UIUtil.dip2px(mContext, 10))
-        recyclerView.setLayoutManager(gridLayoutManager);
+                .setScrollDuration(800)
-        recyclerView.setAdapter(mHomeRoomAdapter);
+                .setAutoPlay(true)
-
+                .setRevealWidth(leftRevealWidth, rightRevealWidth)
-        View emptyView = getLayoutInflater().inflate(R.layout.layout_home_room_empty, null);
+                .setPageStyle(pageStyle)
-        ViewGroup.LayoutParams lp = new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+                .create(list);
-        emptyView.setLayoutParams(lp);
+        mBanner.setOnPageClickListener((clickedView, position) -> {
-        mHomeRoomAdapter.setEmptyView(emptyView);
+            StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_TJ_ROOM_SUCCESS, ResUtil.getString(R.string.home_adapter_homeroomfragmentadapter_01));
+            AVRoomActivity.startForFromType(mContext, list.get(position).getRoomUid(), AVRoomActivity.FROM_TYPE_RECOMMEND);
+        });
     }
 
     /**
@@ -135,13 +146,14 @@ public class HomeTabHomeFragment extends BaseFragment {
 
         if (finalList1.size() >= ROOM_COUNT) {
             finalList1 = finalList1.subList(0, ROOM_COUNT);
-        } else {
-            while (finalList1.size() < ROOM_COUNT) {
-                HomeTabMapInfo info = new HomeTabMapInfo();
-                info.setItemType(HomeTabMapInfo.TYPE_EMPTY);
-                finalList1.add(info);
-            }
         }
+//        else {
+//            while (finalList1.size() < ROOM_COUNT) {
+//                HomeTabMapInfo info = new HomeTabMapInfo();
+//                info.setItemType(HomeTabMapInfo.TYPE_EMPTY);
+//                finalList1.add(info);
+//            }
+//        }
         return finalList1;
     }
 
@@ -187,7 +199,7 @@ public class HomeTabHomeFragment extends BaseFragment {
 
     @Subscribe(threadMode = ThreadMode.MAIN)
     public void onRefreshHomeDataEvent(RefreshHomeDataEvent event) {
-       if (isResumed()) getData();
+        if (isResumed()) getData();
     }
 
 }

app/src/main/java/com/yizhuan/erban/ui/im/recent/RecentListFragment.java

@@ -174,7 +174,7 @@ public class RecentListFragment extends BaseFragment {
         ivRedPoint = mView.findViewById(R.id.iv_red_point);
         ivRedPoint.setVisibility(isClicked ? View.GONE : View.VISIBLE);
         // 等级限制
-        setFindNewbieView();
+//        setFindNewbieView();
     }
 
     @SuppressLint("CheckResult")
@@ -432,7 +432,7 @@ public class RecentListFragment extends BaseFragment {
     @Subscribe(threadMode = ThreadMode.MAIN)
     public void onLoginEvent(LoginEvent event) {
         //登录成功刷新消息页萌新
-        setFindNewbieView();
+//        setFindNewbieView();
     }
 
     @Override

app/src/main/java/com/yizhuan/erban/ui/widget/ShareDialog.java

@@ -34,7 +34,7 @@ public class ShareDialog extends BottomSheetDialog implements View.OnClickListen
     private static final String TAG = "ShareDialog";
     private Context context;
     private TextView tvErban;
-    private TextView tv_Google;
+    private TextView tv_share_link;
     private TextView tvLine;
     private TextView tvFaceBook;
     private TextView tvCancel;
@@ -57,13 +57,13 @@ public class ShareDialog extends BottomSheetDialog implements View.OnClickListen
         setContentView(R.layout.dialog_share);
         setCanceledOnTouchOutside(true);
         tvErban = findViewById(R.id.tv_erban);
-        tv_Google = (TextView) findViewById(R.id.tv_Google);
+        tv_share_link = (TextView) findViewById(R.id.tv_share_link);
         tvLine = (TextView) findViewById(R.id.tv_line);
         tvFaceBook = (TextView) findViewById(R.id.tv_facebook);
         tvCancel = (TextView) findViewById(R.id.tv_cancel);
 
         tvErban.setOnClickListener(this);
-        tv_Google.setOnClickListener(this);
+        tv_share_link.setOnClickListener(this);
         tvLine.setOnClickListener(this);
         tvCancel.setOnClickListener(this);
         tvFaceBook.setOnClickListener(this);
@@ -93,7 +93,6 @@ public class ShareDialog extends BottomSheetDialog implements View.OnClickListen
                     if (type != TYPE_SHARE_H5) {
                         onShareDialogItemClick.onInAppSharingItemClick();
                     } else {
-//                        Toast.makeText(context, ResUtil.getString(R.string.ui_widget_sharedialog_01), Toast.LENGTH_SHORT).show();
                         SingleToastUtil.showToastShort(ResUtil.getString(R.string.ui_widget_sharedialog_02));
                     }
                 }
@@ -105,18 +104,18 @@ public class ShareDialog extends BottomSheetDialog implements View.OnClickListen
                 }
                 dismiss();
                 break;
-            case R.id.tv_Google:
-                if (onShareDialogItemClick != null) {
-                    onShareDialogItemClick.onSharePlatformClick(ShareSDK.getPlatform(GooglePlus.NAME));
-                }
-                dismiss();
-                break;
             case R.id.tv_facebook:
                 if (onShareDialogItemClick != null) {
                     onShareDialogItemClick.onSharePlatformClick(ShareSDK.getPlatform(Facebook.NAME));
                 }
                 dismiss();
                 break;
+            case R.id.tv_share_link:
+                if (onShareDialogItemClick != null) {
+                    onShareDialogItemClick.onSharePlatformClick(ShareSDK.getPlatform(GooglePlus.NAME));
+                }
+                dismiss();
+                break;
             case R.id.tv_cancel:
                 dismiss();
                 break;
@@ -138,5 +137,6 @@ public class ShareDialog extends BottomSheetDialog implements View.OnClickListen
          * @param platform
          */
         void onSharePlatformClick(Platform platform);
+
     }
 }

app/src/main/java/com/yizhuan/erban/utils/ClipboardUtils.java

@@ -0,0 +1,136 @@
+package com.yizhuan.erban.utils;
+
+import android.annotation.TargetApi;
+import android.app.Activity;
+import android.app.Application;
+import android.content.ClipData;
+import android.content.ClipboardManager;
+import android.content.Context;
+import android.os.Build;
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.util.Log;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.yizhuan.erban.application.XChatApplication;
+
+/**
+ * <pre>
+ *     author : wk
+ *     time   : 2019/08/21
+ *     desc   : 剪贴板相关工具类
+ * </pre>
+ */
+public class ClipboardUtils {
+    private static final String TAG = "ClipboardUtils";
+
+    /**
+     * 复制文本到剪贴板
+     *
+     * @param text 文本
+     */
+    public static void copyText(final CharSequence text) {
+        try {
+            ClipboardManager cm = (ClipboardManager) XChatApplication.getApplication().getSystemService(Context.CLIPBOARD_SERVICE);
+            cm.setPrimaryClip(ClipData.newPlainText("text", text));
+        } catch (Exception e) {
+            Log.e(TAG, "copyText", e);
+        }
+    }
+
+    /**
+     * 获取剪贴板的文本
+     */
+    public static void getText(@Nullable Activity activity, final Function f) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q && activity != null) {
+            getTextFroClipAboveAndroidQ(activity, f);
+        } else {
+            f.invoke(getTextFromClip());
+        }
+    }
+
+    /**
+     * Android Q获取剪贴板的文本
+     * 参考文档：https://juejin.cn/post/6844903922767757325
+     */
+    @TargetApi(Build.VERSION_CODES.Q)
+    private static void getTextFroClipAboveAndroidQ(@NonNull final Activity activity, final Function f) {
+        Runnable runnable = new Runnable() {
+            @Override
+            public void run() {
+                f.invoke(getTextFromClip());
+            }
+        };
+        activity.registerActivityLifecycleCallbacks(new Application.ActivityLifecycleCallbacks() {
+            @Override
+            public void onActivityCreated(@NonNull Activity activity, @Nullable Bundle savedInstanceState) {
+            }
+
+            @Override
+            public void onActivityStarted(@NonNull Activity activity) {
+            }
+
+            @Override
+            public void onActivityResumed(@NonNull Activity activity) {
+            }
+
+            @Override
+            public void onActivityPaused(@NonNull Activity activity) {
+            }
+
+            @Override
+            public void onActivityStopped(@NonNull Activity activity) {
+            }
+
+            @Override
+            public void onActivitySaveInstanceState(@NonNull Activity activity, @NonNull Bundle outState) {
+            }
+
+            @Override
+            public void onActivityDestroyed(@NonNull Activity activity) {
+                activity.getWindow().getDecorView().removeCallbacks(runnable);
+                activity.unregisterActivityLifecycleCallbacks(this);
+            }
+        });
+        activity.getWindow().getDecorView().post(runnable);
+    }
+
+    /**
+     * 低于Android Q获取剪贴板的内容
+     */
+    private static String getTextFromClip() {
+        try {
+            ClipboardManager clipboardManager = (ClipboardManager) XChatApplication.getApplication().getSystemService(Context.CLIPBOARD_SERVICE);
+            if (null == clipboardManager || !clipboardManager.hasPrimaryClip()) {
+                return "";
+            }
+            ClipData clipData = clipboardManager.getPrimaryClip();
+            if (null == clipData || clipData.getItemCount() < 1) {
+                return "";
+            }
+            ClipData.Item item = clipData.getItemAt(0);
+            if (item == null) {
+                return "";
+            }
+            CharSequence clipText = item.getText();
+            if (TextUtils.isEmpty(clipText)) {
+                return "";
+            } else {
+                return clipText.toString();
+            }
+        } catch (Exception e) {
+            Log.e(TAG, "getTextFromClip", e);
+        }
+        return "";
+    }
+
+    public interface Function {
+        /**
+         * Invokes the function.
+         */
+        void invoke(String text);
+    }
+
+}

app/src/main/res/drawable/bg_common_touch_while.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@color/item_hover" android:state_pressed="true" />
+    <item android:drawable="@color/color_white" android:state_pressed="true" />
-    <item android:drawable="@color/item_hover" android:state_focused="true" />
+    <item android:drawable="@color/color_white" android:state_focused="true" />
     <item android:drawable="@color/color_white" />
 </selector>

app/src/main/res/drawable/bg_ffffff_r360.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners android:radius="360dp" />
+    <solid android:color="#ffffff" />
+</shape>

app/src/main/res/drawable/bg_nim_msg_touch.xml

@@ -2,5 +2,5 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:drawable="@color/white" android:state_pressed="true" />
     <item android:drawable="@color/white" android:state_focused="true" />
-    <item android:drawable="@color/bg_normal_1c1b22" />
+    <item android:drawable="@color/white" />
 </selector>

app/src/main/res/drawable/shape_home_room_tag.xml

@@ -3,13 +3,13 @@
     android:shape="rectangle">
     <gradient
         android:angle="180"
-        android:endColor="#FFDD74FF"
+        android:endColor="#FF5B5B"
-        android:startColor="#FFB759FF"
+        android:startColor="#FF67E6"
         android:type="linear"
         android:useLevel="true" />
     <corners
-        android:bottomLeftRadius="0dp"
+        android:bottomLeftRadius="2dp"
         android:bottomRightRadius="8dp"
         android:topLeftRadius="8dp"
-        android:topRightRadius="0dp" />
+        android:topRightRadius="2dp" />
 </shape>

app/src/main/res/layout/activity_charge.xml

@@ -66,7 +66,7 @@
         android:text="0.0"
         android:textColor="@color/color_333333"
         android:textSize="@dimen/text_size_30"
-        android:layout_marginTop="@dimen/dp_4"
+        android:layout_marginTop="18dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/tv_title_diamond"
@@ -99,9 +99,9 @@
                 android:id="@+id/tv_charge"
                 android:layout_width="match_parent"
                 android:layout_height="56dp"
-                android:layout_marginStart="60dp"
+                android:layout_marginStart="16dp"
                 android:layout_marginTop="50dp"
-                android:layout_marginEnd="@dimen/dp_60"
+                android:layout_marginEnd="@dimen/dp_16"
                 android:layout_marginBottom="@dimen/dp_40"
                 android:background="@drawable/bg_common_confirm_normal"
                 android:gravity="center"

app/src/main/res/layout/activity_home_top_banner.xml

@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/ll_container"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <com.makeramen.roundedimageview.RoundedImageView
+        android:id="@+id/iv_cover"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:scaleType="centerCrop"
+        android:src="@drawable/default_cover"
+        app:layout_constraintBottom_toTopOf="@+id/tv_title"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:riv_corner_radius_bottom_left="8dp"
+        app:riv_corner_radius_bottom_right="8dp"
+        app:riv_corner_radius_top_left="8dp"
+        app:riv_corner_radius_top_right="8dp" />
+
+    <TextView
+        android:id="@+id/tv_online_number"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="2dp"
+        android:layout_marginBottom="2dp"
+        android:background="@drawable/shape_item_room_online_member"
+        android:gravity="center"
+        android:maxLines="1"
+        android:paddingStart="4dp"
+        android:paddingEnd="4dp"
+        android:textColor="@color/white"
+        android:textSize="@dimen/sp_10"
+        app:drawableStartCompat="@drawable/ic_home_online_tag"
+        app:layout_constraintBottom_toBottomOf="@+id/iv_cover"
+        app:layout_constraintStart_toStartOf="parent"
+        tools:text="100" />
+
+    <ImageView
+        android:id="@+id/iv_tab_label"
+        android:layout_width="43dp"
+        android:layout_height="18dp"
+        android:scaleType="centerCrop"
+        android:src="@mipmap/ic_bg_home_room_tag"
+        android:visibility="invisible"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:visibility="gone" />
+
+    <TextView
+        android:id="@+id/tv_tag_content"
+        android:layout_width="wrap_content"
+        android:layout_height="18dp"
+        android:background="@drawable/shape_home_room_tag"
+        android:gravity="center"
+        android:includeFontPadding="false"
+        android:maxLength="5"
+        android:paddingStart="10dp"
+        android:paddingEnd="10dp"
+        android:text="@string/layout_item_home_tab_map_01"
+        android:textColor="@color/white"
+        android:textSize="@dimen/sp_11"
+        android:visibility="invisible"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:visibility="visible" />
+
+    <TextView
+        android:id="@+id/tv_tag_in_pk"
+        android:layout_width="46dp"
+        android:layout_height="18dp"
+        android:background="@drawable/bg_room_pk_tag"
+        android:gravity="center"
+        android:includeFontPadding="false"
+        android:text="@string/layout_item_home_tab_map_02"
+        android:textColor="@color/white"
+        android:textSize="12sp"
+        android:visibility="gone"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:visibility="visible" />
+
+    <TextView
+        android:id="@+id/tv_title"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/dp_10"
+        android:layout_marginTop="2dp"
+        android:layout_marginEnd="@dimen/dp_10"
+        android:ellipsize="end"
+        android:gravity="center"
+        android:includeFontPadding="false"
+        android:maxLines="1"
+        android:textColor="@color/color_1F1A4E"
+        android:textSize="@dimen/sp_13"
+        android:textStyle="bold"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/iv_cover"
+        tools:text="@string/layout_item_home_tab_map_03" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/activity_main.xml

@@ -19,6 +19,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginBottom="3dp"
+        android:paddingTop="@dimen/dp_10"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent" />
@@ -31,23 +32,19 @@
 
         <com.yizhuan.erban.common.widget.DragLayout
             android:id="@+id/avatar_image_layout"
-            android:layout_width="@dimen/dp_drag_layout_bg_width"
+            android:layout_width="60dp"
-            android:layout_height="@dimen/dp_drag_layout_bg_height"
+            android:layout_height="60dp"
             android:layout_gravity="bottom|end"
-            android:layout_marginEnd="@dimen/dp_15"
+            android:layout_marginEnd="@dimen/dp_10"
             android:layout_marginBottom="50dp"
-            android:background="@drawable/bg_room_main_entrance"
+            android:background="@drawable/bg_ffffff_r360"
             android:visibility="visible">
 
-
             <FrameLayout
                 android:id="@+id/fl_avatar"
-                android:layout_width="@dimen/dp_drag_layout_avatar_size"
+                android:layout_width="58dp"
-                android:layout_height="@dimen/dp_drag_layout_avatar_size"
+                android:layout_height="58dp"
-                android:layout_centerVertical="true"
+                android:layout_centerVertical="true">
-                android:layout_marginStart="12.5dp"
-
-                >
 
                 <com.yizhuan.erban.common.widget.CircleImageView
                     android:id="@+id/avatar_image"
@@ -69,48 +66,6 @@
                     android:background="@color/transparent" />
             </FrameLayout>
 
-            <LinearLayout
-                android:id="@+id/ll_drag_info"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerVertical="true"
-                android:layout_marginStart="@dimen/dp_5"
-                android:layout_toStartOf="@id/view_close"
-                android:layout_toEndOf="@id/fl_avatar"
-                android:orientation="vertical">
-
-                <TextView
-                    android:id="@+id/tv_name"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:ellipsize="end"
-                    android:lines="1"
-                    android:maxEms="6"
-                    android:singleLine="true"
-                    android:textColor="@color/white"
-                    android:textSize="@dimen/dp_12"
-                    tools:text="@string/layout_activity_main_01" />
-
-                <TextView
-                    android:id="@+id/tv_id"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:ellipsize="end"
-                    android:singleLine="true"
-                    android:textColor="@color/white"
-                    android:textSize="@dimen/dp_10"
-                    tools:text="ID:666" />
-            </LinearLayout>
-
-            <ImageView
-                android:id="@+id/view_close"
-                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:src="@drawable/ic_room_main_entrance_close" />
-
         </com.yizhuan.erban.common.widget.DragLayout>
 
     </FrameLayout>

app/src/main/res/layout/dialog_privacy_agreement.xml

@@ -62,7 +62,7 @@
         android:layout_height="36dp"
         android:layout_gravity="center_horizontal"
         android:layout_marginTop="20dp"
-        android:background="@drawable/common_btn_bg"
+        android:background="@drawable/bg_common_confirm_normal"
         android:gravity="center"
         android:minHeight="50dp"
         android:text="@string/layout_dialog_privacy_agreement_01"

app/src/main/res/layout/dialog_share.xml

@@ -72,20 +72,6 @@
                 android:textSize="@dimen/font_medium"
                 app:drawableTopCompat="@drawable/icon_line" />
 
-            <TextView
-                android:id="@+id/tv_Google"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/dp_17"
-                android:layout_marginBottom="19dp"
-                android:layout_weight="1"
-                android:drawablePadding="9dp"
-                android:gravity="center"
-                android:text="@string/text_share_Google"
-                android:textColor="@color/color_999999"
-                android:textSize="@dimen/font_medium"
-                app:drawableTopCompat="@drawable/ic_login_google" />
-
             <TextView
                 android:id="@+id/tv_facebook"
                 android:layout_width="0dp"
@@ -99,6 +85,22 @@
                 android:textColor="@color/color_999999"
                 android:textSize="@dimen/font_medium"
                 app:drawableTopCompat="@drawable/icon_facebook" />
+
+            <TextView
+                android:id="@+id/tv_share_link"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/dp_17"
+                android:layout_marginBottom="19dp"
+                android:layout_weight="1"
+                android:drawablePadding="9dp"
+                android:gravity="center"
+                android:text="@string/share_link"
+                android:textColor="@color/color_999999"
+                android:textSize="@dimen/font_medium"
+                app:drawableTopCompat="@drawable/ic_share_link" />
+
+
         </LinearLayout>
 
     </LinearLayout>

app/src/main/res/layout/fragment_home_room_tab.xml

@@ -1,12 +1,14 @@
 <LinearLayout 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:orientation="vertical"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <androidx.recyclerview.widget.RecyclerView
+    <com.zhpan.bannerview.BannerViewPager
-        android:id="@+id/recycler_view"
+        android:id="@+id/mBanner"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="140dp"
-        android:paddingStart="12.5dp"
+        app:bvp_indicator_visibility="gone"
-        android:paddingEnd="12.5dp" />
+        app:bvp_page_style="multi_page_scale" />
 
 </LinearLayout>

app/src/main/res/layout/fragment_me.xml

@@ -93,6 +93,7 @@
                         android:text="@{userInfo.nick}"
                         android:textColor="@color/text_title_color"
                         android:textSize="@dimen/sp_16"
+                        android:textStyle="bold"
                         app:layout_constrainedWidth="true"
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintHorizontal_bias="0"
@@ -119,8 +120,8 @@
                             android:drawablePadding="4dp"
                             android:gravity="center"
                             android:maxLines="1"
-                            android:textColor="@color/text_secondary_4f516a"
+                            android:textColor="@color/color_6D6B89"
-                            android:textSize="@dimen/dp_13"
+                            android:textSize="@dimen/sp_13"
                             tools:ignore="SpUsage"
                             tools:text="@string/layout_fragment_me_02" />
 
@@ -208,16 +209,16 @@
 
                 <LinearLayout
                     android:id="@+id/ll_user_attentions"
-                    android:orientation="vertical"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginEnd="@dimen/dp_10"
+                    android:gravity="center"
                     android:onClick="@{click}"
+                    android:orientation="vertical"
                     android:paddingStart="@dimen/dp_8"
                     android:paddingEnd="@dimen/dp_8"
-                    android:gravity="center"
                     app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintEnd_toStartOf="@+id/ll_user_fans" >
+                    app:layout_constraintEnd_toStartOf="@+id/ll_user_fans">
 
                     <TextView
                         android:id="@+id/tv_user_attention_text"
@@ -240,16 +241,16 @@
 
                 <LinearLayout
                     android:id="@+id/ll_user_fans"
-                    android:orientation="vertical"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:gravity="center"
                     android:layout_marginEnd="@dimen/dp_8"
+                    android:gravity="center"
                     android:onClick="@{click}"
+                    android:orientation="vertical"
                     android:paddingStart="@dimen/dp_8"
                     android:paddingEnd="@dimen/dp_8"
                     app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent" >
+                    app:layout_constraintEnd_toEndOf="parent">
 
                     <TextView
                         android:id="@+id/tv_user_fan_text"
@@ -293,24 +294,39 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="14dp"
-                    android:gravity="center_vertical"
                     android:maxLines="1"
                     android:text="0"
                     android:textColor="@color/color_AF3817"
                     android:textSize="@dimen/sp_16"
                     android:textStyle="bold"
                     tools:text="999" />
-
+                
-                <TextView
+                <LinearLayout
+                    android:orientation="horizontal"
+                    android:gravity="center"
                     android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
+                    android:layout_height="wrap_content">
-                    android:layout_marginStart="14dp"
+
-                    android:layout_marginTop="2dp"
+                    <TextView
-                    android:gravity="center_vertical"
+                        android:id="@+id/tv_diamond_text"
-                    android:maxLines="1"
+                        android:layout_width="wrap_content"
-                    android:text="@string/me_charge_diamond"
+                        android:layout_height="wrap_content"
-                    android:textColor="@color/color_C46C53"
+                        android:layout_marginStart="14dp"
-                    android:textSize="@dimen/sp_10" />
+                        android:layout_marginTop="2dp"
+                        android:gravity="center_vertical"
+                        android:maxLines="1"
+                        android:text="@string/me_charge_diamond"
+                        android:textColor="@color/color_C46C53"
+                        android:textSize="@dimen/sp_10" />
+
+                    <ImageView
+                        android:src="@drawable/ic_diamond_arrow"
+                        android:layout_marginTop="@dimen/dp_2"
+                        android:layout_marginStart="@dimen/dp_3"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"/>
+
+                </LinearLayout>
 
             </LinearLayout>
 
@@ -360,16 +376,31 @@
                             android:textSize="@dimen/sp_16"
                             android:textStyle="bold" />
 
-                        <TextView
+                        <LinearLayout
-                            android:id="@+id/tv_vip_desc"
+                            android:orientation="horizontal"
+                            android:gravity="center"
                             android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
+                            android:layout_height="wrap_content">
-                            android:layout_marginTop="2dp"
+
-                            android:gravity="center_vertical"
+                            <TextView
-                            android:maxLines="1"
+                                android:id="@+id/tv_vip_desc"
-                            android:text="@string/me_open_various_privileges"
+                                android:layout_width="wrap_content"
-                            android:textColor="@color/color_AA6F29"
+                                android:layout_height="wrap_content"
-                            android:textSize="@dimen/sp_10" />
+                                android:layout_marginTop="2dp"
+                                android:gravity="center_vertical"
+                                android:maxLines="1"
+                                android:text="@string/me_open_various_privileges"
+                                android:textColor="@color/color_AA6F29"
+                                android:textSize="@dimen/sp_10" />
+
+                            <ImageView
+                                android:src="@drawable/ic_vip_arrow"
+                                android:layout_marginTop="2dp"
+                                android:layout_marginStart="3dp"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"/>
+
+                        </LinearLayout>
 
                     </LinearLayout>
 
@@ -441,7 +472,8 @@
                     android:layout_marginStart="@dimen/dp_12"
                     android:text="@string/me_my_association"
                     android:textColor="@color/color_EEA473"
-                    android:textSize="@dimen/sp_15" />
+                    android:textSize="@dimen/sp_15"
+                    android:textStyle="bold" />
 
                 <View
                     android:layout_width="0dp"
@@ -485,8 +517,8 @@
                     android:layout_width="0dp"
                     android:layout_height="0dp"
                     android:gravity="center"
-                    android:orientation="horizontal"
                     android:onClick="@{click}"
+                    android:orientation="horizontal"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toStartOf="@+id/ll_gain"
                     app:layout_constraintHorizontal_weight="1"
@@ -513,8 +545,8 @@
                     android:layout_width="0dp"
                     android:layout_height="0dp"
                     android:gravity="center"
-                    android:orientation="horizontal"
                     android:onClick="@{click}"
+                    android:orientation="horizontal"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintHorizontal_weight="1"
@@ -556,16 +588,16 @@
                 android:id="@+id/view"
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/dp_18"
-                app:layout_constraintTop_toBottomOf="@+id/rc_entrance"/>
+                app:layout_constraintTop_toBottomOf="@+id/rc_entrance" />
 
             <com.yizhuan.erban.ui.widget.rollviewpager.RollPagerView
                 android:id="@+id/roll_view"
                 android:layout_width="0dp"
                 android:layout_height="0dp"
                 android:layout_marginStart="15dp"
+                android:layout_marginTop="@dimen/dp_18"
                 android:layout_marginEnd="15dp"
                 android:layout_marginBottom="15dp"
-                android:layout_marginTop="@dimen/dp_18"
                 app:layout_constraintDimensionRatio="345:80"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"

app/src/main/res/layout/fragment_recent_contacts.xml

@@ -4,6 +4,7 @@
     android:id="@+id/messages_list_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="@color/color_white"
     android:clickable="true"
     android:focusable="true">
 

app/src/main/res/layout/fragment_recent_list.xml

@@ -3,6 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/recent_list_container"
     android:orientation="vertical"
+    android:background="@color/color_white"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 

app/src/main/res/layout/fragment_recommend.xml

@@ -27,39 +27,27 @@
                 android:layout_height="wrap_content"
                 android:orientation="vertical">
 
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:id="@+id/cl_roll_view"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="@dimen/dp_15"
-                    android:layout_marginEnd="@dimen/dp_15">
-
-                    <com.yizhuan.erban.ui.widget.rollviewpager.RollPagerView
-                        android:id="@+id/roll_view"
-                        android:layout_width="0dp"
-                        android:layout_height="0dp"
-                        android:layout_marginBottom="15dp"
-                        android:visibility="gone"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintDimensionRatio="690:260"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent"
-                        app:rollviewpager_hint_gravity="left"
-                        app:rollviewpager_hint_paddingBottom="8dp"
-                        tools:visibility="gone" />
-
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
                 <androidx.fragment.app.FragmentContainerView
                     android:id="@+id/fg_recommend_room"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:paddingTop="@dimen/dp_5"
+                    android:layout_marginTop="@dimen/dp_15"
-                    android:paddingBottom="@dimen/dp_5"
+                    android:layout_marginBottom="@dimen/dp_15"
                     android:visibility="visible"
                     tools:visibility="visible" />
 
+                <com.yizhuan.erban.ui.widget.rollviewpager.RollPagerView
+                    android:id="@+id/roll_view"
+                    android:layout_width="match_parent"
+                    android:layout_height="80dp"
+                    android:layout_marginStart="@dimen/dp_15"
+                    android:layout_marginEnd="@dimen/dp_15"
+                    android:layout_marginBottom="10dp"
+                    android:visibility="gone"
+                    app:rollviewpager_hint_gravity="left"
+                    app:rollviewpager_hint_paddingBottom="8dp"
+                    tools:visibility="gone" />
+
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -73,30 +61,30 @@
 
                 <LinearLayout
                     android:id="@+id/mLiCreateRoom"
-                    android:orientation="horizontal"
-                    android:layout_marginTop="@dimen/dp_12"
-                    android:gravity="center_vertical"
-                    android:background="@drawable/bg_home_chat"
-                    android:visibility="gone"
-                    android:layout_marginStart="@dimen/dp_15"
-                    android:layout_marginEnd="@dimen/dp_15"
                     android:layout_width="match_parent"
-                    android:layout_height="64dp">
+                    android:layout_height="64dp"
+                    android:layout_marginStart="@dimen/dp_15"
+                    android:layout_marginTop="@dimen/dp_12"
+                    android:layout_marginEnd="@dimen/dp_15"
+                    android:background="@drawable/bg_home_chat"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal"
+                    android:visibility="gone">
 
                     <ImageView
-                        android:layout_marginStart="@dimen/dp_12"
-                        android:src="@drawable/ic_home_chat_add"
                         android:layout_width="48dp"
-                        android:layout_height="48dp"/>
+                        android:layout_height="48dp"
+                        android:layout_marginStart="@dimen/dp_12"
+                        android:src="@drawable/ic_home_chat_add" />
 
                     <TextView
-                        android:text="@string/create_home_play"
+                        android:layout_width="match_parent"
-                        android:textSize="@dimen/sp_15"
+                        android:layout_height="wrap_content"
-                        android:textColor="@color/color_1F1A4E"
                         android:layout_marginStart="@dimen/dp_15"
                         android:layout_marginEnd="@dimen/dp_15"
-                        android:layout_width="match_parent"
+                        android:text="@string/create_home_play"
-                        android:layout_height="wrap_content"/>
+                        android:textColor="@color/color_1F1A4E"
+                        android:textSize="@dimen/sp_15" />
 
                 </LinearLayout>
 
@@ -125,9 +113,9 @@
 
                 <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/mRecyclerRoom"
-                    android:layout_marginTop="@dimen/dp_10"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/dp_2"
                     android:overScrollMode="never"
                     android:scrollbars="none"
                     app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />

app/src/main/res/layout/item_room_common.xml

@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginTop="6dp"
+    android:layout_marginTop="10dp"
     android:layout_marginEnd="@dimen/dp_15"
     android:clipChildren="false"
     android:clipToPadding="false"
@@ -53,7 +53,6 @@
         android:layout_marginStart="10dp"
         android:layout_marginTop="@dimen/dp_10"
         android:ellipsize="end"
-        android:includeFontPadding="false"
         android:maxLines="1"
         android:textColor="@color/color_1F1A4E"
         android:textSize="14sp"
@@ -68,7 +67,7 @@
         android:layout_width="wrap_content"
         android:layout_height="14dp"
         android:layout_marginStart="@dimen/dp_10"
-        android:layout_marginTop="@dimen/dp_10"
+        android:layout_marginTop="@dimen/dp_16"
         app:layout_constraintStart_toEndOf="@id/iv_room_image"
         app:layout_constraintTop_toBottomOf="@id/tv_room_title"
         tools:src="@drawable/tag_101" />
@@ -78,7 +77,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/dp_10"
-        android:layout_marginTop="10dp"
+        android:layout_marginTop="@dimen/dp_16"
         android:includeFontPadding="false"
         android:textColor="#66333333"
         android:textSize="12sp"

app/src/main/res/layout/main_tab_layout.xml

@@ -3,6 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:background="@color/color_white"
     android:orientation="horizontal"
     tools:parentTag="LinearLayout">
 

app/src/main/res/layout/nim_recent_contact_list_item_new.xml

@@ -6,7 +6,8 @@
     android:clickable="true"
     android:focusable="true"
     android:orientation="vertical"
-    tools:background="@color/bg_normal_1c1b22">
+    android:background="@color/color_white"
+    tools:background="@color/color_white">
 
     <LinearLayout
         android:layout_width="match_parent"

app/src/main/res/values/strings.xml

@@ -957,9 +957,9 @@
     <string name="charge_my_earnings">我的收益</string>
 
     <!--我的-->
-    <string name="me_charge_diamond">充值鉆石 ></string>
+    <string name="me_charge_diamond">充值鉆石</string>
     <string name="me_noble_center">貴族中心</string>
-    <string name="me_open_various_privileges">開通立享各項特權></string>
+    <string name="me_open_various_privileges">開通立享各項特權</string>
     <string name="me_my_association">我的公會</string>
     <string name="me_personal_center">個人中心</string>
     <string name="me_my_room">我的房間</string>
@@ -4901,5 +4901,6 @@
     <string name="extender_column_chat">擴列聊天</string>
     <string name="extender_room_party">房間派對</string>
     <string name="create_home_play">快來創建房間一起開黑吧~</string>
+    <string name="share_link">複製鏈接</string>
 
 </resources>

app/src/module_bank_card/res/layout/activity_add_bank_card_agreement.xml

@@ -52,7 +52,7 @@
         android:layout_height="43dp"
         android:layout_marginEnd="@dimen/dp_21"
         android:layout_marginBottom="@dimen/dp_33"
-        android:background="@drawable/shape_round_app_color_solid"
+        android:background="@drawable/bg_common_confirm_normal"
         android:gravity="center"
         android:text="@string/text_agree"
         android:textColor="@color/color_333333"

app/src/module_community/res/layout/fragment_square.xml

@@ -15,7 +15,7 @@
         <com.yizhuan.erban.ui.widget.magicindicator.MagicIndicator
             android:id="@+id/magic_indicator"
             android:layout_width="wrap_content"
-            android:layout_height="20dp"
+            android:layout_height="25dp"
             android:layout_marginTop="10dp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"

app/src/module_community/res/layout/item_square_dynamic.xml

@@ -59,7 +59,6 @@
             android:id="@+id/iv_in_room"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_8"
             android:background="@drawable/ic_dy_square_in_room"
             android:drawablePadding="@dimen/dp_2"
             android:gravity="center_vertical"
@@ -70,18 +69,7 @@
             android:textSize="@dimen/sp_10"
             app:drawableStartCompat="@drawable/ic_square_live"
             app:layout_constraintBottom_toBottomOf="@id/widget_nick_detail"
-            app:layout_constraintEnd_toStartOf="@+id/iv_more"
+            app:layout_constraintEnd_toEndOf="parent" />
-            app:layout_constraintTop_toTopOf="@+id/widget_nick_detail" />
-
-        <ImageView
-            android:id="@+id/iv_more"
-            android:layout_width="22dp"
-            android:layout_height="22dp"
-            android:scaleType="centerInside"
-            android:src="@drawable/icon_square_dynamic_more"
-            app:layout_constraintBottom_toBottomOf="@+id/iv_in_room"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="@+id/iv_in_room" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
@@ -270,6 +258,14 @@
                 android:src="@drawable/icon_square_dynamic_share" />
         </LinearLayout>
 
+        <ImageView
+            android:id="@+id/iv_more"
+            android:layout_width="22dp"
+            android:layout_height="22dp"
+            android:scaleType="centerInside"
+            android:src="@drawable/icon_square_dynamic_more"
+            android:layout_alignParentEnd="true"/>
+
     </RelativeLayout>
 
 </androidx.constraintlayout.widget.ConstraintLayout>

app/src/module_mini_world/res/layout/nim_recent_contact_team_list_item.xml

@@ -89,7 +89,7 @@
 
         <TextView
             android:id="@+id/tv_message"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:autoLink="none"
@@ -147,9 +147,9 @@
         android:layout_below="@id/tv_nickname"
         android:layout_marginEnd="15dp"
         android:layout_marginTop="10dp"
-        android:textColor="@color/color_999999"
+        android:textColor="@color/color_B3B3C3"
         tools:text="@string/layout_nim_recent_contact_team_list_item_03"
-        android:textSize="12dp" />
+        android:textSize="@dimen/sp_12" />
 
 
     <ImageView
@@ -175,13 +175,4 @@
         android:gravity="center"
         android:visibility="gone" />
 
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:background="@color/color_F4F4F4"
-        android:layout_alignParentBottom="true"
-        android:layout_alignStart="@+id/content_layout"
-        android:layout_alignEnd="@+id/tv_date_time"
-        />
-
 </RelativeLayout>

app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/widget/dialog/BoxMoreDialog.java

@@ -11,6 +11,7 @@ import com.yizhuan.erban.ui.webview.DialogWebViewActivity;
 import com.yizhuan.erban.utils.UserUtils;
 import com.yizhuan.xchat_android_core.DemoCache;
 import com.yizhuan.xchat_android_core.UriProvider;
+import com.yizhuan.xchat_android_core.utils.Logger;
 import com.yizhuan.xchat_android_library.annatation.ActLayoutRes;
 import com.yizhuan.xchat_android_library.utils.ResUtil;
 import com.yizhuan.xchat_android_library.utils.SingleToastUtil;

core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/UriProvider.java

@@ -270,7 +270,7 @@ public class UriProvider {
      * 宝箱帮助
      */
     public static String getBoxHelp() {
-        return JAVA_WEB_URL.concat("/peko/modules/rank/index.html#/wishingWellRule");
+        return JAVA_WEB_URL.concat("peko/modules/rule/wishingWellRule.html");
     }
 
     /**

core/src/main/res/values/strings.xml

@@ -1,7 +1,7 @@
 <resources>
     <string name="app_name">XChat_Android_Core</string>
     <string name="yizhuan_xchat_android_constants_xchatconstants_01">平臺嚴禁未成年人直播或打賞，倡導綠色互動，禁止宣傳及發布政治、低俗、暴力、色情等違規違法內容，嚴禁違規交易和誘導欺詐用戶，如有違規將對賬號進行封禁，發現請及時舉報。</string>
-    <string name="yizhuan_xchat_android_constants_xchatconstants_02">人美聲甜帶上分，一起來玩吧~</string>
+    <string name="yizhuan_xchat_android_constants_xchatconstants_02">來peko，邂逅你的專屬聲音</string>
     <string name="yizhuan_xchat_android_constants_xchatconstants_03">來Peko，開黑交友玩遊戲</string>
     <string name="yizhuan_xchat_android_constants_xchatconstants_04">加入家族,和你興趣相投的小夥伴一起玩耍吧~</string>
     <string name="yizhuan_xchat_android_constants_xchatconstants_05">hi,我想邀請您加入我的Peko家族:</string>

mob.gradle

@@ -3,6 +3,10 @@ apply plugin: 'com.mob.sdk'
 MobSDK {
     appKey "36b91eeac7469"
     appSecret "63ec0702513aca17e20615dd5dfdc03f"
+    MobLink {
+        uriScheme "pekoapp://sharesdk"
+        appLinkHost "cebg.t4m.cn"
+    }
     appBundleMode true
     MobLink {
         uriScheme "pekoapp://sharesdk"

nim_uikit/res/drawable/nim_recent_contact_sticky_selecter.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item android:drawable="@color/color_f4f4fa" android:state_pressed="true" />
+    <item android:drawable="@color/white" android:state_pressed="true" />
     <item android:drawable="@color/white" android:state_pressed="false" />
     <item android:drawable="@color/white" />