From 989b4cf5a84e898e9682f8d9723a8ba1ff20c23b Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 28 六月 2023 16:55:57 +0800
Subject: [PATCH] Merge branch 'hxb' into wjc
---
app/src/main/java/com/hdl/photovoltaic/other/HdlThreadLogic.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 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 13d7ea1..a50ae9f 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlThreadLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlThreadLogic.java
@@ -4,12 +4,14 @@
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.ConfirmationExceptionDialog;
/**
* 绾跨▼閫昏緫
@@ -33,6 +35,7 @@
handler.post(run);
}
} catch (Exception e) {
+
exception(e, showErrorMode, context);
}
}
@@ -119,8 +122,11 @@
@Override
public void Confirm() {
confirmationDialog.dismiss();
- String s = getStackTrace(ex);
-
+ ConfirmationExceptionDialog confirmationExceptionDialog = new ConfirmationExceptionDialog(context);
+// String s = getStackTrace(ex);
+ String s = Log.getStackTraceString(ex);
+ confirmationExceptionDialog.setContent(s);
+ confirmationExceptionDialog.show();
}
});
--
Gitblit v1.8.0