From 32b5f366ceaad4aa9a33eccf0b109eef24175495 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 10 十月 2023 14:55:01 +0800
Subject: [PATCH] 2023年10月10日14:54:56
---
app/src/main/java/com/hdl/photovoltaic/other/HdlThreadLogic.java | 76 ++++++++++++++++++++++++++-----------
1 files changed, 53 insertions(+), 23 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 0922c13..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,14 +1,14 @@
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.ConfirmationCancelDialog;
+import com.hdl.photovoltaic.widget.ConfirmationExceptionDialog;
/**
* 绾跨▼閫昏緫
@@ -20,37 +20,40 @@
/**
* 鍒囨崲鍥炰富绾跨▼鎵ц
*
- * @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) {
+
exception(e, showErrorMode, context);
}
}
+
+
/**
* 瀛愮嚎绋嬫墽琛�
*
- * @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);
}
@@ -86,12 +89,12 @@
/**
- * @param e 寮傚父淇℃伅绫�
+ * @param ex 寮傚父淇℃伅绫�
* @param context 涓婁笅鏂�(涓嶉渶瑕佸脊妗嗗～null)
* @param showErrorMode 鏄惁鏄剧ず閿欒(涓嶉渶瑕佸～null)
*/
- private static void exception(Exception e, ShowErrorMode showErrorMode, Context context) {
- if (showErrorMode == null || context == null || e == null) {
+ private static void exception(Exception ex, ShowErrorMode showErrorMode, Context context) {
+ if (showErrorMode == null || context == null || ex == null) {
return;
}
if (showErrorMode == ShowErrorMode.NO) {
@@ -101,18 +104,45 @@
handler.post(new Runnable() {
@Override
public void run() {
- Dialog alertDialog = new AlertDialog.Builder(context).
- setTitle("鎶辨瓑绋嬪簭鍑虹幇閿欒浜�,鐐瑰嚮\"纭\"鑾峰彇鏇村璇︾粏淇℃伅.").
- setMessage(e.getMessage()).
- create();
- alertDialog.show();
- //鎻愮ず
-// AlertDialog alertDialog = new AlertDialog(context, androidx.fragment.R.style.TextAppearance_Compat_Notification);
-// alertDialog.setTitle("鎶辨瓑绋嬪簭鍑虹幇閿欒浜�");
-// alertDialog.show();
-// Toast.makeText(context, "鎶辨瓑绋嬪簭鍑虹幇閿欒浜�", Toast.LENGTH_SHORT).show();
+
+ ConfirmationCancelDialog confirmationCancelDialog = new ConfirmationCancelDialog(context);
+ confirmationCancelDialog.setTitle("鎻愮ず");
+ confirmationCancelDialog.setContent("寰堟姳姝�,绋嬪簭鍑虹幇閿欒浜�,鐐瑰嚮\"纭\"鑾峰彇鏇村璇︾粏閿欒淇℃伅.");
+ confirmationCancelDialog.setConfirmation("纭");
+ confirmationCancelDialog.setCancel("鍙栨秷");
+ confirmationCancelDialog.show();
+ confirmationCancelDialog.setNoOnclickListener(new ConfirmationCancelDialog.onNoOnclickListener() {
+ @Override
+ public void Cancel() {
+ confirmationCancelDialog.dismiss();
+ }
+ });
+ confirmationCancelDialog.setYesOnclickListener(new ConfirmationCancelDialog.onYesOnclickListener() {
+ @Override
+ public void Confirm() {
+ confirmationCancelDialog.dismiss();
+ ConfirmationExceptionDialog confirmationExceptionDialog = new ConfirmationExceptionDialog(context);
+// String s = getStackTrace(ex);
+ String s = Log.getStackTraceString(ex);
+ confirmationExceptionDialog.setContent(s);
+ confirmationExceptionDialog.show();
+ }
+ });
}
});
}
+
+ /**
+ * @return 璋冪敤鏍�
+ */
+ private static String getStackTrace(Exception ex) {
+ StringBuilder sb = new StringBuilder("");
+ StackTraceElement[] trace = ex.getStackTrace();
+ for (StackTraceElement stackTraceElement : trace) {
+ sb.append(stackTraceElement).append("\n");
+ }
+ return sb.toString();
+ }
+
}
--
Gitblit v1.8.0