From 4f9fab221268ca32efb1ebd59dd7dd2ced81f89b Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 30 七月 2024 16:14:52 +0800
Subject: [PATCH] 2024年07月30日16:14:51
---
app/src/main/res/layout/activity_change_password.xml | 2 +-
app/src/main/java/com/hdl/photovoltaic/other/HdlThreadLogic.java | 9 +++++++--
app/src/main/res/layout/activity_bind_mail.xml | 2 +-
app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java | 2 +-
4 files changed, 10 insertions(+), 5 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 01b396c..dd6dbfa 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlThreadLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlThreadLogic.java
@@ -174,7 +174,12 @@
Drawable drawable = AppCompatResources.getDrawable(context, R.drawable.tip_fail);
flashingBoxDialog.setImage(drawable);
}
- flashingBoxDialog.setContent(msg + "(" + code + ")");
+ if (code == 0) {
+ //鎴愬姛涓嶉渶瑕佸鍔犵姸鎬佺爜
+ flashingBoxDialog.setContent(msg);
+ } else {
+ flashingBoxDialog.setContent(msg + "(" + code + ")");
+ }
flashingBoxDialog.show();
}
}, null, null);
@@ -229,7 +234,7 @@
* @return 璋冪敤鏍�
*/
private static String getStackTrace(Exception ex) {
- StringBuilder sb = new StringBuilder("");
+ StringBuilder sb = new StringBuilder();
StackTraceElement[] trace = ex.getStackTrace();
for (StackTraceElement stackTraceElement : trace) {
sb.append(stackTraceElement).append("\n");
diff --git a/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java b/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
index 1c33af8..98aa56d 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
@@ -361,7 +361,7 @@
break;
//蹇嵎寮�鍚�嗗彉鍣�
case HDLUniMP.UNI_EVENT_REPLY_DEVICE_OPEN_DEVICE_LIST: {
- this.uniOidEditName(mode_type, data, callback);
+ this.uniSetDeviceStartup(mode_type, data, callback);
}
break;
}
diff --git a/app/src/main/res/layout/activity_bind_mail.xml b/app/src/main/res/layout/activity_bind_mail.xml
index bfd139c..0977f7d 100644
--- a/app/src/main/res/layout/activity_bind_mail.xml
+++ b/app/src/main/res/layout/activity_bind_mail.xml
@@ -119,7 +119,7 @@
android:gravity="center"
android:paddingStart="@dimen/dp_16"
android:paddingEnd="@dimen/dp_0"
- android:text="@string/home_login_send_mail"
+ android:text="@string/home_login_verification_code"
android:textColor="@color/text_245EC3"
android:textSize="@dimen/text_14" />
diff --git a/app/src/main/res/layout/activity_change_password.xml b/app/src/main/res/layout/activity_change_password.xml
index 4440e30..da39cf5 100644
--- a/app/src/main/res/layout/activity_change_password.xml
+++ b/app/src/main/res/layout/activity_change_password.xml
@@ -158,7 +158,7 @@
android:layout_marginEnd="@dimen/dp_20"
android:gravity="center"
android:padding="@dimen/dp_16"
- android:text="@string/home_login_send_mail"
+ android:text="@string/home_login_verification_code"
android:textColor="@color/text_245EC3"
android:textSize="@dimen/text_14" />
--
Gitblit v1.8.0