连接蓝牙，配网

app/src/main/java/com/ckkj/water/base/BaseActivity.java

@@ -43,6 +43,7 @@ import androidx.appcompat.app.AppCompatDelegate;
 import androidx.core.app.ActivityCompat;
 import androidx.viewbinding.ViewBinding;
 
+import com.ckkj.water.dialog.LoadingProgressDialog;
 import com.ckkj.water.utils.manager.ThemeManager;
 import com.esafirm.imagepicker.features.ImagePicker;
 import com.hjq.permissions.OnPermissionCallback;
@@ -275,6 +276,16 @@ public abstract class BaseActivity<T extends ViewBinding, P extends IPresenter>
         } catch (Exception e) {
             e.printStackTrace();
         }
+
+        LoadingProgressDialog progressDialog = mProgressLoadingDialog;
+        try {
+            if (progressDialog != null && mContext != null) {
+                mProgressLoadingDialog = null;
+                progressDialog.dismiss();
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
     }
 
     //每个activity都需要创建Presenter
@@ -317,6 +328,7 @@ public abstract class BaseActivity<T extends ViewBinding, P extends IPresenter>
     @Override
     public void hideLoading() {
         loadingDialog.dismiss();
+
     }
 
     @Override
@@ -359,6 +371,9 @@ public abstract class BaseActivity<T extends ViewBinding, P extends IPresenter>
 
     protected LoadingDialog mLoadingDialog;
 
+    /**
+     * 普通加载loading
+     */
     public void showLoadingDialog() {
         LoadingDialog dialog = mLoadingDialog;
         if (dialog == null && mContext != null) {
@@ -381,6 +396,33 @@ public abstract class BaseActivity<T extends ViewBinding, P extends IPresenter>
         }
     }
 
+    /**
+     * 进度条加载loading
+     */
+    protected LoadingProgressDialog mProgressLoadingDialog;
+    public void showProgressLoadingDialog(int  progress) {
+        LoadingProgressDialog dialog = mProgressLoadingDialog;
+        if (dialog == null && mContext != null) {
+            dialog = new LoadingProgressDialog(mContext);
+            // 不可触摸取消
+            dialog.setCanceledOnTouchOutside(false);
+            // 强制取消关闭界面
+            dialog.setCancelable(true);
+            dialog.setOnCancelListener(dialog1 -> finish());
+            dialog.setProgress( progress);
+            mProgressLoadingDialog = dialog;
+        } else {
+            dialog.dismiss();
+        }
+        if (dialog != null && mContext != null) {
+            try {
+                dialog.show();
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
 
     @Override
     public void onNetChange(int netModel) {