添加加载框

video/app/src/main/java/com/mints/helivideo/mvp/views/BaseView.java

@@ -24,6 +24,13 @@ public interface BaseView {
      */
     void showLoading(String msg);
 
+    /**
+     * show loading message
+     *
+     * @param msg
+     */
+    void showLoading(String msg, boolean isShowLoadingImg);
+
     /**
      * hide loading
      */

video/app/src/main/java/com/mints/helivideo/ui/activitys/base/BaseActivity.java

@@ -163,6 +163,26 @@ public abstract class BaseActivity extends BaseAppCompatActivity implements Base
         }
     }
 
+    /**
+     * 显示加载进度条（自定义message）
+     *
+     * @param message _
+     */
+    @Override
+    public void showLoading(String message, boolean isShowLoadingImg) {
+        if (!this.isFinishing() && this.getWindow() != null) {
+            if (progressDialog == null) {
+                progressDialog = new LoadingDialog(this);
+                progressDialog.setLoadText(message);
+            }
+            progressDialog.setShowLoadingImg(isShowLoadingImg);
+
+            progressDialog.show();
+            setProgressOnTouchOutside(false);
+            setProgressNoDismiss();
+        }
+    }
+
     /**
      * 设置Progress是否手触消失
      *

video/app/src/main/java/com/mints/helivideo/ui/fragment/MyFragment.kt

@@ -279,18 +279,22 @@ class MyFragment : LazyLoadBaseFragment(), MyView, View.OnClickListener {
                 override fun adFail() {
                     if (canFail) return
 
+                    showLoading("正在获取视频", false)
                     NoPreAdManager.loadVideoAd(
                         requireActivity(),
                         carrierType, object : AdStatusListener {
                             override fun adFail() {
                                 carrierType = Constant.CARRIERTYPE_NINE
+                                hideLoading()
                                 showToast("广告太火爆了，请稍候再试")
                             }
 
                             override fun adSuccess() {
+                                hideLoading()
                             }
 
                             override fun adClose(vo: HashMap<String, Any>?) {
+                                hideLoading()
                                 vo?.let {
                                     myPresenter.unlock(vo)
                                 }

video/app/src/main/java/com/mints/helivideo/ui/fragment/base/BaseFragment.java

@@ -91,6 +91,26 @@ public abstract class BaseFragment extends BaseAppFragment {
         }
     }
 
+    /**
+     * 显示加载进度条（自定义message）
+     *
+     * @param message _
+     */
+    public void showLoading(String message, boolean isShowLoadingImg) {
+//        ExtKt.showLoadingExt(this, message);
+        if (getActivity() != null && !getActivity().isFinishing() &&
+                getActivity().getWindow() != null && !getActivity().isFinishing()) {
+            if (progressDialog == null) {
+                progressDialog = new LoadingDialog(getActivity());
+                progressDialog.setLoadText(message);
+            }
+            progressDialog.setShowLoadingImg(isShowLoadingImg);
+            progressDialog.show();
+            setProgressOnTouchOutside(false);
+            setProgressNoDismiss();
+        }
+    }
+
     /**
      * 消失加载进度条
      */

video/app/src/main/java/com/mints/helivideo/ui/widgets/LoadingDialog.java

 package com.mints.helivideo.ui.widgets;
 
+import android.app.Dialog;
 import android.content.Context;
+import android.graphics.Color;
+import android.graphics.Typeface;
 import android.graphics.drawable.Drawable;
 import androidx.core.content.ContextCompat;
 import android.text.TextUtils;
+import android.util.TypedValue;
 import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.WindowManager.LayoutParams;
+import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
 import com.mints.helivideo.R;
+import com.mints.helivideo.utils.BubbleUtils;
+import com.mints.library.utils.GlideUtils;
 
 /**
  * 描述：加载中dialog
@@ -20,29 +27,30 @@ import com.mints.helivideo.R;
  * 时间：2017/10/10 17:51
  * 邮箱：mengcuiguang@cashbang.cn
  */
-public class LoadingDialog extends BaseDialog {
+public class LoadingDialog extends Dialog {
 
-    private Context mContext;
-    private LayoutInflater inflater;
-    private LayoutParams lp;
-    private TextView loadtext;
-    private LinearLayout loading_ll;
+    private final ImageView img;
+    private final LinearLayout container;
+    private final TextView tv;
+    private final TextView tv2;
+    private final ImageView ivDot;
+    private final LinearLayout ll;
 
     public LoadingDialog(Context context) {
         super(context, R.style.dialog);
-        this.mContext = context;
-        inflater = (LayoutInflater) mContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-        View layout = inflater.inflate(R.layout.loadingdialog, null);
-        if (android.os.Build.VERSION.SDK_INT > 22) {//android 6.0替换clip的加载动画
-            final Drawable drawable = ContextCompat.getDrawable(mContext, R.drawable.ufo_loading_refresh);
-            ProgressBar loading_bar = (ProgressBar) layout.findViewById(R.id.loading_bar);
-            loading_bar.setIndeterminateDrawable(drawable);
-        }
-        loadtext = (TextView) layout.findViewById(R.id.loading_text);
-        loading_ll = (LinearLayout) layout.findViewById(R.id.loading_ll);
-        setContentView(layout);
+        LayoutInflater inflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+        container = (LinearLayout) inflater.inflate(R.layout.layout_custom_progress_dialog_view, null);
+        img = container.findViewById(R.id.ivProgress);
+        tv = container.findViewById(R.id.loading_tips);
+        tv2 = container.findViewById(R.id.loading_waiting);
+        ivDot = container.findViewById(R.id.iv_dot);
+        ll = container.findViewById(R.id.ll_container);
+
+        GlideUtils.INSTANCE.loadImageViewGif(context, R.drawable.ic_loading, img);
+
+        setContentView(container);
         // 设置window属性
-        lp = getWindow().getAttributes();
+        LayoutParams lp = getWindow().getAttributes();
         lp.gravity = Gravity.CENTER;
         lp.dimAmount = 0; // 去背景遮盖
         // lp.alpha = 1.0f;//透明效果
@@ -56,10 +64,40 @@ public class LoadingDialog extends BaseDialog {
      */
     public void setLoadText(String content) {
         if (TextUtils.isEmpty(content)) {
-            loading_ll.setVisibility(View.GONE);
+            tv.setVisibility(View.GONE);
+        } else {
+            tv.setVisibility(View.VISIBLE);
+            tv.setText(content);
+        }
+    }
+
+    /**
+     * 是否显示图片
+     */
+    public void setShowLoadingImg(boolean showLoadingImg) {
+        if (showLoadingImg) {
+            img.setVisibility(View.VISIBLE);
+            ll.setVisibility(View.GONE);
+
+            tv.setTypeface(Typeface.defaultFromStyle(Typeface.NORMAL));
+            int dimen = getContext().getResources().getDimensionPixelSize(R.dimen.font_size_14);
+            tv.setTextSize(TypedValue.COMPLEX_UNIT_PX, dimen);
+            container.setBackgroundColor(Color.TRANSPARENT);
         } else {
-            loading_ll.setVisibility(View.VISIBLE);
-            loadtext.setText(content);
+            img.setVisibility(View.GONE);
+            ll.setVisibility(View.VISIBLE);
+
+            GlideUtils.INSTANCE.loadImageViewGif(getContext(), R.drawable.ic_loading_dot, ivDot);
+            int paddingTB = BubbleUtils.dp2px(30);
+            int paddingSE = BubbleUtils.dp2px(10);
+            tv.setPadding(paddingSE, paddingTB, paddingSE, 0);
+            tv.setTypeface(Typeface.defaultFromStyle(Typeface.BOLD));
+            int dimen = getContext().getResources().getDimensionPixelSize(R.dimen.font_size_30);
+            tv.setTextSize(TypedValue.COMPLEX_UNIT_PX, dimen);
+
+            tv2.setTypeface(Typeface.defaultFromStyle(Typeface.BOLD));
+            tv2.setTextSize(TypedValue.COMPLEX_UNIT_PX, dimen);
+            container.setBackground(ContextCompat.getDrawable(getContext(), R.drawable.shape_bg_transparent));
         }
     }
 

video/app/src/main/res/drawable/shape_bg_transparent.xml

+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners android:radius="10dp" />
+    <solid android:color="#B0000000" />
+</shape>
\ No newline at end of file

video/app/src/main/res/layout/layout_custom_progress_dialog_view.xml

+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/container"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center"
+    android:gravity="center_horizontal"
+    android:orientation="vertical"
+    android:paddingBottom="10dp">
+
+    <ImageView
+        android:id="@+id/ivProgress"
+        android:layout_width="120dp"
+        android:layout_height="120dp"
+        android:layout_gravity="center"
+        android:scaleType="fitXY"
+        android:src="@drawable/ic_loading" />
+
+    <TextView
+        android:id="@+id/loading_tips"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="10dp"
+        android:gravity="center"
+        android:paddingStart="10dp"
+        android:paddingEnd="10dp"
+        android:text="加载中..."
+        android:textColor="@color/white"
+        android:textSize="14sp" />
+
+    <LinearLayout
+        android:id="@+id/ll_container"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="30dp"
+        android:gravity="center_vertical"
+        android:orientation="horizontal"
+        android:visibility="gone">
+
+        <TextView
+            android:id="@+id/loading_waiting"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:text="请稍候"
+            android:textColor="@color/white"
+            android:textSize="14sp" />
+
+        <ImageView
+            android:id="@+id/iv_dot"
+            android:layout_width="wrap_content"
+            android:layout_height="12dp"
+            android:layout_marginTop="2dp" />
+
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file

video/app/src/main/res/values/dimens.xml

@@ -24,5 +24,9 @@
     <!--inner category-->
     <!--inner category-->
     <!--inner category-->
+    <!-- 字体 -->
+    <dimen name="font_size_14">14sp</dimen>
+    <dimen name="font_size_16">16sp</dimen>
+    <dimen name="font_size_30">30sp</dimen>
 
 </resources>
\ No newline at end of file