diff --git a/FaceUnity/src/main/res/values/colors.xml b/FaceUnity/src/main/res/values/colors.xml
index deb27665a..76f895882 100644
--- a/FaceUnity/src/main/res/values/colors.xml
+++ b/FaceUnity/src/main/res/values/colors.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="colorPrimary">#FF8D41</color>
-    <color name="colorPrimaryDark">#FF8D41</color>
-    <color name="colorAccent">#FF8D41</color>
+    <color name="colorPrimary">#2ED0FF</color>
+    <color name="colorPrimaryDark">#2ED0FF</color>
+    <color name="colorAccent">#2ED0FF</color>
 
     <!--fulive demo 主配色-->
     <color name="primary_background">#050F14</color>
diff --git a/Share/src/main/res/values-zh/strings.xml b/Share/src/main/res/values-zh/strings.xml
index ec54569a2..776639d56 100644
--- a/Share/src/main/res/values-zh/strings.xml
+++ b/Share/src/main/res/values-zh/strings.xml
@@ -4,7 +4,7 @@
 <string name="com.twitter.sdk.android.CONSUMER_SECRET">aq0eV4R1pqMK_AAeKRWnjPr7ErGMGgTPGgZJdm73WeRY-Kluws</string>
 
 <string name="dialog_share_title">分享</string>
-<string name="dialog_share_info">快來 PDLIVE觀看%s直播，認識更多有趣的朋友吧！</string>
+<string name="dialog_share_info">快來 HOSO觀看%s直播，認識更多有趣的朋友吧！</string>
 <string name="dialog_share_app_facebook" >Facebook</string>
 <string name="dialog_share_app_line" >Line</string>
 <string name="dialog_share_app_twitter">Twitter</string>
@@ -13,6 +13,6 @@
 <string name="dialog_share_app_instagram" >Instagram</string>
 
 <string name="dialog_invite_title">邀請好友</string>
-<string name="dialog_invite_info">快來 PDLIVE觀看直播，認識更多有趣的朋友吧！</string>
+<string name="dialog_invite_info">快來 HOSO觀看直播，認識更多有趣的朋友吧！</string>
 <string name="dialog_share_copy">複製</string>
 </resources>
\ No newline at end of file
diff --git a/Share/src/main/res/values/strings.xml b/Share/src/main/res/values/strings.xml
index b1b94a0b5..e6e10ad76 100644
--- a/Share/src/main/res/values/strings.xml
+++ b/Share/src/main/res/values/strings.xml
@@ -9,8 +9,8 @@
     <string name="dialog_share_app_messenger">Messenger</string>
     <string name="dialog_share_app_instagram" >Instagram</string>
     <string name="dialog_share_title">Share</string>
-    <string name="dialog_share_info">Come and watch %s live on PDLIVE and meet more interesting people!</string>
+    <string name="dialog_share_info">Come and watch %s live on HOSO and meet more interesting people!</string>
     <string name="dialog_invite_title">Invite Friends</string>
-    <string name="dialog_invite_info">Come to PDLIVE to discover more and better live streams.</string>
+    <string name="dialog_invite_info">Come to HOSO to discover more and better live streams.</string>
     <string name="dialog_share_copy">Copy</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/java/com/shayu/phonelive/activity/LauncherActivity.java b/app/src/main/java/com/shayu/phonelive/activity/LauncherActivity.java
index f74ecb999..057386bd8 100644
--- a/app/src/main/java/com/shayu/phonelive/activity/LauncherActivity.java
+++ b/app/src/main/java/com/shayu/phonelive/activity/LauncherActivity.java
@@ -6,10 +6,13 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.res.Configuration;
 import android.content.res.Resources;
+import android.graphics.Matrix;
+import android.graphics.RectF;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
+import android.os.Parcelable;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.Gravity;
@@ -25,6 +28,7 @@ import androidx.appcompat.app.AppCompatActivity;
 import androidx.core.app.ActivityCompat;
 import androidx.core.app.ActivityOptionsCompat;
 import androidx.core.app.NotificationManagerCompat;
+import androidx.core.app.SharedElementCallback;
 
 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.alibaba.fastjson.JSON;
@@ -131,8 +135,8 @@ public class LauncherActivity extends AppCompatActivity implements View.OnClickL
         mBtnSkipVideo = findViewById(R.id.btn_skip_video);
         mBtnSkipImage.setOnClickListener(this);
         mBtnSkipVideo.setOnClickListener(this);
-        ImgLoader.display(mContext, R.mipmap.screen, mCover);
-        mHandler = new Handler() {
+       // ImgLoader.display(mContext, R.mipmap.screen, mCover);
+        mHandler = new Handler(getMainLooper()) {
             @Override
             public void handleMessage(Message msg) {
                 switch (msg.what) {
@@ -152,6 +156,14 @@ public class LauncherActivity extends AppCompatActivity implements View.OnClickL
             e.printStackTrace();
         }
         SpUtil.getInstance().setBooleanValue("NOTIFICATION", NotificationManagerCompat.from(this).areNotificationsEnabled());
+
+        setExitSharedElementCallback(new SharedElementCallback() {
+            @Override
+            public Parcelable onCaptureSharedElementSnapshot(View sharedElement, Matrix viewToGlobalMatrix, RectF screenBounds) {
+                sharedElement.setAlpha(1);
+                return super.onCaptureSharedElementSnapshot(sharedElement, viewToGlobalMatrix, screenBounds);
+            }
+        });
     }
 
 
@@ -267,8 +279,9 @@ public class LauncherActivity extends AppCompatActivity implements View.OnClickL
                 IMLoginManager.get(this).upDataUserInfo();
             } else {
                 releaseVideo();
-                this.startActivity(new Intent(this, EntryActivity.class));
-                this.finish();
+                Bundle bundle = ActivityOptionsCompat.makeSceneTransitionAnimation(this, findViewById(R.id.app_logo), findViewById(R.id.app_logo).getTransitionName()).toBundle();
+                this.startActivity(new Intent(this, EntryActivity.class),bundle);
+                new Handler(getMainLooper()).postDelayed(this::finish,1000);
             }
 
         }
@@ -588,8 +601,9 @@ public class LauncherActivity extends AppCompatActivity implements View.OnClickL
             forwardMainActivity();
         } else {
             releaseVideo();
-            this.startActivity(new Intent(this, EntryActivity.class));
-            this.finish();
+            Bundle bundle = ActivityOptionsCompat.makeSceneTransitionAnimation(this, findViewById(R.id.app_logo), findViewById(R.id.app_logo).getTransitionName()).toBundle();
+            this.startActivity(new Intent(this, EntryActivity.class),bundle);
+            new Handler(getMainLooper()).postDelayed(this::finish,1000);
         }
     }
 }
diff --git a/app/src/main/res/layout/activity_launcher.xml b/app/src/main/res/layout/activity_launcher.xml
index 92776f82c..d278df3c6 100644
--- a/app/src/main/res/layout/activity_launcher.xml
+++ b/app/src/main/res/layout/activity_launcher.xml
@@ -9,7 +9,7 @@
         android:id="@+id/container"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="#000" />
+        android:background="#fff" />
 
     <FrameLayout
         android:id="@+id/btn_skip_img"
@@ -53,12 +53,50 @@
         android:textColor="@color/white"
         android:textSize="11sp"
         android:visibility="invisible" />
-
-    <ImageView
+       <!--原来的启动页图片-->
+ <!--   <ImageView
         android:id="@+id/cover"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:clickable="true"
-        android:scaleType="centerCrop" />
+        android:scaleType="centerCrop" />-->
+    <!--新启动页-->
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <ImageView
+            android:id="@+id/cover"
+            android:layout_width="match_parent"
+            android:layout_height="342dp"
+            android:scaleType="centerCrop"
+            android:src="@mipmap/bg_app_launch"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+        <LinearLayout
+            android:id="@+id/app_logo"
+            android:transitionName="app_logo"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            android:orientation="vertical"
+            android:gravity="center"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                app:srcCompat="@mipmap/ic_app_launch_logo" />
+
+            <ImageView
+                android:layout_width="match_parent"
+                android:layout_marginTop="20dp"
+                android:layout_height="wrap_content"
+                app:srcCompat="@mipmap/ic_app_launch_name" />
+        </LinearLayout>
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </FrameLayout>
 
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png
deleted file mode 100644
index 50257bea6..000000000
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp
new file mode 100644
index 000000000..9a1cf82a5
Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher.webp differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png
deleted file mode 100644
index 33cbef52d..000000000
Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp
new file mode 100644
index 000000000..17ac07210
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher.webp differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
deleted file mode 100644
index a70ceeb93..000000000
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp
new file mode 100644
index 000000000..616b806c2
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
deleted file mode 100644
index 072f87ff3..000000000
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp
new file mode 100644
index 000000000..eae09b446
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/bg_app_launch.webp b/app/src/main/res/mipmap-xxxhdpi/bg_app_launch.webp
new file mode 100644
index 000000000..d01707c22
Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/bg_app_launch.webp differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_app_launch_logo.webp b/app/src/main/res/mipmap-xxxhdpi/ic_app_launch_logo.webp
new file mode 100644
index 000000000..863bf2ab1
Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_app_launch_logo.webp differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_app_launch_name.webp b/app/src/main/res/mipmap-xxxhdpi/ic_app_launch_name.webp
new file mode 100644
index 000000000..3253556e6
Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_app_launch_name.webp differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
deleted file mode 100644
index 2d52cdd94..000000000
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
new file mode 100644
index 000000000..bc40b718f
Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp differ
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1f229165b..f6e84b800 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">PDLIVE</string>
+    <string name="app_name">HOSO</string>
     <string name="leak_canary_test_class_name">assertk.Assert</string>
 </resources>
\ No newline at end of file
diff --git a/common/src/main/res/layout/notification_message.xml b/common/src/main/res/layout/notification_message.xml
index 9cb3fd00d..bcdc2c179 100644
--- a/common/src/main/res/layout/notification_message.xml
+++ b/common/src/main/res/layout/notification_message.xml
@@ -54,7 +54,7 @@
         android:layout_height="wrap_content"
         android:layout_alignParentRight="true"
         android:layout_marginRight="15dp"
-        android:text="PD LIVE"
+        android:text="HOSO"
         android:textColor="@color/gray3" />
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/common/src/main/res/layout/rule_of_war_popup.xml b/common/src/main/res/layout/rule_of_war_popup.xml
index b57f0eec2..81343fd74 100644
--- a/common/src/main/res/layout/rule_of_war_popup.xml
+++ b/common/src/main/res/layout/rule_of_war_popup.xml
@@ -37,7 +37,7 @@
                     android:layout_marginStart="14dp"
                     android:layout_marginEnd="14dp"
                     android:textColor="#0D21B2"
-                    tools:text="1.戰令開啟時，完成戰令任務，提升戰令等級，可獲得大量等級獎勵。\n2.所有用戶免費解鎖普通版，戰令開啟時隨時可進階為精英版和尊享版，獲得豐厚額外專屬獎勵。\n3.三種戰令都會獎勵積分，可在兌換商城中兌換心儀的寶貝，部分寶貝兌換有戰令等級要求或兌換數量限制。\n4.每日任務0點刷新，未完成任務進度不再累計，每季任務將會在新一季戰令開啟時刷新。\n5.任務達成時需主動領取經驗，未领取經驗將會在任務刷新時過期。\n6.活動最終解釋權歸PDLIVE所有。"
+                    tools:text="1.戰令開啟時，完成戰令任務，提升戰令等級，可獲得大量等級獎勵。\n2.所有用戶免費解鎖普通版，戰令開啟時隨時可進階為精英版和尊享版，獲得豐厚額外專屬獎勵。\n3.三種戰令都會獎勵積分，可在兌換商城中兌換心儀的寶貝，部分寶貝兌換有戰令等級要求或兌換數量限制。\n4.每日任務0點刷新，未完成任務進度不再累計，每季任務將會在新一季戰令開啟時刷新。\n5.任務達成時需主動領取經驗，未领取經驗將會在任務刷新時過期。\n6.活動最終解釋權歸HOSO所有。"
                     android:textSize="14sp" />
             </LinearLayout>
         </androidx.core.widget.NestedScrollView>
diff --git a/common/src/main/res/values-zh/strings.xml b/common/src/main/res/values-zh/strings.xml
index 7025e1357..efa1bd251 100644
--- a/common/src/main/res/values-zh/strings.xml
+++ b/common/src/main/res/values-zh/strings.xml
@@ -74,7 +74,7 @@
     <string name="quit_mic">退出連麥</string>
     <string name="edit_profile_city">所在地</string>
     <string name="edit_one_1">編輯個人資料</string>
-    <string name="edit_one_2">進入PD LIVE</string>
+    <string name="edit_one_2">進入HOSO</string>
     <string name="edit_one_3">是否確認使用一下資料</string>
     <string name="edit_one_4">確認</string>
     <string name="edit_one_5">暱稱重複，請重新輸入</string>
@@ -645,7 +645,7 @@
     <string name="one_free">一次免費贈送禮物特權！</string>
 
     <string name="no_car">TA還沒有座騎</string>
-    <string name="welcome_pdlive">歡迎來到PDLIVE</string>
+    <string name="welcome_pdlive">歡迎來到HOSO</string>
     <string name="newcomer">恭喜你獲得了新人獎勵</string>
 
     <string name="FILE_PROVIDER">com.newpdlive.sy.fileprovider</string>
@@ -1045,8 +1045,8 @@
     <string name="click_to_view">點擊查看</string>
     <string name="anchor_task">主播任務</string>
     <string name="anchor_agreement">我已閱讀並同意</string>
-    <string name="anchor_agreement_hint">請閱讀並同意《PDLIVE主播協議》</string>
-    <string name="anchor_hint">《PDLIVE主播協議》</string>
+    <string name="anchor_agreement_hint">請閱讀並同意《HOSO主播協議》</string>
+    <string name="anchor_hint">《HOSO主播協議》</string>
     <string name="live_task_new_user_timer">新秀主播時效截止至 </string>
     <string name="live_data_coin">鑽石收禮</string>
     <string name="live_data_gold">金豆收禮</string>
@@ -1070,19 +1070,19 @@
     <string name="go_to_the_sign">前往簽到中心</string>
     <string name="confirm_pick_up">確認領取</string>
     <string name="customer_service2">無法登陸？點此聯繫客服</string>
-    <string name="next_step_is_consent">進入下一步即代表同意</string>
+    <string name="next_step_is_consent">登錄即代表您同意</string>
     <string name="user_protocol2">用戶協議</string>
     <string name="and">和</string>
     <string name="privacy_terms">隱私條款</string>
     <string name="terms_and_policies">條款和政策</string>
-    <string name="treat_and_protect">歡迎來到PD LIVE，對於您的個人信息及隱私，我們將採用最高標準對待和保護。</string>
+    <string name="treat_and_protect">歡迎來到HOSO，對於您的個人信息及隱私，我們將採用最高標準對待和保護。</string>
     <string name="install_the_application">詳情請您閱讀以下安裝應用程序的消息：</string>
     <string name="anti_cheating_services">為了給用戶提供更好的服務，我們的產品集成[友盟SDK]，SDK需要收集您的设备信息（IMEI/MAC/Android ID/IDFA/OpenUDID/GUID/IP地址/SIM 卡 IMSI 信息等），為便於您更好地了解[友盟SDK]采集的數據類型及用途，以及何保護您的個人信息，您可以登陸：https://www.umeng.com/page/policy 了解[友盟SDK]隱私權政策【友盟+】隐私政策【友盟+】,第三方全域大数据服务提供商,为客户提供PC/APP/线下统计,广告效果监测,消息推送/微社区/分享/IM等运营工具,DIP,全域指数与行业报告等。https://www.umeng.com/page/policy</string>
     <string name="agreement">同意</string>
     <string name="read_and_agre">點擊同意後即代表您已閱讀並同意以上所有內容。</string>
     <string name="support_login">本應用會收集位置數據以支持登錄和註冊的功能使用。</string>
-    <string name="come_to">歡迎來到PD LIVE。</string>
-    <string name="sign_up_for">註冊PD LIVE</string>
+    <string name="come_to">歡迎來到HOSO。</string>
+    <string name="sign_up_for">註冊HOSO</string>
     <string name="register_and_log_in">註冊並登錄</string>
     <string name="enjoy_a_lot">開通貴族，尊享超多特權！</string>
     <string name="layout_live_anchor_say_ready_title">女神說</string>
@@ -1366,11 +1366,11 @@
     <string name="sud_in_game_game_game_peer_user">對局用戶</string>
     <string name="sud_in_game_game_game_peer_user_nodata">暫無記錄~</string>
     <string name="sud_in_game_game_game_peer_today">今日</string>
-    <string name="sud_in_game_rule_hint1">1、互動遊戲是PDLIVE為用戶提供的全新板塊，用戶可以在首頁【遊戲專區】或直播間內參與；</string>
+    <string name="sud_in_game_rule_hint1">1、互動遊戲是HOSO為用戶提供的全新板塊，用戶可以在首頁【遊戲專區】或直播間內參與；</string>
     <string name="sud_in_game_rule_hint2">2、目前已上線【五子棋】、【飛行棋】、【碰碰我最強】、【怪物消消樂】、【跳一跳】、【友情闖關】、【魔法大樂鬥】、【美式8球】後續將會提供更多遊戲種類，敬請期期待；</string>
     <string name="sud_in_game_rule_hint3">3、 用戶可自定義設定遊戲門檻，要求在100~50000金豆之間，數額必須為10的倍數；</string>
     <string name="sud_in_game_rule_hint4">4、 遊戲開始時將會收取參與遊戲用戶的籌碼，在遊戲結束後，將收取10%的籌碼作為門票，剩餘籌碼將全部給予勝利用戶，平局時將會扣除相應籌碼门票後返還給用戶；</string>
-    <string name="sud_in_game_rule_hint5">5、活動最終解釋權歸PDLIVE所有。</string>
+    <string name="sud_in_game_rule_hint5">5、活動最終解釋權歸HOSO所有。</string>
     <string name="sud_in_game_game_currency_item">貨幣</string>
     <string name="sud_in_game_game_currency">貨幣：</string>
     <string name="sud_in_game_game_time">時間：</string>
@@ -1388,10 +1388,10 @@
     <string name="rule_of_war_hint3">3.三種戰令都會獎勵積分，可在兌換商城中兌換心 儀的寶貝，部分寶貝兌換有戰令等級要求或兌換數 量限制。</string>
     <string name="rule_of_war_hint4">4.每日任務0點刷新，未完成任務進度不再累計， 每季任務將會在新一季戰令開啟時刷新。</string>
     <string name="rule_of_war_hint5">5.任務達成時需主動領取經驗，未领取經驗將會在 任務刷新時自动领取。</string>
-    <string name="rule_of_war_hint6">6.活動最終解釋權歸PDLIVE所有。</string>
+    <string name="rule_of_war_hint6">6.活動最終解釋權歸HOSO所有。</string>
     <string name="conversion_quantity_need_of_use1">1.1星幣兌換1張觀影券，您可以根據需求自定義兌換數量，觀影券一經兌換不可撤銷，請提前確認；</string>
     <string name="conversion_quantity_need_of_use2">2.1張觀影券可觀看一集短劇，兌換成功後即可返回觀影頁面，使用觀影券繼續觀看影片；</string>
-    <string name="conversion_quantity_need_of_use3">3.觀影券禁止線下交易、收購等不正當行為，PDLIVE將對各類以盈利為目的的交易行為進行嚴厲打擊。</string>
+    <string name="conversion_quantity_need_of_use3">3.觀影券禁止線下交易、收購等不正當行為，HOSO將對各類以盈利為目的的交易行為進行嚴厲打擊。</string>
 
     <string name="pay_cancel">支付取消</string>
     <string name="pay_suc">支付成功</string>
@@ -1472,7 +1472,7 @@
     <string name="dragon_rule1">1.龍神送財是您開通【神之守護】後給予直播間觀眾的福利，您可選擇自定義金豆數量並召喚龍神給直播间内主播粉丝瓜分（金豆數量不低於1000），或者您可以選擇不开启活动；</string>
     <string name="dragon_rule2">2.此次金豆消耗将计入守护贡献值和经验值增长，每提供10金豆將獲得1貢獻值，貢獻值可用於增長守護等級；</string>
     <string name="dragon_rule3">3.用戶關注主播並參與活動，將在五分鐘倒計時後將獲得您提供的福利；</string>
-    <string name="dragon_rule4">4.此活動的最終解釋權歸PDLIVE所有。</string>
+    <string name="dragon_rule4">4.此活動的最終解釋權歸HOSO所有。</string>
     <string name="dragon_immediate_participation">立即參與</string>
     <string name="continuative_guardian_privilege">延續守護特權</string>
     <string name="travel_renewal">前往續費</string>
@@ -1491,7 +1491,7 @@
     <string name="current_guard_expires">暫時無法開通該守護，請當前守護到期後嘗試</string>
     <string name="dragon_rule5">1.神龍送財是開通【神之守護】的用戶給予直播間觀眾的免費金豆福利；</string>
     <string name="dragon_rule6">2.用戶關注主播並參與活動，將在倒計時五分鐘結束後瓜分活動金豆；</string>
-    <string name="dragon_rule7">3.此活動的最終解釋權歸PDLIVE所有。</string>
+    <string name="dragon_rule7">3.此活動的最終解釋權歸HOSO所有。</string>
     <string name="main_type_theater">短劇</string>
     <string name="prank_complete">完成*1</string>
     <string name="pking_over">主播正在PK，稍後再試</string>
diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml
index 31ff8afe0..633a6b76a 100644
--- a/common/src/main/res/values/strings.xml
+++ b/common/src/main/res/values/strings.xml
@@ -659,7 +659,7 @@
     <string name="save">Preservation</string>
     <string name="reg">Register</string>
     <string name="no_more_mic">No one is currently in the voice link</string>
-    <string name="welcome_pdlive">Welcome to PDLive</string>
+    <string name="welcome_pdlive">Welcome to HOSO</string>
     <string name="newcomer">Newcomer Bonus</string>
     <string name="exp">EXP</string>
     <string name="new_rewards">Complete newcomer tasks for more rewards</string>
@@ -885,7 +885,7 @@
     <string name="online_service">Online Service</string>
     <string name="popular_tickets">Hot Ticket</string>
     <string name="register_and_log_in">Register and log in</string>
-    <string name="sign_up_for">Sign in PDlive</string>
+    <string name="sign_up_for">Sign in HOSO</string>
     <string name="tell_the_world">Tell the world！</string>
     <string name="better_emperor_hint">Tell the world! %s recommends anchor %s to everyone!</string>
     <string name="emperor_hint">Tell the world! %s recommends the anchor %s to everyone, and the splendid glance is amazing！</string>
@@ -1020,8 +1020,8 @@
     <string name="click_to_view">Click To View</string>
     <string name="anchor_task">Anchor Task</string>
     <string name="anchor_agreement">I have read and agreed to the </string>
-    <string name="anchor_agreement_hint">Please read and agree to the PDLIVE Host Agreement</string>
-    <string name="anchor_hint">PDLIVE Host Agreement</string>
+    <string name="anchor_agreement_hint">Please read and agree to the HOSO Host Agreement</string>
+    <string name="anchor_hint">HOSO Host Agreement</string>
     <string name="live_task_new_user_timer">The statute of limitations for new anchors expires</string>
     <string name="live_data_coin">coin</string>
     <string name="live_data_gold">gold</string>
@@ -1044,17 +1044,17 @@
     <string name="go_to_the_sign">Go to the sign-in center</string>
     <string name="confirm_pick_up">Confirm pick up</string>
     <string name="customer_service2">Unable to login? Click here to contact customer service</string>
-    <string name="next_step_is_consent">By continuing, you are agree to our Terms of </string>
+    <string name="next_step_is_consent">By logging in, you agree </string>
     <string name="user_protocol2"> use</string>
     <string name="and">&amp;</string>
     <string name="privacy_terms">Privacy Policy</string>
     <string name="terms_and_policies">Terms and policies</string>
     <string name="install_the_application">For details, please read the following message to install the application:</string>
-    <string name="treat_and_protect">Welcome to PD LIVE. For your personal information and privacy, we will adopt the highest standards of treatment and protection.</string>
+    <string name="treat_and_protect">Welcome to HOSO. For your personal information and privacy, we will adopt the highest standards of treatment and protection.</string>
     <string name="anti_cheating_services">In order to provide users with better services, our products integrate [Alliance SDK], SDK needs to collect your device information (IMEI/MAC/Android ID/IDFA/OpenUDID/GUID/IP address /SIM card IMSI information, etc.), In order for you to better understand the types and purposes of the data collected by [Alliance SDK] and how to protect your personal information, you can log on to: https://www.umeng.com/page/policy  Learn about [Alliance SDK] Privacy Policy [Alliance +] Privacy Policy [Alliance +], a third-party global big data service provider, providing customers with PC/APP/ offline statistics, advertising effect monitoring, message push/micro community/sharing /IM and other operating tools,DIP, global index and industry reports. https://www.umeng.com/page/policy</string>
     <string name="read_and_agre">Clicking Agree means you have read and agree to all of the above.。</string>
     <string name="agreement">agreement</string>
-    <string name="come_to">Welcome to PD LIVE.</string>
+    <string name="come_to">Welcome to HOSO.</string>
     <string name="live_gift">gift</string>
     <string name="register_tip_2">User service agreement</string>
     <string name="live_fans_medal_pri_des">一 Fan privilege 一</string>
@@ -1378,11 +1378,11 @@
     <string name="sud_in_game_game_game_peer_today">"Today "</string>
     <string name="sud_in_game_game_game_peer_today_7">"≤7 days "</string>
     <string name="sud_in_game_game_game_peer_today_30">≤ 30 days</string>
-    <string name="sud_in_game_rule_hint1">1.Interactive games are a new section provided by PDLIVE for users, who can participate in the game section on the homepage or in the live room;</string>
+    <string name="sud_in_game_rule_hint1">1.Interactive games are a new section provided by HOSO for users, who can participate in the game section on the homepage or in the live room;</string>
     <string name="sud_in_game_rule_hint2">2.Currently, [Backgammon], [Flying Chess], [Bumper I’m the Strongest], [Monster Match], [Jump], [Friendly Challenge], [Magic Battle], [American 8 Ball] More game types will be provided in the future, so stay tuned;</string>
     <string name="sud_in_game_rule_hint3">3. Users can customize the game threshold, which must be between 100 to 50000 gold beans , and the amount must be a multiple of 10;</string>
     <string name="sud_in_game_rule_hint4">4.At the beginning of the game, chips from participating users will be collected. After the game ends, 10% of the chips will be collected as tickets, and all remaining chips will be given to the winning users.In a draw, the corresponding chips will be deducted from the tickets and returned to the users;</string>
-    <string name="sud_in_game_rule_hint5">5. The final interpretation right of the event belongs to PDLIVE.</string>
+    <string name="sud_in_game_rule_hint5">5. The final interpretation right of the event belongs to HOSO.</string>
     <string name="room_sill0_100">0-100 coins</string>
     <string name="room_sill100_500">100-500 coins</string>
     <string name="room_sill500_m">Above 500 coins</string>
@@ -1392,7 +1392,7 @@
     <string name="conversion_quantity_need_of_use">Exchange&amp;Usage Rules:</string>
     <string name="conversion_quantity_need_of_use1">1.One star coin can be exchanged for one ticket. You can customize the exchange quantity according to your needs. Once the ticket is exchanged, it cannot be revoked. Please confirm in advance;</string>
     <string name="conversion_quantity_need_of_use2">2.One ticket can be used to watch one episode of a short drama. After successful redemption, you can return to the viewing page and use the ticket to continue watching the movie;</string>
-    <string name="conversion_quantity_need_of_use3">3.Ticket prohibit illegal activities such as offline trading and acquisitions, and PDLIVE will crack down severely on various profit-making trading activities.</string>
+    <string name="conversion_quantity_need_of_use3">3.Ticket prohibit illegal activities such as offline trading and acquisitions, and HOSO will crack down severely on various profit-making trading activities.</string>
 
     <string name="msg_del_sys01">The items inside have not been claimed yet.Are you sure to delete the message？</string>
     <string name="msg_del_sys02">Are you sure to delete the message？</string>
@@ -1410,7 +1410,7 @@
     <string name="rule_of_war_hint3">3.三種戰令都會獎勵積分，可在兌換商城中兌換心 儀的寶貝，部分寶貝兌換有戰令等級要求或兌換數 量限制。</string>
     <string name="rule_of_war_hint4">4.每日任務0點刷新，未完成任務進度不再累計， 每季任務將會在新一季戰令開啟時刷新。</string>
     <string name="rule_of_war_hint5">5.任務達成時需主動領取經驗，未领取經驗將會在 任務刷新時自动领取。</string>
-    <string name="rule_of_war_hint6">6.活動最終解釋權歸PDLIVE所有。</string>
+    <string name="rule_of_war_hint6">6.活動最終解釋權歸HOSO所有。</string>
     <string name="more_integral">More points</string>
     <string name="gift_overvalue">Gifts worth over 200%</string>
     <string name="gift_overvalue3">Gifts worth over 300%</string>
@@ -1479,7 +1479,7 @@
     <string name="dragon_rule1">"1. Dragon's Wealth is a benefit that you provide to the audience of the live room after activating the 【God Guardian】. You can choose to customize the number of golden beans and summon Dragon God to divide the profits among the fans of the live broadcast room (the number of golden beans is not less than 1000), or you can choose not to activate the activity; "</string>
     <string name="dragon_rule2">"2. The consumption of gold beans this time will be included in the guardian contribution value and experience value growth. For every 10 gold beans provided, 1 contribution value will be obtained, which can be used to increase the guardian level; "</string>
     <string name="dragon_rule3">"3. Users who follow the anchor and participate in activities will receive the benefits you provide after a five minute countdown; "</string>
-    <string name="dragon_rule4">4. The final interpretation of this activity belongs to PDLIVE.</string>
+    <string name="dragon_rule4">4. The final interpretation of this activity belongs to HOSO.</string>
     <string name="dragon_immediate_participation">Participate</string>
     <string name="continuative_guardian_privilege">Renew now to extend guardian privileges\n</string>
     <string name="continuative_guardian_privilege2">Now renew and enjoy guardian privileges again\n</string>
@@ -1499,7 +1499,7 @@
     <string name="current_guard_expires">We are currently unable to activate this guard. Please try again after the current guard expires</string>
     <string name="dragon_rule5">1.Dragon\'s Wealth is a free golden bean benefit provided to live stream viewers by users who have activated the 【God Guardian】 feature;</string>
     <string name="dragon_rule6">2.Users who follow the anchor and participate in the activity will divide the gold beans of the activity after the countdown of five minutes ends;</string>
-    <string name="dragon_rule7">3.The final interpretation of this activity belongs to PDLIVE.</string>
+    <string name="dragon_rule7">3.The final interpretation of this activity belongs to HOSO.</string>
     <string name="main_type_theater" >Theater</string>
     <string name="pking_over">The anchor is in PK, please try again later</string>
     <string name="prank_complete">once</string>
diff --git a/live/src/main/res/drawable/background_fff_d20.xml b/live/src/main/res/drawable/background_fff_d20.xml
index 8b466e367..387da583f 100644
--- a/live/src/main/res/drawable/background_fff_d20.xml
+++ b/live/src/main/res/drawable/background_fff_d20.xml
@@ -3,7 +3,7 @@
     <item>
         <shape android:shape="rectangle">
             <corners android:radius="30dp" />
-            <solid android:color="#ffffff" />
+            <solid android:color="#FAFAFA" />
         </shape>
     </item>
 </selector>
\ No newline at end of file
diff --git a/live/src/main/res/drawable/button_ffc621.xml b/live/src/main/res/drawable/button_ffc621.xml
index e4b6e8c04..113a8e881 100644
--- a/live/src/main/res/drawable/button_ffc621.xml
+++ b/live/src/main/res/drawable/button_ffc621.xml
@@ -2,7 +2,7 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
         <shape android:shape="rectangle">
-            <solid android:color="#33FFC621" />
+            <solid android:color="#80f9ff" />
             <corners android:topLeftRadius="13dp" android:topRightRadius="13dp" android:bottomLeftRadius="13dp" android:bottomRightRadius="13dp" />
         </shape>
     </item>
diff --git a/live/src/main/res/values-zh/strings.xml b/live/src/main/res/values-zh/strings.xml
index 04f92fff9..20b75a361 100644
--- a/live/src/main/res/values-zh/strings.xml
+++ b/live/src/main/res/values-zh/strings.xml
@@ -102,7 +102,7 @@
     <string name="live_fans_group_info_text3">3. 專屬禮包與主播為 1 對 1 綁定關係，購買專屬 禮包中禮物資源只可送給該主播</string>
     <string name="live_fans_group_info_text4">4. 禮包中禮物資源有效期 30 天，有效期內均可正 常贈送；過期後禮物資源失效不可贈送</string>
     <string name="live_fans_group_info2_text1">1. 當月只可購買一次，購買后禮包实时發放</string>
-    <string name="live_fans_group_info2_text2">2. 该禮包最終解釋權歸 PD Live 所有</string>
+    <string name="live_fans_group_info2_text2">2. 该禮包最終解釋權歸 HOSO 所有</string>
     <string name="live_fans_group_info_title">禮包介紹</string>
     <string name="live_fans_group_info2_title">購買規則</string>
     <string name="live_fans_follow_toast">加入粉絲團,解鎖專屬禮物</string>
diff --git a/live/src/main/res/values/strings.xml b/live/src/main/res/values/strings.xml
index d0dcf7d23..b874c35c6 100644
--- a/live/src/main/res/values/strings.xml
+++ b/live/src/main/res/values/strings.xml
@@ -104,7 +104,7 @@
     <string name="live_fans_group_info_text3">3 The exclusive gift package is bound to the anchor in a one-on-one relationship, and purchasing gift resources in the exclusive gift package can only be given to the anchor</string>
     <string name="live_fans_group_info_text4">4 The gift resources in the gift package are valid for 30 days and can be given normally during the validity period; Gift resources become invalid and cannot be given after expiration</string>
     <string name="live_fans_group_info2_text1">1 Purchase can only be made once a month, and the gift package will be distributed in real-time after purchase</string>
-    <string name="live_fans_group_info2_text2">2. The final interpretation rights of this gift package belong to PD Live</string>
+    <string name="live_fans_group_info2_text2">2. The final interpretation rights of this gift package belong to HOSO</string>
     <string name="live_fans_group_info_title">Introduction</string>
     <string name="live_fans_group_info2_title">Rules</string>
     <string name="live_fans_follow_toast">Join the fan group and unlock exclusive gifts</string>
diff --git a/main/src/main/java/com/yunbao/main/activity/MainActivity.java b/main/src/main/java/com/yunbao/main/activity/MainActivity.java
index b002e65f9..4097a2884 100644
--- a/main/src/main/java/com/yunbao/main/activity/MainActivity.java
+++ b/main/src/main/java/com/yunbao/main/activity/MainActivity.java
@@ -363,13 +363,13 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
                             mMainHomeCommunityViewHolder.onPauseVideo();
                         }
                         break;
-                    case 1:
+                    case 2:
                         MobclickAgent.onEvent(mContext, "community", "社区");
                         if (mMainHomeCommunityViewHolder != null) {
                             mMainHomeCommunityViewHolder.onResumePlay();
                         }
                         break;
-                    case 2:
+                    case 1:
                         MobclickAgent.onEvent(mContext, "information", "消息");
                         if (mMainHomeCommunityViewHolder != null) {
                             mMainHomeCommunityViewHolder.onPauseVideo();
@@ -1302,11 +1302,11 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
                     mainHomeViewHolder = new MainHomeViewHolder(mContext, parent);
                     vh = mainHomeViewHolder;
 
-                } else if (position == 1) {
+                } else if (position == 2) {
                     mMainHomeCommunityViewHolder = new MainHomeCommunityViewHolder(mContext, parent, this);//社区
                     vh = mMainHomeCommunityViewHolder;
 
-                } else if (position == 2) {
+                } else if (position == 1) {
                     mainMessageViewHolder = new MainMessageViewHolder(this, parent);
                     vh = mainMessageViewHolder;
 
diff --git a/main/src/main/java/com/yunbao/main/adapter/MainHomeLivesClassAdapter.java b/main/src/main/java/com/yunbao/main/adapter/MainHomeLivesClassAdapter.java
index 582bf1b5c..220088e15 100644
--- a/main/src/main/java/com/yunbao/main/adapter/MainHomeLivesClassAdapter.java
+++ b/main/src/main/java/com/yunbao/main/adapter/MainHomeLivesClassAdapter.java
@@ -97,7 +97,7 @@ public class MainHomeLivesClassAdapter extends RecyclerView.Adapter<MainHomeLive
 
             if (position == choice) {
                 mName.setBackgroundResource(R.drawable.button_ffc621);
-                mName.setTextColor(Color.parseColor("#FFC621"));
+                mName.setTextColor(Color.parseColor("#2ED0FF"));
             } else {
                 mName.setBackgroundResource(R.drawable.button_cbd5e0);
                 mName.setTextColor(Color.parseColor("#484D68"));
diff --git a/main/src/main/java/com/yunbao/main/views/AbsMainHomeParentViewHolder.java b/main/src/main/java/com/yunbao/main/views/AbsMainHomeParentViewHolder.java
index 972a5e159..e5e981782 100644
--- a/main/src/main/java/com/yunbao/main/views/AbsMainHomeParentViewHolder.java
+++ b/main/src/main/java/com/yunbao/main/views/AbsMainHomeParentViewHolder.java
@@ -2,15 +2,20 @@ package com.yunbao.main.views;
 
 import android.content.Context;
 import android.graphics.Color;
+
 import com.google.android.material.appbar.AppBarLayout;
+
 import androidx.core.content.ContextCompat;
 import androidx.viewpager.widget.ViewPager;
+
+import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
 import android.widget.TextView;
 
 import com.yunbao.common.adapter.ViewPagerAdapter;
+import com.yunbao.common.custom.MyViewPager;
 import com.yunbao.common.utils.DpUtil;
 import com.yunbao.common.utils.SpUtil;
 import com.yunbao.common.views.AbsMainViewHolder;
@@ -41,7 +46,7 @@ import java.util.List;
 public abstract class AbsMainHomeParentViewHolder extends AbsMainViewHolder {
 
     private AppBarLayout mAppBarLayout;
-    protected ViewPager mViewPager;
+    protected MyViewPager mViewPager;
     private MagicIndicator mIndicator;
     private TextView mRedPoint;//显示未读消息数量的红点
     protected AbsMainHomeChildViewHolder[] mViewHolders;
@@ -59,7 +64,7 @@ public abstract class AbsMainHomeParentViewHolder extends AbsMainViewHolder {
     public void init() {
         mAppBarLayout = (AppBarLayout) findViewById(R.id.appBarLayout);
         View mAppBarChildAt = mAppBarLayout.getChildAt(0);
-        AppBarLayout.LayoutParams  mAppBarParams = (AppBarLayout.LayoutParams)                  mAppBarChildAt.getLayoutParams();
+        AppBarLayout.LayoutParams mAppBarParams = (AppBarLayout.LayoutParams) mAppBarChildAt.getLayoutParams();
         mAppBarParams.setScrollFlags(0);
         mAppBarLayout.addOnOffsetChangedListener(new AppBarStateListener() {
             @Override
@@ -100,7 +105,7 @@ public abstract class AbsMainHomeParentViewHolder extends AbsMainViewHolder {
             mViewList.add(frameLayout);
         }
         mViewHolders = new AbsMainHomeChildViewHolder[pageCount];
-        mViewPager = (ViewPager) findViewById(R.id.viewPager);
+        mViewPager = (MyViewPager) findViewById(R.id.viewPager);
         if (pageCount > 1) {
             mViewPager.setOffscreenPageLimit(pageCount - 1);
         }
@@ -137,7 +142,7 @@ public abstract class AbsMainHomeParentViewHolder extends AbsMainViewHolder {
             public IPagerTitleView getTitleView(Context context, final int index) {
                 SimplePagerTitleView simplePagerTitleView = new ColorTransitionPagerTitleView(context);
                 simplePagerTitleView.setNormalColor(Color.parseColor("#B1B1B1"));
-                simplePagerTitleView.setSelectedColor(Color.parseColor("#FFC621"));
+                simplePagerTitleView.setSelectedColor(Color.parseColor("#2ED0FF"));
                 simplePagerTitleView.setText(titles[index]);
                 simplePagerTitleView.setTextSize(18);
                 simplePagerTitleView.getPaint().setFakeBoldText(true);
@@ -145,7 +150,7 @@ public abstract class AbsMainHomeParentViewHolder extends AbsMainViewHolder {
                     @Override
                     public void onClick(View v) {
                         if (mViewPager != null) {
-                            mViewPager.setCurrentItem(index);
+                         //   mViewPager.setCurrentItem(index);
                         }
                     }
                 });
@@ -158,7 +163,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("#FFC621"));
+                linePagerIndicator.setColors(Color.parseColor("#2ED0FF"));
                 return linePagerIndicator;
             }
         });
@@ -166,11 +171,11 @@ public abstract class AbsMainHomeParentViewHolder extends AbsMainViewHolder {
         ViewPagerHelper.bind(mIndicator, mViewPager);
         mRedPoint = (TextView) findViewById(R.id.red_point);
 
-        mIndicator.setNavigator(commonNavigator);
-        ViewPagerHelper.bind(mIndicator, mViewPager);
         //默认选择第几个
-        mIndicator.onPageSelected(1);
-        mViewPager.setCurrentItem(1);
+        mViewPager.setCurrentItem(0);
+        mIndicator.onPageSelected(0);
+        mViewPager.setCanScroll(false);
+        loadPageData(0);
         unReadMsgHandle();
     }
 
diff --git a/main/src/main/java/com/yunbao/main/views/MainHomeCommunityViewHolder.java b/main/src/main/java/com/yunbao/main/views/MainHomeCommunityViewHolder.java
index c5695cfec..e1b31fa0e 100644
--- a/main/src/main/java/com/yunbao/main/views/MainHomeCommunityViewHolder.java
+++ b/main/src/main/java/com/yunbao/main/views/MainHomeCommunityViewHolder.java
@@ -174,9 +174,10 @@ public class MainHomeCommunityViewHolder extends AbsMainHomeChildViewHolder impl
     String[] titles;
 
     private void initTab() {
-        titles = new String[]{"社區", "短劇"};
+        //TODO 短剧
+        titles = new String[]{"社區"/*, "短劇"*/};
         if (!WordUtil.isNewZh()) {
-            titles = new String[]{"Community", "Theater"};
+            titles = new String[]{"Community"/*, "Theater"*/};
         }
         CommonNavigator commonNavigator = new CommonNavigator(mContext);
         commonNavigator.setAdjustMode(true);
@@ -190,7 +191,7 @@ public class MainHomeCommunityViewHolder extends AbsMainHomeChildViewHolder impl
             public IPagerTitleView getTitleView(Context context, int index) {
                 SimplePagerTitleView simplePagerTitleView = new ColorTransitionPagerTitleView(context);
                 simplePagerTitleView.setNormalColor(Color.parseColor("#B1B1B1"));
-                simplePagerTitleView.setSelectedColor(Color.parseColor("#FFC621"));
+                simplePagerTitleView.setSelectedColor(Color.parseColor("#2ED0FF"));
                 simplePagerTitleView.setText(titles[index]);
                 simplePagerTitleView.setTextSize(18);
                 simplePagerTitleView.getPaint().setFakeBoldText(true);
@@ -215,7 +216,7 @@ public class MainHomeCommunityViewHolder extends AbsMainHomeChildViewHolder impl
                 linePagerIndicator.setMode(LinePagerIndicator.MODE_WRAP_CONTENT);
                 linePagerIndicator.setXOffset(DpUtil.dp2px(5));
                 linePagerIndicator.setRoundRadius(DpUtil.dp2px(2));
-                linePagerIndicator.setColors(Color.parseColor("#FFC621"));
+                linePagerIndicator.setColors(Color.parseColor("#2ED0FF"));
                 return linePagerIndicator;
             }
         });
diff --git a/main/src/main/java/com/yunbao/main/views/MainHomeViewHolder.java b/main/src/main/java/com/yunbao/main/views/MainHomeViewHolder.java
index 3991b9493..5fc84cd3f 100644
--- a/main/src/main/java/com/yunbao/main/views/MainHomeViewHolder.java
+++ b/main/src/main/java/com/yunbao/main/views/MainHomeViewHolder.java
@@ -133,11 +133,11 @@ public class MainHomeViewHolder extends AbsMainHomeParentViewHolder {
                     return;
                 }
                 if (position == -1) {
-                } else if (position == 0) {
+                } else if (position == 1) {
                     mainHomeFollLiveViewHolder = new MainHomeFollLiveViewHolder(mContext, parent);
                     vh = mainHomeFollLiveViewHolder;
 
-                } else if (position == 1) {
+                } else if (position == 0) {
                     mainHomeLiveViewHolder = new MainHomeLiveViewHolder(mContext, parent);
                     vh = mainHomeLiveViewHolder;
 
@@ -176,7 +176,12 @@ public class MainHomeViewHolder extends AbsMainHomeParentViewHolder {
 
     @Override
     protected String[] getTitles() {
-        return new String[]{mContext.getString(R.string.follow), mContext.getString(R.string.hot), mContext.getString(R.string.recomment), mContext.getString(R.string.main_tabs_red_packet),};
+        return new String[]{
+            //    mContext.getString(R.string.follow),
+                mContext.getString(R.string.hot),
+             //   mContext.getString(R.string.recomment),
+            //    mContext.getString(R.string.main_tabs_red_packet),
+        };
     }
 
 
diff --git a/main/src/main/res/drawable/border_fdbe40.xml b/main/src/main/res/drawable/border_fdbe40.xml
index 3fda70d15..b02b0498c 100644
--- a/main/src/main/res/drawable/border_fdbe40.xml
+++ b/main/src/main/res/drawable/border_fdbe40.xml
@@ -3,7 +3,7 @@
     <item>
         <shape android:shape="rectangle">
             <corners android:radius="30dp" />
-            <solid android:color="#fdbe40  " />
+            <solid android:color="#2ED0FF  " />
         </shape>
     </item>
 </selector>
diff --git a/main/src/main/res/layout/activity_entry.xml b/main/src/main/res/layout/activity_entry.xml
index 2680499be..536d0fc60 100644
--- a/main/src/main/res/layout/activity_entry.xml
+++ b/main/src/main/res/layout/activity_entry.xml
@@ -3,16 +3,56 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
+    android:background="#fff"
     android:layout_height="match_parent"
     tools:context=".activity.EntryActivity">
 
 
     <com.yunbao.main.views.CustomVideoView
         android:id="@+id/video_view"
+        android:visibility="gone"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_gravity="center" />
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
 
+        <ImageView
+            android:id="@+id/cover"
+            android:layout_width="match_parent"
+            android:layout_height="342dp"
+            android:scaleType="centerCrop"
+            android:src="@mipmap/bg_app_launch"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <LinearLayout
+            android:id="@+id/app_logo"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="60dp"
+            android:transitionName="app_logo"
+            android:gravity="center"
+            android:orientation="vertical"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent">
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                app:srcCompat="@mipmap/ic_app_launch_logo" />
+
+            <ImageView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="20dp"
+                app:srcCompat="@mipmap/ic_app_launch_name" />
+        </LinearLayout>
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
     <ImageView
         android:id="@+id/img_view"
         android:layout_width="match_parent"
@@ -237,8 +277,8 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/customer_service2"
-                    android:textColor="@color/white"
-                    android:textSize="11sp" />
+                    android:textColor="#424242"
+                    android:textSize="12sp" />
             </LinearLayout>
 
             <LinearLayout
@@ -254,7 +294,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:text="@string/next_step_is_consent"
-                    android:textColor="#ffb1b1b1"
+                    android:textColor="#ABABAB"
                     android:textSize="10sp" />
 
 
@@ -263,6 +303,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:layout_marginLeft="1dp"
+                    android:textStyle="bold"
                     android:text="@string/user_protocol2"
                     android:textColor="#ffb1b1b1"
                     android:textSize="10sp" />
@@ -278,6 +319,7 @@
                 <TextView
                     android:id="@+id/btn_tip1"
                     android:layout_width="wrap_content"
+                    android:textStyle="bold"
                     android:layout_height="match_parent"
                     android:layout_marginLeft="1dp"
                     android:text="@string/privacy_terms"
@@ -294,14 +336,15 @@
         android:layout_height="wrap_content"
         android:layout_centerHorizontal="true"
         android:layout_marginTop="80dp"
-        android:src="@mipmap/white_logo" />
+        android:src="@mipmap/white_logo"
+        android:visibility="gone" />
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/webview_container"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:visibility="gone"
-        tools:visibility="visible">
+        tools:visibility="gone">
 
         <View
             android:id="@+id/view2"
diff --git a/main/src/main/res/layout/activity_find_pwd.xml b/main/src/main/res/layout/activity_find_pwd.xml
index b59f57aaa..4185fd481 100644
--- a/main/src/main/res/layout/activity_find_pwd.xml
+++ b/main/src/main/res/layout/activity_find_pwd.xml
@@ -38,7 +38,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/find_pwd_forget"
-        android:textColor="#ffff8d41"
+        android:textColor="#2ED0FF"
         android:textSize="24sp"
         android:layout_marginLeft="41dp"
         android:layout_marginTop="30dp"
diff --git a/main/src/main/res/layout/activity_login.xml b/main/src/main/res/layout/activity_login.xml
index c46ea6cbd..12b0a24ad 100644
--- a/main/src/main/res/layout/activity_login.xml
+++ b/main/src/main/res/layout/activity_login.xml
@@ -41,8 +41,8 @@
         android:layout_height="wrap_content"
         android:layout_marginLeft="45dp"
         android:layout_marginTop="49dp"
-        android:text="Hello，"
-        android:textColor="#ffff8d41"
+        android:text="Hello,"
+        android:textColor="#2ED0FF"
         android:textSize="33sp"
         android:textStyle="bold" />
 
diff --git a/main/src/main/res/layout/activity_register.xml b/main/src/main/res/layout/activity_register.xml
index a70f7261f..1b0769783 100644
--- a/main/src/main/res/layout/activity_register.xml
+++ b/main/src/main/res/layout/activity_register.xml
@@ -41,7 +41,7 @@
                 android:layout_marginTop="30dp"
                 android:layout_marginBottom="25dp"
                 android:text="@string/sign_up_for"
-                android:textColor="#ffff8d41"
+                android:textColor="#2ED0FF"
                 android:textSize="24sp" />
 
             <LinearLayout
diff --git a/main/src/main/res/layout/view_homemain.xml b/main/src/main/res/layout/view_homemain.xml
index 52e31bdfe..4f0ccaa39 100644
--- a/main/src/main/res/layout/view_homemain.xml
+++ b/main/src/main/res/layout/view_homemain.xml
@@ -53,7 +53,7 @@
                     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_list"
                     app:tbn_icon_size="28dp"
                     app:tbn_text_color_checked="@color/colorAccent"
                     app:tbn_text_color_unchecked="@color/gray1"
@@ -63,7 +63,7 @@
                     android:layout_width="0dp"
                     android:layout_height="match_parent"
                     android:layout_weight="1"
-                    app:tbn_icon_array_id="@array/main_tab_list"
+                    app:tbn_icon_array_id="@array/main_tab_video"
                     app:tbn_icon_size="28dp"
                     app:tbn_text_color_checked="@color/colorAccent"
                     app:tbn_text_color_unchecked="@color/gray1"
@@ -96,17 +96,8 @@
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
+                    android:gravity="center_horizontal"
                     android:layout_weight="1">
-
-                </LinearLayout>
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_marginEnd="5dp"
-                    android:layout_weight="1"
-                    android:gravity="right">
-
                     <TextView
                         android:id="@+id/v_table_redpoint"
                         android:layout_width="20dp"
@@ -118,6 +109,16 @@
                         android:visibility="gone" />
                 </LinearLayout>
 
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_marginEnd="5dp"
+                    android:layout_weight="1"
+                    android:gravity="right">
+
+
+                </LinearLayout>
+
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
diff --git a/main/src/main/res/layout/view_main_home.xml b/main/src/main/res/layout/view_main_home.xml
index dc97db9b1..061fddd92 100644
--- a/main/src/main/res/layout/view_main_home.xml
+++ b/main/src/main/res/layout/view_main_home.xml
@@ -43,6 +43,7 @@
 
                     <TextView
                         android:id="@+id/tvPlay"
+                        android:visibility="gone"
                         android:layout_width="wrap_content"
                         android:layout_height="match_parent"
                         android:layout_marginStart="5dp"
@@ -92,7 +93,7 @@
 
     </com.google.android.material.appbar.AppBarLayout>
 
-    <androidx.viewpager.widget.ViewPager
+    <com.yunbao.common.custom.MyViewPager
         android:id="@+id/viewPager"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
diff --git a/main/src/main/res/layout/view_main_home_video.xml b/main/src/main/res/layout/view_main_home_video.xml
index 88173de50..e9f15e4d8 100644
--- a/main/src/main/res/layout/view_main_home_video.xml
+++ b/main/src/main/res/layout/view_main_home_video.xml
@@ -63,7 +63,7 @@
                 android:layout_alignParentBottom="true"
                 android:layout_marginLeft="10dp"
                 android:textColor="@color/colorPrimary"
-                android:text="PD LIVE"
+                android:text="HOSO"
                 android:paddingTop="2dp"
                 android:textSize="20sp"
                 android:textStyle="bold" />
diff --git a/main/src/main/res/layout/view_main_me.xml b/main/src/main/res/layout/view_main_me.xml
index 9d5c05a9f..0c7cf9798 100644
--- a/main/src/main/res/layout/view_main_me.xml
+++ b/main/src/main/res/layout/view_main_me.xml
@@ -42,6 +42,35 @@
                         android:layout_marginTop="42dp"
                         android:orientation="horizontal">
 
+                        <RelativeLayout
+                            android:layout_width="114dp"
+                            android:layout_height="match_parent"
+                            android:layout_marginRight="18dp"
+                            android:gravity="center|right">
+
+                            <com.makeramen.roundedimageview.RoundedImageView
+                                android:id="@+id/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" />
+
+                        </RelativeLayout>
+
                         <LinearLayout
                             android:layout_width="match_parent"
                             android:layout_height="match_parent"
@@ -53,8 +82,8 @@
                                 android:id="@+id/complete_information_radius"
                                 android:layout_width="7dp"
                                 android:layout_height="7dp"
-                                android:layout_marginStart="115.9dp"
-                                android:layout_marginEnd="4dp"
+                                android:layout_gravity="end"
+                                android:layout_marginEnd="24dp"
                                 app:cardBackgroundColor="#FF5730"
                                 app:cardCornerRadius="20dp" />
 
@@ -62,7 +91,8 @@
                                 android:id="@+id/complete_information"
                                 android:layout_width="107.9dp"
                                 android:layout_height="25.25dp"
-                                android:layout_marginStart="21dp"
+                                android:layout_gravity="end"
+                                android:layout_marginEnd="21dp"
                                 android:layout_marginTop="-5dp"
                                 android:background="@mipmap/icon_complete_information">
 
@@ -79,7 +109,7 @@
                                 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">
@@ -106,7 +136,6 @@
                                 android:id="@+id/signature"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:layout_marginLeft="21dp"
                                 android:layout_marginTop="6dp"
                                 android:text="这个人很懒，什么也没留下。"
                                 android:textColor="@color/gray_cccccc"
@@ -117,47 +146,6 @@
                                 android:layout_height="match_parent"
                                 android:layout_weight="1"
                                 android:orientation="horizontal">
-
-                                <LinearLayout
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="48dp"
-                                    android:layout_marginLeft="21dp"
-                                    android:layout_weight="1"
-                                    android:gravity="center|left">
-
-                                    <ImageView
-                                        android:id="@+id/good_nub_ico"
-                                        android:layout_width="21dp"
-                                        android:layout_height="15dp"
-                                        android:src="@mipmap/good_nub"
-                                        android:visibility="gone" />
-
-                                    <ImageView
-                                        android:layout_width="30dp"
-                                        android:layout_height="15dp"
-                                        android:src="@mipmap/icon_userid" />
-
-                                    <TextView
-                                        android:id="@+id/id_val"
-                                        android:layout_width="wrap_content"
-                                        android:layout_height="wrap_content"
-                                        android:textColor="@color/gray_B1B1B1"
-                                        android:textSize="12sp" />
-                                </LinearLayout>
-
-                                <TextView
-                                    android:id="@+id/btn_copy"
-                                    android:layout_width="30dp"
-                                    android:layout_height="wrap_content"
-                                    android:layout_marginLeft="5dp"
-                                    android:layout_marginRight="5dp"
-                                    android:background="@drawable/border_grey"
-                                    android:gravity="center"
-                                    android:text="@string/copy"
-                                    android:textColor="#ff9f9f9f"
-                                    android:textSize="10sp"
-                                    android:visibility="gone" />
-
                                 <LinearLayout
                                     android:layout_width="match_parent"
                                     android:layout_height="48dp"
@@ -200,45 +188,203 @@
                                         android:layout_marginLeft="3dp"
                                         android:background="@mipmap/icon_arrow_right"
                                         android:visibility="visible" />
+
                                 </LinearLayout>
+                                <LinearLayout
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="48dp"
+                                    android:layout_marginLeft="21dp"
+                                    android:layout_weight="1"
+                                    android:gravity="center|left">
+
+
+                                    <ImageView
+                                        android:layout_width="30dp"
+                                        android:layout_height="15dp"
+                                        android:src="@mipmap/icon_userid" />
+
+                                    <TextView
+                                        android:id="@+id/id_val"
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:textColor="@color/gray_B1B1B1"
+                                        android:textSize="12sp" />
+
+                                    <ImageView
+                                        android:id="@+id/good_nub_ico"
+                                        android:layout_width="21dp"
+                                        android:layout_height="15dp"
+                                        android:src="@mipmap/good_nub"
+                                        android:visibility="gone" />
+                                </LinearLayout>
+
+                                <TextView
+                                    android:id="@+id/btn_copy"
+                                    android:layout_width="30dp"
+                                    android:layout_height="wrap_content"
+                                    android:layout_marginLeft="5dp"
+                                    android:layout_marginRight="5dp"
+                                    android:background="@drawable/border_grey"
+                                    android:gravity="center"
+                                    android:text="@string/copy"
+                                    android:textColor="#ff9f9f9f"
+                                    android:textSize="10sp"
+                                    android:visibility="gone" />
+
+
                             </LinearLayout>
                         </LinearLayout>
 
-                        <RelativeLayout
-                            android:layout_width="114dp"
-                            android:layout_height="match_parent"
-                            android:layout_marginRight="18dp"
-                            android:gravity="center|right">
+                    </LinearLayout>
+                    <LinearLayout
+                        android:id="@+id/ll_me_vip"
+                        android:layout_below="@id/lt_me_top"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content">
 
-                            <com.makeramen.roundedimageview.RoundedImageView
-                                android:id="@+id/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" />
+                        <FrameLayout
+                            android:id="@+id/lt_guard"
+                            android:layout_width="0dp"
+                            android:layout_height="81dp"
+                            android:layout_marginLeft="15dp"
+                            android:layout_weight="1"
+                            android:background="@drawable/bg_me_data"
+                            android:clickable="true"
+                            android:focusable="true"
+                            android:focusableInTouchMode="true"
+                            android:gravity="center"
+                            android:orientation="horizontal">
 
-                            <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" />
+                            <LinearLayout
+                                android:layout_width="wrap_content"
+                                android:layout_height="match_parent"
+                                android:layout_gravity="end"
+                                android:layout_marginTop="4dp"
+                                android:layout_marginEnd="14dp"
+                                android:clickable="false"
+                                android:focusable="false"
+                                android:focusableInTouchMode="false">
+
+                                <ImageView
+                                    android:layout_width="48dp"
+                                    android:layout_height="45dp"
+                                    android:src="@mipmap/icon_guard_me" />
+                            </LinearLayout>
+
+
+                            <LinearLayout
+                                android:layout_width="match_parent"
+                                android:layout_height="match_parent"
+                                android:layout_weight="1"
+                                android:clickable="false"
+                                android:focusable="false"
+                                android:focusableInTouchMode="false"
+                                android:orientation="vertical"
+                                android:paddingLeft="18dp"
+                                android:paddingRight="6dp">
+
+                                <TextView
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_marginTop="15dp"
+                                    android:text="@string/live_guard"
+                                    android:textColor="#000000"
+                                    android:textSize="16sp"
+                                    android:textStyle="bold" />
+
+                                <TextView
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_marginTop="12dp"
+                                    android:text="@string/guard_for_your_beloved_one"
+                                    android:textColor="#000000"
+                                    android:textSize="12sp" />
+                            </LinearLayout>
+                        </FrameLayout>
+                        <View
+                            android:layout_width="18dp"
+                            android:layout_height="1dp" />
+                        <FrameLayout
+                            android:id="@+id/lt_noble"
+                            android:layout_width="0dp"
+                            android:layout_height="81dp"
+                            android:layout_marginRight="15dp"
+                            android:layout_weight="1"
+                            android:background="@drawable/bg_me_data"
+                            android:clickable="true"
+                            android:focusable="true"
+                            android:focusableInTouchMode="true"
+                            android:gravity="center"
+                            android:orientation="horizontal">
+
+                            <LinearLayout
+                                android:layout_width="wrap_content"
+                                android:layout_height="match_parent"
+                                android:layout_gravity="end"
+                                android:layout_marginTop="4dp"
+                                android:layout_marginEnd="14dp"
+                                android:clickable="false"
+                                android:focusable="false"
+                                android:focusableInTouchMode="false">
+
+                                <ImageView
+                                    android:id="@+id/user_noble_ico"
+                                    android:layout_width="48dp"
+                                    android:layout_height="45dp"
+                                    android:src="@mipmap/icon_vip_gold" />
+                            </LinearLayout>
+
+                            <LinearLayout
+                                android:layout_width="match_parent"
+                                android:layout_height="match_parent"
+                                android:layout_weight="1"
+                                android:clickable="false"
+                                android:focusable="false"
+                                android:focusableInTouchMode="false"
+                                android:orientation="vertical"
+                                android:paddingLeft="18dp"
+                                android:paddingRight="6dp">
+
+                                <TextView
+                                    android:id="@+id/user_noble_text"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_marginTop="15dp"
+                                    android:text=""
+                                    android:textColor="#000000"
+                                    android:textSize="16sp"
+                                    android:textStyle="bold" />
+
+                                <TextView
+                                    android:id="@+id/user_noble_time"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_marginTop="12dp"
+                                    android:text="@string/open_noble_text"
+                                    android:textColor="#000000"
+                                    android:textSize="12sp" />
+                            </LinearLayout>
+
+                            <View
+                                android:id="@+id/v_noble"
+                                android:layout_width="18dp"
+                                android:layout_height="18dp"
+                                android:layout_marginRight="30dp"
+                                android:background="@mipmap/icon_more_gray"
+                                android:clickable="false"
+                                android:focusable="false"
+                                android:focusableInTouchMode="false"
+                                android:visibility="gone" />
+                        </FrameLayout>
 
-                        </RelativeLayout>
 
                     </LinearLayout>
 
                     <LinearLayout
                         android:layout_width="match_parent"
                         android:layout_height="114dp"
-                        android:layout_below="@id/lt_me_top"
+                        android:layout_below="@id/ll_me_vip"
+                        android:layout_marginTop="12dp"
                         android:layout_marginLeft="15dp"
                         android:layout_marginRight="15dp"
                         android:background="@drawable/bg_me_data"
@@ -249,7 +395,6 @@
                             android:layout_height="match_parent"
                             android:layout_weight="1"
                             android:orientation="horizontal">
-
                             <LinearLayout
                                 android:layout_width="match_parent"
                                 android:layout_height="match_parent"
@@ -260,7 +405,6 @@
                                 <LinearLayout
                                     android:layout_width="match_parent"
                                     android:layout_height="match_parent"
-                                    android:layout_weight="1"
                                     android:gravity="center"
                                     android:orientation="horizontal"
                                     android:paddingTop="6dp">
@@ -268,18 +412,18 @@
                                     <ImageView
                                         android:layout_width="39dp"
                                         android:layout_height="39dp"
-                                        android:src="@mipmap/home_me_diamonds" />
+                                        android:src="@mipmap/home_me_gold" />
 
                                     <TextView
                                         android:layout_width="wrap_content"
                                         android:layout_height="wrap_content"
-                                        android:text="@string/diamond"
+                                        android:text="@string/golden_bean"
                                         android:textColor="@color/gray1"
                                         android:textSize="14sp" />
                                 </LinearLayout>
 
                                 <TextView
-                                    android:id="@+id/coin"
+                                    android:id="@+id/gold"
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
                                     android:text=""
@@ -289,6 +433,8 @@
 
                             </LinearLayout>
 
+
+
                             <LinearLayout
                                 android:layout_width="1dp"
                                 android:layout_height="match_parent"
@@ -310,7 +456,6 @@
                                 <LinearLayout
                                     android:layout_width="match_parent"
                                     android:layout_height="match_parent"
-                                    android:layout_weight="1"
                                     android:gravity="center"
                                     android:orientation="horizontal"
                                     android:paddingTop="6dp">
@@ -349,7 +494,6 @@
                                     android:layout_height="42dp"
                                     android:background="@color/gray_dcdcdc" />
                             </LinearLayout>
-
                             <LinearLayout
                                 android:layout_width="match_parent"
                                 android:layout_height="match_parent"
@@ -360,7 +504,6 @@
                                 <LinearLayout
                                     android:layout_width="match_parent"
                                     android:layout_height="match_parent"
-                                    android:layout_weight="1"
                                     android:gravity="center"
                                     android:orientation="horizontal"
                                     android:paddingTop="6dp">
@@ -368,18 +511,18 @@
                                     <ImageView
                                         android:layout_width="39dp"
                                         android:layout_height="39dp"
-                                        android:src="@mipmap/home_me_gold" />
+                                        android:src="@mipmap/home_me_diamonds" />
 
                                     <TextView
                                         android:layout_width="wrap_content"
                                         android:layout_height="wrap_content"
-                                        android:text="@string/golden_bean"
+                                        android:text="@string/diamond"
                                         android:textColor="@color/gray1"
                                         android:textSize="14sp" />
                                 </LinearLayout>
 
                                 <TextView
-                                    android:id="@+id/gold"
+                                    android:id="@+id/coin"
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
                                     android:text=""
@@ -396,8 +539,9 @@
                             android:layout_height="45dp"
                             android:paddingBottom="3dp">
 
+
                             <LinearLayout
-                                android:id="@+id/btn_coin"
+                                android:id="@+id/btn_gold"
                                 android:layout_width="match_parent"
                                 android:layout_height="match_parent"
                                 android:layout_weight="1"
@@ -407,7 +551,7 @@
                                 <TextView
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
-                                    android:text="@string/charge"
+                                    android:text="@string/receive"
                                     android:textColor="@color/gray_B1B1B1"
                                     android:textSize="12sp" />
 
@@ -417,7 +561,6 @@
                                     android:layout_marginLeft="3dp"
                                     android:background="@mipmap/icon_arrow_right" />
                             </LinearLayout>
-
                             <LinearLayout
                                 android:id="@+id/lt_star_coin"
                                 android:layout_width="match_parent"
@@ -440,9 +583,8 @@
                                     android:layout_marginLeft="3dp"
                                     android:background="@mipmap/icon_arrow_right" />
                             </LinearLayout>
-
                             <LinearLayout
-                                android:id="@+id/btn_gold"
+                                android:id="@+id/btn_coin"
                                 android:layout_width="match_parent"
                                 android:layout_height="match_parent"
                                 android:layout_weight="1"
@@ -452,7 +594,7 @@
                                 <TextView
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
-                                    android:text="@string/receive"
+                                    android:text="@string/charge"
                                     android:textColor="@color/gray_B1B1B1"
                                     android:textSize="12sp" />
 
@@ -494,150 +636,6 @@
                     </androidx.cardview.widget.CardView>
                 </LinearLayout>
 
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
-
-                    <FrameLayout
-                        android:id="@+id/lt_noble"
-                        android:layout_width="0dp"
-                        android:layout_height="81dp"
-                        android:layout_marginLeft="15dp"
-                        android:layout_marginTop="12dp"
-                        android:layout_weight="1"
-                        android:background="@drawable/bg_me_data"
-                        android:clickable="true"
-                        android:focusable="true"
-                        android:focusableInTouchMode="true"
-                        android:gravity="center"
-                        android:orientation="horizontal">
-
-                        <LinearLayout
-                            android:layout_width="wrap_content"
-                            android:layout_height="match_parent"
-                            android:layout_gravity="end"
-                            android:layout_marginTop="4dp"
-                            android:layout_marginEnd="14dp"
-                            android:clickable="false"
-                            android:focusable="false"
-                            android:focusableInTouchMode="false">
-
-                            <ImageView
-                                android:id="@+id/user_noble_ico"
-                                android:layout_width="48dp"
-                                android:layout_height="45dp"
-                                android:src="@mipmap/icon_vip_gold" />
-                        </LinearLayout>
-
-                        <LinearLayout
-                            android:layout_width="match_parent"
-                            android:layout_height="match_parent"
-                            android:layout_weight="1"
-                            android:clickable="false"
-                            android:focusable="false"
-                            android:focusableInTouchMode="false"
-                            android:orientation="vertical"
-                            android:paddingLeft="18dp"
-                            android:paddingRight="6dp">
-
-                            <TextView
-                                android:id="@+id/user_noble_text"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_marginTop="15dp"
-                                android:text=""
-                                android:textColor="#000000"
-                                android:textSize="16sp"
-                                android:textStyle="bold" />
-
-                            <TextView
-                                android:id="@+id/user_noble_time"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_marginTop="12dp"
-                                android:text="@string/open_noble_text"
-                                android:textColor="#000000"
-                                android:textSize="12sp" />
-                        </LinearLayout>
-
-                        <View
-                            android:id="@+id/v_noble"
-                            android:layout_width="18dp"
-                            android:layout_height="18dp"
-                            android:layout_marginRight="30dp"
-                            android:background="@mipmap/icon_more_gray"
-                            android:clickable="false"
-                            android:focusable="false"
-                            android:focusableInTouchMode="false"
-                            android:visibility="gone" />
-                    </FrameLayout>
-
-                    <View
-                        android:layout_width="18dp"
-                        android:layout_height="1dp" />
-
-                    <FrameLayout
-                        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"
-                        android:background="@drawable/bg_me_data"
-                        android:clickable="true"
-                        android:focusable="true"
-                        android:focusableInTouchMode="true"
-                        android:gravity="center"
-                        android:orientation="horizontal">
-
-                        <LinearLayout
-                            android:layout_width="wrap_content"
-                            android:layout_height="match_parent"
-                            android:layout_gravity="end"
-                            android:layout_marginTop="4dp"
-                            android:layout_marginEnd="14dp"
-                            android:clickable="false"
-                            android:focusable="false"
-                            android:focusableInTouchMode="false">
-
-                            <ImageView
-                                android:layout_width="48dp"
-                                android:layout_height="45dp"
-                                android:src="@mipmap/icon_guard_me" />
-                        </LinearLayout>
-
-
-                        <LinearLayout
-                            android:layout_width="match_parent"
-                            android:layout_height="match_parent"
-                            android:layout_weight="1"
-                            android:clickable="false"
-                            android:focusable="false"
-                            android:focusableInTouchMode="false"
-                            android:orientation="vertical"
-                            android:paddingLeft="18dp"
-                            android:paddingRight="6dp">
-
-                            <TextView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_marginTop="15dp"
-                                android:text="@string/live_guard"
-                                android:textColor="#000000"
-                                android:textSize="16sp"
-                                android:textStyle="bold" />
-
-                            <TextView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_marginTop="12dp"
-                                android:text="@string/guard_for_your_beloved_one"
-                                android:textColor="#000000"
-                                android:textSize="12sp" />
-                        </LinearLayout>
-                    </FrameLayout>
-                </LinearLayout>
 
 
                 <LinearLayout
diff --git a/main/src/main/res/mipmap-xxxhdpi/login_phone.png b/main/src/main/res/mipmap-xxxhdpi/login_phone.png
index 45a4e31b6..2227477ca 100644
Binary files a/main/src/main/res/mipmap-xxxhdpi/login_phone.png and b/main/src/main/res/mipmap-xxxhdpi/login_phone.png differ