From e0abee7b6ab08462f1f5a94e356ddf84f2eb3271 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 07 六月 2023 16:41:34 +0800
Subject: [PATCH] 2023年06月07日16:41:22

---
 app/src/main/java/com/hdl/photovoltaic/base/BaseFragment.java |  122 +++++++++-------------------------------
 1 files changed, 29 insertions(+), 93 deletions(-)

diff --git a/app/src/main/java/com/hdl/photovoltaic/base/BaseFragment.java b/app/src/main/java/com/hdl/photovoltaic/base/BaseFragment.java
index 5598bea..7e4d36b 100644
--- a/app/src/main/java/com/hdl/photovoltaic/base/BaseFragment.java
+++ b/app/src/main/java/com/hdl/photovoltaic/base/BaseFragment.java
@@ -16,7 +16,10 @@
 import androidx.fragment.app.FragmentActivity;
 import androidx.lifecycle.Lifecycle;
 
+import com.hdl.photovoltaic.R;
 import com.hdl.photovoltaic.listener.BaseView;
+import com.hdl.photovoltaic.other.HdlThreadLogic;
+import com.hdl.photovoltaic.widget.LoadingDialog;
 
 import org.greenrobot.eventbus.EventBus;
 
@@ -27,9 +30,7 @@
     private boolean isFirst = true;
     protected FragmentActivity _mActivity;
     protected View mContainerView;
-//    private LoadingDialog loadingDialog;
-//    private LoadingDialog loadingGetDataDialog;
-//    private DeviceLoadingDialog deviceLoadingDialog;
+    private LoadingDialog loadingDialog;
 
     @Override
     public void onAttach(@NonNull Context context) {
@@ -99,6 +100,8 @@
         super.onDestroyView();
         _mActivity = null;
         isFirst = true;
+        //闅愯棌Loading
+        hideLoading();
 //        unregisterEventBus();
     }
 
@@ -154,118 +157,51 @@
         }
     }
 
-    /* *//**
+
+    /**
      * 鑾峰彇LoadingDialog
      *
-     * @return
-     *//*
+     * @return LoadingDialog
+     */
     protected LoadingDialog getLoadingDialog() {
         if (loadingDialog == null && _mActivity != null) {
-            loadingDialog = new LoadingDialog(_mActivity, R.style.loading_dialog);
+            loadingDialog = new LoadingDialog(_mActivity, R.style.Custom_AlertDialog);
         }
         return loadingDialog;
     }
 
-    public LoadingDialog getLoadingGetDataDialog() {
-        if (loadingGetDataDialog == null && _mActivity != null) {
-            loadingGetDataDialog = new LoadingDialog(_mActivity, R.style.loading_dialog);
-        }
-        return loadingGetDataDialog;
-    }
-
-
-    *//**
-     * 鑾峰彇DeviceLoadingDialog
-     *
-     * @return
-     *//*
-    protected DeviceLoadingDialog getDeviceLoadingDialog() {
-        if (deviceLoadingDialog == null && _mActivity != null) {
-            deviceLoadingDialog = new DeviceLoadingDialog(_mActivity, R.style.loading_dialog);
-        }
-        return deviceLoadingDialog;
-    }
-
-    *//**
+    /**
      * 寮�濮婰oading
-     *//*
-    public void showLoading() {
+     */
+    protected void showLoading() {
         getLoadingDialog().start();
     }
 
-    *//**
+    /**
      * 寮�濮婰oading
-     *//*
-    public void showDeviceLoading() {
-        getDeviceLoadingDialog().start();
-    }
-
-
-    *//**
-     * 寮�濮婰oading
-     *//*
+     *
+     * @param mes 鑷畾涔夋枃鏈�
+     */
     protected void showLoading(String mes) {
         getLoadingDialog().start();
         getLoadingDialog().setText(mes);
     }
 
-
-    *//**
-     * 寮�濮婰oading
-     *//*
-    protected void showGetDataLoading(String mes) {
-        getLoadingGetDataDialog().startTouchNotGone();
-        getLoadingGetDataDialog().setText(mes);
-    }
-
-
-    *//**
-     * 寮�濮婰oading
-     *//*
-    protected void showDeviceLoading(String mes) {
-        getDeviceLoadingDialog().start();
-        getDeviceLoadingDialog().setText(mes);
-    }
-
-    *//**
-     * 鍋滄闅愯棌Loading
-     *//*
-    protected void hideLoading() {
-        if (loadingDialog != null && loadingDialog.isShowing()) {
-            loadingDialog.stop();
-        }
-    }
-
-    *//**
-     * 鍋滄闅愯棌Loading
-     *//*
-    protected void hideGetDataLoading() {
-        if (loadingGetDataDialog != null && loadingGetDataDialog.isShowing()) {
-            loadingGetDataDialog.stop();
-        }
-    }
-
-    */
-
     /**
      * 鍋滄闅愯棌Loading
-     *//*
-    protected void hideDeviceLoading() {
-        if (deviceLoadingDialog != null && deviceLoadingDialog.isShowing()) {
-            deviceLoadingDialog.stop();
-        }
-    }*/
-
-    //鐢ㄤ簬popwindow鏄剧ず闅愯棌鏃跺�欒儗鏅殑棰滆壊鏇存崲
-    protected void backgroundAlpha(float bgAlpha) {
-        if (_mActivity != null) {
-            WindowManager.LayoutParams lp = _mActivity.getWindow().getAttributes();
-            _mActivity.getWindow().addFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND);
-            lp.alpha = bgAlpha; //0.0-1.0
-            _mActivity.getWindow().setAttributes(lp);
-        }
+     */
+    protected void hideLoading() {
+        HdlThreadLogic.runMainThread(new Runnable() {
+            @Override
+            public void run() {
+                if (loadingDialog != null && loadingDialog.isShowing()) {
+                    loadingDialog.stop();
+                }
+            }
+        }, null, null);
     }
 
+
     public static boolean isZh(Context context) {
         Locale locale = context.getResources().getConfiguration().locale;
         String language = locale.getLanguage();

--
Gitblit v1.8.0