From 116def783f85af5896fc4500bc8a690d8b1eb5f3 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期六, 23 九月 2023 14:46:27 +0800
Subject: [PATCH] Merge branch 'wjc' of http://59.41.255.150:6688/r/~wjc/HDLPhotovoltaicDebugAPP into wjc
---
app/src/main/java/com/hdl/photovoltaic/other/HdlThreadLogic.java | 41 ++++++++++++++++++++---------------------
1 files changed, 20 insertions(+), 21 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/other/HdlThreadLogic.java b/app/src/main/java/com/hdl/photovoltaic/other/HdlThreadLogic.java
index a50ae9f..ec25ae5 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlThreadLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlThreadLogic.java
@@ -1,16 +1,13 @@
package com.hdl.photovoltaic.other;
-import android.app.Dialog;
import android.content.Context;
import android.os.Handler;
import android.os.Looper;
import android.util.Log;
import android.widget.Toast;
-import androidx.appcompat.app.AlertDialog;
-
import com.hdl.photovoltaic.enums.ShowErrorMode;
-import com.hdl.photovoltaic.widget.ConfirmationDialog;
+import com.hdl.photovoltaic.widget.ConfirmationCancelDialog;
import com.hdl.photovoltaic.widget.ConfirmationExceptionDialog;
/**
@@ -23,16 +20,16 @@
/**
* 鍒囨崲鍥炰富绾跨▼鎵ц
*
- * @param run 鍥炶皟
+ * @param runnable 鍥炶皟
* @param context 涓婁笅鏂�(涓嶉渶瑕佸脊妗嗗～null)
* @param showErrorMode 鏄惁鏄剧ず閿欒(涓嶉渶瑕佹樉绀洪敊璇～null)
*/
- public static void runMainThread(Runnable run, Context context, ShowErrorMode showErrorMode) {
+ public static void runMainThread(Runnable runnable, Context context, ShowErrorMode showErrorMode) {
try {
if (Looper.myLooper() == Looper.getMainLooper()) {
- run.run();
+ runnable.run();
} else {
- handler.post(run);
+ handler.post(runnable);
}
} catch (Exception e) {
@@ -41,20 +38,22 @@
}
+
+
/**
* 瀛愮嚎绋嬫墽琛�
*
- * @param run 鍥炶皟
+ * @param runnable 鍥炶皟
* @param context 涓婁笅鏂�(涓嶉渶瑕佸脊妗嗗～null)
* @param showErrorMode 鏄惁鏄剧ず閿欒(涓嶉渶瑕佸～null)
*/
- public static void runThread(Runnable run, Context context, ShowErrorMode showErrorMode) {
+ public static void runThread(Runnable runnable, Context context, ShowErrorMode showErrorMode) {
new Thread(new Runnable() {
@Override
public void run() {
try {
- run.run();
+ runnable.run();
} catch (Exception e) {
exception(e, showErrorMode, context);
}
@@ -106,22 +105,22 @@
@Override
public void run() {
- ConfirmationDialog confirmationDialog = new ConfirmationDialog(context);
- confirmationDialog.setTitle("鎻愮ず");
- confirmationDialog.setContent("寰堟姳姝�,绋嬪簭鍑虹幇閿欒浜�,鐐瑰嚮\"纭\"鑾峰彇鏇村璇︾粏閿欒淇℃伅.");
- confirmationDialog.setConfirmation("纭");
- confirmationDialog.setCancel("鍙栨秷");
- confirmationDialog.show();
- confirmationDialog.setNoOnclickListener(new ConfirmationDialog.onNoOnclickListener() {
+ ConfirmationCancelDialog confirmationCancelDialog = new ConfirmationCancelDialog(context);
+ confirmationCancelDialog.setTitle("鎻愮ず");
+ confirmationCancelDialog.setContent("寰堟姳姝�,绋嬪簭鍑虹幇閿欒浜�,鐐瑰嚮\"纭\"鑾峰彇鏇村璇︾粏閿欒淇℃伅.");
+ confirmationCancelDialog.setConfirmation("纭");
+ confirmationCancelDialog.setCancel("鍙栨秷");
+ confirmationCancelDialog.show();
+ confirmationCancelDialog.setNoOnclickListener(new ConfirmationCancelDialog.onNoOnclickListener() {
@Override
public void Cancel() {
- confirmationDialog.dismiss();
+ confirmationCancelDialog.dismiss();
}
});
- confirmationDialog.setYesOnclickListener(new ConfirmationDialog.onYesOnclickListener() {
+ confirmationCancelDialog.setYesOnclickListener(new ConfirmationCancelDialog.onYesOnclickListener() {
@Override
public void Confirm() {
- confirmationDialog.dismiss();
+ confirmationCancelDialog.dismiss();
ConfirmationExceptionDialog confirmationExceptionDialog = new ConfirmationExceptionDialog(context);
// String s = getStackTrace(ex);
String s = Log.getStackTraceString(ex);
--
Gitblit v1.8.0