个人主页修改，房间ui修改，配置修改

app/build.gradle

@@ -138,7 +138,7 @@ android {
     buildTypes {
         release {
 //            buildConfigField "String", "BASE_URL", "\"https://api.lecheng163.com/\""
-            buildConfigField "String", "BASE_URL", "\"http://beta.api.pekolive.com/\""
+            buildConfigField "String", "BASE_URL", "\"https://beta.api.pekolive.com/\""
             buildConfigField "String", "BASE_URL_DEBUG", "BASE_URL"
             buildConfigField "String", "BASE_URL_STAGING", "BASE_URL"
             buildConfigField "String", "BASE_URL_RELEASE", "BASE_URL"
@@ -149,7 +149,7 @@ android {
         }
 
         debug {
-            buildConfigField "String", "BASE_URL", "\"http://beta.api.pekolive.com/\""
+            buildConfigField "String", "BASE_URL", "\"https://beta.api.pekolive.com/\""
             buildConfigField "String", "BASE_URL_DEBUG", "BASE_URL"
             buildConfigField "String", "BASE_URL_STAGING", "\"https://api.lecheng163.com/\""
             buildConfigField "String", "BASE_URL_RELEASE", "\"https://api.lecheng163.com/\""

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

@@ -5,6 +5,7 @@ import com.opensource.svgaplayer.SVGADrawable
 import com.opensource.svgaplayer.SVGAImageView
 import com.opensource.svgaplayer.SVGAParser
 import com.opensource.svgaplayer.SVGAVideoEntity
+import com.yizhuan.erban.R
 import com.yizhuan.erban.avroom.activity.AVRoomActivity
 import com.yizhuan.erban.base.BaseViewBindingFragment
 import com.yizhuan.erban.databinding.FragmentFakeSingleRoomBinding
@@ -60,7 +61,7 @@ class FakeSingleRoomFragment : BaseViewBindingFragment<FragmentFakeSingleRoomBin
                     }
                 }
             }, {
-                toast("已经到底啦~自动为您返回当前房间")
+                toast(getString(R.string.room_down_to_the_bottom))
                 reSet()
                 (activity as AVRoomActivity).setCurrentItem(1)
             })

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

@@ -68,7 +68,6 @@ class MeFragment : BaseFragment(), View.OnClickListener {
     private val meViewModel: MeViewModel by viewModels()
     private val homeViewModel: HomeViewModel by activityViewModels()
     private val vipViewModel: VipViewModel by viewModels()
-    private var centerIndex = 0
 
     override fun getRootLayoutId(): Int {
         return R.layout.fragment_me

app/src/main/java/com/yizhuan/erban/ui/pay/ChargeActivity.java

@@ -317,9 +317,10 @@ public class ChargeActivity extends BaseMvpActivity<IChargeView, ChargePresenter
         getMvpPresenter().loadUserInfo();
     }
 
+    @SuppressLint("SetTextI18n")
     @Override
     public void setupUserWalletBalance(WalletInfo walletInfo) {
-        mTv_gold.setText(Double.toString(walletInfo.getGoldNum()));
+        mTv_gold.setText(Double.toString(walletInfo.getDiamondNum()));
     }
 
     @Override

app/src/main/java/com/yizhuan/erban/ui/user/UserInfoActivity.java

@@ -44,9 +44,11 @@ import com.yizhuan.erban.ui.user.adapter.UserInfoIndicatorAdapter;
 import com.yizhuan.erban.ui.user.adapter.UserInfoPagerAdapter;
 import com.yizhuan.erban.ui.user.adapter.UserInfoPhotoAdapter;
 import com.yizhuan.erban.ui.user.view.UserInfoDynamicFragment;
+import com.yizhuan.erban.ui.user.view.UserInfoGiftWallFragment;
 import com.yizhuan.erban.ui.user.view.UserInfoInfoFragment;
 import com.yizhuan.erban.ui.user.viewmodel.UserInfoViewModel;
 import com.yizhuan.erban.ui.utils.ImageLoadUtils;
+import com.yizhuan.erban.ui.utils.ImageLoadUtilsV2;
 import com.yizhuan.erban.ui.widget.ButtonItem;
 import com.yizhuan.erban.ui.widget.ObservableScrollView;
 import com.yizhuan.erban.ui.widget.magicindicator.ViewPagerHelper;
@@ -54,7 +56,6 @@ import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.Commo
 import com.yizhuan.erban.ui.widget.rollviewpager.HintView;
 import com.yizhuan.erban.ui.widget.rollviewpager.RollPagerView;
 import com.yizhuan.erban.ui.widget.rollviewpager.adapter.StaticPagerAdapterWrapper;
-import com.yizhuan.erban.ui.widget.rollviewpager.hintview.TextHintView;
 import com.yizhuan.erban.utils.RegexUtil;
 import com.yizhuan.erban.vip.VipHelper;
 import com.yizhuan.xchat_android_constants.XChatConstants;
@@ -210,12 +211,13 @@ public class UserInfoActivity extends BaseBindingActivity<ActivityUserInfoBindin
         List<Fragment> fragmentList = new ArrayList<>(3);
         fragmentList.add(new UserInfoInfoFragment());
         fragmentList.add(new UserInfoDynamicFragment());
-        fragmentList.add(UserInfoCpFragment.Companion.newInstance(userId));
+        fragmentList.add(new UserInfoGiftWallFragment());
+/*        fragmentList.add(UserInfoCpFragment.Companion.newInstance(userId));*/
         pagerAdapter = new UserInfoPagerAdapter(getSupportFragmentManager(), fragmentList);
         final List<String> tagList = new ArrayList<>(3);
-        tagList.add("资料");
-        tagList.add("动态");
-        tagList.add("亲密关系");
+        tagList.add(getString(R.string.me_data));
+        tagList.add(getString(R.string.me_dynamic));
+        tagList.add(getString(R.string.me_gift_wall));
         CommonNavigator commonNavigator = new CommonNavigator(context);
         commonNavigator.setTitleWrapContent(true);
         UserInfoIndicatorAdapter magicIndicatorAdapter = new UserInfoIndicatorAdapter(context, tagList);
@@ -265,18 +267,18 @@ public class UserInfoActivity extends BaseBindingActivity<ActivityUserInfoBindin
 
     // 埋点
     private void setStatistic(int position) {
-        String temp = AuthModel.get().getCurrentUid() == userId ? "主态" : "客态";
+        String temp = AuthModel.get().getCurrentUid() == userId ? getString(R.string.me_main_state) : getString(R.string.me_guest_state);
         switch (position) {
             case 0:
-                StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_HOMEPAGE_MOMENT, "个人主页动态tab-" + temp);
+                StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_HOMEPAGE_MOMENT, getString(R.string.me_personal_home_page_dynamic_tab) + temp);
                 break;
 
             case 1:
-                StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_HOMEPAGE_DATA, "个人主页资料tab-" + temp);
+                StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_HOMEPAGE_DATA, getString(R.string.me_personal_homepage_Information) + temp);
                 break;
 
             case 2:
-                StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_HOMEPAGE_GIFT, "个人主页礼物tab-" + temp);
+                StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_HOMEPAGE_GIFT, getString(R.string.me_personal_home_gifts_tab) + temp);
                 break;
 
         }
@@ -292,6 +294,7 @@ public class UserInfoActivity extends BaseBindingActivity<ActivityUserInfoBindin
 
     private void initData(UserInfo userInfo) {
         if (null != userInfo) {
+            ImageLoadUtilsV2.loadImage(mBinding.ivUserHead, userInfo.getAvatar());
             //设置昵称
             String nick = RegexUtil.getPrintableString(userInfo.getNick());
             mBinding.tvNick.setText(nick);
@@ -466,7 +469,7 @@ public class UserInfoActivity extends BaseBindingActivity<ActivityUserInfoBindin
                 }
                 ButtonItem reportItem = ButtonItemFactory.createReportItem(context, userInfo.getUid(), XChatConstants.REPORT_TYPE_PERSONAL);
                 buttonItems.add(reportItem);
-                new CommonPopupDialog(this, "", buttonItems, "取消", false).show();
+                new CommonPopupDialog(this, "", buttonItems, getString(R.string.cancel), false).show();
             }
 
         }
@@ -495,7 +498,7 @@ public class UserInfoActivity extends BaseBindingActivity<ActivityUserInfoBindin
                             if (code == 200) {
                                 NimP2PMessageActivity.start(mActivity, String.valueOf(userId));
                             } else {
-                                toast("网络异常，请重试");
+                                toast(getString(R.string.network_is_abnormal));
                             }
                         }
                     });
@@ -504,13 +507,13 @@ public class UserInfoActivity extends BaseBindingActivity<ActivityUserInfoBindin
 
             case R.id.attention_layout:
                 if (userInfo == null) {
-                    toast("用户信息为空。");
+                    toast(getString(R.string.me_user_information_is_empty));
                     return;
                 }
 
                 if (mIslike) {
                     boolean isMyFriend = IMFriendModel.get().isMyFriend(String.valueOf(userInfo.getUid()));
-                    String tip = (isMyFriend) ? "取消关注将不再是好友关系，确定取消关注？" : "确定取消关注？";
+                    String tip = (isMyFriend) ? getString(R.string.me_unfollow_is_no_longer_a_friend) : getString(R.string.me_decide_to_unfollow);
                     getDialogManager().showOkCancelDialog(tip, true, new DialogManager.OkCancelDialogListener() {
 
                         @Override
@@ -526,14 +529,14 @@ public class UserInfoActivity extends BaseBindingActivity<ActivityUserInfoBindin
                         }
                     });
                 } else {
-                    StatisticManager.Instance().onEvent(StatisticsProtocol.guest_page_follow, "客态页-关注");
+                    StatisticManager.Instance().onEvent(StatisticsProtocol.guest_page_follow, getString(R.string.me_guest_page_focus));
                     getDialogManager().showProgressDialog(mActivity, getString(R.string.waiting_text));
                     PraiseModel.get().praise(userInfo.getUid(), true).subscribe();
                 }
                 break;
             case R.id.iv_where:
                 if (userInfo == null) {
-                    toast("用户信息为空。");
+                    toast(getString(R.string.me_user_information_is_empty));
                     return;
                 }
                 if (viewModel.getMRoomUid() != 0) {
@@ -633,7 +636,7 @@ public class UserInfoActivity extends BaseBindingActivity<ActivityUserInfoBindin
 
             @Override
             public void onError(String error) {
-                SingleToastUtil.showToast("播放出错，请重试");
+                SingleToastUtil.showToast(getString(R.string.me_error_playing));
                 stopAudio();
             }
 

app/src/main/java/com/yizhuan/erban/ui/user/adapter/UserInfoDynamicAdapter.java

@@ -134,7 +134,7 @@ public class UserInfoDynamicAdapter extends BaseQuickAdapter<WorldDynamicBean, B
                                 if (error != null) {
                                     SingleToastUtil.showToast(error);
                                 } else {
-                                    LogUtil.print("调用点赞接口完成...");
+                                    LogUtil.print(mContext.getString(R.string.me_call_the_like_interface_to_complete));
                                     if (status == 1) {
                                         item.setLikeCount(item.getLikeCount() + 1);
                                     } else {
@@ -153,10 +153,10 @@ public class UserInfoDynamicAdapter extends BaseQuickAdapter<WorldDynamicBean, B
                         return;
                     }
                     StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_WORLD_COMMENT_MOMENTS,
-                            "点击列表评论按钮-区分-话题客态页");
+                            mContext.getString(R.string.me_click_the_list_comment_button));
                     //1.3.1新埋点
                     StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_WORLD_COMMENT_MOMENTS_B,
-                            "点击评论按钮进入详情页的次数，区分话题-" + worldId);
+                            mContext.getString(R.string.me_number_of_times) + worldId);
                     DynamicDetailActivity.start(context, item.getDynamicId(), worldId,
                             helper.getAdapterPosition(), true, 1);
                 }

app/src/main/java/com/yizhuan/erban/ui/user/adapter/UserInfoIndicatorAdapter.java

@@ -15,6 +15,7 @@ import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil;
 import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter;
 import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator;
 import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView;
+import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.indicators.GradientLinePagerIndicator;
 import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.indicators.LinePagerIndicator;
 
 import java.util.List;
@@ -23,7 +24,7 @@ public class UserInfoIndicatorAdapter extends CommonNavigatorAdapter {
     private final Context mContext;
     private final List<? extends CharSequence> mTitleList;
 
-    private int textSize = 16;
+    private int textSize = 18;
     private float minScale = 0.75f;
     private boolean showIndicator = true;
     private OnItemSelectListener mOnItemSelectListener;
@@ -41,8 +42,8 @@ public class UserInfoIndicatorAdapter extends CommonNavigatorAdapter {
     @Override
     public IPagerTitleView getTitleView(Context context, final int i) {
         ScaleTransitionPagerTitleView scaleTransitionPagerTitleView = new ScaleTransitionPagerTitleView(context, true);
-        scaleTransitionPagerTitleView.setNormalColor(ContextCompat.getColor(context, R.color.color_40_333333));
-        scaleTransitionPagerTitleView.setSelectedColor(ContextCompat.getColor(context, R.color.color_333333));
+        scaleTransitionPagerTitleView.setNormalColor(ContextCompat.getColor(context, R.color.color_6D6B89));
+        scaleTransitionPagerTitleView.setSelectedColor(ContextCompat.getColor(context, R.color.color_1F1A4E));
         scaleTransitionPagerTitleView.setMinScale(minScale);
         scaleTransitionPagerTitleView.setTextSize(textSize);
         int padding = UIUtil.dip2px(context, 12);
@@ -60,11 +61,10 @@ public class UserInfoIndicatorAdapter extends CommonNavigatorAdapter {
     @Override
     public IPagerIndicator getIndicator(Context context) {
         if (!showIndicator) return null;
-        LinePagerIndicator indicator = new LinePagerIndicator(context);
+        GradientLinePagerIndicator indicator = new GradientLinePagerIndicator(context);
         indicator.setMode(LinePagerIndicator.MODE_WRAP_CONTENT);
-        indicator.setLineHeight(UIUtil.dip2px(mContext, 10));
-        indicator.setRoundRadius(UIUtil.dip2px(mContext, 7));
-        indicator.setColors(Color.parseColor("#FFC000"));
+        indicator.setLineHeight(UIUtil.dip2px(mContext, 8));
+        indicator.setRoundRadius(UIUtil.dip2px(mContext, 360));
         FrameLayout.LayoutParams lp = new FrameLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
         lp.gravity = Gravity.END;
         lp.bottomMargin = UIUtil.dip2px(mContext, 0);

app/src/main/java/com/yizhuan/erban/ui/user/view/UserInfoDynamicFragment.kt

@@ -52,32 +52,32 @@ class UserInfoDynamicFragment : BaseViewBindingFragment<FragmentUserinfoDynamicB
                 if (view.id == R.id.iv_more) {
                     val dataList: MutableList<ButtonItem> =
                         ArrayList()
-                    if (!UserModel.get().isMyseft(bean.getUid())) {
-                        val item = ButtonItem("举报") {
+                    if (!UserModel.get().isMyseft(bean.uid)) {
+                        val item = ButtonItem(getString(R.string.me_report)) {
                             StatisticManager.Instance().onEvent(
                                 StatisticsProtocol.EVENT_WORLD_REPORT_MOMENTS,
-                                "举报动态-区分-动态广场"
+                                getString(R.string.me_report_the_dynamic)
                             )
                             UIHelper.showReportPage(
-                                mContext, bean.getUid(),
+                                mContext, bean.uid,
                                 XChatConstants.REPORT_TYPE_DYNAMIC_SQUARE
                             )
                         }
                         dataList.add(item)
                     }
-                    if (UserModel.get().isMyseft(bean.getUid()) ||
+                    if (UserModel.get().isMyseft(bean.uid) ||
                         isThisWorldOwner(bean)
                     ) {
                         val item = ButtonItem(
-                            "删除"
+                            getString(R.string.me_delete)
                         ) { deleteDynamic(pos, dynamicAdapter) }
                         dataList.add(item)
                     }
-                    dialogManager.showCommonPopupDialog(dataList, "取消")
+                    dialogManager.showCommonPopupDialog(dataList, getString(R.string.me_cancel))
                 } else if (view.id == R.id.ll_share) {
                     StatisticManager.Instance().onEvent(
                         StatisticsProtocol.EVENT_WORLD_SHARE_MOMENTS,
-                        "分享动态-区分-动态广场"
+                        getString(R.string.me_share_dynamic)
                     )
                     ShareDynamicHelper(activity).share(bean)
                 }
@@ -91,9 +91,9 @@ class UserInfoDynamicFragment : BaseViewBindingFragment<FragmentUserinfoDynamicB
     private fun deleteDynamic(pos: Int, adapter: UserInfoDynamicAdapter?) {
         StatisticManager.Instance().onEvent(
             StatisticsProtocol.EVENT_WORLD_DELETE_MOMENTS,
-            "删除动态-区分-动态广场"
+            getString(R.string.me_delete_the_dynamic)
         )
-        dialogManager.showOkCancelWithTitleDialog("删除后不可恢复，确定删除该动态吗?",
+        dialogManager.showOkCancelWithTitleDialog(getString(R.string.me_cannot_be_restored),
             OkCancelDialogListener {
                 val bean = adapter?.getItem(pos) ?: return@OkCancelDialogListener
                 DynamicModel.get().delete(bean.worldId, bean.dynamicId)
@@ -106,7 +106,7 @@ class UserInfoDynamicFragment : BaseViewBindingFragment<FragmentUserinfoDynamicB
                             if (error != null) {
                                 toast(error)
                             } else {
-                                toast("删除成功")
+                                toast(getString(R.string.me_successfully_delete))
                                 if (pos < adapter.data.size) {
                                     if (bean == adapter.getItem(pos)) {
                                         adapter.remove(pos)
@@ -122,6 +122,6 @@ class UserInfoDynamicFragment : BaseViewBindingFragment<FragmentUserinfoDynamicB
      * 判断自己是不是该世界的创始人
      */
     private fun isThisWorldOwner(bean: WorldDynamicBean?): Boolean {
-        return bean != null && bean.getWorldUid() === AuthModel.get().getCurrentUid()
+        return bean != null && bean.worldUid == AuthModel.get().currentUid
     }
 }

app/src/main/java/com/yizhuan/erban/ui/user/view/UserInfoGiftWallFragment.kt

@@ -0,0 +1,72 @@
+package com.yizhuan.erban.ui.user.view
+
+import android.widget.LinearLayout
+import android.widget.TextView
+import androidx.fragment.app.Fragment
+import androidx.viewpager.widget.ViewPager
+import androidx.viewpager.widget.ViewPager.OnPageChangeListener
+import com.yizhuan.erban.R
+import com.yizhuan.erban.base.BaseViewBindingFragment
+import com.yizhuan.erban.databinding.FragmentUserinfoGiftWallBinding
+import com.yizhuan.erban.ui.user.UserInfoGiftFragment
+import com.yizhuan.erban.ui.user.adapter.UserInfoIndicatorAdapter
+import com.yizhuan.erban.ui.user.adapter.UserInfoPagerAdapter
+import com.yizhuan.erban.ui.widget.magicindicator.MagicIndicator
+import com.yizhuan.erban.ui.widget.magicindicator.ViewPagerHelper
+import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator
+import com.yizhuan.xchat_android_library.annatation.ActLayoutRes
+
+
+@ActLayoutRes(R.layout.fragment_userinfo_gift_wall)
+class UserInfoGiftWallFragment : BaseViewBindingFragment<FragmentUserinfoGiftWallBinding>() {
+
+    override fun init() {
+        initGiftList()
+    }
+
+    /**
+     * 礼物列表
+     *
+     * @param list
+     */
+    private fun initGiftList() {
+        val viewPager: ViewPager = binding.viewPagerGift
+        val magicIndicator: MagicIndicator = binding.magicIndicatorGift
+        val fragmentList: MutableList<Fragment> = ArrayList(2)
+        //礼物类型 1:普通礼物;2:辛运礼物
+        fragmentList.add(UserInfoGiftFragment.newInstance(1, false))
+        fragmentList.add(UserInfoGiftFragment.newInstance(2, false))
+        val pagerAdapter = UserInfoPagerAdapter(childFragmentManager, fragmentList)
+        val tagList: MutableList<String> = ArrayList(2)
+        tagList.add(getString(R.string.me_ordinary_gift))
+        tagList.add(getString(R.string.me_lucky_gift))
+        val commonNavigator = CommonNavigator(context)
+        commonNavigator.setTitleWrapContent(true)
+        val magicIndicatorAdapter = UserInfoIndicatorAdapter(context, tagList)
+        magicIndicatorAdapter.setOnItemSelectListener { position: Int, view: TextView? ->
+            viewPager.currentItem = position
+        }
+        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) {}
+        })
+
+    }
+
+}

app/src/main/java/com/yizhuan/erban/ui/user/view/UserInfoInfoFragment.kt

@@ -1,20 +1,15 @@
 package com.yizhuan.erban.ui.user.view
 
 import android.annotation.SuppressLint
-import android.content.Intent
 import android.graphics.Color
 import android.graphics.drawable.GradientDrawable
 import android.view.Gravity
 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.yizhuan.erban.R
 import com.yizhuan.erban.base.BaseViewBindingFragment
@@ -25,25 +20,16 @@ import com.yizhuan.erban.module_hall.hall.activity.ModuleHallActivity
 import com.yizhuan.erban.skill.activity.SkillHomeActivity
 import com.yizhuan.erban.skill.activity.SkillHomeActivity.Companion.PAGE_TYPE_CUSTOM
 import com.yizhuan.erban.skill.activity.SkillHomeActivity.Companion.PAGE_TYPE_SELF
-import com.yizhuan.erban.ui.user.UserGiftActivity
 import com.yizhuan.erban.ui.user.UserInfoActivity
-import com.yizhuan.erban.ui.user.UserInfoGiftFragment
-import com.yizhuan.erban.ui.user.adapter.GiftAdapter
 import com.yizhuan.erban.ui.user.adapter.SkillCardAdapter
-import com.yizhuan.erban.ui.user.adapter.UserInfoIndicatorAdapter
-import com.yizhuan.erban.ui.user.adapter.UserInfoPagerAdapter
 import com.yizhuan.erban.ui.user.decorationsend.UserInfoSkillDecoration
 import com.yizhuan.erban.ui.user.viewmodel.UserInfoViewModel
-import com.yizhuan.erban.ui.widget.magicindicator.MagicIndicator
-import com.yizhuan.erban.ui.widget.magicindicator.ViewPagerHelper
 import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil
-import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator
 import com.yizhuan.xchat_android_core.auth.AuthModel
 import com.yizhuan.xchat_android_core.module_hall.hall.HallModel
 import com.yizhuan.xchat_android_core.module_hall.hall.bean.ClanAndHallInfo
 import com.yizhuan.xchat_android_core.module_hall.hall.bean.ClanInfo
 import com.yizhuan.xchat_android_core.module_hall.hall.bean.HallInfo
-import com.yizhuan.xchat_android_core.user.bean.UserDetailInfo.DataBean.UserGiftWallBean
 import com.yizhuan.xchat_android_core.user.bean.UserInfoSkillEntity
 import com.yizhuan.xchat_android_core.utils.net.BeanObserver
 import com.yizhuan.xchat_android_core.utils.net.RxHelper
@@ -51,13 +37,20 @@ import com.yizhuan.xchat_android_library.annatation.ActLayoutRes
 
 
 @ActLayoutRes(R.layout.fragment_userinfo_userinfo)
-class UserInfoInfoFragment : BaseViewBindingFragment<FragmentUserinfoUserinfoBinding>(),
-    View.OnClickListener {
+class UserInfoInfoFragment : BaseViewBindingFragment<FragmentUserinfoUserinfoBinding>() {
 
-    private var giftAdapter: GiftAdapter? = null
     private var skillAdapter: SkillCardAdapter? = null
     private val vm: UserInfoViewModel by activityViewModels()
 
+    override fun init() {
+        vm.hallData.observe(this) {
+            initClanAndHall(it)
+        }
+        vm.userInfoSkillData.observe(this) {
+            initSkillCardList(it)
+        }
+    }
+
     @SuppressLint("SetTextI18n")
     private fun initClanAndHall(clanAndHallInfo: ClanAndHallInfo) {
         val hallInfo: HallInfo? = clanAndHallInfo.hall
@@ -66,10 +59,11 @@ class UserInfoInfoFragment : BaseViewBindingFragment<FragmentUserinfoUserinfoBin
             AuthModel.get().currentUid != vm.userId && HallDataManager.get().hallId <= 0
         if (hallInfo != null && hallInfo.hallId > 0) {
             binding.llModuleHall.visibility = View.VISIBLE
-            binding.tvHallId.text = "房间ID:" + hallInfo.hallId.toString()
+            binding.tvHallId.text = getString(R.string.me_roomid) + hallInfo.hallId.toString()
             binding.tvHallName.text = hallInfo.hallName
-            binding.tvHallMemberNum.text = "房间人数:" + hallInfo.memberCount
-            binding.tvHallErbanId.text = "Peko号:" + hallInfo.ownerErbanNo
+            binding.tvHallMemberNum.text =
+                getString(R.string.me_room_number_people) + hallInfo.memberCount
+            binding.tvHallErbanId.text = getString(R.string.me_peko_number) + hallInfo.ownerErbanNo
             GlideApp.with(this)
                 .load(hallInfo.ownerAvatar)
                 .placeholder(R.drawable.default_avatar)
@@ -83,16 +77,17 @@ class UserInfoInfoFragment : BaseViewBindingFragment<FragmentUserinfoUserinfoBin
         } else {
             binding.llHall.isVisible = false
             binding.ivClanArrow.isVisible = false
-            binding.tvHallDetail.text = "公会"
+            binding.tvHallDetail.text = getString(R.string.me_association)
         }
 
         if (clanInfo != null && clanInfo.id > 0) {
             binding.llModuleHall.visibility = View.VISIBLE
             binding.llClan.visibility = View.VISIBLE
-            binding.tvClanId.text = "公会ID:" + clanInfo.id
+            binding.tvClanId.text = getString(R.string.me_association_id) + clanInfo.id
             binding.tvClanName.text = clanInfo.name
-            binding.tvClanMemberNum.text = "公会人数:" + clanInfo.clanMemberNum
-            binding.tvClanHallNum.text = "房间数量:" + clanInfo.clanHallNum
+            binding.tvClanMemberNum.text =
+                getString(R.string.me_association_number) + clanInfo.clanMemberNum
+            binding.tvClanHallNum.text = getString(R.string.me_room_number) + clanInfo.clanHallNum
             GlideApp.with(this)
                 .load(clanInfo.avatar)
                 .placeholder(R.drawable.default_cover)
@@ -102,7 +97,7 @@ class UserInfoInfoFragment : BaseViewBindingFragment<FragmentUserinfoUserinfoBin
                 .placeholder(R.drawable.default_cover)
                 .into(binding.ivClanLevel)
             if (hallInfo != null && hallInfo.hallId > 0) {
-                binding.tvHallDetail.text = "公会·房间"
+                binding.tvHallDetail.text = getString(R.string.me_association_room)
             }
         } else {
             binding.llClan.visibility = View.GONE
@@ -110,7 +105,7 @@ class UserInfoInfoFragment : BaseViewBindingFragment<FragmentUserinfoUserinfoBin
                 binding.llModuleHall.visibility = View.GONE
             } else {
                 binding.llHall.isVisible = true
-                binding.tvHallDetail.text = "房间"
+                binding.tvHallDetail.text = getString(R.string.me_room)
             }
         }
 
@@ -138,51 +133,6 @@ class UserInfoInfoFragment : BaseViewBindingFragment<FragmentUserinfoUserinfoBin
         }
     }
 
-    /**
-     * 礼物列表
-     *
-     * @param list
-     */
-    private fun initGiftList() {
-        val viewPager: ViewPager = binding.viewPagerGift
-        val magicIndicator: MagicIndicator = binding.magicIndicatorGift
-        val fragmentList: MutableList<Fragment> = ArrayList(2)
-        //礼物类型 1:普通礼物;2:辛运礼物
-        fragmentList.add(UserInfoGiftFragment.newInstance(1,false))
-        fragmentList.add(UserInfoGiftFragment.newInstance(2,false))
-        val pagerAdapter = UserInfoPagerAdapter(childFragmentManager, fragmentList)
-        val tagList: MutableList<String> = ArrayList(2)
-        tagList.add("普通礼物")
-        tagList.add("幸运礼物")
-        val commonNavigator = CommonNavigator(context)
-        commonNavigator.setTitleWrapContent(true)
-        val magicIndicatorAdapter = UserInfoIndicatorAdapter(context, tagList)
-        magicIndicatorAdapter.setOnItemSelectListener { position: Int, view: TextView? ->
-            viewPager.currentItem = position
-        }
-        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) {}
-        })
-
-    }
-
     /**
      * 技能卡
      */
@@ -212,12 +162,6 @@ class UserInfoInfoFragment : BaseViewBindingFragment<FragmentUserinfoUserinfoBin
         skillAdapter?.setNewData(newList)
     }
 
-    override fun onClick(v: View) {
-        when (v.id) {
-            R.id.tv_gift_detail -> startActivity(Intent(mContext, UserGiftActivity::class.java))
-        }
-    }
-
     private fun applyJoinHall(hallId: Long) {
         HallModel.get().applyJoinHall(hallId)
             .compose(RxHelper.bindFragment(this))
@@ -239,7 +183,7 @@ class UserInfoInfoFragment : BaseViewBindingFragment<FragmentUserinfoUserinfoBin
             ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, textViewHeight)
         textView.gravity = Gravity.CENTER
         textView.setTextColor(mContext.resources.getColor(R.color.color_666666))
-        textView.text = "还未添加技能卡喔"
+        textView.text = getString(R.string.me_no_skill_card_added_yet)
         textView.textSize = 12.0f
         val conner = UIUtil.dip2px(mContext, 8.0)
         val drawable = GradientDrawable()
@@ -249,16 +193,4 @@ class UserInfoInfoFragment : BaseViewBindingFragment<FragmentUserinfoUserinfoBin
         return textView
     }
 
-    override fun init() {
-        initGiftList()
-        vm.hallData.observe(this) {
-            initClanAndHall(it)
-        }
-        vm.userInfoSkillData.observe(this) {
-            initSkillCardList(it)
-        }
-        binding.tvGiftDetail.setOnClickListener(this)
-    }
-
-
 }

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

@@ -2,10 +2,6 @@ package com.yizhuan.erban.ui.widget;
 
 import android.content.Context;
 import android.os.Bundle;
-
-import com.google.android.material.bottomsheet.BottomSheetBehavior;
-import com.google.android.material.bottomsheet.BottomSheetDialog;
-
 import android.util.DisplayMetrics;
 import android.view.Display;
 import android.view.View;
@@ -13,6 +9,9 @@ import android.view.WindowManager;
 import android.widget.FrameLayout;
 import android.widget.TextView;
 
+import com.google.android.material.bottomsheet.BottomSheetBehavior;
+import com.google.android.material.bottomsheet.BottomSheetDialog;
+import com.yizhuan.erban.R;
 import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
 import com.yizhuan.xchat_android_library.utils.StringUtils;
 
@@ -22,8 +21,6 @@ import cn.sharesdk.framework.ShareSDK;
 import cn.sharesdk.google.GooglePlus;
 import cn.sharesdk.line.Line;
 
-import com.yizhuan.erban.R;
-
 /**
  * @author xiaoyu
  * @date 2017/12/13
@@ -38,14 +35,10 @@ public class ShareDialog extends BottomSheetDialog implements View.OnClickListen
     public static final int TYPE_SHARE_H5 = 4;
     private static final String TAG = "ShareDialog";
     private Context context;
-    private WindowManager windowManager;
-    private int width;
-    private TextView tvName;
     private TextView tvErban;
-    private TextView tvWeixin;
-    private TextView tvWeixinpy;
-    private TextView tvQq;
-    private TextView tvQqZone;
+    private TextView tv_Google;
+    private TextView tvLine;
+    private TextView tvFaceBook;
     private TextView tvCancel;
     private OnShareDialogItemClick onShareDialogItemClick;
     private int type = TYPE_SHARE_NORMAL;
@@ -65,26 +58,17 @@ public class ShareDialog extends BottomSheetDialog implements View.OnClickListen
         super.onCreate(savedInstanceState);
         setContentView(R.layout.dialog_share);
         setCanceledOnTouchOutside(true);
-        tvName = (TextView) findViewById(R.id.tv_title);
         tvErban = findViewById(R.id.tv_erban);
-        tvWeixin = (TextView) findViewById(R.id.tv_weixin);
-        tvWeixinpy = (TextView) findViewById(R.id.tv_weixinpy);
-        tvQq = (TextView) findViewById(R.id.tv_qq);
-        tvQqZone = (TextView) findViewById(R.id.tv_qq_zone);
+        tv_Google = (TextView) findViewById(R.id.tv_Google);
+        tvLine = (TextView) findViewById(R.id.tv_line);
+        tvFaceBook = (TextView) findViewById(R.id.tv_facebook);
         tvCancel = (TextView) findViewById(R.id.tv_cancel);
 
         tvErban.setOnClickListener(this);
-        tvWeixin.setOnClickListener(this);
-        tvWeixinpy.setOnClickListener(this);
-        tvQq.setOnClickListener(this);
-        tvQqZone.setOnClickListener(this);
+        tv_Google.setOnClickListener(this);
+        tvLine.setOnClickListener(this);
         tvCancel.setOnClickListener(this);
-        findViewById(R.id.tv_qq_game).setOnClickListener(this);
-        FrameLayout bottomSheet = findViewById(R.id.design_bottom_sheet);
-        if (bottomSheet != null) {
-            BottomSheetBehavior.from(bottomSheet).setSkipCollapsed(false);
-            BottomSheetBehavior.from(bottomSheet).setHideable(false);
-        }
+        tvFaceBook.setOnClickListener(this);
         WindowManager windowManager = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE);
         Display d = windowManager.getDefaultDisplay();
         DisplayMetrics realDisplayMetrics = new DisplayMetrics();
@@ -96,13 +80,6 @@ public class ShareDialog extends BottomSheetDialog implements View.OnClickListen
 
         if (type == TYPE_SHARE_H5) {
             tvErban.setVisibility(View.GONE);
-            tvQq.setVisibility(View.GONE);
-        }
-    }
-
-    public void setName(String name) {
-        if (!StringUtils.isEmpty(name)) {
-            tvName.setText(name);
         }
     }
 
@@ -124,21 +101,19 @@ public class ShareDialog extends BottomSheetDialog implements View.OnClickListen
                 }
                 dismiss();
                 break;
-
-            case R.id.tv_weixin:
-                if (onShareDialogItemClick != null) {
-                    onShareDialogItemClick.onSharePlatformClick(ShareSDK.getPlatform(GooglePlus.NAME));
-                }
-                dismiss();
-                break;
-            case R.id.tv_weixinpy:
+            case R.id.tv_line:
                 if (onShareDialogItemClick != null) {
                     onShareDialogItemClick.onSharePlatformClick(ShareSDK.getPlatform(Line.NAME));
                 }
                 dismiss();
                 break;
-            case R.id.tv_qq:
-            case R.id.tv_qq_game:
+            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));
                 }
@@ -160,7 +135,7 @@ public class ShareDialog extends BottomSheetDialog implements View.OnClickListen
         void onInAppSharingItemClick();
 
         /**
-         * 应用外分享包括微信 qq 等平台
+         * 应用外分享包括Line FaceBook 等平台
          *
          * @param platform
          */

app/src/main/java/com/yizhuan/erban/ui/widget/magicindicator/buildins/commonnavigator/indicators/GradientLinePagerIndicator.java

@@ -0,0 +1,23 @@
+package com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.indicators;
+
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.LinearGradient;
+
+/**
+ * 实现渐变指示器帮助类
+ */
+public class GradientLinePagerIndicator extends LinePagerIndicator {
+
+    public GradientLinePagerIndicator(Context context) {
+        super(context);
+    }
+
+    @Override
+    protected void onDraw(Canvas canvas) {
+        LinearGradient lg = new LinearGradient(getLineRect().left, getLineRect().top, getLineRect().right, getLineRect().bottom, new int[]{0xFF13E2F5, 0xFFCC66FF}, null, LinearGradient.TileMode.CLAMP);
+        getPaint().setShader(lg);
+        canvas.drawOval(getLineRect(), getPaint());
+    }
+
+}

app/src/main/java/com/yizhuan/erban/ui/widget/magicindicator/buildins/commonnavigator/indicators/LinePagerIndicator.java

@@ -180,6 +180,15 @@ public class LinePagerIndicator extends View implements IPagerIndicator {
         return mPaint;
     }
 
+    /**
+     * 返回底部画线的RectF mLineRect。
+     *
+     * @return
+     */
+    public RectF getLineRect() {
+        return mLineRect;
+    }
+
     public List<Integer> getColors() {
         return mColors;
     }

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

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item>
+        <shape android:shape="rectangle">
+
+            <corners android:radius="@dimen/dp_30" />
+
+            <gradient
+                android:angle="0"
+                android:endColor="#CC66FF"
+                android:centerColor="#9CB3FF"
+                android:startColor="#13E2F5"
+                android:type="linear" />
+
+        </shape>
+    </item>
+
+    <item
+        android:bottom="1dp"
+        android:left="1dp"
+        android:right="1dp"
+        android:top="1dp">
+        <shape android:shape="rectangle">
+
+            <corners android:radius="@dimen/dp_30" />
+
+            <gradient
+                android:angle="0"
+                android:endColor="#FAEDFF"
+                android:startColor="#E6FDFF"
+                android:type="linear" />
+
+        </shape>
+    </item>
+</layer-list>

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

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <gradient
+        android:angle="180"
+        android:endColor="#19EBFF"
+        android:startColor="#ED66FF"
+        android:type="linear"
+        android:useLevel="true" />
+    <corners
+        android:bottomLeftRadius="14dp"
+        android:bottomRightRadius="0dp"
+        android:topLeftRadius="14dp"
+        android:topRightRadius="0dp" />
+
+</shape>

app/src/main/res/drawable/shape_66000000_100dp.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="@dimen/dp_100"/>
+    <solid android:color="#66000000"/>
+</shape>

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

@@ -9,9 +9,9 @@
 
 
     <RelativeLayout
+        android:background="@color/color_F3F5FA"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@color/white">
+        android:layout_height="match_parent">
 
         <androidx.coordinatorlayout.widget.CoordinatorLayout
             android:id="@+id/coordinator_layout"
@@ -35,6 +35,8 @@
                     <LinearLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
+                        android:clipChildren="false"
+                        android:clipToPadding="false"
                         android:orientation="vertical">
 
                         <FrameLayout
@@ -44,27 +46,32 @@
                             <com.yizhuan.erban.ui.widget.rollviewpager.RollPagerView
                                 android:id="@+id/roll_view"
                                 android:layout_width="match_parent"
-                                android:layout_height="375dp"
-                                app:rollviewpager_play_delay="5000" />
+                                android:layout_height="245dp"
+                                app:rollviewpager_play_delay="5000" >
 
-                            <View
-                                android:layout_width="match_parent"
-                                android:layout_height="375dp"
-                                android:background="@mipmap/bg_userinfo_photo_cover" />
+                                <View
+                                    android:layout_width="match_parent"
+                                    android:layout_height="245dp"
+                                    android:background="@mipmap/bg_userinfo_photo_cover" />
+                            </com.yizhuan.erban.ui.widget.rollviewpager.RollPagerView>
 
                             <TextView
                                 android:id="@+id/tv_roll_hint"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:layout_gravity="end|bottom"
-                                android:layout_marginEnd="12dp"
-                                android:layout_marginBottom="28dp"
-                                android:background="@drawable/bg_roll_hint"
+                                android:layout_marginEnd="@dimen/dp_15"
+                                android:layout_marginBottom="60dp"
+                                android:paddingStart="@dimen/dp_10"
+                                android:paddingEnd="@dimen/dp_10"
+                                android:paddingTop="@dimen/dp_2"
+                                android:paddingBottom="@dimen/dp_2"
+                                android:background="@drawable/shape_66000000_100dp"
                                 android:gravity="center"
                                 android:includeFontPadding="false"
                                 android:text="1/1"
                                 android:textColor="@color/white"
-                                android:textSize="10dp" />
+                                android:textSize="@dimen/sp_10" />
 
                             <LinearLayout
                                 android:id="@+id/ll_audio"
@@ -97,241 +104,248 @@
 
                             </LinearLayout>
 
-                            <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">
+                        </FrameLayout>
 
-                                <ImageView
-                                    android:id="@+id/iv_vip_icon"
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="20dp"
-                                    android:adjustViewBounds="true"
-                                    android:visibility="gone"
-                                    app:layout_constraintBottom_toBottomOf="@id/tv_nick"
-                                    app:layout_constraintStart_toStartOf="parent"
-                                    app:layout_constraintTop_toTopOf="@id/tv_nick"
-                                    tools:src="@drawable/ic_user_charm_level"
-                                    tools:visibility="visible" />
+                        <androidx.constraintlayout.widget.ConstraintLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="bottom"
+                            android:layout_marginTop="-50dp"
+                            android:layout_marginStart="@dimen/dp_15"
+                            android:layout_marginEnd="@dimen/dp_15"
+                            android:background="@drawable/shape_white_12dp_round"
+                            android:clipChildren="false"
+                            android:clipToPadding="false"
+                            android:paddingStart="@dimen/dp_15"
+                            android:paddingTop="@dimen/dp_10"
+                            android:paddingBottom="@dimen/dp_15"
+                            android:paddingEnd="0dp">
+
+                            <com.yizhuan.erban.common.widget.CircleImageView
+                                android:id="@+id/iv_user_head"
+                                android:layout_width="88dp"
+                                android:layout_height="88dp"
+                                android:src="@drawable/default_avatar"
+                                app:layout_constraintStart_toStartOf="parent"
+                                app:layout_constraintBottom_toTopOf="parent"
+                                app:layout_constraintTop_toTopOf="parent"/>
+
+                            <ImageView
+                                android:id="@+id/iv_vip_icon"
+                                android:layout_width="wrap_content"
+                                android:layout_height="20dp"
+                                android:adjustViewBounds="true"
+                                android:visibility="gone"
+                                android:layout_marginStart="@dimen/dp_12"
+                                app:layout_constraintBottom_toBottomOf="@id/tv_nick"
+                                app:layout_constraintStart_toEndOf="@+id/iv_user_head"
+                                app:layout_constraintTop_toTopOf="@id/tv_nick"
+                                tools:src="@drawable/ic_user_charm_level"
+                                tools:visibility="visible" />
+
+                            <TextView
+                                android:id="@+id/tv_nick"
+                                android:layout_width="wrap_content"
+                                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:maxLines="1"
+                                android:textColor="@color/color_1F1A4E"
+                                android:textSize="@dimen/sp_18"
+                                android:textStyle="bold"
+                                app:layout_constraintStart_toEndOf="@id/iv_vip_icon"
+                                app:layout_constraintTop_toTopOf="parent"
+                                app:layout_goneMarginStart="@dimen/dp_12"
+                                tools:drawableRight="@drawable/ic_gender_male"
+                                tools:text="King天地天地" />
+
+                            <LinearLayout
+                                android:id="@+id/ll_id"
+                                android:layout_width="0dp"
+                                android:layout_height="wrap_content"
+                                android:layout_marginTop="@dimen/dp_8"
+                                android:gravity="center_vertical"
+                                android:orientation="horizontal"
+                                android:layout_marginStart="@dimen/dp_12"
+                                app:layout_constraintStart_toEndOf="@+id/iv_user_head"
+                                app:layout_constraintEnd_toEndOf="parent"
+                                app:layout_constraintTop_toBottomOf="@id/tv_nick">
 
                                 <TextView
-                                    android:id="@+id/tv_nick"
+                                    android:id="@+id/tv_erban_id"
                                     android:layout_width="wrap_content"
                                     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:gravity="center_vertical"
+                                    android:includeFontPadding="false"
                                     android:maxLines="1"
+                                    android:textColor="@color/color_6D6B89"
+                                    android:textSize="@dimen/sp_12"
+                                    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" />
+
+                                <View
+                                    android:layout_width="0dp"
+                                    android:layout_weight="1"
+                                    android:layout_height="wrap_content"/>
+
+                                <LinearLayout
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_marginEnd="@dimen/dp_15"
+                                    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/color_6D6B89"
+                                        android:textSize="@dimen/sp_12"
+                                        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/color_6D6B89"
+                                        android:textSize="@dimen/sp_12" />
+
+                                </LinearLayout>
+
+                            </LinearLayout>
+
+                            <LinearLayout
+                                android:id="@+id/ll_level"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_marginTop="@dimen/dp_8"
+                                android:orientation="horizontal"
+                                app:layout_constraintTop_toBottomOf="@id/ll_id">
+
+                                <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:adjustViewBounds="true"
+                                    android:visibility="visible"
+                                    tools:src="@mipmap/ic_user_level" />
+
+                                <androidx.appcompat.widget.AppCompatImageView
+                                    android:id="@+id/iv_user_charm"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="@dimen/dp_20"
+                                    android:layout_marginEnd="3dp"
+                                    android:adjustViewBounds="true"
+                                    android:visibility="visible"
+                                    tools:src="@drawable/ic_user_charm_level" />
+
+
+                                <androidx.constraintlayout.widget.ConstraintLayout
+                                    android:id="@+id/in_official_mask"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="20dp"
+                                    android:visibility="visible"
+                                    tools:visibility="visible">
+
+                                    <ImageView
+                                        android:id="@+id/iv_official_mask"
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="0dp"
+                                        android:adjustViewBounds="true"
+                                        app:layout_constraintBottom_toBottomOf="parent"
+                                        app:layout_constraintStart_toStartOf="parent"
+                                        app:layout_constraintTop_toTopOf="parent"
+                                        tools:src="@drawable/ic_temp_official_mask" />
+
+                                    <TextView
+                                        android:id="@+id/tv_official_mask"
+                                        android:layout_width="match_parent"
+                                        android:layout_height="wrap_content"
+                                        android:layout_marginStart="22dp"
+                                        android:layout_marginEnd="8dp"
+                                        android:gravity="center"
+                                        android:includeFontPadding="false"
+                                        android:singleLine="true"
+                                        android:textColor="@color/white"
+                                        android:textSize="11dp"
+                                        app:layout_constraintBottom_toBottomOf="parent"
+                                        app:layout_constraintEnd_toEndOf="@+id/iv_official_mask"
+                                        app:layout_constraintStart_toStartOf="@id/iv_official_mask"
+                                        app:layout_constraintTop_toTopOf="parent"
+                                        tools:text="金牌主持" />
+
+                                </androidx.constraintlayout.widget.ConstraintLayout>
+
+                                <TextView
+                                    android:id="@+id/tv_constellation"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="18dp"
+                                    android:layout_gravity="center_vertical"
+                                    android:layout_marginStart="5dp"
+                                    android:background="@drawable/shape_58559d"
+                                    android:gravity="center"
+                                    android:includeFontPadding="false"
+                                    android:paddingLeft="6dp"
+                                    android:paddingRight="6dp"
                                     android:textColor="@color/white"
-                                    android:textSize="15dp"
-                                    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天地天地" />
+                                    android:textSize="10dp"
+                                    tools:text="金牛座" />
+
+                                <View
+                                    android:layout_width="0dp"
+                                    android:layout_weight="1"
+                                    android:layout_height="wrap_content"/>
 
                                 <TextView
                                     android:id="@+id/iv_where"
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
-                                    android:layout_marginStart="8dp"
-                                    android:background="@drawable/shape_ffcb47_to_ffa936"
+                                    android:background="@drawable/bg_in_live_gradient"
                                     android:gravity="center"
                                     android:includeFontPadding="false"
-                                    android:paddingStart="7dp"
-                                    android:paddingTop="2dp"
-                                    android:paddingEnd="7dp"
-                                    android:paddingBottom="2dp"
-                                    android:text="直播中"
+                                    android:paddingStart="@dimen/dp_7"
+                                    android:paddingTop="@dimen/dp_5"
+                                    android:paddingEnd="@dimen/dp_7"
+                                    android:paddingBottom="@dimen/dp_5"
+                                    android:drawablePadding="@dimen/dp_6"
+                                    android:text="@string/me_in_live"
                                     android:textColor="@color/white"
-                                    android:textSize="12dp"
-                                    android:textStyle="bold"
+                                    android:textSize="@dimen/sp_12"
                                     android:visibility="gone"
-                                    app:layout_constraintBottom_toBottomOf="@id/tv_nick"
-                                    app:layout_constraintStart_toEndOf="@id/tv_nick"
-                                    app:layout_constraintTop_toTopOf="@id/tv_nick"
-                                    tools:visibility="visible" />
+                                    tools:visibility="visible"
+                                    app:drawableStartCompat="@drawable/icon_in_live" />
 
-
-                                <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>
-
-                                <LinearLayout
-                                    android:id="@+id/ll_level"
-                                    android:layout_width="match_parent"
-                                    android:layout_height="wrap_content"
-                                    android:layout_marginTop="@dimen/dp_8"
-                                    android:orientation="horizontal"
-                                    app:layout_constraintTop_toBottomOf="@id/ll_id">
-
-                                    <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:adjustViewBounds="true"
-                                        android:visibility="visible"
-                                        tools:src="@mipmap/ic_user_level" />
-
-                                    <androidx.appcompat.widget.AppCompatImageView
-                                        android:id="@+id/iv_user_charm"
-                                        android:layout_width="wrap_content"
-                                        android:layout_height="@dimen/dp_20"
-                                        android:layout_marginEnd="3dp"
-                                        android:adjustViewBounds="true"
-                                        android:visibility="visible"
-                                        tools:src="@drawable/ic_user_charm_level" />
-
-
-                                    <androidx.constraintlayout.widget.ConstraintLayout
-                                        android:id="@+id/in_official_mask"
-                                        android:layout_width="wrap_content"
-                                        android:layout_height="20dp"
-                                        android:visibility="visible"
-                                        tools:visibility="visible">
-
-                                        <ImageView
-                                            android:id="@+id/iv_official_mask"
-                                            android:layout_width="wrap_content"
-                                            android:layout_height="0dp"
-                                            android:adjustViewBounds="true"
-                                            app:layout_constraintBottom_toBottomOf="parent"
-                                            app:layout_constraintStart_toStartOf="parent"
-                                            app:layout_constraintTop_toTopOf="parent"
-                                            tools:src="@drawable/ic_temp_official_mask" />
-
-                                        <TextView
-                                            android:id="@+id/tv_official_mask"
-                                            android:layout_width="match_parent"
-                                            android:layout_height="wrap_content"
-                                            android:layout_marginStart="22dp"
-                                            android:layout_marginEnd="8dp"
-                                            android:gravity="center"
-                                            android:includeFontPadding="false"
-                                            android:singleLine="true"
-                                            android:textColor="@color/white"
-                                            android:textSize="11dp"
-                                            app:layout_constraintBottom_toBottomOf="parent"
-                                            app:layout_constraintEnd_toEndOf="@+id/iv_official_mask"
-                                            app:layout_constraintStart_toStartOf="@id/iv_official_mask"
-                                            app:layout_constraintTop_toTopOf="parent"
-                                            tools:text="金牌主持" />
-
-                                    </androidx.constraintlayout.widget.ConstraintLayout>
-
-                                    <TextView
-                                        android:id="@+id/tv_constellation"
-                                        android:layout_width="wrap_content"
-                                        android:layout_height="18dp"
-                                        android:layout_gravity="center_vertical"
-                                        android:layout_marginStart="5dp"
-                                        android:background="@drawable/shape_58559d"
-                                        android:gravity="center"
-                                        android:includeFontPadding="false"
-                                        android:paddingLeft="6dp"
-                                        android:paddingRight="6dp"
-                                        android:textColor="@color/white"
-                                        android:textSize="10dp"
-                                        tools:text="金牛座" />
-
-                                </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">
+                            </LinearLayout>
 
                             <TextView
                                 android:id="@+id/tv_desc"
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
-                                android:layout_marginTop="@dimen/dp_23"
                                 android:ellipsize="end"
                                 android:maxLines="2"
-                                android:textColor="@color/color_999999"
-                                android:textSize="@dimen/dp_12"
-                                app:layout_constraintTop_toBottomOf="@id/ll_id"
+                                android:textColor="@color/color_B3B3C3"
+                                android:textSize="@dimen/sp_13"
+                                android:layout_marginTop="@dimen/dp_10"
+                                app:layout_constraintTop_toBottomOf="@id/ll_level"
                                 tools:text="关注我喜欢我就关注我喜欢我就关注我我就关注我" />
 
-                            <View
-                                android:layout_width="match_parent"
-                                android:layout_height="1px"
-                                android:layout_marginTop="20dp"
-                                android:background="#0f979797" />
-
-                        </LinearLayout>
+                        </androidx.constraintlayout.widget.ConstraintLayout>
 
                     </LinearLayout>
 
@@ -376,15 +390,13 @@
                                 android:layout_centerVertical="true"
                                 android:src="@drawable/icon_home_page_more" />
 
-                            <TextView
+                            <ImageView
                                 android:id="@+id/tv_edit"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
+                                android:layout_width="@dimen/dp_30"
+                                android:layout_height="@dimen/dp_30"
+                                android:src="@drawable/icon_home_page_compile"
                                 android:layout_alignParentEnd="true"
                                 android:layout_centerVertical="true"
-                                android:text="编辑"
-                                android:textColor="@color/white"
-                                android:textSize="@dimen/sp_13"
                                 android:visibility="gone" />
 
                         </RelativeLayout>

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

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout 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:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -50,96 +51,15 @@
                 android:layout_marginTop="@dimen/dp_17"
                 android:layout_marginBottom="19dp"
                 android:layout_weight="1"
-                android:drawableTop="@drawable/icon_erban_friends"
                 android:drawablePadding="9dp"
                 android:gravity="center"
                 android:text="@string/text_share_erban_friends"
-
                 android:textColor="@color/color_999999"
-                android:textSize="@dimen/font_medium" />
-
-            <TextView
-                android:id="@+id/tv_weixinpy"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/dp_17"
-                android:layout_marginBottom="19dp"
-                android:layout_weight="1"
-                android:drawableTop="@drawable/icon_weixinpy"
-                android:drawablePadding="9dp"
-                android:gravity="center"
-                android:text="微信朋友圈"
-                android:textColor="@color/color_999999"
-                android:textSize="@dimen/font_medium" />
-
-            <TextView
-                android:id="@+id/tv_weixin"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/dp_17"
-                android:layout_marginBottom="19dp"
-                android:layout_weight="1"
-                android:drawableTop="@drawable/icon_weixin"
-                android:drawablePadding="9dp"
-                android:gravity="center"
-                android:text="@string/text_share_wechat_friends"
-                android:textColor="@color/color_999999"
-                android:textSize="@dimen/font_medium" />
-
-            <TextView
-                android:id="@+id/tv_qq_zone"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/dp_17"
-                android:layout_marginBottom="19dp"
-                android:layout_weight="1"
-                android:drawableTop="@drawable/icon_qq_zone"
-                android:drawablePadding="9dp"
-                android:gravity="center"
-                android:text="QQ空间"
-                android:textColor="@color/color_999999"
-                android:textSize="@dimen/font_medium" />
-
-            <TextView
-                android:id="@+id/tv_qq_game"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/dp_17"
-                android:layout_marginBottom="19dp"
-                android:layout_weight="1"
-                android:drawableTop="@drawable/icon_qq"
-                android:drawablePadding="9dp"
-                android:gravity="center"
-                android:text="@string/text_share_qq_friends"
-                android:textColor="@color/color_999999"
-                android:textSize="@dimen/font_medium" />
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="@color/transparent"
-            android:gravity="center"
-            android:orientation="horizontal"
-            android:weightSum="4">
-
-
-            <TextView
-                android:id="@+id/tv_qq"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/dp_17"
-                android:layout_marginBottom="19dp"
-                android:layout_weight="1"
-                android:drawableTop="@drawable/icon_qq"
-                android:drawablePadding="9dp"
-                android:gravity="center"
-                android:text="@string/text_share_qq_friends"
-                android:textColor="@color/color_999999"
-                android:textSize="@dimen/font_medium" />
-
+                android:textSize="@dimen/font_medium"
+                app:drawableTopCompat="@drawable/icon_erban_friends" />
 
             <TextView
+                android:id="@+id/tv_line"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_17"
@@ -147,10 +67,13 @@
                 android:layout_weight="1"
                 android:drawablePadding="9dp"
                 android:gravity="center"
+                android:text="@string/share_line"
                 android:textColor="@color/color_999999"
-                android:textSize="@dimen/font_medium" />
+                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"
@@ -158,10 +81,13 @@
                 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" />
+                android:textSize="@dimen/font_medium"
+                app:drawableTopCompat="@drawable/ic_login_google" />
 
             <TextView
+                android:id="@+id/tv_facebook"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_17"
@@ -169,8 +95,10 @@
                 android:layout_weight="1"
                 android:drawablePadding="9dp"
                 android:gravity="center"
+                android:text="@string/share_facebook"
                 android:textColor="@color/color_999999"
-                android:textSize="@dimen/font_medium" />
+                android:textSize="@dimen/font_medium"
+                app:drawableTopCompat="@drawable/icon_facebook" />
         </LinearLayout>
 
     </LinearLayout>

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

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <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:orientation="vertical"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0">
+
+        <com.yizhuan.erban.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_marginTop="4dp" />
+
+        <androidx.viewpager.widget.ViewPager
+            android:id="@+id/view_pager_gift"
+            android:layout_width="match_parent"
+            android:layout_height="280dp" />
+
+    </LinearLayout>
+
+</LinearLayout>
+

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

@@ -21,12 +21,13 @@
             android:paddingTop="@dimen/dp_18"
             android:paddingRight="@dimen/dp_20"
             android:paddingBottom="@dimen/dp_12"
+            android:visibility="gone"
             app:layout_constraintTop_toTopOf="parent">
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="技能卡"
+                android:text="@string/me_skill_card"
                 android:textColor="@color/color_333333"
                 android:textSize="@dimen/sp_14"
                 android:textStyle="bold" />
@@ -60,7 +61,7 @@
                 android:id="@+id/tv_hall_detail"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="公会·房间"
+                android:text="@string/me_association_room"
                 android:textColor="@color/text_normal_c6c6e9"
                 android:textSize="@dimen/sp_14"
                 android:textStyle="bold"
@@ -89,6 +90,7 @@
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical"
                     android:orientation="vertical"
+                    android:paddingStart="0dp"
                     android:paddingEnd="10dp">
 
                     <TextView
@@ -101,7 +103,7 @@
                         android:lines="1"
                         android:maxLength="9"
                         android:textColor="@color/text_title_color"
-                        android:textSize="@dimen/dp_12"
+                        android:textSize="@dimen/sp_12"
                         tools:text="忘忧忘忧忘忧忘忧阁忘忧阁阁阁忘忧阁阁" />
 
                     <TextView
@@ -112,7 +114,7 @@
                         android:ellipsize="end"
                         android:lines="1"
                         android:textColor="@color/color_999999"
-                        android:textSize="@dimen/dp_11"
+                        android:textSize="@dimen/sp_12"
                         android:visibility="gone"
                         tools:text="公会ID：123456" />
 
@@ -124,7 +126,7 @@
                         android:ellipsize="end"
                         android:lines="1"
                         android:textColor="@color/color_666666"
-                        android:textSize="@dimen/dp_11"
+                        android:textSize="@dimen/sp_12"
                         android:visibility="gone"
                         tools:text="公会人数：123" />
 
@@ -136,7 +138,7 @@
                         android:ellipsize="end"
                         android:lines="1"
                         android:textColor="@color/text_normal_c6c6e9"
-                        android:textSize="@dimen/dp_11"
+                        android:textSize="@dimen/sp_12"
                         android:visibility="gone"
                         tools:text="公会数量：123" />
 
@@ -192,6 +194,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:orientation="vertical"
+                    android:paddingStart="0dp"
                     android:paddingEnd="10dp">
 
                     <TextView
@@ -200,13 +203,13 @@
                         android:layout_height="wrap_content"
                         android:ellipsize="end"
                         android:fontFamily="sans-serif-medium"
-                        android:hint="没有加入房间"
+                        android:hint="@string/me_not_joining_the_room"
                         android:includeFontPadding="false"
                         android:lines="1"
                         android:maxLength="9"
                         android:textColor="@color/text_title_color"
                         android:textColorHint="@color/color_999999"
-                        android:textSize="@dimen/dp_12" />
+                        android:textSize="@dimen/sp_12" />
 
                     <TextView
                         android:id="@+id/tv_hall_id"
@@ -216,7 +219,7 @@
                         android:ellipsize="end"
                         android:lines="1"
                         android:textColor="@color/text_normal_c6c6e9"
-                        android:textSize="@dimen/dp_11"
+                        android:textSize="@dimen/sp_12"
                         android:visibility="gone"
                         tools:text="公会ID：123456" />
 
@@ -234,7 +237,7 @@
                             android:ellipsize="end"
                             android:lines="1"
                             android:textColor="@color/color_999999"
-                            android:textSize="@dimen/dp_11"
+                            android:textSize="@dimen/sp_12"
                             tools:text="Peko号：1234567" />
 
                         <TextView
@@ -245,7 +248,7 @@
                             android:ellipsize="end"
                             android:lines="1"
                             android:textColor="@color/color_999999"
-                            android:textSize="@dimen/dp_11"
+                            android:textSize="@dimen/sp_12"
                             tools:text="房间人数：123" />
                     </LinearLayout>
 
@@ -266,7 +269,7 @@
                     android:background="@drawable/shape_stroke_app_color_1dp"
                     android:gravity="center"
                     android:includeFontPadding="false"
-                    android:text="申请加入"
+                    android:text="@string/me_apply_to_join"
                     android:textColor="@color/app_248cfe"
                     android:textSize="14sp"
                     android:visibility="gone"
@@ -276,48 +279,6 @@
 
         </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:orientation="vertical"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/ll_module_hall"
-            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:text="礼物墙"
-                android:textColor="@color/text_normal_c6c6e9"
-                android:textSize="@dimen/sp_13"
-                android:textStyle="bold" />
-
-            <com.yizhuan.erban.ui.widget.magicindicator.MagicIndicator
-                android:id="@+id/magic_indicator_gift"
-                android:layout_width="wrap_content"
-                android:layout_height="20dp"
-                android:layout_gravity="center_horizontal"
-               />
-
-            <androidx.viewpager.widget.ViewPager
-                android:id="@+id/view_pager_gift"
-                android:layout_width="match_parent"
-                android:layout_height="280dp" />
-
-        </LinearLayout>
-
     </androidx.constraintlayout.widget.ConstraintLayout>
 
 </androidx.core.widget.NestedScrollView>

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

@@ -67,9 +67,9 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:gravity="center"
-            android:text="离开"
+            android:text="@string/room_leave"
             android:textColor="#E6FFFFFF"
-            android:textSize="16dp"
+            android:textSize="@dimen/sp_16"
             android:visibility="gone"
             tools:visibility="visible" />
 
@@ -121,7 +121,7 @@
         android:background="@drawable/shape_pk_mic_queue_mark_red"
         android:gravity="center"
         android:textColor="@color/color_FFFFFF"
-        android:textSize="9dp"
+        android:textSize="9sp"
         android:visibility="gone"
         tools:text="红队" />
 
@@ -137,7 +137,7 @@
             android:id="@+id/iv_tag"
             android:layout_width="wrap_content"
             android:layout_height="15dp"
-            android:layout_marginRight="5dp" />
+            android:layout_marginEnd="5dp" />
 
         <TextView
             android:id="@+id/nick"
@@ -179,7 +179,7 @@
                 android:gravity="center"
                 android:text="0"
                 android:textColor="@color/white"
-                android:textSize="9dp" />
+                android:textSize="@dimen/sp_9" />
 
         </LinearLayout>
 
@@ -214,7 +214,7 @@
             android:id="@+id/tv_room_desc"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="5dp"
+            android:layout_marginStart="5dp"
             android:layout_marginBottom="1px"
             android:ellipsize="end"
             android:gravity="center"

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

@@ -29,9 +29,10 @@
                 android:background="@drawable/bg_room_msg_input"
                 android:gravity="center_vertical"
                 android:paddingStart="13dp"
-                android:text="说点什么..."
+                android:paddingEnd="0dp"
+                android:text="@string/room_say_something"
                 android:textColor="@color/white"
-                android:textSize="14dp"
+                android:textSize="@dimen/sp_14"
                 android:visibility="visible"
                 tools:visibility="gone" />
 

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

@@ -10,28 +10,28 @@
 
     <com.yizhuan.xchat_android_library.widget.DrawableCenterTextView
         android:id="@+id/send_msg_layout"
-        android:layout_width="150dp"
-        android:layout_height="36dp"
-        android:background="@drawable/bg_common_confirm"
-        android:drawableLeft="@mipmap/icon_chat"
-        android:drawablePadding="5dp"
+        android:layout_width="0dp"
+        android:layout_weight="1"
+        android:layout_height="45dp"
+        android:layout_marginStart="@dimen/dp_15"
+        android:background="@drawable/bg_gradient_cc66ff_9cb3ff_30"
         android:gravity="center"
         android:text="@string/send_msg"
-        android:textColor="@color/white"
-        android:textSize="15sp" />
+        android:textColor="@color/color_9168FA"
+        android:textSize="@dimen/sp_16" />
 
     <com.yizhuan.xchat_android_library.widget.DrawableCenterTextView
         android:id="@+id/attention_layout"
-        android:layout_width="150dp"
-        android:layout_height="36dp"
-        android:layout_marginStart="25dp"
+        android:layout_width="0dp"
+        android:layout_weight="1"
+        android:layout_height="45dp"
+        android:layout_marginStart="18dp"
+        android:layout_marginEnd="@dimen/dp_15"
         android:background="@drawable/bg_common_confirm"
-        android:drawableStart="@drawable/icon_new_attention"
-        android:drawablePadding="5dp"
         android:gravity="center"
         android:text="@string/attention"
         android:textColor="@color/white"
-        android:textSize="15sp" />
+        android:textSize="@dimen/sp_16" />
 
 
 </LinearLayout>

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

@@ -521,6 +521,7 @@
     <color name="color_AFAFB2">#AFAFB2</color>
     <color name="color_E0E0E0">#E0E0E0</color>
     <color name="color_F3F2F5">#F3F2F5</color>
+    <color name="color_F3F5FA">#F3F5FA</color>
     <color name="color_FFF044">#FFF044</color>
 
     <color name="color_CEC0FF">#CEC0FF</color>
@@ -612,5 +613,9 @@
     <color name="color_93570B">#93570B</color>
     <color name="color_AA6F29">#AA6F29</color>
     <color name="color_EEA473">#EEA473</color>
+    <color name="color_FFC000">#FFC000</color>
+    <color name="color_13E2F5">#13E2F5</color>
+    <color name="color_CC66FF">#CC66FF</color>
+    <color name="color_9168FA">#9168FA</color>
 
 </resources>

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

@@ -7,7 +7,9 @@
     <string name="click_screen_reload">點擊刷新</string>
     <string name="loading">加載中&#8230;</string>
     <string name="click_or_pull_refresh">點擊或者下拉嘗試刷新</string>
+    <string name="sure">确定</string>
     <string name="cancel">取消</string>
+    <string name="network_is_abnormal">网络异常，请重试</string>
 
 
     <string name="gift_action">禮物</string>
@@ -536,7 +538,7 @@
     <string name="tab_title_fans">粉絲</string>
     <string name="title_share_dialog">每天第一次分享免費領紅包（不包含分享至Peko好友）</string>
     <string name="text_share_erban_friends">好友</string>
-    <string name="text_share_wechat_friends">微信好友</string>
+    <string name="text_share_Google">Google</string>
     <string name="text_share_qq_friends">QQ好友</string>
     <string name="tab_title_team">群</string>
     <string name="text_team_join_auth_on">開啟身份驗證</string>
@@ -980,5 +982,50 @@
     <string name="me_Individual_center_noble_card_card_click">个人中心贵族卡片片点击</string>
     <string name="me_personal_center_recharge_card_click">个人中心充值卡片点击</string>
     <string name="me_click_my_center">个人中心功能板块点击</string>
+    <string name="me_in_live">直播中</string>
+    <string name="me_data">资料</string>
+    <string name="me_dynamic">动态</string>
+    <string name="me_gift_wall">礼物墙</string>
+    <string name="me_report">举报</string>
+    <string name="me_report_the_dynamic">举报动态-区分-动态广场</string>
+    <string name="me_delete">删除</string>
+    <string name="me_cancel">取消</string>
+    <string name="me_share_dynamic">分享动态-区分-动态广场</string>
+    <string name="me_delete_the_dynamic">删除动态-区分-动态广场</string>
+    <string name="me_cannot_be_restored">删除后不可恢复，确定删除该动态吗?</string>
+    <string name="me_successfully_delete">删除成功</string>
+    <string name="me_call_the_like_interface_to_complete">调用点赞接口完成...</string>
+    <string name="me_click_the_list_comment_button">点击列表评论按钮-区分-话题客态页</string>
+    <string name="me_number_of_times">点击评论按钮进入详情页的次数，区分话题-</string>
+    <string name="me_main_state">主态</string>
+    <string name="me_guest_state">客态</string>
+    <string name="me_personal_home_page_dynamic_tab">个人主页动态tab-</string>
+    <string name="me_personal_homepage_Information">个人主页资料tab-</string>
+    <string name="me_personal_home_gifts_tab">个人主页礼物tab-</string>
+    <string name="me_user_information_is_empty">用户信息为空。</string>
+    <string name="me_unfollow_is_no_longer_a_friend">取消关注将不再是好友关系，确定取消关注？</string>
+    <string name="me_decide_to_unfollow">确定取消关注？</string>
+    <string name="me_guest_page_focus">客态页-关注</string>
+    <string name="me_error_playing">播放出错，请重试</string>
+    <string name="me_roomid">房间ID:</string>
+    <string name="me_room_number_people">房间人数:</string>
+    <string name="me_peko_number">Peko号:</string>
+    <string name="me_association">公会</string>
+    <string name="me_association_id">公会ID:</string>
+    <string name="me_association_number">公会人数:</string>
+    <string name="me_room_number">房间数量:</string>
+    <string name="me_association_room">公会·房间</string>
+    <string name="me_room">房间</string>
+    <string name="me_ordinary_gift">普通礼物</string>
+    <string name="me_lucky_gift">幸运礼物</string>
+    <string name="me_no_skill_card_added_yet">还未添加技能卡喔</string>
+    <string name="me_skill_card">技能卡</string>
+    <string name="me_not_joining_the_room">没有加入房间</string>
+    <string name="me_apply_to_join">申请加入</string>
+    <string name="room_down_to_the_bottom">已经到底啦~自动为您返回当前房间</string>
+    <string name="room_say_something">说点什么…</string>
+    <string name="room_leave">离开</string>
+    <string name="share_line">Line</string>
+    <string name="share_facebook">Facebook</string>
 
 </resources>

core/src/diff_src_erban/java/com/yizhuan/xchat_android_constants/XChatConstants.java

@@ -9,7 +9,7 @@ import com.yizhuan.xchat_android_core.BuildConfig;
 public class XChatConstants {
 
     /**
-     * 包名(各种缓存目录的根目录)
+     * 包名(各種緩存目錄的根目錄)
      */
     public static final String XCHAT_DIR_NAME = "com.mango.peko";
 
@@ -19,17 +19,17 @@ public class XChatConstants {
     public static final String XCHAT_SHARE_PREFERENCE_NAME = "accompany_share_data";
 
     /**
-     * 加密接口参数
+     * 加密接口參數
      */
     public static final String DES_ENCRYPT_KEY_SMS_PARAMS = "70d26f6a5c214d3b858f3f8daad7a161";
 
     /**
-     * 加密接口签名
+     * 加密接口簽名
      */
     public static final String DES_ENCRYPT_KEY_SMS_SIGN = "c8d514b3cdc44e898e027940e84f036c";
 
     /**
-     * 本地数据库的名字(目前是用 realm 数据库)
+     * 本地數據庫的名字(目前是用 realm 數據庫)
      */
     public static final String XCHAT_DATABASE_NAME = "accompany.db";
 
@@ -49,59 +49,59 @@ public class XChatConstants {
     public static final String BUGLY_KEY_RELEASE = "3655441f78";//已更改
 
     /**
-     * 云信 key (DEBUG)
+     * 雲信 key (DEBUG)
      */
-    public static final String NIM_KEY_DEBUG = "1c3b8c6bf8467d8e4c33a004dbec5c94";//已更换
+    public static final String NIM_KEY_DEBUG = "1c3b8c6bf8467d8e4c33a004dbec5c94";//已更換
 
     /**
-     * 云信 key (RELEASE)
+     * 雲信 key (RELEASE)
      */
-    public static final String NIM_KEY_RELEASE = "1c3b8c6bf8467d8e4c33a004dbec5c94";//已更换
+    public static final String NIM_KEY_RELEASE = "1c3b8c6bf8467d8e4c33a004dbec5c94";//已更換
 
     /**
-     * 网易易盾 productNumber
+     * 網易易盾 productNumber
      */
-    public static final String YI_DUN_PRODUCT_NUMBER = "YD00313347064620";//已更换
+    public static final String YI_DUN_PRODUCT_NUMBER = "YD00313347064620";//已更換
     /**
-     * 网易易盾 业务 ID 注册
+     * 網易易盾 業務 ID 註冊
      */
     public static final String QUICK_PASS_BUSINESS_ID = "ef7de5582f194c549125a64b710e7f31";
 
     /**
-     * 网易易盾 业务 ID 注册
+     * 網易易盾 業務 ID 註冊
      */
     public static final String YI_DUN_BUSINESS_ID = "af43d0f8752147c48f8281800da6049e";
     /**
-     * 网易易盾 业务 ID 注册
+     * 網易易盾 業務 ID 註冊
      */
     public static final String YI_DUN_LOGIN_BUSINESS_ID = "67881c7a69764c058435ba93a51b1285";
 
     /**
-     * 数美-天网 的 organization
+     * 數美-天網 的 organization
      */
     public static final String SHU_MEI_TIAN_WANG_ORGANIZATION = "2qjgWI5tyNipa08YPjOt";
 
     /**
-     * 声网 key
+     * 聲網 key
      */
-    public static final String AGORA_KEY = "7ae1a8dabe7a44a9a67c829faa409e70"; //已更换
+    public static final String AGORA_KEY = "7ae1a8dabe7a44a9a67c829faa409e70"; //已更換
 
     /**
-     * 阿里云日志空间名字
+     * 阿裏雲日誌空間名字
      */
     public static final String ALIYUN_LOG_NAME = "66accompanylog";
     /**
-     * 阿里云日志空间名字
+     * 阿裏雲日誌空間名字
      */
     public static final String ALIYUN_LOG_STORE = "66accompanylog";
 
     /**
-     * 百度统计 key
+     * 百度統計 key
      */
     public static final String BAIDU_APP_KEY = "b8a4cb4bd1";//已更改
 
     /**
-     * 友盟统计 key
+     * 友盟統計 key
      */
     public static final String UMENG_APP_KEY = "5ff6bc27adb42d5826a1cb97";//已更改
 
@@ -111,12 +111,12 @@ public class XChatConstants {
     public static final String LINKED_ME_KEY = "6ba9e9d9760b8acc50b2b499cfd557da";
 
     /**
-     * 公屏第一条提示消息
+     * 公屏第一條提示消息
      */
-    public static final String MESSAGE_VIEW_FIRST_MSG = "平台严禁未成年人直播或打赏，倡导绿色互动，禁止宣传及发布政治、低俗、暴力、色情等违规违法内容，严禁违规交易和诱导欺诈用户，如有违规将对账号进行封禁，发现请及时举报。";
+    public static final String MESSAGE_VIEW_FIRST_MSG = "平臺嚴禁未成年人直播或打賞，倡導綠色互動，禁止宣傳及發布政治、低俗、暴力、色情等違規違法內容，嚴禁違規交易和誘導欺詐用戶，如有違規將對賬號進行封禁，發現請及時舉報。";
 
     /**
-     * 龙珠表情 ID
+     * 龍珠表情 ID
      */
     public static final int DRAGON_BALL_ID = 40;
 
@@ -126,29 +126,29 @@ public class XChatConstants {
     public static final String SHARE_H5_URL = "/activity/double12/index.html";
 
     /**
-     * 分享房间文本
+     * 分享房間文本
      */
-    public static final String SHARE_ROOM_TEXT = "人美声甜带上分，一起来玩吧~";
+    public static final String SHARE_ROOM_TEXT = "人美聲甜帶上分，一起來玩吧~";
 
     /**
-     * 分享房间标题
+     * 分享房間標題
      */
-    public static final String SHARE_ROOM_TITLE = "来Peko，开黑交友玩游戏";
+    public static final String SHARE_ROOM_TITLE = "來Peko，開黑交友玩遊戲";
 
     /**
-     * 分享房间 URL
+     * 分享房間 URL
      */
     public static final String SHARE_ROOM_URL = "/peko/modules/share_room/index.html?shareUid=";
 
     /**
      * 分享家族文本
      */
-    public static final String SHARE_FAMILY_TEXT = "加入家族,和你兴趣相投的小伙伴一起玩耍吧~";
+    public static final String SHARE_FAMILY_TEXT = "加入家族,和你興趣相投的小夥伴一起玩耍吧~";
 
     /**
-     * 分享家族标题
+     * 分享家族標題
      */
-    public static final String SHARE_FAMILY_TITLE = "hi,我想邀请您加入我的Peko家族:";
+    public static final String SHARE_FAMILY_TITLE = "hi,我想邀請您加入我的Peko家族:";
 
     /**
      * 分享家族 URL
@@ -156,93 +156,93 @@ public class XChatConstants {
     public static final String SHARE_FAMILY_URL = "/peko/modules/share/share_family.html";
 
     /**
-     * 分享群组文本
+     * 分享群組文本
      */
-    public static final String SHARE_TEAM_TEXT = "加入家族,和你兴趣相投的小伙伴一起玩耍吧~";
+    public static final String SHARE_TEAM_TEXT = "加入家族,和你興趣相投的小夥伴一起玩耍吧~";
 
     /**
-     * 分享群组标题
+     * 分享群組標題
      */
-    public static final String SHARE_TEAM_TITLE = "hi,我想邀请您加入我的Peko群聊:";
+    public static final String SHARE_TEAM_TITLE = "hi,我想邀請您加入我的Peko群聊:";
 
     /**
-     * 分享群组 URL
+     * 分享群組 URL
      */
     public static final String SHARE_TEAM_URL = "/peko/modules/share/share_family.html";
     /**
-     * 分享群组 URL
+     * 分享群組 URL
      */
     public static final String SHARE_WORLD_DYNAMIC_URL = "/peko/modules/world/share-page/index.html";
 
 
     /**
-     * 游戏排行榜 URL
+     * 遊戲排行榜 URL
      */
     public static final String GAME_ROOK = "/peko/modules/erbanRank/game_rank.html?type=week";
 
     /**
-     * 系统消息那个用户的UID
+     * 系統消息那個用戶的UID
      */
     public static final String SYSTEM_MESSAGE_UID = BuildConfig.DEBUG ? "935008" : "904770";
 
 
     /**
-     * 小秘书那个用户的UID
+     * 小秘書那個用戶的UID
      */
     public static final String SECRETARY_UID = BuildConfig.DEBUG ? "935001" : "904769";
 
     /**
-     * 赛事消息UID
+     * 賽事消息UID
      */
     public static final String MATCH_UID = BuildConfig.DEBUG ? "1296314" : "904772";
 
 
     /**
-     * 登录页面「如何登录」对应的 H5 页面
+     * 登錄頁面「如何登錄」對應的 H5 頁面
      */
     public static final String LOGIN_ERBAN_ACCOUNT_URL = "/peko/modules/rule/login_tips.html";
-    public static final String ROOM_INTRODUCTION = "可点击房间话题查看本房间公告";
+    public static final String ROOM_INTRODUCTION = "可點擊房間話題查看本房間公告";
 
-    public static final String DATING_TIPS_OPEN = "相亲玩法已开启,请点击主持人麦位选择主持人";
-    //仅开头提示文案,这个tips消息我们服务端发的
-    public static final String DATING_TIPS_NEW = "新一轮的相亲已开启";
-    public static final String DATING_TIPS_IN = "已进入心动选人环节";
-    public static final String DATING_TIPS_PUBLIC = "公布心动对象";
+    public static final String DATING_TIPS_OPEN = "相親玩法已開啟,請點擊主持人麥位選擇主持人";
+    //僅開頭提示文案,這個tips消息我們服務端發的
+    public static final String DATING_TIPS_NEW = "新一輪的相親已開啟";
+    public static final String DATING_TIPS_IN = "已進入心動選人環節";
+    public static final String DATING_TIPS_PUBLIC = "公布心動對象";
 
     public static final String SHOW = "show";
     public static final String HIDE = "hide";
 
-    public static final String UPDATE_VERSION_TIPS = "版本过旧，请下载最新版本哦";
+    public static final String UPDATE_VERSION_TIPS = "版本過舊，請下載最新版本哦";
 
-    public static final String NET_ERROR = "网络错误";
+    public static final String NET_ERROR = "網絡錯誤";
 
-    public static final String UNKOWN_ERROR = "未知错误";
+    public static final String UNKOWN_ERROR = "未知錯誤";
 
-    public static final String EMPTY_USER_INFO_TIPS = "用户信息为空，请重新登录";
+    public static final String EMPTY_USER_INFO_TIPS = "用戶信息為空，請重新登錄";
 
     /**
-     * 当布局记录为空时的提示，比如礼物，充值
+     * 當布局記錄為空時的提示，比如禮物，充值
      */
-    public static final String EMPTY_RECORD_AND_THREE_MONTHS_TIPSS = "仅支持查看3个月内记录";
+    public static final String EMPTY_RECORD_AND_THREE_MONTHS_TIPSS = "僅支持查看3個月內記錄";
 
-    // 举报入口标识
+    // 舉報入口標識
     public static final String REPORT_TYPE_CHAT = "chat"; // 私聊
-    public static final String REPORT_TYPE_PERSONAL = "personal"; // 个人中心
-    public static final String REPORT_TYPE_ROOM = "room"; // 房间
-    public static final String REPORT_TYPE_WORLD = "world"; // 话题
-    public static final String REPORT_TYPE_VOICE = "voice"; // 声音瓶子
-    public static final String REPORT_TYPE_MISSION = ""; // 师徒
-    public static final String REPORT_TYPE_USERCARD = "USERCARD"; // 资料卡片
-    public static final String REPORT_TYPE_WORLDDYNAMIC = "WORLDDYNAMIC"; // 世界动态
-    public static final String REPORT_TYPE_DYNAMICCOMMENT = "DYNAMICCOMMENT"; // 世界动态
-    public static final String REPORT_TYPE_PERSONAL_DYNAMIC = "PERSONAL_DYNAMIC"; // 个人页动态
-    public static final String REPORT_TYPE_DYNAMIC_SQUARE = "DYNAMIC_SQUARE";//广场动态
+    public static final String REPORT_TYPE_PERSONAL = "personal"; // 個人中心
+    public static final String REPORT_TYPE_ROOM = "room"; // 房間
+    public static final String REPORT_TYPE_WORLD = "world"; // 話題
+    public static final String REPORT_TYPE_VOICE = "voice"; // 聲音瓶子
+    public static final String REPORT_TYPE_MISSION = ""; // 師徒
+    public static final String REPORT_TYPE_USERCARD = "USERCARD"; // 資料卡片
+    public static final String REPORT_TYPE_WORLDDYNAMIC = "WORLDDYNAMIC"; // 世界動態
+    public static final String REPORT_TYPE_DYNAMICCOMMENT = "DYNAMICCOMMENT"; // 世界動態
+    public static final String REPORT_TYPE_PERSONAL_DYNAMIC = "PERSONAL_DYNAMIC"; // 個人頁動態
+    public static final String REPORT_TYPE_DYNAMIC_SQUARE = "DYNAMIC_SQUARE";//廣場動態
 
 
     /**
      * Referer (DEBUG)
      */
-    public static final String KEY_REFERER_DEBUG = "http://beta.api.pekolive.com/";
+    public static final String KEY_REFERER_DEBUG = "https://beta.api.pekolive.com/";
 
     /**
      * Referer (RELEASE)
@@ -250,9 +250,9 @@ public class XChatConstants {
     public static final String KEY_REFERER_RELEASE = "https://api.lecheng163.com/";
     public static final String APP_MARK = "peko";
     /**
-     * 聊天室文本消息易盾反垃圾业务id
+     * 聊天室文本消息易盾反垃圾業務id
      */
-    public static final String CHAT_ROOM_ANTI_SPAM_CONFIG_ID = BuildConfig.DEBUG ? "be58dfa4a664540006f0ed1f752d604a" : "244721766ba607056a32c8824a85c253";
+    public static final String CHAT_ROOM_ANTI_SPAM_CONFIG_ID = BuildConfig.DEBUG ? "8151e1245163738e1fa84db7a02f8fb9" : "244721766ba607056a32c8824a85c253";
 
     public static final int KICK_OUT_ROOM_LIMIT_ENTER_TIME = 5 * 60 * 1000;
 

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

@@ -17,8 +17,8 @@ public class UriProvider {
     /**
      * 默认以下生产环境地址
      */
-    public static String JAVA_WEB_URL = "https://api.lecheng163.com/";
-    public static String IM_SERVER_URL = "https://api.lecheng163.com/";
+    public static String JAVA_WEB_URL = "https://beta.api.pekolive.com/";
+    public static String IM_SERVER_URL = "https://beta.api.pekolive.com/";
 
     /**
      * 初始化URL