Merge branch '直播间提示优化'

# Conflicts:
#	config.gradle

common/src/main/java/com/yunbao/common/adapter/InteractionGamesAdapter.java

@@ -13,6 +13,7 @@ import com.yunbao.common.R;
 import com.yunbao.common.bean.CustomSidebarChildModel;
 import com.yunbao.common.event.CustomDrawerPopupEvent;
 import com.yunbao.common.utils.Bus;
+import com.yunbao.common.utils.SpUtil;
 import com.yunbao.common.views.InteractionGamesChildViewHolder;
 
 import java.util.ArrayList;
@@ -36,7 +37,7 @@ public class InteractionGamesAdapter extends RecyclerView.Adapter {
     @Override
     public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
         View runGamesView = LayoutInflater.from(parent.getContext()).inflate(R.layout.view_live_new_role_fun_games_child_view3, parent, false);
-        return new InteractionGamesChildViewHolder(runGamesView);
+        return new InteractionGamesChildViewHolder(runGamesView,mContext);
     }
 
     @Override
@@ -51,6 +52,9 @@ public class InteractionGamesAdapter extends RecyclerView.Adapter {
                 if (activityID != 0) {
                     Bus.get().post(new CustomDrawerPopupEvent()
                             .setDisMiss(true).setInteractionID(activityID).setInteraction(true).setChild(srcChild));
+                    if(model.getSudGameIsNew().equals("1")){
+                        SpUtil.getInstance().setLiveGameId(model.getId());
+                    }
                 }
 
 

common/src/main/java/com/yunbao/common/adapter/LiveNewRoleFunGamesAdapter.java

@@ -31,11 +31,16 @@ public class LiveNewRoleFunGamesAdapter extends RecyclerView.Adapter {
     @Override
     public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
         View runGamesView = LayoutInflater.from(parent.getContext()).inflate(R.layout.view_live_new_role_fun_games_child_view, parent, false);
-        return new NewRoleFunGamesChildViewHolder(runGamesView,showRed);
+        return new NewRoleFunGamesChildViewHolder(runGamesView,showRed,mContext);
     }
 
     @Override
     public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
+        ViewGroup.LayoutParams layoutParams = new ViewGroup.LayoutParams((int)
+                (mContext.getResources().getDisplayMetrics().widthPixels / 4.5),
+                ViewGroup.LayoutParams.WRAP_CONTENT);
+        holder.itemView.setLayoutParams(layoutParams);
+
         NewRoleFunGamesChildViewHolder childViewHolder = (NewRoleFunGamesChildViewHolder) holder;
         childViewHolder.setData(child.get(position), rigts);
     }

common/src/main/java/com/yunbao/common/adapter/LiveNewRoleInteractionGamesAdapter.java

@@ -11,11 +11,11 @@ import androidx.recyclerview.widget.RecyclerView;
 
 import com.yunbao.common.R;
 import com.yunbao.common.bean.CustomSidebarChildModel;
-import com.yunbao.common.event.CustomDrawerPopupEvent;
 import com.yunbao.common.event.LiveNewRoleEvent;
 import com.yunbao.common.event.NewRoleCustomDrawerPopupEvent;
 import com.yunbao.common.utils.Bus;
-import com.yunbao.common.views.InteractionGamesChildViewHolder;
+import com.yunbao.common.utils.SpUtil;
+import com.yunbao.common.views.InteractionGamesChildBottomViewHolder;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -34,14 +34,14 @@ public class LiveNewRoleInteractionGamesAdapter extends RecyclerView.Adapter {
     @Override
     public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
         View runGamesView = LayoutInflater.from(parent.getContext()).inflate(R.layout.view_live_new_role_fun_games_child_view3, parent, false);
-        return new InteractionGamesChildViewHolder(runGamesView);
+        return new InteractionGamesChildBottomViewHolder(runGamesView,mContext);
     }
 
     @Override
     public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
-        InteractionGamesChildViewHolder childViewHolder = (InteractionGamesChildViewHolder) holder;
+        InteractionGamesChildBottomViewHolder childViewHolder = (InteractionGamesChildBottomViewHolder) holder;
         childViewHolder.setData(child.get(position), rigts);
-        childViewHolder.setItemViewClicks(new InteractionGamesChildViewHolder.InteractionGamesCallBack() {
+        childViewHolder.setItemViewClicks(new InteractionGamesChildBottomViewHolder.InteractionGamesCallBack() {
             @Override
             public void onItemViewClicks(CustomSidebarChildModel model, boolean rigts) {
 
@@ -52,6 +52,9 @@ public class LiveNewRoleInteractionGamesAdapter extends RecyclerView.Adapter {
                                 .setInteractionID(activityID)
                                         .setChild(child)
                                 .setInteraction(true));
+                        if(model.getSudGameIsNew().equals("1")){
+                            SpUtil.getInstance().setLiveGameId(model.getId());
+                        }
                     }
 
 
@@ -60,12 +63,14 @@ public class LiveNewRoleInteractionGamesAdapter extends RecyclerView.Adapter {
         });
     }
 
+
     @Override
     public int getItemCount() {
         return child.size();
     }
 
     public void updateData(List<CustomSidebarChildModel> mChild) {
+
         child.clear();
        /* if (mChild.size() > 8) {
             for (int i = 0; i < 8; i++) {

common/src/main/java/com/yunbao/common/adapter/LiveNewRolerPopupAdapter.java

@@ -39,13 +39,14 @@ public class LiveNewRolerPopupAdapter extends RecyclerView.Adapter {
         switch (viewType) {
             case FUN_GAMES:
                 View runGamesView = LayoutInflater.from(parent.getContext()).inflate(R.layout.view_new_roler_fun_games_view, parent, false);
-                return new LiveNewRoleFunGamesViewHolder(runGamesView);
+                return new LiveNewRoleFunGamesViewHolder(runGamesView,mContext);
             case RIGHTS_INTERESTS:
+                //特权
                 View rightsInterestsView = LayoutInflater.from(parent.getContext()).inflate(R.layout.view_live_new_roler_ights_interests, parent, false);
-                return new LiveNewRoleRigtsInterestsViewHolder(rightsInterestsView,showRed);
+                return new LiveNewRoleRigtsInterestsViewHolder(rightsInterestsView,showRed,mContext);
             default:
                 View gamesView = LayoutInflater.from(parent.getContext()).inflate(R.layout.view_live_new_role_interaction_games_view, parent, false);
-                return new LiveNewRoleInteractionGamesViewHolder(gamesView);
+                return new LiveNewRoleInteractionGamesViewHolder(gamesView,mContext);
         }
     }
 

common/src/main/java/com/yunbao/common/adapter/NewRoleFunGamesAdapter.java

@@ -30,11 +30,15 @@ public class NewRoleFunGamesAdapter extends RecyclerView.Adapter {
     @Override
     public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
         View runGamesView = LayoutInflater.from(parent.getContext()).inflate(R.layout.view_live_new_role_fun_games_child_view2, parent, false);
-        return new NewRoleFunGamesChildViewHolder(runGamesView,false);
+        return new NewRoleFunGamesChildViewHolder(runGamesView,false,mContext);
     }
 
     @Override
     public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
+        ViewGroup.LayoutParams layoutParams = new ViewGroup.LayoutParams((int)
+                (mContext.getResources().getDisplayMetrics().widthPixels / 4.5),
+                ViewGroup.LayoutParams.WRAP_CONTENT);
+        holder.itemView.setLayoutParams(layoutParams);
         NewRoleFunGamesChildViewHolder childViewHolder = (NewRoleFunGamesChildViewHolder) holder;
         childViewHolder.setData(child.get(position), rigts);
     }

common/src/main/java/com/yunbao/common/bean/GuardPriceModel.java

@@ -22,6 +22,30 @@ public class GuardPriceModel extends BaseModel {
     private String discount;
     @SerializedName("price_key")
     private int priceKey;
+    @SerializedName("coupon_discount")
+    private String couponDiscount;
+    @SerializedName("coupon_discount_en")
+    private String couponDiscountEn;
+    @SerializedName("coupon_discount_price")
+    private String couponDiscountPrice;
+    @SerializedName("coupon_id")
+    private String couponId;
+
+    public String getCouponDiscount() {
+        return couponDiscount;
+    }
+
+    public String getCouponId() {
+        return couponId;
+    }
+
+    public String getCouponDiscountEn() {
+        return couponDiscountEn;
+    }
+
+    public String getCouponDiscountPrice() {
+        return couponDiscountPrice;
+    }
 
     public String getOpeningTime() {
         return openingTime;

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

@@ -0,0 +1,80 @@
+package com.yunbao.common.dialog;
+
+import android.app.Activity;
+import android.app.Dialog;
+import android.content.Context;
+import android.text.Html;
+import android.text.Spanned;
+import android.view.View;
+import android.widget.TextView;
+
+import com.yunbao.common.R;
+import com.yunbao.common.utils.DialogUitl;
+import com.yunbao.common.utils.WordUtil;
+
+public class GuardBuyCouponTipsDialog {
+
+    /**
+     * @param context
+     * @param coin           钻石
+     * @param content        购买类型名称
+     * @param simpleCallback
+     */
+    public static void showBuyOrRenewDialog(Context context, String coupon, String coin, String content,
+                                            DialogUitl.SimpleCallback3 simpleCallback) {
+        if (context instanceof Activity) {
+            if (((Activity) context).isDestroyed() || ((Activity) context).isFinishing()) {
+                return;
+            }
+        }
+
+        final Dialog dialog = new Dialog(context, R.style.dialog2);
+        dialog.setContentView(R.layout.dialog_guard_buy_coupon_tips);
+        dialog.setCancelable(true);
+        dialog.setCanceledOnTouchOutside(true);
+        TextView btn_confirm = dialog.findViewById(R.id.btn_confirm);
+        TextView content2 = dialog.findViewById(R.id.content2);
+
+        Spanned tips;
+        if (WordUtil.isNewZh()) {
+            tips = Html.fromHtml("<font color='#FFE0BF'>您有一張</font>"
+                    + "<font color='#FF9937'>" + content + "優惠券</font><br>"
+                    + "<font color='#FFE0BF'>開通/續費" + content + "(1個月)時，</font><br><font color='#FFE0BF'>可享</font>"
+                    + "<strong><font color='#FF9937'>" + coupon + "折</font></strong>"
+                    + "<font color='#FFE0BF'>優惠 (折後:</font>"
+                    + "<font color='#FF9937'>" + coin + "鑽</font>)<br>"
+                    + "<font color='#FFE0BF'>是否使用優惠券？</font>");
+        } else {
+            tips = Html.fromHtml("<font color='#FFE0BF'>You have a </font>"
+                    + "<font color='#FF9937'>" + content + " coupon</font>"
+                    + "<font color='#FFE0BF'> When activating/renewing " + content + "(1 month), you can enjoy a</font>"
+                    + "<strong><font color='#FF9937'> " + coupon + "% </font></strong>"
+                    + "<font color='#FFE0BF'>discount (After folding:</font>"
+                    + "<font color='#FF9937'>" + coin + " diamonds</font>"
+                    + "<font color='#FFE0BF'>）Do you want to use coupons?</font>");
+        }
+        content2.setText(tips);
+        dialog.findViewById(R.id.btn_cancel).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                dialog.dismiss();
+            }
+        });
+        dialog.findViewById(R.id.btn_cancel1).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                simpleCallback.onCancel();
+                dialog.dismiss();
+            }
+        });
+        btn_confirm.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                simpleCallback.onConfirmClick(dialog);
+                dialog.dismiss();
+            }
+        });
+        dialog.show();
+    }
+
+}

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

@@ -0,0 +1,44 @@
+package com.yunbao.common.dialog;
+
+import android.app.Activity;
+import android.app.Dialog;
+import android.content.Context;
+import android.view.View;
+import android.widget.TextView;
+
+import com.yunbao.common.R;
+import com.yunbao.common.utils.WordUtil;
+
+public class GuardBuyTipsNewDialog {
+    /**
+     * @param context
+     */
+    public static void showBuyOrRenewDialog(Context context) {
+        if (context instanceof Activity) {
+            if (((Activity) context).isDestroyed() || ((Activity) context).isFinishing()) {
+                return;
+            }
+        }
+
+        final Dialog dialog = new Dialog(context, R.style.dialog2);
+        dialog.setContentView(R.layout.dialog_guard_buy_tips);
+        dialog.setCancelable(true);
+        dialog.setCanceledOnTouchOutside(true);
+        TextView btn_confirm = dialog.findViewById(R.id.btn_confirm);
+        btn_confirm.setText(WordUtil.isNewZh() ? "確認" : "Confirm");
+        dialog.findViewById(R.id.btn_cancel).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                dialog.dismiss();
+            }
+        });
+        dialog.findViewById(R.id.btn_confirm).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                dialog.dismiss();
+            }
+        });
+        dialog.show();
+    }
+
+}

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

@@ -1,7 +1,10 @@
 package com.yunbao.common.dialog;
 
 import android.content.Context;
+import android.text.Editable;
+import android.text.TextWatcher;
 import android.view.View;
+import android.widget.EditText;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
@@ -26,18 +29,19 @@ import java.math.BigDecimal;
  * 战令等级 经验
  */
 public class OrderLevelPopupWindow extends CenterPopupView {
-    private TextView orderLevel, orderLevelDiamond, balanceDiamond, current, expText;
+    private TextView orderLevelDiamond, balanceDiamond, current, expText;
     private int currentExperience, totalExperience;//当前经验，全部经验
-    private String buyExp = "100", currentLevel, balance;
+    private String buyExp = "1", currentLevel, balance;
     private ProgressBar progressBar;
     private OrderLevelCallback orderLevelCallback;
     private long maxExp;
     private BattlePassUserInfoBean userInfoBean;
+    private Context mContext;
+    private EditText orderLevel;
 
-    public OrderLevelPopupWindow(@NonNull Context context, BattlePassUserInfoBean userInfoBean,
+    public OrderLevelPopupWindow(@NonNull Context context, BattlePassUserInfoBean userInfoBean, int mCurrentExperience, int mTotalExperience, String mCurrentLevel, String mBalance, long maxExp, OrderLevelCallback mOrderLevelCallback) {
-                                 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,15 +71,15 @@ 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) {
                 float exp = new BigDecimal(buyExp).floatValue();
-                if (exp > 100) {
+                if (exp > 1) {
-                    BigDecimal buyExpBigDecimal = new BigDecimal(buyExp).subtract(new BigDecimal("100"));
+                    BigDecimal buyExpBigDecimal = new BigDecimal(buyExp).subtract(new BigDecimal("1"));
                     buyExp = String.valueOf(buyExpBigDecimal.intValue());
-                    orderLevelDiamond.setText(String.valueOf(buyExpBigDecimal.floatValue()));
+                    orderLevelDiamond.setText("00 = " + buyExp + "00");
                     orderLevel.setText(buyExp);
                 }
             }
@@ -84,15 +88,14 @@ public class OrderLevelPopupWindow extends CenterPopupView {
             @Override
             public void onClick(View view) {
                 float exp = new BigDecimal(buyExp).floatValue();
-                if (exp < maxExp && exp < 10000) {
+                if (exp < maxExp && (exp + 1) < 10000) {
-                    BigDecimal buyExpBigDecimal = new BigDecimal(buyExp).add(new BigDecimal("100"));
+                    BigDecimal buyExpBigDecimal = new BigDecimal(buyExp).add(new BigDecimal("1"));
                     buyExp = String.valueOf(buyExpBigDecimal.intValue());
-                    orderLevelDiamond.setText(String.valueOf(buyExpBigDecimal.floatValue()));
+                    orderLevelDiamond.setText("00 = " + buyExp + "00");
                     orderLevel.setText(buyExp);
                 } else if (exp >= maxExp) {
-                    ToastUtil.show(WordUtil.isNewZh() ? "经验已滿" : "Experience full");
+                    ToastUtil.show(WordUtil.isNewZh() ? "經驗超出，僅需" + maxExp + "經驗可達滿级" : "Exp exceeds.Only " + maxExp + " exp is needed to reach the max level.");
                 }
-
             }
         });
         ViewClicksAntiShake.clicksAntiShake(findViewById(R.id.war_order_close), new ViewClicksAntiShake.ViewClicksCallBack() {
@@ -101,14 +104,30 @@ public class OrderLevelPopupWindow extends CenterPopupView {
                 dialog.dismiss();
             }
         });
+        orderLevel.addTextChangedListener(new TextWatcher() {
+            @Override
+            public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) {
+
+            }
+
+            @Override
+            public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) {
+                buyExp = charSequence.toString();
+                orderLevelDiamond.setText("00 = " + charSequence.toString() + "00");
+            }
+
+            @Override
+            public void afterTextChanged(Editable editable) {
+
+            }
+        });
         ViewClicksAntiShake.clicksAntiShake(findViewById(R.id.buying_experience), new ViewClicksAntiShake.ViewClicksCallBack() {
             @Override
             public void onViewClicks() {
-                LiveNetManager.get(getContext())
+                if (Integer.parseInt(orderLevel.getText().toString()+"00") <= maxExp) {
-                        .buyingExperiencePoint(buyExp, new HttpCallback<ResponseModel<Object>>() {
+                    LiveNetManager.get(getContext()).buyingExperiencePoint(buyExp + "00", new HttpCallback<ResponseModel<Object>>() {
                         @Override
                         public void onSuccess(ResponseModel<Object> data) {
-
                             if (orderLevelCallback != null) {
                                 orderLevelCallback.onCallback(data.getData().getCode(), data.getMsg());
                             }
@@ -123,15 +142,17 @@ public class OrderLevelPopupWindow extends CenterPopupView {
                             dialog.dismiss();
                         }
                     });
+                } else {
+                    ToastUtil.show(WordUtil.isNewZh() ? "經驗超出，僅需" + maxExp + "經驗可達滿级" : "Exp exceeds.Only " + maxExp + " exp is needed to reach the max level.");
+                }
             }
         });
-        IMLoginManager.get(getContext())
+        IMLoginManager.get(getContext()).updateUserCoin(new OnItemClickListener<JSONObject>() {
-                .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/java/com/yunbao/common/http/PDLiveApi.java

@@ -1195,7 +1195,7 @@ public interface PDLiveApi {
     Observable<ResponseModel<GuardGetGuardOpenInfoModel>> getGuardOpenInfo(@Query("liveuid") String liveUid);
 
     @GET("/api/public/?service=Guard.openGuard")
-    Observable<ResponseModel<Object>> openGuard(@Query("liveuid") String liveUid, @Query("guard_type") String guardType, @Query("price_key") String priceKey, @Query("stream") String stream);
+    Observable<ResponseModel<Object>> openGuard(@Query("liveuid") String liveUid, @Query("guard_type") String guardType, @Query("price_key") String priceKey, @Query("stream") String stream,@Query("coupon_type") String coupon_type,@Query("coupon_id") String coupon_id);
 
     @GET("/api/public/?service=Guard.sendMoneyLong")
     Observable<ResponseModel<Object>> sendMoneyLong(@Query("liveuid") String liveUid, @Query("gold_num") String goldNum);

common/src/main/java/com/yunbao/common/http/live/LiveNetManager.java

@@ -3015,9 +3015,9 @@ public class LiveNetManager {
 
     }
 
-    public void openGuard(String liveUid, String guardType, String priceKey, String stream, HttpCallback<String> callback) {
+    public void openGuard(String liveUid, String guardType, String priceKey, String stream,String coupon_type,String couponId, HttpCallback<String> callback) {
         API.get().pdLiveApi(mContext)
-                .openGuard(liveUid, guardType, priceKey, stream)
+                .openGuard(liveUid, guardType, priceKey, stream,coupon_type,couponId)
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(new Consumer<ResponseModel<Object>>() {

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

@@ -4,8 +4,13 @@ import android.content.Context;
 import android.content.SharedPreferences;
 import android.text.TextUtils;
 
+import com.alibaba.fastjson.JSONArray;
+import com.google.gson.Gson;
 import com.yunbao.common.CommonAppContext;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -37,9 +42,8 @@ public class SpUtil {
     public static final String ANCHOR_PK_TIME = "anchorPkTime";
     //播放短视频上下滑动引导页
     public static final String READ_VIDEO_GUIDE = "readVideoGuide";
-
     public static final String MESSAGE_SYS_DEL = "FIRST_DEL";
-
+    public static final String LIVE_GAME_NEWED_LIST = "LIVE_GAME_NEWED_LIST";
 
     public SpUtil() {
         mSharedPreferences = CommonAppContext.sInstance.getSharedPreferences("SharedPreferences", Context.MODE_PRIVATE);
@@ -56,6 +60,41 @@ public class SpUtil {
         return sInstance;
     }
 
+    public static void setLiveGameId(String gameId) {
+        String gameMap = getStringValue(LIVE_GAME_NEWED_LIST);
+        List<String> gameNewList;
+        gameNewList = JSONArray.parseArray(gameMap, String.class);
+        L.eSw("gameMap:" + gameMap);
+        if (gameNewList == null) {
+            gameNewList = new ArrayList<>();
+        }
+        for (int i = 0; i < gameNewList.size(); i++) {
+            if (gameNewList.get(i).equals(gameId)) {
+                gameNewList.remove(i);
+                break;
+            }
+        }
+        gameNewList.add(gameId);
+        setStringValue(LIVE_GAME_NEWED_LIST, new Gson().toJson(gameNewList));
+    }
+
+    public static boolean isLiveGameNew(String gameId) {
+        String gameMap = getStringValue(LIVE_GAME_NEWED_LIST);
+        List<String> gameNewList = new ArrayList<>();
+        gameNewList = JSONArray.parseArray(gameMap, String.class);
+        if (gameNewList == null) {
+            gameNewList = new ArrayList<>();
+        }
+        boolean isNew = false;
+        for (int i = 0; i < gameNewList.size(); i++) {
+            if (gameNewList.get(i).equals(gameId)) {
+                isNew = true;
+            }
+        }
+        return !isNew;
+    }
+
+
     /**
      * 保存一个字符串
      */

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

@@ -0,0 +1,67 @@
+package com.yunbao.common.views;
+
+import android.content.Context;
+import android.text.TextUtils;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.makeramen.roundedimageview.RoundedImageView;
+import com.yunbao.common.R;
+import com.yunbao.common.bean.CustomSidebarChildModel;
+import com.yunbao.common.glide.ImgLoader;
+import com.yunbao.common.utils.SpUtil;
+import com.yunbao.common.views.weight.ViewClicksAntiShake;
+
+public class InteractionGamesChildBottomViewHolder extends RecyclerView.ViewHolder {
+    private RoundedImageView funGamePic;
+    private TextView funGameName;
+    private Context mContext;
+
+    public InteractionGamesChildBottomViewHolder(@NonNull View itemView, Context context) {
+        super(itemView);
+        this.mContext = context;
+        funGamePic = itemView.findViewById(R.id.fun_game_pic);
+        funGameName = itemView.findViewById(R.id.fun_game_name);
+    }
+
+    public void setData(CustomSidebarChildModel model, boolean rigts) {
+        ViewGroup.LayoutParams layoutParams = new ViewGroup.LayoutParams((int)
+                (mContext.getResources().getDisplayMetrics().widthPixels / 4.5),
+                ViewGroup.LayoutParams.WRAP_CONTENT);
+        itemView.setLayoutParams(layoutParams);
+        if (rigts) {
+            ImgLoader.display(itemView.getContext(), model.getIcon(), funGamePic);
+        } else {
+            ImgLoader.display(itemView.getContext(), model.getResIcon(), funGamePic);
+        }
+        funGameName.setText(model.getTitle());
+        if (!TextUtils.isEmpty(model.getSudGameIsNew())&&TextUtils.equals(model.getSudGameIsNew(),"1")&& SpUtil.isLiveGameNew(model.getId())){
+            itemView.findViewById(R.id.icon_new_game).setVisibility(View.VISIBLE);
+        }else {
+            itemView.findViewById(R.id.icon_new_game).setVisibility(View.GONE);
+        }
+        ViewClicksAntiShake.clicksAntiShake(itemView, new ViewClicksAntiShake.ViewClicksCallBack() {
+            @Override
+            public void onViewClicks() {
+                if (interactionGamesCallBack != null) {
+                    interactionGamesCallBack.onItemViewClicks(model, rigts);
+                }
+            }
+        });
+    }
+
+    private InteractionGamesCallBack interactionGamesCallBack;
+
+    public void setItemViewClicks(InteractionGamesCallBack callBack) {
+        interactionGamesCallBack = callBack;
+    }
+
+    public interface InteractionGamesCallBack {
+        void onItemViewClicks(CustomSidebarChildModel model, boolean rigts);
+    }
+}

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

@@ -1,40 +1,48 @@
 package com.yunbao.common.views;
 
+import android.content.Context;
 import android.text.TextUtils;
 import android.view.View;
-import android.widget.ImageView;
+import android.view.ViewGroup;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 
+import com.makeramen.roundedimageview.RoundedImageView;
 import com.yunbao.common.R;
 import com.yunbao.common.bean.CustomSidebarChildModel;
-import com.yunbao.common.event.CustomDrawerPopupEvent;
 import com.yunbao.common.glide.ImgLoader;
-import com.yunbao.common.utils.Bus;
+import com.yunbao.common.utils.SpUtil;
 import com.yunbao.common.views.weight.ViewClicksAntiShake;
 
 public class InteractionGamesChildViewHolder extends RecyclerView.ViewHolder {
-    private ImageView funGamePic;
+    private RoundedImageView funGamePic;
     private TextView funGameName;
+    private Context mContext;
 
-    public InteractionGamesChildViewHolder(@NonNull View itemView) {
+    public InteractionGamesChildViewHolder(@NonNull View itemView,Context mContext) {
         super(itemView);
+        this.mContext = mContext;
         funGamePic = itemView.findViewById(R.id.fun_game_pic);
         funGameName = itemView.findViewById(R.id.fun_game_name);
     }
 
     public void setData(CustomSidebarChildModel model, boolean rigts) {
+
+        ViewGroup.LayoutParams layoutParams = new ViewGroup.LayoutParams((int)
+                (mContext.getResources().getDisplayMetrics().widthPixels / 4.5),
+                ViewGroup.LayoutParams.WRAP_CONTENT);
+        itemView.setLayoutParams(layoutParams);
+
         if (rigts) {
             ImgLoader.display(itemView.getContext(), model.getIcon(), funGamePic);
         } else {
             ImgLoader.display(itemView.getContext(), model.getResIcon(), funGamePic);
         }
 
-
         funGameName.setText(model.getTitle());
-        if (!TextUtils.isEmpty(model.getSudGameIsNew())&&TextUtils.equals(model.getSudGameIsNew(),"1")){
+        if (!TextUtils.isEmpty(model.getSudGameIsNew())&&TextUtils.equals(model.getSudGameIsNew(),"1")&& SpUtil.isLiveGameNew(model.getId())){
             itemView.findViewById(R.id.icon_new_game).setVisibility(View.VISIBLE);
         }else {
             itemView.findViewById(R.id.icon_new_game).setVisibility(View.GONE);
@@ -45,8 +53,6 @@ public class InteractionGamesChildViewHolder extends RecyclerView.ViewHolder {
                 if (interactionGamesCallBack != null) {
                     interactionGamesCallBack.onItemViewClicks(model, rigts);
                 }
-
-
             }
         });
     }

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

@@ -1,6 +1,8 @@
 package com.yunbao.common.views;
 
+import android.content.Context;
 import android.view.View;
+import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
 
@@ -25,21 +27,22 @@ public class LiveNewRoleFunGamesViewHolder extends RecyclerView.ViewHolder {
     private RecyclerView childList;
     private ImageView selectMoreIcon;
     boolean isShowMore = true;
+    private Context mContext;
 
-    public LiveNewRoleFunGamesViewHolder(@NonNull View itemView) {
+    public LiveNewRoleFunGamesViewHolder(@NonNull View itemView, Context context) {
         super(itemView);
+        this.mContext = context;
         sendGoodGift = itemView.findViewById(R.id.send_good_gift);
         childList = itemView.findViewById(R.id.child_list);
         selectMoreIcon = itemView.findViewById(R.id.select_more_icon);
         selectMore = itemView.findViewById(R.id.select_more);
-        funGamesAdapter = new NewRoleFunGamesAdapter(itemView.getContext(),true);
+        funGamesAdapter = new NewRoleFunGamesAdapter(itemView.getContext(), true);
         childList.setLayoutManager(new LinearLayoutManager(itemView.getContext(), LinearLayoutManager.HORIZONTAL, false));
         childList.setAdapter(funGamesAdapter);
 
     }
 
     public void setData(CustomSidebarInfoModel model) {
-
         List<CustomSidebarChildModel> sidebarChildModels = model.getChild();
         itemView.findViewById(R.id.select_more_layout).setVisibility(sidebarChildModels.size() >= 8 ? View.VISIBLE : View.GONE);
         sendGoodGift.setText(model.getTitle());

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

@@ -1,11 +1,13 @@
 package com.yunbao.common.views;
 
+import android.content.Context;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.yunbao.common.R;
@@ -21,14 +23,14 @@ public class LiveNewRoleInteractionGamesViewHolder extends RecyclerView.ViewHold
     private RecyclerView childList;
     private ImageView selectMoreIcon;
     boolean isShowMore = true;
-
+    public LiveNewRoleInteractionGamesViewHolder(@NonNull View itemView, Context context) {
-    public LiveNewRoleInteractionGamesViewHolder(@NonNull View itemView) {
         super(itemView);
         sendGoodGift = itemView.findViewById(R.id.send_good_gift);
         childList = itemView.findViewById(R.id.child_list);
         selectMoreIcon = itemView.findViewById(R.id.select_more_icon);
         funGamesAdapter = new LiveNewRoleInteractionGamesAdapter(itemView.getContext(), true);
-        childList.setLayoutManager(new GridLayoutManager(itemView.getContext(), 4));
+        LinearLayoutManager layoutManager = new LinearLayoutManager(context, LinearLayoutManager.HORIZONTAL, false);
+        childList.setLayoutManager(layoutManager);
         childList.setAdapter(funGamesAdapter);
 
     }

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

@@ -1,10 +1,13 @@
 package com.yunbao.common.views;
 
+import android.content.Context;
 import android.view.View;
+import android.view.ViewGroup;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.yunbao.common.R;
@@ -21,19 +24,21 @@ public class LiveNewRoleRigtsInterestsViewHolder extends RecyclerView.ViewHolder
     private TextView sendGoodGift;
     private RecyclerView childList;
     private boolean showRed = false;
-    public LiveNewRoleRigtsInterestsViewHolder(@NonNull View itemView,boolean showRed) {
+    private Context mContext;
+    public LiveNewRoleRigtsInterestsViewHolder(@NonNull View itemView, boolean showRed,Context mContext) {
         super(itemView);
+        this.mContext = mContext;
         sendGoodGift = itemView.findViewById(R.id.send_good_gift);
         childList = itemView.findViewById(R.id.child_list);
         sendGoodGift = itemView.findViewById(R.id.send_good_gift);
         childList = itemView.findViewById(R.id.child_list);
         funGamesAdapter = new LiveNewRoleFunGamesAdapter(itemView.getContext(), false,showRed);
-        childList.setLayoutManager(new GridLayoutManager(itemView.getContext(), 4));
+        LinearLayoutManager layoutManager = new LinearLayoutManager(itemView.getContext(), LinearLayoutManager.HORIZONTAL, false);
+        childList.setLayoutManager(layoutManager);
         childList.setAdapter(funGamesAdapter);
     }
 
     public void setData(CustomSidebarInfoModel model) {
-
         sendGoodGift.setText(model.getTitle());
         funGamesAdapter.updateData(generateData());
     }

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

@@ -98,7 +98,7 @@ public class LiveSudGamePopup extends BottomPopupView {
             gameTitle.setText(mCreateSudRoomModel.getSudGameName());
             roomName.setText(mCreateSudRoomModel.getRoomName());
             roomNumber.setText(mCreateSudRoomModel.getSudGameRoomId());
-            ImgLoader.display(getContext(), mCreateSudRoomModel.getAvatar(), mAvatar);
+            //ImgLoader.display(getContext(), mCreateSudRoomModel.getAvatar(), mAvatar);
         }
         ViewClicksAntiShake.clicksAntiShake(findViewById(R.id.exit), new ViewClicksAntiShake.ViewClicksCallBack() {
             @Override

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

@@ -1,8 +1,10 @@
 package com.yunbao.common.views;
 
+import android.content.Context;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.View;
+import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
 
@@ -27,8 +29,10 @@ public class NewRoleFunGamesChildViewHolder extends RecyclerView.ViewHolder {
     private View red_point;
     private boolean showRed = false;
     private View total_image_red_point;
-    public NewRoleFunGamesChildViewHolder(@NonNull View itemView, boolean showRed) {
+    private Context mContext;
+    public NewRoleFunGamesChildViewHolder(@NonNull View itemView, boolean showRed, Context mContext) {
         super(itemView);
+        this.mContext = mContext;
         this.showRed = showRed;
         funGamePic = itemView.findViewById(R.id.fun_game_pic);
         funGameName = itemView.findViewById(R.id.fun_game_name);

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

@@ -27,7 +27,7 @@ public class RigtsInterestsViewHolder extends RecyclerView.ViewHolder {
         sendGoodGift = itemView.findViewById(R.id.send_good_gift);
         childList = itemView.findViewById(R.id.child_list);
         funGamesAdapter = new FunGamesAdapter(itemView.getContext(), false);
-        childList.setLayoutManager(new GridLayoutManager(itemView.getContext(), 3));
+        childList.setLayoutManager(new GridLayoutManager(itemView.getContext(), 4));
         childList.setAdapter(funGamesAdapter);
     }
 

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

@@ -4,6 +4,7 @@ import android.view.View;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
+import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
@@ -25,15 +26,19 @@ public class SudGameUserListViewHolder extends RecyclerView.ViewHolder {
     private FrameLayout user_layout;
     private RoundedImageView sud_game_user;
     private LinearLayout layout;
+    private TextView userName;
+    private FrameLayout vacancy_sud_gameLayout;
 
     public SudGameUserListViewHolder(@NonNull View itemView) {
         super(itemView);
         vacancy_sud_game = itemView.findViewById(R.id.vacancy_sud_game);
+        vacancy_sud_gameLayout = itemView.findViewById(R.id.vacancy_sud_gameLayout);
         sud_game_user = itemView.findViewById(R.id.sud_game_user);
         user_layout = itemView.findViewById(R.id.user_layout);
         mic_status = itemView.findViewById(R.id.mic_status);
         layout = itemView.findViewById(R.id.layout);
         game_status = itemView.findViewById(R.id.game_status);
+        userName= itemView.findViewById(R.id.userName);
     }
 
     public void upData(SudGameUserModel sudGameUserModel, SudGameUserListAdapter.SudGameSmallCallBack sudGameSmallCallBack, int position) {
@@ -46,7 +51,7 @@ public class SudGameUserListViewHolder extends RecyclerView.ViewHolder {
 //            }
 //        });
         if (sudGameUserModel.isNullUser()) {
-            vacancy_sud_game.setVisibility(View.VISIBLE);
+            vacancy_sud_gameLayout.setVisibility(View.VISIBLE);
             user_layout.setVisibility(View.GONE);
             ViewClicksAntiShake.clicksAntiShake(vacancy_sud_game, new ViewClicksAntiShake.ViewClicksCallBack() {
                 @Override
@@ -55,7 +60,7 @@ public class SudGameUserListViewHolder extends RecyclerView.ViewHolder {
                 }
             });
         } else {
-            vacancy_sud_game.setVisibility(View.GONE);
+            vacancy_sud_gameLayout.setVisibility(View.GONE);
             user_layout.setVisibility(View.VISIBLE);
             ImgLoader.display2(itemView.getContext(), sudGameUserModel.getAvatar(), sud_game_user);
             if (sudGameUserModel.getMicStatus() == 2) {
@@ -71,6 +76,7 @@ public class SudGameUserListViewHolder extends RecyclerView.ViewHolder {
             } else {
                 game_status.setVisibility(View.GONE);
             }
+            userName.setText(sudGameUserModel.getUserNicename());
             ViewClicksAntiShake.clicksAntiShake(user_layout, new ViewClicksAntiShake.ViewClicksCallBack() {
                 @Override
                 public void onViewClicks() {

common/src/main/java/com/yunbao/common/views/weight/NobleNoticeView.java

@@ -27,6 +27,7 @@ import com.opensource.svgaplayer.SVGAVideoEntity;
 import com.yunbao.common.R;
 import com.yunbao.common.glide.ImgLoader;
 import com.yunbao.common.utils.BitmapUtil;
+import com.yunbao.common.utils.L;
 import com.yunbao.common.utils.SVGAViewUtils;
 
 import org.jetbrains.annotations.NotNull;
@@ -56,6 +57,8 @@ public class NobleNoticeView extends FrameLayout {
     private HorizontalScrollView contextLayout;
     private RelativeLayout scrollLayout;
     private ImageView nobleIcon;
+    private String anchorUid;
+    private String mLiveId;
 
     public NobleNoticeView(@NonNull Context context) {
         super(context);
@@ -97,9 +100,11 @@ public class NobleNoticeView extends FrameLayout {
         });
     }
 
-    public NobleNoticeView setRootView(String uHead, String userNameStr, String anchorNicknameStr, String anchorUid) {
+    public NobleNoticeView setRootView(String uHead, String userNameStr, String anchorNicknameStr, String anchorUid,String mLiveId) {
         this.uhead = uHead;
         this.anchorNicknameStr = anchorNicknameStr.trim();
+        this.anchorUid = anchorUid;
+        this.mLiveId = mLiveId;
         userName.setText(userNameStr);
         anchorNickname.setText(anchorNicknameStr.trim());
         if (TextUtils.isEmpty(anchorNicknameStr.trim())) {
@@ -112,6 +117,10 @@ public class NobleNoticeView extends FrameLayout {
             findViewById(R.id.anchor_nickname).setVisibility(VISIBLE);
             openNoble.setText(mContext.getString(R.string.open_noble));
         }
+        if(anchorUid.equals(mLiveId)){
+            L.eSw("showBuyVipMessage:"+anchorUid+"__"+mLiveId);
+            gotoRoomView.setVisibility(GONE);
+        }
         return this;
     }
 
@@ -352,13 +361,15 @@ public class NobleNoticeView extends FrameLayout {
             gotoRoomView.setLayoutParams(layoutParams);
             contextLayout.setLayoutParams(contextLayoutParams);
             if (!TextUtils.isEmpty(anchorNicknameStr)) {
+                if(mLiveId.equals(anchorUid)){
+                    gotoRoomView.setVisibility(GONE);
+                }else{
                     gotoRoomView.setVisibility(VISIBLE);
+                }
                 findViewById(R.id.in).setVisibility(VISIBLE);
                 findViewById(R.id.anchor_nickname).setVisibility(VISIBLE);
             }
             contextLayout.setVisibility(VISIBLE);
-
-
         });
 
     }

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

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

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <corners android:topLeftRadius="12dp" android:topRightRadius="12dp" />
-    <solid android:color="#201E1A" />
+    <solid android:color="#292929" />
 </shape>

common/src/main/res/drawable/dialog_live_sud_game_name_bg.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="7dp" />
+    <solid android:color="#B3414141" />
+</shape>

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/activity_sud_game.xml

@@ -2,6 +2,8 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:background="#201E1A"
     android:orientation="vertical">
 
@@ -14,17 +16,25 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent" />
 
-
     </RelativeLayout>
 
     <LinearLayout
-        android:layout_width="150dp"
+        android:layout_width="138dp"
-        android:layout_height="50dp"
+        android:layout_height="38dp"
         android:layout_marginStart="23dp"
         android:layout_marginTop="48dp"
         android:background="@drawable/bg_live_sud_game_top_new"
         android:gravity="start|center_vertical">
-
+        <com.makeramen.roundedimageview.RoundedImageView
+            android:id="@+id/avatar"
+            android:layout_width="20dp"
+            android:layout_height="20dp"
+            android:layout_marginStart="10dp"
+            android:scaleType="centerCrop"
+            android:src="@mipmap/live_dialog_top_game_icon"
+            android:visibility="visible"
+            tools:visibility="visible"
+            app:riv_oval="true" />
 
         <LinearLayout
             android:layout_width="wrap_content"
@@ -69,30 +79,27 @@
     </LinearLayout>
 
     <LinearLayout
-        android:layout_width="98dp"
+        android:layout_width="88dp"
         android:layout_height="wrap_content"
         android:layout_gravity="end"
-        android:layout_marginTop="49dp"
+        android:layout_marginTop="55dp"
-        android:layout_marginEnd="20dp"
         android:gravity="center_vertical">
 
-
         <ImageView
             android:id="@+id/sud_history"
-            android:layout_width="40dp"
+            android:layout_width="30dp"
-            android:layout_height="40dp"
+            android:layout_height="30dp"
             android:layout_marginEnd="14dp"
             android:src="@mipmap/icon_sud_history_live_new" />
 
-        <TextView
+        <ImageView
             android:id="@+id/exit"
-            android:layout_width="40dp"
+            android:layout_width="30dp"
-            android:layout_height="40dp"
+            android:layout_height="30dp"
-            android:background="@drawable/bg_live_sud_game_back_new"
+            android:background="@mipmap/bg_live_sud_game_back_new2"
             android:gravity="center"
-            android:text="@string/video_exit"
             android:textColor="#FFFFFF"
-            android:textSize="12sp" />
+            android:textSize="8sp" />
     </LinearLayout>
 
     <LinearLayout
@@ -131,10 +138,8 @@
             android:id="@+id/game_seat"
             android:layout_width="34dp"
             android:layout_height="34dp"
-
             android:src="@mipmap/icon_game_seat" />
 
-
     </LinearLayout>
 
     <androidx.recyclerview.widget.RecyclerView
@@ -146,13 +151,13 @@
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="70dp"
+        android:layout_height="50dp"
-        android:layout_marginTop="98dp">
+        android:layout_marginTop="93dp">
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/user_list"
             android:layout_marginStart="11dp"
-            android:layout_marginEnd="20dp"
+            android:layout_marginEnd="12dp"
             android:layout_width="wrap_content"
             android:layout_height="match_parent" />
     </LinearLayout>

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

@@ -0,0 +1,88 @@
+<?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:layout_width="310dp"
+    android:layout_height="260dp"
+    android:gravity="center_horizontal"
+    android:orientation="vertical">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="243dp"
+        android:background="@drawable/guard_buy_tips_bg">
+
+        <ImageView
+            android:id="@+id/btn_cancel"
+            android:layout_width="20dp"
+            android:layout_height="20dp"
+            android:layout_alignParentEnd="true"
+            android:layout_marginTop="10dp"
+            android:layout_marginEnd="10dp"
+            android:src="@mipmap/icon_guard_buy_tips_close" />
+
+        <com.flyjingfish.gradienttextviewlib.GradientTextView
+            android:id="@+id/title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerHorizontal="true"
+            android:layout_marginTop="20dp"
+            android:letterSpacing="0.1"
+            android:text="@string/dialog_tip"
+            android:textSize="22dp"
+            app:gradient_angle="45"
+            app:gradient_endColor="#F9E1AE"
+            app:gradient_startColor="#C28413" />
+
+        <TextView
+            android:id="@+id/content2"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerHorizontal="true"
+            android:layout_centerVertical="true"
+            android:layout_marginStart="20dp"
+            android:layout_marginTop="5dp"
+            android:layout_marginEnd="20dp"
+            android:gravity="center"
+            android:letterSpacing="0.1"
+            android:text="@string/current_guard_expires"
+            android:textColor="#FFE0BF"
+            android:textSize="14dp" />
+    </RelativeLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_alignParentBottom="true"
+        android:gravity="center"
+        android:layout_centerHorizontal="true"
+        android:layout_height="wrap_content">
+
+        <TextView
+            android:id="@+id/btn_cancel1"
+            android:layout_width="100dp"
+            android:gravity="center"
+            android:layout_height="38dp"
+            android:textColor="#F7F7F7"
+            android:textSize="15sp"
+            android:textStyle="bold"
+            android:background="@mipmap/guard_buy_tips_cancel_bg"
+            android:letterSpacing="0.1"
+            android:text="@string/live_guard_buy_coupon_tips_cancel" />
+
+        <TextView
+            android:layout_marginLeft="40dp"
+            android:id="@+id/btn_confirm"
+            android:layout_width="100dp"
+            android:gravity="center"
+            android:layout_height="38dp"
+            android:textColor="#893D0D"
+            android:textSize="15sp"
+            android:textStyle="bold"
+            android:background="@drawable/guard_buy_tips_sure_bg"
+            android:letterSpacing="0.1"
+            android:text="@string/live_guard_buy_coupon_tips_use" />
+
+    </LinearLayout>
+
+
+
+</RelativeLayout>

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

@@ -3,17 +3,19 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="650dp"
+    xmlns:tools="http://schemas.android.com/tools"
     android:background="@drawable/bg_live_sud_list"
     android:orientation="vertical">
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="40dp"
-        android:layout_marginTop="14dp"
+        android:layout_marginTop="10dp"
         android:gravity="center_vertical">
 
         <TextView
             android:id="@+id/game_title"
+            android:visibility="gone"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="15dp"
@@ -22,6 +24,79 @@
             android:textSize="16sp"
             android:textStyle="bold" />
 
+        <LinearLayout
+            android:layout_marginLeft="10dp"
+            android:layout_width="121dp"
+            android:layout_height="39dp"
+            android:padding="2dp"
+            android:background="@drawable/dialog_live_sud_game_name_bg"
+            android:gravity="center_vertical">
+
+            <com.makeramen.roundedimageview.RoundedImageView
+                android:id="@+id/avatar"
+                android:layout_width="20dp"
+                android:layout_height="20dp"
+                android:layout_marginStart="6dp"
+                android:scaleType="centerCrop"
+                android:src="@mipmap/live_dialog_top_game_icon"
+                android:visibility="visible"
+                tools:visibility="visible"
+                app:riv_oval="true" />
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_marginStart="10dp"
+                android:orientation="vertical">
+
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="1dp">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:maxLines="1"
+                        android:ellipsize="end"
+                        android:text="@string/interactive_game_create_room_name"
+                        android:textColor="@color/white"
+                        android:textSize="12sp" />
+
+                    <TextView
+                        android:id="@+id/room_name"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:ellipsize="end"
+                        android:maxWidth="98dp"
+                        android:singleLine="true"
+                        android:textColor="@color/white"
+                        android:textSize="12sp" />
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="2dp">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/interactive_game_create_room_number"
+                        android:textColor="@color/white"
+                        android:textSize="12sp" />
+
+                    <TextView
+                        android:id="@+id/room_number"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textColor="@color/white"
+                        android:textSize="12sp" />
+                </LinearLayout>
+
+            </LinearLayout>
+        </LinearLayout>
+
         <View
             android:layout_width="0dp"
             android:layout_height="1dp"
@@ -42,18 +117,19 @@
             android:src="@mipmap/icon_min_game_new"
             android:visibility="visible" />
 
-        <TextView
+        <ImageView
             android:id="@+id/exit"
             android:layout_width="30dp"
+            android:layout_marginEnd="12dp"
             android:layout_height="30dp"
-            android:background="@drawable/bg_live_sud_game_back_new2"
+            android:background="@mipmap/bg_live_sud_game_back_new2"
             android:gravity="center"
-            android:text="@string/video_exit"
             android:textColor="#FFFFFF"
             android:textSize="8sp" />
     </LinearLayout>
 
     <RelativeLayout
+        android:layout_marginTop="10dp"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
@@ -62,74 +138,7 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent" />
 
-        <LinearLayout
-            android:layout_width="175dp"
-            android:layout_height="50dp"
-            android:layout_marginStart="15dp"
-            android:layout_marginTop="16dp"
-            android:background="@drawable/bg_live_sud_game_top"
-            android:gravity="center_vertical">
 
-            <com.makeramen.roundedimageview.RoundedImageView
-                android:id="@+id/avatar"
-                android:layout_width="35dp"
-                android:layout_height="35dp"
-                android:layout_marginStart="6dp"
-                android:scaleType="centerCrop"
-                android:visibility="gone"
-                app:riv_oval="true" />
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_marginStart="4dp"
-                android:orientation="vertical">
-
-                <LinearLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="4dp">
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/interactive_game_create_room_name"
-                        android:textColor="@color/white"
-                        android:textSize="12sp" />
-
-                    <TextView
-                        android:id="@+id/room_name"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:ellipsize="end"
-                        android:maxWidth="98dp"
-                        android:singleLine="true"
-                        android:textColor="@color/white"
-                        android:textSize="12sp" />
-                </LinearLayout>
-
-                <LinearLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="4dp">
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/interactive_game_create_room_number"
-                        android:textColor="@color/white"
-                        android:textSize="12sp" />
-
-                    <TextView
-                        android:id="@+id/room_number"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:textColor="@color/white"
-                        android:textSize="12sp" />
-                </LinearLayout>
-
-            </LinearLayout>
-        </LinearLayout>
     </RelativeLayout>
 
 </LinearLayout>

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

@@ -3,7 +3,8 @@
     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:id="@+id/root"
     android:layout_marginStart="17dp"
     android:layout_marginEnd="17dp"
     android:background="@drawable/background_order_dialog"
@@ -39,7 +40,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,6 +67,7 @@
                 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"
@@ -75,23 +77,23 @@
         </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"
@@ -103,7 +105,7 @@
                 android:layout_height="match_parent"
                 android:layout_weight="1" />
 
-            <TextView
+            <EditText
                 android:id="@+id/tickets_plus_minus"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
@@ -111,6 +113,8 @@
                 android:background="@null"
                 android:gravity="center"
                 android:imeOptions="actionSend"
+                android:maxEms="4"
+                android:maxLength="4"
                 android:inputType="number"
                 android:singleLine="true"
                 android:text="0"
@@ -129,8 +133,8 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="10dp"
-            android:text="100"
+            android:text="00 = 100"
-            android:textColor="#0D21B2"
+            android:textColor="#000000"
             android:textSize="11sp" />
 
         <ImageView

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

@@ -38,7 +38,9 @@
     <ImageView
         android:id="@+id/btn_close"
         android:layout_width="50dp"
+        android:layout_marginLeft="-35dp"
         android:layout_height="50dp"
+        android:layout_toRightOf="@+id/layout"
         android:paddingBottom="30dp"
         android:src="@mipmap/icon_live_close_3" />
 

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

@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
+    android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_marginTop="12dp"
-    android:gravity="center"
+    android:paddingEnd="7dp"
+    android:gravity="start"
     android:orientation="vertical">
     <!--身份特权-->
 
     <RelativeLayout
-        android:layout_width="40dp"
+        android:layout_width="55dp"
-
         android:layout_height="40dp">
         <!--普通工具合集-->
         <ImageView
@@ -27,7 +27,6 @@
             android:layout_height="6dp"
             android:layout_alignParentEnd="true"
             android:layout_marginTop="3dp"
-
             android:layout_marginEnd="5dp"
             android:background="@drawable/bg_red_point"
             tools:visibility="visible" />
@@ -35,10 +34,11 @@
 
     <TextView
         android:id="@+id/fun_game_name"
-        android:layout_width="wrap_content"
+        android:layout_width="55dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="6dp"
         android:text="@string/guard_guard"
+        android:gravity="center"
         android:textColor="#9A9A9A"
         android:textSize="10sp" />
 

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

@@ -39,9 +39,10 @@
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/child_list"
+        android:layout_marginTop="10dp"
+        android:layout_marginLeft="10dp"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-
         android:layout_marginBottom="16dp" />
 
     <LinearLayout

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

@@ -23,16 +23,13 @@
             android:textColor="#F6F7FB"
             android:textSize="14sp" />
 
-
-
-
     </FrameLayout>
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/child_list"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-
+        android:layout_marginLeft="10dp"
         android:layout_marginBottom="16dp" />
 
     <LinearLayout

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

@@ -16,13 +16,12 @@
 
         <RelativeLayout
             android:layout_width="50dp"
-
             android:layout_height="50dp">
             <!--普通工具合集-->
             <ImageView
                 android:id="@+id/fun_game_pic"
-                android:layout_width="48dp"
+                android:layout_width="38dp"
-                android:layout_height="48dp"
+                android:layout_height="38dp"
                 android:layout_centerHorizontal="true"
                 android:layout_centerVertical="true"
                 android:src="@mipmap/live_more_icon_guard" />
@@ -63,6 +62,6 @@
         android:maxLines="1"
         android:text="@string/guard_guard"
         android:textColor="#9A9A9A"
-        android:textSize="14sp" />
+        android:textSize="10sp" />
 
 </LinearLayout>

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

@@ -1,17 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
+    android:layout_width="50dp"
     android:layout_height="wrap_content"
     android:layout_marginTop="8dp"
-    android:paddingEnd="30dp"
     android:clickable="true"
     android:gravity="center"
     android:orientation="vertical">
 
     <ImageView
         android:id="@+id/fun_game_pic"
-        android:layout_width="48dp"
+        android:layout_width="38dp"
-        android:layout_height="48dp"
+        android:layout_height="38dp"
         android:src="@mipmap/live_more_icon_guard" />
 
     <TextView
@@ -21,6 +20,6 @@
         android:layout_marginTop="2dp"
         android:text="@string/guard_guard"
         android:textColor="#9A9A9A"
-        android:textSize="14sp" />
+        android:textSize="10sp" />
 
 </LinearLayout>

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

@@ -4,63 +4,70 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:layout_marginTop="8dp"
     android:layout_marginEnd="7dp"
-    android:gravity="center"
+    android:gravity="start"
     android:orientation="vertical">
 
-    <FrameLayout
+    <LinearLayout
-        android:layout_width="60dp"
+        android:layout_marginTop="15dp"
+        android:layout_width="wrap_content"
+        android:orientation="vertical"
         android:layout_height="wrap_content">
 
-        <ImageView
+        <RelativeLayout
+            android:layout_width="55dp"
+            android:layout_height="wrap_content">
+
+            <com.makeramen.roundedimageview.RoundedImageView
                 android:id="@+id/fun_game_pic"
-            android:layout_width="48dp"
+                android:layout_width="38dp"
-            android:layout_height="48dp"
+                android:layout_height="38dp"
-            android:src="@mipmap/live_more_icon_guard" />
+                android:layout_centerInParent="true"
+                android:layout_centerHorizontal="true"
+                android:layout_centerVertical="true"
+                android:scaleType="centerCrop"
+                android:src="@mipmap/live_more_icon_guard"
+                android:visibility="visible"
+                app:riv_oval="true" />
 
             <View
                 android:id="@+id/red_point"
                 android:layout_width="10dp"
                 android:layout_height="10dp"
                 android:layout_gravity="end"
-            android:layout_marginTop="5dp"
+                android:layout_alignParentEnd="true"
-            android:layout_marginEnd="5dp"
                 android:background="@drawable/bg_red_point"
                 android:visibility="gone"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
-            tools:visibility="gone" />
+                tools:visibility="visible" />
 
             <ImageView
                 android:id="@+id/icon_new_game"
-            android:layout_width="26dp"
+                android:layout_width="23dp"
-            android:layout_height="13dp"
+                android:layout_height="10dp"
                 android:layout_gravity="end"
-            android:layout_marginTop="2dp"
+                android:layout_alignParentEnd="true"
                 android:visibility="gone"
-            android:layout_marginEnd="5dp"
+                tools:visibility="visible"
                 android:src="@mipmap/icon_new_game" />
-    </FrameLayout>
+        </RelativeLayout>
-
-
         <TextView
             android:id="@+id/fun_game_name"
             android:layout_width="match_parent"
-        android:gravity="center"
-        android:layout_marginStart="1dp"
-        android:layout_marginEnd="1dp"
             android:layout_height="wrap_content"
             android:layout_marginTop="2dp"
+            android:gravity="center"
             android:maxLines="1"
             android:text="@string/guard_guard"
             android:textColor="#9A9A9A"
-
             app:autoSizeMaxTextSize="14sp"
             app:autoSizeMinTextSize="5sp"
             app:autoSizeStepGranularity="1sp"
             app:autoSizeTextType="uniform"
+            android:textSize="10sp" />
+    </LinearLayout>
+
 
-        android:textSize="14sp" />
 
 </LinearLayout>

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

@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginStart="24dp"
+    android:layout_marginStart="15dp"
     android:orientation="vertical">
 
     <FrameLayout

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

@@ -2,12 +2,12 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginStart="24dp"
     android:orientation="vertical">
 
     <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_marginStart="15dp"
         android:layout_marginTop="14dp">
 
         <TextView
@@ -23,5 +23,7 @@
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/child_list"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content" />
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="5dp"
+        android:layout_marginTop="10dp" />
 </LinearLayout>

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

@@ -2,12 +2,12 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginStart="24dp"
     android:orientation="vertical">
 
     <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_marginStart="15dp"
         android:layout_marginTop="14dp">
 
         <TextView
@@ -23,7 +23,10 @@
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/child_list"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content" />
+        android:layout_marginTop="15dp"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="5dp"
+        android:overScrollMode="never" />
 
     <LinearLayout
         android:id="@+id/select_more_layout"

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

@@ -26,6 +26,7 @@
     </FrameLayout>
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/child_list"
+        android:layout_marginLeft="10dp"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="16dp" />

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

@@ -3,50 +3,73 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/layout"
     android:layout_width="wrap_content"
-    android:layout_height="match_parent"
+    android:layout_height="wrap_content"
     android:gravity="center_vertical"
     android:orientation="vertical">
 
+    <FrameLayout
+        android:id="@+id/vacancy_sud_gameLayout"
+        android:layout_width="wrap_content"
+        android:layout_height="50dp"
+        android:visibility="visible">
+
         <ImageView
             android:id="@+id/vacancy_sud_game"
-        android:layout_width="45dp"
+            android:layout_width="34dp"
-        android:layout_height="45dp"
+            android:layout_height="50dp"
-        android:layout_marginStart="12dp"
+            android:paddingBottom="5dp"
-        android:src="@mipmap/icon_vacancy_sud_game"
+            android:layout_marginStart="15dp"
-        android:visibility="visible" />
+            android:src="@mipmap/icon_vacancy_sud_game" />
+
+    </FrameLayout>
 
     <FrameLayout
         android:id="@+id/user_layout"
         android:layout_width="wrap_content"
-        android:layout_height="60dp"
+        android:layout_height="50dp"
         android:visibility="visible">
 
-
         <com.makeramen.roundedimageview.RoundedImageView
             android:id="@+id/sud_game_user"
-            android:layout_width="45dp"
+            android:layout_width="34dp"
-            android:layout_height="45dp"
+            android:layout_height="34dp"
-            android:layout_gravity="center_vertical"
+            android:layout_marginTop="5dp"
-            android:layout_marginStart="12dp"
+            android:layout_marginStart="15dp"
             android:scaleType="centerCrop"
             android:src="@mipmap/icon_vacancy_sud_game"
             app:riv_oval="true" />
 
         <ImageView
             android:id="@+id/mic_status"
-            android:layout_width="15dp"
+            android:layout_width="9dp"
-            android:layout_height="15dp"
+            android:layout_height="9dp"
-            android:layout_marginStart="5dp"
+            android:layout_marginTop="3dp"
-            android:layout_marginTop="5dp"
+            android:layout_marginStart="15dp"
             android:src="@mipmap/icon_game_close_wheat_mute" />
 
         <ImageView
             android:id="@+id/game_status"
-            android:layout_width="18dp"
+            android:layout_width="17dp"
-            android:layout_height="14dp"
+            android:layout_height="11dp"
-            android:layout_marginStart="5dp"
+            android:layout_marginTop="31dp"
-            android:layout_gravity="bottom|center_horizontal"
+            android:layout_marginStart="8dp"
-
+            android:layout_gravity="center_horizontal"
             android:src="@mipmap/icon_game_status" />
+
+        <TextView
+            android:id="@+id/userName"
+            android:text="用户名"
+            android:layout_marginTop="40dp"
+            android:ellipsize="end"
+            android:visibility="gone"
+            android:maxLines="1"
+            android:gravity="center"
+            android:textColor="#333333"
+            android:layout_marginStart="8dp"
+            android:textSize="8dp"
+            android:layout_gravity="center_horizontal"
+            android:layout_width="34dp"
+            android:layout_height="wrap_content"/>
+
     </FrameLayout>
 </LinearLayout>

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

@@ -1332,7 +1332,7 @@ Limited ride And limited avatar frame</string>
     <string name="interactive_game_room_all">All Game</string>
     <string name="interactive_game_create_room">Create a room</string>
     <string name="interactive_game_create_room_name">"Room Name: "</string>
-    <string name="interactive_game_create_room_number">Room ID:</string>
+    <string name="interactive_game_create_room_number">ID:</string>
     <string name="interactive_game_create_room_name_input">Please enter a room name</string>
     <string name="interactive_game_create_game_type">Game type:</string>
     <string name="interactive_game_create_game_sill">Game threshold:</string>

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

@@ -1329,7 +1329,7 @@
     <string name="interactive_game_room_all">所有遊戲</string>
     <string name="interactive_game_create_room">創建房間</string>
     <string name="interactive_game_create_room_name">房間名稱：</string>
-    <string name="interactive_game_create_room_number">房間號：</string>
+    <string name="interactive_game_create_room_number">ID：</string>
     <string name="interactive_game_create_room_name_input">請輸入房間名</string>
     <string name="interactive_game_create_game_type">游戲類型：</string>
     <string name="interactive_game_create_game_sill">游戲門檻：</string>
@@ -1501,4 +1501,6 @@
     <string name="main_type_theater">短劇</string>
     <string name="prank_complete">完成*1</string>
     <string name="pking_over">主播正在PK，稍後再試</string>
+    <string name="live_guard_buy_coupon_tips_use">使用</string>
+    <string name="live_guard_buy_coupon_tips_cancel">不使用</string>
 </resources>

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

@@ -1328,7 +1328,7 @@
     <string name="interactive_game_room_all">所有遊戲</string>
     <string name="interactive_game_create_room">創建房間</string>
     <string name="interactive_game_create_room_name">房間名稱：</string>
-    <string name="interactive_game_create_room_number">房間號：</string>
+    <string name="interactive_game_create_room_number">ID：</string>
     <string name="interactive_game_create_room_name_input">請輸入房間名</string>
     <string name="interactive_game_create_game_type">游戲類型：</string>
     <string name="interactive_game_create_game_sill">游戲門檻：</string>
@@ -1500,4 +1500,6 @@
     <string name="main_type_theater">短劇</string>
     <string name="prank_complete">完成*1</string>
     <string name="pking_over">主播正在PK，稍後再試</string>
+    <string name="live_guard_buy_coupon_tips_use">使用</string>
+    <string name="live_guard_buy_coupon_tips_cancel">不使用</string>
 </resources>

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

@@ -1327,7 +1327,7 @@
     <string name="interactive_game_room_all">所有遊戲</string>
     <string name="interactive_game_create_room">創建房間</string>
     <string name="interactive_game_create_room_name">房間名稱：</string>
-    <string name="interactive_game_create_room_number">房間號：</string>
+    <string name="interactive_game_create_room_number">ID：</string>
     <string name="interactive_game_create_room_name_input">請輸入房間名</string>
     <string name="interactive_game_create_game_type">游戲類型：</string>
     <string name="interactive_game_create_game_sill">游戲門檻：</string>
@@ -1497,5 +1497,7 @@
     <string name="main_type_theater">短劇</string>
     <string name="prank_complete">完成*1</string>
     <string name="pking_over">主播正在PK，稍後再試</string>
+    <string name="live_guard_buy_coupon_tips_use">使用</string>
+    <string name="live_guard_buy_coupon_tips_cancel">不使用</string>
 
 </resources>

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

@@ -1335,7 +1335,7 @@ Limited ride And limited avatar frame</string>
     <string name="interactive_game_room_all">All Game</string>
     <string name="interactive_game_create_room">Create a room</string>
     <string name="interactive_game_create_room_name">"Room Name: "</string>
-    <string name="interactive_game_create_room_number">Room ID:</string>
+    <string name="interactive_game_create_room_number">ID:</string>
     <string name="interactive_game_create_room_name_input">Please enter a room name</string>
     <string name="interactive_game_create_game_type">Game type:</string>
     <string name="interactive_game_create_game_sill">Game threshold:</string>
@@ -1506,4 +1506,6 @@ Limited ride And limited avatar frame</string>
     <string name="main_type_theater" >Theater</string>
     <string name="pking_over">The anchor is in PK, please try again later</string>
     <string name="prank_complete">once</string>
+    <string name="live_guard_buy_coupon_tips_use">Use</string>
+    <string name="live_guard_buy_coupon_tips_cancel">Not use</string>
 </resources>

config.gradle

@@ -4,16 +4,16 @@ ext {
             buildToolsVersion: "29.0.2",
             minSdkVersion    : 21,
             targetSdkVersion : 33,
-            versionCode      : 681,
+            versionCode      : 690,
             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",
 
             //百度语音识别
 

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/activity/LiveAudienceActivity.java

@@ -103,6 +103,7 @@ import com.yunbao.common.utils.LiveRoomCheckLivePresenter;
 import com.yunbao.common.utils.MicStatusManager;
 import com.yunbao.common.utils.ProcessResultUtil;
 import com.yunbao.common.utils.RouteUtil;
+import com.yunbao.common.utils.SpUtil;
 import com.yunbao.common.utils.StringUtil;
 import com.yunbao.common.utils.ToastUtil;
 import com.yunbao.common.utils.WordUtil;

live/src/main/java/com/yunbao/live/activity/SudRyGameActivity.java

@@ -448,7 +448,7 @@ public class SudRyGameActivity extends AbsActivity implements GameRyMicManager.M
         // 设置游戏安全操作区域
         GameViewInfoModel.GameViewRectModel gameViewRectModel = new GameViewInfoModel.GameViewRectModel();
         gameViewRectModel.left = 0;
-        gameViewRectModel.top = DpUtil.dp2px(155);
+        gameViewRectModel.top = DpUtil.dp2px(180);
         gameViewRectModel.right = 0;
         gameViewRectModel.bottom = DpUtil.dp2px(155);
         gameViewModel.gameViewRectModel = gameViewRectModel;

live/src/main/java/com/yunbao/live/activity/SudSwGameActivity.java

@@ -496,7 +496,7 @@ public class SudSwGameActivity extends AbsActivity implements GameSwMicManager.M
         // 设置游戏安全操作区域
         GameViewInfoModel.GameViewRectModel gameViewRectModel = new GameViewInfoModel.GameViewRectModel();
         gameViewRectModel.left = 0;
-        gameViewRectModel.top = DpUtil.dp2px(155);
+        gameViewRectModel.top = DpUtil.dp2px(180); //游戏安全区域
         gameViewRectModel.right = 0;
         gameViewRectModel.bottom = DpUtil.dp2px(155);
         gameViewModel.gameViewRectModel = gameViewRectModel;

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

@@ -41,7 +41,9 @@ import com.yunbao.common.bean.GuardUserInfoModel;
 import com.yunbao.common.bean.IMLoginModel;
 import com.yunbao.common.custom.LiveGuardScalePageTransformer;
 import com.yunbao.common.dialog.AbsDialogPopupWindow;
+import com.yunbao.common.dialog.GuardBuyCouponTipsDialog;
 import com.yunbao.common.dialog.GuardBuyTipsDialog;
+import com.yunbao.common.dialog.GuardBuyTipsNewDialog;
 import com.yunbao.common.dialog.GuardUpgradePopup;
 import com.yunbao.common.dialog.LiveBuyGuardSelectPopup;
 import com.yunbao.common.glide.ImgLoader;
@@ -247,6 +249,9 @@ public class LiveBuyGuardDialog extends AbsDialogPopupWindow {
                             : WordUtil.getNewString(R.string.open_the_god_guard));
                 }
                 guardPriceModel = price.get(0);
+                discountPrice.setTag("1");
+                discount.setTag(guardPriceModel.getCouponId());
+
                 if (TextUtils.isEmpty(guardPriceModel.getDiscountPrice())) {
                     discountPrice.setText(String.valueOf(guardPriceModel.getOriginalPrice()));
                     originalPrice.setVisibility(GONE);
@@ -308,6 +313,8 @@ public class LiveBuyGuardDialog extends AbsDialogPopupWindow {
                                             @Override
                                             public void onLiveBuyGuardSelectListener(GuardPriceModel model) {
                                                 guardPriceModel = model;
+                                                discountPrice.setTag(String.valueOf(guardPriceModel.getPriceKey()));
+                                                discount.setTag(guardPriceModel.getCouponId());
                                                 if (TextUtils.isEmpty(guardPriceModel.getDiscountPrice())) {
                                                     discountPrice.setText(String.valueOf(guardPriceModel.getOriginalPrice()));
                                                     originalPrice.setVisibility(GONE);
@@ -340,10 +347,99 @@ public class LiveBuyGuardDialog extends AbsDialogPopupWindow {
         ViewClicksAntiShake.clicksAntiShake(openTheGuard, new ViewClicksAntiShake.ViewClicksCallBack() {
             @Override
             public void onViewClicks() {
+                if (TextUtils.equals(mGuardUserInfoModel.getIsOpen(), "1") &&
+                        dataTipModel.getGuardType() < mGuardUserInfoModel.getGuardType()) {
+                    //开通比当前低级的的守护
+                    GuardBuyTipsNewDialog.showBuyOrRenewDialog(mContext);
+                }else{
+                    //判断是否选择的是一个月
+                    if(discountPrice.getTag().equals("1")&&!discount.getTag().toString().equals("0")){
+                        GuardBuyCouponTipsDialog.showBuyOrRenewDialog(mContext, WordUtil.isNewZh() ? guardPriceModel.getCouponDiscount() : guardPriceModel.getCouponDiscountEn(), guardPriceModel.getCouponDiscountPrice(), dataTipModel.getGuardName(), new DialogUitl.SimpleCallback3() {
+                            @Override
+                            public void onConfirmClick(Dialog dialog) {
+                                bugGurd(true);
+                            }
+
+                            @Override
+                            public void onCancel() {
+                                bugGurd(false);
+                            }
+                        });
+                    }else{
+                        bugGurd(false);
+                    }
+                }
+                switch (dataTipModel.getGuardType()) {
+                    case 1:
+                        MobclickAgent.onEvent(mContext, "star_guardian_renew_btn", "星之守护开通/续费按钮点击次数及人数");
+                        break;
+                    case 2:
+                        MobclickAgent.onEvent(mContext, "king_guardian_renew_btn", "王之守护开通/续费按钮点击次数及人数");
+                        break;
+                    case 3:
+                        MobclickAgent.onEvent(mContext, "god_guardian_renew_btn", "神之守护开通/续费按钮点击次数及人数");
+                        break;
+
+                }
+
+
+//                new XPopup.Builder(mContext)
+//                        .asCustom(new DragonSendsMoneyPopup(mContext))
+//                        .show();
+            }
+        });
+        LiveNetManager.get(getContext())
+                .checkUpgrades(mLiveUid, new com.yunbao.common.http.base.HttpCallback<CheckUpgradesModel>() {
+                    @Override
+                    public void onSuccess(CheckUpgradesModel data) {
+                        if (!data.getRewards().isEmpty())
+                            new XPopup.Builder(mContext)
+                                    .asCustom(new GuardUpgradePopup(mContext, mLiveUid, data, new GuardUpgradePopup.GuardUpgradeCallBack() {
+                                        @Override
+                                        public void onGuardLevel() {
+                                            LiveBuyGuardDialog.this.dismiss();
+                                        }
+                                    }))
+                                    .show();
+                    }
+
+                    @Override
+                    public void onError(String error) {
+
+                    }
+                });
+        ViewClicksAntiShake.clicksAntiShake(findViewById(R.id.guard_rule), new ViewClicksAntiShake.ViewClicksCallBack() {
+            @Override
+            public void onViewClicks() {
+                StringBuffer htmlUrl = new StringBuffer();
+                IMLoginModel userInfo = IMLoginManager.get(mContext).getUserInfo();
+                htmlUrl.append(CommonAppConfig.HOST)
+                        .append("/h5/Guard/rules.html")
+                        .append("?token=")
+                        .append(userInfo.getToken())
+                        .append("&uid=")
+                        .append(userInfo.getId())
+                        .append("&anchorUid=")
+                        .append(mLiveUid)
+                        .append("&isZh=")
+                        .append(((WordUtil.isNewZh()) ? "1" : "0"));
+
+                Bundle bundle = new Bundle();
+                bundle.putString("url", htmlUrl.toString());
+                bundle.putInt("height", DeviceUtils.getScreenHeight(getActivity()) / 5 * 3);
+                LiveHDDialogFragment fragment = new LiveHDDialogFragment();
+                fragment.setArguments(bundle);
+                fragment.show(((LiveAudienceActivity) mContext).getSupportFragmentManager(), "LiveHDDialogFragment");
+            }
+        });
+
+    }
+
+    private void bugGurd(boolean isCoupon) {
         if (TextUtils.equals(userInfo.getIsOpen(), "1")) {
             GuardBuyTipsDialog
                     .showBuyOrRenewDialog(mContext,
-                                    discountPrice.getText().toString(),
+                            isCoupon?guardPriceModel.getCouponDiscountPrice():discountPrice.getText().toString(),
                             dataTipModel.getGuardName(), dataTipModel.isOpen(),
                             mGuardUserInfoModel, dataTipModel.getGuardType(), new DialogUitl.SimpleCallback2() {
                                 @Override
@@ -357,7 +453,7 @@ public class LiveBuyGuardDialog extends AbsDialogPopupWindow {
                                     LiveNetManager.get(activity)
                                             .openGuard(mLiveUid,
                                                     String.valueOf(dataTipModel.getGuardType()),
-                                                            String.valueOf(guardPriceModel.getPriceKey()), mStream, new HttpCallback<String>() {
+                                                    String.valueOf(guardPriceModel.getPriceKey()), mStream,isCoupon?"1":"0",discount.getTag().toString(), new HttpCallback<String>() {
                                                         @Override
                                                         public void onSuccess(String data) {
                                                             if (TextUtils.equals(data, "22")) {
@@ -430,7 +526,7 @@ public class LiveBuyGuardDialog extends AbsDialogPopupWindow {
                                     public void onConfirmClick(Dialog dialog, String content) {
                                         GuardBuyTipsDialog
                                                 .showBuyOrRenewDialog(mContext,
-                                                                discountPrice.getText().toString(),
+                                                        isCoupon?guardPriceModel.getCouponDiscountPrice():discountPrice.getText().toString(),
                                                         dataTipModel.getGuardName(), dataTipModel.isOpen(),
                                                         mGuardUserInfoModel, dataTipModel.getGuardType(), new DialogUitl.SimpleCallback2() {
                                                             @Override
@@ -444,7 +540,7 @@ public class LiveBuyGuardDialog extends AbsDialogPopupWindow {
                                                                 LiveNetManager.get(activity)
                                                                         .openGuard(mLiveUid,
                                                                                 String.valueOf(dataTipModel.getGuardType()),
-                                                                                        String.valueOf(guardPriceModel.getPriceKey()), mStream, new HttpCallback<String>() {
+                                                                                String.valueOf(guardPriceModel.getPriceKey()), mStream,isCoupon?"1":"0",discount.getTag().toString(), new HttpCallback<String>() {
                                                                                     @Override
                                                                                     public void onSuccess(String data) {
                                                                                         if (TextUtils.equals(data, "22")) {
@@ -485,7 +581,7 @@ public class LiveBuyGuardDialog extends AbsDialogPopupWindow {
             }else {
                 GuardBuyTipsDialog
                         .showBuyOrRenewDialog(mContext,
-                                        discountPrice.getText().toString(),
+                                isCoupon?guardPriceModel.getCouponDiscountPrice():discountPrice.getText().toString(),
                                 dataTipModel.getGuardName(), dataTipModel.isOpen(),
                                 mGuardUserInfoModel, dataTipModel.getGuardType(), new DialogUitl.SimpleCallback2() {
                                     @Override
@@ -499,7 +595,7 @@ public class LiveBuyGuardDialog extends AbsDialogPopupWindow {
                                         LiveNetManager.get(activity)
                                                 .openGuard(mLiveUid,
                                                         String.valueOf(dataTipModel.getGuardType()),
-                                                                String.valueOf(guardPriceModel.getPriceKey()), mStream, new HttpCallback<String>() {
+                                                        String.valueOf(guardPriceModel.getPriceKey()), mStream,isCoupon?"1":"0",discount.getTag().toString(), new HttpCallback<String>() {
                                                             @Override
                                                             public void onSuccess(String data) {
                                                                 if (TextUtils.equals(data, "22")) {
@@ -539,70 +635,6 @@ public class LiveBuyGuardDialog extends AbsDialogPopupWindow {
 
 
         }
-                switch (dataTipModel.getGuardType()) {
-                    case 1:
-                        MobclickAgent.onEvent(mContext, "star_guardian_renew_btn", "星之守护开通/续费按钮点击次数及人数");
-                        break;
-                    case 2:
-                        MobclickAgent.onEvent(mContext, "king_guardian_renew_btn", "王之守护开通/续费按钮点击次数及人数");
-                        break;
-                    case 3:
-                        MobclickAgent.onEvent(mContext, "god_guardian_renew_btn", "神之守护开通/续费按钮点击次数及人数");
-                        break;
-
-                }
-
-
-//                new XPopup.Builder(mContext)
-//                        .asCustom(new DragonSendsMoneyPopup(mContext))
-//                        .show();
-            }
-        });
-        LiveNetManager.get(getContext())
-                .checkUpgrades(mLiveUid, new com.yunbao.common.http.base.HttpCallback<CheckUpgradesModel>() {
-                    @Override
-                    public void onSuccess(CheckUpgradesModel data) {
-                        if (!data.getRewards().isEmpty())
-                            new XPopup.Builder(mContext)
-                                    .asCustom(new GuardUpgradePopup(mContext, mLiveUid, data, new GuardUpgradePopup.GuardUpgradeCallBack() {
-                                        @Override
-                                        public void onGuardLevel() {
-                                            LiveBuyGuardDialog.this.dismiss();
-                                        }
-                                    }))
-                                    .show();
-                    }
-
-                    @Override
-                    public void onError(String error) {
-
-                    }
-                });
-        ViewClicksAntiShake.clicksAntiShake(findViewById(R.id.guard_rule), new ViewClicksAntiShake.ViewClicksCallBack() {
-            @Override
-            public void onViewClicks() {
-                StringBuffer htmlUrl = new StringBuffer();
-                IMLoginModel userInfo = IMLoginManager.get(mContext).getUserInfo();
-                htmlUrl.append(CommonAppConfig.HOST)
-                        .append("/h5/Guard/rules.html")
-                        .append("?token=")
-                        .append(userInfo.getToken())
-                        .append("&uid=")
-                        .append(userInfo.getId())
-                        .append("&anchorUid=")
-                        .append(mLiveUid)
-                        .append("&isZh=")
-                        .append(((WordUtil.isNewZh()) ? "1" : "0"));
-
-                Bundle bundle = new Bundle();
-                bundle.putString("url", htmlUrl.toString());
-                bundle.putInt("height", DeviceUtils.getScreenHeight(getActivity()) / 5 * 3);
-                LiveHDDialogFragment fragment = new LiveHDDialogFragment();
-                fragment.setArguments(bundle);
-                fragment.show(((LiveAudienceActivity) mContext).getSupportFragmentManager(), "LiveHDDialogFragment");
-            }
-        });
-
     }
 
     private void closeAnimSudGameListEvent(View view) {

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/presenter/LiveGiftAnimPresenter.java

@@ -153,6 +153,8 @@ public class LiveGiftAnimPresenter {
     private ObjectAnimator mGifGiftTipShowAnimatorBuyVip;
     private ObjectAnimator mGifGiftTipHideAnimatorBuyVip;
 
+    private ObjectAnimator mGifGiftTipShowAnimatorfull_sud_layout_name;
+
 
     private LiveGiftViewHolder[] mLiveGiftViewHolders;
     private ConcurrentLinkedQueue<LiveReceiveGiftBean> mQueue;
@@ -276,6 +278,7 @@ public class LiveGiftAnimPresenter {
 
         mFrameImageView = (FrameImageView) v.findViewById(R.id.all_frame_img);
         full_service_notice_new = v.findViewById(R.id.full_service_notice_new);
+        full_live_room_game_view = v.findViewById(R.id.sud_layout_name);
         full_service_notice_new_bg = v.findViewById(R.id.full_service_notice_new_bg);
         full_service_notice_new_icon = v.findViewById(R.id.full_service_notice_new_icon);
         full_service_notice_new_text = v.findViewById(R.id.full_service_notice_new_text);
@@ -622,6 +625,15 @@ public class LiveGiftAnimPresenter {
         });
     }
 
+
+    public void startGiftTipAnimatormSud(){
+        mDp500 = DpUtil.dp2px(-300);
+        mGifGiftTipShowAnimatorfull_sud_layout_name = ObjectAnimator.ofFloat(full_live_room_game_view, "translationX", mDp500, 0);
+        mGifGiftTipShowAnimatorfull_sud_layout_name.setDuration(600);
+        mGifGiftTipShowAnimatorfull_sud_layout_name.setInterpolator(new LinearInterpolator());
+        mGifGiftTipShowAnimatorfull_sud_layout_name.start();
+    }
+
     private void setGitTipAnimatormGifGiftTipShowAnimatorfull_service_notice_new() {
         mDp500 = DpUtil.dp2px(500);
         mGifGiftTipShowAnimatorfull_service_notice_new = ObjectAnimator.ofFloat(full_service_notice_new, "translationX", mDp500, 0);
@@ -656,6 +668,9 @@ public class LiveGiftAnimPresenter {
     }
 
 
+
+
+
     /**
      * 釋放全局通知
      */
@@ -1071,8 +1086,13 @@ public class LiveGiftAnimPresenter {
             mGifGiftTipGroupAllServer.setAlpha(1f);
             mGifGiftTipGroupAllServer.setVisibility(View.VISIBLE);
             textRender.render(mContext, mGifGiftTipAllServer, mTempGifGiftBean.getGiftIcon(), mTempGifGiftBean.getUserNiceName(), mAncherName, mTempGifGiftBean.getGiftName(), 1, mWindowManager, "");
+            if(CommonAppConfig.getInstance().getUid().equals(mLiveUid)){
+                mIvLook.setVisibility(View.GONE);
+            }else{
                 mIvLook.setVisibility(View.VISIBLE);
+            }
             mIvLook.setTag(bean);
+           mIvLook.setVisibility(mLiveUid.equals(bean.getUid())?View.GONE:View.VISIBLE);
             mGifGiftTipShowAnimatorAllServer.start();
 
         }
@@ -1116,7 +1136,11 @@ public class LiveGiftAnimPresenter {
                         break;
                 }
                 mIvLook.setText(R.string.participate_in);
+                if(CommonAppConfig.getInstance().getUid().equals(mLiveUid)){
+                    mIvLook.setVisibility(View.GONE);
+                }else{
                     mIvLook.setVisibility(View.VISIBLE);
+                }
                 superNotice.setBackgroundResource(R.mipmap.icon_blind_box_headlines);
                 textRender.blindBoxText(mContext, mGifGiftTipAllServer, serverNotifyEvent);
             }
@@ -1160,6 +1184,7 @@ public class LiveGiftAnimPresenter {
     AllServerNotifyFFGGGDJANEvent notifyFFGGGDJANEvent;
     View iv_look_full_service_notice_new3;
     ImageView iv_look_full_service_notice_new2;
+    View full_live_room_game_view;
 
     public void showAllServerNotifyFFGGGD(AllServerNotifyFFGGGDJANEvent event, boolean showB) {
         if (TextUtils.isEmpty(event.getBackgroundImage())) return;
@@ -1206,10 +1231,10 @@ public class LiveGiftAnimPresenter {
                 int unameSize = textMsg.length();
                 builder.setSpan(new ForegroundColorSpan(Color.parseColor(dto.getColour())), unameIndexOf, unameIndexOf + unameSize, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
             }
-            if (!showB) {
+            if (!showB ||CommonAppConfig.getInstance().getUid().equals(mLiveUid)) {
                 iv_look_full_service_notice_new3.setVisibility(View.GONE);
             } else {
-                if (TextUtils.equals(event.getJumpType(), "0")) {
+                if (TextUtils.equals(event.getJumpType(), "0")||CommonAppConfig.getInstance().getUid().equals(mLiveUid)) {
                     iv_look_full_service_notice_new3.setVisibility(View.GONE);
                 } else {
                     iv_look_full_service_notice_new3.setVisibility(View.VISIBLE);
@@ -1299,9 +1324,13 @@ public class LiveGiftAnimPresenter {
             if (!TextUtils.isEmpty(event.getIsOnlookers()) && TextUtils.equals("0", event.getIsOnlookers())) {
                 mIvLookBuyGuardNew.setVisibility(View.GONE);
             } else {
+                if(event.getLiveuid().equals(mLiveUid)||CommonAppConfig.getInstance().getUid().equals(mLiveUid)){
+                    mIvLookBuyGuardNew.setVisibility(View.GONE);
+                }else{
                     mIvLookBuyGuardNew.setVisibility(View.VISIBLE);
                     mIvLookBuyGuardNew.setText(WordUtil.isNewZh() ? "圍觀" : "Views");
                 }
+            }
             mGifGiftTipShowAnimatorBuyGuardNew.start();
 
 
@@ -1365,6 +1394,7 @@ public class LiveGiftAnimPresenter {
 
     //购买守护 全服通知
     public void showBuyGuardGiftAnim(LiveReceiveGiftBean bean) {
+        mIvLookBuyGuard.setVisibility(mLiveUid.equals(bean.getUid())?View.GONE:View.VISIBLE);
         if (bean.ismTypeBuyGuard()) {
             mTempGifGiftBean = bean;
             if (mShowAllServer) {
@@ -1502,6 +1532,8 @@ public class LiveGiftAnimPresenter {
                 iv_look_buy_vip.setVisibility(View.GONE);
             }
 
+            iv_look_buy_vip.setVisibility(mLiveUid.equals(bean.getUid())?View.GONE:View.VISIBLE);
+
             mGifGiftTipBuyVip.setSelected(false);
 
             if (!"0".equals(bean.getmLiveUId())) {

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,9 +729,9 @@ 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);
-        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));
+        iconSudClose = (ImageView) findViewById(R.id.iconSudClose);
-        sud_layout_name.setVisibility(View.VISIBLE);
+        //sud_layout_name.setVisibility(View.VISIBLE);
         ViewClicksAntiShake.clicksAntiShake(sud_layout_name, new ViewClicksAntiShake.ViewClicksCallBack() {
             @Override
             public void onViewClicks() {
@@ -748,8 +750,34 @@ 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);
+        sud_layout_name.post(new Runnable() {
+            @Override
+            public void run() {
+                RelativeLayout.LayoutParams params1 = (RelativeLayout.LayoutParams) sud_layout_name.getLayoutParams();
+                params1.width = mChatRecyclerView.getWidth()-DpUtil.dp2px(85);
+                sud_layout_name.setLayoutParams(params1);
+            }
+        });
+
+        new Handler().postDelayed(new Runnable() {
+            @Override
+            public void run() {
+                sud_text_name.setText(WordUtil.isNewZh() ? String.format("主播创建了【%s】房间，快来与主播同玩~", sudName) : String.format("The anchor created a 【%s】 room", sudName));
+                sud_layout_name.setVisibility(View.VISIBLE);
+                mLiveGiftAnimPresenter = new LiveGiftAnimPresenter(mContext, mContentView, mGifImageView, mSVGAImageView, mLiveGiftPrizePoolContainer, windowManager);
+                mLiveGiftAnimPresenter.startGiftTipAnimatormSud();
+            }
+        },2000);
+
+
     }
 
     private View sudGameMin;
@@ -2073,12 +2101,12 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
                 redPacket.setVisibility(View.GONE);
                 if (dragonImmediateParticipation.getVisibility() == View.VISIBLE) {
                     RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) dragonImmediateParticipation.getLayoutParams();
-                    layoutParams.topMargin = DpUtil.dp2px(110);
+                    layoutParams.topMargin = DpUtil.dp2px(160);
                     dragonImmediateParticipation.setLayoutParams(layoutParams);
                 }
                 if (dragonImmediateParticipationTime.getVisibility() == View.VISIBLE) {
                     RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) dragonImmediateParticipation.getLayoutParams();
-                    layoutParams.topMargin = DpUtil.dp2px(110);
+                    layoutParams.topMargin = DpUtil.dp2px(160);
                     dragonImmediateParticipationTime.setLayoutParams(layoutParams);
                 }
                 anchorTimeHandler.removeCallbacks(anchorTimeRunnable);
@@ -2108,22 +2136,22 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
             redPacket.setVisibility(View.VISIBLE);
             if (dragonImmediateParticipation.getVisibility() == View.VISIBLE) {
                 RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) dragonImmediateParticipation.getLayoutParams();
-                layoutParams.topMargin = DpUtil.dp2px(190);
+                layoutParams.topMargin = DpUtil.dp2px(240);
                 dragonImmediateParticipation.setLayoutParams(layoutParams);
             }
             if (dragonImmediateParticipationTime.getVisibility() == View.VISIBLE && mContext instanceof LiveRyAnchorActivity||mContext instanceof LiveSwAnchorActivity) {
                 RelativeLayout.LayoutParams layoutParamsredPacket = (RelativeLayout.LayoutParams) redPacket.getLayoutParams();
-                layoutParamsredPacket.topMargin = DpUtil.dp2px(110);
+                layoutParamsredPacket.topMargin = DpUtil.dp2px(160);
                 redPacket.setLayoutParams(layoutParamsredPacket);
 
                 RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) dragonImmediateParticipationTime.getLayoutParams();
-                layoutParams.topMargin = DpUtil.dp2px(190);
+                layoutParams.topMargin = DpUtil.dp2px(240);
                 dragonImmediateParticipationTime.setLayoutParams(layoutParams);
             }
             if (mContext instanceof LiveRyAnchorActivity || mContext instanceof LiveSwAnchorActivity) {
                 if (dragonImmediateParticipationTime.getVisibility() == View.GONE) {
                     RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) redPacket.getLayoutParams();
-                    layoutParams.topMargin = DpUtil.dp2px(110);
+                    layoutParams.topMargin = DpUtil.dp2px(160);
                     redPacket.setLayoutParams(layoutParams);
                 }
             }
@@ -2189,12 +2217,12 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
         redPacket.setVisibility(View.GONE);
         if (dragonImmediateParticipation.getVisibility() == View.VISIBLE) {
             RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) dragonImmediateParticipation.getLayoutParams();
-            layoutParams.topMargin = DpUtil.dp2px(110);
+            layoutParams.topMargin = DpUtil.dp2px(160);
             dragonImmediateParticipation.setLayoutParams(layoutParams);
         }
         if (dragonImmediateParticipationTime.getVisibility() == View.VISIBLE) {
             RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) dragonImmediateParticipationTime.getLayoutParams();
-            layoutParams.topMargin = DpUtil.dp2px(110);
+            layoutParams.topMargin = DpUtil.dp2px(160);
             dragonImmediateParticipationTime.setLayoutParams(layoutParams);
         }
     }
@@ -3528,11 +3556,11 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
             dragonImmediateParticipationTime.setVisibility(View.VISIBLE);
             if (redPacket.getVisibility() == View.VISIBLE) {
                 RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) dragonImmediateParticipation.getLayoutParams();
-                layoutParams.topMargin = DpUtil.dp2px(190);
+                layoutParams.topMargin = DpUtil.dp2px(240);
                 dragonImmediateParticipationTime.setLayoutParams(layoutParams);
             } else {
                 RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) dragonImmediateParticipation.getLayoutParams();
-                layoutParams.topMargin = DpUtil.dp2px(110);
+                layoutParams.topMargin = DpUtil.dp2px(160);
                 dragonImmediateParticipationTime.setLayoutParams(layoutParams);
             }
             String s1 = StringUtil.getDurationText(sendMoneyTime * 1000);
@@ -3542,11 +3570,11 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
             dragonImmediateParticipation.setVisibility(View.VISIBLE);
             if (redPacket.getVisibility() == View.VISIBLE) {
                 RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) dragonImmediateParticipation.getLayoutParams();
-                layoutParams.topMargin = DpUtil.dp2px(190);
+                layoutParams.topMargin = DpUtil.dp2px(240);
                 dragonImmediateParticipation.setLayoutParams(layoutParams);
             } else {
                 RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) dragonImmediateParticipation.getLayoutParams();
-                layoutParams.topMargin = DpUtil.dp2px(110);
+                layoutParams.topMargin = DpUtil.dp2px(160);
                 dragonImmediateParticipation.setLayoutParams(layoutParams);
             }
         }
@@ -3562,7 +3590,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
                 dragonImmediateParticipationTime.setLayoutParams(layoutParams);
             } else {
                 RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) dragonImmediateParticipation.getLayoutParams();
-                layoutParams.topMargin = DpUtil.dp2px(110);
+                layoutParams.topMargin = DpUtil.dp2px(160);
                 dragonImmediateParticipationTime.setLayoutParams(layoutParams);
             }
         } else {
@@ -3601,7 +3629,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
         dragonImmediateParticipation.setVisibility(View.VISIBLE);
         if (redPacket.getVisibility() == View.VISIBLE) {
             RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) dragonImmediateParticipation.getLayoutParams();
-            layoutParams.topMargin = DpUtil.dp2px(190);
+            layoutParams.topMargin = DpUtil.dp2px(240);
             dragonImmediateParticipation.setLayoutParams(layoutParams);
         } else {
             RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) dragonImmediateParticipation.getLayoutParams();
@@ -4366,29 +4394,30 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
      * @param bean
      */
     public void showBuyVipMessage(LiveReceiveGiftBean bean) {
+        L.eSw("showBuyVipMessage:"+bean.getRoomnum()+"__"+mLiveUid);
         noble.setVisibility(View.VISIBLE);
         switch (bean.getNobilityid()) {
 
             case "1":
-                noble.setRootView(bean.getUhead(), bean.getUname(), bean.getAncherName(), bean.getRoomnum()).setRoleType(NobleNoticeView.RoleType.BARON).setCallBack(() -> gotoLive(bean.getRoomnum()));
+                noble.setRootView(bean.getUhead(), bean.getUname(), bean.getAncherName(), bean.getRoomnum(),mLiveUid).setRoleType(NobleNoticeView.RoleType.BARON).setCallBack(() -> gotoLive(bean.getRoomnum()));
                 break;
             case "2":
-                noble.setRootView(bean.getUhead(), bean.getUname(), bean.getAncherName(), bean.getRoomnum()).setRoleType(NobleNoticeView.RoleType.VISCOUNT).setCallBack(() -> gotoLive(bean.getRoomnum()));
+                noble.setRootView(bean.getUhead(), bean.getUname(), bean.getAncherName(), bean.getRoomnum(),mLiveUid).setRoleType(NobleNoticeView.RoleType.VISCOUNT).setCallBack(() -> gotoLive(bean.getRoomnum()));
                 break;
             case "3":
-                noble.setRootView(bean.getUhead(), bean.getUname(), bean.getAncherName(), bean.getRoomnum()).setRoleType(NobleNoticeView.RoleType.MARQUIS).setCallBack(() -> gotoLive(bean.getRoomnum()));
+                noble.setRootView(bean.getUhead(), bean.getUname(), bean.getAncherName(), bean.getRoomnum(),mLiveUid).setRoleType(NobleNoticeView.RoleType.MARQUIS).setCallBack(() -> gotoLive(bean.getRoomnum()));
                 break;
             case "4":
-                noble.setRootView(bean.getUhead(), bean.getUname(), bean.getAncherName(), bean.getRoomnum()).setRoleType(NobleNoticeView.RoleType.DUKE).setCallBack(() -> gotoLive(bean.getRoomnum()));
+                noble.setRootView(bean.getUhead(), bean.getUname(), bean.getAncherName(), bean.getRoomnum(),mLiveUid).setRoleType(NobleNoticeView.RoleType.DUKE).setCallBack(() -> gotoLive(bean.getRoomnum()));
                 break;
             case "5":
-                noble.setRootView(bean.getUhead(), bean.getUname(), bean.getAncherName(), bean.getRoomnum()).setRoleType(NobleNoticeView.RoleType.KING).setCallBack(() -> gotoLive(bean.getRoomnum()));
+                noble.setRootView(bean.getUhead(), bean.getUname(), bean.getAncherName(), bean.getRoomnum(),mLiveUid).setRoleType(NobleNoticeView.RoleType.KING).setCallBack(() -> gotoLive(bean.getRoomnum()));
                 break;
             case "6":
-                noble.setRootView(bean.getUhead(), bean.getUname(), bean.getAncherName(), bean.getRoomnum()).setRoleType(NobleNoticeView.RoleType.EMPEROR).setCallBack(() -> gotoLive(bean.getRoomnum()));
+                noble.setRootView(bean.getUhead(), bean.getUname(), bean.getAncherName(), bean.getRoomnum(),mLiveUid).setRoleType(NobleNoticeView.RoleType.EMPEROR).setCallBack(() -> gotoLive(bean.getRoomnum()));
                 break;
             case "7":
-                noble.setRootView(bean.getUhead(), bean.getUname(), bean.getAncherName(), bean.getRoomnum()).setRoleType(NobleNoticeView.RoleType.BETTER_EMPEROR).setCallBack(() -> gotoLive(bean.getRoomnum()));
+                noble.setRootView(bean.getUhead(), bean.getUname(), bean.getAncherName(), bean.getRoomnum(),mLiveUid).setRoleType(NobleNoticeView.RoleType.BETTER_EMPEROR).setCallBack(() -> gotoLive(bean.getRoomnum()));
                 break;
         }
     }

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
@@ -174,9 +169,8 @@
             android:id="@+id/guard_imageView"
             android:layout_width="58dp"
             android:layout_height="58dp"
-            android:layout_centerInParent="true"
             android:layout_centerHorizontal="true"
-            android:layout_centerVertical="true"
+            android:layout_marginTop="20dp"
             android:scaleType="centerCrop"
             android:src="@mipmap/guardian_img_wings"
             android:visibility="visible"
@@ -197,7 +191,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 +226,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" />

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

@@ -515,7 +515,7 @@
             android:layout_height="wrap_content"
             android:layout_alignParentEnd="true"
             android:layout_alignParentBottom="true"
-            android:layout_marginEnd="150dp"
+            android:layout_marginEnd="144dp"
             android:layout_marginBottom="-2dp"
             android:text="99"
             android:textColor="#FFB403"

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

@@ -745,8 +745,9 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="12dp"
-        android:layout_marginTop="100dp"
+        android:layout_marginTop="160dp"
-        android:visibility="gone" />
+        android:visibility="gone"
+        tools:visibility="visible"/>
 
     <FrameLayout
         android:id="@+id/btn_prize_pool_level"
@@ -1158,6 +1159,7 @@
             android:layout_width="match_parent"
             android:layout_height="51dp"
             android:translationX="500dp"
+            tools:visibility="visible"
             android:visibility="invisible">
 
             <LinearLayout
@@ -1283,8 +1285,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 +1299,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 +1517,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 +1560,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 +2393,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 +2448,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 +2666,73 @@
         android:layout_marginTop="80dp"
         app:autoPlay="true" />
 
-    <LinearLayout
+    <RelativeLayout
         android:id="@+id/sud_layout_name"
-        android:layout_width="257dp"
+        android:layout_width="200dp"
         android:layout_height="40dp"
-        android:layout_alignParentEnd="true"
         android:layout_alignParentBottom="true"
-        android:layout_marginStart="21dp"
+        android:layout_marginStart="13dp"
-        android:layout_marginEnd="42dp"
         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 +2745,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"
@@ -2736,9 +2781,10 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="10dp"
-        android:layout_marginTop="180dp"
+        android:layout_marginTop="240dp"
         android:gravity="center"
         android:orientation="vertical"
+        tools:visibility="visible"
         android:visibility="gone">
 
         <ImageView
@@ -2766,6 +2812,7 @@
         android:layout_marginTop="120dp"
         android:gravity="center"
         android:orientation="vertical"
+        tools:visibility="visible"
         android:visibility="gone">
 
         <ImageView

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

@@ -15,7 +15,7 @@
 
             <ImageView
                 android:id="@+id/guard_number_img"
-                android:layout_width="19dp"
+                android:layout_width="38.5dp"
                 android:layout_height="19dp"
                 android:layout_gravity="center"
                 android:src="@mipmap/icon_one_guard"

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">Guard 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>

main/src/main/AndroidManifest.xml

@@ -62,8 +62,8 @@
             android:screenOrientation="portrait" />
         <activity
             android:name=".activity.LanguageSettingActivity"
-            android:screenOrientation="portrait"
+            android:configChanges="locale|layoutDirection|keyboard"
-            android:configChanges="locale|layoutDirection|keyboard"    />
+            android:screenOrientation="portrait" />
         <activity
             android:name=".activity.SearchActivity"
             android:screenOrientation="portrait"
@@ -156,15 +156,25 @@
         <activity
             android:name=".activity.RedPacketUsersActivity"
             android:screenOrientation="portrait" />
-        <activity android:name=".activity.UserAvatarSelectActivity"
+        <activity
+            android:name=".activity.UserAvatarSelectActivity"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name=".activity.BattlePassActivity"
             android:screenOrientation="portrait" />
-        <activity android:name=".activity.BattlePassActivity" />
 
-        <activity android:name=".activity.MainHomeCommunityActivity"
+        <activity
+            android:name=".activity.MainHomeCommunityActivity"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name=".activity.FeedbackActivity"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name=".activity.FeedbackSuccessActivity"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name=".activity.FeedbackEditActivity"
             android:screenOrientation="portrait" />
-        <activity android:name=".activity.FeedbackActivity" />
-        <activity android:name=".activity.FeedbackSuccessActivity" />
-        <activity android:name=".activity.FeedbackEditActivity" />
     </application>
 
 </manifest>

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

@@ -15,12 +15,9 @@ import com.lxj.xpopup.XPopup;
 import com.yunbao.common.manager.IMLoginManager;
 import com.yunbao.common.utils.MobclickAgent;
 import com.yunbao.common.activity.AbsActivity;
-import com.yunbao.common.dialog.SkitCheckInWasSuccessfulPopup;
 import com.yunbao.common.event.FloatWarOrderEvent;
 import com.yunbao.common.glide.ImgLoader;
 import com.yunbao.common.utils.RouteUtil;
-import com.yunbao.live.dialog.LiveBuyGuardDialog;
-import com.yunbao.live.dialog.LiveGuardDialog;
 import com.yunbao.live.dialog.LivePrankDialogFragment;
 import com.yunbao.main.R;