[优化]：

1.直播间游戏提示优化
2.战令经验值购买优化
3.守护榜页面需美化

app/build.gradle

@@ -178,7 +178,7 @@ android {
             }else{
                 server='测试服'
             }
-            outputFileName = "[${new Date().format("yyyy-MM-dd HHmmss", TimeZone.getTimeZone("GMT+8"))}]PDLive-${defaultConfig.versionName}-${channel}-${server}-${variant.buildType.name}.apk"
+         //   outputFileName = "[${new Date().format("yyyy-MM-dd HHmmss", TimeZone.getTimeZone("GMT+8"))}]PDLive-${defaultConfig.versionName}-${channel}-${server}-${variant.buildType.name}.apk"
         }
         tasks.named("sign${variant.name.capitalize()}Bundle", com.android.build.gradle.internal.tasks.FinalizeBundleTask) {
             File file = finalBundleFile.asFile.get()

common/src/main/java/com/yunbao/common/dialog/OrderLevelPopupWindow.java

@@ -1,5 +1,6 @@
 package com.yunbao.common.dialog;
 
+import android.app.Dialog;
 import android.content.Context;
 import android.view.View;
 import android.widget.ProgressBar;
@@ -16,6 +17,7 @@ import com.yunbao.common.http.base.HttpCallback;
 import com.yunbao.common.http.live.LiveNetManager;
 import com.yunbao.common.interfaces.OnItemClickListener;
 import com.yunbao.common.manager.IMLoginManager;
+import com.yunbao.common.utils.DialogUitl;
 import com.yunbao.common.utils.ToastUtil;
 import com.yunbao.common.utils.WordUtil;
 import com.yunbao.common.views.weight.ViewClicksAntiShake;
@@ -33,11 +35,13 @@ public class OrderLevelPopupWindow extends CenterPopupView {
     private OrderLevelCallback orderLevelCallback;
     private long maxExp;
     private BattlePassUserInfoBean userInfoBean;
+    private Context mContext;
 
     public OrderLevelPopupWindow(@NonNull Context context, BattlePassUserInfoBean userInfoBean,
                                  int mCurrentExperience, int mTotalExperience,
                                  String mCurrentLevel, String mBalance, long maxExp, OrderLevelCallback mOrderLevelCallback) {
         super(context);
+        this.mContext = context;
         this.userInfoBean = userInfoBean;
         currentExperience = mCurrentExperience;
         totalExperience = mTotalExperience;
@@ -67,7 +71,7 @@ public class OrderLevelPopupWindow extends CenterPopupView {
         progressBar.setProgress(currentExperience);
         expText.setText(String.format("%s/%s", userInfoBean.getBattlePassExp(), userInfoBean.getNextLevelExp()));
         current.setText(String.format("Lv%s", currentLevel));
-        balanceDiamond.setText(balance);
+        balanceDiamond.setText(WordUtil.isNewZh()?"剩餘：":"Balance："+balance);
         findViewById(R.id.sub).setOnClickListener(new OnClickListener() {
             @Override
             public void onClick(View view) {
@@ -75,7 +79,7 @@ public class OrderLevelPopupWindow extends CenterPopupView {
                 if (exp > 100) {
                     BigDecimal buyExpBigDecimal = new BigDecimal(buyExp).subtract(new BigDecimal("100"));
                     buyExp = String.valueOf(buyExpBigDecimal.intValue());
-                    orderLevelDiamond.setText(String.valueOf(buyExpBigDecimal.floatValue()));
+                    orderLevelDiamond.setText("00 = "+String.valueOf(buyExpBigDecimal.floatValue()));
                     orderLevel.setText(buyExp);
                 }
             }
@@ -87,7 +91,7 @@ public class OrderLevelPopupWindow extends CenterPopupView {
                 if (exp < maxExp && exp < 10000) {
                     BigDecimal buyExpBigDecimal = new BigDecimal(buyExp).add(new BigDecimal("100"));
                     buyExp = String.valueOf(buyExpBigDecimal.intValue());
-                    orderLevelDiamond.setText(String.valueOf(buyExpBigDecimal.floatValue()));
+                    orderLevelDiamond.setText("00 = "+String.valueOf(buyExpBigDecimal.floatValue()));
                     orderLevel.setText(buyExp);
                 } else if (exp >= maxExp) {
                     ToastUtil.show(WordUtil.isNewZh() ? "经验已滿" : "Experience full");
@@ -125,13 +129,29 @@ public class OrderLevelPopupWindow extends CenterPopupView {
                         });
             }
         });
+        ViewClicksAntiShake.clicksAntiShake(findViewById(R.id.tickets_plus_minus), new ViewClicksAntiShake.ViewClicksCallBack() {
+            @Override
+            public void onViewClicks() {
+                DialogUitl.showSimpleInputDialog(mContext, getResources().getString(R.string.buying_experience_point), DialogUitl.INPUT_TYPE_NUMBER, 4, new DialogUitl.SimpleCallback2() {
+                    @Override
+                    public void onCancelClick() {
+
+                    }
+
+                    @Override
+                    public void onConfirmClick(Dialog dialog, String content) {
+                        orderLevel.setText(content);
+                    }
+                });
+            }
+        });
         IMLoginManager.get(getContext())
                 .updateUserCoin(new OnItemClickListener<JSONObject>() {
                     @Override
                     public void onItemClick(JSONObject bean, int position) {
                         if (bean != null) {
                             balance = bean.getString("coin");
-                            balanceDiamond.setText(balance);
+                            balanceDiamond.setText(WordUtil.isNewZh()?"剩餘：":"Balance："+balance);
                         }
                     }
                 });

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

@@ -14,7 +14,7 @@
         <clip android:clipOrientation="horizontal">
             <shape>
                 <corners android:radius="3dp" />
-                <solid android:color="#CE2BFF" />
+                <solid android:color="#936EFF" />
             </shape>
         </clip>
     </item>

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

@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="218dp"
+    android:layout_height="240dp"
     android:layout_marginStart="17dp"
     android:layout_marginEnd="17dp"
     android:background="@drawable/background_order_dialog"
@@ -39,7 +39,7 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="46dp"
             android:text="Lv7"
-            android:textColor="#CE2BFF"
+            android:textColor="#2439B9"
             android:textSize="14sp" />
 
         <androidx.constraintlayout.widget.ConstraintLayout
@@ -66,32 +66,32 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
                 android:textColor="#000"
+                android:layout_marginRight="7dp"
                 android:textSize="12sp"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
                 tools:text="500/1000" />
         </androidx.constraintlayout.widget.ConstraintLayout>
 
     </LinearLayout>
-
+    <TextView
+        android:layout_width="match_parent"
+        android:gravity="center"
+        android:layout_marginTop="10dp"
+        android:layout_height="wrap_content"
+        android:text="@string/buying_experience_point"
+        android:textColor="#0D21B2"
+        android:textSize="14sp" />
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
         android:layout_marginStart="15dp"
-        android:layout_marginTop="20dp"
+        android:layout_marginTop="10dp"
         android:layout_marginEnd="15dp"
         android:gravity="center">
 
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/buying_experience_point"
-            android:textColor="#0D21B2"
-            android:textSize="14sp" />
-
         <LinearLayout
             android:layout_width="90dp"
             android:layout_height="25dp"
@@ -130,7 +130,7 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="10dp"
             android:text="100"
-            android:textColor="#0D21B2"
+            android:textColor="#000000"
             android:textSize="11sp" />
 
         <ImageView

config.gradle

@@ -4,16 +4,16 @@ ext {
             buildToolsVersion: "29.0.2",
             minSdkVersion    : 21,
             targetSdkVersion : 33,
-            versionCode      : 678,
+            versionCode      : 690,
-            versionName      : "6.7.0"
+            versionName      : "6.7.1"
     ]
     manifestPlaceholders = [
             //正式、
+//            serverHost       : "https://napi.yaoulive.com",
             serverHost       : "https://napi.yaoulive.com",
-//             测试
-            testServerHost       : "https://ceshi.yaoulive.com",
 
             buildTime        : new Date().format("MM-dd HH:mm", TimeZone.getTimeZone("GMT+8")),
+            testServerHost       : "https://ceshi.yaoulive.com",
 
             //百度语音识别
 
@@ -32,3 +32,4 @@ ext {
             isPluginModel    : false,
     ]
 }
+

gradle.properties

@@ -23,8 +23,7 @@ android.enableJetifier=true
 
 systemProp.http.proxyHost=127.0.0.1
 systemProp.https.proxyHost=127.0.0.1
-systemProp.https.proxyPort=7890
+systemProp.https.proxyPort=10809
-systemProp.http.proxyPort=7890
+systemProp.http.proxyPort=10809
-
 
 #android.enableR8.fullMode=true

live/src/main/java/com/yunbao/live/dialog/LiveGuardDialog.java

@@ -66,7 +66,7 @@ public class LiveGuardDialog extends AbsDialogPopupWindow {
     ImageView userSex, tagKing;
     RoundedImageView guardIcon;
     SVGAImageView giftSvga;
-    TextView btnGuardOpen;
+    ImageView btnGuardOpen;
     TextView guard_hint;
     TextView guard_time;
     View guardian_task_view;
@@ -117,11 +117,11 @@ public class LiveGuardDialog extends AbsDialogPopupWindow {
         IMLoginManager.get(mContext).setGuardRedPoint();
         if (WordUtil.isNewZh()) {
             ViewGroup.LayoutParams layoutParams = guardian_task_view.getLayoutParams();
-            layoutParams.width = DpUtil.dp2px(50);
+            layoutParams.width = DpUtil.dp2px(48);
             guardian_task_view.setLayoutParams(layoutParams);
         } else {
             ViewGroup.LayoutParams layoutParams = guardian_task_view.getLayoutParams();
-            layoutParams.width = DpUtil.dp2px(78);
+            layoutParams.width = DpUtil.dp2px(68);
             guardian_task_view.setLayoutParams(layoutParams);
 
         }
@@ -203,18 +203,18 @@ public class LiveGuardDialog extends AbsDialogPopupWindow {
                 if (TextUtils.equals(data.getIsOpen(), "0")) {
                     guardianTask.setVisibility(GONE);
                     myGraudGrade.setVisibility(GONE);
-                    btnGuardOpen.setText(WordUtil.isNewZh() ? "開通守護" : "Open Guard");
+                    btnGuardOpen.setImageDrawable(getResources().getDrawable(R.mipmap.guard_btn_buy_first_icon));
                     guard_hint.setText(WordUtil.isNewZh() ? "快為您喜歡的主播開通守護吧!" : "Turn on the guard for your favorite anchor!");
                 } else {
                     if (data.getGuardType() == 0) {
                         guardianTask.setVisibility(GONE);
                         myGraudGrade.setVisibility(GONE);
-                        btnGuardOpen.setText(WordUtil.isNewZh() ? "開通守護" : "Open Guard");
+                        btnGuardOpen.setImageDrawable(getResources().getDrawable(R.mipmap.guard_btn_buy_first_icon));
                         guard_hint.setText(WordUtil.isNewZh() ? "快為您喜歡的主播開通守護吧!" : "Turn on the guard for your favorite anchor!");
                     } else {
                         guardianTask.setVisibility(VISIBLE);
                         myGraudGrade.setVisibility(VISIBLE);
-                        btnGuardOpen.setText(WordUtil.isNewZh() ? "續費守護" : "Renewal");
+                        btnGuardOpen.setImageDrawable(getResources().getDrawable(R.mipmap.guard_btn_buy_icon));
                         StringBuffer stringBuffer = new StringBuffer();
                         stringBuffer.append(WordUtil.isNewZh() ? "您是當前主播的" : "You are the ");
                         switch (data.getGuardType()) {
@@ -260,7 +260,7 @@ public class LiveGuardDialog extends AbsDialogPopupWindow {
                 ToastUtil.show(error);
                 guardianTask.setVisibility(GONE);
                 myGraudGrade.setVisibility(GONE);
-                btnGuardOpen.setText(WordUtil.isNewZh() ? "開通守護" : "Open Guard");
+                btnGuardOpen.setImageDrawable(getResources().getDrawable(R.mipmap.guard_btn_buy_first_icon));
             }
         });
         LiveNetManager.get(getContext())
@@ -347,7 +347,7 @@ public class LiveGuardDialog extends AbsDialogPopupWindow {
 
         guardLevel.setText(String.valueOf(guardUserModel.getGuardLevel()));
         ImgLoader.display(mContext, guardUserModel.getAvatar(), guardIcon);
-        giftSvga.setImageResource(R.mipmap.guardian_img_wings_p);
+        giftSvga.setImageResource(R.mipmap.guardian_img_wings);
         if (TextUtils.equals(guardUserModel.getGuardLevelCard(), "0")) {
             switch (guardUserModel.getGuardType()) {
                 case 1:

live/src/main/java/com/yunbao/live/dialog/LiveNewGuardDialogFragment.java

@@ -1,6 +1,5 @@
 package com.yunbao.live.dialog;
 
-import android.app.Dialog;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.view.Gravity;
@@ -24,14 +23,10 @@ import com.yunbao.common.Constants;
 import com.yunbao.common.adapter.RefreshAdapter;
 import com.yunbao.common.custom.CommonRefreshView;
 import com.yunbao.common.dialog.AbsDialogFragment;
-import com.yunbao.common.dialog.GuardBuyTipsDialog;
 import com.yunbao.common.glide.ImgLoader;
 import com.yunbao.common.http.HttpCallback;
 import com.yunbao.common.http.LiveHttpUtil;
 import com.yunbao.common.utils.CommonIconUtil;
-import com.yunbao.common.utils.DialogUitl;
-import com.yunbao.common.utils.ToastUtil;
-import com.yunbao.common.utils.ToastUtils;
 import com.yunbao.live.R;
 import com.yunbao.live.activity.LiveActivity;
 import com.yunbao.live.adapter.GuardAdapter;
@@ -48,10 +43,10 @@ import java.util.List;
  * 2024/02/22
  */
 public class LiveNewGuardDialogFragment extends AbsDialogFragment implements View.OnClickListener {
-    private ImageView guardIcon, userSex, userLevel;
+    private ImageView guardIcon, userSex,mBtnBuy,  userLevel;
     private ConstraintLayout mRootLayout;
     private CommonRefreshView mRefreshView;
-    private TextView mBtnBuy, userName, userGuard, tip1, tip2;
+    private TextView userName, userGuard, tip1, tip2;
     private SVGAImageView giftSvga;
     private LinearLayout userLayout;
 
@@ -117,7 +112,7 @@ public class LiveNewGuardDialogFragment extends AbsDialogFragment implements Vie
         relativeLayout = mRootView.findViewById(R.id.guard_relativeLayout);
         mBtnBuy.setOnClickListener(this);
         mBtnBuy.setEnabled(true);
-        mBtnBuy.setText(R.string.guard_buy_2);
+        mBtnBuy.setImageDrawable(getResources().getDrawable(R.mipmap.guard_btn_buy_first_icon));
         initView();
     }
 
@@ -222,13 +217,13 @@ public class LiveNewGuardDialogFragment extends AbsDialogFragment implements Vie
                 tip1.setText(R.string.guard_tip_0);
             } else if (guardType == Constants.GUARD_TYPE_DAY) {
                 tip1.setText(mContext.getString(R.string.guard_tip_day) + mLiveGuardInfo.getMyGuardEndTime());
-                mBtnBuy.setText(R.string.guard_buy_3);
+                mBtnBuy.setImageDrawable(getResources().getDrawable(R.mipmap.guard_btn_buy_icon));
             } else if (guardType == Constants.GUARD_TYPE_MONTH) {
                 tip1.setText(mContext.getString(R.string.guard_tip_1) + mLiveGuardInfo.getMyGuardEndTime());
-                mBtnBuy.setText(R.string.guard_buy_3);
+                mBtnBuy.setImageDrawable(getResources().getDrawable(R.mipmap.guard_btn_buy_icon));
             } else if (guardType == Constants.GUARD_TYPE_YEAR) {
                 tip1.setText(mContext.getString(R.string.guard_tip_2) + mLiveGuardInfo.getMyGuardEndTime());
-                mBtnBuy.setText(R.string.guard_buy_3);
+                mBtnBuy.setImageDrawable(getResources().getDrawable(R.mipmap.guard_btn_buy_icon));
             }
         }
     }

live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java

@@ -714,7 +714,9 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
     }
 
     private TextView sud_text_name;
-    private LinearLayout sud_layout_name;
+    private RelativeLayout sud_layout_name;
+    private TextView sud_join;
+    private ImageView iconSudClose;
     private Handler sudNameHandler = new Handler();
     private Runnable sudNameRunnable = new Runnable() {
         @Override
@@ -727,7 +729,8 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
 
     public void setSudName(String sudName, SudGameDateModel sudGameDateModel) {
         sud_text_name = (TextView) findViewById(R.id.sud_text_name);
-        sud_layout_name = (LinearLayout) findViewById(R.id.sud_layout_name);
+        sud_layout_name = (RelativeLayout) findViewById(R.id.sud_layout_name);
+        iconSudClose = (ImageView) findViewById(R.id.iconSudClose);
         sud_text_name.setText(WordUtil.isNewZh() ? String.format("主播创建了【%s】房间，快来与主播同玩~", sudName) : String.format("The anchor has created a 【%s】 room. Come and play with the anchor~", sudName));
         sud_layout_name.setVisibility(View.VISIBLE);
         ViewClicksAntiShake.clicksAntiShake(sud_layout_name, new ViewClicksAntiShake.ViewClicksCallBack() {
@@ -748,6 +751,12 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
                 sud_layout_name.setVisibility(View.GONE);
             }
         });
+        ViewClicksAntiShake.clicksAntiShake(iconSudClose, new ViewClicksAntiShake.ViewClicksCallBack() {
+            @Override
+            public void onViewClicks() {
+                sud_layout_name.setVisibility(View.GONE);
+            }
+        });
         sudNameHandler.removeCallbacks(sudNameRunnable);
         sudNameHandler.postDelayed(sudNameRunnable, 10000);
     }

live/src/main/res/drawable/background_live_sud_hint.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="8dp"/>
+    <solid android:color="#FFFFFF"/>
+</shape>

live/src/main/res/drawable/bg_live_room_sud_hint.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:width="74dp" android:height="23dp">
+        <shape android:layout_width="match_parent" android:layout_height="wrap_content" android:shape="rectangle">
+            <gradient android:angle="180" android:centerColor="#ffe782ff" android:endColor="#ffff9c9c" android:startColor="#ff9e96ff" android:type="linear" android:useLevel="true" />
+            <corners android:radius="12dp" />
+        </shape>
+    </item>
+</selector>

live/src/main/res/drawable/bg_live_room_sud_hint_join.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:width="102dp" android:height="34dp">
+        <shape android:shape="rectangle">
+            <gradient android:type="linear"
+                android:useLevel="true"
+                android:startColor="#5BD6FF"
+                android:endColor="#6DA0FF"
+                android:angle="90" />
+            <corners android:radius="21dp" />
+        </shape>
+    </item>
+</selector>

live/src/main/res/drawable/guard_buy_bottom_bg.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <gradient
-        android:angle="45"
-        android:endColor="#3B217D"
-        android:startColor="#181F3B" />
-    <corners
-        android:bottomLeftRadius="0dp"
-        android:bottomRightRadius="0dp"
-        android:topLeftRadius="0dp"
-        android:topRightRadius="0dp" />
-</shape>

live/src/main/res/drawable/guard_buy_center_bg.xml

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <gradient
-        android:angle="-45"
-        android:centerColor="#090522"
-        android:endColor="#0E1633"
-        android:startColor="#2C1661" />
-    <corners
-        android:bottomLeftRadius="0dp"
-        android:bottomRightRadius="0dp"
-        android:topLeftRadius="12dp"
-        android:topRightRadius="12dp" />
-</shape>

live/src/main/res/drawable/guard_buy_top_bg.xml

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <gradient
-        android:angle="45"
-        android:centerColor="#220A3C"
-        android:endColor="#0E1633"
-        android:startColor="#0E1633" />
-    <corners
-        android:bottomLeftRadius="0dp"
-        android:bottomRightRadius="0dp"
-        android:topLeftRadius="12dp"
-        android:topRightRadius="12dp" />
-</shape>

live/src/main/res/layout/dialog_live_guard.xml

@@ -9,7 +9,7 @@
         android:layout_height="match_parent"
         android:layout_marginTop="59dp"
         android:layout_marginBottom="71dp"
-        android:background="@drawable/background_live_guard">
+        android:background="@drawable/guard_buy_top_bg">
 
         <RelativeLayout
             android:layout_width="wrap_content"
@@ -82,7 +82,6 @@
 
         <FrameLayout
             android:id="@+id/guardian_task"
-
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="14dp"
@@ -96,12 +95,13 @@
                 android:textColor="#E8C7F9"
                 android:textSize="12sp" />
 
-            <View
+            <ImageView
                 android:id="@+id/guardian_task_view"
-                android:layout_width="50dp"
+                android:layout_width="48dp"
-                android:layout_height="1dp"
+                android:layout_height="20dp"
-                android:layout_gravity="bottom|center_horizontal"
+                android:layout_marginTop="6dp"
-                android:background="#E8C7F9" />
+                android:src="@drawable/live_dialog_top_guardian_tasks_bg"
+          />
         </FrameLayout>
 
 
@@ -121,11 +121,6 @@
                 android:textColor="@color/white"
                 android:textSize="12sp" />
 
-            <View
-                android:layout_width="60dp"
-                android:layout_height="1dp"
-                android:layout_gravity="bottom"
-                android:background="@color/white" />
         </FrameLayout>
 
         <FrameLayout
@@ -134,7 +129,7 @@
             android:layout_marginStart="7dp"
             android:layout_marginTop="96dp"
             android:layout_marginEnd="7dp"
-            android:background="@drawable/background_live_guard2">
+            android:background="@drawable/guard_buy_center_bg">
 
 
             <com.yunbao.common.custom.CommonRefreshView
@@ -197,7 +192,7 @@
         android:layout_width="match_parent"
         android:layout_height="71dp"
         android:layout_gravity="bottom"
-        android:background="@drawable/background_live_guard3">
+        android:background="@drawable/guard_buy_bottom_bg">
 
         <LinearLayout
             android:layout_width="0dp"
@@ -232,18 +227,18 @@
                 android:textSize="11sp" />
         </LinearLayout>
 
-
+        <ImageView
-        <TextView
             android:id="@+id/btn_guard_open"
-            android:layout_width="124dp"
+            android:layout_width="101dp"
-            android:layout_height="42dp"
+            android:layout_height="36dp"
-            android:layout_gravity="center_vertical|end"
+            android:layout_gravity="center_vertical"
-            android:layout_marginEnd="16dp"
+            android:layout_marginEnd="15dp"
-            android:background="@mipmap/btn_guard_open"
+            android:background="@mipmap/guard_btn_buy_icon"
+            android:enabled="false"
             android:gravity="center"
-            android:text="續費守護"
+            android:singleLine="true"
+            android:text="@string/guard_buy_2"
             android:textColor="@color/white"
-            android:textSize="15sp"
+            android:textSize="14sp" />
-            android:textStyle="bold" />
     </LinearLayout>
 </FrameLayout>

live/src/main/res/layout/dialog_new_guard.xml

@@ -17,6 +17,36 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent">
 
+        <ImageView
+            android:layout_width="50dp"
+            android:layout_height="20dp"
+            android:src="@drawable/live_dialog_top_guardian_tasks_bg"
+            tools:ignore="MissingConstraints"
+            tools:layout_editor_absoluteX="23.5dp"
+            tools:layout_editor_absoluteY="26dp" />
+
+        <TextView
+            android:id="@+id/guardian_tasks"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/live_dialog_top_guardian_tasks"
+            android:textColor="#E8B9FF"
+            tools:ignore="MissingConstraints"
+            tools:layout_editor_absoluteX="20dp"
+            tools:layout_editor_absoluteY="15dp" />
+
+
+        <TextView
+            android:id="@+id/guardian_tasks_my_rank"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="我的等級 >"
+            app:layout_constraintEnd_toEndOf="parent"
+            android:textColor="@color/white"
+            android:layout_marginRight="20dp"
+            android:layout_alignParentEnd="true"
+            tools:ignore="MissingConstraints"
+            tools:layout_editor_absoluteY="15dp" />
 
         <LinearLayout
             android:id="@+id/guard_linearLayout"
@@ -125,13 +155,13 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="10dp"
-                        android:text=""
                         android:ellipsize="marquee"
                         android:focusable="true"
                         android:focusableInTouchMode="true"
                         android:marqueeRepeatLimit="marquee_forever"
                         android:scrollHorizontally="true"
                         android:singleLine="true"
+                        android:text=""
                         android:textColor="@color/white"
                         android:textSize="11sp" />
 
@@ -143,30 +173,29 @@
                         android:layout_centerVertical="true"
                         android:layout_marginLeft="10dp"
                         android:drawablePadding="4dp"
-                        android:text="456"
                         android:ellipsize="marquee"
                         android:focusable="true"
                         android:focusableInTouchMode="true"
                         android:marqueeRepeatLimit="marquee_forever"
                         android:scrollHorizontally="true"
                         android:singleLine="true"
+                        android:text="456"
                         android:textColor="#A281FD"
                         android:textSize="11sp"
                         android:visibility="gone" />
                 </LinearLayout>
 
-
+                <ImageView
-                <TextView
                     android:id="@+id/guard_btn_buy"
-                    android:layout_width="110dp"
+                    android:layout_width="101dp"
-                    android:layout_height="30dp"
+                    android:layout_height="36dp"
-                    android:singleLine="true"
                     android:layout_alignParentEnd="true"
                     android:layout_centerVertical="true"
                     android:layout_marginEnd="15dp"
-                    android:background="@drawable/bg_guard_btn_buy"
+                    android:background="@mipmap/guard_btn_buy_icon"
                     android:enabled="false"
                     android:gravity="center"
+                    android:singleLine="true"
                     android:text="@string/guard_buy_2"
                     android:textColor="@color/white"
                     android:textSize="14sp" />
@@ -195,7 +224,7 @@
             android:layout_centerHorizontal="true"
             android:layout_centerVertical="true"
             android:scaleType="centerCrop"
-              android:src="@mipmap/guardian_img_wings"
+            android:src="@mipmap/guardian_img_wings"
             android:visibility="visible"
             app:riv_oval="true" />
 
@@ -204,7 +233,7 @@
             android:id="@+id/gift_svga"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-              android:src="@mipmap/guardian_img_wings"
+            android:src="@mipmap/guardian_img_wings"
             android:visibility="visible"
             app:autoPlay="true" />
 

live/src/main/res/layout/view_live_room.xml

@@ -1283,8 +1283,8 @@
                     android:id="@+id/iv_look_full_service_notice_new3"
                     android:layout_width="56dp"
                     android:layout_height="30dp"
-                    android:layout_marginBottom="1dp"
+                    android:layout_marginEnd="5dp"
-                    android:layout_marginEnd="5dp">
+                    android:layout_marginBottom="1dp">
 
                     <ImageView
                         android:id="@+id/iv_look_full_service_notice_new2"
@@ -1297,10 +1297,10 @@
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
                         android:clickable="true"
-                        tools:text="btn"
-                        tools:textColor="@color/white"
                         android:gravity="center"
-                        android:textSize="12sp" />
+                        android:textSize="12sp"
+                        tools:text="btn"
+                        tools:textColor="@color/white" />
                 </FrameLayout>
 
 
@@ -1515,10 +1515,11 @@
     <RelativeLayout
         android:id="@+id/lt_pk_line"
         android:layout_width="match_parent"
-        tools:visibility="visible"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/live_top"
-        android:visibility="gone">
+        android:visibility="gone"
+        tools:visibility="visible">
+
         <TextView
             android:id="@+id/pk_rank_red_val"
             android:layout_width="wrap_content"
@@ -1557,8 +1558,8 @@
         <LinearLayout
             android:id="@+id/pk_red_layout"
             android:layout_width="match_parent"
-            android:layout_alignParentBottom="true"
+            android:layout_height="wrap_content"
-            android:layout_height="wrap_content">
+            android:layout_alignParentBottom="true">
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -2390,29 +2391,28 @@
         <!--整蛊进度列表-->
         <include
             android:id="@+id/prank_group"
+            layout="@layout/view_prank_group"
             android:visibility="gone"
-            tools:visibility="visible"
+            tools:visibility="visible" />
-            layout="@layout/view_prank_group"/>
 
         <pl.droidsonroids.gif.GifImageView
             android:id="@+id/prank_small_icon"
-            android:layout_gravity="end"
-            android:visibility="gone"
             android:layout_width="23dp"
             android:layout_height="33dp"
+            android:layout_gravity="end"
             android:layout_marginBottom="5dp"
-            />
+            android:visibility="gone" />
 
         <ImageView
             android:id="@+id/prank_group_turntable_icon"
-            android:src="@mipmap/turntable_icon"
-            android:layout_gravity="end"
-            android:visibility="gone"
-            android:layout_marginBottom="5dp"
-            tools:visibility="visible"
-            android:layout_marginEnd="16dp"
             android:layout_width="44dp"
-            android:layout_height="46dp"/>
+            android:layout_height="46dp"
+            android:layout_gravity="end"
+            android:layout_marginEnd="16dp"
+            android:layout_marginBottom="5dp"
+            android:src="@mipmap/turntable_icon"
+            android:visibility="gone"
+            tools:visibility="visible" />
 
 
         <LinearLayout
@@ -2446,13 +2446,13 @@
             android:id="@+id/top_banner2"
             android:layout_width="52dp"
             android:layout_height="76dp"
-            android:layout_marginTop="20dp"
             android:layout_gravity="end"
+            android:layout_marginTop="20dp"
             android:layout_marginEnd="16dp"
             android:visibility="gone"
             app:delay_time="5000"
-            tools:visibility="visible"
+            app:indicator_height="8dp"
-            app:indicator_height="8dp" />
+            tools:visibility="visible" />
 
         <LinearLayout
             android:id="@+id/lt_trickery"
@@ -2664,31 +2664,74 @@
         android:layout_marginTop="80dp"
         app:autoPlay="true" />
 
-    <LinearLayout
+    <RelativeLayout
         android:id="@+id/sud_layout_name"
         android:layout_width="257dp"
         android:layout_height="40dp"
-        android:layout_alignParentEnd="true"
         android:layout_alignParentBottom="true"
-        android:layout_marginStart="21dp"
+        android:layout_marginStart="10dp"
-        android:layout_marginEnd="42dp"
+        android:layout_marginEnd="72dp"
         android:background="@drawable/background_live_sud_hint"
-        android:gravity="center"
+        android:paddingStart="5dp"
-        android:paddingStart="21dp"
+        android:visibility="gone"
-        android:paddingEnd="15dp"
+        tools:visibility="visible">
-        android:visibility="gone">
+
+        <ImageView
+            android:id="@+id/sud_game_coin"
+            android:layout_width="22dp"
+            android:layout_height="16dp"
+            android:layout_centerVertical="true"
+            android:layout_marginTop="2dp"
+            android:src="@mipmap/live_room_sud_hint_icon" />
 
         <com.yunbao.common.views.weight.MarqueeTextView
             android:id="@+id/sud_text_name"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_marginStart="5dp"
+            android:layout_toStartOf="@+id/sud_join"
+            android:layout_toEndOf="@+id/sud_game_coin"
             android:ellipsize="marquee"
             android:scrollHorizontally="true"
             android:singleLine="true"
             android:text="主播創建了【游戲名】房間，快來與主播同玩~"
+            android:textColor="#999999"
+            android:textSize="12dp" />
+
+        <TextView
+            android:id="@+id/sud_join"
+            android:layout_width="wrap_content"
+            android:layout_height="18dp"
+            android:layout_alignParentEnd="true"
+            android:layout_centerVertical="true"
+            android:layout_marginLeft="10dp"
+            android:layout_marginEnd="20dp"
+            android:background="@drawable/bg_live_room_sud_hint_join"
+            android:ellipsize="end"
+            android:fontFamily="sans-serif-condensed-medium"
+            android:gravity="center"
+            android:maxWidth="50dp"
+            android:paddingStart="10dp"
+            android:paddingEnd="10dp"
+            android:singleLine="true"
+            android:text="@string/live_room_sud_hint_join"
             android:textColor="@color/white"
-            android:textSize="14sp" />
+            android:textSize="10sp"
-    </LinearLayout>
+            android:visibility="visible"
+            tools:visibility="visible" />
+
+        <ImageView
+            android:id="@+id/iconSudClose"
+            android:layout_width="12dp"
+            android:layout_height="12dp"
+            android:layout_alignParentTop="true"
+            android:layout_alignParentEnd="true"
+            android:layout_marginTop="2dp"
+            android:layout_marginEnd="2dp"
+            android:src="@mipmap/icon_live_room_sud_close" />
+
+    </RelativeLayout>
 
     <FrameLayout
         android:id="@+id/pa_pao_layout"
@@ -2701,7 +2744,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
-        android:layout_marginStart="220dp">
+        android:layout_marginStart="220dp"
+        tools:visibility="gone">
 
         <TextView
             android:layout_width="wrap_content"

live/src/main/res/values-en/strings.xml

@@ -146,4 +146,6 @@
     <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_room_sud_hint_join">Join</string>
+    <string name="live_dialog_top_guardian_tasks">守護任務</string>
 </resources>

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

@@ -143,4 +143,6 @@
     <string name="alive_prank_gift_dialog_explain">整蠱說明</string>
     <string name="prank_open_live_msg">娛樂整蠱全新升級，快去設置整蠱内容，給直播間增加更多趣味吧！</string>
     <string name="prank_im_immediately_go">立即前往</string>
+    <string name="live_room_sud_hint_join">加入</string>
+    <string name="live_dialog_top_guardian_tasks">守護任務</string>
 </resources>