修复测试反馈内容

新增临时需求：banner点进礼物墙
新增临时需求：主播下播后显示违规内容(未接入接口）
合并潘多拉修复问题

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

@@ -5,6 +5,8 @@ import static com.yunbao.live.socket.SocketClient.mSocketHandler;
 import android.app.Activity;
 import android.app.ActivityManager;
 import android.content.Context;
+import android.content.res.Configuration;
+import android.content.res.Resources;
 import android.net.http.HttpResponseCache;
 import android.os.Build;
 import android.os.Bundle;
@@ -25,6 +27,7 @@ import com.blankj.utilcode.util.Utils;
 import com.facebook.appevents.AppEventsLogger;
 import com.fm.openinstall.OpenInstall;
 import com.google.gson.Gson;
+import com.yunbao.common.manager.IMLoginManager;
 import com.yunbao.common.utils.LogUtils;
 import com.tencent.imsdk.v2.V2TIMGroupMemberInfo;
 import com.tencent.imsdk.v2.V2TIMManager;

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

@@ -102,6 +102,11 @@ public class GiftWallGiftInfoListItemAdapter extends RecyclerView.Adapter<GiftWa
         }
 
         public void setData(GiftWallInfoBean.Data data, int position) {
+            user_name.setText("");
+            anchor_name.setText("");
+            tv_rank.setText("");
+            avatar.setVisibility(View.INVISIBLE);
+            avatar2.setVisibility(View.INVISIBLE);
             if (data.getId() == -1) {
                 tv_rank.setText("");
                 tv_rename.setText("");
@@ -118,6 +123,7 @@ public class GiftWallGiftInfoListItemAdapter extends RecyclerView.Adapter<GiftWa
             }
             anchor_name.setVisibility(View.GONE);
             if (isStar && list_type == 2) {
+                avatar.setVisibility(View.VISIBLE);
                 ImgLoader.display(itemView.getContext(), data.getLive_avatar(), avatar);
                 anchor_name.setText(data.getLive_user_name());
                 if (data.getGift_hall_rank_hide() == 1 && !data.getUser_id().equals(IMLoginManager.get(itemView.getContext()).getUserInfo().getId() + "")) {
@@ -132,7 +138,8 @@ public class GiftWallGiftInfoListItemAdapter extends RecyclerView.Adapter<GiftWa
             } else {
                 avatar2.setVisibility(View.INVISIBLE);
                 anchor_name.setVisibility(View.GONE);
-                if (data.getGift_hall_rank_hide() == 1&& !data.getUser_id().equals(IMLoginManager.get(itemView.getContext()).getUserInfo().getId() + "")) {
+                avatar.setVisibility(View.VISIBLE);
+                if (data.getGift_hall_rank_hide() == 1 && !data.getUser_id().equals(IMLoginManager.get(itemView.getContext()).getUserInfo().getId() + "")) {
                     avatar.setImageResource(R.mipmap.hide);
                     user_name.setText(WordUtil.getNewString(R.string.mystery_man));
                 } else {

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

@@ -152,6 +152,14 @@ public class GiftWallMainTab1List2Adapter extends RecyclerView.Adapter<GiftWallM
             ImgLoader.display(itemView.getContext(), gift.getGift_icon(), giftImage, 40, 40);
             giftBg.setClearsAfterDetached(false);
             giftBg.setClearsAfterStop(false);
+            progressBar.setVisibility(View.GONE);
+            if (isAnchor) {
+                progressBar.setMax(gift.getIlluminate_num());
+                progressBar.setProgress(gift.getGift_hall_send_num());
+            }else{
+                progressBar.setMax(1);
+            }
+            progressBar.setVisibility(View.VISIBLE);
             if (gift.getIlluminate_status() == 1) {
                 gift_status.setText(String.format("%s%s", WordUtil.getNewString(R.string.dialog_gift_wall_list_spinner_up), gift.getGift_hall_send_numForString()));
                 gift_status.setTextColor(Color.parseColor("#FFFFFF"));
@@ -163,10 +171,20 @@ public class GiftWallMainTab1List2Adapter extends RecyclerView.Adapter<GiftWallM
                         giftBg.startAnimation();
                     });
                 }
-                progressBar.setMax(gift.getIlluminate_num());
+                if(!isAnchor){
-                progressBar.setProgress(gift.getGift_hall_send_num());
+                    progressBar.setProgress(1);
+                }
             } else {
+                if (isAnchor) {
+                    gift_status.setText(String.format("%s %s/%s",
+                            WordUtil.getNewString(R.string.dialog_gift_wall_list_spinner_down2),
+                            gift.getGift_hall_send_numForString(),
+                            gift.getIlluminate_num()
+                    ));
+                } else {
+                    progressBar.setProgress(0);
                     gift_status.setText(WordUtil.getNewString(R.string.dialog_gift_wall_list_spinner_down));
+                }
                 gift_status.setTextColor(Color.parseColor("#01071A"));
                 gift_soles.setImageResource(getUnSolesrRes());
                 giftBg.setImageResource(R.mipmap.gift_wall_main_item_bg1);

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

@@ -36,6 +36,7 @@ import com.yunbao.common.dialog.GiftWallMainTab2ClassicInfoDialog;
 import com.yunbao.common.dialog.GiftWallTab2List2Dialog;
 import com.yunbao.common.event.ClosePopupDialogEvent;
 import com.yunbao.common.glide.ImgLoader;
+import com.yunbao.common.manager.IMLoginManager;
 import com.yunbao.common.utils.Bus;
 import com.yunbao.common.utils.StringUtil;
 import com.yunbao.common.utils.ToastUtil;
@@ -166,7 +167,7 @@ public class GiftWallMainTab2ListAdapter extends RecyclerView.Adapter<GiftWallMa
         @SuppressLint("DefaultLocale")
         public void setData(GiftWallTab2Bean.Gift giftData, int position) {
             gift_name.setText(WordUtil.isNewZh() ? giftData.getGiftName() : giftData.getGiftNameEn());
-            display(itemView.getContext(), giftData.getGiftIcon(), gift, 60, 60);
+            display(itemView.getContext(), giftData.getGiftIcon(), gift, -1,-1);
             if (!StringUtil.isEmpty(giftData.getNamingLiveNicename(), giftData.getNamingUserNicename())) {
                 anchor_nickname.setVisibility(View.VISIBLE);
                 user_nickname.setVisibility(View.VISIBLE);
@@ -176,18 +177,18 @@ public class GiftWallMainTab2ListAdapter extends RecyclerView.Adapter<GiftWallMa
                 imageView8.setVisibility(View.VISIBLE);
                 tv_wait.setVisibility(View.GONE);
                 gift_number.setText(String.format(Locale.getDefault(), "%d", giftData.getGiftHallSendNum()));
-                if (giftData.getNamingLiveActiveRankHide() == 1) {
+                if (giftData.getNamingLiveActiveRankHide() == 1 && giftData.getNamingLiveId()!= IMLoginManager.get(mContext).getUserInfo().getId()) {
                     user1Avatar.setImageResource(R.mipmap.hide);
                     anchor_nickname.setText(WordUtil.getNewString(R.string.mystery_man));
                 } else {
-                    display(mContext, giftData.getNamingLiveAvatar(), user1Avatar, 35, 35);
+                    display(mContext, giftData.getNamingLiveAvatar(), user1Avatar, 60, 60);
                     anchor_nickname.setText(giftData.getNamingLiveNicename());
                 }
-                if (giftData.getNamingUserActiveRankHide() == 1) {
+                if (giftData.getNamingUserActiveRankHide() == 1&& giftData.getNamingUserId()!= IMLoginManager.get(mContext).getUserInfo().getId()) {
                     user2Avatar.setImageResource(R.mipmap.hide);
                     user_nickname.setText(WordUtil.getNewString(R.string.mystery_man));
                 } else {
-                    display(mContext, giftData.getNamingUserAvatar(), user2Avatar, 35, 35);
+                    display(mContext, giftData.getNamingUserAvatar(), user2Avatar, 60, 60);
                     user_nickname.setText(giftData.getNamingUserNicename());
                 }
             } else {

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

@@ -68,7 +68,7 @@ public class GiftWallTab2GiftInfoListItemAdapter extends RecyclerView.Adapter<Gi
             tv_rank.setText(String.format(Locale.getDefault(), "%d", (position + 4)));
             tv_rank.setTextColor(Color.parseColor("#FCC755"));
             tv_rank.setTextSize(20);
-            tv_rename.setText(String.format(Locale.getDefault(), "%d", (data.getGiftHallSendNum())));
+            tv_rename.setText(String.format(Locale.getDefault(), "%s", (data.getGiftHallSendNumForString())));
             avatar.setVisibility(View.VISIBLE);
             if (data.getActiveRankHide() == 1) {
                 user_name.setText(WordUtil.getNewString(R.string.mystery_man));

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

@@ -1,5 +1,7 @@
 package com.yunbao.common.bean;
 
+import android.text.TextUtils;
+
 import com.alibaba.fastjson.annotation.JSONField;
 import com.google.gson.annotations.SerializedName;
 
@@ -45,9 +47,9 @@ public class GiftNamingInfoModel extends BaseModel {
     private String giftStartTime;
     @SerializedName("gift_end_time")
     private String giftEndTime;
-    @SerializedName("naming_liveuid")
+    @SerializedName("naming_live_id")
     private String namingLiveuid;
-    @SerializedName("naming_uid")
+    @SerializedName("naming_user_id")
     private String namingUid;
     @SerializedName("naming_live_name")
     private String namingLiveName;
@@ -327,6 +329,10 @@ public class GiftNamingInfoModel extends BaseModel {
     }
 
     public String getNamingStatus() {
+        //后端反馈 namingStatus 已经无效了，需要判断冠名主播id和冠名用户id是否为0
+        if(TextUtils.equals(namingLiveuid,"0")||TextUtils.equals(namingUid,"0")){
+            return "0";
+        }
         return namingStatus;
     }
 

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

@@ -87,6 +87,16 @@ public class GiftWallInfoBean extends BaseModel {
         private int user_gift_hall_send_num;
         @SerializedName("gift_status")
         private int gift_status;
+        @SerializedName("sendtype")
+        private int sendtype;//0默认钻石购买，1金币购买
+
+        public int getSendtype() {
+            return sendtype;
+        }
+
+        public void setSendtype(int sendtype) {
+            this.sendtype = sendtype;
+        }
 
         public int getGift_status() {
             return gift_status;
@@ -230,6 +240,9 @@ public class GiftWallInfoBean extends BaseModel {
         // 同样地，这里省略getter和setter方法
 
         public String getUser_id() {
+            if(StringUtil.isEmpty(user_id)){
+                return "0";
+            }
             return user_id;
         }
 

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

@@ -1,6 +1,7 @@
 package com.yunbao.common.bean;
 
 import com.google.gson.annotations.SerializedName;
+import com.yunbao.common.utils.StringUtil;
 
 import java.util.List;
 
@@ -350,12 +351,28 @@ public class GiftWallMainTab2ClassicInfoBean extends BaseModel{
 
         @SerializedName("create_time")
         private String createTime;
+        @SerializedName("naming_user_gift_hall_rank_hide")
+        private int naming_user_gift_hall_rank_hide;
 
         // 如果需要，可以添加无参构造器、getter和setter（这里省略）
 
+        public int getNaming_user_gift_hall_rank_hide() {
+            return naming_user_gift_hall_rank_hide;
+        }
+
+        public void setNaming_user_gift_hall_rank_hide(int naming_user_gift_hall_rank_hide) {
+            this.naming_user_gift_hall_rank_hide = naming_user_gift_hall_rank_hide;
+        }
+
         public int getGiftHallSendNum() {
             return giftHallSendNum;
         }
+        public String getGiftHallSendNumForString() {
+            if(giftHallSendNum>999999){
+                return "999999+";
+            }
+            return giftHallSendNum+"";
+        }
 
         public void setGiftHallSendNum(int giftHallSendNum) {
             this.giftHallSendNum = giftHallSendNum;
@@ -402,6 +419,9 @@ public class GiftWallMainTab2ClassicInfoBean extends BaseModel{
         }
 
         public String getUserId() {
+            if(StringUtil.isEmpty(userId)){
+                return "0";
+            }
             return userId;
         }
 

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

@@ -4,6 +4,7 @@ import android.view.View;
 
 import com.alibaba.fastjson.annotation.JSONField;
 import com.google.gson.annotations.SerializedName;
+import com.yunbao.common.utils.StringUtil;
 
 /**
  * Created by cxf on 2018/10/12.
@@ -52,9 +53,9 @@ public class LiveGiftBean {
 
     @JSONField(name = "operate_url")
     private String operateUrl;
-    @JSONField(name = "naming_liveuid")
+    @JSONField(name = "naming_live_id")
     private String namingLiveuid;
-    @JSONField(name = "naming_uid")
+    @JSONField(name = "naming_user_id")
     private String namingUid;
     @JSONField(name = "naming_live_name")
     private String namingLiveName;
@@ -168,6 +169,9 @@ public class LiveGiftBean {
     }
 
     public String getNamingUid() {
+        if(StringUtil.isEmpty(namingUid)){
+            namingUid="0";
+        }
         return namingUid;
     }
 
@@ -310,6 +314,9 @@ public class LiveGiftBean {
     }
 
     public String getSwf() {
+        if(StringUtil.isEmpty(swf)){
+            swf="";
+        }
         return swf;
     }
 

common/src/main/java/com/yunbao/common/custom/LiveGifWallAchieveWearTransformer.java

@@ -2,9 +2,12 @@ package com.yunbao.common.custom;
 
 import android.view.View;
 
+import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.core.view.ViewCompat;
+import androidx.viewpager.widget.ViewPager;
 
 import com.stx.xhb.androidx.transformers.BasePageTransformer;
+import com.yunbao.common.utils.DpUtil;
 import com.yunbao.common.utils.L;
 
 public class LiveGifWallAchieveWearTransformer extends BasePageTransformer {
@@ -15,7 +18,7 @@ public class LiveGifWallAchieveWearTransformer extends BasePageTransformer {
      * github:https://github.com/xiaohaibin
      * describe: 适用于一屏显示多个模式
      */
-    private float mMinScale = 0.55f;
+    private float mMinScale = 0.85f;
     private float mMinAlpha = 1f;
 
     public LiveGifWallAchieveWearTransformer() {
@@ -28,7 +31,7 @@ public class LiveGifWallAchieveWearTransformer extends BasePageTransformer {
 
     @Override
     public void handleInvisiblePage(View view, float position) {
-        ViewCompat.setAlpha(view, 0);
+       // ViewCompat.setAlpha(view, 0);
     }
 
     @Override
@@ -36,19 +39,12 @@ public class LiveGifWallAchieveWearTransformer extends BasePageTransformer {
         float scale = Math.max(mMinScale, 1 + position);
         float vertMargin = view.getHeight() * (1 - scale) / 2;
         float horzMargin = view.getWidth() * (1 - scale) / 2;
-        L.eSw("l position:"+position);
+        view.setTranslationX(horzMargin - vertMargin / 2);
-        L.eSw("l mMinScale:"+mMinScale);
-        L.eSw("l getHeight:"+view.getHeight());
-        L.eSw("l getWidth:"+view.getWidth());
-        L.eSw("l scale:"+scale);
-        L.eSw("l vertMargin:"+vertMargin);
-        L.eSw("l horzMargin:"+horzMargin);
-        L.eSw("l setTranslationX :"+(horzMargin - vertMargin / 2));
-        L.eSw("l setAlpha :"+mMinAlpha + (scale - mMinScale) / (1 - mMinScale) * (1 - mMinAlpha));
-        view.setTranslationX(horzMargin - vertMargin / 4);
         view.setScaleX(scale);
         view.setScaleY( scale);
-        view.setAlpha( mMinAlpha + (scale - mMinScale) / (1 - mMinScale) * (1 - mMinAlpha));
+        L.e("handleLeftPage scale:"+scale);
+       // view.setAlpha( mMinAlpha + (scale - mMinScale) / (1 - mMinScale) * (1 - mMinAlpha));
+        view.setAlpha(1f);
     }
 
     @Override
@@ -56,19 +52,13 @@ public class LiveGifWallAchieveWearTransformer extends BasePageTransformer {
         float scale = Math.max(mMinScale, 1 - position);
         float vertMargin = view.getHeight() * (1 - scale) / 2;
         float horzMargin = view.getWidth() * (1 - scale) / 2;
-        L.eSw("r position:"+position);
+        view.setTranslationX( -horzMargin + vertMargin / 2);
-        L.eSw("r mMinScale:"+mMinScale);
-        L.eSw("r getHeight:"+view.getHeight());
-        L.eSw("r getWidth:"+view.getWidth());
-        L.eSw("r scale:"+scale);
-        L.eSw("r vertMargin:"+vertMargin);
-        L.eSw("r horzMargin:"+horzMargin);
-        L.eSw("r setTranslationX :"+(horzMargin - vertMargin / 2));
-        L.eSw("r setAlpha :"+mMinAlpha + (scale - mMinScale) / (1 - mMinScale) * (1 - mMinAlpha));
-        view.setTranslationX( -horzMargin + vertMargin / 4);
         view.setScaleX( scale);
+
         view.setScaleY( scale);
-        view.setAlpha( mMinAlpha + (scale - mMinScale) / (1 - mMinScale) * (1 - mMinAlpha));
+        L.e("handleRightPage scale:"+scale);
+     //   view.setAlpha( mMinAlpha + (scale - mMinScale) / (1 - mMinScale) * (1 - mMinAlpha));
+        view.setAlpha(1f);
     }
 
     public void setMinAlpha(float minAlpha) {

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

@@ -10,12 +10,14 @@ import androidx.viewpager.widget.ViewPager;
 
 import com.lxj.xpopup.XPopup;
 import com.stx.xhb.androidx.XBanner;
+import com.stx.xhb.androidx.transformers.BasePageTransformer;
 import com.stx.xhb.androidx.transformers.Transformer;
 import com.yunbao.common.CommonAppConfig;
 import com.yunbao.common.R;
 import com.yunbao.common.bean.HttpCallbackModel;
 import com.yunbao.common.bean.UserBean;
 import com.yunbao.common.bean.UserMedalModel;
+import com.yunbao.common.custom.LiveGifWallAchieveWearTransformer;
 import com.yunbao.common.custom.LiveGuardScalePageTransformer;
 import com.yunbao.common.glide.ImgLoader;
 import com.yunbao.common.http.base.HttpCallback;
@@ -47,13 +49,20 @@ public class GiftWallAchieveWearDialog extends AbsDialogPopupWindow {
     String wearing = WordUtil.isNewZh() ? "已佩戴" : "worn";
     private List<UserMedalModel> achieveWearModels = new ArrayList<>();
     private UserUseDressSuccess userUseDressSuccess;
+    private int useIndex = 0;
 
-    public GiftWallAchieveWearDialog(@NonNull Context context,String toUid,boolean isAnchor, List<UserMedalModel> achieveWearModels,UserUseDressSuccess userUseDressSuccess) {
+    public GiftWallAchieveWearDialog(@NonNull Context context, String toUid, boolean isAnchor, List<UserMedalModel> achieveWearModels, UserUseDressSuccess userUseDressSuccess) {
         super(context);
         this.toUid = toUid;
         this.isAnchor = isAnchor;
         this.achieveWearModels = achieveWearModels;
         this.userUseDressSuccess = userUseDressSuccess;
+        for (int i = 0; i < this.achieveWearModels.size(); i++) {
+            if ("1".equals(this.achieveWearModels.get(i).getUseStatus())) {
+                useIndex = i;
+                break;
+            }
+        }
     }
 
     public GiftWallAchieveWearDialog setFullWindows(boolean fullWindows) {
@@ -110,7 +119,7 @@ public class GiftWallAchieveWearDialog extends AbsDialogPopupWindow {
                                         UserBean u = CommonAppConfig.getInstance().getUserBean();
                                         u.setMedal_no_display_src(achieveWearModels.get(selectPosition).getDisplaySrc());
                                         CommonAppConfig.getInstance().setUserBean(u);
-                                if(userUseDressSuccess!=null){
+                                        if (userUseDressSuccess != null) {
                                             userUseDressSuccess.onSuccess();
                                         }
                                         dialog.dismiss();
@@ -125,7 +134,7 @@ public class GiftWallAchieveWearDialog extends AbsDialogPopupWindow {
                 }
             }
         });
-            btnConfirm.setVisibility(CommonAppConfig.getInstance().getUid().equals(toUid)?View.VISIBLE:View.GONE);
+        btnConfirm.setVisibility(CommonAppConfig.getInstance().getUid().equals(toUid) ? View.VISIBLE : View.GONE);
     }
 
     @Override
@@ -161,9 +170,9 @@ public class GiftWallAchieveWearDialog extends AbsDialogPopupWindow {
         setWearInfo();
         xBanner.setBannerData(R.layout.dialog_gift_wall_achieve_wear_item, achieveWearModels);
         //xBanner.setCustomPageTransformer(new LiveGuardScalePageTransformer());
-        //xBanner.setCustomPageTransformer(new LiveGifWallAchieveWearTransformer());
+        xBanner.setCustomPageTransformer(new LiveGifWallAchieveWearTransformer());
         xBanner.setIsClipChildrenMode(true);
-        xBanner.setPageTransformer(Transformer.Scale);
+        //xBanner.setCustomPageTransformer(BasePageTransformer.getPageTransformer(Transformer.Zoom));
         xBanner.getViewPager().setOffscreenPageLimit(3);
         xBanner.loadImage(new XBanner.XBannerAdapter() {
             @Override
@@ -192,6 +201,7 @@ public class GiftWallAchieveWearDialog extends AbsDialogPopupWindow {
 
             }
         });
+     //   xBanner.getViewPager().setCurrentItem(useIndex); //自动定位到已佩戴到的勋章
     }
 
     public interface UserUseDressSuccess {

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

@@ -1,5 +1,6 @@
 package com.yunbao.common.dialog;
 
+import android.app.Activity;
 import android.content.Context;
 import android.graphics.Color;
 import android.graphics.Typeface;
@@ -54,13 +55,14 @@ public class GiftWallDialog extends AbsDialogPopupWindow {
     String toUserId;
     String userName;
     boolean isAnchor;
+    boolean isTab2;
 
     public GiftWallDialog(@NonNull Context context, String toUserId, String userName, String anchorId, boolean isAnchor) {
         super(context);
         this.toUserId = toUserId;
         this.isAnchor = isAnchor;
         this.userName = userName;
-        this.anchorId=anchorId;
+        this.anchorId = anchorId;
     }
 
     public GiftWallDialog setFullWindows(boolean fullWindows) {
@@ -68,6 +70,11 @@ public class GiftWallDialog extends AbsDialogPopupWindow {
         return this;
     }
 
+    public GiftWallDialog setTab2(boolean isTab2) {
+        this.isTab2 = isTab2;
+        return this;
+    }
+
     @Override
     public void buildDialog(XPopup.Builder builder) {
 
@@ -140,10 +147,15 @@ public class GiftWallDialog extends AbsDialogPopupWindow {
                     mTvUserName.setTextColor(Color.parseColor("#6BCDFF"));
                 } else {
                     mTvUserName.setTextColor(Color.parseColor("#FFCF94"));
+                    if (isTab2) {
+                        ((GiftWallMainTab2Fragment) fragments.get(position)).setTab2();
+                    }
                 }
             }
         });
-
+        if (isTab2) {
+            mViewPager.setCurrentItem(1);
+        }
 
         ViewClicksAntiShake.clicksAntiShake(mTvTab1, () -> {
             mIvBg.setImageResource(R.mipmap.bg_gift_wall_main_root);
@@ -181,6 +193,9 @@ public class GiftWallDialog extends AbsDialogPopupWindow {
             new GiftWallRuleDialog(mContext).setFullWindows(isFullWindows).showDialog();
         });
         resetWindows();
+        if (isTab2) {
+            mTvTab2.callOnClick();
+        }
     }
 
     private void resetWindows() {
@@ -208,4 +223,6 @@ public class GiftWallDialog extends AbsDialogPopupWindow {
         mIvBack.setLayoutParams(params);
         ViewClicksAntiShake.clicksAntiShake(mIvBack, this::dismiss);
     }
+
+
 }

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

@@ -66,6 +66,7 @@ public class GiftWallGiftInfoDialog extends AbsDialogPopupWindow {
     View tab_layout;
     View bottom_layout;
     View gift_schedule;
+    ImageView diamond_icon;
 
     GiftWallGiftInfoListItemAdapter adapter;
     RecyclerView recyclerView;
@@ -143,6 +144,7 @@ public class GiftWallGiftInfoDialog extends AbsDialogPopupWindow {
     void initView() {
         mIvBg = findViewById(R.id.iv_root_bg);
         mIvBack = findViewById(R.id.iv_back);
+        diamond_icon = findViewById(R.id.diamond_icon);
         giftName = findViewById(R.id.gift_name);
         gift = findViewById(R.id.gift);
         diamond_text = findViewById(R.id.diamond_text);
@@ -319,6 +321,11 @@ public class GiftWallGiftInfoDialog extends AbsDialogPopupWindow {
         gift_tv_progress.setText(String.format(Locale.getDefault(), "%s", giftBean.getGift_info().getGift_hall_send_num()));
         gift_progress.setMax(giftBean.getGift_info().getIlluminate_num());
         gift_progress.setProgress(Integer.parseInt(giftBean.getGift_info().getGift_hall_send_num()));
+        if (giftBean.getGift_info().getSendtype() == 0) {
+            diamond_icon.setImageResource(R.mipmap.diamond);
+        } else {
+            diamond_icon.setImageResource(R.mipmap.gold_coin);
+        }
         if (giftBean.getGift_info().getIlluminate_status() == 1) {
             gift_btn.setText(WordUtil.getNewString(R.string.dialog_gift_wall_list_info_top_btn_continue));
             btn_lighten.setText(WordUtil.getNewString(R.string.dialog_gift_wall_list_spinner_up));
@@ -329,6 +336,11 @@ public class GiftWallGiftInfoDialog extends AbsDialogPopupWindow {
             btn_lighten.setBackgroundResource(R.drawable.gift_wall_gift_info_un_lighten);
         }
         adapter.setGiftStatus(giftBean.getGift_info().getIlluminate_status());
+        /**
+         *  如果对方是主播，要有点亮标记。
+         *  如果对方是用户，不要有点亮标记
+         *
+         */
         if (isAnchor) {
             tab_layout.setVisibility(View.VISIBLE);
             bottom_layout.setVisibility(View.VISIBLE);
@@ -337,18 +349,20 @@ public class GiftWallGiftInfoDialog extends AbsDialogPopupWindow {
                 tab_layout.setVisibility(View.GONE);
                 bottom_layout.setVisibility(View.GONE);
                 tv_list_title.setVisibility(View.VISIBLE);
-                gift_progress.setVisibility(View.GONE);
             }
         } else {
             tab_layout.setVisibility(View.GONE);
             bottom_layout.setVisibility(View.GONE);
             tv_list_title.setVisibility(View.VISIBLE);
-            if (!toUserId.equals(IMLoginManager.get(mContext).getUserInfo().getId() + "")) {
-                gift_btn.setVisibility(View.GONE);
-                gift_schedule.setVisibility(View.GONE);
             gift_progress.setVisibility(View.GONE);
+            gift_schedule.setVisibility(View.GONE);
+            if (isTab2Enter || ((!toUserId.equals(IMLoginManager.get(mContext).getUserInfo().getId() + "")) && !isTab2Enter)) {
+                gift_btn.setVisibility(View.GONE);
+            } else {
+                System.out.println("---------------显示 " + toUserId + " " + IMLoginManager.get(mContext).getUserInfo().getId() + "|" + isTab2Enter);
             }
         }
+
         if (!isLiveRoom || giftBean.getGift_info().getGift_status() == 0) {
             gift_btn.setEnabled(false);
             btn_one.setEnabled(false);
@@ -373,15 +387,12 @@ public class GiftWallGiftInfoDialog extends AbsDialogPopupWindow {
                 loadChampion(giftBean);
             }
         }
-        if (!isAnchor) {
-            gift_schedule.setVisibility(View.GONE);
-            gift_progress.setVisibility(View.GONE);
-        }
 
         initAnim();
     }
 
     private void setTips(String tmp) {
+        btn_one_tips.setVisibility(View.VISIBLE);
         btn_one_tips.setText(String.format(Locale.getDefault(), "%s%s%s"
                 , WordUtil.isNewZh() ? "需 " : "Need ",
                 tmp,
@@ -394,6 +405,7 @@ public class GiftWallGiftInfoDialog extends AbsDialogPopupWindow {
         if (giftBean.getData() != null && !giftBean.getData().isEmpty()) {
             tmp = giftBean.getData().get(0).getGift_hall_send_num() - giftBean.getGift_info().getUser_gift_hall_send_num() + 1;
         }
+        System.out.println("冠名数据 我发的 = " + mySend + " 检测的 = " + tmp + " 第一名id = " + giftBean.getData().get(0).getUser_id() + " 我的id = " + IMLoginManager.get(mContext).getUserInfo().getId());
         if (mySend > tmp || giftBean.getData().get(0).getUser_id().equals(IMLoginManager.get(mContext).getUserInfo().getId() + "")) {
             btn_one.setText(WordUtil.getNewString(R.string.dialog_gift_wall_gfit_info_list_bottom_btn_one_champion_get));
             btn_one_tips.setVisibility(View.GONE);

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

@@ -115,13 +115,14 @@ public class GiftWallMainTab2ClassicInfoDialog extends AbsDialogPopupWindow {
 
     void initData(GiftWallMainTab2ClassicInfoBean data) {
         ImgLoader.display(mContext, data.getGiftInfo().getGiftIcon(), mIvGift);
-        if (data.getGiftInfo().getNamingLiveActiveRankHide() == 0 || data.getGiftInfo().getNamingUserId() == IMLoginManager.get(mContext).getUserInfo().getId()) {
+        if (data.getGiftInfo().getNamingLiveActiveRankHide() == 0 || data.getGiftInfo().getNamingLiveId() == IMLoginManager.get(mContext).getUserInfo().getId()) {
             ImgLoader.display(mContext, data.getGiftInfo().getNamingLiveAvatar(), user_avatar);
+            mTvUserName.setText(data.getGiftInfo().getNamingLiveNicename());
         } else {
             user_avatar.setImageResource(R.mipmap.hide);
+            mTvUserName.setText(WordUtil.getNewString(R.string.mystery_man));
         }
         gift_name.setText(WordUtil.isNewZh() ? data.getGiftInfo().getGiftName() : data.getGiftInfo().getGiftNameEn());
-        mTvUserName.setText(data.getGiftInfo().getNamingLiveNicename());
         star_value.setText(String.format(Locale.getDefault(), "%d", data.getGiftInfo().getGiftHallSendNum()));
         int max = data.getData().size() > 3 ? 3 : 0;
         if (max != 0) {
@@ -151,6 +152,11 @@ public class GiftWallMainTab2ClassicInfoDialog extends AbsDialogPopupWindow {
     }
 
     void setTopData(GiftWallMainTab2ClassicInfoBean.GiftData data, ImageView avatar, TextView name, TextView value) {
+        if (data.getNaming_user_gift_hall_rank_hide() == 1 && Integer.parseInt(data.getUserId()) != IMLoginManager.get(mContext).getUserInfo().getId()) {
+            avatar.setImageResource(R.mipmap.hide);
+            name.setText(WordUtil.getNewString(R.string.mystery_man));
+            return;
+        }
         ImgLoader.display(mContext, data.getAvatar(), avatar);
         name.setText(data.getUserName());
         value.setText(String.format(Locale.getDefault(), "%d", data.getGiftHallSendNum()));

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

@@ -91,7 +91,7 @@ public class GiftWallRuleDialog extends AbsDialogPopupWindow {
         } else {
             mIvBg.setScaleType(ImageView.ScaleType.FIT_XY);
         }
-        ImgLoader.displayDrawable(mContext, WordUtil.isNewZh() ? "https://downs.yaoulive.com/Group%201384.png" : "https://downs.yaoulive.com/Group%201381.png", -1, -1, new ImgLoader.DrawableCallback() {
+        ImgLoader.displayDrawable(mContext, WordUtil.isNewZh() ? "https://downs.yaoulive.com/%E4%B8%AD%E6%96%87%E8%A7%84%E5%88%99.png" : "https://downs.yaoulive.com/%E8%8B%B1%E6%96%87%E8%A7%84%E5%88%99.png", -1, -1, new ImgLoader.DrawableCallback() {
             @Override
             public void onLoadSuccess(Drawable drawable) {
                 iv_rule.setImageDrawable(drawable);

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

@@ -11,6 +11,7 @@ import com.makeramen.roundedimageview.RoundedImageView;
 import com.yunbao.common.R;
 import com.yunbao.common.bean.GiftWallTab2Bean;
 import com.yunbao.common.glide.ImgLoader;
+import com.yunbao.common.manager.IMLoginManager;
 import com.yunbao.common.utils.RouteUtil;
 import com.yunbao.common.utils.WordUtil;
 import com.yunbao.common.views.weight.ViewClicksAntiShake;
@@ -57,14 +58,14 @@ public class GiftWallTab2List2Dialog extends AbsDialogCenterPopupWindow {
         giftName = findViewById(R.id.gift_name);
 
         ImgLoader.display(mContext, gift.getGiftIcon(), giftImage);
-        if (gift.getNamingLiveActiveRankHide() == 0) {
+        if (gift.getNamingLiveActiveRankHide() == 0 || gift.getNamingLiveId()== IMLoginManager.get(mContext).getUserInfo().getId()) {
             ImgLoader.display(mContext, gift.getNamingLiveAvatar(), user2Avatar);
             user2Name.setText(gift.getNamingLiveNicename());
         } else {
             user2Avatar.setImageResource(R.mipmap.hide);
             user2Name.setText(WordUtil.getNewString(R.string.mystery_man));
         }
-        if (gift.getNamingUserActiveRankHide() == 0) {
+        if (gift.getNamingUserActiveRankHide() == 0|| gift.getNamingUserId()== IMLoginManager.get(mContext).getUserInfo().getId()) {
             ImgLoader.display(mContext, gift.getNamingUserAvatar(), user1Avatar);
             user1Name.setText(gift.getNamingUserNicename());
         } else {

common/src/main/java/com/yunbao/common/fragment/GiftWallMainTab1Fragment.java

@@ -93,8 +93,13 @@ public class GiftWallMainTab1Fragment extends BaseFragment {
     @Override
     public void updateData() {
         super.updateData();
+        if (list1Adapter != null) {
             list1Adapter.notifyDataSetChanged();
+
+        }
+        if (list2Adapter != null) {
             list2Adapter.notifyDataSetChanged();
+        }
 
     }
 

common/src/main/java/com/yunbao/common/fragment/GiftWallMainTab2Fragment.java

@@ -53,6 +53,7 @@ public class GiftWallMainTab2Fragment extends BaseFragment {
     String anchorId;
     boolean isAnchor;
     private boolean isLiveRoom;
+    private boolean isTab2;
 
     public GiftWallMainTab2Fragment setToUserId(String toUserId) {
         this.toUserId = toUserId;
@@ -151,11 +152,14 @@ public class GiftWallMainTab2Fragment extends BaseFragment {
                     public Unit invoke(Integer fromIndex, List<Integer> selectIndexList, Boolean select, Boolean fromUser) {
                         //参考setOnSelectViewChange
                         //只不过对象从view,变成了view在ViewGroup中的索引
-                        if (fromIndex == 0) {
+                        if (isTab2 && fromIndex == -1) {
+                            fromIndex = 1;
+                        } else if (fromIndex == 0) {
                             fromIndex = 1;
                         } else {
                             fromIndex = 0;
                         }
+
                         setDslTabColor(fromIndex == 0 ? dslTab1 : dslTab2, fromIndex == 1 ? dslTab1 : dslTab2);
                         type = (fromIndex + 1);
                         list1Adapter.setNowRank(fromIndex == 0);
@@ -179,7 +183,7 @@ public class GiftWallMainTab2Fragment extends BaseFragment {
             @Override
             public void onViewClicks() {
                 spinnerImage.setRotation(180);
-                ((XPopup.Builder) spinner.getTag()).asCustom(new GiftWallMainTab1List2SpinnerDialog(getContext(),1, new OnItemClickListener<Integer>() {
+                ((XPopup.Builder) spinner.getTag()).asCustom(new GiftWallMainTab1List2SpinnerDialog(getContext(), 1, new OnItemClickListener<Integer>() {
                     @Override
                     public void onItemClick(Integer bean, int position) {
                         if (bean > -1) {
@@ -203,8 +207,12 @@ public class GiftWallMainTab2Fragment extends BaseFragment {
 
             }
         });
+        if (isTab2) {
+            tabLayout.onPageSelected(1);
+        } else {
             initData();
         }
+    }
 
     void setDslTabColor(TextView select, TextView unSelect) {
         select.getPaint().setShader(new LinearGradient(0, 0, 0, select.getPaint().getTextSize(),
@@ -216,9 +224,9 @@ public class GiftWallMainTab2Fragment extends BaseFragment {
     void initData() {
         list1Adapter.clear();
         list2Adapter.clear();
-        if(type==2){
+        if (type == 2) {
             spinner.setVisibility(View.INVISIBLE);
-        }else {
+        } else {
             spinner.setVisibility(View.VISIBLE);
         }
         LiveNetManager.get(getContext())
@@ -254,7 +262,7 @@ public class GiftWallMainTab2Fragment extends BaseFragment {
         list1Adapter.setList(bean.getIlluminateData().getWeekStartData());
         list2Adapter.setList(bean.getIlluminateData().getGiftData());
         show_time.setText(String.format(Locale.getDefault(), "%s%s - %s",
-               WordUtil.getNewString(type==1?R.string.dialog_gift_wall_time_now:R.string.dialog_gift_wall_time_old),
+                WordUtil.getNewString(type == 1 ? R.string.dialog_gift_wall_time_now : R.string.dialog_gift_wall_time_old),
                 bean.getGift_hall_start_date(),
                 bean.getGift_hall_end_date()));
     }
@@ -263,4 +271,8 @@ public class GiftWallMainTab2Fragment extends BaseFragment {
     protected void loadData() {
 
     }
+
+    public void setTab2() {
+        isTab2 = true;
+    }
 }

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

@@ -122,6 +122,7 @@
                         android:layout_height="wrap_content">
 
                         <ImageView
+                            android:id="@+id/diamond_icon"
                             android:layout_width="18dp"
                             android:layout_height="18dp"
                             android:layout_weight="1"
@@ -373,6 +374,8 @@
             android:minWidth="32dp"
             android:text="需10个"
             android:textSize="8dp"
+            android:visibility="gone"
+            tools:visibility="visible"
             android:translationZ="2dp"
             app:layout_constraintBottom_toTopOf="@+id/btn_one"
             app:layout_constraintEnd_toEndOf="@+id/btn_one" />

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

@@ -21,7 +21,6 @@
         app:layout_constraintVertical_bias="0.0" />
 
 
-
     <androidx.core.widget.NestedScrollView
         android:id="@+id/scrollView"
         android:layout_width="match_parent"
@@ -80,12 +79,12 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="16dp"
-                    tools:text="TextView"
                     android:textColor="#FFD3A4"
                     android:textSize="16sp"
                     app:layout_constraintEnd_toEndOf="@+id/user_avatar_container"
                     app:layout_constraintStart_toStartOf="@+id/user_avatar_container"
-                    app:layout_constraintTop_toBottomOf="@+id/user_avatar_container" />
+                    app:layout_constraintTop_toBottomOf="@+id/user_avatar_container"
+                    tools:text="TextView" />
 
                 <androidx.constraintlayout.widget.ConstraintLayout
                     android:id="@+id/user_avatar_container"
@@ -206,12 +205,12 @@
                                 android:id="@+id/user_avatar_2"
                                 android:layout_width="0dp"
                                 android:layout_height="0dp"
-                                tools:src="@mipmap/icon_avatar_placeholder"
                                 app:layout_constraintBottom_toBottomOf="parent"
                                 app:layout_constraintEnd_toEndOf="parent"
                                 app:layout_constraintStart_toStartOf="parent"
                                 app:layout_constraintTop_toTopOf="parent"
-                                app:riv_oval="true" />
+                                app:riv_oval="true"
+                                tools:src="@mipmap/icon_avatar_placeholder" />
                         </androidx.constraintlayout.widget.ConstraintLayout>
 
                         <ImageView
@@ -231,24 +230,25 @@
                             android:ellipsize="end"
                             android:gravity="center"
                             android:maxLines="1"
-                            tools:text="TextView"
                             android:textColor="#FFFFFF"
                             android:textSize="14sp"
                             app:layout_constraintBottom_toTopOf="@+id/user_value_2"
                             app:layout_constraintEnd_toEndOf="@+id/imageView17"
-                            app:layout_constraintStart_toStartOf="@+id/imageView17"/>
+                            app:layout_constraintStart_toStartOf="@+id/imageView17"
+                            tools:text="TextView" />
 
                         <TextView
                             android:id="@+id/user_value_2"
                             android:layout_width="wrap_content"
                             android:layout_height="0dp"
                             android:layout_marginBottom="5dp"
-                            tools:text="TextView"
+                            android:gravity="center"
                             android:textColor="#FFFFFF"
                             android:textSize="20sp"
                             app:layout_constraintBottom_toBottomOf="@+id/imageView17"
                             app:layout_constraintEnd_toEndOf="@+id/user_name_2"
-                            app:layout_constraintStart_toStartOf="@+id/user_name_2" />
+                            app:layout_constraintStart_toStartOf="@+id/user_name_2"
+                            tools:text="TextView" />
 
                     </androidx.constraintlayout.widget.ConstraintLayout>
 
@@ -293,12 +293,12 @@
                                 android:id="@+id/user_avatar_1"
                                 android:layout_width="0dp"
                                 android:layout_height="0dp"
-                                tools:src="@mipmap/icon_avatar_placeholder"
                                 app:layout_constraintBottom_toBottomOf="parent"
                                 app:layout_constraintEnd_toEndOf="parent"
                                 app:layout_constraintStart_toStartOf="parent"
                                 app:layout_constraintTop_toTopOf="parent"
-                                app:riv_oval="true" />
+                                app:riv_oval="true"
+                                tools:src="@mipmap/icon_avatar_placeholder" />
 
                             <androidx.constraintlayout.widget.ConstraintLayout
                                 android:layout_width="match_parent"
@@ -323,24 +323,26 @@
                             android:ellipsize="end"
                             android:gravity="center"
                             android:maxLines="1"
-                            tools:text="TextView"
                             android:textColor="#FFFFFF"
                             android:textSize="14sp"
                             app:layout_constraintBottom_toTopOf="@+id/user_value_1"
                             app:layout_constraintEnd_toEndOf="@+id/imageView9"
-                            app:layout_constraintStart_toStartOf="@+id/imageView9" />
+                            app:layout_constraintHorizontal_bias="0.0"
+                            app:layout_constraintStart_toStartOf="@+id/imageView9"
+                            tools:text="TextView" />
 
                         <TextView
                             android:id="@+id/user_value_1"
                             android:layout_width="wrap_content"
                             android:layout_height="0dp"
-                            android:layout_marginBottom="5dp"
+                            android:layout_marginBottom="10dp"
-                            tools:text="TextView"
+                            android:gravity="center"
                             android:textColor="#FFFFFF"
                             android:textSize="20sp"
                             app:layout_constraintBottom_toBottomOf="@+id/imageView9"
                             app:layout_constraintEnd_toEndOf="@+id/user_name_1"
-                            app:layout_constraintStart_toStartOf="@+id/user_name_1" />
+                            app:layout_constraintStart_toStartOf="@+id/user_name_1"
+                            tools:text="Mystery Man" />
 
                     </androidx.constraintlayout.widget.ConstraintLayout>
 
@@ -384,12 +386,12 @@
                                 android:id="@+id/user_avatar_3"
                                 android:layout_width="0dp"
                                 android:layout_height="0dp"
-                                tools:src="@mipmap/icon_avatar_placeholder"
                                 app:layout_constraintBottom_toBottomOf="parent"
                                 app:layout_constraintEnd_toEndOf="parent"
                                 app:layout_constraintStart_toStartOf="parent"
                                 app:layout_constraintTop_toTopOf="parent"
-                                app:riv_oval="true" />
+                                app:riv_oval="true"
+                                tools:src="@mipmap/icon_avatar_placeholder" />
                         </androidx.constraintlayout.widget.ConstraintLayout>
 
                         <ImageView
@@ -409,24 +411,25 @@
                             android:ellipsize="end"
                             android:gravity="center"
                             android:maxLines="1"
-                            tools:text="TextView"
                             android:textColor="#FFFFFF"
                             android:textSize="14sp"
                             app:layout_constraintBottom_toTopOf="@+id/user_value_3"
                             app:layout_constraintEnd_toEndOf="@+id/imageView16"
-                            app:layout_constraintStart_toStartOf="@+id/imageView16" />
+                            app:layout_constraintStart_toStartOf="@+id/imageView16"
+                            tools:text="TextView" />
 
                         <TextView
                             android:id="@+id/user_value_3"
                             android:layout_width="wrap_content"
                             android:layout_height="0dp"
                             android:layout_marginBottom="5dp"
-                            tools:text="TextView"
+                            android:gravity="center"
                             android:textColor="#FFFFFF"
                             android:textSize="20sp"
                             app:layout_constraintBottom_toBottomOf="parent"
                             app:layout_constraintEnd_toEndOf="@+id/user_name_3"
-                            app:layout_constraintStart_toStartOf="@+id/user_name_3" />
+                            app:layout_constraintStart_toStartOf="@+id/user_name_3"
+                            tools:text="TextView" />
                     </androidx.constraintlayout.widget.ConstraintLayout>
 
                 </LinearLayout>
@@ -472,6 +475,7 @@
             </androidx.constraintlayout.widget.ConstraintLayout>
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
+
     <ImageView
         android:id="@+id/iv_back"
         android:layout_width="wrap_content"

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

@@ -17,7 +17,7 @@
 
     <ImageView
         android:id="@+id/gift_soles"
-        android:layout_width="wrap_content"
+        android:layout_width="58dp"
 
         android:layout_height="20dp"
         app:layout_constraintBottom_toBottomOf="@+id/gift_bg"

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

@@ -9,15 +9,15 @@
         android:id="@+id/gift_bg"
         android:layout_width="74dp"
         android:layout_height="74dp"
+        android:src="@mipmap/gift_wall_main_item_bg1"
         app:autoPlay="true"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
-        android:src="@mipmap/gift_wall_main_item_bg1" />
 
     <ImageView
         android:id="@+id/gift_soles"
-        android:layout_width="wrap_content"
+        android:layout_width="58dp"
 
         android:layout_height="20dp"
         app:layout_constraintBottom_toBottomOf="@+id/gift_bg"
@@ -28,13 +28,16 @@
     <TextView
         android:id="@+id/gift_status"
         android:layout_width="wrap_content"
-        android:textSize="10sp"
-        android:textColor="#01071A"
         android:layout_height="wrap_content"
-        tools:text="未點亮"
+        android:gravity="center"
+        android:maxLines="1"
+        android:textColor="#01071A"
+
+        android:textSize="10sp"
         app:layout_constraintBottom_toBottomOf="@+id/gift_bg"
         app:layout_constraintEnd_toEndOf="@+id/gift_soles"
-        app:layout_constraintStart_toStartOf="@+id/gift_soles" />
+        app:layout_constraintStart_toStartOf="@+id/gift_soles"
+        tools:text="未點亮 00/000" />
 
     <ImageView
         android:id="@+id/gift"
@@ -63,8 +66,10 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
         android:layout_marginEnd="8dp"
-        android:textColor="#FFFFFF"
+        android:ellipsize="end"
         android:gravity="center"
+        android:maxLines="2"
+        android:textColor="#FFFFFF"
         android:textSize="11sp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"

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

@@ -1541,4 +1541,9 @@
     <string name="dialog_gift_wall_assistance_star">助力值</string>
     <string name="dialog_gift_wall_time_now">本期展館時間:</string>
     <string name="dialog_gift_wall_time_old">上期展館時間:</string>
+    <string name="live_end_view_ban_title">您由於【%s】 違規被中斷直播</string>
+    <string name="live_end_view_ban_reason">違規原因:</string>
+    <string name="live_end_view_ban_content">處罰內容:</string>
+    <string name="live_end_view_ban_timer">處罰時間:</string>
+
 </resources>

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

@@ -1549,4 +1549,9 @@
     <string name="dialog_gift_wall_time_old">Last hall time:</string>
 
     <string name="sub_admission_fee">*10% of the threshold will be charged as ticket</string>
+
+    <string name="live_end_view_ban_title">You were interrupted from the live broadcast due to violation of [%s].  </string>
+    <string name="live_end_view_ban_reason">Violation reasons:</string>
+    <string name="live_end_view_ban_content">Penalty content:</string>
+    <string name="live_end_view_ban_timer">Penalty time:</string>
 </resources>

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

@@ -1729,7 +1729,6 @@ public abstract class LiveActivity extends AbsActivity implements SocketMessageL
     protected void release() {
         EventBus.getDefault().unregister(this);
         LiveHttpUtil.cancel(LiveHttpConsts.SEND_DANMU);
-        LoadDian9TuUtil.clearBitmap();
         if (mKeyBoardHeightUtil != null) {
             mKeyBoardHeightUtil.release();
         }
@@ -1778,6 +1777,11 @@ public abstract class LiveActivity extends AbsActivity implements SocketMessageL
         Constants.isSend = "0";
     }
 
+    private void claerBitmap(){
+        LoadDian9TuUtil.clearBitmap();
+    }
+
+
     /**
      * 显示个人资料弹窗
      */
@@ -1835,6 +1839,7 @@ public abstract class LiveActivity extends AbsActivity implements SocketMessageL
     @Override
     protected void onDestroy() {
         release();
+        claerBitmap();
         super.onDestroy();
     }
 

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

@@ -982,6 +982,7 @@ public class LiveSwAnchorActivity extends LiveActivity implements LiveFunctionCl
                     }
 
                     if (mLivePushViewHolder != null) {
+                        mLivePushViewHolder.closeLive();
                         mLivePushViewHolder.release();
                     }
                     if (mLiveLinkMicPresenter != null) {

live/src/main/java/com/yunbao/live/adapter/FreePkRecyclerAdapter.java

@@ -25,6 +25,7 @@ import com.yunbao.common.manager.IMLoginManager;
 import com.yunbao.common.utils.AppManager;
 import com.yunbao.common.utils.ToastUtil;
 import com.yunbao.common.utils.WordUtil;
+import com.yunbao.common.views.weight.ViewClicksAntiShake;
 import com.yunbao.live.R;
 import com.yunbao.live.activity.LiveRyAnchorActivity;
 import com.yunbao.live.activity.LiveSwAnchorActivity;
@@ -129,7 +130,9 @@ public class FreePkRecyclerAdapter extends RefreshAdapter<RandomPkUserBean> {
             mAvatar = itemView.findViewById(R.id.item_avatar);
             mPkStatus = itemView.findViewById(R.id.item_pk);
             mFollow = itemView.findViewById(R.id.item_follow);
-            mPkStatus.setOnClickListener(v -> {
+            ViewClicksAntiShake.clicksAntiShake(mPkStatus, new ViewClicksAntiShake.ViewClicksCallBack() {
+                @Override
+                public void onViewClicks() {
                     RandomPkUserBean bean = (RandomPkUserBean) itemView.getTag();
                     if (bean.isPk()) {
                         ToastUtil.show(mContext.getString(R.string.free_pk_user_pking));
@@ -229,8 +232,7 @@ public class FreePkRecyclerAdapter extends RefreshAdapter<RandomPkUserBean> {
                             }
                         }
                     });
-
+                }
-
             });
             mFollow.setOnClickListener(v -> {
                 RandomPkUserBean bean = (RandomPkUserBean) itemView.getTag();

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

@@ -853,12 +853,14 @@ public class LiveGiftPopup extends AbsDialogFragment {
                                                 .append(liveGiftModel.getNamingUserCoin())
                                                 .append("  ");
                                     }
+                                    String hideName=liveGiftModel.getNamingUid().equals(IMLoginManager.get(mContext).getUserInfo().getId()+"")?liveGiftModel.getNamingUserName():WordUtil.getNewString(R.string.mystery_man);
+                                    String hideLiveName=liveGiftModel.getNamingLiveuid().equals(IMLoginManager.get(mContext).getUserInfo().getId()+"")?liveGiftModel.getNamingLiveName():WordUtil.getNewString(R.string.mystery_man);
                                     namingNameText.append(mContext.getText(com.yunbao.live.R.string.title_anchor))
                                             .append(liveGiftModel.getNamingLiveName())
                                             .append("  ")
                                             .append(mContext.getText(com.yunbao.live.R.string.the_title_financier))
                                             .append("  ")
-                                            .append(liveGiftModel.getNaming_user_gift_hall_rank_hide()==0?liveGiftModel.getNamingUserName():WordUtil.getNewString(R.string.mystery_man));
+                                            .append(liveGiftModel.getNaming_user_gift_hall_rank_hide()==0?liveGiftModel.getNamingUserName():hideName);
                                     namingName.setText(namingNameText.toString());
                                 } else {
                                     namingLayout.setVisibility(View.GONE);
@@ -934,7 +936,6 @@ public class LiveGiftPopup extends AbsDialogFragment {
                 !TextUtils.isEmpty(liveGiftModel.getNamingUid()) &&
                 !TextUtils.equals(liveGiftModel.getNamingLiveuid(), "0") &&
                 !TextUtils.equals(liveGiftModel.getNamingUid(), "0")) {
-            ToastUtil.show("显示");
             namingLayout.setVisibility(View.VISIBLE);
             ImgLoader.display(mContext, liveGiftModel.getNamingLiveAvatar(), namingAvatar);
             StringBuffer namingNameText = new StringBuffer();
@@ -946,11 +947,13 @@ public class LiveGiftPopup extends AbsDialogFragment {
                 namingNameText.append("Get title:  ")
                         .append(liveGiftModel.getNamingUserCoin());
             }
+            String hideName=liveGiftModel.getNamingUid().equals(IMLoginManager.get(mContext).getUserInfo().getId()+"")?liveGiftModel.getNamingUserName():WordUtil.getNewString(R.string.mystery_man);
+            String hideLiveName=liveGiftModel.getNamingLiveuid().equals(IMLoginManager.get(mContext).getUserInfo().getId()+"")?liveGiftModel.getNamingLiveName():WordUtil.getNewString(R.string.mystery_man);
             namingNameText.append(mContext.getText(com.yunbao.live.R.string.title_anchor))
                     .append(liveGiftModel.getNamingLiveName())
                     .append("  ")
                     .append(mContext.getText(com.yunbao.live.R.string.the_title_financier))
-                    .append(liveGiftModel.getNaming_user_gift_hall_rank_hide()==0?liveGiftModel.getNamingUserName():WordUtil.getNewString(R.string.mystery_man));
+                    .append(liveGiftModel.getNaming_user_gift_hall_rank_hide()==0?liveGiftModel.getNamingUserName():hideName);
             namingName.setText(namingNameText.toString());
         } else {
             namingLayout.setVisibility(View.GONE);

live/src/main/java/com/yunbao/live/presenter/LiveSwLinkMicPkPresenter.java

@@ -767,7 +767,6 @@ public class LiveSwLinkMicPkPresenter extends AbsLinkMicPkPresenter implements V
                                                                     @Override
                                                                     public void onError(io.rong.imlib.model.Message message, RongIMClient.ErrorCode errorCode) {
                                                                         Log.e("tx", "aaa" + errorCode.toString());
-                                                                        ToastUtil.show(errorCode.code + ":" + errorCode.msg);
                                                                     }
                                                                 });
 
@@ -801,7 +800,6 @@ public class LiveSwLinkMicPkPresenter extends AbsLinkMicPkPresenter implements V
                                                                     @Override
                                                                     public void onError(io.rong.imlib.model.Message message, RongIMClient.ErrorCode errorCode) {
                                                                         Log.e("tx", "aaa" + errorCode.toString());
-                                                                        ToastUtil.show(errorCode.code + ":" + errorCode.msg);
                                                                     }
                                                                 });
                                                             }
@@ -829,7 +827,6 @@ public class LiveSwLinkMicPkPresenter extends AbsLinkMicPkPresenter implements V
                                                                     @Override
                                                                     public void onError(io.rong.imlib.model.Message message, RongIMClient.ErrorCode errorCode) {
                                                                         Log.e("tx", "aaa" + errorCode.toString());
-                                                                        ToastUtil.show(errorCode.code + ":" + errorCode.msg);
                                                                     }
                                                                 });
                                                             }

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

@@ -21,6 +21,7 @@ import androidx.recyclerview.widget.RecyclerView;
 
 import com.lxj.xpopup.XPopup;
 import com.makeramen.roundedimageview.RoundedImageView;
+import com.yunbao.common.manager.IMLoginManager;
 import com.yunbao.common.utils.MobclickAgent;
 import com.yunbao.common.bean.LiveGiftBean;
 import com.yunbao.common.event.LiveGiftDialogEvent;
@@ -102,7 +103,7 @@ public class FrameGiftViewHolder extends RecyclerView.ViewHolder {
         giftName.setText(model.getName());
 //        }
 
-        if (model.getNaming_user_gift_hall_rank_hide() == 1) {
+        if (model.getNaming_user_gift_hall_rank_hide() == 1 && !model.getNamingUid().equals(IMLoginManager.get(mContext).getUserInfo().getId() + "")) {
             avatar.setImageResource(com.yunbao.common.R.mipmap.hide);
             naming_name.setText(WordUtil.getNewString(com.yunbao.common.R.string.mystery_man));
         } else {

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

@@ -77,6 +77,8 @@ public class LiveEndViewHolder extends AbsViewHolder implements View.OnClickList
     private IMLoginModel model = null;
     private String live_id;
     private String leaveStream, leaveGroupId;
+    private TextView banContent, banReason, banTimer;
+    private View banLayout;
 
     public LiveEndViewHolder(Context context, ViewGroup parentView, String uid) {
         super(context, parentView);
@@ -208,7 +210,7 @@ public class LiveEndViewHolder extends AbsViewHolder implements View.OnClickList
 
                     @Override
                     public void onError(String error) {
-                          ToastUtil.show(WordUtil.isNewZh()?"抱歉！出錯了！":"i \\'m sorry! An error occurred");
+                        ToastUtil.show(WordUtil.isNewZh() ? "抱歉！出錯了！" : "i \\'m sorry! An error occurred");
                     }
                 });
     }
@@ -258,6 +260,11 @@ public class LiveEndViewHolder extends AbsViewHolder implements View.OnClickList
         liveDurationAnchor = (TextView) findViewById(R.id.live_duration_anchor);
         liveVotes = (TextView) findViewById(R.id.live_votes);
         liveWatchNum = (TextView) findViewById(R.id.live_watch_num);
+        banContent = (TextView) findViewById(R.id.ban_content);
+        banReason = (TextView) findViewById(R.id.ban_reason);
+        banTimer = (TextView) findViewById(R.id.ban_timer);
+        banLayout=findViewById(R.id.banLayout);
+
         findViewById(R.id.go_home_anchor)
                 .setOnClickListener(new View.OnClickListener() {
                     @Override
@@ -366,7 +373,7 @@ public class LiveEndViewHolder extends AbsViewHolder implements View.OnClickList
             ((LiveAudienceActivity) mContext).exitLiveRoom();
         } else if (mContext instanceof LiveSwAnchorActivity) {
             ((LiveSwAnchorActivity) mContext).superBackPressed();
-        }else if(mContext instanceof LiveRyAnchorActivity){
+        } else if (mContext instanceof LiveRyAnchorActivity) {
             ((LiveRyAnchorActivity) mContext).superBackPressed();
         }
         Bus.get().post(new CloseEvent());
@@ -424,7 +431,7 @@ public class LiveEndViewHolder extends AbsViewHolder implements View.OnClickList
 
                     new LiveRoomCheckLivePresenter(mContext, liveBean.getUid(), liveBean.getStream(), new LiveRoomCheckLivePresenter.NewActionListener() {
                         @Override
-                        public void onLiveRoomChanged(String liveUid, String stream, int liveType, String liveTypeVal, String liveSdk,boolean isSw) {
+                        public void onLiveRoomChanged(String liveUid, String stream, int liveType, String liveTypeVal, String liveSdk, boolean isSw) {
                             if (liveBean == null) {
                                 return;
                             }
@@ -450,7 +457,7 @@ public class LiveEndViewHolder extends AbsViewHolder implements View.OnClickList
                         ((LiveAudienceActivity) mContext).exitLiveRoom();
                     } else if (mContext instanceof LiveSwAnchorActivity) {
                         ((LiveSwAnchorActivity) mContext).superBackPressed();
-                    }else if(mContext instanceof LiveRyAnchorActivity){
+                    } else if (mContext instanceof LiveRyAnchorActivity) {
                         ((LiveRyAnchorActivity) mContext).superBackPressed();
                     }
                 }

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

@@ -667,6 +667,13 @@ public class LivePushSwViewHolder extends AbsRyLivePushViewHolder implements ITX
         }
     }
 
+    public void closeLive(){
+        if (swManager != null) {
+            swManager.exitChannelAll();
+        }
+    }
+
+
     public interface onDrPkJoinSuccessListener{
         void joinSuccess1();
         void joinSuccess2();

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

@@ -4721,8 +4721,17 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
         mRefreshUserListCallback = null;
         mTimeChargeCallback = null;
         Contexts = null;
+        if(drawableBg!=null){
+            drawableBg.clear();
+        }
         drawableBg = null;
+        if(drawableTitleCn!=null){
+            drawableTitleCn.clear();
+        }
         drawableTitleCn = null;
+        if(drawableTitleEn!=null){
+            drawableTitleEn.clear();
+        }
         drawableTitleEn = null;
     }
 

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

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:clickable="true">
@@ -15,7 +16,8 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="#b3000000"
-        android:visibility="gone">
+        android:visibility="gone"
+        tools:visibility="visible">
 
         <TextView
             android:id="@+id/text_1"
@@ -137,6 +139,111 @@
 
         </LinearLayout>
 
+        <LinearLayout
+            android:id="@+id/banLayout"
+            android:layout_width="match_parent"
+            android:layout_height="180dp"
+            android:layout_below="@id/group"
+            android:visibility="gone"
+            android:layout_centerHorizontal="true"
+            android:layout_marginLeft="20dp"
+            android:layout_marginTop="20dp"
+            android:layout_marginRight="20dp"
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/ban_title"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:text="@string/live_end_view_ban_title"
+                android:textColor="#E5E5E5"
+                android:textSize="14sp" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="44dp"
+                android:layout_marginTop="10dp"
+                android:gravity="center"
+                android:background="@drawable/bg_live_end"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:layout_width="0dp"
+                    android:layout_marginLeft="10dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:text="@string/live_end_view_ban_reason"
+                    android:textColor="#E5E5E5"
+                    android:textSize="14sp" />
+
+                <TextView
+                    android:id="@+id/ban_reason"
+                    android:layout_width="wrap_content"
+                    android:layout_marginRight="17dp"
+                    android:layout_height="wrap_content"
+                    android:gravity="end"
+                    android:text="123\n45678"
+                    android:textColor="#E5E5E5"
+                    android:textSize="14sp" />
+            </LinearLayout>
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="44dp"
+                android:layout_marginTop="10dp"
+                android:gravity="center"
+                android:background="@drawable/bg_live_end"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:layout_width="0dp"
+                    android:layout_marginLeft="10dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:text="@string/live_end_view_ban_content"
+                    android:textColor="#E5E5E5"
+                    android:textSize="14sp" />
+
+                <TextView
+                    android:id="@+id/ban_content"
+                    android:layout_width="wrap_content"
+                    android:layout_marginRight="17dp"
+                    android:layout_height="wrap_content"
+                    android:gravity="end"
+                    android:text="123\n45678"
+                    android:textColor="#E5E5E5"
+                    android:textSize="14sp" />
+            </LinearLayout>
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="44dp"
+                android:layout_marginTop="10dp"
+                android:gravity="center"
+                android:background="@drawable/bg_live_end"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:layout_width="0dp"
+                    android:layout_marginLeft="10dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:text="@string/live_end_view_ban_timer"
+                    android:textColor="#E5E5E5"
+                    android:textSize="14sp" />
+
+                <TextView
+                    android:id="@+id/ban_timer"
+                    android:layout_width="wrap_content"
+                    android:layout_marginRight="17dp"
+                    android:layout_height="wrap_content"
+                    android:gravity="end"
+                    android:text="123\n45678"
+                    android:textColor="#E5E5E5"
+                    android:textSize="14sp" />
+            </LinearLayout>
+
+        </LinearLayout>
+
         <com.makeramen.roundedimageview.RoundedImageView
             android:id="@+id/avatar_2"
             android:layout_width="100dp"
@@ -151,7 +258,7 @@
             android:id="@+id/btn_back"
             android:layout_width="match_parent"
             android:layout_height="48dp"
-            android:layout_below="@id/group"
+            android:layout_below="@id/banLayout"
             android:layout_marginLeft="50dp"
             android:layout_marginTop="50dp"
             android:layout_marginRight="50dp"
@@ -169,7 +276,8 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="#b3000000"
-        android:visibility="visible">
+        android:visibility="visible"
+        tools:visibility="gone">
 
 
         <View
@@ -259,9 +367,11 @@
                 android:background="@drawable/background_live_end"
                 android:gravity="center"
                 android:padding="10dp">
+
                 <LinearLayout
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content">
+
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
@@ -464,9 +574,9 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="12dp"
+                        android:gravity="center"
                         android:text="@string/live_watch_num"
                         android:textColor="@color/white"
-                        android:gravity="center"
                         android:textSize="13.33sp" />
                 </LinearLayout>
             </LinearLayout>

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

@@ -120,13 +120,14 @@
         android:layout_width="56dp"
         android:layout_height="15dp"
         android:layout_gravity="bottom"
-        android:visibility="gone"
         android:layout_marginStart="11dp"
         android:background="@drawable/background_naming_icon"
         android:gravity="center"
         android:text="@string/the_title_financier2"
         android:textColor="#DB7008"
-        android:textSize="10sp" />
+        android:textSize="10sp"
+        android:visibility="gone"
+        tools:visibility="visible" />
 
     <com.opensource.svgaplayer.SVGAImageView
         android:layout_marginTop="12dp"

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

@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/root"
-    android:layout_width="match_parent"
-    android:layout_height="60dp"
-    android:clipChildren="false"
-    tools:visibility="visible"
-    android:visibility="invisible">
-
-    <com.opensource.svgaplayer.SVGAImageView
-        android:id="@+id/root_back"
-        android:layout_width="204dp"
-        android:layout_height="45dp"
-        android:scaleType="fitStart"
-        android:layout_gravity="bottom"
-        app:autoPlay="true"
-        android:layout_marginLeft="10dp"
-        />
-
-    <View
-        android:id="@+id/bg"
-        android:layout_width="204dp"
-        android:layout_height="50dp"
-        android:layout_gravity="bottom"
-        android:layout_marginLeft="10dp"
-        android:background="@mipmap/icon_live_gift_anim_4"
-        android:translationX="-214dp" />
-
-    <View
-        android:id="@+id/star"
-        android:layout_width="38dp"
-        android:layout_height="50dp"
-        android:layout_gravity="bottom"
-        android:layout_marginLeft="214dp"
-        android:background="@mipmap/icon_live_gift_anim_5"
-        android:visibility="invisible" />
-
-    <LinearLayout
-        android:id="@+id/content_layout"
-        android:layout_width="match_parent"
-        android:layout_height="45dp"
-        android:layout_gravity="bottom"
-        android:layout_marginLeft="10dp"
-        android:gravity="center_vertical"
-        android:orientation="horizontal">
-
-        <com.makeramen.roundedimageview.RoundedImageView
-            android:id="@+id/avatar"
-            android:layout_width="32dp"
-            android:layout_height="32dp"
-            android:layout_marginLeft="10dp"
-            android:layout_marginRight="8dp"
-            android:scaleType="centerCrop"
-            app:riv_oval="true" />
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:id="@+id/name"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textColor="@color/white"
-                android:textSize="12sp" />
-
-            <TextView
-                android:id="@+id/content"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:ellipsize="end"
-                android:singleLine="true"
-                android:textColor="@color/white"
-                android:textSize="12sp" />
-
-        </LinearLayout>
-
-        <ImageView
-            android:layout_marginLeft="10dp"
-            android:id="@+id/gift_icon"
-            android:layout_width="40dp"
-            android:layout_height="match_parent" />
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:id="@+id/gift_group_count"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textColor="@color/white"
-                android:textSize="14sp" />
-
-            <TextView
-                android:id="@+id/mul_sign"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textColor="@color/yellow4"
-                android:textSize="14sp"
-                android:textStyle="bold" />
-
-        </LinearLayout>
-
-        <TextView
-            android:id="@+id/gift_count"
-            android:layout_width="150dp"
-            android:layout_height="32dp"
-            android:singleLine="true"
-            android:visibility="invisible" />
-    </LinearLayout>
-
-    <TextView
-        android:id="@+id/naming_icon"
-        android:layout_width="56dp"
-        android:layout_height="15dp"
-        android:layout_gravity="bottom"
-        android:visibility="gone"
-        android:layout_marginStart="11dp"
-        android:background="@drawable/background_naming_icon"
-        android:gravity="center"
-        android:text="@string/the_title_financier2"
-        android:textColor="#DB7008"
-        android:textSize="10sp" />
-
-    <com.opensource.svgaplayer.SVGAImageView
-        android:layout_marginTop="12dp"
-        android:layout_marginStart="20dp"
-        android:id="@+id/gift_naming_icon"
-        android:layout_width="27dp"
-        android:layout_height="12dp"/>
-
-</FrameLayout>

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

@@ -14,6 +14,8 @@ import android.content.Intent;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.Signature;
+import android.content.res.Configuration;
+import android.content.res.Resources;
 import android.graphics.Paint;
 import android.media.MediaPlayer;
 import android.net.Uri;
@@ -92,6 +94,7 @@ import com.yunbao.common.utils.ToastUtil;
 import com.yunbao.common.http.LiveHttpUtil;
 import com.yunbao.common.utils.LiveRoomCheckLivePresenter;
 import com.yunbao.common.utils.WordUtil;
+import com.yunbao.common.views.weight.ViewClicksAntiShake;
 import com.yunbao.main.R;
 import com.yunbao.main.dialog.LoginTipsDialog;
 import com.yunbao.main.http.MainHttpUtil;
@@ -137,6 +140,20 @@ public class EntryActivity extends AppCompatActivity {
 
     private WebView webview;
     private WebSettings webSettings;
+    private View webViewLayout;
+    private View webBack;
+
+
+    @Override
+    public Resources getResources() {
+        Resources res = super.getResources();
+        Configuration config = new Configuration();
+        config.setToDefaults();
+        config.locale = IMLoginManager.get(this).getLocaleLanguage();
+        res.updateConfiguration(config, res.getDisplayMetrics());
+        return res;
+    }
+
 
     @Subscribe(threadMode = ThreadMode.MAIN)
     public void close(String str) {
@@ -225,7 +242,9 @@ public class EntryActivity extends AppCompatActivity {
         btn_tip1.getPaint().setFlags(Paint.UNDERLINE_TEXT_FLAG);
         btn_tip1.getPaint().setAntiAlias(true);
 
-        webview = (WebView) findViewById(R.id.webview);
+        webview = findViewById(R.id.webview);
+        webViewLayout = findViewById(R.id.webview_container);
+        webBack = findViewById(R.id.btn_back1);
         initView();
         btn_tip1.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -377,11 +396,22 @@ public class EntryActivity extends AppCompatActivity {
                 }
             }
         });
+        ViewClicksAntiShake.clicksAntiShake(webBack, new ViewClicksAntiShake.ViewClicksCallBack() {
+            @Override
+            public void onViewClicks() {
+                webViewLayout.setVisibility(View.GONE);
+            }
+        });
     }
 
-    private void verfiy(int loginType){
+    private void verfiy(int loginType) {
         this.loginType = loginType;
-        webview.setVisibility(View.VISIBLE);
+        webViewLayout.setVisibility(View.VISIBLE);
+        // 开启js支持
+        webSettings.setJavaScriptEnabled(true);
+        webview.addJavascriptInterface(new JsBridge(), "jsBridge");
+// 也可以加载本地html(webView.loadUrl("file:///android_asset/xxx.html"))
+        webview.loadUrl(CommonAppConfig.HOST + "/h5/live/TCaptcha.html" + "?isZh=" + (WordUtil.isNewZh() ? "1" : 0));
     }
 
     private int loginType;  // 1:facebook 2:google 3:twitter 4:Line
@@ -429,7 +459,7 @@ public class EntryActivity extends AppCompatActivity {
             runOnUiThread(new Runnable() {
                 @Override
                 public void run() {
-                    webview.setVisibility(View.GONE);
+                    webViewLayout.setVisibility(View.GONE);
                     //跳转
                     todo();
                 }
@@ -451,11 +481,7 @@ public class EntryActivity extends AppCompatActivity {
                 return true;
             }
         });
-// 开启js支持
+
-        webSettings.setJavaScriptEnabled(true);
-        webview.addJavascriptInterface(new JsBridge(), "jsBridge");
-// 也可以加载本地html(webView.loadUrl("file:///android_asset/xxx.html"))
-        webview.loadUrl(CommonAppConfig.HOST + "/h5/live/TCaptcha.html" + "?isZh=" + (WordUtil.isNewZh() ? "1" : 0));
     }
 
 

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

@@ -29,6 +29,8 @@ import com.bumptech.glide.request.target.DrawableImageViewTarget;
 import com.bumptech.glide.request.target.Target;
 import com.ms.banner.Banner;
 import com.ms.banner.listener.OnBannerClickListener;
+import com.yunbao.common.dialog.GiftWallDialog;
+import com.yunbao.common.manager.IMLoginManager;
 import com.yunbao.common.utils.MobclickAgent;
 import com.yunbao.common.CommonAppConfig;
 import com.yunbao.common.Constants;
@@ -211,7 +213,7 @@ public class MainHomeLiveViewHolder extends AbsMainHomeChildViewHolder implement
                     });
                 } else {
                     pp = 0;
-                    if(select==0){
+                    if (select == 0) {
                         select = list.get(0).getId();
                     }
                     MainHttpUtil.getClassLive(select, p, callback);
@@ -409,8 +411,8 @@ public class MainHomeLiveViewHolder extends AbsMainHomeChildViewHolder implement
                     liveBean.setParams(gotoRoomKey);
                     new LiveRoomCheckLivePresenter(mContext, liveBean.getUid(), liveBean.getStream(), new LiveRoomCheckLivePresenter.NewActionListener() {
                         @Override
-                        public void onLiveRoomChanged(String liveUid, String stream, int liveType, String liveTypeVal, String liveSdk,boolean isSw) {
+                        public void onLiveRoomChanged(String liveUid, String stream, int liveType, String liveTypeVal, String liveSdk, boolean isSw) {
-                            RouteUtil.forwardLiveAudienceActivity(liveBean, liveType, Integer.parseInt(liveSdk), Integer.parseInt(liveTypeVal),isSw);
+                            RouteUtil.forwardLiveAudienceActivity(liveBean, liveType, Integer.parseInt(liveSdk), Integer.parseInt(liveTypeVal), isSw);
                         }
 
                         @Override
@@ -467,6 +469,10 @@ public class MainHomeLiveViewHolder extends AbsMainHomeChildViewHolder implement
                                         WebViewActivity.forward(mContext, link, true, false);
                                     } else if ("home_page_banner_battle".equals(link)) {
                                         RouteUtil.forwardBattlePass();
+                                    } else if ("home_page_banner_giftwall".equals(link)) {
+                                        new GiftWallDialog(mContext, IMLoginManager.get(mContext).getUserInfo().getId() + "",
+                                                IMLoginManager.get(mContext).getUserInfo().getUserNicename(),null
+                                                , false).setFullWindows(true).setTab2(true).showDialog();
                                     } else {
                                         gotoLive(link);
                                     }
@@ -504,7 +510,7 @@ public class MainHomeLiveViewHolder extends AbsMainHomeChildViewHolder implement
                         }
                         new LiveRoomCheckLivePresenter(mContext, liveBean.getUid(), liveBean.getStream(), new LiveRoomCheckLivePresenter.NewActionListener() {
                             @Override
-                            public void onLiveRoomChanged(String liveUid, String stream, int liveType, String liveTypeVal, String liveSdk,boolean isSw) {
+                            public void onLiveRoomChanged(String liveUid, String stream, int liveType, String liveTypeVal, String liveSdk, boolean isSw) {
 
                                 if (LiveRoomViewHolder.mHandler != null) {
                                     LiveRoomViewHolder.mHandler.removeCallbacksAndMessages(null);
@@ -516,7 +522,7 @@ public class MainHomeLiveViewHolder extends AbsMainHomeChildViewHolder implement
                                     }
                                     EventBus.getDefault().post(new LiveRoomChangeEvent(liveBean, liveType, Integer.parseInt(liveTypeVal)));
                                 } else {
-                                    RouteUtil.forwardLiveAudienceActivity(liveBean, liveType, Integer.parseInt(liveTypeVal), Integer.parseInt(liveSdk),isSw);
+                                    RouteUtil.forwardLiveAudienceActivity(liveBean, liveType, Integer.parseInt(liveTypeVal), Integer.parseInt(liveSdk), isSw);
                                 }
                             }
 

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

@@ -69,8 +69,8 @@ public class MainHomeViewHolder extends AbsMainHomeParentViewHolder {
                     @Override
                     public void run() {
                         new GiftWallDialog(mContext, IMLoginManager.get(mContext).getUserInfo().getId() + "",
-                                IMLoginManager.get(mContext).getUserInfo().getUserNicename(),null
+                                IMLoginManager.get(mContext).getUserInfo().getUserNicename(), null
-                                , false).setFullWindows(true).showDialog();
+                                , false).setFullWindows(true).setTab2(true).showDialog();
                     }
                 });
                 return true;

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

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -295,12 +296,49 @@
         android:layout_marginTop="80dp"
         android:src="@mipmap/white_logo" />
 
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/webview_container"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:visibility="gone"
+        tools:visibility="visible">
+
+        <View
+            android:id="@+id/view2"
+            android:layout_width="match_parent"
+            android:layout_height="80dp"
+            android:background="@color/white"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <ImageView
+            android:id="@+id/btn_back1"
+            android:layout_width="40dp"
+            android:layout_height="40dp"
+            android:layout_centerVertical="true"
+            android:layout_marginTop="10dp"
+            android:onClick="backClick"
+            android:padding="9dp"
+            android:src="@mipmap/icon_back"
+            android:tint="@color/textColor"
+            app:layout_constraintBottom_toBottomOf="@+id/view2"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
         <WebView
             android:id="@+id/webview"
             android:layout_width="match_parent"
-        android:visibility="gone"
+            android:layout_height="0dp"
-        android:layout_height="match_parent"
+            android:layout_centerHorizontal="true"
-        android:layout_centerHorizontal="true" />
+            android:visibility="visible"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/view2" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+
 
 
 </RelativeLayout>