Merge branch 'dev_play_model_exo'

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

@@ -28,6 +28,8 @@ public class EnterRoomNewModel extends BaseModel {
     private String isUseHotCard = "";//是否使用热度卡
     @SerializedName("liveRoomActivity")
     private List<LiveRoomActivityModel> liveRoomActivityModels = new ArrayList<>();//活动列表
+    @SerializedName("clarityType")
+    private int clarityType;
 
     public List<LiveRoomActivityModel> getLiveRoomActivityModels() {
         return liveRoomActivityModels;
@@ -109,4 +111,12 @@ public class EnterRoomNewModel extends BaseModel {
         this.isUseHotCard = isUseHotCard;
         return this;
     }
+
+    public int getClarityType() {
+        return clarityType;
+    }
+
+    public void setClarityType(int clarityType) {
+        this.clarityType = clarityType;
+    }
 }

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

@@ -4,6 +4,8 @@ import android.app.Activity;
 import android.app.Dialog;
 import android.content.Context;
 import android.content.DialogInterface;
+import android.os.Handler;
+import android.os.Looper;
 import android.text.InputFilter;
 import android.text.InputType;
 import android.text.Spanned;
@@ -68,6 +70,20 @@ public class DialogUitl {
         }
         return dialog;
     }
+    public static void showToast(Context context,String content,long delayMillis){
+        Dialog dialog = new Dialog(context, R.style.dialog);
+        dialog.setContentView(R.layout.dialog_toast);
+        dialog.setCancelable(false);
+        dialog.setCanceledOnTouchOutside(false);
+        if (!TextUtils.isEmpty(content)) {
+            TextView titleView = (TextView) dialog.findViewById(R.id.text);
+            if (titleView != null) {
+                titleView.setText(content);
+            }
+        }
+        dialog.show();
+        new Handler(Looper.getMainLooper()).postDelayed(dialog::dismiss,delayMillis);
+    }
 
 
     public static Dialog loadingDialog(Context context) {
@@ -494,8 +510,12 @@ public class DialogUitl {
                     }
                 }
             };
-            btnConfirm.setOnClickListener(listener);
-            btnCancel.setOnClickListener(listener);
+            if(btnConfirm!=null) {
+                btnConfirm.setOnClickListener(listener);
+            }
+            if(btnCancel!=null) {
+                btnCancel.setOnClickListener(listener);
+            }
             dialog.setOnShowListener(new DialogInterface.OnShowListener() {
                 @Override
                 public void onShow(DialogInterface dialogInterface) {

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

@@ -127,8 +127,10 @@ public class CustomDrawerPopupView extends DrawerPopupView {
         ViewClicksAntiShake.clicksAntiShake(findViewById(R.id.system_notice), new ViewClicksAntiShake.ViewClicksCallBack() {
             @Override
             public void onViewClicks() {
-//                dismiss();
-
+                dismiss();
+                if (callBack != null) {
+                    callBack.systemNotice();
+                }
 
 
             }

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

@@ -2,26 +2,47 @@ package com.yunbao.common.views;
 
 import android.content.Context;
 import android.view.View;
+import android.view.ViewGroup;
 import android.widget.ImageView;
+import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
+import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 
 import com.lxj.xpopup.core.BottomPopupView;
 import com.yunbao.common.R;
+import com.yunbao.common.utils.ToastUtil;
 import com.yunbao.common.views.weight.ViewClicksAntiShake;
 
 public class LiveClarityCustomPopup extends BottomPopupView implements View.OnClickListener {
+    public static final int BAN_720 = 1;
+    public static final int BAN_1080 = 2;
     private int selectClarity = 1;
     private RelativeLayout lineSd, lineHd, lineFhd;
     private ImageView iconSd, iconHd, iconFhd;
+    private ImageView titleSDImg, titleHDImg, titleFHDImg;
+    private TextView titleSDText, titleHDText, titleFHDText;
+    private int banSelect;
 
     public int getSelectClarity() {
         return selectClarity;
     }
 
+    public LiveClarityCustomPopup(@NonNull Context context, int selectClarity, int banSelect) {
+        super(context);
+        this.banSelect = banSelect;
+        if (selectClarity == -1) {
+            selectClarity = 0;
+        }
+        this.selectClarity = selectClarity;
+    }
+
     public LiveClarityCustomPopup(@NonNull Context context, int selectClarity) {
         super(context);
+        if (selectClarity == -1) {
+            selectClarity = 0;
+        }
         this.selectClarity = selectClarity;
     }
 
@@ -55,6 +76,12 @@ public class LiveClarityCustomPopup extends BottomPopupView implements View.OnCl
         iconSd = findViewById(R.id.icon_sd);
         iconHd = findViewById(R.id.icon_hd);
         iconFhd = findViewById(R.id.icon_fhd);
+        titleSDImg = findViewById(R.id.sd);
+        titleHDImg = findViewById(R.id.hd);
+        titleFHDImg = findViewById(R.id.fhd);
+        titleSDText = findViewById(R.id.sd_text);
+        titleHDText = findViewById(R.id.hd_text);
+        titleFHDText = findViewById(R.id.fhd_text);
         selectClarity(selectClarity);
         //流畅
         ViewClicksAntiShake.clicksAntiShake(lineSd, () -> {
@@ -75,6 +102,18 @@ public class LiveClarityCustomPopup extends BottomPopupView implements View.OnCl
             selectClarity(selectClarity);
             dismiss();
         });
+        if (banSelect == BAN_720) {
+            lineFhd.setEnabled(false);
+            lineHd.setEnabled(false);
+            titleHDImg.setImageAlpha(40);
+            titleFHDImg.setImageAlpha(40);
+            titleHDText.setAlpha(0.2f);
+            titleFHDText.setAlpha(0.2f);
+        } else if (banSelect == BAN_1080) {
+            lineFhd.setEnabled(false);
+            titleFHDText.setAlpha(0.2f);
+            titleFHDImg.setImageAlpha(20);
+        }
     }
 
     /**