准备提交暂停

视频流相关横屏修改
横屏部分弹窗修改
2024-08-23 16:19:42 +08:00 · 2024-08-22 13:52:00 +08:00 · 2024-08-19 15:53:54 +08:00 · 2024-08-05 14:27:52 +08:00 · 2024-08-05 14:09:10 +08:00 · 2024-08-05 13:40:54 +08:00
43 changed files with 7463 additions and 590 deletions
--- a/IAP6Helper/src/main/res/values-de/strings.xml
+++ b/IAP6Helper/src/main/res/values-de/strings.xml
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 
-/*
-** Copyright 2006, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-**
-** Created with STMS Automation System
-*/ -->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- MIDS_SAPPS_POP_UNKNOWN_ERROR_OCCURRED -->
-    <string name="mids_sapps_pop_unknown_error_occurred">Unbekannter Fehler aufgetreten</string>
-    <!-- MIDS_SAPPS_HEADER_SAMSUNG_IN_APP_PURCHASE_ABB -->
-    <string name="mids_sapps_header_samsung_in_app_purchase_abb">Samsung In-App Purchase</string>
-    <!-- MIDS_SAPPS_POP_UNABLE_TO_OPEN_SAMSUNG_IN_APP_PURCHASE_MSG -->
-    <string name="mids_sapps_pop_unable_to_open_samsung_in_app_purchase_msg">Samsung In-App Purchase kann nicht geöffnet werden. Wechseln Sie zu „Berechtigungen“, erteilen Sie die erforderlichen Berechtigungen und versuchen Sie es anschließend erneut.</string>
-    <!-- DREAM_SAPPS_BODY_AUTHENTICATING_ING -->
-    <string name="dream_sapps_body_authenticating_ing">Authentifizierung wird durchgeführt\u2026</string>
-    <!-- DREAM_SAPPS_BODY_CONTACT_CUSTOMER_SERVICE_TO_COMPLETE_YOUR_PURCHASE -->
-    <string name="dream_sapps_body_contact_customer_service_to_complete_your_purchase">Wenden Sie sich an den Kundendienst, um Ihren Einkauf abzuschließen.</string>
-    <!-- DREAM_SAPPS_BODY_YOUR_PURCHASE_IS_COMPLETE -->
-    <string name="dream_sapps_body_your_purchase_is_complete">Ihr Kauf ist abgeschlossen.</string>
-    <!-- DREAM_PH_PHEADER_COULDNT_COMPLETE_PURCHASE -->
-    <string name="dream_ph_pheader_couldnt_complete_purchase">Abschließen des Kaufs nicht möglich</string>
-    <!-- DREAM_PH_BODY_TO_COMPLETE_THIS_PURCHASE_YOU_NEED_TO_UPDATE_THE_GALAXY_STORE -->
-    <string name="dream_ph_body_to_complete_this_purchase_you_need_to_update_the_galaxy_store">Sie müssen Galaxy Store aktualisieren, um diesen Kauf abzuschließen.</string>
-    <!-- DREAM_PH_BODY_TO_COMPLETE_THIS_PURCHASE_YOU_NEED_TO_ENABLE_THE_GALAXY_STORE_IN_SETTINGS -->
-    <string name="dream_ph_body_to_complete_this_purchase_you_need_to_enable_the_galaxy_store_in_settings">Sie müssen Galaxy Store in den Einstellungen aktivieren, um diesen Kauf abzuschließen.</string>
-    <!-- DREAM_PH_BODY_CONTACT_P1SSCUSTOMER_SERVICEP2SS_FOR_MORE_INFORMATION_N_NERROR_CODE_C_P3SS -->
-    <string name="dream_ph_body_contact_p1sscustomer_servicep2ss_for_more_information_n_nerror_code_c_p3ss">Weitere Informationen erhalten Sie vom %1$sKundendienst%2$s.\n\nFehlercode: %3$s</string>
-    <!-- IDS_COM_BODY_ERROR_CODE_C -->
-    <string name="ids_com_body_error_code_c">Fehlercode:</string>
-    <!-- MIDS_SAPPS_POP_TO_PURCHASE_ITEMS_YOU_NEED_TO_INSTALL_SAMSUNG_IN_APP_PURCHASE_INSTALL_Q -->
-    <string name="mids_sapps_pop_to_purchase_items_you_need_to_install_samsung_in_app_purchase_install_q">Wenn Sie Artikel kaufen möchten, müssen Sie Samsung In-App-Kauf installieren. Installieren?</string>
-    <!-- MIDS_SAPPS_POP_AN_INVALID_VALUE_HAS_BEEN_PROVIDED_FOR_SAMSUNG_IN_APP_PURCHASE -->
-    <string name="mids_sapps_pop_an_invalid_value_has_been_provided_for_samsung_in_app_purchase">Es wurde ein ungültiger Wert für Samsung In-App Purchase angegeben.</string>
-    <!-- MIDS_SAPPS_BODY_WAITING_ING -->
-    <string name="mids_sapps_body_waiting_ing">Warten\u2026</string>
-    <!-- MIDS_SAPPS_POP_PAYMENT_CANCELLED -->
-    <string name="mids_sapps_pop_payment_canceled">Zahlung abgebrochen</string>
-    <!-- MIDS_SAPPS_HEADER_UPDATE_GALAXY_APPS -->
-    <string name="mids_sapps_header_update_galaxy_apps">Aktualisieren von Galaxy Apps</string>
-    <!-- MIDS_SAPPS_POP_A_NEW_VERSION_IS_AVAILABLE_GALAXY_APPS_WILL_BE_UPDATED_TO_THE_LATEST_VERSION_TO_COMPLETE_THIS_PURCHASE -->
-    <string name="mids_sapps_pop_a_new_version_is_available_galaxy_apps_will_be_updated_to_the_latest_version_to_complete_this_purchase">Eine neue Version ist verfügbar. Galaxy Apps wird auf die neueste Version aktualisiert, um diesen Kauf abzuschließen.</string>
-</resources>
--- a/IAP6Helper/src/main/res/values-mk-rMK/strings.xml
+++ b/IAP6Helper/src/main/res/values-mk-rMK/strings.xml
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 
-/*
-** Copyright 2006, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-**
-** Created with STMS Automation System
-*/ -->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- MIDS_SAPPS_POP_UNKNOWN_ERROR_OCCURRED -->
-    <string name="mids_sapps_pop_unknown_error_occurred">Дојде до непозната грешка.</string>
-    <!-- MIDS_SAPPS_HEADER_SAMSUNG_IN_APP_PURCHASE_ABB -->
-    <string name="mids_sapps_header_samsung_in_app_purchase_abb">Samsung In-App Purchase</string>
-    <!-- MIDS_SAPPS_POP_UNABLE_TO_OPEN_SAMSUNG_IN_APP_PURCHASE_MSG -->
-    <string name="mids_sapps_pop_unable_to_open_samsung_in_app_purchase_msg">Не може да се отвори Samsung In-App Purchase. Одете во Дозволи, а потоа овозможете ги бараните дозволи и обидете се повторно.</string>
-    <!-- DREAM_SAPPS_BODY_AUTHENTICATING_ING -->
-    <string name="dream_sapps_body_authenticating_ing">Се потврдува\u2026</string>
-    <!-- DREAM_SAPPS_BODY_CONTACT_CUSTOMER_SERVICE_TO_COMPLETE_YOUR_PURCHASE -->
-    <string name="dream_sapps_body_contact_customer_service_to_complete_your_purchase">Контактирајте со Службата за корисници за да го завршите Вашето купување.</string>
-    <!-- DREAM_SAPPS_BODY_YOUR_PURCHASE_IS_COMPLETE -->
-    <string name="dream_sapps_body_your_purchase_is_complete">Купувањето Ви е завршено.</string>
-    <!-- DREAM_PH_PHEADER_COULDNT_COMPLETE_PURCHASE -->
-    <string name="dream_ph_pheader_couldnt_complete_purchase">Не може да се заврши купувањето</string>
-    <!-- DREAM_PH_BODY_TO_COMPLETE_THIS_PURCHASE_YOU_NEED_TO_UPDATE_THE_GALAXY_STORE -->
-    <string name="dream_ph_body_to_complete_this_purchase_you_need_to_update_the_galaxy_store">За да го завршите ова купување, треба да го ажурирате Galaxy Store.</string>
-    <!-- DREAM_PH_BODY_TO_COMPLETE_THIS_PURCHASE_YOU_NEED_TO_ENABLE_THE_GALAXY_STORE_IN_SETTINGS -->
-    <string name="dream_ph_body_to_complete_this_purchase_you_need_to_enable_the_galaxy_store_in_settings">За да го завршите ова купување, треба да го овозможите Galaxy Store во Поставувања.</string>
-    <!-- DREAM_PH_BODY_CONTACT_P1SSCUSTOMER_SERVICEP2SS_FOR_MORE_INFORMATION_N_NERROR_CODE_C_P3SS -->
-    <string name="dream_ph_body_contact_p1sscustomer_servicep2ss_for_more_information_n_nerror_code_c_p3ss">Контактирајте со %1$sУслугите за корисниците%2$s за повеќе информации.\n\nШифра на грешка: %3$s</string>
-    <!-- IDS_COM_BODY_ERROR_CODE_C -->
-    <string name="ids_com_body_error_code_c">Шифра на грешка:</string>
-    <!-- MIDS_SAPPS_POP_TO_PURCHASE_ITEMS_YOU_NEED_TO_INSTALL_SAMSUNG_IN_APP_PURCHASE_INSTALL_Q -->
-    <string name="mids_sapps_pop_to_purchase_items_you_need_to_install_samsung_in_app_purchase_install_q">За да купувате ставки, треба да го инсталирате Samsung купување во апликација. Да се инсталира?</string>
-    <!-- MIDS_SAPPS_POP_AN_INVALID_VALUE_HAS_BEEN_PROVIDED_FOR_SAMSUNG_IN_APP_PURCHASE -->
-    <string name="mids_sapps_pop_an_invalid_value_has_been_provided_for_samsung_in_app_purchase">Дадена е неважечка вредност за Samsung In-App Purchase.</string>
-    <!-- MIDS_SAPPS_BODY_WAITING_ING -->
-    <string name="mids_sapps_body_waiting_ing">Се чека\u2026</string>
-    <!-- MIDS_SAPPS_POP_PAYMENT_CANCELLED -->
-    <string name="mids_sapps_pop_payment_canceled">Плаќањето е одложено.</string>
-    <!-- MIDS_SAPPS_HEADER_UPDATE_GALAXY_APPS -->
-    <string name="mids_sapps_header_update_galaxy_apps">Ажурирање на Galaxy Apps</string>
-    <!-- MIDS_SAPPS_POP_A_NEW_VERSION_IS_AVAILABLE_GALAXY_APPS_WILL_BE_UPDATED_TO_THE_LATEST_VERSION_TO_COMPLETE_THIS_PURCHASE -->
-    <string name="mids_sapps_pop_a_new_version_is_available_galaxy_apps_will_be_updated_to_the_latest_version_to_complete_this_purchase">Достапна е нова верзија. Galaxy Apps ќе се ажурира на најновата верзија за да го завршите купувањево.</string>
-</resources>
--- a/common/src/main/java/com/yunbao/common/dialog/GiftWallAchieveDialog.java
+++ b/common/src/main/java/com/yunbao/common/dialog/GiftWallAchieveDialog.java
@@ -1,6 +1,7 @@
 package com.yunbao.common.dialog;

 import android.content.Context;
+import android.content.res.Configuration;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
@@ -85,7 +86,7 @@ public class GiftWallAchieveDialog extends AbsDialogPopupWindow {

    @Override
    protected int getPopupHeight() {
-        if (isFullWindows) {
+        if (isFullWindows ||getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE) {
            return super.getPopupHeight();
        }
        int screenHeight = ScreenDimenUtil.getInstance().getScreenHeight();
--- a/common/src/main/java/com/yunbao/common/dialog/GiftWallDialog.java
+++ b/common/src/main/java/com/yunbao/common/dialog/GiftWallDialog.java
@@ -2,6 +2,7 @@ package com.yunbao.common.dialog;

 import android.app.Activity;
 import android.content.Context;
+import android.content.res.Configuration;
 import android.graphics.Color;
 import android.graphics.Typeface;
 import android.view.View;
@@ -80,6 +81,7 @@ public class GiftWallDialog extends AbsDialogPopupWindow {

    }

+
    @Override
    public int bindLayoutId() {
        return R.layout.dialog_gift_wall;
@@ -87,12 +89,17 @@ public class GiftWallDialog extends AbsDialogPopupWindow {

    @Override
    protected int getPopupHeight() {
+        if (getResources().getConfiguration().orientation == Configuration.ORIENTATION_PORTRAIT) {
            if (isFullWindows) {
                return super.getPopupHeight() - DpUtil.dp2px(10);
            }
            int screenHeight = ScreenDimenUtil.getInstance().getScreenHeight();
            return (int) (screenHeight * 0.8);
+        } else {
+            return super.getPopupHeight() - DpUtil.dp2px(10);
        }
+    }
+

    void initView() {
        mIvBg = findViewById(R.id.iv_root_bg);
@@ -196,6 +203,10 @@ public class GiftWallDialog extends AbsDialogPopupWindow {
        if (isTab2) {
            mTvTab2.callOnClick();
        }
+        if (getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE) {
+            findViewById(R.id.rootView).setOnClickListener(v -> dismiss());
+            mIvBg.setOnClickListener(v -> {});
+        }
    }

    private void resetWindows() {
--- a/common/src/main/java/com/yunbao/common/dialog/GiftWallGiftInfoDialog.java
+++ b/common/src/main/java/com/yunbao/common/dialog/GiftWallGiftInfoDialog.java
@@ -4,6 +4,7 @@ import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.animation.ObjectAnimator;
 import android.content.Context;
+import android.content.res.Configuration;
 import android.graphics.Color;
 import android.view.View;
 import android.view.ViewGroup;
@@ -117,7 +118,7 @@ public class GiftWallGiftInfoDialog extends AbsDialogPopupWindow {

    @Override
    protected int getPopupHeight() {
-        if (isFullWindows) {
+        if (isFullWindows || getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE) {
            return super.getPopupHeight();
        }
        int screenHeight = ScreenDimenUtil.getInstance().getScreenHeight();
--- a/common/src/main/java/com/yunbao/common/views/AbsViewHolder.java
+++ b/common/src/main/java/com/yunbao/common/views/AbsViewHolder.java
@@ -43,6 +43,11 @@ public abstract class AbsViewHolder implements LifeCycleListener {

    }

+    public void onConfigureChange() {
+       //如果 mParentView
+    }
+
+
    protected abstract int getLayoutId();

    public abstract void init();
--- a/common/src/main/res/drawable-land/background_gift_money2.xml
+++ b/common/src/main/res/drawable-land/background_gift_money2.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners
+        android:radius="16dp"/>
+    <solid android:color="#2A2C3B" />
+</shape>
--- a/common/src/main/res/layout-land/dialog_gift_wall.xml
+++ b/common/src/main/res/layout-land/dialog_gift_wall.xml
@@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/rootView"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <com.makeramen.roundedimageview.RoundedImageView
+        android:id="@+id/iv_root_bg"
+        android:layout_width="0dp"
+        android:layout_margin="8dp"
+        android:layout_height="0dp"
+        android:scaleType="fitXY"
+        android:src="@mipmap/bg_gift_wall_main_root"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintWidth_percent="0.48"
+        app:riv_corner_radius="16dp"
+        app:layout_constraintTop_toTopOf="parent" />
+
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/v_achievement"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="20dp"
+        android:layout_marginEnd="10dp"
+        android:visibility="invisible"
+        tools:visibility="visible"
+        app:layout_constraintEnd_toEndOf="@id/iv_root_bg"
+        app:layout_constraintTop_toTopOf="@id/iv_root_bg">
+
+        <ImageView
+            android:id="@+id/imageView3"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@mipmap/bg_gift_wall_main_achievement"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <TextView
+            android:id="@+id/textView2"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="1dp"
+            android:layout_marginEnd="1dp"
+            android:layout_marginBottom="1dp"
+            android:text="@string/dialog_gift_wall_text_honors"
+            android:textColor="#FFFFFF"
+            android:textSize="6.8sp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+    <ImageView
+        android:id="@+id/v_tips"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="11dp"
+        app:layout_constraintBottom_toBottomOf="@+id/v_achievement"
+        app:layout_constraintEnd_toStartOf="@+id/v_achievement"
+        app:layout_constraintTop_toTopOf="@+id/v_achievement"
+        app:srcCompat="@mipmap/icon_gift_wall_main_tips" />
+
+    <com.yunbao.common.views.CustomEllipsizeTextView
+        android:id="@+id/user_name"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:singleLine="true"
+        android:text="111111111的礼物展馆"
+        android:textColor="#6BCDFF"
+        android:textSize="22sp"
+        app:layout_constraintBottom_toBottomOf="@+id/v_achievement"
+        app:layout_constraintEnd_toStartOf="@+id/v_tips"
+        app:layout_constraintStart_toEndOf="@+id/iv_back"
+        app:layout_constraintTop_toTopOf="@+id/v_achievement" />
+
+    <LinearLayout
+        android:id="@+id/tab_layout"
+        android:layout_width="240dp"
+        android:layout_height="36dp"
+        android:layout_marginTop="13dp"
+        android:background="@mipmap/icon_gift_wall_main_switch_main"
+        android:gravity="center"
+        android:scaleType="fitXY"
+        app:layout_constraintEnd_toEndOf="@id/iv_root_bg"
+        app:layout_constraintStart_toStartOf="@id/iv_root_bg"
+        app:layout_constraintTop_toBottomOf="@+id/v_achievement">
+
+        <TextView
+            android:id="@+id/tab1"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:gravity="center"
+            android:text="@string/dialog_gift_wall_text_personal_hal"
+            android:textSize="16sp"
+            android:textColor="#9CE7FF"
+            android:textStyle="bold" />
+
+        <TextView
+            android:id="@+id/tab2"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:gravity="center"
+            android:text="@string/dialog_gift_wall_text_site_hal"
+            android:textColor="#FFFFFF"
+            android:textSize="14sp" />
+    </LinearLayout>
+
+    <androidx.viewpager2.widget.ViewPager2
+        android:id="@+id/viewPager2"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        app:layout_constraintBottom_toBottomOf="@id/iv_root_bg"
+        app:layout_constraintEnd_toEndOf="@id/iv_root_bg"
+        app:layout_constraintStart_toStartOf="@id/iv_root_bg"
+        app:layout_constraintTop_toBottomOf="@+id/tab_layout" />
+
+    <ImageView
+        android:id="@+id/iv_back"
+        android:layout_width="1dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="15dp"
+        android:src="@mipmap/icon_sud_rule_close_bottom"
+        android:visibility="invisible"
+        tools:visibility="visible"
+        app:layout_constraintBottom_toBottomOf="@+id/user_name"
+        app:layout_constraintStart_toStartOf="@+id/iv_root_bg"
+        app:layout_constraintTop_toTopOf="@+id/user_name" />
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>
--- a/common/src/main/res/layout-land/dialog_gift_wall_achieve.xml
+++ b/common/src/main/res/layout-land/dialog_gift_wall_achieve.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/rootView"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <ImageView
+        android:id="@+id/iv_root_bg"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:scaleType="fitXY"
+        android:src="@mipmap/dialog_gift_wall_achieve" />
+
+    <View
+        android:id="@+id/top_bar"
+        android:layout_width="0dp"
+        android:layout_height="0dp" />
+
+    <ImageView
+        android:id="@+id/iv_back"
+        android:layout_width="80dp"
+        android:layout_height="60dp"
+        android:layout_below="@+id/top_bar"
+        android:paddingEnd="25dp"
+        android:scaleType="center"
+        android:src="@mipmap/dialog_gift_wall_back" />
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="60dp"
+        android:layout_below="@+id/top_bar"
+        android:gravity="center"
+        android:text="@string/gift_wall_achieve_title"
+        android:textColor="@color/white"
+        android:textSize="20sp"
+        android:textStyle="bold" />
+
+    <LinearLayout
+        android:id="@+id/topLayout"
+        android:layout_width="match_parent"
+        android:layout_height="48dp"
+        android:layout_below="@+id/iv_back"
+        android:layout_marginLeft="20dp"
+        android:layout_marginRight="20dp"
+        android:background="@mipmap/dialog_gift_wall_achieve_top_bg"
+        android:gravity="center_vertical"
+        android:orientation="horizontal">
+
+        <ImageView
+            android:id="@+id/top_icon"
+            android:layout_width="120dp"
+            android:layout_height="20dp"
+            android:layout_marginLeft="10dp"
+            android:src="@mipmap/dialog_gift_wall_achieve_top_icon" />
+
+        <TextView
+            android:id="@+id/numCount"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_marginLeft="5dp"
+            android:layout_weight="1"
+            android:gravity="start|center_vertical"
+            android:text="0/1"
+            android:textColor="#FDE9D8" />
+
+        <TextView
+            android:id="@+id/honor"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:gravity="center_vertical"
+            android:text="@string/wall_honor"
+            android:textColor="#E0E0E0"
+            android:textSize="12dp" />
+
+        <ImageView
+            android:layout_width="13dp"
+            android:layout_height="13dp"
+            android:layout_marginRight="7dp"
+            android:src="@mipmap/dialog_gift_wall_more" />
+
+    </LinearLayout>
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/recyclerView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/topLayout"
+        android:layout_marginLeft="10dp"
+        android:layout_marginTop="15dp"
+        android:layout_marginRight="10dp" />
+
+</RelativeLayout>
--- a/common/src/main/res/layout-land/dialog_live_gift_popup.xml
+++ b/common/src/main/res/layout-land/dialog_live_gift_popup.xml
@@ -0,0 +1,450 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_gravity="bottom"
+    android:paddingBottom="12dp"
+    android:orientation="vertical">
+
+        <FrameLayout
+            android:id="@+id/overlay"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1">
+
+            <ImageView
+                android:id="@+id/operate_image"
+                android:layout_width="122dp"
+                android:layout_height="50dp"
+                android:layout_gravity="end|bottom"
+                android:layout_marginEnd="5dp"
+                android:scaleType="fitXY" />
+
+            <FrameLayout
+                android:id="@+id/blind_box"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="end"
+                android:visibility="invisible">
+
+                <include
+                    layout="@layout/view_blind_box" />
+
+
+            </FrameLayout>
+
+            <FrameLayout
+                android:id="@+id/naming_layout"
+                android:layout_width="match_parent"
+                android:layout_height="28dp"
+
+                android:layout_gravity="bottom"
+                android:layout_marginStart="25dp"
+                android:layout_marginEnd="25dp"
+                android:layout_marginBottom="5dp">
+
+                <ImageView
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:scaleType="fitXY"
+                    android:src="@mipmap/background_live_gift_gift_itle" />
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:gravity="center_vertical">
+
+                    <ImageView
+                        android:id="@+id/gift_itle"
+                        android:layout_width="54dp"
+                        android:layout_height="13dp"
+                        android:layout_marginStart="13dp"
+                        android:src="@mipmap/icon_live_gift_gift_itle" />
+
+                    <com.makeramen.roundedimageview.RoundedImageView
+                        android:id="@+id/naming_avatar"
+                        android:layout_width="20dp"
+                        android:layout_height="20dp"
+                        android:layout_centerHorizontal="true"
+                        android:layout_marginStart="6dp"
+                        android:scaleType="centerCrop"
+                        android:src="@drawable/m_chu_xia"
+                        app:riv_oval="true" />
+
+                    <com.yunbao.common.views.weight.MarqueeTextView
+                        android:id="@+id/naming_name"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
+                        android:layout_marginStart="4dp"
+                        android:layout_marginEnd="16dp"
+                        android:layout_weight="1"
+                        android:ellipsize="marquee"
+                        android:focusable="true"
+                        android:focusableInTouchMode="true"
+                        android:gravity="center"
+                        android:marqueeRepeatLimit="marquee_forever"
+                        android:scrollHorizontally="true"
+                        android:singleLine="true"
+                        android:textColor="#FFFFFFFF"
+                        android:textSize="12sp" />
+                </LinearLayout>
+            </FrameLayout>
+        </FrameLayout>
+
+        <RelativeLayout
+            android:id="@+id/gift_list"
+            android:layout_width="match_parent"
+            android:layout_height="323dp"
+            android:animateLayoutChanges="true"
+            android:orientation="vertical">
+
+            <com.makeramen.roundedimageview.RoundedImageView
+                android:id="@+id/git_background2"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:scaleType="fitXY"
+                android:src="@drawable/backgroud_custom_gift2"
+                app:riv_corner_radius_bottom_left="10dp"
+                app:riv_corner_radius_bottom_right="10dp"
+                app:riv_corner_radius_top_left="10dp"
+                app:riv_corner_radius_top_right="10dp" />
+
+
+            <LinearLayout
+                android:id="@+id/git_title"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="5dp"
+                android:animateLayoutChanges="true">
+
+                <LinearLayout
+                    android:id="@+id/leveling_layout"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:visibility="gone">
+
+                    <FrameLayout
+                        android:layout_width="40dp"
+                        android:layout_height="22dp"
+                        android:layout_marginStart="17dp"
+                        android:layout_marginTop="9dp"
+                        android:background="@mipmap/icon_grade_angle_mark">
+
+                        <TextView
+                            android:id="@+id/lv_str"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center"
+                            android:text="Lv.8"
+                            android:textColor="@color/white"
+                            android:textSize="12sp" />
+                    </FrameLayout>
+
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="6dp"
+                        android:layout_marginTop="12dp"
+                        android:layout_marginEnd="18dp"
+                        android:layout_weight="1"
+                        android:orientation="vertical">
+
+                        <ProgressBar
+                            android:id="@+id/progressBar"
+                            style="?android:attr/progressBarStyleHorizontal"
+                            android:layout_width="match_parent"
+                            android:layout_height="4dp"
+                            android:max="100"
+                            android:progress="0"
+                            android:progressDrawable="@drawable/progress_bg_user" />
+
+                        <com.yunbao.common.views.weight.MarqueeTextView
+                            android:id="@+id/leave_hint"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center_vertical"
+                            android:layout_marginTop="2dp"
+                            android:ellipsize="marquee"
+                            android:focusable="true"
+                            android:focusableInTouchMode="true"
+                            android:gravity="center"
+                            android:marqueeRepeatLimit="marquee_forever"
+                            android:scrollHorizontally="true"
+                            android:singleLine="true"
+                            android:text="@string/leveling_points"
+                            android:textColor="#BBBBBB"
+                            android:textSize="9sp" />
+
+                    </LinearLayout>
+
+                    <ImageView
+                        android:layout_width="16dp"
+                        android:layout_height="16dp"
+                        android:layout_marginTop="14dp"
+                        android:layout_marginEnd="14dp"
+                        android:background="@mipmap/icon_right" />
+                </LinearLayout>
+
+                <com.yunbao.common.views.weight.MarqueeTextView
+                    android:id="@+id/gift_description"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:layout_marginStart="15dp"
+                    android:layout_marginEnd="16dp"
+                    android:layout_weight="1"
+                    android:ellipsize="marquee"
+                    android:focusable="true"
+                    android:focusableInTouchMode="true"
+                    android:gravity="center"
+                    android:marqueeRepeatLimit="marquee_forever"
+                    android:scrollHorizontally="true"
+                    android:singleLine="true"
+                    android:textColor="#80FFFFFF"
+                    android:textSize="12sp" />
+
+                <FrameLayout
+                    android:id="@+id/btn_luck_gift_tip"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="5dp">
+
+                    <include layout="@layout/view_nobility" />
+
+                </FrameLayout>
+            </LinearLayout>
+
+            <RelativeLayout
+                android:id="@+id/gift_bottom"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_alignParentBottom="true"
+                android:layout_marginBottom="8dp"
+                android:paddingStart="16dp">
+
+                <LinearLayout
+                    android:id="@+id/diamond_linear"
+                    android:layout_width="wrap_content"
+                    android:layout_height="32dp"
+                    android:background="@drawable/background_gift_money"
+                    android:gravity="center_vertical"
+                    android:paddingStart="4dp"
+                    android:paddingTop="7dp"
+                    android:paddingBottom="7dp">
+
+                    <ImageView
+                        android:layout_width="18dp"
+                        android:layout_height="18dp"
+                        android:clickable="false"
+                        android:focusable="false"
+                        android:src="@mipmap/diamond" />
+
+                    <TextView
+                        android:id="@+id/diamond_text"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="4dp"
+                        android:layout_marginEnd="4dp"
+                        android:clickable="false"
+                        android:focusable="false"
+                        android:text="0"
+                        android:textColor="@color/white"
+                        android:textSize="12sp" />
+
+                    <ImageView
+                        android:layout_width="8dp"
+                        android:layout_height="8dp"
+                        android:layout_marginEnd="4dp"
+                        android:background="@mipmap/icon_right" />
+                </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/gold_layout"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:layout_marginStart="8dp"
+                    android:layout_toRightOf="@id/diamond_linear"
+                    android:gravity="center_vertical">
+
+                    <ImageView
+                        android:layout_width="20dp"
+                        android:layout_height="20dp"
+                        android:clickable="false"
+                        android:focusable="false"
+                        android:src="@mipmap/gold_coin" />
+
+                    <TextView
+                        android:id="@+id/gold_text"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="4dp"
+                        android:layout_marginEnd="4dp"
+                        android:clickable="false"
+                        android:focusable="false"
+                        android:text="10000000"
+                        android:textColor="@color/white"
+                        android:textSize="12sp" />
+                </LinearLayout>
+
+                <FrameLayout
+                    android:id="@+id/gift_send_layout"
+                    android:layout_width="130dp"
+                    android:layout_height="32dp"
+                    android:layout_alignParentEnd="true"
+                    android:layout_centerVertical="true"
+                    android:layout_marginEnd="14dp">
+
+                    <FrameLayout
+                        android:id="@+id/gift_number_layout"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_marginEnd="42dp"
+                        android:background="@drawable/background_gift_money2">
+
+                        <TextView
+                            android:id="@+id/gift_number"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center_vertical"
+                            android:layout_marginStart="15dp"
+                            android:text="1"
+                            android:textColor="#F5C05A"
+                            android:textSize="14sp" />
+
+                        <ImageView
+                            android:id="@+id/icon_arrow"
+                            android:layout_width="10dp"
+                            android:layout_height="10dp"
+                            android:layout_gravity="center_vertical|end"
+                            android:layout_marginEnd="30dp"
+                            android:src="@mipmap/icon_arrow_right_2" />
+                    </FrameLayout>
+
+                    <TextView
+                        android:id="@+id/live_gift_send"
+                        android:layout_width="62dp"
+                        android:layout_height="32dp"
+                        android:layout_gravity="end"
+                        android:background="@drawable/bg_live_gift_send_new"
+                        android:gravity="center"
+                        android:text="@string/live_gift_send"
+                        android:textColor="@color/white"
+                        android:textSize="14sp" />
+                </FrameLayout>
+            </RelativeLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_above="@id/gift_bottom"
+                android:layout_below="@id/git_title"
+                android:orientation="vertical">
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="18dp">
+
+                    <FrameLayout
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1">
+
+                        <androidx.recyclerview.widget.RecyclerView
+                            android:id="@+id/gift_title"
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:layout_marginStart="8dp"
+                            android:layout_marginEnd="10dp" />
+
+                        <ImageView
+                            android:layout_width="27dp"
+                            android:layout_height="match_parent"
+                            android:layout_gravity="end"
+                            android:background="@drawable/icon_covering_layer"
+                            android:scaleType="centerCrop" />
+                    </FrameLayout>
+
+                    <View
+                        android:layout_width="1dp"
+                        android:layout_height="11dp"
+                        android:layout_gravity="center_vertical"
+                        android:background="@color/white" />
+
+                    <FrameLayout
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="6dp"
+                        android:layout_marginEnd="10dp">
+
+
+                        <TextView
+                            android:id="@+id/live_wrap"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:paddingEnd="8dp"
+                            android:text="@string/live_wrap"
+                            android:textColor="#CCCDCE"
+                            android:textSize="16sp" />
+
+                        <View
+                            android:id="@+id/red_point"
+                            android:layout_width="6dp"
+                            android:layout_height="6dp"
+                            android:layout_gravity="end"
+                            android:layout_marginEnd="6dp"
+                            android:background="@drawable/bg_red_point" />
+                    </FrameLayout>
+
+
+                </LinearLayout>
+
+                <FrameLayout
+                    android:id="@+id/context_layout_gift"
+                    android:layout_width="match_parent"
+                    android:layout_height="196dp"
+                    android:layout_marginTop="12dp" />
+
+
+            </LinearLayout>
+
+            <RelativeLayout
+                android:id="@+id/btn_send_lian"
+                android:layout_width="70dp"
+                android:layout_height="70dp"
+                android:layout_alignParentRight="true"
+                android:layout_alignParentBottom="true"
+                android:layout_marginRight="10dp"
+                android:layout_marginBottom="5dp"
+                android:background="@mipmap/icon_live_gift_lian"
+                android:visibility="gone">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerHorizontal="true"
+                    android:layout_marginTop="20dp"
+                    android:text="@string/live_gift_send_lian"
+                    android:textColor="@color/white"
+                    android:textSize="12sp" />
+
+                <TextView
+                    android:id="@+id/lian_text"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerHorizontal="true"
+                    android:layout_marginTop="35dp"
+                    android:textColor="#fff"
+                    android:textSize="14sp" />
+
+            </RelativeLayout>
+
+
+    </RelativeLayout>
+
+
+</LinearLayout>
--- a/common/src/main/res/layout/item_comment_view.xml
+++ b/common/src/main/res/layout/item_comment_view.xml
@@ -11,7 +11,11 @@
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:layout_marginTop="10dp"
-        android:orientation="horizontal">
+        android:orientation="vertical">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">

            <com.makeramen.roundedimageview.RoundedImageView
                android:id="@+id/avatar"
@@ -21,33 +25,16 @@
                android:src="@mipmap/icon_data_empty"
                app:riv_oval="true" />

-        <LinearLayout
+            <TextView
+                android:id="@+id/name"
+                android:layout_weight="1"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_marginLeft="10dp"
-            android:layout_marginTop="7dp"
-            android:gravity="center_vertical"
-            android:orientation="vertical">
-
-            <TextView
-                android:id="@+id/name"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
                android:text="栗子栗子🌰zzz"
                android:textColor="#777777"
                android:textSize="12dp" />

-            <TextView
-                android:id="@+id/content"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="5dp"
-                android:text="栗子栗子🌰zzz"
-                android:textColor="#333333"
-                android:textSize="12dp" />
-
-        </LinearLayout>
-
            <TextView
                android:id="@+id/author"
                android:layout_width="45dp"
@@ -62,11 +49,6 @@
                android:textSize="10dp"
                android:visibility="gone" />

-        <View
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:layout_weight="1" />
-
            <TextView
                android:id="@+id/del"
                android:layout_width="wrap_content"
@@ -99,6 +81,19 @@

        </LinearLayout>

+        <TextView
+            android:id="@+id/content"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="15dp"
+            android:layout_marginStart="40dp"
+            android:layout_marginTop="5dp"
+            android:text="栗子栗子🌰栗子栗子栗子栗子栗子栗子栗子栗子栗子栗子栗子栗子栗子栗子栗子栗子栗子栗子zzz"
+            android:textColor="#333333"
+            android:textSize="12dp" />
+    </LinearLayout>
+
+
    <LinearLayout
        android:id="@+id/replyLayout"
        android:layout_width="match_parent"
--- a/common/src/main/res/mipmap-mdpi/icon_img_up_label_en.png
+++ b/common/src/main/res/mipmap-mdpi/icon_img_up_label_en.png
--- a/common/src/main/res/values-en-rUS/strings.xml
+++ b/common/src/main/res/values-en-rUS/strings.xml
--- a/common/src/main/res/values/strings.xml
+++ b/common/src/main/res/values/strings.xml
@@ -1279,41 +1279,41 @@ Limited ride And limited avatar frame</string>
    <string name="dialog_message_chat_notify_btn">Reply</string>
    <string name="activity_msg_chat_top_status_online">Online</string>
    <string name="activity_msg_chat_top_status_offline">Offline</string>
-    <string name="commen_user_active">个人动态</string>
+    <string name="commen_user_active">Personal updates</string>
    <string name="real_person">Real person</string>
-    <string name="trade_union">工会</string>
+    <string name="trade_union">tradeUnion</string>
    <string name="praise">Liked</string>
-    <string name="cancel_back">取消黑名单</string>
-    <string name="user_home_img_del_dialog">確定刪除圖片？</string>
-    <string name="upload_success">上传成功</string>
-    <string name="upload_failed">上傳成功</string>
-    <string name="_9">最多添加9張圖片</string>
-    <string name="not_interested">不感興趣</string>
-    <string name="person_like">人覺得很讚</string>
-    <string name="fan_group_name">主播守護團</string>
-    <string name="user_home_anchor">主播粉絲團</string>
-    <string name="main_active_type_01">美圖</string>
-    <string name="main_active_type_02">新秀</string>
-    <string name="main_active_type_03">身材</string>
-    <string name="main_active_type_04">直播</string>
-    <string name="main_active_type_05">生活</string>
-    <string name="send_active_time">選擇時間</string>
-    <string name="now_send">立即發表</string>
-    <string name="choose_topic">選擇話題</string>
-    <string name="pricture">圖文</string>
-    <string name="_200">请输入200字以内的文字</string>
-    <string name="focus_on">關注</string>
-    <string name="see_more">查看更多</string>
-    <string name="close">收起</string>
-    <string name="time_cannot_be_greater_than_the_current_time">时间不能大于当前时间</string>
-    <string name="msg_del_sure">是否確認刪除？</string>
-    <string name="not_blackmail">不能拉黑自己</string>
-    <string name="active_author">作者</string>
-    <string name="active_count">共%1$s條回復></string>
-    <string name="uploading">上傳中...</string>
-    <string name="upload_fail">上傳失敗</string>
-    <string name="please_input_content">請填寫發佈內容</string>
-    <string name="comm_details">詳情</string>
+    <string name="cancel_back">Cancel blacklist</string>
+    <string name="user_home_img_del_dialog">Are you sure you want to delete the picture?？</string>
+    <string name="upload_success">Upload successful</string>
+    <string name="upload_failed">upload failed</string>
+    <string name="_9">Add up to 9 pictures</string>
+    <string name="not_interested">not interested</string>
+    <string name="person_like">people liked it</string>
+    <string name="fan_group_name">Fan group name</string>
+    <string name="user_home_anchor">Anchor fan group</string>
+    <string name="main_active_type_01">Beauty</string>
+    <string name="main_active_type_02">Rookie</string>
+    <string name="main_active_type_03">Figure</string>
+    <string name="main_active_type_04">Live</string>
+    <string name="main_active_type_05">Life</string>
+    <string name="send_active_time">Selection period</string>
+    <string name="now_send">Now</string>
+    <string name="choose_topic">Select topic</string>
+    <string name="pricture">picture</string>
+    <string name="_200">Please enter text within 200 words</string>
+    <string name="focus_on">Focus on</string>
+    <string name="see_more">See more</string>
+    <string name="close">close</string>
+    <string name="time_cannot_be_greater_than_the_current_time">Time cannot be greater than the current time</string>
+    <string name="msg_del_sure">Do you confirm deletion?</string>
+    <string name="not_blackmail">Cannot blackmail oneself</string>
+    <string name="active_author">author</string>
+    <string name="active_count">altogether %1$s strip reply></string>
+    <string name="uploading">Uploading...</string>
+    <string name="upload_fail">Upload failed</string>
+    <string name="please_input_content">Please fill in the publication content</string>
+    <string name="comm_details">Details</string>

    <string name="guard_buy_type_1">【Star Guardian】</string>

--- a/gradle.properties
+++ b/gradle.properties
@@ -24,6 +24,6 @@ android.nonTransitiveRClass=false

 systemProp.http.proxyHost=127.0.0.1
 systemProp.https.proxyHost=127.0.0.1
-systemProp.https.proxyPort=7890
-systemProp.http.proxyPort=7890
+systemProp.https.proxyPort=9098
+systemProp.http.proxyPort=9098
 #android.enableR8.fullMode=true
--- a/lib_faceunity/src/main/java/io/agora/beautyapi/faceunity/agora/SWAuManager.java
+++ b/lib_faceunity/src/main/java/io/agora/beautyapi/faceunity/agora/SWAuManager.java
@@ -171,6 +171,8 @@ public class SWAuManager extends BaseCacheManager {
        frameLayout.addView(surfaceView);

        VideoCanvas videoCanvas = new VideoCanvas(surfaceView, VideoCanvas.RENDER_MODE_HIDDEN, uid);
+
+        Log.i("nwq","updateMyChannelView::setupRemoteVideo");
        mRtcEngine.setupRemoteVideo(videoCanvas);
    }

@@ -188,7 +190,7 @@ public class SWAuManager extends BaseCacheManager {
        // 创建一个 TextureView 对象，并将其作为 FrameLayout 的子对象
        TextureView surfaceView = new TextureView(mContext);
        audienceContainer.addView(surfaceView);
-
+        Log.i("nwq"," audienceContainer.getChildCount()"+ audienceContainer.getChildCount());
        // 启用视频模块
        mRtcEngine.enableVideo();

@@ -232,6 +234,7 @@ public class SWAuManager extends BaseCacheManager {
                        // surfaceView.setZOrderMediaOverlay(true);
                        pkContainer1.addView(surfaceView);
                        VideoCanvas videoCanvas = new VideoCanvas(surfaceView, VideoCanvas.RENDER_MODE_HIDDEN, strUid);
+                        Log.i("nwq","joinExRoomEx::setupRemoteVideoEx");
                        mRtcEngine.setupRemoteVideoEx(videoCanvas, rtcConnection);
                    }
                });
@@ -312,6 +315,7 @@ public class SWAuManager extends BaseCacheManager {
                        // surfaceView.setZOrderMediaOverlay(true);
                        frameLayout.addView(surfaceView);
                        VideoCanvas videoCanvas = new VideoCanvas(surfaceView, VideoCanvas.RENDER_MODE_HIDDEN, Integer.parseInt(toUid));
+                        Log.i("nwq","joinChannelDrEx::setupRemoteVideoEx");
                        mRtcEngine.setupRemoteVideoEx(videoCanvas, rtcConnection);
                    }
                });
@@ -393,6 +397,7 @@ public class SWAuManager extends BaseCacheManager {
        // surfaceView.setZOrderMediaOverlay(true);
        audienceContainer.addView(surfaceView);
        // 将 TextureView 对象传入声网实时互动 SDK，设置远端视图
+        Log.i("nwq","setupRemoteVideo::setupRemoteVideo");
        mRtcEngine.setupRemoteVideo(new VideoCanvas(surfaceView, VideoCanvas.RENDER_MODE_HIDDEN, uid));
    }

--- a/live/src/main/AndroidManifest.xml
+++ b/live/src/main/AndroidManifest.xml
@@ -25,7 +25,7 @@
            android:windowSoftInputMode="adjustPan|stateAlwaysHidden" />
        <activity
            android:name=".activity.LiveAudienceActivity"
-            android:configChanges="screenLayout|orientation"
+            android:configChanges="screenLayout|orientation|screenSize"
            android:launchMode="singleTask"
            android:screenOrientation="portrait"
            android:theme="@style/AppTheme"
--- a/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java
+++ b/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java
@@ -4,6 +4,7 @@ package com.yunbao.live.activity;
 import android.annotation.SuppressLint;
 import android.app.Dialog;
 import android.content.Intent;
+import android.content.pm.ActivityInfo;
 import android.content.res.Configuration;
 import android.media.AudioManager;
 import android.os.Build;
@@ -213,6 +214,8 @@ public class LiveAudienceActivity extends LiveActivity {
        Bus.getOn(this);
        super.main();
        liveAudienceActivity = this;
+        // 设置初始屏幕方向为竖屏
+        //setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
        CrashSaveBean.getInstance().addEnterRoom();
        mProcessResultUtil = new ProcessResultUtil(this);
        Intent intent = getIntent();
@@ -287,6 +290,7 @@ public class LiveAudienceActivity extends LiveActivity {
        }
    };

+
    /**
     * 初始化界面
     */
@@ -634,8 +638,13 @@ public class LiveAudienceActivity extends LiveActivity {

    }

+
    @Override
    public void onBackPressed() {
+        if (getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE) {
+            setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
+            return;
+        }
        if (manager != null && manager.getsudGameMin()) {
            new XPopup.Builder(mContext).asCustom(new HintCustomPopup(mContext, mContext.getString(com.yunbao.common.R.string.dialog_tip), mContext.getString(com.yunbao.common.R.string.the_live_room)).setLiveOpenOk(mContext.getString(com.yunbao.common.R.string.confirm)).setLiveOpenCancel(mContext.getString(com.yunbao.common.R.string.cancel)).setCallBack(new HintCustomPopup.HintCustomCallBack() {
                @Override
@@ -904,9 +913,30 @@ public class LiveAudienceActivity extends LiveActivity {
    @Override
    public void onConfigurationChanged(@NonNull Configuration newConfig) {
        super.onConfigurationChanged(newConfig);
+        Log.i(TAG, "onConfigurationChanged");
        adjustFullScreen(newConfig);
+
+        onConfigurationChangedView(newConfig);
    }

+    public void onConfigurationChangedView(Configuration newConfig) {
+        //  liveHandler.post(liveRunnable);
+        if (manager != null && manager.getRootView() != null && mLiveBean != null && mViewGroup != null) {
+            Log.i("nwq", "横竖屏进行切换");
+            manager.onConfigurationChanged(newConfig);
+            //       liveHandler.post(liveRunnable);
+//            View rootView = manager.getRootView();
+//            if (rootView.getParent() != null && rootView.getParent() instanceof ViewGroup) {
+//                ((ViewGroup) (rootView.getParent())).removeView(rootView);
+//                manager.onRemove(false);
+//            }
+//            mViewGroup.addView(manager.getRootView());
+            manager.onAdd(mLiveBean, mLiveType, mLiveTypeVal, mLiveSDK, isSw);
+        }
+
+    }
+
+
    private void adjustFullScreen(Configuration config) {
        final WindowInsetsControllerCompat insetsController = ViewCompat.getWindowInsetsController(getWindow().getDecorView());
        if (insetsController == null) return;
@@ -1888,9 +1918,9 @@ public class LiveAudienceActivity extends LiveActivity {
        if (manager == null || manager.mLiveAudienceViewHolder == null || manager.mLiveAudienceViewHolder.mRedPoint == null) {
            return;
        }
-        if(event.getNumber()>0){
+        if (event.getNumber() > 0) {
            manager.mLiveAudienceViewHolder.mRedPoint.setVisibility(View.VISIBLE);
-        }else{
+        } else {
            manager.mLiveAudienceViewHolder.mRedPoint.setVisibility(View.GONE);
        }

--- a/live/src/main/java/com/yunbao/live/activity/LiveSwAnchorActivity.java
+++ b/live/src/main/java/com/yunbao/live/activity/LiveSwAnchorActivity.java
@@ -223,7 +223,7 @@ public class LiveSwAnchorActivity extends LiveActivity implements LiveFunctionCl
        initFaceManager();
        leave_img = findViewById(R.id.leave_img);
        mLiveSDK = intent.getIntExtra(Constants.LIVE_SDK, Constants.LIVE_SDK_KSY);
-        if (mLiveSDK == Constants.LIVE_SDK_SW) {
+        if(mLiveSDK ==Constants.LIVE_SDK_SW){
            isSw = true;
        }
        mLiveKsyConfigBean = intent.getParcelableExtra(Constants.LIVE_KSY_CONFIG);
@@ -289,23 +289,7 @@ public class LiveSwAnchorActivity extends LiveActivity implements LiveFunctionCl
            }
        });

-        /*DebugDialog.getInstance(new DebugDialog.DebugDialogRunnable() {
-            @Override
-            public void run(DebugDialog dialog) {
-                dialog.setShowPattern(ShowPattern.ALL_TIME);
-                dialog.show();
-                dialog.setView("测试", new Button(mContext), new View.OnClickListener() {
-                    @Override
-                    public void onClick(View v) {
-                        android.os.Message msg = android.os.Message.obtain();
-                        msg.what = Constants.SOCKET_WHAT_BROADCAST;
-                        String json = "{\"msg\":[{\"_method_\":\"StartEndLive\",\"action\":\"18\",\"ct\":\"直播关闭\",\"touid\":\"\",\"equipment\":\"app\",\"msgtype\":\"1\",\"uname\":\"1\",\"timestamp\":\"\",\"touname\":\"\",\"uid\":\"98274\",\"tougood\":\"\",\"ugood\":\"\",\"roomnum\":\"98274\",\"riskDescription\":\"色情:性行为:中度色情\",\"enRiskDescription\":\"Pornography: Sexual behavior: Moderate pornography\",\"riskhType\":\"封禁1分钟\",\"enRiskhType\":\"Banned for 1 minute\",\"date\":\"2024-07-30 15:03:11\"}],\"retcode\":\"000000\",\"retmsg\":\"OK\"}";
-                        msg.obj = json;
-                        SocketSwClient.mSocketHandler.sendMessage(msg);
-                    }
-                });
-            }
-        });*/
+
    }

    private void initFaceManager() {
@@ -894,9 +878,8 @@ public class LiveSwAnchorActivity extends LiveActivity implements LiveFunctionCl
        getAiRobotStatus();
        MicedUserManager.get().removeAllMicUserList();
        MicUserManager.get().removeAllMicUserList();
-
-        if(mLiveRoomViewHolder!=null){
        //加载整蛊
+        if(mLiveRoomViewHolder!=null){
            mLiveRoomViewHolder.initPrankProgress(2);
            mLiveRoomViewHolder.sendMsgPrank();

@@ -1264,9 +1247,9 @@ public class LiveSwAnchorActivity extends LiveActivity implements LiveFunctionCl
                                    .param("uhead", CommonAppConfig.getInstance().getUserBean().getAvatar())
                                    .param("pkname", CommonAppConfig.getInstance().getUserBean().getUserNiceName());
                            //判断是否是随机PK
-                            if(extra){
+                            if (extra) {
                                msg1.param("random_pk", "1");
-                                msg1.param("msgtype","11");
+                                msg1.param("msgtype", "11");
                                if (RandomPkManager.getInstance().isRankModel()) {
                                    msg1.param("is_ladders", "https://downs.yaoulive.com/rank_top_box.png");
                                }
@@ -1321,7 +1304,7 @@ public class LiveSwAnchorActivity extends LiveActivity implements LiveFunctionCl
        }
    }

-    public void linkDrMicRemoveListUid(String uid) {
+    public void linkDrMicRemoveListUid(String uid){
        if (mLiveAnchorViewHolder != null) {
            mLiveAnchorViewHolder.removeYaoqing(uid);
        }
@@ -1498,7 +1481,7 @@ public class LiveSwAnchorActivity extends LiveActivity implements LiveFunctionCl

    @Override
    public void onUpdatePrankProgress(String prankString) {
-        if (mLiveRoomViewHolder != null) {
+        if (mLiveRoomViewHolder != null){
            mLiveRoomViewHolder.refreshPrank(prankString);
        }
    }
@@ -1689,7 +1672,7 @@ public class LiveSwAnchorActivity extends LiveActivity implements LiveFunctionCl
            case LEAVE_DR_ROOM:
                if (mLiveRoomViewHolder != null) {
                    mLiveRoomViewHolder.seisShowGif(true);
-                    if (DRPKing == 1) {
+                    if(DRPKing==1){
                        mLiveRoomViewHolder.endDRGif();
                    }
                }
@@ -1990,6 +1973,7 @@ public class LiveSwAnchorActivity extends LiveActivity implements LiveFunctionCl


    }
+
    @Subscribe(threadMode = ThreadMode.MAIN)
    public void onAllServerNotifyFFGGGDJANEvent(AllServerNotifyFFGGGDJANEvent event) {
        if (mLiveRoomViewHolder != null) {
--- a/live/src/main/java/com/yunbao/live/dialog/LiveFansFragment.java
+++ b/live/src/main/java/com/yunbao/live/dialog/LiveFansFragment.java
@@ -1,10 +1,14 @@
 package com.yunbao.live.dialog;

 import android.app.Activity;
+import android.content.Context;
+import android.content.res.Configuration;
+import android.graphics.Point;
 import android.os.Build;
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.util.Log;
+import android.view.Display;
 import android.view.Gravity;
 import android.view.View;
 import android.view.Window;
@@ -13,7 +17,9 @@ import android.webkit.WebSettings;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;

+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.constraintlayout.widget.ConstraintLayout;

 import com.yunbao.common.Constants;
 import com.yunbao.common.dialog.AbsDialogFragment;
@@ -62,14 +68,31 @@ public class LiveFansFragment extends AbsDialogFragment {

    @Override
    protected void setWindowAttributes(Window window) {
-        window.setWindowAnimations(R.style.bottomToTopAnim);
        WindowManager.LayoutParams params = window.getAttributes();
+        if (getResources().getConfiguration().orientation == Configuration.ORIENTATION_PORTRAIT) {
+            window.setWindowAnimations(R.style.bottomToTopAnim);
            params.width = WindowManager.LayoutParams.MATCH_PARENT;
            params.height = DpUtil.dp2px(400);
            params.gravity = Gravity.BOTTOM;
+        } else {
+            window.setWindowAnimations(R.style.RightLeftToAnim);
+            // 获取屏幕尺寸
+            Point size = new Point();
+            Display display = ((WindowManager) mContext.getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay();
+            display.getSize(size);
+            int screenWidth = size.x;
+            int screenHeight = size.y;
+            // 设置宽度为屏幕宽度的 48%
+            params.width = (int) (screenWidth * 0.46f);
+            // 设置高度为屏幕高度的 70%
+            params.height = WindowManager.LayoutParams.MATCH_PARENT;
+            // 设置居中对齐
+            params.gravity = Gravity.CENTER_VERTICAL | Gravity.RIGHT;
+        }
        window.setAttributes(params);
    }

+
    @Override
    public void onCreate(@Nullable Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
@@ -132,7 +155,7 @@ public class LiveFansFragment extends AbsDialogFragment {
                LiveAudienceActivity.is_fans = "2";
                int num = LiveAudienceActivity.fansNum - 1;
                LiveRoomViewHolder.setFansNum(num);
-                ToastUtil.show(WordUtil.isNewZh()?"退出成功":"Exit successfully");
+                ToastUtil.show(WordUtil.isNewZh() ? "退出成功" : "Exit successfully");
                EventBus.getDefault().post("exitFansGroup");
                dismiss();
            } else if (TextUtils.equals(event.getMethod(), "sendFansCard")) {
--- a/live/src/main/java/com/yunbao/live/dialog/LiveGiftPopup.java
+++ b/live/src/main/java/com/yunbao/live/dialog/LiveGiftPopup.java
@@ -6,8 +6,11 @@ import static com.yunbao.live.views.LiveRoomViewHolder.bean1;

 import android.annotation.SuppressLint;
 import android.app.Dialog;
+import android.content.Context;
 import android.content.DialogInterface;
+import android.content.res.Configuration;
 import android.graphics.Color;
+import android.graphics.Point;
 import android.graphics.Typeface;
 import android.os.Bundle;
 import android.os.Handler;
@@ -16,6 +19,7 @@ import android.text.SpannableStringBuilder;
 import android.text.TextUtils;
 import android.text.style.ForegroundColorSpan;
 import android.util.Log;
+import android.view.Display;
 import android.view.Gravity;
 import android.view.MotionEvent;
 import android.view.View;
@@ -44,6 +48,7 @@ import com.opensource.svgaplayer.SVGADrawable;
 import com.opensource.svgaplayer.SVGAImageView;
 import com.opensource.svgaplayer.SVGAParser;
 import com.opensource.svgaplayer.SVGAVideoEntity;
+import com.yunbao.common.utils.DpUtil;
 import com.yunbao.common.utils.L;
 import com.yunbao.common.utils.MobclickAgent;
 import com.yunbao.common.CommonAppConfig;
@@ -1337,12 +1342,29 @@ public class LiveGiftPopup extends AbsDialogFragment {

    @Override
    protected void setWindowAttributes(Window window) {
-        window.setWindowAnimations(R.style.bottomToTopAnim);
        window.setDimAmount(0f);//去掉遮罩层（全透明）
        WindowManager.LayoutParams params = window.getAttributes();
+        if (getResources().getConfiguration().orientation == Configuration.ORIENTATION_PORTRAIT) {
+            window.setWindowAnimations(R.style.bottomToTopAnim);
            params.width = WindowManager.LayoutParams.MATCH_PARENT;
            params.height = WindowManager.LayoutParams.WRAP_CONTENT;
            params.gravity = Gravity.BOTTOM;
+        } else {
+            window.setWindowAnimations(R.style.RightLeftToAnim);
+            window.setWindowAnimations(com.yunbao.live.R.style.RightLeftToAnim);
+            // 获取屏幕尺寸
+            Point size = new Point();
+            Display display = ((WindowManager) mContext.getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay();
+            display.getSize(size);
+            int screenWidth = size.x;
+            int screenHeight = size.y;
+            // 设置宽度为屏幕宽度的 48%
+            params.width = (int) (screenWidth * 0.46f);
+            // 设置高度为屏幕高度的 70%
+            params.height = WindowManager.LayoutParams.MATCH_PARENT;
+            // 设置居中对齐
+            params.gravity = Gravity.CENTER_VERTICAL | Gravity.RIGHT;
+        }
        window.setAttributes(params);
    }

--- a/live/src/main/java/com/yunbao/live/dialog/LiveUserAnchorMsgPopDialog.java
+++ b/live/src/main/java/com/yunbao/live/dialog/LiveUserAnchorMsgPopDialog.java
@@ -83,6 +83,7 @@ public class LiveUserAnchorMsgPopDialog extends AbsDialogFragment {
        mIndicator = (MagicIndicator) findViewById(R.id.indicator);
        viewPager = (ViewPager2) findViewById(R.id.viewPager);
        titleCount= (TextView) findViewById(R.id.titleCount);
+        titleCount.setText(getResources().getString(R.string.message_chat_msg_all_an_a)+"(0)");
        fragmentList = new ArrayList<>();
        fragmentList.add(new MainMessageChatListFragment(AppManager.getInstance().getLiveActivity()));
        viewPager.setAdapter(new FragmentStateAdapter((FragmentActivity) AppManager.getInstance().getLiveActivity()) {
--- a/live/src/main/java/com/yunbao/live/dialog/LiveUserDialogFragment.java
+++ b/live/src/main/java/com/yunbao/live/dialog/LiveUserDialogFragment.java
@@ -2,6 +2,8 @@ package com.yunbao.live.dialog;

 import android.app.Activity;
 import android.app.Dialog;
+import android.content.pm.ActivityInfo;
+import android.content.res.Configuration;
 import android.graphics.Color;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
@@ -71,8 +73,10 @@ import pl.droidsonroids.gif.GifImageView;
 /**
 * Created by cxf on 2018/10/15.
 * 直播间个人资料弹窗
+ *
+ * @modify by ningwenqiang 2024/8/16
+ * 如果是横屏则从右边弹出
 */
-
 public class LiveUserDialogFragment extends AbsDialogFragment implements View.OnClickListener {
    private String TAG = "用户弹窗";

@@ -150,6 +154,8 @@ public class LiveUserDialogFragment extends AbsDialogFragment implements View.On
    }


+    private boolean isPortrait = true;
+
    @Override
    protected void setWindowAttributes(Window window) {
        window.setWindowAnimations(R.style.bottomToTopAnim);
@@ -157,7 +163,12 @@ public class LiveUserDialogFragment extends AbsDialogFragment implements View.On
        window.setWindowAnimations(R.style.bottomToTopAnim);
        params.width = WindowManager.LayoutParams.MATCH_PARENT;
        params.height = WindowManager.LayoutParams.WRAP_CONTENT;
+        isPortrait = getResources().getConfiguration().orientation == Configuration.ORIENTATION_PORTRAIT;
+        if (isPortrait) {
            params.gravity = Gravity.BOTTOM;
+        } else {
+            params.gravity = Gravity.CENTER;
+        }
        window.setAttributes(params);
    }

@@ -209,6 +220,7 @@ public class LiveUserDialogFragment extends AbsDialogFragment implements View.On
        loadData();
    }

+
    private void initView() {
        gift_svga = (SVGAImageView) mRootView.findViewById(R.id.gift_svga);
        btn_live = mRootView.findViewById(R.id.btn_live);
@@ -249,6 +261,17 @@ public class LiveUserDialogFragment extends AbsDialogFragment implements View.On
        mLvVal = mRootView.findViewById(R.id.user_card_lv_val);
        mNobleIconLayout.setOnClickListener(this);
        mSetting.setOnClickListener(this);
+        if (getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE) {
+            View view = findViewById(R.id.rootView);
+            if (view != null) {
+                view.setOnClickListener(v -> dismiss());
+            }
+            View view1 = findViewById(R.id.bgView);
+            if (view1 != null) {
+                view1.setOnClickListener(this);
+            }
+        }
+
        mHonorLayout.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View view) {
@@ -292,7 +315,7 @@ public class LiveUserDialogFragment extends AbsDialogFragment implements View.On
                        .setVoicePress(isAnchor)
                        .setUname(mToName)
                        .setAvatar(mAvatarUrl));*/
-                new com.yunbao.common.dialog.GiftWallDialog(mContext, mToUid + "",mToName,mLiveUid, isAnchor).setFullWindows(false).showDialog();
+                new com.yunbao.common.dialog.GiftWallDialog(mContext, mToUid + "", mToName, mLiveUid, isAnchor).setFullWindows(false).showDialog();
                dismiss();
            }
        });
@@ -344,7 +367,7 @@ public class LiveUserDialogFragment extends AbsDialogFragment implements View.On
            }
        }
    }
-
+    //是否是主播
    boolean isAnchor = false;

    private void showData(String data) {
@@ -544,7 +567,7 @@ public class LiveUserDialogFragment extends AbsDialogFragment implements View.On
                            public void onComplete(SVGAVideoEntity videoItem) {
                                SVGADrawable drawable = new SVGADrawable(videoItem);
                                gift_svga.setImageDrawable(drawable);
-                                SVGAViewUtils.playEndClear(gift_svga,true,0,null);
+                                SVGAViewUtils.playEndClear(gift_svga, true, 0, null);
                                //SVGAViewUtils.playEndClear(gift_svga);
                            }

@@ -653,7 +676,15 @@ public class LiveUserDialogFragment extends AbsDialogFragment implements View.On
     */
    private void report() {
        if (TextUtils.equals(mLiveUid, "uid")) return;
+        if (!isPortrait) {
+            Log.i("nwq", "先切换成竖屏");
+            getActivity().setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
            LiveReportActivity.forward(mContext, mToUid);
+            dismiss();
+        }else {
+            LiveReportActivity.forward(mContext, mToUid);
+        }
+
    }


@@ -699,6 +730,15 @@ public class LiveUserDialogFragment extends AbsDialogFragment implements View.On
    }


+    //切换横竖屏
+    private void switchPortraitOrientation() {
+        if (!isPortrait) {
+            Log.i("nwq", "先切换成竖屏");
+            getActivity().setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
+        }
+    }
+
+
    @Override
    public void onClick(View v) {
        int i = v.getId();
@@ -731,6 +771,7 @@ public class LiveUserDialogFragment extends AbsDialogFragment implements View.On
        } else if (i == R.id.btn_guard) {
            if (TextUtils.equals(mLiveUid, "uid")) return;
            MobclickAgent.onEvent(mContext, "anchor_avatar_guard", "守护按钮");
+            switchPortraitOrientation();
            ((LiveActivity) mContext).openNewGuardListWindow(mContext instanceof LiveSwAnchorActivity, mToUid);
        } else if (i == R.id.btn_live) {
            gotoLive(mToUid);
@@ -740,6 +781,7 @@ public class LiveUserDialogFragment extends AbsDialogFragment implements View.On
                dismiss();
                ((LiveActivity) mContext).openFansWindow(mToUid);
            } else {
+                switchPortraitOrientation();
                MobclickAgent.onEvent(mContext, "user_avatar_noble", "贵族按钮");
                Bus.get().post(new LiveAudienceEvent()
                        .setType(LiveAudienceEvent.LiveAudienceType.NOBLE));
@@ -766,7 +808,7 @@ public class LiveUserDialogFragment extends AbsDialogFragment implements View.On
                return;
            }
            boolean isAnchor = CommonAppConfig.getInstance().getUserBean().getUsers_type().equals("C");
-            CommonHttpUtil.sayHi(mToUid, isAnchor ? "6" : "7",new HttpCallback() {
+            CommonHttpUtil.sayHi(mToUid, isAnchor ? "6" : "7", new HttpCallback() {
                @Override
                public void onSuccess(int code, String msg, String[] info) {

@@ -777,7 +819,7 @@ public class LiveUserDialogFragment extends AbsDialogFragment implements View.On
    }

    public void showMsgError() {
-        ToastUtil.show(WordUtil.isNewZh()?"無法聊天,待開發":"Unable to chat, awaiting development");
+        ToastUtil.show(WordUtil.isNewZh() ? "無法聊天,待開發" : "Unable to chat, awaiting development");
    }


--- a/live/src/main/java/com/yunbao/live/views/LiveAudienceViewHolder.java
+++ b/live/src/main/java/com/yunbao/live/views/LiveAudienceViewHolder.java
@@ -4,6 +4,8 @@ import android.Manifest;
 import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.Context;
+import android.content.pm.ActivityInfo;
+import android.content.res.Configuration;
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
 import android.graphics.Color;
@@ -304,21 +306,22 @@ public class LiveAudienceViewHolder extends AbsLiveViewHolder {
        pd_pao.setOnLongClickListener(new View.OnLongClickListener() {
            @Override
            public boolean onLongClick(View view) {
-                IMLoginModel userInfo = IMLoginManager.get(mContext).getUserInfo();
-                StringBuffer urlString = new StringBuffer();
-                urlString.append(CommonAppConfig.HOST)
-                        .append("/h5/exchangeShop/index.html?uid=")
-                        .append(userInfo.getId())
-                        .append("&token=")
-                        .append(userInfo.getToken()).append("&isZh=")
-                        .append(WordUtil.isNewZh() ? "1" : 0);
-                Bundle bundle1 = new Bundle();
-                bundle1.putString("url", urlString.toString());
-                LiveHDDialogFragment liveHDDialogFragment = new LiveHDDialogFragment();
-                liveHDDialogFragment.setArguments(bundle1);
-                liveHDDialogFragment.show(((LiveAudienceActivity) mContext).getSupportFragmentManager(), "LiveHDDialogFragment");
-                Bus.get().post(new QuickGiftingEvent().setReminder(true));
-                MobclickAgent.onEvent(mContext, "small_pd_gifts", "长按");
+                  switchCurrentOrientation();
+//                IMLoginModel userInfo = IMLoginManager.get(mContext).getUserInfo();
+//                StringBuffer urlString = new StringBuffer();
+//                urlString.append(CommonAppConfig.HOST)
+//                        .append("/h5/exchangeShop/index.html?uid=")
+//                        .append(userInfo.getId())
+//                        .append("&token=")
+//                        .append(userInfo.getToken()).append("&isZh=")
+//                        .append(WordUtil.isNewZh() ? "1" : 0);
+//                Bundle bundle1 = new Bundle();
+//                bundle1.putString("url", urlString.toString());
+//                LiveHDDialogFragment liveHDDialogFragment = new LiveHDDialogFragment();
+//                liveHDDialogFragment.setArguments(bundle1);
+//                liveHDDialogFragment.show(((LiveAudienceActivity) mContext).getSupportFragmentManager(), "LiveHDDialogFragment");
+//                Bus.get().post(new QuickGiftingEvent().setReminder(true));
+//                MobclickAgent.onEvent(mContext, "small_pd_gifts", "长按");
                return true;
            }
        });
@@ -396,6 +399,18 @@ public class LiveAudienceViewHolder extends AbsLiveViewHolder {

    }

+    //切换横竖屏
+    private void switchCurrentOrientation() {
+        int currentOrientation = context.getResources().getConfiguration().orientation;
+        if (currentOrientation == Configuration.ORIENTATION_PORTRAIT) {
+            // 当前为竖屏，切换到横屏
+            context.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
+        } else {
+            // 当前为横屏，切换回竖屏
+            context. setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
+        }
+    }
+
    public void setGiftRemainingQuantity(String giftRemainingQuantity) {
        mQuickGiftRemainingQuantity = Integer.parseInt(giftRemainingQuantity);
        if (mQuickGiftRemainingQuantity > 0) {
--- a/live/src/main/java/com/yunbao/live/views/LivePlaySwViewHolder.java
+++ b/live/src/main/java/com/yunbao/live/views/LivePlaySwViewHolder.java
@@ -5,6 +5,7 @@ import android.Manifest;
 import android.app.Activity;
 import android.app.Dialog;
 import android.content.Context;
+import android.content.res.Configuration;
 import android.graphics.Color;
 import android.media.AudioManager;
 import android.os.Build;
@@ -135,6 +136,10 @@ public class LivePlaySwViewHolder extends LiveRoomPlayViewHolder {
        return landscape;
    }

+    private boolean isPhysicalScreenVertical() {
+        return contexts.getResources().getConfiguration().orientation == Configuration.ORIENTATION_PORTRAIT;
+    }
+
    public LivePlaySwViewHolder(Context context, ViewGroup parentView, int landscapes) {
        super(context, parentView);
        contexts = context;
@@ -183,6 +188,66 @@ public class LivePlaySwViewHolder extends LiveRoomPlayViewHolder {
        dr_pk_view.setVisibility(View.GONE);
    }

+    public void onConfigureChange() {
+        if (contexts == null) {
+            return;
+        }
+        //这里考虑只通过修改参数的方式实现
+        if (isPhysicalScreenVertical()) {
+            RelativeLayout.LayoutParams params = (RelativeLayout.LayoutParams) mPkContainer.getLayoutParams();
+            params.height = DpUtil.dp2px(280);
+            params.topMargin = DpUtil.dp2px(130);
+            mPkContainer.setLayoutParams(params);
+            if (mPkContainer.getVisibility() == View.VISIBLE) {
+                mPkContainer.requestLayout();
+            }
+
+            params = (RelativeLayout.LayoutParams) dr_pk_view.getLayoutParams();
+            params.height = DpUtil.dp2px(280);
+            params.topMargin = DpUtil.dp2px(130);
+            dr_pk_view.setLayoutParams(params);
+            if (dr_pk_view.getVisibility() == View.VISIBLE) {
+                dr_pk_view.requestLayout();
+            }
+
+            params = (RelativeLayout.LayoutParams) ry_view.getLayoutParams();
+            params.height = DpUtil.dp2px(280);
+            params.topMargin = DpUtil.dp2px(130);
+            ry_view.setLayoutParams(params);
+            if (ry_view.getVisibility() == View.VISIBLE) {
+                ry_view.requestLayout();
+            }
+
+
+        } else {
+            RelativeLayout.LayoutParams params = (RelativeLayout.LayoutParams) mPkContainer.getLayoutParams();
+            params.height = ViewGroup.LayoutParams.MATCH_PARENT;
+            params.topMargin = 0;
+            mPkContainer.setLayoutParams(params);
+            if (mPkContainer.getVisibility() == View.VISIBLE) {
+                mPkContainer.requestLayout();
+            }
+
+            params = (RelativeLayout.LayoutParams) dr_pk_view.getLayoutParams();
+            params.height = ViewGroup.LayoutParams.MATCH_PARENT;
+            params.topMargin = 0;
+            dr_pk_view.setLayoutParams(params);
+            if (dr_pk_view.getVisibility() == View.VISIBLE) {
+                dr_pk_view.requestLayout();
+            }
+
+            params = (RelativeLayout.LayoutParams) ry_view.getLayoutParams();
+            params.height = ViewGroup.LayoutParams.MATCH_PARENT;
+            params.topMargin = 0;
+            ry_view.setLayoutParams(params);
+            if (ry_view.getVisibility() == View.VISIBLE) {
+                ry_view.requestLayout();
+            }
+        }
+        swAuManager.joinRoom(CommonAppConfig.getInstance().getUid(), CommonAppConfig.SWToken, liveUid, SWAuManager.getChannelName(liveUid));
+    }
+
+
    public void initSwEngine(String liveUid) {
        dr_pk_view.setVisibility(View.GONE);
        this.liveUid = liveUid;
@@ -224,7 +289,6 @@ public class LivePlaySwViewHolder extends LiveRoomPlayViewHolder {
                                    @Override
                                    public void onSuccess(io.rong.imlib.model.Message message) {
                                        Log.e("ry", "发送成功");
-
                                        IMCenter.getInstance().deleteRemoteMessages(Conversation.ConversationType.PRIVATE, message.getTargetId(), new Message[]{message}, null);
                                        IMCenter.getInstance().clearMessagesUnreadStatus(Conversation.ConversationType.PRIVATE, message.getTargetId(), null);
                                        MicedUserManager.get().removeMiscUser(CommonAppConfig.getInstance().getUid());
@@ -464,6 +528,7 @@ public class LivePlaySwViewHolder extends LiveRoomPlayViewHolder {
        Log.i(TAG, "setLiveBeanLandscape: " + landscape + " isPk: " + isPk);
        this.landscape = landscape;
        this.videoLandscape = landscape;
+        if (isPhysicalScreenVertical()) {
            if (landscape == 2) {
                Log.i(TAG, "还原9：16");
                RelativeLayout.LayoutParams params = (RelativeLayout.LayoutParams) ry_view.getLayoutParams();
@@ -504,6 +569,25 @@ public class LivePlaySwViewHolder extends LiveRoomPlayViewHolder {
                mCover.setLayoutParams(params2);
                mCover.requestLayout();
            }
+        } else {
+            Log.i(TAG, "还原横屏 16：9");
+            RelativeLayout.LayoutParams params = (RelativeLayout.LayoutParams) ry_view.getLayoutParams();
+            params.height = RelativeLayout.LayoutParams.MATCH_PARENT;
+            params.topMargin = 0;
+            ry_view.setLayoutParams(params);
+            ry_view.requestLayout();
+
+           /* RelativeLayout.LayoutParams params1 = (RelativeLayout.LayoutParams) ry_view.getLayoutParams();
+            params1.height = RelativeLayout.LayoutParams.MATCH_PARENT;
+            params1.topMargin = 0;
+            ry_view.setLayoutParams(params1);
+            ry_view.requestLayout();*/
+            RelativeLayout.LayoutParams params2 = (RelativeLayout.LayoutParams) mCover.getLayoutParams();
+            params2.height = RelativeLayout.LayoutParams.MATCH_PARENT;
+            params2.topMargin = 0;
+            mCover.setLayoutParams(params2);
+            mCover.requestLayout();
+        }
    }

    @Override
@@ -618,7 +702,7 @@ public class LivePlaySwViewHolder extends LiveRoomPlayViewHolder {
        params1.topMargin = mContext.getResources().getDimensionPixelOffset(R.dimen.live_top);
        params1.addRule(RelativeLayout.ALIGN_TOP);
        ry_view.setLayoutParams(params1);
-        ry_view.requestLayout();*/
+        ry_view.requestLayout(); */
        RelativeLayout.LayoutParams params2 = (RelativeLayout.LayoutParams) mCover.getLayoutParams();
        params2.height = DpUtil.dp2px(270);
        params2.topMargin = DpUtil.dp2px(120);
@@ -664,16 +748,18 @@ public class LivePlaySwViewHolder extends LiveRoomPlayViewHolder {
        Log.e("PK状态", "" + i);


-        /*RelativeLayout.LayoutParams params1 = (RelativeLayout.LayoutParams) ry_view.getLayoutParams();
+        /*
+        RelativeLayout.LayoutParams params1 = (RelativeLayout.LayoutParams) ry_view.getLayoutParams();
        params1.height = vHeight;
        params1.topMargin = contexts.getResources().getDimensionPixelOffset(R.dimen.live_top);
        params1.addRule(RelativeLayout.ALIGN_TOP);
-        ry_view.requestLayout();*/
+        ry_view.requestLayout(); */
        isPk = true;
    }

    /**
     * 播放开始
+     * TODO 横屏
     */
    public void onPrepared() {
        if (mEnd) {
@@ -681,6 +767,7 @@ public class LivePlaySwViewHolder extends LiveRoomPlayViewHolder {
            return;
        }
        int height;
+        if (isPhysicalScreenVertical()) {
            if (videoLandscape == VIDEO_VERTICAL) {
                height = ViewGroup.LayoutParams.MATCH_PARENT;
            } else {
@@ -732,6 +819,21 @@ public class LivePlaySwViewHolder extends LiveRoomPlayViewHolder {
                mCover.setLayoutParams(params2);
                mCover.requestLayout();
            }
+        } else {
+            Log.i(TAG, " onPrepared:还原横屏16：9 land=" + videoLandscape);
+            RelativeLayout.LayoutParams params = (RelativeLayout.LayoutParams) mVideoView.getLayoutParams();
+            params.height = ViewGroup.LayoutParams.MATCH_PARENT;
+            params.topMargin = 0;
+            params.addRule(RelativeLayout.ALIGN_TOP);
+            mVideoView.setLayoutParams(params);
+            mVideoView.requestLayout();
+
+            RelativeLayout.LayoutParams params2 = (RelativeLayout.LayoutParams) mCover.getLayoutParams();
+            params2.height = ViewGroup.LayoutParams.MATCH_PARENT;
+            params2.topMargin = 0;
+            mCover.setLayoutParams(params2);
+            mCover.requestLayout();
+        }
    }

    @Override
@@ -801,7 +903,6 @@ public class LivePlaySwViewHolder extends LiveRoomPlayViewHolder {
    @Override
    public void changeToLeft() {
        if (mVideoView != null) {
-
            RelativeLayout.LayoutParams params = (RelativeLayout.LayoutParams) mVideoView.getLayoutParams();
            params.height = vHeight;
 //            params.height =  mContext.getResources().getDimensionPixelOffset(R.dimen.live_view);
--- a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
+++ b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
@@ -5,6 +5,7 @@ import static com.yunbao.live.bean.LiveChatBean.RECOMMEND_CARD_NOTIFY;
 import android.app.Activity;
 import android.app.Dialog;
 import android.content.Context;
+import android.content.res.Configuration;
 import android.graphics.Outline;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
@@ -1000,8 +1001,10 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
                        }
                    }).into(dr_pk_end_gif);
        }
+    }

-
+    private boolean isPorit(){
+         return true;
    }

    public static void UpPkBar(JSONArray obj, String uid, int time) {
@@ -1175,6 +1178,10 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis

    }

+    private boolean isPortrait(Context context){
+      return context.getResources().getConfiguration().orientation == Configuration.ORIENTATION_PORTRAIT;
+    }
+

    @Override
    public void init() {
@@ -1412,16 +1419,26 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
        gif_view = (LinearLayout) findViewById(R.id.gif_view);
        chat_view = (RelativeLayout) findViewById(R.id.chat_view);

+        if(isPortrait(mContentView.getContext())){
            int topMargin = mScreenWdith * 720 / 960 + 210;
            RelativeLayout.LayoutParams params = (RelativeLayout.LayoutParams) chat_view.getLayoutParams();
            params.topMargin = topMargin;
            chat_view.setLayoutParams(params);
-
-
            RelativeLayout.LayoutParams msgLayoutLayoutParams = (RelativeLayout.LayoutParams) msgLayout.getLayoutParams();
            msgLayoutLayoutParams.topMargin = topMargin + DpUtil.dp2px(50);
            msgLayout.setLayoutParams(msgLayoutLayoutParams);
            voteManager.setMarginPosition(topMargin + DpUtil.dp2px(50));
+        }else {
+            int topMargin = mScreenWdith * 190 / 960 ;
+            RelativeLayout.LayoutParams params = (RelativeLayout.LayoutParams) chat_view.getLayoutParams();
+            params.topMargin = topMargin;
+            chat_view.setLayoutParams(params);
+            RelativeLayout.LayoutParams msgLayoutLayoutParams = (RelativeLayout.LayoutParams) msgLayout.getLayoutParams();
+            msgLayoutLayoutParams.topMargin = topMargin + DpUtil.dp2px(50);
+            msgLayout.setLayoutParams(msgLayoutLayoutParams);
+            voteManager.setMarginPosition(topMargin + DpUtil.dp2px(50));
+        }
+

        RelativeLayout.LayoutParams params1 = (RelativeLayout.LayoutParams) mChatRecyclerView.getLayoutParams();
        params1.topMargin = DpUtil.dp2px(65);
@@ -2127,7 +2144,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis

        }
    };
-    //主播倒计时调用接口
+    //主播倒计时调用接口b
    private Handler anchorTimeHandler = new Handler();
    private int mCountdown;
    private Runnable anchorTimeRunnable = new Runnable() {
@@ -2352,6 +2369,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
    public void resetViewGone() {
        goto_room_view.setVisibility(View.GONE);
        mPkRankTopIcon.setVisibility(View.GONE);
+        Log.i("nwq","LiveRoomViewHolder::resetViewGone");
        lt_pk_line.setVisibility(View.GONE);
        time.setVisibility(View.GONE);
        if (!SpUtil.getInstance().getBooleanValue("private_chat_message_switch")) {
@@ -3289,7 +3307,9 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis

    //双人pk显示
    public void UpPkTwo() {
+        Log.i("nwq","LiveRoomViewHolder::UpPkTwo");
        if (lt_pk_line.getVisibility() == View.VISIBLE) return;
+        Log.i("nwq","LiveRoomViewHolder::UpPkTwo22");
        ScreenDimenUtil util = ScreenDimenUtil.getInstance();
        int mScreenWdith = util.getScreenWdith();
        RelativeLayout.LayoutParams params = (RelativeLayout.LayoutParams) lt_pk_line.getLayoutParams();
--- a/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java
+++ b/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java
@@ -396,8 +396,10 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
                    liveHandler.removeCallbacks(loadTimeoutRunnableGone);
                    if (mLivePlayViewHolder == null) {
                        if (isSw) {
+                            Log.i("NWQ", "打开播放器源 声网");
                            mLivePlayViewHolder = new LivePlaySwViewHolder(mContext, playContainer, mLiveBean.getLandscape());
                        } else {
+                            Log.i("NWQ", "打开播放器源 融云");
                            mLivePlayViewHolder = new LivePlayRyViewHolder(mContext, playContainer, 1);
                        }

@@ -518,6 +520,11 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
        }
    };

+    //屏幕方向改变
+    public void onConfigureChange() {
+
+    }
+
    /**
     * 新进入房间接口
     */
@@ -730,9 +737,9 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
                                    }
                                }
                                isShowPrank = false;
-                            }else{
+                            } else {
                                //初始化天梯赛数据(不在pk过程中)
-                                mLiveRoomViewHolder.initRankPKInfo(mLiveUid,"");
+                                mLiveRoomViewHolder.initRankPKInfo(mLiveUid, "");
                            }
                            if (mLiveRoomViewHolder != null) {
                                mLiveRoomViewHolder.pkHandler = false;
@@ -818,9 +825,9 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe

                            upDataPkScore(pkInfo.getJSONArray("userlist"), pkInfo.getIntValue("drpk_time"));
                            isShowPrank = false;
-                        }else{
+                        } else {
                            //初始化天梯赛数据(不在pk过程中)
-                            mLiveRoomViewHolder.initRankPKInfo(mLiveUid,"");
+                            mLiveRoomViewHolder.initRankPKInfo(mLiveUid, "");
                        }
                        if (data.getEnterRoomInfo().getGuard() != null) {
                            if (mLiveRoomViewHolder != null) {
@@ -907,7 +914,7 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
                            mLiveRoomViewHolder.onSendMoneyLong();
                        }
                        //初始化整蠱列表
-                        mLiveRoomViewHolder.initPrankProgress(isShowPrank?1:2);
+                        mLiveRoomViewHolder.initPrankProgress(isShowPrank ? 1 : 2);

                    }

@@ -1123,7 +1130,12 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe

    @Override
    public void onConfigurationChanged(Configuration newConfig) {
+        mLiveRoomViewHolder.removeView();
+        mLiveRoomViewHolder = new LiveRoomViewHolder(false, 1, mContext, mContainer, mSecondPage.findViewById(R.id.gift_gif), mSecondPage.findViewById(R.id.gift_svga), mContainerWrap, mContext.getWindowManager(), isSw);
+        mLiveRoomViewHolder.subscribeActivityLifeCycle();
+        mLiveRoomViewHolder.addToParent();

+       // mLivePlayViewHolder.onConfigureChange();
    }

    @Override
@@ -1967,7 +1979,7 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
    //整蛊进度数据更新
    @Override
    public void onUpdatePrankProgress(String prankString) {
-        if (mLiveRoomViewHolder != null){
+        if (mLiveRoomViewHolder != null) {
            mLiveRoomViewHolder.refreshPrank(prankString);
        }
    }
--- a/live/src/main/res/drawable-land/bg_live_user.xml
+++ b/live/src/main/res/drawable-land/bg_live_user.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="@color/white" />
+</shape>
--- a/live/src/main/res/layout-land/activity_live_audience.xml
+++ b/live/src/main/res/layout-land/activity_live_audience.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.yunbao.common.views.weight.MyDrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/drawer_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <ImageView
+            android:id="@+id/live_back"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:scaleType="centerCrop"
+            android:src="@mipmap/live_bg" />
+
+        <View
+            android:id="@+id/mask"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="#80000000" />
+
+        <FrameLayout
+            android:id="@+id/play_container"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
+
+
+        <com.yunbao.common.custom.MyViewPager
+            android:id="@+id/viewPager"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:overScrollMode="never" />
+
+        <FrameLayout
+            android:id="@+id/page_container"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
+
+
+        <ImageView
+            android:id="@+id/btn_small_screen"
+            android:layout_width="35dp"
+            android:layout_height="35dp"
+            android:layout_gravity="right"
+            android:layout_marginTop="30dp"
+            android:layout_marginRight="20dp"
+            android:padding="5dp"
+            android:src="@mipmap/icon_live_close"
+            android:visibility="gone" />
+
+    </FrameLayout>
+
+    <include
+        android:id="@+id/loading"
+        layout="@layout/layout_portrait_live_item" />
+
+    <Switch
+        android:id="@+id/switch1"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Switch" />
+
+
+</com.yunbao.common.views.weight.MyDrawerLayout>
--- a/live/src/main/res/layout-land/dialog_fans.xml
+++ b/live/src/main/res/layout-land/dialog_fans.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:layout_marginTop="18dp"
+    android:layout_marginBottom="18dp"
+    android:gravity="center_vertical|right"
+    android:orientation="vertical"
+    app:cardCornerRadius="12dp"
+    app:cardElevation="16dp">
+
+
+    <WebView
+        android:id="@+id/rlWebview"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+</androidx.cardview.widget.CardView>
--- a/live/src/main/res/layout-land/dialog_new_live_user.xml
+++ b/live/src/main/res/layout-land/dialog_new_live_user.xml
@@ -0,0 +1,610 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/rootView"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <!--用来确认头像位置的基准线，需要根据背景进行调整 -->
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/bgView"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="16dp"
+        android:background="@drawable/bg_live_user"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.52"
+        app:layout_constraintWidth_percent="0.48">
+
+        <ImageView
+            android:id="@+id/title_bg"
+            android:layout_width="0dp"
+            android:layout_height="93dp"
+            android:visibility="visible"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"/>
+        <TextView
+            android:id="@+id/btn_report"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="18dp"
+            android:layout_marginEnd="14dp"
+            android:gravity="center"
+            android:text="@string/report"
+            android:textColor="#B1B1B1"
+            android:visibility="visible"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <TextView
+            android:id="@+id/ai_te"
+            android:layout_width="41dp"
+            android:layout_height="25dp"
+            android:layout_marginTop="10dp"
+            android:background="@drawable/background_fc6945"
+            android:gravity="center"
+            android:text="\@TA"
+            android:textColor="@color/white"
+            android:visibility="visible"
+            app:layout_constraintEnd_toEndOf="@+id/btn_report"
+            app:layout_constraintTop_toBottomOf="@+id/btn_report" />
+
+        <LinearLayout
+            android:id="@+id/btn_guard"
+            android:layout_width="88dp"
+            android:layout_height="23dp"
+            android:layout_marginStart="25dp"
+            android:layout_marginTop="18dp"
+            android:background="@drawable/bg_user_card_guard"
+            android:gravity="center"
+            android:orientation="horizontal"
+            android:visibility="invisible"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent">
+
+            <TextView
+                android:id="@+id/guard_val"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="1dp"
+                android:text="@string/user_card_guard"
+                android:textColor="#FFFFFF"
+                android:textSize="10sp" />
+
+            <ImageView
+                android:id="@+id/imageView4"
+                android:layout_width="10dp"
+                android:layout_height="10dp"
+                app:srcCompat="@mipmap/icon_arrow_right_3" />
+        </LinearLayout>
+
+        <ImageView
+            android:id="@+id/btn_setting"
+            android:layout_width="20dp"
+            android:layout_height="20dp"
+            android:layout_marginTop="18dp"
+            android:layout_marginEnd="14dp"
+            android:src="@mipmap/icon_live_usercard_setting"
+            android:visibility="gone"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:ignore="MissingConstraints"
+            tools:visibility="visible" />
+
+
+
+
+        <TextView
+            android:id="@+id/name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="48dp"
+            android:ellipsize="end"
+            android:singleLine="true"
+            android:textColor="@color/textColor"
+            android:textSize="16sp"
+            android:textStyle="bold"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:text="sxsdff" />
+
+        <LinearLayout
+            android:id="@+id/ll1"
+            android:layout_width="wrap_content"
+            android:layout_height="17dp"
+            android:layout_marginTop="13dp"
+            android:orientation="horizontal"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/name">
+
+            <ImageView
+                android:id="@+id/good_nub_ico"
+                android:layout_width="18dp"
+                android:layout_height="15dp"
+                android:layout_marginRight="6dp"
+                android:src="@mipmap/usercard_good_nub"
+                android:visibility="visible" />
+
+            <ImageView
+                android:layout_width="18dp"
+                android:layout_height="15dp"
+                android:layout_marginRight="6dp"
+                android:src="@mipmap/user_card_id"
+                android:visibility="visible" />
+
+
+            <TextView
+                android:id="@+id/id_val"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:textColor="#B1B1B1"
+                android:textSize="13sp" />
+
+            <View
+                android:layout_width="1dp"
+                android:layout_height="25dp"
+                android:layout_gravity="center_vertical"
+                android:layout_marginLeft="8dp"
+                android:layout_marginRight="8dp"
+                android:background="#B1B1B1"
+                android:visibility="visible" />
+
+            <TextView
+                android:id="@+id/fans_val"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:textColor="#B1B1B1"
+                android:textSize="13sp" />
+
+            <View
+                android:layout_width="1dp"
+                android:layout_height="25dp"
+                android:layout_gravity="center_vertical"
+                android:layout_marginLeft="8dp"
+                android:layout_marginRight="8dp"
+                android:background="#B1B1B1"
+                android:visibility="visible" />
+
+            <TextView
+                android:id="@+id/praise_val"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:textColor="#B1B1B1"
+                android:textSize="13sp" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/ll2"
+            android:layout_width="wrap_content"
+            android:layout_height="17.5dp"
+            android:layout_marginTop="15dp"
+            android:gravity="center"
+            android:orientation="horizontal"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/ll1">
+
+            <ImageView
+                android:id="@+id/sex"
+                android:layout_width="27dp"
+                android:layout_height="match_parent"
+                android:layout_marginLeft="4dp" />
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:layout_width="46.5dp"
+                android:layout_height="match_parent"
+                android:layout_gravity="center"
+                android:layout_marginStart="6dp"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:id="@+id/user_card_lv_icon"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_gravity="center"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+                <TextView
+                    android:id="@+id/user_card_lv_val"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_gravity="center"
+                    android:layout_marginStart="5dp"
+                    android:gravity="center"
+                    android:textColor="#FFFFFF"
+                    android:textSize="12sp"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+
+            <LinearLayout
+                android:id="@+id/btn_union"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_marginStart="6dp"
+                android:background="@drawable/bg_user_card_guard"
+                android:gravity="center"
+                android:orientation="horizontal"
+                android:visibility="gone">
+
+                <TextView
+                    android:id="@+id/union_val"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="10dp"
+                    android:layout_marginEnd="10dp"
+                    android:gravity="center"
+                    android:text="@string/user_card_guard"
+                    android:textColor="#FFFFFF"
+                    android:textSize="9sp" />
+            </LinearLayout>
+
+            <ImageView
+                android:id="@+id/user_card_noble"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_marginStart="6dp"
+                android:src="@mipmap/emperor_rom" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/ll3"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="15dp"
+            android:layout_marginBottom="15dp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/ll2">
+
+            <ImageView
+                android:layout_width="17dp"
+                android:layout_height="14dp"
+                android:layout_gravity="top"
+                android:src="@mipmap/icon_user_card_t1" />
+
+            <TextView
+                android:id="@+id/sign"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/live_user_dialog_tips"
+                android:textColor="#B1B1B1"
+                android:textSize="14sp" />
+
+            <ImageView
+                android:layout_width="17dp"
+                android:layout_height="14dp"
+                android:layout_gravity="bottom"
+                android:src="@mipmap/icon_user_card_t2" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/ll4"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="15dp"
+            android:gravity="center"
+            android:orientation="horizontal"
+            android:visibility="gone"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/ll3"
+            tools:visibility="visible">
+
+            <ImageView
+                android:id="@+id/medal_ico1"
+                android:layout_width="35dp"
+                android:layout_height="35dp" />
+
+            <LinearLayout
+                android:id="@+id/ry_view"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:visibility="visible">
+
+                <View
+                    android:id="@+id/no_gz"
+                    android:layout_width="1dp"
+                    android:layout_height="25dp"
+                    android:layout_gravity="center_vertical"
+                    android:layout_marginLeft="8dp"
+                    android:layout_marginRight="8dp"
+                    android:background="#B1B1B1"
+                    android:visibility="visible" />
+
+                <ImageView
+                    android:id="@+id/ry_ico1"
+                    android:layout_width="35dp"
+                    android:layout_height="35dp"
+                    android:layout_marginLeft="8dp"
+                    android:visibility="visible" />
+
+                <ImageView
+                    android:id="@+id/ry_ico2"
+                    android:layout_width="35dp"
+                    android:layout_height="35dp"
+                    android:layout_marginLeft="8dp"
+                    android:visibility="visible" />
+
+                <ImageView
+                    android:id="@+id/ry_ico3"
+                    android:layout_width="35dp"
+                    android:layout_height="35dp"
+                    android:layout_marginLeft="8dp"
+                    android:visibility="visible" />
+
+                <ImageView
+                    android:id="@+id/ry_ico4"
+                    android:layout_width="35dp"
+                    android:layout_height="35dp"
+                    android:layout_marginLeft="8dp"
+                    android:visibility="visible" />
+            </LinearLayout>
+
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/ll5"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="15dp"
+            android:visibility="visible"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/ll4">
+
+            <LinearLayout
+                android:id="@+id/user_level_layout"
+                android:layout_width="0dp"
+                android:layout_height="55dp"
+                android:layout_marginStart="8dp"
+                android:layout_weight="1"
+                android:background="@drawable/bg_user_card_lv"
+                android:gravity="center_vertical">
+
+                <ImageView
+                    android:id="@+id/live_icon"
+                    android:layout_width="24dp"
+                    android:layout_height="24dp"
+                    android:layout_marginStart="2dp"
+                    android:layout_marginEnd="5dp"
+                    android:src="@mipmap/icon_chat_face"
+                    android:visibility="visible" />
+
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical">
+
+                    <TextView
+                        android:id="@+id/lv_desc"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/live_user_level_anchor"
+                        android:textColor="#FFFFFF"
+                        android:textSize="11sp" />
+
+                    <TextView
+                        android:id="@+id/lv_val"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="Lv.0"
+                        android:textColor="#FFFFFF"
+                        android:textSize="9sp" />
+                </LinearLayout>
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/gift_wall"
+                android:layout_width="0dp"
+                android:layout_height="55dp"
+                android:layout_marginStart="8dp"
+                android:layout_weight="1"
+                android:background="@drawable/bg_user_card_lv"
+                android:gravity="center_vertical">
+
+                <ImageView
+                    android:id="@+id/icon_gift_wall"
+                    android:layout_width="24dp"
+                    android:layout_height="24dp"
+                    android:layout_marginStart="2dp"
+                    android:layout_marginEnd="5dp"
+                    android:src="@mipmap/icon_chat_face"
+                    android:visibility="visible" />
+
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical">
+
+                    <TextView
+                        android:id="@+id/text_gift_wall"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/live_user_level_anchor"
+                        android:textColor="#FFFFFF"
+                        android:textSize="11sp" />
+
+                    <TextView
+                        android:id="@+id/value_gift_wall"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="Lv.0"
+                        android:textColor="#FFFFFF"
+                        android:textSize="9sp" />
+                </LinearLayout>
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/noble_icon_layout"
+                android:layout_width="0dp"
+                android:layout_height="55dp"
+                android:layout_marginStart="8dp"
+                android:layout_marginEnd="8dp"
+                android:layout_weight="1"
+                android:background="@mipmap/img_aristocrat_notopen"
+                android:gravity="center_vertical">
+
+                <ImageView
+                    android:id="@+id/noble_icon"
+                    android:layout_width="24dp"
+                    android:layout_height="24dp"
+                    android:layout_marginStart="7dp"
+                    android:layout_marginEnd="5dp"
+                    android:src="@mipmap/img_fans_default"
+                    android:visibility="invisible" />
+
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="5dp"
+                    android:layout_marginEnd="2dp"
+                    android:orientation="vertical">
+
+                    <TextView
+                        android:id="@+id/noble_title_val"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/live_noble_level_anchor"
+                        android:textColor="#FFFFFF"
+                        android:textSize="11sp" />
+
+                    <TextView
+                        android:id="@+id/noble_val"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="Lv.0"
+                        android:textColor="#FFFFFF"
+                        android:textSize="9sp" />
+                </LinearLayout>
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/honor_layout"
+                android:layout_width="0dp"
+                android:layout_height="55dp"
+                android:layout_marginEnd="8dp"
+                android:layout_weight="1"
+                android:background="@drawable/bg_user_card_honor"
+                android:gravity="center_vertical">
+
+                <ImageView
+                    android:id="@+id/honor_icon"
+                    android:layout_width="24dp"
+                    android:layout_height="24dp"
+                    android:layout_marginStart="2dp"
+                    android:layout_marginEnd="5dp"
+                    android:src="@mipmap/img_honor_default"
+                    android:visibility="visible" />
+
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/live_honor_number_anchor"
+                        android:textColor="#FFFFFF"
+                        android:textSize="11sp" />
+
+                    <TextView
+                        android:id="@+id/honor_val"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="0"
+                        android:textColor="#FFFFFF"
+                        android:textSize="9sp" />
+                </LinearLayout>
+            </LinearLayout>
+        </LinearLayout>
+
+        <FrameLayout
+            android:id="@+id/bottom_container"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="13dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/ll5" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+    <View
+        android:id="@+id/guideline"
+        android:layout_width="1dp"
+        android:layout_height="1dp"
+        android:layout_marginTop="20dp"
+        app:layout_constraintStart_toStartOf="@id/bgView"
+        app:layout_constraintTop_toTopOf="@id/bgView" />
+
+    <ImageView
+        android:id="@+id/shawl"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        app:layout_constraintEnd_toEndOf="@id/bgView"
+        app:layout_constraintStart_toStartOf="@id/bgView"
+        app:layout_constraintTop_toTopOf="@+id/guideline"
+        app:layout_constraintBottom_toBottomOf="@+id/guideline" />
+
+
+
+
+    <com.makeramen.roundedimageview.RoundedImageView
+        android:id="@+id/avatar"
+        android:layout_width="63dp"
+        android:layout_height="63dp"
+        android:layout_centerInParent="true"
+        android:scaleType="centerCrop"
+        app:layout_constraintBottom_toBottomOf="@+id/guideline"
+        app:layout_constraintEnd_toEndOf="@id/bgView"
+        app:layout_constraintStart_toStartOf="@id/bgView"
+        app:riv_oval="true"
+        tools:src="@mipmap/icon_avatar_male" />
+
+    <com.opensource.svgaplayer.SVGAImageView
+        android:id="@+id/gift_svga"
+        android:layout_width="82dp"
+        android:layout_height="82dp"
+        android:layout_centerInParent="true"
+        android:scaleType="centerCrop"
+        app:autoPlay="true"
+        app:layout_constraintBottom_toBottomOf="@+id/avatar"
+        app:layout_constraintEnd_toEndOf="@+id/avatar"
+        app:layout_constraintStart_toStartOf="@+id/avatar"
+        app:layout_constraintTop_toTopOf="@+id/avatar" />
+
+    <pl.droidsonroids.gif.GifImageView
+        android:id="@+id/btn_live"
+        android:layout_width="70dp"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_centerHorizontal="true"
+        android:adjustViewBounds="true"
+        android:src="@mipmap/icon_user_home_living"
+        android:visibility="visible"
+        app:layout_constraintBottom_toBottomOf="@+id/gift_svga"
+        app:layout_constraintEnd_toEndOf="@+id/gift_svga"
+        app:layout_constraintStart_toStartOf="@+id/gift_svga" />
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>
--- a/live/src/main/res/layout-land/view_live_audience.xml
+++ b/live/src/main/res/layout-land/view_live_audience.xml
@@ -0,0 +1,520 @@
+<?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="match_parent"
+    android:orientation="vertical">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_alignParentBottom="true"
+            android:layout_gravity="bottom"
+            android:orientation="vertical">
+
+
+            <LinearLayout
+                android:id="@+id/btn_turntable"
+                android:layout_width="76dp"
+                android:layout_height="45dp"
+                android:layout_gravity="right"
+                android:layout_marginRight="10dp"
+                android:layout_marginBottom="30dp"
+                android:gravity="center_horizontal"
+                android:orientation="vertical"
+                android:visibility="gone">
+
+                <ImageView
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:src="@drawable/live_turntable" />
+
+            </LinearLayout>
+
+
+            <LinearLayout
+                android:id="@+id/btn_onecz_event"
+                android:layout_width="55dp"
+                android:layout_height="55dp"
+                android:layout_gravity="right"
+                android:layout_marginRight="10dp"
+                android:layout_marginBottom="20dp"
+                android:gravity="center_horizontal"
+                android:orientation="vertical"
+                android:visibility="gone">
+
+                <pl.droidsonroids.gif.GifImageView
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:adjustViewBounds="true"
+                    android:src="@mipmap/onecz" />
+
+            </LinearLayout>
+
+
+            <LinearLayout
+                android:id="@+id/btn_wishlist"
+                android:layout_width="55dp"
+                android:layout_height="55dp"
+                android:layout_gravity="right"
+                android:layout_marginRight="10dp"
+                android:layout_marginBottom="50dp"
+                android:gravity="center_horizontal"
+                android:orientation="vertical"
+                android:visibility="gone">
+
+                <ImageView
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:src="@drawable/icon_wish_player" />
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:gravity="center"
+                    android:text="@string/live_wish_list"
+                    android:textColor="@color/gray2"
+                    android:textSize="10sp"
+                    android:visibility="gone" />
+            </LinearLayout>
+
+
+            <LinearLayout
+                android:layout_width="50dp"
+                android:layout_height="50dp"
+                android:layout_gravity="right"
+                android:layout_marginRight="10dp"
+                android:layout_marginBottom="5dp"
+                android:background="@drawable/bg_live_link_mic"
+                android:gravity="center_horizontal"
+                android:orientation="vertical"
+                android:visibility="gone">
+
+                <ImageView
+                    android:layout_width="30dp"
+                    android:layout_height="30dp"
+                    android:layout_marginTop="2dp"
+                    android:src="@mipmap/icon_live_link_mic" />
+
+                <TextView
+                    android:id="@+id/link_mic_tip"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:gravity="center"
+                    android:text="@string/live_link_mic_2"
+                    android:textColor="@color/gray2"
+                    android:textSize="10sp" />
+
+            </LinearLayout>
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="45dp"
+            android:layout_alignParentBottom="true"
+            android:gravity="center_vertical">
+
+            <ImageView
+                android:id="@+id/btn_close"
+                android:layout_width="0dp"
+                android:layout_height="0dp"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
+                android:padding="5dp"
+                android:src="@mipmap/icon_live_close"
+                android:visibility="invisible" />
+
+
+            <pl.droidsonroids.gif.GifImageView
+                android:id="@+id/btn_zg"
+                android:layout_width="32dp"
+                android:layout_height="32dp"
+                android:layout_centerVertical="true"
+                android:layout_marginLeft="5dp"
+                android:layout_toLeftOf="@id/btn_gift"
+                android:adjustViewBounds="true"
+                android:background="@mipmap/img_bg"
+                android:padding="5dp"
+                android:src="@mipmap/zg"
+                android:visibility="gone" />
+
+
+            <RelativeLayout
+                android:id="@+id/btn_zg1"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_toLeftOf="@id/btn_zg"
+                android:visibility="gone">
+
+                <ImageView
+                    android:layout_width="32dp"
+                    android:layout_height="32dp"
+                    android:background="@mipmap/img_bg" />
+
+                <pl.droidsonroids.gif.GifImageView
+                    android:id="@+id/btn_hd"
+                    android:layout_width="33dp"
+                    android:layout_height="33dp"
+                    android:adjustViewBounds="true"
+                    android:src="@mipmap/play" />
+
+            </RelativeLayout>
+
+
+            <pl.droidsonroids.gif.GifImageView
+                android:id="@+id/btn_share"
+                android:layout_width="32dp"
+                android:layout_height="32dp"
+                android:layout_centerVertical="true"
+                android:layout_marginLeft="5dp"
+                android:layout_toRightOf="@id/btn_gift"
+                android:adjustViewBounds="true"
+                android:background="@mipmap/img_bg"
+                android:padding="5dp"
+                android:src="@mipmap/zan_gif"
+                android:visibility="gone" />
+
+            <pl.droidsonroids.gif.GifImageView
+                android:id="@+id/btn_gift"
+                android:layout_width="32dp"
+                android:layout_height="32dp"
+                android:layout_centerVertical="true"
+                android:layout_marginLeft="5dp"
+                android:layout_marginRight="10dp"
+                android:layout_toLeftOf="@id/btn_close"
+                android:adjustViewBounds="true"
+                android:background="@mipmap/img_bg"
+                android:src="@mipmap/live_lw"
+                android:visibility="gone" />
+
+            <ImageView
+                android:id="@+id/btn_link_mic"
+                android:layout_width="0dp"
+                android:layout_height="0dp"
+                android:layout_centerVertical="true"
+                android:layout_toLeftOf="@id/btn_more"
+                android:src="@mipmap/icon_live_link_mic_1"
+                android:visibility="gone" />
+
+            <ImageView
+                android:id="@+id/btn_more"
+                android:layout_width="30dp"
+                android:layout_height="30dp"
+                android:layout_centerVertical="true"
+                android:layout_marginRight="5dp"
+                android:layout_toLeftOf="@id/btn_mic"
+                android:src="@mipmap/live_user_more"
+                android:visibility="gone" />
+
+
+            <ImageView
+                android:id="@+id/btn_mic"
+                android:layout_width="30dp"
+                android:layout_height="30dp"
+                android:layout_centerVertical="true"
+                android:layout_marginRight="5dp"
+                android:layout_toLeftOf="@id/btn_zg1"
+                android:src="@mipmap/lianmai"
+                android:visibility="gone" />
+
+
+            <ImageView
+                android:id="@+id/btn_red_pack"
+                android:layout_width="0dp"
+                android:layout_height="40dp"
+                android:layout_marginRight="5dp"
+                android:layout_toLeftOf="@id/btn_link_mic"
+                android:padding="5dp"
+                android:src="@mipmap/icon_live_red_pack"
+                android:visibility="gone" />
+
+            <!--聊天-->
+            <LinearLayout
+                android:layout_width="126dp"
+                android:layout_height="35dp"
+                android:layout_marginStart="10dp"
+                android:clickable="false"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:id="@+id/et_input"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_gravity="center"
+                    android:layout_weight="9"
+                    android:alpha="0.5"
+                    android:background="@drawable/bc_sound_recording_left"
+                    android:gravity="center"
+                    android:hint="@string/say_something3"
+                    android:singleLine="true"
+                    android:textColor="#D9D9D9"
+                    android:textColorHint="@color/gray3"
+                    android:textSize="12sp" />
+
+                <LinearLayout
+                    android:id="@+id/voice_button"
+                    android:layout_width="36dp"
+                    android:layout_height="36dp"
+                    android:background="@drawable/bc_sound_recording_right"
+                    android:clickable="true"
+                    android:focusable="true"
+                    android:focusableInTouchMode="true"
+                    android:gravity="center">
+
+                    <ImageView
+
+                        android:layout_width="14dp"
+                        android:layout_height="14dp"
+                        android:layout_gravity="center"
+                        android:clickable="false"
+                        android:focusable="false"
+                        android:focusableInTouchMode="false"
+                        android:src="@mipmap/icon_voice"
+                        android:visibility="visible" />
+                </LinearLayout>
+
+
+            </LinearLayout>
+            <!--消息中心-->
+            <RelativeLayout
+                android:visibility="visible"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content">
+
+                <RelativeLayout
+                    android:id="@+id/rt_msg"
+                    android:layout_width="45dp"
+                    android:layout_height="45dp">
+
+                    <ImageView
+                        android:id="@+id/btn_msg"
+                        android:layout_width="35dp"
+                        android:layout_height="35dp"
+                        android:layout_centerInParent="true"
+                        android:src="@mipmap/icon_message" />
+
+                    <View
+                        android:id="@+id/v_msg_redpoint"
+                        android:layout_width="6dp"
+                        android:layout_height="6dp"
+                        android:layout_marginTop="6dp"
+                        android:background="@drawable/background_ff5075"
+                        android:visibility="gone" />
+                </RelativeLayout>
+
+                <TextView
+                    android:id="@+id/red_point"
+                    android:layout_width="6dp"
+                    android:layout_height="6dp"
+                    android:layout_alignTop="@id/rt_msg"
+                    android:layout_alignRight="@id/rt_msg"
+                    android:layout_marginTop="5dp"
+                    android:layout_marginRight="5dp"
+                    android:background="@drawable/bg_red_point"
+                    android:gravity="center"
+                    android:includeFontPadding="false"
+                    android:minWidth="14dp"
+                    android:paddingLeft="3dp"
+                    android:paddingRight="3dp"
+                    android:textColor="#fff"
+                    android:textSize="10sp"
+                    android:translationY="-4dp"
+                    android:visibility="invisible" />
+
+            </RelativeLayout>
+
+
+            <View
+                android:layout_width="0dp"
+                android:layout_height="1dp"
+                android:layout_weight="1" />
+
+
+            <!--整蛊-->
+            <ImageView
+                android:id="@+id/live_cheat"
+                android:layout_width="35dp"
+                android:layout_height="35dp"
+                android:layout_marginEnd="8dp"
+                android:src="@mipmap/icon_prank"
+                android:visibility="gone" />
+            <!--玩-->
+            <ImageView
+                android:id="@+id/live_play"
+                android:layout_width="27.2dp"
+                android:layout_height="27.2dp"
+                android:layout_marginEnd="8dp"
+                android:src="@mipmap/live_icon_play"
+                android:visibility="gone" />
+            <!--新人特惠-->
+            <RelativeLayout
+                android:layout_width="40dp"
+                android:layout_height="40dp"
+                android:layout_marginEnd="13dp"
+                android:padding="4dp"
+                android:visibility="gone">
+
+                <ImageView
+                    android:id="@+id/live_new_people"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_centerInParent="true"
+                    android:src="@mipmap/live_icon_newpeople_en"
+                    android:visibility="invisible" />
+
+                <View
+                    android:id="@+id/live_new_people_red_dot"
+                    android:layout_width="12dp"
+                    android:layout_height="12dp"
+                    android:layout_alignParentRight="true"
+                    android:layout_marginTop="0dp"
+                    android:layout_marginRight="0dp"
+                    android:background="@drawable/background_ff5075"
+                    android:visibility="invisible" />
+            </RelativeLayout>
+
+            <RelativeLayout
+                android:layout_width="36dp"
+                android:layout_height="36dp"
+                android:layout_marginEnd="8dp">
+
+                <com.yunbao.common.views.weight.CircleProgress2
+                    android:id="@+id/circleProgress"
+                    android:layout_width="32dp"
+                    android:layout_height="32dp"
+                    android:layout_centerHorizontal="true"
+                    android:layout_centerVertical="true" />
+
+                <ImageView
+                    android:id="@+id/pd_pao"
+                    android:layout_width="27dp"
+                    android:layout_height="27dp"
+                    android:layout_centerHorizontal="true"
+                    android:layout_centerVertical="true"
+                    android:src="@mipmap/icon_pd_pao" />
+
+                <TextView
+                    android:id="@+id/time_text"
+                    android:layout_width="27dp"
+                    android:layout_height="27dp"
+                    android:layout_centerHorizontal="true"
+                    android:layout_centerVertical="true"
+                    android:background="@drawable/backgroud_panda_time"
+                    android:gravity="center"
+                    android:text="120S"
+                    android:textColor="@color/white"
+                    android:textSize="10sp"
+                    android:visibility="gone" />
+
+
+                <ImageView
+                    android:id="@+id/combo"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:src="@mipmap/icon_combo"
+                    android:visibility="gone" />
+            </RelativeLayout>
+
+            <!--礼物-->
+            <ImageView
+                android:id="@+id/gift_image"
+                android:layout_width="36dp"
+                android:layout_height="36dp"
+                android:layout_marginEnd="8dp"
+                android:background="@drawable/background_gift" />
+            <!--特权-->
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:layout_width="40dp"
+                android:layout_height="40dp">
+
+
+                <ImageView
+                    android:id="@+id/live_privilege"
+                    android:layout_width="0dp"
+                    android:layout_height="0dp"
+                    android:layout_marginEnd="8dp"
+                    android:src="@mipmap/icon_privilege"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+                <View
+                    android:id="@+id/privilege_red_point"
+                    android:layout_width="6dp"
+                    android:layout_height="6dp"
+                    android:layout_marginTop="5dp"
+                    android:layout_marginEnd="10dp"
+                    android:background="@drawable/bg_red_point"
+                    android:visibility="gone"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"
+                    tools:visibility="visible" />
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+            <RelativeLayout
+                android:layout_width="38dp"
+                android:layout_height="38dp">
+                <!--普通工具合集-->
+                <ImageView
+                    android:id="@+id/total_image"
+                    android:layout_width="35dp"
+                    android:layout_height="35dp"
+                    android:layout_marginEnd="8dp"
+                    android:src="@mipmap/icon_more_live_menu" />
+
+                <View
+                    android:id="@+id/total_image_red_point"
+                    android:layout_width="6dp"
+                    android:layout_height="6dp"
+                    android:layout_alignParentEnd="true"
+                    android:layout_marginEnd="12dp"
+                    android:layout_marginTop="3dp"
+                    android:background="@drawable/bg_red_point"
+                    tools:visibility="visible" />
+            </RelativeLayout>
+
+
+        </LinearLayout>
+
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="100dp"
+            android:layout_alignParentBottom="true"
+            android:layout_marginBottom="360dp">
+
+            <com.opensource.svgaplayer.SVGAImageView
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_gravity="center_vertical" />
+
+            <include
+                android:id="@+id/station_horn_banner"
+                layout="@layout/view_whole_station_horn_layout"
+                android:visibility="gone" />
+        </RelativeLayout>
+
+        <TextView
+            android:id="@+id/quick_gift_remaining_quantity"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentEnd="true"
+            android:layout_alignParentBottom="true"
+            android:layout_marginEnd="144dp"
+            android:layout_marginBottom="-2dp"
+            android:text="99"
+            android:textColor="#FFB403"
+            android:textSize="8sp"
+            android:textStyle="bold" />
+
+    </RelativeLayout>
+
+</LinearLayout>
--- a/live/src/main/res/layout-land/view_live_play_ksy.xml
+++ b/live/src/main/res/layout-land/view_live_play_ksy.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/root"
+    android:animateLayoutChanges="true"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+
+    <com.google.android.exoplayer2.ui.StyledPlayerView
+        android:id="@+id/video_view"
+        android:layout_width="match_parent"
+        app:surface_type="texture_view"
+        app:use_controller="false"
+        android:layout_height="match_parent" />
+
+    <ImageView
+        android:id="@+id/leave"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_gravity="center_vertical"
+        android:scaleType="centerCrop"
+        android:src="@mipmap/zslk"
+        android:visibility="gone" />
+
+
+    <RelativeLayout
+        android:id="@+id/pk_container"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/live_top">
+
+        <com.yunbao.live.custom.MyFrameLayout4
+            android:id="@+id/left_container"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_marginBottom="20dp" />
+
+        <com.yunbao.live.custom.MyFrameLayout4
+            android:id="@+id/right_container"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_gravity="right"
+            android:layout_marginBottom="20dp" />
+
+    </RelativeLayout>
+
+
+    <com.yunbao.live.custom.MyFrameLayout3
+        android:id="@+id/small_container"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentBottom="true"
+        android:layout_marginBottom="120dp"
+        app:mfl3_ratio="0.25" />
+
+
+    <FrameLayout
+        android:id="@+id/ry_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+
+    <ImageView
+        android:id="@+id/cover"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:scaleType="centerCrop" />
+
+    <ProgressBar
+        android:id="@+id/loading"
+        android:layout_width="24dp"
+        android:layout_height="24dp"
+        android:layout_marginTop="240dp"
+        android:layout_centerHorizontal="true"
+        android:indeterminateBehavior="repeat"
+        android:indeterminateDrawable="@drawable/anim_loading"
+        android:indeterminateOnly="true"
+        android:visibility="invisible" />
+    <ProgressBar
+        android:id="@+id/loading2"
+        android:layout_width="24dp"
+        android:layout_height="24dp"
+        android:layout_marginTop="240dp"
+        android:layout_centerHorizontal="true"
+        android:indeterminateBehavior="repeat"
+        android:indeterminateDrawable="@drawable/anim_loading"
+        android:indeterminateOnly="true"
+        android:visibility="invisible" />
+
+</RelativeLayout>
--- a/live/src/main/res/layout-land/view_live_play_sw.xml
+++ b/live/src/main/res/layout-land/view_live_play_sw.xml
@@ -0,0 +1,168 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/root"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:animateLayoutChanges="true">
+
+
+    <com.google.android.exoplayer2.ui.StyledPlayerView
+        android:id="@+id/video_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:visibility="gone"
+        app:surface_type="texture_view"
+        app:use_controller="false" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_centerVertical="true"
+        android:orientation="horizontal">
+
+        <FrameLayout
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1" />
+
+        <FrameLayout
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1" />
+    </LinearLayout>
+
+
+    <ImageView
+        android:id="@+id/leave"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:layout_gravity="center_vertical"
+        android:scaleType="centerCrop"
+        android:src="@mipmap/zslk"
+        android:visibility="gone" />
+
+    <FrameLayout
+        android:id="@+id/pk_container"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <com.yunbao.live.custom.MyFrameLayout4
+            android:id="@+id/left_container"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_marginBottom="20dp" />
+
+        <com.yunbao.live.custom.MyFrameLayout4
+            android:id="@+id/right_container"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_gravity="right"
+            android:layout_marginBottom="20dp" />
+
+    </FrameLayout>
+
+    <LinearLayout
+        android:id="@+id/dr_pk_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="horizontal"
+        tools:visibility="visible"
+        android:visibility="gone">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:orientation="vertical">
+
+            <FrameLayout
+                android:id="@+id/dr1_preview"
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="1"
+                android:background="@mipmap/live_icon_vacancy"
+                tools:ignore="NestedWeights" />
+
+            <FrameLayout
+                android:id="@+id/dr3_preview"
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="1"
+                android:background="@mipmap/live_icon_vacancy" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:orientation="vertical">
+
+            <FrameLayout
+                android:id="@+id/dr2_preview"
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="1"
+                android:background="@mipmap/live_icon_vacancy"
+                tools:ignore="NestedWeights" />
+
+            <FrameLayout
+                android:id="@+id/dr4_preview"
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="1"
+                android:background="@mipmap/live_icon_vacancy" />
+
+        </LinearLayout>
+
+    </LinearLayout>
+
+    <com.yunbao.live.custom.MyFrameLayout3
+        android:id="@+id/small_container"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentBottom="true"
+        android:layout_marginBottom="120dp"
+        app:mfl3_ratio="0.25" />
+
+
+    <FrameLayout
+        android:id="@+id/ry_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+
+    <ImageView
+        android:id="@+id/cover"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:scaleType="centerCrop" />
+
+    <ProgressBar
+        android:id="@+id/loading"
+        android:layout_width="24dp"
+        android:layout_height="24dp"
+        android:layout_centerHorizontal="true"
+        android:layout_marginTop="240dp"
+        android:indeterminateBehavior="repeat"
+        android:indeterminateDrawable="@drawable/anim_loading"
+        android:indeterminateOnly="true"
+        android:visibility="invisible"
+        tools:visibility="visible"/>
+
+    <ProgressBar
+        android:id="@+id/loading2"
+        android:layout_width="24dp"
+        android:layout_height="24dp"
+        android:layout_centerHorizontal="true"
+        android:layout_marginTop="240dp"
+        android:indeterminateBehavior="repeat"
+        android:indeterminateDrawable="@drawable/anim_loading"
+        android:indeterminateOnly="true"
+        android:visibility="invisible"
+        tools:visibility="visible"/>
+
+</RelativeLayout>
--- a/live/src/main/res/layout-land/view_live_room.xml
+++ b/live/src/main/res/layout-land/view_live_room.xml
--- a/live/src/main/res/layout/item_sys_msg.xml
+++ b/live/src/main/res/layout/item_sys_msg.xml
@@ -83,7 +83,7 @@
            <TextView
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
-                android:text="點擊查看"
+                android:text="@string/click_to_view"
                android:textColor="#ffaaaaaa"
                android:textSize="12sp" />

--- a/live/src/main/res/layout/view_live_audience.xml
+++ b/live/src/main/res/layout/view_live_audience.xml
@@ -395,7 +395,6 @@
                <ImageView
                    android:id="@+id/pd_pao"
                    android:layout_width="27dp"
-
                    android:layout_height="27dp"
                    android:layout_centerHorizontal="true"
                    android:layout_centerVertical="true"
--- a/live/src/main/res/layout/view_live_room.xml
+++ b/live/src/main/res/layout/view_live_room.xml
@@ -236,6 +236,7 @@
            android:visibility="gone" />
    </RelativeLayout>

+    <!--这个是登记排行的 -->
    <FrameLayout
        android:id="@+id/hour_rank_layout"
        android:layout_width="80dp"
--- a/live/src/main/res/values-en/strings.xml
+++ b/live/src/main/res/values-en/strings.xml
@@ -0,0 +1,161 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="no_more_day_rank">No one is on the list at the moment</string>
+    <string name="no_more_guard">anchor are waiting at your guard!</string>
+    <string name="no_rank_data">Not on the list</string>
+    <string name="hour_rank">No.%s</string>
+    <string name="hour_rank_not">Not listed</string>
+    <string name="day_rank">Day</string>
+    <string name="week_rank">Weekly</string>
+    <string name="views_rank">Viewers</string>
+    <string name="gurad_rank">Guard</string>
+    <string name="fans">Fans</string>
+    <string name="room_msg">News</string>
+    <string name="live_room_title">Select room type</string>
+    <string name="live_room_public">Public Rooms</string>
+    <string name="live_room_private">Password Rooms</string>
+    <string name="live_room_public_des">Available for all</string>
+    <string name="live_room_private_des">Only those who have the room code can watch</string>
+    <string name="live_room_type_submit">Submit</string>
+    <string name="live_mic_max">The number of voices has reached 3, and no more can be added.</string>
+    <string name="live_task_no1">Consecutive broadcast duration of the day (minutes)</string>
+    <string name="live_task_no2">PK count on the day (unlimited mode)</string>
+    <string name="live_task_fans_no1">Accumulated new followers on that day</string>
+    <string name="live_task_fans_no2">Cumulative new fan group members on that day</string>
+    <string name="live_task_tab1">Live interaction</string>
+    <string name="live_task_tab2">Fan growth</string>
+    <string name="live_task_info_title">Special instructions for anchor tasks</string>
+    <string name="live_task_info_msg1">After the broadcast, all anchors can get a series of tasks of the day. After completing the tasks according to the corresponding requirements, anchors can get the task reward of the previous day after the broadcast of the next day.</string>
+    <string name="live_task_info_msg2">● All task values will be calculated by the system in real time. If data errors occur due to personal, mobile, computer equipment problems, network problems or no normal downcasting, relevant anchors can contact relevant platform staff or online customer service for feedback. After confirmation by relevant part, compensation will be processed.\n● The normal settlement period of all mission data will be settled at 6:00 am every day. If the broadcast time is longer than 6:00 AM, the reward cannot be settled normally, please be noted.\n● When the anchor standard score is lower than 90, the anchor task center can only get 50% of all rewards. When the anchor standard score is lower than 80, the anchor task reward cannot be obtained.</string>
+    <string name="live_task_item_complete_true">success</string>
+    <string name="live_task_item_complete_false">incomplete</string>
+    <string name="live_task_item_hot">hot</string>
+    <string name="live_task_item_xp">exp</string>
+    <string name="live_data_msg1">This live data statistics</string>
+    <string name="live_data_msg2">Historical data can be viewed in the anchor center</string>
+    <string name="live_data_tip">* Non-real-time calculation of data</string>
+
+    <string name="buy_guard_info" >Guardian, always be there for your anchor~ </string>
+    <string name="buy_guard_back_coin" >return</string>
+    <string name="praise">Like</string>
+    <string name="live_gift_buy_gold" >Open aristocracy</string>
+    <string name="live_gift_buy_gold_desc" >Enjoy exclusive privileges!</string>
+    <string name="live_gift_buy_gold_desc_to" >Head to the noble Center</string>
+    <string name="fingers_slide" >Swipe up to cancel send</string>
+    <string name="release_cancel_send" >Release cancel send</string>
+    <string name="more_than" >No recording has been recognized in over 10 seconds</string>
+    <string name="live_role_title" >Identity privilege</string>
+    <string name="noble_seat" >VIP seats</string>
+    <string name="live_mic_user_apply" >%s Applies for connected wheat. Check whether</string>
+    <string name="live_mic_user_down" >The wheat has been kicked off</string>
+    <string name="live_mic_invite" >An invitation has been sent and is waiting for the user to accept</string>
+    <string name="live_mic_request" >The request has been agreed and is awaiting acceptance by the user</string>
+    <string name="random_pk_info_view_title" >Random PK</string>
+    <string name="random_pk_info_title" >PK main rules:</string>
+    <string name="random_pk_info_time_desc" >Random PK qualifying time</string>
+    <string name="random_pk_info_time" >12:00~17:00、19:00~23:59</string>
+    <string name="random_pk_info_desc_1" >1. After matching, the system will automatically select opponents for PK;</string>
+    <string name="random_pk_info_desc_2" >2. If you cannot match your opponent for a long time, you can try to match again；</string>
+    <string name="random_pk_info_desc_3" >3. During the PK process, if there is any delay or delay, please check your personal device and network first, and then try to log in again and start broadcasting.</string>
+    <string name="random_pk_info_desc_4" >4, the security department will be 24 hours of inspection, please civilized PK, strictly abide by the anchor rules;</string>
+    <string name="random_pk_info_switch" >Random PK switch:</string>
+    <string name="random_pk_info_btn_start" >Start matching</string>
+    <string name="random_pk_info_btn_ing" >Match %s</string>
+    <string name="random_pk_info_btn_ing_desc" >Click again to cancel the match</string>
+    <string name="random_pk_info_btn_end" >Exiting match %s</string>
+    <string name="random_pk_info_btn_end_desc" >It\'s also possible to match an opponent during the exit process</string>
+    <string name="random_pk_search_hint" >Please enter the anchor nickname or id you want to pk</string>
+    <string name="free_pk_user_pking" >The other team is engaged in a PK</string>
+    <string name="free_pk_num_null" >The PK number is used up</string>
+    <string name="live_user_mailbox_top_text">Letter from %s</string>
+    <string name="live_user_mailbox_tip_text">「%s」have more to say to you</string>
+    <string name="live_user_mailbox_more_text">View details</string>
+    <string name="live_user_mailbox_web_title">Letter from[%s]</string>
+    <string name="live_anchor_edit_call_me_title">Editors Contact</string>
+    <string name="live_anchor_edit_call_me_switch">Contact switch</string>
+    <string name="live_anchor_edit_call_me_select_gift">Choose a gift</string>
+    <string name="live_anchor_edit_call_me_not_filled">Not filled</string>
+    <string name="live_anchor_edit_call_me_not_filled_toash">Please fill in your contact details before enabling</string>
+    <string name="live_anchor_edit_call_me_not_gift_toash">No gift selected</string>
+    <string name="live_anchor_edit_call_me_letter_title">Letter Content</string>
+    <string name="live_anchor_edit_call_me_letter_content">The most romantic thing I can think of is to grow old with you, to collect all the laughs along the way, and to talk about them later in a rocking chair.</string>
+    <string name="live_ready_anchor_call_me">Contact</string>
+    <string name="live_anchor_say_title">Editors Goddess says</string>
+    <string name="live_anchor_say_edit_hint">Please enter the words the goddess wants to say, limited to 16 words.</string>
+    <string name="live_anchor_say_select_style">Select Style</string>
+    <string name="live_anchor_say_switch">The Goddess Says Switch</string>
+    <string name="live_user_letter_dialog_title">Delete Mail</string>
+    <string name="live_user_letter_dialog_content">Do you confirm the deletion of this email?</string>
+    <string name="live_user_letter_dialog_yes">Delete</string>
+    <string name="live_user_letter_dialog_no">Think again</string>
+    <string name="dialog_live_mailbox_title">Letter</string>
+    <string name="live_anchor_edit_call_me_not_call_info_toash">Please turn on at least one contact information</string>
+    <string name="minute">Minute</string>
+    <string name="live_setting_silence_title">Please select</string>
+    <string name="live_ban_tip">You have been banned</string>
+    <string name="live_details_send_gift_btn">Confirm</string>
+    <string name="live_details_sned_gift_text1">Give</string>
+    <string name="live_details_sned_gift_text2">obtain the</string>
+    <string name="live_details_sned_gift_text3">\'s letter and contact information</string>
+    <string name="me_edit_avatar_title">Select Avatar</string>
+    <string name="me_edit_avatar_submit">Confirm</string>
+    <string name="live_fans_group_info_text1">1 The fan exclusive gift pack is an exclusive benefit for fan group users, which can quickly increase their companionship with the host after purchase</string>
+    <string name="live_fans_group_info_text2">2 After the gift pack is successfully purchased, the gift will be sent to [Fan Exclusive Gift Pack - Gift Pack], you can view and use it in [Gift Pack]; the avatar frame will be sent to [My - Personalized Dressing], you can use it in [Personalized Dressing] View and use in</string>
+    <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_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>
+    <string name="live_fans_group_send_sub">Gift</string>
+    <string name="live_fans_group_send_title">Currently Available To Send</string>
+    <string name="live_fans_group_buy_title">The %s</string>
+    <string name="live_fans_group_buy_info">Purchase a %s Diamond Specific Gift And Receive ALimited Resource</string>
+    <string name="live_fans_group_buy_buy">%s Diamond</string>
+    <string name="live_fans_group_enter_room">Welcome,Fan Club Members</string>
+    <string name="live_fans_group_send_gift_tips">Fan group level Of Lv%s Can send this gift</string>
+    <string name="live_rad_pack_join_fans_group_tip">Join the fan group can be opened [Join]</string>
+    <string name="live_rad_pack_join_fans_group_click_tip">Join the fan group to open</string>
+    <string name="message_chat_msg_all">Chat All</string>
+    <string name="message_chat_msg_all_an_a">Chat All</string>
+    <string name="message_chat_msg_recommend">Suggest chat</string>
+    <string name="message_chat_msg_system">System matching</string>
+    <string name="message_chat_msg_user">User initiated</string>
+    <string name="message_chat_msg_look_live">看直播%dmin</string>
+    <string name="message_chat_msg_read_tip">[Read]</string>
+    <string name="message_chat_msg_unread_tip">[Unread]</string>
+    <string name="message_interactive_chat">Initiate a chat</string>
+
+    <string name="prank_progress">Progress</string>
+    <string name="turntable_prank">To do</string>
+    <string name="details">Details></string>
+    <string name="combo_vote">Combo</string>
+    <string name="combo_vote_more">Most first</string>
+    <string name="live_prank_dialog_save">Save</string>
+    <string name="live_prank_dialog_clear">Clear</string>
+    <string name="live_prank_dialog_gift_type_number">highest combo</string>
+    <string name="live_prank_gift_add_title">Add gift</string>
+    <string name="live_prank_gift_add_gift">Gift</string>
+    <string name="live_prank_gift_add_gift_select">Choose a gift</string>
+    <string name="live_prank_gift_add_gift_number">Quantity</string>
+    <string name="live_prank_gift_add_gift_number_select">Fill in the number</string>
+    <string name="live_prank_gift_add_gift_content">Content</string>
+    <string name="live_prank_gift_add_gift_contnet_select">Please enter prank content, such as a dance.</string>
+    <string name="alive_prank_gift_add_gift_content_sub">confirm</string>
+    <string name="alive_prank_gift_dialog_number_title">Quantity</string>
+    <string name="live_prank_gift_dialog_number_btn">+ Set other quantity (up to 9999)</string>
+    <string name="alive_prank_gift_dialog_explain">Trick instructions</string>
+    <string name="prank_open_live_msg">Entertainment Tricky has been newly upgraded. Go and set up Tricky content to add more fun to the live broadcast room!</string>
+    <string name="prank_im_immediately_go">Go now</string>
+
+    <string name="live_prank_dialog_gift_type_todo">Switch to</string>
+    <string name="live_prank_switch">gift trick switch</string>
+    <string name="live_prank_switch_info">After closing, the user cannot see the gift trick</string>
+    <string name="live_prank_add_gift">+ Add gift trick</string>
+    <string name="live_prank_gift_tips">You can add up to 6, and it is recommended to add 4.</string>
+
+    <string name="live_prank_dialog_gift_type_achieved">Quantity achieved</string>
+    <string name="live_room_sud_hint_join">Join</string>
+    <string name="live_dialog_top_guardian_tasks">Guard tasks</string>
+</resources>
--- a/live/src/main/res/values/strings.xml
+++ b/live/src/main/res/values/strings.xml
@@ -1,151 +1,161 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="buy_guard_info" >成爲TA的守護，爲TA保駕護航！</string>
-    <string name="buy_guard_back_coin" >返還</string>
-    <string name="no_more_day_rank">暫時無人上榜，快來成為第一位上榜的人吧！</string>
-    <string name="no_rank_data">未上榜</string>
-    <string name="hour_rank">第%s名</string>
-    <string name="day_rank">日榜</string>
-    <string name="week_rank">周榜</string>
-    <string name="fans">粉絲</string>
-    <string name="praise">獲讚</string>
-    <string name="room_msg">私信</string>
-    <string name="live_room_title">選擇房間類型</string>
-    <string name="live_room_public">公開房</string>
-    <string name="live_room_private">密碼房</string>
-    <string name="live_room_public_des">所有人可觀看</string>
-    <string name="live_room_private_des">僅擁有房間密碼的人可觀看</string>
-    <string name="live_room_type_submit">確認</string>
-    <string name="live_gift_buy_gold" >開通貴族</string>
-    <string name="live_gift_buy_gold_desc" >享受專屬特權！</string>
-    <string name="live_gift_buy_gold_desc_to" >前往貴族中心</string>
-    <string name="fingers_slide" >手指上滑，取消發送</string>
-    <string name="release_cancel_send" >松開取消發送</string>
-    <string name="more_than" >已超过10秒未识别到录音</string>
-    <string name="live_role_title" >身份特權</string>
-    <string name="noble_seat" >貴族坐席</string>
-    <string name="live_mic_max">當前連麥語音人數已達到3人，無法再添加。</string>
-    <string name="live_mic_user_apply" >%s 申請連麥,是否查看</string>
-    <string name="live_mic_user_down" >已踢下麥</string>
-    <string name="live_mic_invite" >已發出邀請,等待用戶接受</string>
-    <string name="live_mic_request" >已同意請求,等待用戶接受</string>
-    <string name="random_pk_info_view_title" >隨機PK</string>
-    <string name="random_pk_info_title" >PK主要規則說明：</string>
-    <string name="random_pk_info_time_desc" >隨機PK排位賽時間</string>
+    <string name="no_more_day_rank">No one is on the list at the moment</string>
+    <string name="no_more_guard">anchor are waiting at your guard!</string>
+    <string name="no_rank_data">Not on the list</string>
+    <string name="hour_rank">No.%s</string>
+    <string name="hour_rank_not">Not listed</string>
+    <string name="day_rank">Day</string>
+    <string name="week_rank">Weekly</string>
+    <string name="views_rank">Viewers</string>
+    <string name="gurad_rank">Guard</string>
+    <string name="fans">Fans</string>
+    <string name="room_msg">News</string>
+    <string name="live_room_title">Select room type</string>
+    <string name="live_room_public">Public Rooms</string>
+    <string name="live_room_private">Password Rooms</string>
+    <string name="live_room_public_des">Available for all</string>
+    <string name="live_room_private_des">Only those who have the room code can watch</string>
+    <string name="live_room_type_submit">Submit</string>
+    <string name="live_mic_max">The number of voices has reached 3, and no more can be added.</string>
+    <string name="live_task_no1">Consecutive broadcast duration of the day (minutes)</string>
+    <string name="live_task_no2">PK count on the day (unlimited mode)</string>
+    <string name="live_task_fans_no1">Accumulated new followers on that day</string>
+    <string name="live_task_fans_no2">Cumulative new fan group members on that day</string>
+    <string name="live_task_tab1">Live interaction</string>
+    <string name="live_task_tab2">Fan growth</string>
+    <string name="live_task_info_title">Special instructions for anchor tasks</string>
+    <string name="live_task_info_msg1">After the broadcast, all anchors can get a series of tasks of the day. After completing the tasks according to the corresponding requirements, anchors can get the task reward of the previous day after the broadcast of the next day.</string>
+    <string name="live_task_info_msg2">● All task values will be calculated by the system in real time. If data errors occur due to personal, mobile, computer equipment problems, network problems or no normal downcasting, relevant anchors can contact relevant platform staff or online customer service for feedback. After confirmation by relevant part, compensation will be processed.\n● The normal settlement period of all mission data will be settled at 6:00 am every day. If the broadcast time is longer than 6:00 AM, the reward cannot be settled normally, please be noted.\n● When the anchor standard score is lower than 90, the anchor task center can only get 50% of all rewards. When the anchor standard score is lower than 80, the anchor task reward cannot be obtained.</string>
+    <string name="live_task_item_complete_true">success</string>
+    <string name="live_task_item_complete_false">incomplete</string>
+    <string name="live_task_item_hot">hot</string>
+    <string name="live_task_item_xp">exp</string>
+    <string name="live_data_msg1">This live data statistics</string>
+    <string name="live_data_msg2">Historical data can be viewed in the anchor center</string>
+    <string name="live_data_tip">* Non-real-time calculation of data</string>
+
+    <string name="buy_guard_info" >Guardian, always be there for your anchor~ </string>
+    <string name="buy_guard_back_coin" >return</string>
+    <string name="praise">Like</string>
+    <string name="live_gift_buy_gold" >Open aristocracy</string>
+    <string name="live_gift_buy_gold_desc" >Enjoy exclusive privileges!</string>
+    <string name="live_gift_buy_gold_desc_to" >Head to the noble Center</string>
+    <string name="fingers_slide" >Swipe up to cancel send</string>
+    <string name="release_cancel_send" >Release cancel send</string>
+    <string name="more_than" >No recording has been recognized in over 10 seconds</string>
+    <string name="live_role_title" >Identity privilege</string>
+    <string name="noble_seat" >VIP seats</string>
+    <string name="live_mic_user_apply" >%s Applies for connected wheat. Check whether</string>
+    <string name="live_mic_user_down" >The wheat has been kicked off</string>
+    <string name="live_mic_invite" >An invitation has been sent and is waiting for the user to accept</string>
+    <string name="live_mic_request" >The request has been agreed and is awaiting acceptance by the user</string>
+    <string name="random_pk_info_view_title" >Random PK</string>
+    <string name="random_pk_info_title" >PK main rules:</string>
+    <string name="random_pk_info_time_desc" >Random PK qualifying time</string>
    <string name="random_pk_info_time" >12:00~17:00、19:00~23:59</string>
-    <string name="random_pk_info_desc_1" >1、開始匹配後，系統將自動挑選對手進行PK；</string>
-    <string name="random_pk_info_desc_2" >2、若長時間無法匹配到對手，可嘗試重新匹配；</string>
-    <string name="random_pk_info_desc_3" >3、PK過程中卡頓及延遲，可先檢查個人設備及網絡後，嘗試重新登錄並開播；</string>
-    <string name="random_pk_info_switch" >隨機PK開關：</string>
-    <string name="random_pk_info_btn_start" >開始匹配</string>
-    <string name="random_pk_info_btn_ing" >匹配中  %s </string>
-    <string name="random_pk_info_btn_ing_desc" >再次點擊可取消匹配</string>
-    <string name="random_pk_info_btn_end" >正在退出匹配 %s</string>
-    <string name="random_pk_info_btn_end_desc" >退出過程中也有可能匹配到對手</string>
-    <string name="random_pk_search_hint" >請輸入您要pk的主播昵稱或id</string>
-    <string name="free_pk_user_pking" >對方正在PK中</string>
-    <string name="free_pk_num_null" >PK次數已用完</string>
-    <string name="live_task_no1">當日連續開播時長(分鐘)</string>
-    <string name="live_task_no2">當日累計PK次數(不限模式)</string>
-    <string name="live_task_fans_no1">當日累積新增關註粉絲</string>
-    <string name="live_task_fans_no2">當日累積新增粉絲團成員</string>
-    <string name="live_task_tab1">直播互動</string>
-    <string name="live_task_tab2">粉絲增漲</string>
-    <string name="live_task_info_title">主播任務特別說明</string>
-    <string name="live_task_info_msg1">所有主播在開播後，即可獲得一系列的當日任務，當根據相應的要求完成任務後，主播即可在第二天開播後，獲得前一天的任務獎勵。</string>
-    <string name="live_task_info_msg2">● 所有任務數值將由系統進行實時計算，如因個人手機電腦設備問題、網絡問題或是沒有正常進行下播導致數據出現錯誤等問題，為此相關主播可進行聯系相關平臺工作人員或是在線客服，進行反饋，待相關部分確認後，將會再進行補償處理。\n● 所有任務數據的正常結算周期將會在每日的淩晨6點進行結算，若開播時間超過淩晨6點，將會出現獎勵無法正常結算的情況，請知悉。\n● 當主播規範分低於90時，主播任務中心的所有獎勵，將僅能獲得50%的，當主播規範分低於80以下時，將無法獲得主播任務獎勵。</string>
-    <string name="live_task_item_complete_true">已完成</string>
-    <string name="live_task_item_complete_false">未完成</string>
-    <string name="live_task_item_hot">直播熱度</string>
-    <string name="live_task_item_xp">主播經驗</string>
-    <string name="live_data_msg1">本場直播數據統計</string>
-    <string name="live_data_msg2">歷史數據可在主播中心查看</string>
-    <string name="live_data_tip">* 人數及新增相關數據非实时计算</string>
-    <string name="live_user_mailbox_top_text">来自%s的信</string>
-    <string name="live_user_mailbox_tip_text">「%s」有更多話對你說</string>
-    <string name="live_user_mailbox_more_text">查看詳情</string>
-    <string name="live_user_mailbox_web_title">來自「%s」的信</string>
-    <string name="live_anchor_edit_call_me_title">編輯聯系方式</string>
-    <string name="live_anchor_edit_call_me_switch">聯系方式開關</string>
-    <string name="live_anchor_edit_call_me_select_gift">選擇禮物</string>
-    <string name="live_anchor_edit_call_me_not_filled">未填寫</string>
-    <string name="live_anchor_edit_call_me_not_filled_toash">请填写联系方式后再启用</string>
-    <string name="live_anchor_edit_call_me_not_gift_toash">未選擇禮物</string>
-    <string name="live_anchor_edit_call_me_not_call_info_toash">請開啟至少一個聯繫方式</string>
-    <string name="live_anchor_edit_call_me_letter_title">信內容</string>
-    <string name="live_anchor_edit_call_me_letter_content">我能想到最浪漫的事,就是和你一起慢慢變老,一路上收藏點點滴滴的歡笑,留到以後坐著搖椅慢慢聊。</string>
-    <string name="live_ready_anchor_call_me">聯繫方式</string>
-    <string name="live_anchor_say_title">編輯女神說</string>
-    <string name="live_anchor_say_edit_hint">请輸入女神想說的話，限16個字哦。</string>
-    <string name="live_anchor_say_select_style">选择样式</string>
-    <string name="live_anchor_say_switch">女神說開關</string>
-    <string name="live_user_letter_dialog_title">刪除郵件</string>
-    <string name="live_user_letter_dialog_content">是否確認刪除此郵件</string>
-    <string name="live_user_letter_dialog_yes">刪除</string>
-    <string name="live_user_letter_dialog_no">再想想</string>
-    <string name="dialog_live_mailbox_title">信件欄</string>
-    <string name="minute">分鐘</string>
-    <string name="live_setting_silence_title">請選擇禁言時間</string>
-    <string name="live_details_send_gift_btn">確認獲取</string>
-    <string name="live_details_sned_gift_text1">贈送</string>
-    <string name="live_details_sned_gift_text2">會獲取到</string>
-    <string name="live_details_sned_gift_text3">的信件與聯繫方式</string>
-    <string name="me_edit_avatar_title">選擇頭像</string>
-    <string name="me_edit_avatar_submit">確認使用</string>
-    <string name="live_fans_group_info_text1">1. 粉絲專屬禮包為粉絲團用戶專屬權益，購買後可 快速提昇與該主播的陪伴值</string>
-    <string name="live_fans_group_info_text2">2. 禮包購買成功后，禮物發放到【粉絲專屬禮包-赠送礼包】中，您可在【贈送禮包】中查看並使用；頭像框發放到【我的-個性裝扮】中，您可在【個性裝扮】中查看並使用</string>
-    <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_info_title">禮包介紹</string>
-    <string name="live_fans_group_info2_title">購買規則</string>
-    <string name="live_fans_follow_toast">加入粉絲團,解鎖專屬禮物</string>
-    <string name="live_fans_group_send_sub">赠送</string>
-    <string name="live_fans_group_send_title">當前可送出</string>
-    <string name="live_fans_group_buy_title">的%s</string>
-    <string name="live_fans_group_buy_info">購買可獲得%s鑽特定禮物，同時可獲得限定資源</string>
-    <string name="live_fans_group_buy_buy">%s鑽購買</string>
-    <string name="live_fans_group_enter_room">粉絲團成員歡迎進房</string>
-    <string name="live_rad_pack_join_fans_group_click_tip">加入粉絲團可開啟</string>
-    <string name="message_chat_msg_all">全部聊天</string>
-    <string name="message_chat_msg_all_an_a">全部聊天</string>
-    <string name="message_chat_msg_recommend">推荐聊天</string>
-    <string name="message_chat_msg_system">系統匹配</string>
-    <string name="message_chat_msg_user">對方主動</string>
+    <string name="random_pk_info_desc_1" >1. After matching, the system will automatically select opponents for PK;</string>
+    <string name="random_pk_info_desc_2" >2. If you cannot match your opponent for a long time, you can try to match again；</string>
+    <string name="random_pk_info_desc_3" >3. During the PK process, if there is any delay or delay, please check your personal device and network first, and then try to log in again and start broadcasting.</string>
+    <string name="random_pk_info_desc_4" >4, the security department will be 24 hours of inspection, please civilized PK, strictly abide by the anchor rules;</string>
+    <string name="random_pk_info_switch" >Random PK switch:</string>
+    <string name="random_pk_info_btn_start" >Start matching</string>
+    <string name="random_pk_info_btn_ing" >Match %s</string>
+    <string name="random_pk_info_btn_ing_desc" >Click again to cancel the match</string>
+    <string name="random_pk_info_btn_end" >Exiting match %s</string>
+    <string name="random_pk_info_btn_end_desc" >It\'s also possible to match an opponent during the exit process</string>
+    <string name="random_pk_search_hint" >Please enter the anchor nickname or id you want to pk</string>
+    <string name="free_pk_user_pking" >The other team is engaged in a PK</string>
+    <string name="free_pk_num_null" >The PK number is used up</string>
+    <string name="live_user_mailbox_top_text">Letter from %s</string>
+    <string name="live_user_mailbox_tip_text">「%s」have more to say to you</string>
+    <string name="live_user_mailbox_more_text">View details</string>
+    <string name="live_user_mailbox_web_title">Letter from[%s]</string>
+    <string name="live_anchor_edit_call_me_title">Editors Contact</string>
+    <string name="live_anchor_edit_call_me_switch">Contact switch</string>
+    <string name="live_anchor_edit_call_me_select_gift">Choose a gift</string>
+    <string name="live_anchor_edit_call_me_not_filled">Not filled</string>
+    <string name="live_anchor_edit_call_me_not_filled_toash">Please fill in your contact details before enabling</string>
+    <string name="live_anchor_edit_call_me_not_gift_toash">No gift selected</string>
+    <string name="live_anchor_edit_call_me_letter_title">Letter Content</string>
+    <string name="live_anchor_edit_call_me_letter_content">The most romantic thing I can think of is to grow old with you, to collect all the laughs along the way, and to talk about them later in a rocking chair.</string>
+    <string name="live_ready_anchor_call_me">Contact</string>
+    <string name="live_anchor_say_title">Editors Goddess says</string>
+    <string name="live_anchor_say_edit_hint">Please enter the words the goddess wants to say, limited to 16 words.</string>
+    <string name="live_anchor_say_select_style">Select Style</string>
+    <string name="live_anchor_say_switch">The Goddess Says Switch</string>
+    <string name="live_user_letter_dialog_title">Delete Mail</string>
+    <string name="live_user_letter_dialog_content">Do you confirm the deletion of this email?</string>
+    <string name="live_user_letter_dialog_yes">Delete</string>
+    <string name="live_user_letter_dialog_no">Think again</string>
+    <string name="dialog_live_mailbox_title">Letter</string>
+    <string name="live_anchor_edit_call_me_not_call_info_toash">Please turn on at least one contact information</string>
+    <string name="minute">Minute</string>
+    <string name="live_setting_silence_title">Please select</string>
+    <string name="live_ban_tip">You have been banned</string>
+    <string name="live_details_send_gift_btn">Confirm</string>
+    <string name="live_details_sned_gift_text1">Give</string>
+    <string name="live_details_sned_gift_text2">obtain the</string>
+    <string name="live_details_sned_gift_text3">\'s letter and contact information</string>
+    <string name="me_edit_avatar_title">Select Avatar</string>
+    <string name="me_edit_avatar_submit">Confirm</string>
+    <string name="live_fans_group_info_text1">1 The fan exclusive gift pack is an exclusive benefit for fan group users, which can quickly increase their companionship with the host after purchase</string>
+    <string name="live_fans_group_info_text2">2 After the gift pack is successfully purchased, the gift will be sent to [Fan Exclusive Gift Pack - Gift Pack], you can view and use it in [Gift Pack]; the avatar frame will be sent to [My - Personalized Dressing], you can use it in [Personalized Dressing] View and use in</string>
+    <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_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>
+    <string name="live_fans_group_send_sub">Gift</string>
+    <string name="live_fans_group_send_title">Currently Available To Send</string>
+    <string name="live_fans_group_buy_title">The %s</string>
+    <string name="live_fans_group_buy_info">Purchase a %s Diamond Specific Gift And Receive ALimited Resource</string>
+    <string name="live_fans_group_buy_buy">%s Diamond</string>
+    <string name="live_fans_group_enter_room">Welcome,Fan Club Members</string>
+    <string name="live_fans_group_send_gift_tips">Fan group level Of Lv%s Can send this gift</string>
+    <string name="live_rad_pack_join_fans_group_tip">Join the fan group can be opened [Join]</string>
+    <string name="live_rad_pack_join_fans_group_click_tip">Join the fan group to open</string>
+    <string name="message_chat_msg_all">Chat All</string>
+    <string name="message_chat_msg_all_an_a">Chat All</string>
+    <string name="message_chat_msg_recommend">Suggest chat</string>
+    <string name="message_chat_msg_system">System matching</string>
+    <string name="message_chat_msg_user">User initiated</string>
    <string name="message_chat_msg_look_live">看直播%dmin</string>
-    <string name="message_chat_msg_read_tip">[已讀]</string>
-    <string name="message_chat_msg_unread_tip">[未讀]</string>
-    <string name="message_interactive_chat">發起聊天</string>
+    <string name="message_chat_msg_read_tip">[Read]</string>
+    <string name="message_chat_msg_unread_tip">[Unread]</string>
+    <string name="message_interactive_chat">Initiate a chat</string>

-    <string name="prank_progress">整蠱進度</string>
-    <string name="turntable_prank">待完成整蠱</string>
-    <string name="combo_vote">連擊投票</string>
-    <string name="alive_prank_gift_dialog_explain">整蠱說明</string>
-    <string name="prank_open_live_msg">娛樂整蠱全新升級，快去設置整蠱内容，給直播間增加更多趣味吧！</string>
-    <string name="prank_im_immediately_go">立即前往</string>
+    <string name="prank_progress">Progress</string>
+    <string name="turntable_prank">To do</string>
+    <string name="details">Details></string>
+    <string name="combo_vote">Combo</string>
+    <string name="combo_vote_more">Most first</string>
+    <string name="live_prank_dialog_save">Save</string>
+    <string name="live_prank_dialog_clear">Clear</string>
+    <string name="live_prank_dialog_gift_type_number">highest combo</string>
+    <string name="live_prank_gift_add_title">Add gift</string>
+    <string name="live_prank_gift_add_gift">Gift</string>
+    <string name="live_prank_gift_add_gift_select">Choose a gift</string>
+    <string name="live_prank_gift_add_gift_number">Quantity</string>
+    <string name="live_prank_gift_add_gift_number_select">Fill in the number</string>
+    <string name="live_prank_gift_add_gift_content">Content</string>
+    <string name="live_prank_gift_add_gift_contnet_select">Please enter prank content, such as a dance.</string>
+    <string name="alive_prank_gift_add_gift_content_sub">confirm</string>
+    <string name="alive_prank_gift_dialog_number_title">Quantity</string>
+    <string name="live_prank_gift_dialog_number_btn">+ Set other quantity (up to 9999)</string>
+    <string name="alive_prank_gift_dialog_explain">Trick instructions</string>
+    <string name="prank_open_live_msg">Entertainment Tricky has been newly upgraded. Go and set up Tricky content to add more fun to the live broadcast room!</string>
+    <string name="prank_im_immediately_go">Go now</string>

-    <string name="live_prank_dialog_gift_type_todo"> </string>
-    <string name="live_prank_switch">禮物整蠱開關</string>
-    <string name="live_prank_switch_info">開閉後用戶無法看到禮物整蠱</string>
-    <string name="live_prank_add_gift">+ 添加禮物整蠱</string>
-    <string name="live_prank_gift_tips">最多可添加6個，建議添加4個</string>
-    <string name="live_prank_gift_add_title">添加禮物</string>
-    <string name="live_prank_gift_add_gift">整蠱禮物</string>
-    <string name="live_prank_gift_add_gift_select">選擇禮物</string>
-    <string name="live_prank_gift_add_gift_number">禮物數量</string>
-    <string name="live_prank_gift_add_gift_number_select">填寫個數</string>
-    <string name="live_prank_gift_add_gift_content">整蠱內容</string>
-    <string name="live_prank_gift_add_gift_contnet_select">請輸入整蠱內容，例如一支舞蹈</string>
-    <string name="alive_prank_gift_add_gift_content_sub">確定</string>
-    <string name="alive_prank_gift_dialog_number_title">禮物數量</string>
-    <string name="live_prank_gift_dialog_number_btn">+ 設置其他數量(最多9999)</string>
-    <string name="live_prank_dialog_gift_type_achieved">連擊數最高</string>
-    <string name="live_prank_dialog_save">保存設置</string>
-    <string name="live_prank_dialog_clear">清除設置</string>
-    <string name="live_prank_dialog_gift_type_number">禮物數達成</string>
+    <string name="live_prank_dialog_gift_type_todo">Switch to</string>
+    <string name="live_prank_switch">gift trick switch</string>
+    <string name="live_prank_switch_info">After closing, the user cannot see the gift trick</string>
+    <string name="live_prank_add_gift">+ Add gift trick</string>
+    <string name="live_prank_gift_tips">You can add up to 6, and it is recommended to add 4.</string>

-
-    <string name="live_room_sud_hint_join">加入</string>
-    <string name="live_dialog_top_guardian_tasks">守護任務</string>
+    <string name="live_prank_dialog_gift_type_achieved">Quantity achieved</string>
+    <string name="live_room_sud_hint_join">Join</string>
+    <string name="live_dialog_top_guardian_tasks">Guard tasks</string>
 </resources>
--- a/main/src/main/java/com/yunbao/main/activity/UserHomeActivity.java
+++ b/main/src/main/java/com/yunbao/main/activity/UserHomeActivity.java
@@ -263,6 +263,7 @@ public class UserHomeActivity extends AbsActivity {
            findViewById(R.id.setting).setVisibility(View.INVISIBLE);
            bottomEditLayout.setVisibility(View.VISIBLE);
            imgUp.setVisibility(View.VISIBLE);
+            ImgLoader.display(mContext,WordUtil.isNewZh()?R.mipmap.icon_img_up_label:R.mipmap.icon_img_up_label_en,imgLabel);
            imgLabel.setVisibility(View.VISIBLE);
            followLayout.setVisibility(View.GONE);
        }
--- a/main/src/main/res/values-en/strings.xml
+++ b/main/src/main/res/values-en/strings.xml
@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="no_more_day_rank">No one is on the list at the moment</string>
+    <string name="no_more_guard">anchor are waiting at your guard!</string>
+    <string name="no_rank_data">Not on the list</string>
+    <string name="hour_rank">No.%s</string>
+    <string name="hour_rank_not">Not listed</string>
+    <string name="day_rank">Day</string>
+    <string name="week_rank">Weekly</string>
+    <string name="views_rank">Viewers</string>
+    <string name="gurad_rank">Guard</string>
+    <string name="fans">Fans</string>
+    <string name="room_msg">News</string>
+    <string name="live_room_title">Select room type</string>
+    <string name="live_room_public">Public Rooms</string>
+    <string name="live_room_private">Password Rooms</string>
+    <string name="live_room_public_des">Available for all</string>
+    <string name="live_room_private_des">Only those who have the room code can watch</string>
+    <string name="live_room_type_submit">Submit</string>
+    <string name="live_mic_max">The number of voices has reached 3, and no more can be added.</string>
+    <string name="live_task_no1">Consecutive broadcast duration of the day (minutes)</string>
+    <string name="live_task_no2">PK count on the day (unlimited mode)</string>
+    <string name="live_task_fans_no1">Accumulated new followers on that day</string>
+    <string name="live_task_fans_no2">Cumulative new fan group members on that day</string>
+    <string name="live_task_tab1">Live interaction</string>
+    <string name="live_task_tab2">Fan growth</string>
+    <string name="live_task_info_title">Special instructions for anchor tasks</string>
+    <string name="live_task_info_msg1">After the broadcast, all anchors can get a series of tasks of the day. After completing the tasks according to the corresponding requirements, anchors can get the task reward of the previous day after the broadcast of the next day.</string>
+    <string name="live_task_info_msg2">● All task values will be calculated by the system in real time. If data errors occur due to personal, mobile, computer equipment problems, network problems or no normal downcasting, relevant anchors can contact relevant platform staff or online customer service for feedback. After confirmation by relevant part, compensation will be processed.\n● The normal settlement period of all mission data will be settled at 6:00 am every day. If the broadcast time is longer than 6:00 AM, the reward cannot be settled normally, please be noted.\n● When the anchor standard score is lower than 90, the anchor task center can only get 50% of all rewards. When the anchor standard score is lower than 80, the anchor task reward cannot be obtained.</string>
+    <string name="live_task_item_complete_true">success</string>
+    <string name="live_task_item_complete_false">incomplete</string>
+    <string name="live_task_item_hot">hot</string>
+    <string name="live_task_item_xp">exp</string>
+    <string name="live_data_msg1">This live data statistics</string>
+    <string name="live_data_msg2">Historical data can be viewed in the anchor center</string>
+    <string name="live_data_tip">* Non-real-time calculation of data</string>
+
+    <string name="buy_guard_info" >Guardian, always be there for your anchor~ </string>
+    <string name="buy_guard_back_coin" >return</string>
+    <string name="praise">Like</string>
+    <string name="live_gift_buy_gold" >Open aristocracy</string>
+    <string name="live_gift_buy_gold_desc" >Enjoy exclusive privileges!</string>
+    <string name="live_gift_buy_gold_desc_to" >Head to the noble Center</string>
+    <string name="fingers_slide" >Swipe up to cancel send</string>
+    <string name="release_cancel_send" >Release cancel send</string>
+    <string name="more_than" >No recording has been recognized in over 10 seconds</string>
+    <string name="live_role_title" >Identity privilege</string>
+    <string name="noble_seat" >VIP seats</string>
+    <string name="live_mic_user_apply" >%s Applies for connected wheat. Check whether</string>
+    <string name="live_mic_user_down" >The wheat has been kicked off</string>
+    <string name="live_mic_invite" >An invitation has been sent and is waiting for the user to accept</string>
+    <string name="live_mic_request" >The request has been agreed and is awaiting acceptance by the user</string>
+    <string name="random_pk_info_view_title" >Random PK</string>
+    <string name="random_pk_info_title" >PK main rules:</string>
+    <string name="random_pk_info_time_desc" >Random PK qualifying time</string>
+    <string name="random_pk_info_time" >12:00~17:00、19:00~23:59</string>
+    <string name="random_pk_info_desc_1" >1. After matching, the system will automatically select opponents for PK;</string>
+    <string name="random_pk_info_desc_2" >2. If you cannot match your opponent for a long time, you can try to match again；</string>
+    <string name="random_pk_info_desc_3" >3. During the PK process, if there is any delay or delay, please check your personal device and network first, and then try to log in again and start broadcasting.</string>
+    <string name="random_pk_info_desc_4" >4, the security department will be 24 hours of inspection, please civilized PK, strictly abide by the anchor rules;</string>
+    <string name="random_pk_info_switch" >Random PK switch:</string>
+    <string name="random_pk_info_btn_start" >Start matching</string>
+    <string name="random_pk_info_btn_ing" >Match %s</string>
+    <string name="random_pk_info_btn_ing_desc" >Click again to cancel the match</string>
+    <string name="random_pk_info_btn_end" >Exiting match %s</string>
+    <string name="random_pk_info_btn_end_desc" >It\'s also possible to match an opponent during the exit process</string>
+    <string name="random_pk_search_hint" >Please enter the anchor nickname or id you want to pk</string>
+    <string name="free_pk_user_pking" >The other team is engaged in a PK</string>
+    <string name="free_pk_num_null" >The PK number is used up</string>
+    <string name="live_user_mailbox_top_text">Letter from %s</string>
+    <string name="live_user_mailbox_tip_text">「%s」have more to say to you</string>
+    <string name="live_user_mailbox_more_text">View details</string>
+    <string name="live_user_mailbox_web_title">Letter from[%s]</string>
+    <string name="live_anchor_edit_call_me_title">Editors Contact</string>
+    <string name="live_anchor_edit_call_me_switch">Contact switch</string>
+    <string name="live_anchor_edit_call_me_select_gift">Choose a gift</string>
+    <string name="live_anchor_edit_call_me_not_filled">Not filled</string>
+    <string name="live_anchor_edit_call_me_not_filled_toash">Please fill in your contact details before enabling</string>
+    <string name="live_anchor_edit_call_me_not_gift_toash">No gift selected</string>
+    <string name="live_anchor_edit_call_me_letter_title">Letter Content</string>
+    <string name="live_anchor_edit_call_me_letter_content">The most romantic thing I can think of is to grow old with you, to collect all the laughs along the way, and to talk about them later in a rocking chair.</string>
+    <string name="live_ready_anchor_call_me">Contact</string>
+    <string name="live_anchor_say_title">Editors Goddess says</string>
+    <string name="live_anchor_say_edit_hint">Please enter the words the goddess wants to say, limited to 16 words.</string>
+    <string name="live_anchor_say_select_style">Select Style</string>
+    <string name="live_anchor_say_switch">The Goddess Says Switch</string>
+    <string name="live_user_letter_dialog_title">Delete Mail</string>
+    <string name="live_user_letter_dialog_content">Do you confirm the deletion of this email?</string>
+    <string name="live_user_letter_dialog_yes">Delete</string>
+    <string name="live_user_letter_dialog_no">Think again</string>
+    <string name="dialog_live_mailbox_title">Letter</string>
+    <string name="live_anchor_edit_call_me_not_call_info_toash">Please turn on at least one contact information</string>
+    <string name="minute">Minute</string>
+    <string name="live_setting_silence_title">Please select</string>
+    <string name="live_ban_tip">You have been banned</string>
+    <string name="live_details_send_gift_btn">Confirm</string>
+    <string name="live_details_sned_gift_text1">Give</string>
+    <string name="live_details_sned_gift_text2">obtain the</string>
+    <string name="live_details_sned_gift_text3">\'s letter and contact information</string>
+    <string name="me_edit_avatar_title">Select Avatar</string>
+    <string name="me_edit_avatar_submit">Confirm</string>
+    <string name="live_fans_group_info_text1">1 The fan exclusive gift pack is an exclusive benefit for fan group users, which can quickly increase their companionship with the host after purchase</string>
+    <string name="live_fans_group_info_text2">2 After the gift pack is successfully purchased, the gift will be sent to [Fan Exclusive Gift Pack - Gift Pack], you can view and use it in [Gift Pack]; the avatar frame will be sent to [My - Personalized Dressing], you can use it in [Personalized Dressing] View and use in</string>
+    <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_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>
+    <string name="live_fans_group_send_sub">Gift</string>
+    <string name="live_fans_group_send_title">Currently Available To Send</string>
+    <string name="live_fans_group_buy_title">The %s</string>
+    <string name="live_fans_group_buy_info">Purchase a %s Diamond Specific Gift And Receive ALimited Resource</string>
+    <string name="live_fans_group_buy_buy">%s Diamond</string>
+    <string name="live_fans_group_enter_room">Welcome,Fan Club Members</string>
+    <string name="live_fans_group_send_gift_tips">Fan group level Of Lv%s Can send this gift</string>
+    <string name="live_rad_pack_join_fans_group_tip">Join the fan group can be opened [Join]</string>
+    <string name="live_rad_pack_join_fans_group_click_tip">Join the fan group to open</string>
+    <string name="message_chat_msg_all">Chat All</string>
+    <string name="message_chat_msg_all_an_a">Chat All</string>
+    <string name="message_chat_msg_recommend">Suggest chat</string>
+    <string name="message_chat_msg_system">System matching</string>
+    <string name="message_chat_msg_user">User initiated</string>
+    <string name="message_chat_msg_look_live">看直播%dmin</string>
+    <string name="message_chat_msg_read_tip">[Read]</string>
+    <string name="message_chat_msg_unread_tip">[Unread]</string>
+    <string name="message_interactive_chat">Initiate a chat</string>
+
+    <string name="prank_progress">Progress</string>
+    <string name="turntable_prank">To do</string>
+    <string name="details">Details></string>
+    <string name="combo_vote">Combo</string>
+    <string name="combo_vote_more">Most first</string>
+    <string name="live_prank_dialog_save">Save</string>
+    <string name="live_prank_dialog_clear">Clear</string>
+    <string name="live_prank_dialog_gift_type_number">highest combo</string>
+    <string name="live_prank_gift_add_title">Add gift</string>
+    <string name="live_prank_gift_add_gift">Gift</string>
+    <string name="live_prank_gift_add_gift_select">Choose a gift</string>
+    <string name="live_prank_gift_add_gift_number">Quantity</string>
+    <string name="live_prank_gift_add_gift_number_select">Fill in the number</string>
+    <string name="live_prank_gift_add_gift_content">Content</string>
+    <string name="live_prank_gift_add_gift_contnet_select">Please enter prank content, such as a dance.</string>
+    <string name="alive_prank_gift_add_gift_content_sub">confirm</string>
+    <string name="alive_prank_gift_dialog_number_title">Quantity</string>
+    <string name="live_prank_gift_dialog_number_btn">+ Set other quantity (up to 9999)</string>
+    <string name="alive_prank_gift_dialog_explain">Trick instructions</string>
+    <string name="prank_open_live_msg">Entertainment Tricky has been newly upgraded. Go and set up Tricky content to add more fun to the live broadcast room!</string>
+    <string name="prank_im_immediately_go">Go now</string>
+
+    <string name="live_prank_dialog_gift_type_todo">Switch to</string>
+    <string name="live_prank_switch">gift trick switch</string>
+    <string name="live_prank_switch_info">After closing, the user cannot see the gift trick</string>
+    <string name="live_prank_add_gift">+ Add gift trick</string>
+    <string name="live_prank_gift_tips">You can add up to 6, and it is recommended to add 4.</string>
+
+    <string name="live_prank_dialog_gift_type_achieved">Quantity achieved</string>
+</resources>
--- a/main/src/main/res/values/strings.xml
+++ b/main/src/main/res/values/strings.xml
@@ -55,9 +55,9 @@
    <string name="dialog_msg_hi_config_audio_btn_play">Play</string>
    <string name="dialog_msg_hi_config_audio_btn_reset">Rerecord</string>
    <string name="dialog_msg_hi_config_audio_btn_save">Save</string>
-    <string name="dialog_msg_hi_config_audio_refuse_save_image">至少传一张图片</string>
-    <string name="dialog_msg_hi_config_audio_refuse_save_text">至少传一条文字消息</string>
-    <string name="dialog_msg_hi_config_audio_refuse_save_audio">至少传一条语音消息</string>
+    <string name="dialog_msg_hi_config_audio_refuse_save_image">至少上傳一張照片</string>
+    <string name="dialog_msg_hi_config_audio_refuse_save_text">至少傳一條文字信息</string>
+    <string name="dialog_msg_hi_config_audio_refuse_save_audio">至少傳一條語音消息</string>
    <string name="activity_reg_user_info_title">Personal information</string>
    <string name="activity_reg_user_info_sex_title">Nickname</string>
    <string name="activity_reg_user_info_sex_sex">Gender</string>
Author	SHA1	Message	Date
ningwenqiang	5bec6c1b79	准备提交暂停	2024-08-23 16:19:42 +08:00
ningwenqiang	1df8d443f7	视频流相关横屏修改	2024-08-22 13:52:00 +08:00
gongduoxiang	6e7d27cbc3	横屏部分弹窗修改	2024-08-19 15:53:54 +08:00
Martin	d61d142ec1	优化[社区评论排版] 修复[官方通知-“點擊查看”-英文翻譯]	2024-08-05 14:27:52 +08:00
Martin	27c2261fac	刪除多餘的strings文件	2024-08-05 14:09:10 +08:00
Martin	730f681f31	处理合并pd代码后，strings文件错乱问题	2024-08-05 13:40:54 +08:00
Martin	1c3c0badfc	Merge branch 'refs/heads/新潘多拉_6.9.0_合并PD' into 新潘多拉 # Conflicts: # config.gradle # live/src/main/java/com/yunbao/live/activity/LiveSwAnchorActivity.java	2024-08-02 17:27:39 +08:00
zlzw	520491a804	修复声网下播后小窗还有流的问题	2024-07-22 18:21:25 +08:00