替換包名：com.pandora.cs

然后把首页的推送先注释掉 把包名随便换一个
然后把登录line 还有谷歌登录去了 留fb的

Share/src/main/AndroidManifest.xml

@@ -4,7 +4,7 @@
     >
 
     <queries>
-        <package android:name="com.pandora.sy"/>
+        <package android:name="com.pandora.cs"/>
         <package android:name="com.facebook.orca"/>
 
         <package

app/build.gradle

@@ -298,7 +298,7 @@ android {
 
     defaultConfig {
 //        applicationId "myname.pdlive.shayu"
-        applicationId "com.pandora.sy"
+        applicationId "com.pandora.cs"
         minSdkVersion rootProject.ext.android.minSdkVersion
         //版本在这里修改
         targetSdkVersion rootProject.ext.android.targetSdkVersion

app/google-services.json

@@ -9,7 +9,7 @@
       "client_info": {
         "mobilesdk_app_id": "1:867032862719:android:841a73fdfb6c37453ae1ca",
         "android_client_info": {
-          "package_name": "com.pandora.sy"
+          "package_name": "com.pandora.cs"
         }
       },
       "oauth_client": [
@@ -17,7 +17,7 @@
           "client_id": "867032862719-af2dnojobjd8s6ekdr1is1vev8nk36sv.apps.googleusercontent.com",
           "client_type": 1,
           "android_info": {
-            "package_name": "com.pandora.sy",
+            "package_name": "com.pandora.cs",
             "certificate_hash": "38cc19306c9facee36a9224e9a4070bc0be15c7d"
           }
         },
@@ -25,7 +25,7 @@
           "client_id": "867032862719-ohaa1f18e186qpasvgt7qkk1i1pivniq.apps.googleusercontent.com",
           "client_type": 1,
           "android_info": {
-            "package_name": "com.pandora.sy",
+            "package_name": "com.pandora.cs",
             "certificate_hash": "b66dc8d21cfcf6c729577ddcf0c312b2a31ed872"
           }
         },
@@ -33,7 +33,7 @@
           "client_id": "867032862719-snpbqruvqcc9fsifjnmm1h3dcgtr8am4.apps.googleusercontent.com",
           "client_type": 1,
           "android_info": {
-            "package_name": "com.pandora.sy",
+            "package_name": "com.pandora.cs",
             "certificate_hash": "15fc5e70cf238323bf7111c8c627803985478e87"
           }
         },

app/src/main/java/com/shayu/phonelive/AppContext.java

@@ -292,6 +292,7 @@ public class AppContext extends CommonAppContext {
         MessageChatNotifyManager.getInstance().addShieldClass(LoginActivity.class);
         MessageChatNotifyManager.getInstance().addShieldClass(RegisterActivity.class);
         MessageChatNotifyManager.getInstance().addShieldClass(UCropActivity.class);
+        MessageChatNotifyManager.getInstance().addShieldClass(MainActivity.class);
 
 
         RongcloudIMManager.addRongcloudIMOnReceiveMessageListener(new RongIMClient.OnReceiveMessageWrapperListener() {

common/src/main/AndroidManifest.xml

@@ -25,7 +25,7 @@
 
         <provider
             android:name="androidx.core.content.FileProvider"
-            android:authorities="com.pandora.sy.fileprovider"
+            android:authorities="com.pandora.cs.fileprovider"
             android:exported="false"
             android:grantUriPermissions="true">
             <meta-data

common/src/main/java/com/yunbao/common/CommonAppConfig.java

@@ -13,6 +13,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.yunbao.common.bean.ConfigBean;
 import com.yunbao.common.bean.FansMedalBean;
+import com.yunbao.common.bean.LiveGiftBean;
 import com.yunbao.common.bean.NewCommunityType;
 import com.yunbao.common.bean.UserBean;
 import com.yunbao.common.bean.UserItemBean;
@@ -537,38 +538,32 @@ public class CommonAppConfig {
      * 个人中心功能列表
      */
     public List<UserItemBean> getUserItemList() {
-        if (mUserItemList == null || mUserItemList.size() == 0) {
             String userBeanJson = SpUtil.getInstance().getStringValue(SpUtil.USER_INFO);
             if (!TextUtils.isEmpty(userBeanJson)) {
                 JSONObject obj = JSON.parseObject(userBeanJson);
                 if (obj != null) {
-                    setUserItemList(obj.getString("list"));
-                }
+                    setUserItemList(obj.getString("pdl_list"));
                 }
             }
         return mUserItemList;
     }
 
+    /**
+     * 个人中心功能列表   新
+     */
+    public List<UserItemBean> getUserItemNewList() {
+        String userBeanJson = SpUtil.getInstance().getStringValue(SpUtil.USER_INFO);
+        if (!TextUtils.isEmpty(userBeanJson)) {
+            JSONObject obj = JSON.parseObject(userBeanJson);
+            if (obj != null) {
+                setUserItemList(obj.getString("pdl_settings"));
+            }
+        }
+        return mUserItemList;
+    }
 
     public void setUserItemList(String listString) {
-        UserItemBean[][] arr = JSON.parseObject(listString, UserItemBean[][].class);
-        if (arr != null && arr.length > 0) {
-            List<UserItemBean> newList = new ArrayList<>();
-            for (int i = 0, length1 = arr.length; i < length1; i++) {
-                for (int j = 0, length2 = arr[i].length; j < length2; j++) {
-                    UserItemBean bean = arr[i][j];
-                    if (j == length2 - 1) {
-                        if (i < length1 - 1) {
-                            bean.setGroupLast(true);
-                        } else {
-                            bean.setAllLast(true);
-                        }
-                    }
-                    newList.add(bean);
-                }
-            }
-            mUserItemList = newList;
-        }
+        mUserItemList = JSON.parseArray(listString, UserItemBean.class);
     }
 
 

common/src/main/java/com/yunbao/common/http/CommonHttpUtil.java

@@ -417,7 +417,7 @@ public class CommonHttpUtil {
                 .params("purchaseToken", purchaseToken)
                 .params("productId", productId)
                 .params("orderno", orderno)
-                .params("package_name", "com.pandora.sy")
+                .params("package_name", "com.pandora.cs")
                 .execute(callback);
     }
 
@@ -428,7 +428,7 @@ public class CommonHttpUtil {
                 .params("trade_no", tradeNo)
                 .params("allData", allData)
                 .params("gps_adid", gps_adid)
-                .params("package_name", "com.pandora.sy")
+                .params("package_name", "com.pandora.cs")
                 .execute(callback);
     }
 
@@ -437,7 +437,7 @@ public class CommonHttpUtil {
                 .params("purchaseToken", purchaseToken)
                 .params("orderno", orderNo)
                 .params("trade_no", tradeNo)
-                .params("package_name", "com.pandora.sy")
+                .params("package_name", "com.pandora.cs")
                 .execute(callback);
     }
 

common/src/main/java/com/yunbao/common/utils/ProcessImageUtil.java

@@ -83,7 +83,7 @@ public class ProcessImageUtil extends ProcessResultUtil {
                 if (mNeedCrop) {
                     Uri uri = null;
                     if (Build.VERSION.SDK_INT >= 24) {
-                        uri = FileProvider.getUriForFile(mContext, "com.pandora.sy.fileprovider", mCameraResult);
+                        uri = FileProvider.getUriForFile(mContext, "com.pandora.cs.fileprovider", mCameraResult);
                     } else {
                         uri = Uri.fromFile(mCameraResult);
                     }
@@ -195,7 +195,7 @@ public class ProcessImageUtil extends ProcessResultUtil {
             mCameraResult = getNewFile();
             Uri uri = null;
             if (Build.VERSION.SDK_INT >= 24) {
-                uri = FileProvider.getUriForFile(mContext, "com.pandora.sy.fileprovider", mCameraResult);
+                uri = FileProvider.getUriForFile(mContext, "com.pandora.cs.fileprovider", mCameraResult);
                 intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION | Intent.FLAG_GRANT_WRITE_URI_PERMISSION);
             } else {
                 uri = Uri.fromFile(mCameraResult);
@@ -255,7 +255,7 @@ public class ProcessImageUtil extends ProcessResultUtil {
             startActivityForResult(intent, mCropResultCallback);
         } catch (Exception e) {
             try {
-                Uri resultUri = FileProvider.getUriForFile(mContext, "com.pandora.sy.fileprovider", mCorpResult);
+                Uri resultUri = FileProvider.getUriForFile(mContext, "com.pandora.cs.fileprovider", mCorpResult);
                 if (resultUri == null || mFragment == null || mContext == null) {
                     return;
                 }

common/src/main/java/com/yunbao/common/utils/VersionUtil.java

@@ -63,7 +63,7 @@ public class VersionUtil {
                             @Override
                             public void onConfirmClick(Dialog dialog, String content) {
                                 Intent i = new Intent(android.content.Intent.ACTION_VIEW);
-                                i.setData(Uri.parse("https://play.google.com/store/apps/details?id=com.pandora.sy"));
+                                i.setData(Uri.parse("https://play.google.com/store/apps/details?id=com.pandora.cs"));
                                 context.startActivity(i);
                                 context.finish();
                             }
@@ -85,7 +85,7 @@ public class VersionUtil {
                             @Override
                             public void onConfirmClick(Dialog dialog, String content) {
                                 Intent i = new Intent(android.content.Intent.ACTION_VIEW);
-                                i.setData(Uri.parse("https://play.google.com/store/apps/details?id=com.pandora.sy"));
+                                i.setData(Uri.parse("https://play.google.com/store/apps/details?id=com.pandora.cs"));
                                 context.startActivity(i);
                                 context.finish();
                             }

common/src/main/java/com/yunbao/common/views/APKUpdateCustomPopup.java

@@ -128,7 +128,7 @@ public class APKUpdateCustomPopup extends CenterPopupView {
             public void onViewClicks() {
                 if (CommonAppConfig.IS_GOOGLE_PLAY == 1) {
                     Intent i = new Intent(android.content.Intent.ACTION_VIEW);
-                    i.setData(Uri.parse("https://play.google.com/store/apps/details?id=com.pandora.sy"));
+                    i.setData(Uri.parse("https://play.google.com/store/apps/details?id=com.pandora.cs"));
                     mContext.startActivity(i);
                     mContext.finish();
                 } else if (CommonAppConfig.IS_GOOGLE_PLAY == 2) {

common/src/main/java/com/yunbao/common/views/DividerItemDecoration.java

@@ -0,0 +1,55 @@
+package com.yunbao.common.views;
+
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.Rect;
+import android.graphics.drawable.ColorDrawable;
+import android.graphics.drawable.Drawable;
+import android.view.View;
+
+import androidx.recyclerview.widget.RecyclerView;
+
+/**
+ * Created by cxf on 2018/1/27.
+ * RecyclerView顶部渐变的itemDecoration
+ */
+
+public class DividerItemDecoration extends RecyclerView.ItemDecoration {
+
+    private Drawable mDivider;
+
+    public DividerItemDecoration(Context context, int dividerHeight, int dividerColor) {
+        // 创建一个带有颜色和高度的Drawable作为分割线  
+        mDivider = new ColorDrawable(dividerColor);
+        // 如果你想让分割线有一定的内边距（比如左右边距），可以使用LayerDrawable或自定义Drawable  
+        // 这里简单起见，我们只设置高度  
+        mDivider.setBounds(0, 0, 0, dividerHeight);
+    }
+
+    @Override
+    public void onDraw(Canvas c, RecyclerView parent, RecyclerView.State state) {
+        drawVertical(c, parent);
+    }
+
+    private void drawVertical(Canvas c, RecyclerView parent) {
+        final int left = parent.getPaddingLeft();
+        final int right = parent.getWidth() - parent.getPaddingRight();
+
+        final int childCount = parent.getChildCount();
+        for (int i = 0; i < childCount - 1; i++) {
+            final View child = parent.getChildAt(i);
+            final RecyclerView.LayoutParams params = (RecyclerView.LayoutParams) child.getLayoutParams();
+            final int top = child.getBottom() + params.bottomMargin;
+            final int bottom = top + mDivider.getIntrinsicHeight();
+
+            mDivider.setBounds(left, top, right, bottom);
+            mDivider.draw(c);
+        }
+    }
+
+    @Override
+    public void getItemOffsets(Rect outRect, View view, RecyclerView parent, RecyclerView.State state) {
+        if (mDivider == null) return;
+        outRect.set(0, 0, 0, mDivider.getIntrinsicHeight());
+    }
+}

common/src/main/res/drawable/bg_main_com_type.xml

@@ -2,8 +2,8 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <gradient
         android:angle="-45"
-        android:endColor="#EB6FFF"
-        android:startColor="#FF83C6" />
+        android:endColor="#FF0FA4FF"
+        android:startColor="#FF0FA4FF" />
     <corners
         android:bottomLeftRadius="90dp"
         android:bottomRightRadius="90dp"

common/src/main/res/layout/rc_conversationlist_item.xml

@@ -27,30 +27,6 @@
                 android:scaleType="centerCrop"
                 android:src="@mipmap/beauty_jingbai" />
 
-            <RelativeLayout
-                android:id="@+id/rc_conversation_unread"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentTop="true"
-                android:layout_alignParentEnd="true">
-
-                <ImageView
-                    android:id="@+id/rc_conversation_unread_bg"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_centerInParent="true"
-                    android:src="@drawable/rc_unread_count_bg_normal" />
-
-                <TextView
-                    android:id="@+id/rc_conversation_unread_count"
-                    style="@style/TextStyle.Alignment"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_centerInParent="true"
-                    android:text="15"
-                    android:textColor="@color/rc_white_color"
-                    android:textSize="@dimen/rc_font_auxiliary_size" />
-            </RelativeLayout>
         </RelativeLayout>
 
         <LinearLayout
@@ -191,6 +167,39 @@
             android:background="@color/rc_divider_color"
             app:layout_constraintStart_toStartOf="@id/rc_conversation_title_layout"
             app:layout_constraintTop_toTopOf="parent" />
+
+
+        <RelativeLayout
+            android:id="@+id/rc_conversation_unread"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentTop="true"
+            android:layout_alignParentEnd="true"
+            android:layout_marginTop="20dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            android:layout_marginEnd="5dp"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:ignore="MissingConstraints">
+
+            <ImageView
+                android:id="@+id/rc_conversation_unread_bg"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerInParent="true"
+                android:src="@drawable/rc_unread_count_bg_normal" />
+
+            <TextView
+                android:id="@+id/rc_conversation_unread_count"
+                style="@style/TextStyle.Alignment"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerInParent="true"
+                android:text="15"
+                android:textColor="@color/rc_white_color"
+                android:textSize="@dimen/rc_font_auxiliary_size" />
+        </RelativeLayout>
+
     </androidx.constraintlayout.widget.ConstraintLayout>
 
 </androidx.constraintlayout.widget.ConstraintLayout>

common/src/main/res/values-en-rUS/strings.xml

@@ -256,6 +256,7 @@
     <string name="login_auth_failure">privilege grant failed</string>
     <string name="login_auth_cancle">Authorization cancelled</string>
     <string name="live">Live</string>
+    <string name="community">Community</string>
     <string name="login_tip_4">Log in</string>
     <string name="shopmall">shopmall</string>
     <string name="recomment">Hot</string>

common/src/main/res/values-zh/strings.xml

@@ -208,6 +208,7 @@
     <string name="login_auth_failure">授權失敗</string>
     <string name="login_auth_cancle">授權取消</string>
     <string name="live">直播</string>
+    <string name="community">社區</string>
     <string name="shopmall">商城</string>
     <string name="cust_server">客服</string>
     <string name="live_anchor">主播</string>
@@ -651,7 +652,7 @@
     <string name="welcome_pdlive">歡迎來到PDLIVE</string>
     <string name="newcomer">恭喜你獲得了新人獎勵</string>
 
-    <string name="FILE_PROVIDER">com.pandora.sy.fileprovider</string>
+    <string name="FILE_PROVIDER">com.pandora.cs.fileprovider</string>
     <string name="ren">人</string>
     <string name="ge">個</string>
     <string name="count">數量</string>

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

@@ -78,4 +78,6 @@
     <color name="gray_f6f7fb">#F6F7FB</color>
 
     <color name="gray_F4F4F4">#F4F4F4</color>
+
+    <color name="gray_8A8A8A">#FFEFEFEF</color>
 </resources>

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

@@ -204,6 +204,7 @@
     <string name="login_ing">Logon</string>
     <string name="login_auth_ing">Authorizing login</string>
     <string name="live">Live</string>
+    <string name="community">Community</string>
     <string name="login_tip_4">Log in</string>
     <string name="recomment">Hot</string>
     <string name="main_type_find">Find</string>

lib_faceunity/src/main/java/io/agora/beautyapi/faceunity/agora/SWAuManager.java

@@ -422,8 +422,9 @@ public class SWAuManager extends BaseCacheManager {
 
     public void preloadChannel(List<LiveBean> uids){
         for (int i = 0; i <uids.size(); i++) {
+            L.eSw("设置秒开数据 uid"+uids.get(i).getUid()+" --- userName:"+uids.get(i).getUserNiceName());
             int code =  mRtcEngine.preloadChannel(CommonAppConfig.SWToken,getChannelName(uids.get(i).getUid()),Integer.parseInt(CommonAppConfig.getInstance().getUid()));
-            L.eSw("设置秒开数据 uid"+uids.get(i).getUid()+" --- userName:"+uids.get(i).getUserNiceName()+" code "+code);
+            //L.eSw("设置秒开数据 uid"+uids.get(i).getUid()+" --- userName:"+uids.get(i).getUserNiceName()+" code "+code);
         }
     }
 }

main/google-services.json

@@ -9,7 +9,7 @@
       "client_info": {
         "mobilesdk_app_id": "1:867032862719:android:841a73fdfb6c37453ae1ca",
         "android_client_info": {
-          "package_name": "com.pandora.sy"
+          "package_name": "com.pandora.cs"
         }
       },
       "oauth_client": [
@@ -17,7 +17,7 @@
           "client_id": "867032862719-af2dnojobjd8s6ekdr1is1vev8nk36sv.apps.googleusercontent.com",
           "client_type": 1,
           "android_info": {
-            "package_name": "com.pandora.sy",
+            "package_name": "com.pandora.cs",
             "certificate_hash": "38cc19306c9facee36a9224e9a4070bc0be15c7d"
           }
         },
@@ -25,7 +25,7 @@
           "client_id": "867032862719-ohaa1f18e186qpasvgt7qkk1i1pivniq.apps.googleusercontent.com",
           "client_type": 1,
           "android_info": {
-            "package_name": "com.pandora.sy",
+            "package_name": "com.pandora.cs",
             "certificate_hash": "b66dc8d21cfcf6c729577ddcf0c312b2a31ed872"
           }
         },
@@ -33,7 +33,7 @@
           "client_id": "867032862719-snpbqruvqcc9fsifjnmm1h3dcgtr8am4.apps.googleusercontent.com",
           "client_type": 1,
           "android_info": {
-            "package_name": "com.pandora.sy",
+            "package_name": "com.pandora.cs",
             "certificate_hash": "15fc5e70cf238323bf7111c8c627803985478e87"
           }
         },

main/src/main/java/com/yunbao/main/activity/MainActivity.java

@@ -551,7 +551,7 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
 
         //选中监听
         mTabButtonGroup.addTabButtonGroupChangeListener((view, index) -> {
-            if (index == 1) {
+            if (index == 0) {
                 isfloatBannernet = true;
                 initAnchorRecommendBanner();
             } else if (index == 2) {
@@ -875,8 +875,6 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
             //RandomPkDialogFragment fragment = new RandomPkDialogFragment();
             //fragment.show(this.getSupportFragmentManager(), "RandomPkDialogFragment");
         }
-
-
     }
 
     private void showStartDialog() {
@@ -904,7 +902,6 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
                 }
             });
         }
-
     }
 
 
@@ -1281,13 +1278,17 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
                     return;
                 }
                 if (position == 0) {
-                    mainHomeComViewHolder = new MainHomeComViewHolder(mContext, MainActivity.this, parent);
-                    vh = mainHomeComViewHolder;
-                } else if (position == 1) {
                      mainHomeViewHolder = new MainHomeViewHolder(mContext, parent);
                     vh = mainHomeViewHolder;
+                    /*mainHomeComViewHolder = new MainHomeComViewHolder(mContext, MainActivity.this, parent);
+                    vh = mainHomeComViewHolder;*/
+                } else if (position == 1) {
+                    /*mainHomeViewHolder = new MainHomeViewHolder(mContext, parent);
+                    vh = mainHomeViewHolder;*/
                   /*  mMainHomeCommunityViewHolder = new MainHomeCommunityViewHolder(mContext, parent, this);//直播
                     vh = mMainHomeCommunityViewHolder;*/
+                       mainHomeComViewHolder = new MainHomeComViewHolder(mContext, MainActivity.this, parent);
+                    vh = mainHomeComViewHolder;
                 } else if (position == 2) {
                     mainMessageViewHolder = new MainMessageViewHolder(this, parent);
                     vh = mainMessageViewHolder;

main/src/main/java/com/yunbao/main/adapter/MainHomeComClassAdapter.java

@@ -94,13 +94,10 @@ public class MainHomeComClassAdapter extends RecyclerView.Adapter<MainHomeComCla
             } else {
                 mName.setText(bean.getTalk_name());
             }
-
             if (position == choice) {
-                mName.setBackgroundResource(R.drawable.bg_main_community_type_01);
-                mName.setTextColor(Color.parseColor("#FFFFFF"));
+                mName.setTextColor(Color.parseColor("#FF0FA4FF"));
             } else {
-                mName.setBackgroundResource(R.drawable.bg_main_community_type_02);
-                mName.setTextColor(Color.parseColor("#777777"));
+                mName.setTextColor(Color.parseColor("#FF777777"));
             }
         }
     }

main/src/main/java/com/yunbao/main/adapter/MainHomeLiveAdapter.java

@@ -67,10 +67,13 @@ public class MainHomeLiveAdapter extends RefreshAdapter<LiveBean> {
 
     @Override
     public int getItemViewType(int position) {
-        if (position == 0) {
+        if (position == 4) {
             return HEAD;
-        } else if (position > 0) {
-            LiveBean mode = mList.get(position - 1);
+        } else{
+            if(position>4){
+
+            }
+            LiveBean mode = mList.get(position>4?position-1:position);
             if (TextUtils.equals(mode.getIs_week(), "1")) {
                 return WEEKLAYOUT;
             } else {
@@ -114,8 +117,9 @@ public class MainHomeLiveAdapter extends RefreshAdapter<LiveBean> {
 
     @Override
     public void onBindViewHolder(@NonNull RecyclerView.ViewHolder vh, int position) {
+        int nowPosition = position>4?position-1:position;
         if (vh instanceof MainHomeLiveWeekItemViewHolder) {
-            ((MainHomeLiveWeekItemViewHolder) vh).loadViewDate(mList.get(position - 1), position - 1, Height, new MainHomeLiveWeekItemViewHolder.OnItemClickListener() {
+            ((MainHomeLiveWeekItemViewHolder) vh).loadViewDate(mList.get(nowPosition), nowPosition, Height, new MainHomeLiveWeekItemViewHolder.OnItemClickListener() {
                 @Override
                 public void onItemClick(LiveBean bean, int position) {
                     if (mOnItemClickListener != null) {
@@ -124,7 +128,7 @@ public class MainHomeLiveAdapter extends RefreshAdapter<LiveBean> {
                 }
             });
         } else if (vh instanceof MainHomeLiveItemViewHolder) {
-            ((MainHomeLiveItemViewHolder) vh).loadViewDate(mList.get(position - 1), position - 1, Height, new MainHomeLiveItemViewHolder.OnItemClickListener() {
+            ((MainHomeLiveItemViewHolder) vh).loadViewDate(mList.get(nowPosition), nowPosition, Height, new MainHomeLiveItemViewHolder.OnItemClickListener() {
                 @Override
                 public void onItemClick(LiveBean bean, int position) {
                     if (mOnItemClickListener != null) {
@@ -137,7 +141,7 @@ public class MainHomeLiveAdapter extends RefreshAdapter<LiveBean> {
 
     @Override
     public int getItemCount() {
-        return super.getItemCount() + 1;
+        return super.getItemCount();
     }
 
     class HeadVh extends RecyclerView.ViewHolder {

main/src/main/java/com/yunbao/main/adapter/MainHomeLivesClassAdapter.java

@@ -96,11 +96,9 @@ public class MainHomeLivesClassAdapter extends RecyclerView.Adapter<MainHomeLive
             }
 
             if (position == choice) {
-                mName.setBackgroundResource(R.drawable.button_ffc621);
-                mName.setTextColor(Color.parseColor("#7d77fc"));
+                mName.setTextColor(Color.parseColor("#FF0FA4FF"));
             } else {
-                mName.setBackgroundResource(R.drawable.button_cbd5e0);
-                mName.setTextColor(Color.parseColor("#484D68"));
+                mName.setTextColor(Color.parseColor("#FF777777"));
             }
         }
     }

main/src/main/java/com/yunbao/main/adapter/MainMeBottomAdapter.java

@@ -0,0 +1,130 @@
+package com.yunbao.main.adapter;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.yunbao.common.bean.UserItemBean;
+import com.yunbao.common.glide.ImgLoader;
+import com.yunbao.common.interfaces.OnItemClickListener;
+import com.yunbao.common.views.weight.ViewClicksAntiShake;
+import com.yunbao.main.R;
+
+import java.util.List;
+
+/**
+ * Created by cxf on 2018/9/28.
+ */
+
+public class MainMeBottomAdapter extends RecyclerView.Adapter<MainMeBottomAdapter.Vh> {
+
+    private static final int NORMAL = 0;
+    private static final int GROUP_LAST = 1;
+    private static final int ALL_LAST = 2;
+
+    private Context mContext;
+    private List<UserItemBean> mList;
+    private LayoutInflater mInflater;
+    private OnItemClickListener<UserItemBean> mOnItemClickListener;
+
+    public MainMeBottomAdapter(Context context, List<UserItemBean> list) {
+        mContext = context;
+        mList = list;
+        mInflater = LayoutInflater.from(context);
+    }
+
+    public void setOnItemClickListener(OnItemClickListener<UserItemBean> onItemClickListener) {
+        mOnItemClickListener = onItemClickListener;
+    }
+
+    @Override
+    public int getItemViewType(int position) {
+        UserItemBean bean = mList.get(position);
+        if (bean.isGroupLast()) {
+            return GROUP_LAST;
+        } else if (bean.isAllLast()) {
+            return ALL_LAST;
+        } else {
+            return NORMAL;
+        }
+    }
+
+
+    public void setList(List<UserItemBean> list) {
+        if (list == null) {
+            return;
+        }
+        boolean changed = false;
+        if (mList.size() != list.size()) {
+            changed = true;
+        } else {
+            for (int i = 0, size = mList.size(); i < size; i++) {
+                if (!mList.get(i).equals(list.get(i))) {
+                    changed = true;
+                    break;
+                }
+            }
+        }
+        if (changed) {
+            mList = list;
+            notifyDataSetChanged();
+        }
+    }
+
+    @NonNull
+    @Override
+    public Vh onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        int res = 0;
+//        if (viewType == GROUP_LAST) {
+//            res = R.layout.item_main_me_1;//竖向单列表
+//        } else if (viewType == ALL_LAST) {
+        res = R.layout.item_main_me_3;//横向4列
+//        } else {
+//            res = R.layout.item_main_me_0;
+//        }
+        return new Vh(mInflater.inflate(res, parent, false));
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull Vh vh, int position) {
+        vh.setData(mList.get(position));
+    }
+
+    @Override
+    public int getItemCount() {
+        return mList.size();
+    }
+
+    class Vh extends RecyclerView.ViewHolder {
+
+        ImageView mThumb;
+        TextView mName;
+
+        public Vh(View itemView) {
+            super(itemView);
+            mThumb = (ImageView) itemView.findViewById(R.id.thumb);
+            mName = (TextView) itemView.findViewById(R.id.name);
+            ViewClicksAntiShake.clicksAntiShake(itemView, () -> {
+                Object tag = itemView.getTag();
+                if (tag != null) {
+                    UserItemBean bean = (UserItemBean) tag;
+                    if (mOnItemClickListener != null) {
+                        mOnItemClickListener.onItemClick(bean, 0);
+                    }
+                }
+            });
+        }
+
+        void setData(UserItemBean bean) {
+            itemView.setTag(bean);
+            ImgLoader.display(mContext, bean.getThumb(), mThumb);
+            mName.setText(bean.getName());
+        }
+    }
+}

main/src/main/java/com/yunbao/main/http/MainHttpUtil.java

@@ -255,6 +255,7 @@ public class MainHttpUtil {
      */
     public static void getBaseInfo(String uid, String token, final CommonCallback<UserBean> commonCallback) {
         HttpClient.getInstance().get("User.getBaseInfos", MainHttpConsts.GET_BASE_INFO)
+                .params("is_pdl", "1")
                 .execute(new HttpCallback() {
                     @Override
                     public void onSuccess(int code, String msg, String[] info) {
@@ -265,7 +266,7 @@ public class MainHttpUtil {
                             bean.setMedalName(obj.getString("medal_name"));
                             bean.setMedalLevel(obj.getIntValue("medal_level"));
                             CommonAppConfig.getInstance().setUserBean(bean);
-                            CommonAppConfig.getInstance().setUserItemList(obj.getString("list"));
+                            CommonAppConfig.getInstance().setUserItemList(obj.getString("pdl_list"));
                             SpUtil.getInstance().setStringValue(SpUtil.USER_INFO, info[0]);
                             if (commonCallback != null) {
                                 commonCallback.callback(bean);
@@ -352,6 +353,7 @@ public class MainHttpUtil {
                 .params("p", p)
                 .execute(callback);
     }
+
     /**
      * 搜索
      */
@@ -702,7 +704,6 @@ public class MainHttpUtil {
     }
 
 
-
     /**
      * 是否是主播
      */
@@ -742,6 +743,7 @@ public class MainHttpUtil {
         HttpClient.getInstance().get("User.isInstructor", MainHttpConsts.ISINSTRUCTOR)
                 .execute(callback);
     }
+
     //
     public static void setMessageReadAll() {
         HttpClient.getInstance().get("User.getUserInstructor", "")
@@ -752,6 +754,7 @@ public class MainHttpUtil {
                     }
                 });
     }
+
     /**
      * 获取设备号有没有注册过
      */

main/src/main/java/com/yunbao/main/views/AbsMainHomeParentViewHolder.java

@@ -44,7 +44,7 @@ public abstract class AbsMainHomeParentViewHolder extends AbsMainViewHolder {
 
     private AppBarLayout mAppBarLayout;
     protected ViewPager mViewPager;
-    private MagicIndicator mIndicator;
+    public MagicIndicator mIndicator;
     private TextView mRedPoint;//显示未读消息数量的红点
     protected AbsMainHomeChildViewHolder[] mViewHolders;
     private MainAppBarLayoutListener mAppBarLayoutListener;
@@ -138,8 +138,8 @@ public abstract class AbsMainHomeParentViewHolder extends AbsMainViewHolder {
             @Override
             public IPagerTitleView getTitleView(Context context, final int index) {
                 SimplePagerTitleView simplePagerTitleView = new ColorTransitionPagerTitleView(context);
-                simplePagerTitleView.setNormalColor(Color.parseColor("#B1B1B1"));
-                simplePagerTitleView.setSelectedColor(Color.parseColor("#7d77fc"));
+                simplePagerTitleView.setNormalColor(Color.parseColor("#FF777777"));
+                simplePagerTitleView.setSelectedColor(Color.parseColor("#FF333333"));
                 simplePagerTitleView.setText(titles[index]);
                 simplePagerTitleView.setTextSize(18);
                 simplePagerTitleView.getPaint().setFakeBoldText(true);
@@ -160,7 +160,7 @@ public abstract class AbsMainHomeParentViewHolder extends AbsMainViewHolder {
                 linePagerIndicator.setMode(LinePagerIndicator.MODE_WRAP_CONTENT);
                 linePagerIndicator.setXOffset(DpUtil.dp2px(5));
                 linePagerIndicator.setRoundRadius(DpUtil.dp2px(2));
-                linePagerIndicator.setColors(Color.parseColor("#7d77fc"));
+                linePagerIndicator.setColors(Color.parseColor("#FF0FA4FF"));
                 return linePagerIndicator;
             }
         });

main/src/main/java/com/yunbao/main/views/MainHomeComViewHolder.java

@@ -30,7 +30,7 @@ import org.greenrobot.eventbus.EventBus;
  * MainActivity 首页-社区
  */
 
-public class MainHomeComViewHolder extends AbsMainHomeParentComViewHolder {
+public class MainHomeComViewHolder extends AbsMainHomeParentViewHolder {
     private MainHomeFollComViewHolder mainHomeFollLiveViewHolder;
     private MainHomeNewViewHolder mainHomeLiveViewHolder;
     private MainHomeRecomComViewHolder mainHomeRecomComViewHolder;
@@ -115,11 +115,11 @@ public class MainHomeComViewHolder extends AbsMainHomeParentComViewHolder {
             RouteUtil.forwardCommunityActivity();
             mIndicator.onPageSelected(selected);
             setCurPosition(selected);
-            refreshIndex(selected);
+            //refreshIndex(selected);
             return;
         }
         selected = position;
-        refreshIndex(position);
+        //refreshIndex(position);
         switch (position) {
             case 0:
                 floatWarOrder = false;

main/src/main/java/com/yunbao/main/views/MainHomeLiveViewHolder.java

@@ -163,7 +163,7 @@ public class MainHomeLiveViewHolder extends AbsMainHomeChildViewHolder implement
         gridLayoutManager.setSpanSizeLookup(new GridLayoutManager.SpanSizeLookup() {
             @Override
             public int getSpanSize(int position) {
-                if (position == 0) {
+                if (position == 4) {
                     return 2;
                 }
                 return 1;

main/src/main/java/com/yunbao/main/views/MainHomeViewHolder.java

@@ -1,6 +1,11 @@
 package com.yunbao.main.views;
 
+import static com.yunbao.common.manager.imrongcloud.RongcloudIMManager.connectIM;
+
+import android.Manifest;
+import android.app.Dialog;
 import android.content.Context;
+import android.os.Build;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
@@ -8,18 +13,42 @@ import android.widget.HorizontalScrollView;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import androidx.fragment.app.FragmentActivity;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.lxj.xpopup.XPopup;
+import com.yunbao.common.CommonAppConfig;
+import com.yunbao.common.Constants;
 import com.yunbao.common.dialog.MessageSayHiNotifyDialog;
+import com.yunbao.common.http.HttpCallback;
+import com.yunbao.common.http.LiveHttpUtil;
+import com.yunbao.common.manager.IMLoginManager;
+import com.yunbao.common.utils.AppManager;
+import com.yunbao.common.utils.DialogUitl;
 import com.yunbao.common.utils.MobclickAgent;
 import com.yunbao.common.activity.AbsActivity;
 import com.yunbao.common.event.FloatWarOrderEvent;
 import com.yunbao.common.glide.ImgLoader;
 import com.yunbao.common.utils.MessageSayHiNotifyManager;
+import com.yunbao.common.utils.PluginManager;
+import com.yunbao.common.utils.ProcessResultUtil;
 import com.yunbao.common.utils.RouteUtil;
+import com.yunbao.common.utils.ToastUtil;
+import com.yunbao.common.utils.WordUtil;
+import com.yunbao.live.LiveConfig;
+import com.yunbao.live.activity.LiveAnchorActivity;
+import com.yunbao.live.activity.LiveRyAnchorActivity;
+import com.yunbao.live.activity.LiveSwAnchorActivity;
+import com.yunbao.live.bean.LiveKsyConfigBean;
 import com.yunbao.main.R;
+import com.yunbao.main.activity.MainActivity;
+import com.yunbao.main.dialog.MainStartDialogFragment;
 
 import org.greenrobot.eventbus.EventBus;
 
+import io.rong.imlib.RongIMClient;
+
 /**
  * Created by cxf on 2018/9/22.
  * MainActivity 首页  删除
@@ -52,6 +81,8 @@ public class MainHomeViewHolder extends AbsMainHomeParentViewHolder {
     public void init() {
         super.init();
 
+        mProcessResultUtil = new ProcessResultUtil((FragmentActivity) mContext);
+
         img_trophy = (ImageView) findViewById(R.id.img_trophy);
 
         ImgLoader.display(mContext, "https://downs.yaoulive.com/gif_trophy.gif", img_trophy);
@@ -69,7 +100,101 @@ public class MainHomeViewHolder extends AbsMainHomeParentViewHolder {
                 RouteUtil.forwardCommunityActivity();
             }
         });
+        findViewById(R.id.btn_live).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                boolean isAnchor = IMLoginManager.get(mContext).getUserInfo().anchorUserType();
+                if (isAnchor) {
+                    String[] permissions;
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+                        permissions = new String[]{
+                                //Manifest.permission.READ_MEDIA_IMAGES, 去掉选择图片的权限，到里面选择封面的时候再去申请
+                                Manifest.permission.CAMERA,
+                                Manifest.permission.RECORD_AUDIO
+                        };
+                    } else {
+                        permissions = new String[]{
+                                Manifest.permission.READ_EXTERNAL_STORAGE,
+                                Manifest.permission.WRITE_EXTERNAL_STORAGE,
+                                Manifest.permission.CAMERA,
+                                Manifest.permission.RECORD_AUDIO
+                        };
                     }
+                    mProcessResultUtil.requestPermissions(permissions, mStartLiveRunnable);
+                } else {
+                    ToastUtil.show(mContext.getString(R.string.only_open_anchor));
+                }
+            }
+        });
+    }
+
+    private Runnable mStartLiveRunnable = new Runnable() {
+        @Override
+        public void run() {
+            if (CommonAppConfig.LIVE_SDK_CHANGED) {
+                if (mGetLiveSdkCallback == null) {
+                    mGetLiveSdkCallback = new HttpCallback() {
+                        @Override
+                        public void onSuccess(int code, String msg, final String[] info) {
+                            if (code == 0 && info.length > 0) {
+                                LiveHttpUtil.getisRong(new HttpCallback() {
+                                    @Override
+                                    public void onSuccess(int code, String msg, String[] info1) {
+                                        try {
+                                            LiveHttpUtil.getIsSw(new HttpCallback() {
+                                                @Override
+                                                public void onSuccess(int code, String msg, String[] infos) {
+                                                    JSONObject obj = JSON.parseObject(info[0]);
+                                                    JSONObject obj1 = JSON.parseObject(info1[0]);
+                                                    try {
+                                                        if(code==201){ //声网
+                                                            LiveSwAnchorActivity.forward(mContext, Constants.LIVE_SDK_SW, JSON.parseObject(obj.getString("android"), LiveKsyConfigBean.class));
+                                                        }else if(code==200){//融云
+                                                            LiveRyAnchorActivity.forward(mContext, obj.getIntValue("live_sdk"), JSON.parseObject(obj.getString("android"), LiveKsyConfigBean.class));
+                                                        }
+                                                    } catch (Exception e) {
+
+                                                    }
+                                                }
+                                            });
+                                        } catch (Exception e) {
+
+                                        }
+                                    }
+                                });
+                            }
+                        }
+                    };
+                }
+                if (!CommonAppConfig.IS_PLUGIN_MODEL || PluginManager.getInstance().isDownloadApk()) {
+                    PluginManager.getInstance().loadAnchorPlugin(it -> {
+                        LiveHttpUtil.getLiveSdk(mGetLiveSdkCallback);
+                    });
+                } else {
+                    String tips = "需要下載開播插件，是否下載";
+                    if (!WordUtil.isNewZh()) {
+                        tips = "You need to download the plug-in, whether to download";
+                    }
+                    DialogUitl.showSimpleDialog(mContext, tips, new DialogUitl.SimpleCallback() {
+                        @Override
+                        public void onConfirmClick(Dialog dialog, String content) {
+                            Dialog downloadDialog = DialogUitl.loadingDialog(mContext, "Downloading...");
+                            downloadDialog.show();
+                            PluginManager.getInstance().loadAnchorPlugin(it -> {
+                                LiveHttpUtil.getLiveSdk(mGetLiveSdkCallback);
+                                downloadDialog.dismiss();
+                            });
+                        }
+                    });
+                }
+            } else {
+                LiveAnchorActivity.forward(mContext, CommonAppConfig.LIVE_SDK_USED, LiveConfig.getDefaultKsyConfig());
+            }
+        }
+    };
+
+    private HttpCallback mGetLiveSdkCallback;
+    private ProcessResultUtil mProcessResultUtil;
 
     public void setCurPosition(int position) {
         mViewPager.setCurrentItem(position);

main/src/main/java/com/yunbao/main/views/MainMeViewHolder.java

@@ -18,6 +18,7 @@ import android.widget.TextView;
 import android.widget.Toast;
 
 import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.alibaba.fastjson.JSON;
@@ -51,6 +52,7 @@ import com.yunbao.common.utils.StringUtil;
 import com.yunbao.common.utils.ToastUtil;
 import com.yunbao.common.utils.WordUtil;
 import com.yunbao.common.views.AbsMainViewHolder;
+import com.yunbao.common.views.DividerItemDecoration;
 import com.yunbao.common.views.weight.ViewClicksAntiShake;
 import com.yunbao.live.activity.LiveRecordActivity;
 import com.yunbao.live.activity.RoomManageActivity;
@@ -70,6 +72,7 @@ import com.yunbao.main.activity.SettingActivity;
 import com.yunbao.main.activity.ThreeDistributActivity;
 import com.yunbao.main.activity.ZhuangBanActivity;
 import com.yunbao.main.adapter.MainMeAdapter;
+import com.yunbao.main.adapter.MainMeBottomAdapter;
 import com.yunbao.main.http.MainHttpConsts;
 import com.yunbao.main.http.MainHttpUtil;
 
@@ -101,7 +104,9 @@ public class MainMeViewHolder extends AbsMainViewHolder implements OnItemClickLi
     private TextView mFans;
     private boolean mPaused;
     private RecyclerView mRecyclerView;
+    private RecyclerView bottomRecyclerView;
     private MainMeAdapter mAdapter;
+    private MainMeBottomAdapter mainMeBottomAdapter;
     private TextView signature;
     private TextView coin, gold, star_coin;//金豆,钻石,星币
     private TextView btnCopy;
@@ -193,6 +198,7 @@ public class MainMeViewHolder extends AbsMainViewHolder implements OnItemClickLi
         mRecyclerView = (RecyclerView) findViewById(R.id.recyclerView);
         mRecyclerView.setHasFixedSize(true);
         mRecyclerView.setLayoutManager(new GridLayoutManager(mContext, 4, GridLayoutManager.VERTICAL, false));
+
         banner_me.setOutlineProvider(new ViewOutlineProvider() {
             @Override
             public void getOutline(View view, Outline outline) {
@@ -206,6 +212,11 @@ public class MainMeViewHolder extends AbsMainViewHolder implements OnItemClickLi
                 mContext.startActivity(new Intent(mContext, EditProfileActivity.class));
             }
         });
+
+        bottomRecyclerView = findViewById(R.id.bottomRecyclerView);
+        bottomRecyclerView.setLayoutManager(new LinearLayoutManager(mContext, LinearLayoutManager.VERTICAL, false));
+        bottomRecyclerView.addItemDecoration(new DividerItemDecoration(mContext,1,mContext.getColor(R.color.gray_8A8A8A)));
+
     }
 
     @Override
@@ -289,15 +300,16 @@ public class MainMeViewHolder extends AbsMainViewHolder implements OnItemClickLi
         @Override
         public void callback(UserBean bean) {
             List<UserItemBean> list = CommonAppConfig.getInstance().getUserItemList();
+            List<UserItemBean> newList = CommonAppConfig.getInstance().getUserItemNewList();
             if (bean != null) {
-                showData(bean, list);
+                showData(bean, list,newList);
             }
         }
     };
 
     private List<SlideBean> mBannerListNew = new ArrayList<>();
 
-    private void showData(UserBean u, List<UserItemBean> list) {
+    private void showData(UserBean u, List<UserItemBean> list,List<UserItemBean> newList) {
         mBannerList.clear();
         mBannerListNew.clear();
         if (!StringUtil.isEmpty(u.getSlide())) {
@@ -364,7 +376,7 @@ public class MainMeViewHolder extends AbsMainViewHolder implements OnItemClickLi
             good_nub_ico.setImageResource(R.mipmap.usercard_good_nub);
 
 
-            ImgLoader.display(mContext, R.mipmap.icon_zhubolv, img_lv_pic);
+            //ImgLoader.display(mContext, R.mipmap.icon_zhubolv, img_lv_pic);
             //主播等级
             tv_level.setOnClickListener(new View.OnClickListener() {
                 @Override
@@ -427,6 +439,14 @@ public class MainMeViewHolder extends AbsMainViewHolder implements OnItemClickLi
             } else {
                 mAdapter.setList(listNow);
             }
+
+            if (mainMeBottomAdapter == null) {
+                mainMeBottomAdapter = new MainMeBottomAdapter(mContext, newList);
+                mainMeBottomAdapter.setOnItemClickListener(this);
+                bottomRecyclerView.setAdapter(mainMeBottomAdapter);
+            } else {
+                mainMeBottomAdapter.setList(newList);
+            }
         }
         if (beanKefu != null) {
         }
@@ -437,11 +457,11 @@ public class MainMeViewHolder extends AbsMainViewHolder implements OnItemClickLi
         Constants.myUid = u.getGoodnum();
         Constants.myAvatar = u.getAvatar();
         if (u.getUserInfoComplete() == 1) {
-            findViewById(R.id.complete_information_radius).setVisibility(View.INVISIBLE);
-            findViewById(R.id.complete_information).setVisibility(View.INVISIBLE);
+            //findViewById(R.id.complete_information_radius).setVisibility(View.INVISIBLE);
+            //findViewById(R.id.complete_information).setVisibility(View.INVISIBLE);
         } else {
-            findViewById(R.id.complete_information_radius).setVisibility(View.VISIBLE);
-            findViewById(R.id.complete_information).setVisibility(View.VISIBLE);
+            //findViewById(R.id.complete_information_radius).setVisibility(View.VISIBLE);
+            //findViewById(R.id.complete_information).setVisibility(View.VISIBLE);
         }
         EventBus.getDefault().post(new CompleteInformationEvent().setCompleteInformation(findViewById(R.id.complete_information).getVisibility() == View.VISIBLE));
     }
@@ -472,6 +492,20 @@ public class MainMeViewHolder extends AbsMainViewHolder implements OnItemClickLi
                 case 17:
                     RouteUtil.forwardActivity(RouteUtil.PATH_FEEDBACK_ACTIVITY);
                     break;
+                case 66:
+                    MobclickAgent.onEvent(mContext, "my_noble", "个人中心点贵族");
+                    Constants.isTitle = true;
+                    UserBean u = CommonAppConfig.getInstance().getUserBean();
+                    String url1 = CommonAppConfig.HOST + "/h5/Noble/index.html?nickname=" + u.getUserNiceName() + "&usernobId=" + u.getNoble_id() + "&token=" + CommonAppConfig.getInstance().getToken() + "&uid=" + CommonAppConfig.getInstance().getUid() + "&isZh=" + (WordUtil.isNewZh() ? "1" : "0");
+                    ZhuangBanActivity.forward(mContext, url1, false);
+                    break;
+                case 67:
+                    MobclickAgent.onEvent(mContext, "my_guard_btn", "我的-守护点击次数及人数");
+                    Constants.isTitle = true;
+                    String url2 = CommonAppConfig.HOST + "/h5/Guard/index.html?token=" + CommonAppConfig.getInstance().getToken()
+                            + "&uid=" + CommonAppConfig.getInstance().getUid() + "&isZh=" + (WordUtil.isNewZh() ? "1" : "0");
+                    ZhuangBanActivity.forward(mContext, url2, false);
+                    break;
             }
         } else {
             //21 在线客服
@@ -638,7 +672,7 @@ public class MainMeViewHolder extends AbsMainViewHolder implements OnItemClickLi
             lt_advertisement.setVisibility(View.GONE);
             return;
         }
-        lt_advertisement.setVisibility(View.VISIBLE);
+        /*lt_advertisement.setVisibility(View.VISIBLE);
         if (mBannerList.size() == 1) {
             banner_me.setAutoPlay(false)
                     .setPages(mBannerList, new CustomMyViewHolder())
@@ -685,18 +719,18 @@ public class MainMeViewHolder extends AbsMainViewHolder implements OnItemClickLi
                                         map_ekv.put("link", url);
                                         MobclickAgent.onEvent(mContext, "my_banner", map_ekv);
 
-                                        /*if(bean.getSlide_id().equals("95")){
+                                        *//*if(bean.getSlide_id().equals("95")){
                                             RouteUtil.forwardCustomerService(url);
                                         }else {
                                             ZhuangBanActivity.forward(mContext, url, false);
-                                        }*/
+                                        }*//*
                                     }
                                 }
                             }
                         }
                     })
                     .start();
-        }
+        }*/
     }
 
 }

main/src/main/java/com/yunbao/main/views/MainMeViewHolder1.java

@@ -1,502 +0,0 @@
-package com.yunbao.main.views;
-
-import android.content.ClipboardManager;
-import android.content.Context;
-import android.content.Intent;
-import android.graphics.drawable.Drawable;
-import android.text.TextUtils;
-import android.util.Log;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ImageView;
-import android.widget.RelativeLayout;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import androidx.recyclerview.widget.GridLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-
-import com.opensource.svgaplayer.SVGADrawable;
-import com.opensource.svgaplayer.SVGAImageView;
-import com.opensource.svgaplayer.SVGAParser;
-import com.opensource.svgaplayer.SVGAVideoEntity;
-import com.yunbao.common.CommonAppConfig;
-import com.yunbao.common.Constants;
-import com.yunbao.common.activity.WebViewActivity;
-import com.yunbao.common.bean.GoogleBean;
-import com.yunbao.common.bean.NewLevelModel;
-import com.yunbao.common.bean.UserBean;
-import com.yunbao.common.bean.UserItemBean;
-import com.yunbao.common.glide.ImgLoader;
-import com.yunbao.common.interfaces.CommonCallback;
-import com.yunbao.common.interfaces.OnItemClickListener;
-import com.yunbao.common.manager.NewLevelManager;
-import com.yunbao.common.utils.RouteUtil;
-import com.yunbao.common.utils.SVGAViewUtils;
-import com.yunbao.common.utils.WordUtil;
-import com.yunbao.common.views.AbsMainViewHolder;
-import com.yunbao.live.activity.LiveRecordActivity;
-import com.yunbao.live.activity.RoomManageActivity;
-import com.yunbao.live.activity.WebViewActivityMedal;
-import com.yunbao.live.utils.LiveTextRender;
-import com.yunbao.main.R;
-import com.yunbao.main.activity.EditProfileActivity;
-import com.yunbao.main.activity.FansActivity;
-import com.yunbao.main.activity.FollowActivity;
-import com.yunbao.main.activity.MyProfitActivity;
-import com.yunbao.main.activity.MyVideoActivity;
-import com.yunbao.main.activity.MyWalletActivity;
-import com.yunbao.main.activity.RewardActivity;
-import com.yunbao.main.activity.SettingActivity;
-import com.yunbao.main.activity.ThreeDistributActivity;
-import com.yunbao.main.activity.ZhuangBanActivity;
-import com.yunbao.main.adapter.MainMeAdapter;
-import com.yunbao.main.http.MainHttpConsts;
-import com.yunbao.main.http.MainHttpUtil;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Created by cxf on 2018/9/22.
- * 我的
- */
-
-public class MainMeViewHolder1 extends AbsMainViewHolder implements OnItemClickListener<UserItemBean>, View.OnClickListener {
-
-    private ImageView mAvatar, mSex, mLevelAnchor, mLevel;
-
-    private TextView mName, tv_level, mID;
-    private ImageView img_kefu, img_setting;
-    private RelativeLayout rt_kefu, rt_setting;
-    private boolean mPaused;
-    private RecyclerView mRecyclerView;
-    private MainMeAdapter mAdapter;
-    private TextView signature;
-    private TextView coin, gold;//金豆,钻石
-    private TextView btnCopy;
-    private SVGAImageView gift_svga;
-    private View v_noble;
-    //    private LinearLayout btnUserNoble;
-    private ImageView user_noble_ico, good_nub_ico;
-    private TextView user_noble_text, leave;
-    private UserItemBean beanStetting = null, beanKefu = null;
-    private boolean firstInto = true;
-
-    public MainMeViewHolder1(Context context, ViewGroup parentView) {
-        super(context, parentView);
-    }
-
-    @Override
-    protected int getLayoutId() {
-        return R.layout.view_main_me1;
-    }
-
-    @Override
-    public void init() {
-        mAvatar = (ImageView) findViewById(R.id.avatar);
-        mAvatar.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                RouteUtil.forwardUserHome(mContext, CommonAppConfig.getInstance().getUid(), 0);
-            }
-        });
-
-        mName = (TextView) findViewById(R.id.name);
-        gift_svga = (SVGAImageView) findViewById(com.yunbao.live.R.id.gift_svga);
-        gift_svga.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                RouteUtil.forwardUserHome(mContext, CommonAppConfig.getInstance().getUid(), 0);
-            }
-        });
-
-        user_noble_ico = (ImageView) findViewById(R.id.user_noble_ico);
-//        mSex = (ImageView) findViewById(R.id.sex);
-        mLevelAnchor = (ImageView) findViewById(R.id.level_anchor);
-        mLevel = (ImageView) findViewById(R.id.level);
-        tv_level = (TextView) findViewById(R.id.tv_level);
-        good_nub_ico = (ImageView) findViewById(R.id.good_nub_ico);
-        mID = (TextView) findViewById(R.id.id_val);
-//        mFollow = (TextView) findViewById(R.id.btn_follow);
-//        mFans = (TextView) findViewById(R.id.btn_fans);
-        signature = (TextView) findViewById(R.id.signature);
-        coin = (TextView) findViewById(R.id.coin);
-        gold = (TextView) findViewById(R.id.gold);
-        btnCopy = (TextView) findViewById(R.id.btn_copy);
-//        btnUserNoble = (LinearLayout) findViewById(R.id.btn_user_noble);
-        user_noble_text = (TextView) findViewById(R.id.user_noble_text);
-        leave = (TextView) findViewById(R.id.leave);
-
-        img_kefu = (ImageView) findViewById(R.id.img_kefu);
-        img_setting = (ImageView) findViewById(R.id.img_setting);
-        rt_kefu = (RelativeLayout) findViewById(R.id.rt_kefu);
-        rt_setting = (RelativeLayout) findViewById(R.id.rt_setting);
-
-        v_noble = (View) findViewById(R.id.v_noble);
-
-//        mFollow.setOnClickListener(this);
-//        mFans.setOnClickListener(this);
-        findViewById(R.id.btn_edit).setOnClickListener(this);
-//        findViewById(R.id.btn_msg).setOnClickListener(this);
-        findViewById(R.id.btn_wallet).setOnClickListener(this);
-        findViewById(R.id.btn_coin).setOnClickListener(this);
-        findViewById(R.id.btn_gold).setOnClickListener(this);
-
-        findViewById(R.id.rt_kefu).setOnClickListener(this);
-        findViewById(R.id.rt_setting).setOnClickListener(this);
-        findViewById(R.id.v_noble).setOnClickListener(this);
-
-        //主播等级
-        mLevelAnchor.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                String url = CommonAppConfig.HOST + "/index.php?g=Appapi&m=Level&a=index" + "&token=" + CommonAppConfig.getInstance().getToken() + "&uid=" + CommonAppConfig.getInstance().getUid() + "&isZh=" + (WordUtil.isNewZh() ? "1" : "0") + "&for";
-                WebViewActivity.forward(mContext, url, false);
-            }
-        });
-        //用户等级
-        mLevel.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                String url = CommonAppConfig.HOST + "/index.php?g=Appapi&m=Level&a=index" + "&token=" + CommonAppConfig.getInstance().getToken() + "&uid=" + CommonAppConfig.getInstance().getUid() + "&isZh=" + (WordUtil.isNewZh() ? "1" : "0");
-                WebViewActivity.forward(mContext, url, false);
-            }
-        });
-
-//        btnUserNoble.setOnClickListener(new View.OnClickListener() {
-//            @Override
-//            public void onClick(View v) {
-//                UserBean u = CommonAppConfig.getInstance().getUserBean();
-//                String url = CommonAppConfig.HOST + "/h5/Noble/index.html?nickname=" + u.getUserNiceName() + "&usernobId=" + u.getNoble_id() + "&token=" + CommonAppConfig.getInstance().getToken() + "&uid=" + CommonAppConfig.getInstance().getUid();
-//                ZhuangBanActivity.forward(mContext, url, false);
-//            }
-//        });
-
-        btnCopy.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                ClipboardManager cm = (ClipboardManager) mContext.getSystemService(Context.CLIPBOARD_SERVICE);
-                cm.setText(mID.getText() + "");
-                Toast.makeText(mContext, "複製成功", Toast.LENGTH_SHORT).show();
-            }
-        });
-//        findViewById(R.id.btn_detail).setOnClickListener(this);
-//        findViewById(R.id.btn_shop).setOnClickListener(this);
-        mRecyclerView = (RecyclerView) findViewById(R.id.recyclerView);
-        mRecyclerView.setHasFixedSize(true);
-//        mRecyclerView.setLayoutManager(new LinearLayoutManager(mContext, LinearLayoutManager.VERTICAL, false));
-        mRecyclerView.setLayoutManager(new GridLayoutManager(mContext, 4, GridLayoutManager.VERTICAL, false));
-//        EventBus.getDefault().register(this);
-    }
-
-    @Override
-    public void onPause() {
-        super.onPause();
-        mPaused = true;
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        if (isShowed() && mPaused) {
-            loadData();
-        }
-        mPaused = false;
-//        EventBus.getDefault().unregister(this);
-    }
-
-    @Override
-    public void onDestroy() {
-        super.onDestroy();
-        MainHttpUtil.cancel(MainHttpConsts.GET_BASE_INFO);
-    }
-
-    @Override
-    public void loadData() {
-        if (isFirstLoadData()) {
-            CommonAppConfig appConfig = CommonAppConfig.getInstance();
-            UserBean u = appConfig.getUserBean();
-            List<UserItemBean> list = appConfig.getUserItemList();
-            if (u != null && list != null) {
-                showData(u, list);
-            }
-        }
-
-        MainHttpUtil.getGoogle(mCallback1);
-        MainHttpUtil.getBaseInfo(mCallback);
-
-    }
-
-
-    //获取谷歌
-    //谷歌支付是否打开 1是打开 0 关闭
-    String Is_hide = "1";
-    private CommonCallback<GoogleBean> mCallback1 = new CommonCallback<GoogleBean>() {
-        @Override
-        public void callback(GoogleBean bean) {
-            if (bean != null) {
-                Is_hide = bean.getIs_hide();
-            }
-        }
-    };
-
-    private CommonCallback<UserBean> mCallback = new CommonCallback<UserBean>() {
-        @Override
-        public void callback(UserBean bean) {
-            List<UserItemBean> list = CommonAppConfig.getInstance().getUserItemList();
-            if (bean != null) {
-                showData(bean, list);
-            }
-        }
-    };
-
-    private void showData(UserBean u, List<UserItemBean> list) {
-        ImgLoader.displayAvatar(mContext, u.getAvatar(), mAvatar);
-//        mTtileView.setText(u.getUserNiceName());
-        mName.setText(u.getUserNiceName());
-        user_noble_text.setText(u.getNoble_name());
-//        mSex.setImageResource(CommonIconUtil.getSexIcon(u.getSex()));
-        coin.setText(u.getYuanbao());
-        gold.setText(u.getCoin());
-        signature.setText(u.getSignature());
-        CommonAppConfig appConfig = CommonAppConfig.getInstance();
-
-
-        if (u.getDress().getAvatar_frame() != null) {
-            if (u.getDress().getAvatar_frame().contains("svga")) {
-                try {
-                    new SVGAParser(mContext).parse(new URL(u.getDress().getAvatar_frame()), new SVGAParser.ParseCompletion() {
-                        @Override
-                        public void onComplete(SVGAVideoEntity videoItem) {
-                            SVGADrawable drawable = new SVGADrawable(videoItem);
-                            gift_svga.setImageDrawable(drawable);
-                            SVGAViewUtils.playEndClear(gift_svga);
-                        }
-
-                        @Override
-                        public void onError() {
-                        }
-                    });
-                } catch (MalformedURLException e) {
-                    e.printStackTrace();
-                }
-            } else {
-                ImgLoader.display(mContext, u.getDress().getAvatar_frame(), gift_svga);
-            }
-        }
-
-        if (u.getDress().getMedal() != null) {
-            Log.e("tag", u.getDress().getMedal());
-            ImgLoader.display(mContext, u.getDress().getMedal(), user_noble_ico);
-        } else {
-            user_noble_ico.setImageResource(R.mipmap.df_nobe);
-        }
-
-        List<NewLevelModel> models = new NewLevelManager(mContext).getNewAnchorLevelModels();
-        int anchorLevel = 0;
-
-
-        anchorLevel = u.getLevelAnchor();
-        String imgUrl = "";
-        for (NewLevelModel newLevelModel : models) {
-            if (newLevelModel.getLeveMin() <= anchorLevel && anchorLevel <= newLevelModel.getLeveMax()) {
-                imgUrl = newLevelModel.getThumb();
-            }
-        }
-        leave.setText(String.valueOf(u.getLevelAnchor()));
-        ImgLoader.display(mContext, imgUrl, mLevelAnchor);
-        new LiveTextRender().getLevelImage(mContext, u.getLevel(), new ImgLoader.DrawableCallback() {
-            @Override
-            public void onLoadSuccess(Drawable drawable) {
-                ImgLoader.display2(mContext, drawable, mLevel);
-            }
-
-            @Override
-            public void onLoadFailed() {
-
-            }
-        });
-        //修改靓号图标 个人中心
-        if (u.getGoodnum() != null && !u.getGoodnum().equals("")) {
-            good_nub_ico.setVisibility(View.VISIBLE);
-            mID.setText(" " + u.getGoodnum());
-        } else {
-            good_nub_ico.setVisibility(View.GONE);
-            mID.setText(u.getLiangNameTip());
-        }
-//        mFollow.setText("" + u.getFollows());
-//        mFans.setText("" + u.getFans());
-        if (list != null && list.size() > 0) {
-            List<UserItemBean> listNow = new ArrayList<>();
-            for (UserItemBean userItemBean : list) {
-                if (userItemBean.getId() != 21 && userItemBean.getId() != 13) {
-                    listNow.add(userItemBean);
-                } else if (userItemBean.getId() == 21) {
-                    beanKefu = userItemBean;
-                } else if (userItemBean.getId() == 13) {
-                    beanStetting = userItemBean;
-                }
-            }
-            if (mAdapter == null) {
-                mAdapter = new MainMeAdapter(mContext, listNow);
-                mAdapter.setOnItemClickListener(this);
-                mRecyclerView.setAdapter(mAdapter);
-            } else {
-                mAdapter.setList(listNow);
-            }
-        }
-        if (beanKefu != null) {
-            ImgLoader.display(mContext, beanKefu.getThumb(), img_kefu);
-        }
-        if (beanStetting != null) {
-            ImgLoader.display(mContext, beanStetting.getThumb(), img_setting);
-        }
-        Constants.myUid = u.getGoodnum();
-        Constants.myAvatar = u.getAvatar();
-    }
-
-    @Override
-    public void onItemClick(UserItemBean bean, int position) {
-        String url = bean.getHref();
-        if (TextUtils.isEmpty(url)) {
-            switch (bean.getId()) {
-                case 1:
-                    forwardProfit();
-                    break;
-                case 2:
-                    forwardCoin();
-                    break;
-                case 13:
-//                    forwardSetting();
-                    break;
-                case 19:
-                    forwardMyVideo();
-                    break;
-                case 20:
-                    forwardRoomManage();
-                    break;
-            }
-        } else {
-            //21 在线客服
-            Log.i("tag", bean.getId() + "");
-            if (bean.getId() == 8) {//三级分销
-                ThreeDistributActivity.forward(mContext, bean.getName(), url);
-            } else {
-                if (bean.getId() == 31) {
-                    //跳转网页版粉丝徽章
-                    WebViewActivityMedal.forward(mContext, url);
-                } else if (bean.getId() == 5) {
-                    ZhuangBanActivity.forward(mContext, CommonAppConfig.HOST + "/h5/Personality.html");
-                    //獎勵中心
-                } else if (bean.getId() == 23) {
-                    Log.i("tsa", url);
-                    RewardActivity.forward(mContext, url);
-                } else {
-                    WebViewActivity.forward(mContext, url, false);
-                }
-
-            }
-        }
-    }
-
-
-    @Override
-    public void onClick(View v) {
-        int i = v.getId();
-        if (i == R.id.btn_edit) {
-            mContext.startActivity(new Intent(mContext, EditProfileActivity.class));
-        }
-//        else if (i == R.id.btn_follow) {
-//            forwardFollow();
-//        }
-        else if (i == R.id.btn_fans) {
-            forwardFans();
-//        } else if (i == R.id.btn_msg) {
-//            ChatActivity.forward(mContext);
-        } else if (i == R.id.btn_wallet) {
-            mContext.startActivity(new Intent(mContext, MyWalletActivity.class).putExtra("p", 0));
-        } else if (i == R.id.btn_coin) {
-            mContext.startActivity(new Intent(mContext, MyWalletActivity.class).putExtra("p", 2));
-        } else if (i == R.id.btn_gold) {
-            mContext.startActivity(new Intent(mContext, MyWalletActivity.class).putExtra("p", 0));
-        } else if (i == R.id.rt_kefu) {
-            WebViewActivity.forward(mContext, beanKefu.getHref(), false);
-        } else if (i == R.id.rt_setting) {
-            forwardSetting();
-        } else if (i == R.id.v_noble) {
-            UserBean u = CommonAppConfig.getInstance().getUserBean();
-            String url = CommonAppConfig.HOST + "/h5/Noble/index.html?nickname=" + u.getUserNiceName() + "&usernobId=" + u.getNoble_id() + "&token=" + CommonAppConfig.getInstance().getToken() + "&uid=" + CommonAppConfig.getInstance().getUid() + "&isZh=" + (WordUtil.isNewZh() ? "1" : 0);
-            ZhuangBanActivity.forward(mContext, url, false);
-        }
-
-
-    }
-
-    /**
-     * 编辑个人资料
-     */
-    private void forwardEditProfile() {
-        mContext.startActivity(new Intent(mContext, EditProfileActivity.class));
-    }
-
-    /**
-     * 我的关注
-     */
-    private void forwardFollow() {
-        FollowActivity.forward(mContext, CommonAppConfig.getInstance().getUid(), 0);
-    }
-
-    /**
-     * 我的粉丝
-     */
-    private void forwardFans() {
-        FansActivity.forward(mContext, CommonAppConfig.getInstance().getUid());
-    }
-
-    /**
-     * 直播记录
-     */
-    private void forwardLiveRecord() {
-        LiveRecordActivity.forward(mContext, CommonAppConfig.getInstance().getUserBean());
-    }
-
-    /**
-     * 我的收益
-     */
-    private void forwardProfit() {
-        mContext.startActivity(new Intent(mContext, MyProfitActivity.class));
-    }
-
-    /**
-     * 我的钻石
-     */
-    private void forwardCoin() {
-        RouteUtil.forwardMyCoin(mContext);
-
-    }
-
-    /**
-     * 设置
-     */
-    private void forwardSetting() {
-        mContext.startActivity(new Intent(mContext, SettingActivity.class));
-    }
-
-    /**
-     * 我的视频
-     */
-    private void forwardMyVideo() {
-        mContext.startActivity(new Intent(mContext, MyVideoActivity.class));
-    }
-
-    /**
-     * 房间管理
-     */
-    private void forwardRoomManage() {
-        mContext.startActivity(new Intent(mContext, RoomManageActivity.class));
-    }
-
-}

main/src/main/res/drawable/bg_msg_top_title.xml

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

main/src/main/res/drawable/bg_my_info_input.xml

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

main/src/main/res/layout/activity_entry.xml

@@ -64,6 +64,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
+            android:visibility="gone"
             android:layout_marginBottom="21dp">
 
             <LinearLayout
@@ -192,7 +193,7 @@
                     android:layout_gravity="center"
                     android:layout_weight="1"
                     android:src="@mipmap/login_line"
-                    android:visibility="visible" />
+                    android:visibility="gone" />
 
                 <RelativeLayout
                     android:layout_width="57dp"

main/src/main/res/layout/item_main_home_com_class.xml

@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_marginLeft="10dp"
-    android:gravity="center"
     android:orientation="vertical"
+    android:gravity="center"
+    android:paddingRight="5dp"
     android:paddingTop="12dp"
-    android:paddingBottom="10dp">
+    android:paddingBottom="10dp"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content">
 
     <TextView
         android:id="@+id/tv_class_name"
-        android:layout_width="50dp"
-        android:layout_height="30dp"
-        android:background="@drawable/bg_main_com_type"
-        android:gravity="center"
+        android:layout_width="65dp"
+        android:layout_height="26dp"
         android:text="音乐"
-        android:textColor="@color/white"
-        android:textSize="13sp" />
+        android:textSize="16sp"
+        android:gravity="center"
+        android:textColor="#FF777777"/>
+
 
 </LinearLayout>

main/src/main/res/layout/item_main_home_live_head.xml

@@ -1,7 +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="135dp"
     android:orientation="vertical">
@@ -26,9 +25,8 @@
             android:id="@+id/banner"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="3dp"
-
-            android:layout_marginBottom="5dp"
+            android:layout_marginStart="5dp"
+            android:layout_marginBottom="10dp"
             app:delay_time="3000"
             app:indicator_drawable_selected="@drawable/bg_home_indicator_selected"
             app:indicator_drawable_unselected="@drawable/bg_home_indicator_unselected"

main/src/main/res/layout/item_main_home_lives_class.xml

@@ -3,7 +3,6 @@
     android:orientation="vertical"
     android:gravity="center"
     android:paddingRight="5dp"
-    android:layout_marginLeft="15dp"
     android:paddingTop="12dp"
     android:paddingBottom="10dp"
     android:layout_width="wrap_content"
@@ -16,8 +15,7 @@
         android:text="音乐"
         android:textSize="16sp"
         android:gravity="center"
-        android:background="@drawable/button_ffc621"
-        android:textColor="#FFC621"/>
+        android:textColor="#FF777777"/>
 
 
 </LinearLayout>

main/src/main/res/layout/item_main_me_2.xml

@@ -9,8 +9,8 @@
 
     <ImageView
         android:id="@+id/thumb"
-        android:layout_width="24dp"
-        android:layout_height="24dp" />
+        android:layout_width="32dp"
+        android:layout_height="32dp" />
 
     <TextView
         android:id="@+id/name"
@@ -20,7 +20,7 @@
         android:text=""
         android:singleLine="true"
         android:ellipsize="end"
-        android:textColor="@color/textColor"
+        android:textColor="#FF333333"
         android:textSize="12sp" />
 
 </LinearLayout>

main/src/main/res/layout/item_main_me_3.xml

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:gravity="center_vertical"
+    android:layout_marginTop="12dp"
+    android:layout_marginBottom="12dp"
+    android:orientation="horizontal">
+
+    <ImageView
+        android:id="@+id/thumb"
+        android:layout_width="20dp"
+        android:layout_height="20dp" />
+
+    <TextView
+        android:id="@+id/name"
+        android:layout_width="0dp"
+        android:layout_weight="1"
+        android:layout_height="wrap_content"
+        android:text="我的勋章"
+        android:singleLine="true"
+        android:ellipsize="end"
+        android:layout_marginStart="8dp"
+        android:textColor="#FF777777"
+        android:textSize="12sp" />
+
+    <ImageView
+        android:layout_width="20dp"
+        android:padding="2dp"
+        android:src="@mipmap/icon_right_new"
+        android:layout_height="20dp"/>
+
+</LinearLayout>

main/src/main/res/layout/simple_pager_title_layout.xml

@@ -21,6 +21,7 @@
     <ImageView
         android:id="@+id/index"
         android:layout_width="30dp"
+        android:visibility="gone"
         android:layout_height="15dp"
         android:src="@mipmap/icon_index" />
 

main/src/main/res/layout/view_homemain.xml

@@ -47,7 +47,7 @@
                     android:layout_height="match_parent"
                     android:layout_weight="1"
                     app:tbn_checked="true"
-                    app:tbn_icon_array_id="@array/main_tab_home"
+                    app:tbn_icon_array_id="@array/main_tab_video"
                     app:tbn_icon_size="25dp"
                     app:tbn_text_color_checked="@color/colorMainTab"
                     app:tbn_text_color_unchecked="@color/gray1"
@@ -59,12 +59,12 @@
                     android:layout_height="match_parent"
                     android:layout_marginRight="60dp"
                     android:layout_weight="1"
-                    app:tbn_icon_array_id="@array/main_tab_video"
+                    app:tbn_icon_array_id="@array/main_tab_home"
                     app:tbn_icon_size="25dp"
                     app:tbn_text_color_checked="@color/colorMainTab"
                     app:tbn_text_color_unchecked="@color/gray1"
                     app:tbn_text_size="11sp"
-                    app:tbn_tip="@string/live" />
+                    app:tbn_tip="@string/community" />
 
                 <com.yunbao.common.custom.TabButton
                     android:layout_width="0dp"

main/src/main/res/layout/view_main_home.xml

@@ -19,8 +19,8 @@
 
         <RelativeLayout
             android:layout_width="match_parent"
-            android:layout_height="37dp"
-            android:layout_marginTop="20dp"
+            android:layout_height="45dp"
+            android:layout_marginTop="22dp"
             app:layout_scrollFlags="scroll|enterAlways">
 
             <HorizontalScrollView
@@ -50,9 +50,9 @@
                         android:gravity="center"
                         android:paddingTop="1dp"
                         android:text="@string/main_type_theater"
-                        android:textColor="#B1B1B1"
+                        android:textColor="#FF777777"
                         android:layout_marginBottom="3dp"
-                        android:textSize="16dp"
+                        android:textSize="18dp"
                         android:textStyle="bold" />
 
                 </LinearLayout>
@@ -62,14 +62,23 @@
                 android:id="@+id/ijiasdw"
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
+                android:gravity="center_vertical"
                 android:layout_alignParentRight="true"
                 android:layout_alignParentBottom="true">
 
+                <ImageView
+                    android:id="@+id/btn_live"
+                    android:layout_width="40dp"
+                    android:layout_height="40dp"
+                    android:contentDescription="TODO"
+                    android:onClick="mainClick"
+                    android:padding="9dp"
+                    android:src="@mipmap/icon_main_live" />
+
                 <ImageView
                     android:id="@+id/btn_search"
                     android:layout_width="40dp"
                     android:layout_height="40dp"
-                    android:layout_marginBottom="2dp"
                     android:contentDescription="TODO"
                     android:onClick="mainClick"
                     android:padding="9dp"
@@ -80,7 +89,6 @@
                     android:layout_width="40dp"
                     android:layout_height="40dp"
                     android:layout_marginRight="5dp"
-                    android:layout_marginBottom="2dp"
                     android:contentDescription="TODO"
                     android:onClick="mainClick"
                     android:padding="6dp" />

main/src/main/res/layout/view_main_home_com.xml

@@ -11,7 +11,7 @@
         android:id="@+id/appBarLayout"
         android:layout_width="match_parent"
         android:layout_height="70dp"
-        android:layout_marginTop="20dp"
+        android:layout_marginTop="10dp"
         android:background="@android:color/transparent"
         android:fadingEdge="none"
         app:elevation="0dp"
@@ -19,17 +19,15 @@
 
         <RelativeLayout
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
+            android:layout_height="45dp"
+            android:layout_marginTop="22dp"
             app:layout_scrollFlags="scroll|enterAlways">
 
-
             <RelativeLayout
                 android:layout_width="match_parent"
-                android:layout_height="60dp"
+                android:layout_height="45dp"
                 android:layout_alignParentBottom="true"
-                android:layout_marginLeft="10dp"
                 android:layout_marginRight="10dp"
-                android:layout_marginBottom="5dp"
                 android:layout_toLeftOf="@id/btn_search"
                 tools:ignore="NotSibling">
 
@@ -43,13 +41,11 @@
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:layout_marginLeft="10dp"
-                    android:layout_marginTop="6dp"
                     android:layout_toRightOf="@+id/indicator"
                     android:gravity="center"
-                    android:paddingTop="1dp"
                     android:text="@string/main_type_theater"
-                    android:textColor="@color/black1"
-                    android:textSize="16dp"
+                    android:textColor="#FF777777"
+                    android:textSize="18dp"
                     android:textStyle="bold" />
 
             </RelativeLayout>

main/src/main/res/layout/view_main_me.xml

@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/gray2"
+    android:background="#FFF7F8FA"
     android:orientation="vertical"
     android:paddingBottom="50dp">
 
@@ -27,43 +27,95 @@
                 android:orientation="vertical">
 
                 <RelativeLayout
+                    android:paddingTop="30dp"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content">
 
-                    <View
+                    <RelativeLayout
+                        android:layout_marginStart="15dp"
                         android:layout_width="match_parent"
-                        android:layout_height="240dp"
-                        android:background="@mipmap/new_bg" />
+                        android:layout_height="40dp">
+
+                        <TextView
+                            android:text="個人中心"
+                            android:textSize="24dp"
+                            android:textColor="#FF333333"
+                            android:textStyle="bold"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"/>
+
+                        <ImageView
+                            android:layout_alignParentBottom="true"
+                            android:layout_width="40dp"
+                            android:layout_height="4dp"
+                            android:background="@drawable/bg_msg_top_title"
+                            android:scaleType="fitXY" />
+
+                        <ImageView
+                            android:id="@+id/rt_setting"
+                            android:layout_marginTop="15dp"
+                            android:layout_marginEnd="15dp"
+                            android:layout_alignParentEnd="true"
+                            android:src="@mipmap/main_my_more"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"/>
+
+                    </RelativeLayout>
 
                     <LinearLayout
-
                         android:id="@+id/lt_me_top"
                         android:layout_width="match_parent"
-                        android:layout_height="144dp"
-                        android:layout_marginTop="42dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="55dp"
                         android:orientation="horizontal">
 
+                        <RelativeLayout
+                            android:layout_width="108dp"
+                            android:layout_height="100dp"
+                            android:layout_marginRight="10dp"
+                            android:gravity="center|right">
+
+                            <com.makeramen.roundedimageview.RoundedImageView
+                                android:id="@+id/edit_me_avatar"
+                                android:layout_width="68dp"
+                                android:layout_height="68dp"
+                                android:layout_alignParentRight="true"
+                                android:layout_centerVertical="true"
+                                android:layout_marginRight="10dp"
+                                android:scaleType="centerCrop"
+                                app:riv_border_color="#FFFFFF"
+                                app:riv_border_width="2dp"
+                                app:riv_oval="true" />
+
+                            <com.opensource.svgaplayer.SVGAImageView
+                                android:id="@+id/gift_svga"
+                                android:layout_width="94dp"
+                                android:layout_height="94dp"
+                                android:layout_alignParentRight="true"
+                                android:layout_centerVertical="true"
+                                android:scaleType="centerCrop"
+                                app:autoPlay="true" />
+
+                        </RelativeLayout>
                         <LinearLayout
-                            android:layout_width="match_parent"
+                            android:layout_width="wrap_content"
                             android:layout_height="match_parent"
                             android:layout_weight="1"
                             android:gravity="center|left"
                             android:orientation="vertical">
 
                             <androidx.cardview.widget.CardView
-                                android:id="@+id/complete_information_radius"
                                 android:layout_width="7dp"
                                 android:layout_height="7dp"
-                                android:layout_marginStart="115.9dp"
-                                android:layout_marginEnd="4dp"
                                 app:cardBackgroundColor="#FF5730"
+                                android:visibility="gone"
                                 app:cardCornerRadius="20dp" />
 
                             <RelativeLayout
-                                android:id="@+id/complete_information"
                                 android:layout_width="107.9dp"
                                 android:layout_height="25.25dp"
                                 android:layout_marginStart="21dp"
+                                android:visibility="gone"
                                 android:layout_marginTop="-5dp"
                                 android:background="@mipmap/icon_complete_information">
 
@@ -80,7 +132,6 @@
                                 android:id="@+id/lt_name"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:layout_marginLeft="21dp"
                                 android:layout_marginTop="8dp"
                                 android:gravity="center"
                                 android:orientation="horizontal">
@@ -90,9 +141,11 @@
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
                                     android:text="用戶名稱"
+                                    android:ellipsize="end"
+                                    android:maxLines="1"
                                     android:textColor="@color/black2"
-                                    android:textSize="19sp"
-                                    android:textStyle="bold" />
+                                    android:textSize="15sp"
+                                   />
 
                                 <ImageView
                                     android:id="@+id/btn_edit"
@@ -107,22 +160,20 @@
                                 android:id="@+id/signature"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:layout_marginLeft="21dp"
-                                android:layout_marginTop="6dp"
+                                android:ellipsize="end"
+                                android:maxLines="1"
                                 android:text="这个人很懒，什么也没留下。"
-                                android:textColor="@color/gray_cccccc"
-                                android:textSize="12sp" />
+                                android:textColor="#FF777777"
+                                android:textSize="11sp" />
 
                             <LinearLayout
                                 android:layout_width="wrap_content"
-                                android:layout_height="match_parent"
-                                android:layout_weight="1"
+                                android:layout_height="30dp"
                                 android:orientation="horizontal">
 
                                 <LinearLayout
                                     android:layout_width="wrap_content"
-                                    android:layout_height="48dp"
-                                    android:layout_marginLeft="21dp"
+                                    android:layout_height="28dp"
                                     android:layout_weight="1"
                                     android:gravity="center|left">
 
@@ -134,8 +185,8 @@
                                         android:visibility="gone" />
 
                                     <ImageView
-                                        android:layout_width="30dp"
-                                        android:layout_height="15dp"
+                                        android:layout_width="13dp"
+                                        android:layout_height="13dp"
                                         android:src="@mipmap/icon_userid" />
 
                                     <TextView
@@ -143,12 +194,12 @@
                                         android:layout_width="wrap_content"
                                         android:layout_height="wrap_content"
                                         android:textColor="@color/gray_B1B1B1"
-                                        android:textSize="12sp" />
+                                        android:textSize="11sp" />
                                 </LinearLayout>
 
                                 <TextView
                                     android:id="@+id/btn_copy"
-                                    android:layout_width="30dp"
+                                    android:layout_width="28dp"
                                     android:layout_height="wrap_content"
                                     android:layout_marginLeft="5dp"
                                     android:layout_marginRight="5dp"
@@ -161,15 +212,15 @@
 
                                 <LinearLayout
                                     android:layout_width="match_parent"
-                                    android:layout_height="48dp"
-                                    android:layout_marginLeft="15dp"
+                                    android:layout_height="28dp"
+                                    android:layout_marginLeft="5dp"
                                     android:layout_weight="1"
                                     android:gravity="center|left">
 
                                     <ImageView
                                         android:id="@+id/img_lv_pic"
-                                        android:layout_width="30dp"
-                                        android:layout_height="15dp"
+                                        android:layout_width="13dp"
+                                        android:layout_height="13dp"
                                         android:src="@mipmap/icon_userlv" />
 
                                     <ImageView
@@ -193,45 +244,43 @@
                                         android:gravity="center|left"
                                         android:text=""
                                         android:textColor="@color/gray_B1B1B1"
-                                        android:textSize="13sp" />
+                                        android:textSize="11sp" />
 
                                     <ImageView
-                                        android:layout_width="11dp"
-                                        android:layout_height="11dp"
-                                        android:layout_marginLeft="3dp"
-                                        android:background="@mipmap/icon_arrow_right"
+                                        android:layout_width="10dp"
+                                        android:layout_height="10dp"
+                                        android:layout_marginLeft="5dp"
+                                        android:background="@mipmap/icon_right_new"
                                         android:visibility="visible" />
                                 </LinearLayout>
                             </LinearLayout>
                         </LinearLayout>
 
                         <RelativeLayout
-                            android:layout_width="114dp"
-                            android:layout_height="match_parent"
-                            android:layout_marginRight="18dp"
-                            android:gravity="center|right">
+                            android:id="@+id/complete_information"
+                            android:layout_marginEnd="15dp"
+                            android:layout_width="wrap_content"
+                            android:layout_height="match_parent">
 
-                            <com.makeramen.roundedimageview.RoundedImageView
-                                android:id="@+id/edit_me_avatar"
-                                android:layout_width="86dp"
-                                android:layout_height="86dp"
-                                android:layout_alignParentRight="true"
-                                android:layout_centerVertical="true"
-                                android:layout_marginRight="9dp"
-                                android:scaleType="centerCrop"
-                                app:riv_border_color="#FFFFFF"
-                                app:riv_border_width="2dp"
-                                app:riv_oval="true" />
-
-                            <com.opensource.svgaplayer.SVGAImageView
-                                android:id="@+id/gift_svga"
-                                android:layout_width="104dp"
-                                android:layout_height="104dp"
-                                android:layout_alignParentRight="true"
-                                android:layout_centerVertical="true"
-                                android:scaleType="centerCrop"
-                                app:autoPlay="true" />
+                            <TextView
+                                android:text="完成填寫領大禮"
+                                android:textColor="#FFFFFFFF"
+                                android:textStyle="bold"
+                                android:layout_alignParentBottom="true"
+                                android:background="@drawable/bg_my_info_input"
+                                android:textSize="11dp"
+                                android:gravity="center"
+                                android:layout_marginBottom="20dp"
+                                android:layout_width="91dp"
+                                android:layout_height="44dp"/>
 
+                            <ImageView
+                                android:id="@+id/complete_information_radius"
+                                android:layout_width="39dp"
+                                android:layout_centerHorizontal="true"
+                                android:layout_marginTop="15dp"
+                                android:layout_height="39dp"
+                                android:src="@mipmap/main_my_info_icon" />
                         </RelativeLayout>
 
                     </LinearLayout>
@@ -267,15 +316,16 @@
                                     android:paddingTop="6dp">
 
                                     <ImageView
-                                        android:layout_width="39dp"
-                                        android:layout_height="39dp"
+                                        android:layout_width="18dp"
+                                        android:layout_height="18dp"
                                         android:src="@mipmap/home_me_diamonds" />
 
                                     <TextView
                                         android:layout_width="wrap_content"
                                         android:layout_height="wrap_content"
+                                        android:layout_marginStart="5dp"
                                         android:text="@string/diamond"
-                                        android:textColor="@color/gray1"
+                                        android:textColor="#FF333333"
                                         android:textSize="14sp" />
                                 </LinearLayout>
 
@@ -284,7 +334,7 @@
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
                                     android:text=""
-                                    android:textColor="@color/textColor"
+                                    android:textColor="#FF333333"
                                     android:textSize="16sp"
                                     android:textStyle="bold" />
 
@@ -317,15 +367,16 @@
                                     android:paddingTop="6dp">
 
                                     <ImageView
-                                        android:layout_width="39dp"
-                                        android:layout_height="39dp"
+                                        android:layout_width="18dp"
+                                        android:layout_height="18dp"
                                         android:src="@mipmap/icon_collectibles" />
 
                                     <TextView
                                         android:layout_width="wrap_content"
                                         android:layout_height="wrap_content"
                                         android:text="@string/coins"
-                                        android:textColor="@color/gray1"
+                                        android:layout_marginStart="5dp"
+                                        android:textColor="#FF333333"
                                         android:textSize="14sp" />
                                 </LinearLayout>
 
@@ -334,7 +385,7 @@
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
                                     android:text=""
-                                    android:textColor="@color/textColor"
+                                    android:textColor="#FF333333"
                                     android:textSize="16sp"
                                     android:textStyle="bold" />
 
@@ -367,15 +418,16 @@
                                     android:paddingTop="6dp">
 
                                     <ImageView
-                                        android:layout_width="39dp"
-                                        android:layout_height="39dp"
+                                        android:layout_width="18dp"
+                                        android:layout_height="18dp"
                                         android:src="@mipmap/home_me_gold" />
 
                                     <TextView
                                         android:layout_width="wrap_content"
                                         android:layout_height="wrap_content"
                                         android:text="@string/golden_bean"
-                                        android:textColor="@color/gray1"
+                                        android:layout_marginStart="5dp"
+                                        android:textColor="#FF333333"
                                         android:textSize="14sp" />
                                 </LinearLayout>
 
@@ -384,7 +436,7 @@
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
                                     android:text=""
-                                    android:textColor="@color/textColor"
+                                    android:textColor="#FF333333"
                                     android:textSize="16sp"
                                     android:textStyle="bold" />
 
@@ -495,6 +547,7 @@
                 </LinearLayout>
 
                 <LinearLayout
+                    android:visibility="gone"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content">
 
@@ -580,7 +633,6 @@
                         android:id="@+id/lt_guard"
                         android:layout_width="0dp"
                         android:layout_height="81dp"
-
                         android:layout_marginTop="12dp"
                         android:layout_marginRight="15dp"
                         android:layout_weight="1"
@@ -661,7 +713,29 @@
                         android:paddingRight="6dp"
                         app:layout_behavior="@string/appbar_scrolling_view_behavior" />
                 </LinearLayout>
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="15dp"
+                    android:layout_marginTop="15dp"
+                    android:layout_marginRight="15dp"
+                    android:background="@drawable/bg_me_data">
 
+                    <androidx.recyclerview.widget.RecyclerView
+                        android:id="@+id/bottomRecyclerView"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_marginStart="10dp"
+                        android:layout_marginTop="9dp"
+                        android:layout_marginEnd="10dp"
+                        android:layout_marginBottom="9dp"
+                        android:focusable="false"
+                        android:nestedScrollingEnabled="false"
+                        android:overScrollMode="never"
+                        android:paddingLeft="6dp"
+                        android:paddingRight="6dp"
+                        app:layout_behavior="@string/appbar_scrolling_view_behavior" />
+                </LinearLayout>
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -734,9 +808,9 @@
                         android:orientation="vertical">
 
                         <RelativeLayout
-                            android:id="@+id/rt_setting"
                             android:layout_width="match_parent"
                             android:layout_height="54dp"
+                            android:visibility="gone"
                             android:paddingLeft="21dp">
 
                             <ImageView

main/src/main/res/layout/view_main_message.xml

@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@mipmap/bg_activity_message"
+    android:background="#FFF7F8FA"
     android:orientation="vertical"
     android:paddingTop="35dp">
     <!--  android:background="@mipmap/bg_activity_message" -->
@@ -25,7 +25,6 @@
                 android:id="@+id/top_noback"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-
                 android:text="@string/activity_msg_title"
                 android:textColor="#ff161616"
                 android:textSize="24sp"
@@ -34,15 +33,14 @@
                 app:layout_constraintTop_toTopOf="parent" />
 
             <ImageView
-
                 android:layout_width="match_parent"
-                android:layout_height="6.3dp"
-                android:scaleType="fitXY"
-                android:src="@mipmap/icon_index" />
+                android:layout_height="4dp"
+                android:layout_marginTop="2dp"
+                android:background="@drawable/bg_msg_top_title"
+                android:scaleType="fitXY" />
 
         </LinearLayout>
 
-
         <EditText
             android:id="@+id/search"
             android:layout_width="0dp"
@@ -66,7 +64,7 @@
             android:layout_gravity="end|bottom"
             android:layout_marginStart="8dp"
             android:layout_marginTop="18dp"
-            android:layout_marginEnd="15dp"
+            android:layout_marginEnd="5dp"
             android:layout_marginBottom="16dp"
             android:layout_weight="0.1"
             android:src="@mipmap/ic_msg_contacts"
@@ -88,35 +86,33 @@
 
 
     <LinearLayout
+        android:background="#FFF7F8FA"
         android:id="@+id/top_layout"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
         <!--系统消息-->
-        <RelativeLayout
-
-            android:layout_width="0dp"
-            android:layout_height="94dp"
-            android:layout_weight="1">
 
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="50dp"
+            android:layout_marginStart="15dp"
+            android:layout_marginTop="10dp"
+            android:gravity="center_vertical">
 
             <ImageView
                 android:id="@+id/img_news_notice"
-                android:layout_width="match_parent"
-                android:layout_height="54dp"
-                android:layout_alignBottom="@+id/tv_news_notice"
-                android:layout_alignParentStart="true"
-                android:layout_alignParentEnd="true"
-                android:layout_marginBottom="20dp"
+                android:layout_width="42dp"
+                android:layout_height="42dp"
                 android:src="@mipmap/ic_msg_notice" />
 
             <TextView
                 android:id="@+id/tv_news_notice"
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_alignParentStart="true"
-                android:layout_alignParentEnd="true"
-                android:layout_alignParentBottom="true"
-                android:gravity="center"
+                android:layout_marginStart="10dp"
+                android:layout_weight="1"
+                android:gravity="center_vertical"
                 android:maxLines="1"
                 android:text="@string/activity_msg_news_notice"
                 android:textColor="#333333"
@@ -130,8 +126,6 @@
                 android:id="@+id/text_news_notice"
                 android:layout_width="20dp"
                 android:layout_height="20dp"
-                android:layout_alignParentEnd="true"
-                android:layout_marginTop="15dp"
                 android:layout_marginEnd="17dp"
                 android:background="@drawable/background_system_message"
                 android:gravity="center"
@@ -140,32 +134,36 @@
                 android:textSize="12sp"
                 android:visibility="gone"
                 tools:visibility="visible" />
-        </RelativeLayout>
 
+        </LinearLayout>
 
-        <RelativeLayout
-            android:layout_width="0dp"
-            android:layout_height="94dp"
-            android:layout_weight="1">
+        <View
+            android:layout_marginStart="60dp"
+            android:layout_width="match_parent"
+            android:layout_marginEnd="22dp"
+            android:background="#FFEFEFEF"
+            android:layout_height="1dp"/>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="50dp"
+            android:layout_marginStart="15dp"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
 
             <ImageView
                 android:id="@+id/img_news_interaction"
-                android:layout_width="match_parent"
-                android:layout_height="54dp"
-                android:layout_alignBottom="@+id/tv_news_interaction"
-                android:layout_alignParentStart="true"
-                android:layout_alignParentEnd="true"
-                android:layout_marginBottom="19dp"
+                android:layout_width="42dp"
+                android:layout_height="42dp"
                 android:src="@mipmap/ic_msg_interaction" />
 
             <TextView
                 android:id="@+id/tv_news_interaction"
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_alignParentStart="true"
-                android:layout_alignParentEnd="true"
-                android:layout_alignParentBottom="true"
-                android:gravity="center"
+                android:layout_marginStart="10dp"
+                android:layout_weight="1"
+                android:gravity="center_vertical"
                 android:maxLines="1"
                 android:text="@string/activity_msg_newts_interaction"
                 android:textColor="#333333"
@@ -179,8 +177,6 @@
                 android:id="@+id/text_news_interaction"
                 android:layout_width="20dp"
                 android:layout_height="20dp"
-                android:layout_alignParentEnd="true"
-                android:layout_marginTop="15dp"
                 android:layout_marginEnd="17dp"
                 android:background="@drawable/background_system_message"
                 android:gravity="center"
@@ -188,33 +184,34 @@
                 android:textColor="@color/white"
                 android:textSize="12sp"
                 android:visibility="gone" />
-        </RelativeLayout>
-
-        <RelativeLayout
-
-            android:layout_width="0dp"
-            android:layout_height="94dp"
-            android:layout_weight="1">
 
+        </LinearLayout>
+        <View
+            android:layout_marginStart="60dp"
+            android:layout_width="match_parent"
+            android:background="#FFEFEFEF"
+            android:layout_marginEnd="22dp"
+            android:layout_height="1dp"/>
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="50dp"
+            android:layout_marginStart="15dp"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
 
             <ImageView
                 android:id="@+id/img_system_messages"
-                android:layout_width="match_parent"
-                android:layout_height="54dp"
-                android:layout_alignBottom="@+id/tv_system_messages"
-                android:layout_alignParentStart="true"
-                android:layout_alignParentEnd="true"
-                android:layout_marginBottom="20dp"
+                android:layout_width="42dp"
+                android:layout_height="42dp"
                 android:src="@mipmap/ic_msg_message" />
 
             <TextView
                 android:id="@+id/tv_system_messages"
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_alignParentStart="true"
-                android:layout_alignParentEnd="true"
-                android:layout_alignParentBottom="true"
-                android:gravity="center"
+                android:layout_marginStart="10dp"
+                android:layout_weight="1"
+                android:gravity="center_vertical"
                 android:maxLines="1"
                 android:text="@string/activity_msg_system_message"
                 android:textColor="#333333"
@@ -228,8 +225,6 @@
                 android:id="@+id/text_system_messages"
                 android:layout_width="20dp"
                 android:layout_height="20dp"
-                android:layout_alignParentEnd="true"
-                android:layout_marginTop="15dp"
                 android:layout_marginEnd="17dp"
                 android:background="@drawable/background_system_message"
                 android:gravity="center"
@@ -237,31 +232,34 @@
                 android:textColor="@color/white"
                 android:textSize="12sp"
                 android:visibility="gone" />
-        </RelativeLayout>
 
-        <RelativeLayout
-            android:layout_width="0dp"
-            android:layout_height="94dp"
-            android:layout_weight="1">
+        </LinearLayout>
+        <View
+            android:layout_marginStart="60dp"
+            android:layout_width="match_parent"
+            android:background="#FFEFEFEF"
+            android:layout_marginEnd="22dp"
+            android:layout_height="1dp"/>
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="50dp"
+            android:layout_marginStart="15dp"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
 
             <ImageView
                 android:id="@+id/img_news_online"
-                android:layout_width="match_parent"
-                android:layout_height="54dp"
-                android:layout_alignBottom="@+id/tv_news_online"
-                android:layout_alignParentStart="true"
-                android:layout_alignParentEnd="true"
-                android:layout_marginBottom="20dp"
+                android:layout_width="42dp"
+                android:layout_height="42dp"
                 android:src="@mipmap/ic_msg_service" />
 
             <TextView
                 android:id="@+id/tv_news_online"
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_alignParentStart="true"
-                android:layout_alignParentEnd="true"
-                android:layout_alignParentBottom="true"
-                android:gravity="center"
+                android:layout_marginStart="10dp"
+                android:layout_weight="1"
+                android:gravity="center_vertical"
                 android:maxLines="1"
                 android:text="@string/activity_msg_news_online"
                 android:textColor="#333333"
@@ -275,8 +273,6 @@
                 android:id="@+id/text_news_online"
                 android:layout_width="20dp"
                 android:layout_height="20dp"
-                android:layout_alignParentEnd="true"
-                android:layout_marginTop="15dp"
                 android:layout_marginEnd="17dp"
                 android:background="@drawable/background_system_message"
                 android:gravity="center"
@@ -284,18 +280,15 @@
                 android:textColor="@color/white"
                 android:textSize="12sp"
                 android:visibility="gone" />
-        </RelativeLayout>
-    </LinearLayout>
 
+        </LinearLayout>
         <View
-        android:id="@+id/line"
+            android:layout_marginStart="60dp"
             android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:layout_marginStart="16dp"
-        android:layout_marginTop="20dp"
-        android:layout_marginEnd="16dp"
-        android:layout_marginBottom="5dp"
-        android:background="#FFE9F6" />
+            android:layout_marginEnd="22dp"
+            android:background="#FFEFEFEF"
+            android:layout_height="1dp"/>
+    </LinearLayout>
 
     <net.lucode.hackware.magicindicator.MagicIndicator
         android:id="@+id/indicator"
@@ -304,6 +297,7 @@
         android:visibility="gone" />
 
     <LinearLayout
+        android:background="@color/white"
         android:id="@+id/tabLayouts"
         android:layout_width="match_parent"
         android:layout_height="40dp"
@@ -312,12 +306,12 @@
         android:paddingEnd="20dp">
 
         <androidx.constraintlayout.widget.ConstraintLayout
-            android:visibility="gone"
-            tools:visibility="visible"
             android:id="@+id/tabLayout1"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_weight="1">
+            android:layout_weight="1"
+            android:visibility="gone"
+            tools:visibility="visible">
 
             <ImageView
                 android:id="@+id/tab_icon"
@@ -363,11 +357,11 @@
                     android:id="@+id/tab_line1"
                     android:layout_width="0dp"
                     android:layout_height="3dp"
-                    android:layout_marginStart="3dp"
-                    android:layout_marginEnd="3dp"
-                    android:layout_marginTop="3dp"
                     android:layout_below="@+id/tab_top1"
                     android:layout_centerHorizontal="true"
+                    android:layout_marginStart="3dp"
+                    android:layout_marginTop="3dp"
+                    android:layout_marginEnd="3dp"
                     android:background="@drawable/bg_main_com_type"
                     app:layout_constraintEnd_toEndOf="@+id/tab1"
                     app:layout_constraintStart_toStartOf="@+id/tab1"
@@ -377,12 +371,12 @@
         </androidx.constraintlayout.widget.ConstraintLayout>
 
         <androidx.constraintlayout.widget.ConstraintLayout
-            android:visibility="gone"
-            tools:visibility="visible"
             android:id="@+id/tabLayout2"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_weight="1">
+            android:layout_weight="1"
+            android:visibility="gone"
+            tools:visibility="visible">
 
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:id="@+id/tab_top2"
@@ -414,12 +408,12 @@
                 <View
                     android:id="@+id/tab_line2"
                     android:layout_width="0dp"
-                    android:layout_marginTop="3dp"
-                    android:layout_marginStart="3dp"
-                    android:layout_marginEnd="3dp"
                     android:layout_height="3dp"
                     android:layout_below="@+id/tab_top2"
                     android:layout_centerHorizontal="true"
+                    android:layout_marginStart="3dp"
+                    android:layout_marginTop="3dp"
+                    android:layout_marginEnd="3dp"
                     android:background="@drawable/bg_main_com_type"
                     app:layout_constraintEnd_toEndOf="@+id/tab2"
                     app:layout_constraintStart_toStartOf="@+id/tab2"
@@ -429,12 +423,12 @@
         </androidx.constraintlayout.widget.ConstraintLayout>
 
         <androidx.constraintlayout.widget.ConstraintLayout
-            android:visibility="gone"
-            tools:visibility="visible"
             android:id="@+id/tabLayout3"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_weight="1">
+            android:layout_weight="1"
+            android:visibility="gone"
+            tools:visibility="visible">
 
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:id="@+id/tab_top3"
@@ -466,12 +460,12 @@
                 <View
                     android:id="@+id/tab_line3"
                     android:layout_width="0dp"
-                    android:layout_marginStart="3dp"
-                    android:layout_marginEnd="3dp"
                     android:layout_height="3dp"
-                    android:layout_marginTop="3dp"
                     android:layout_below="@+id/tab_top3"
                     android:layout_centerHorizontal="true"
+                    android:layout_marginStart="3dp"
+                    android:layout_marginTop="3dp"
+                    android:layout_marginEnd="3dp"
                     android:background="@drawable/bg_main_com_type"
                     app:layout_constraintEnd_toEndOf="@+id/tab3"
                     app:layout_constraintStart_toStartOf="@+id/tab3"
@@ -486,8 +480,9 @@
     <androidx.viewpager2.widget.ViewPager2
         android:id="@+id/viewPager"
         android:layout_width="match_parent"
+        android:background="@color/white"
         android:layout_height="match_parent"
-        android:layout_marginTop="10dp"
+        android:paddingTop="10dp"
         android:layout_marginBottom="50dp"
         android:overScrollMode="never"
         app:layout_behavior="@string/appbar_scrolling_view_behavior" />