From 51d7007fd4bcaaa771d43a745cb6728d4e6d29ae Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期五, 05 一月 2024 18:04:41 +0800
Subject: [PATCH] 2024年01月05日18:04:39
---
app/src/main/java/com/hdl/photovoltaic/ui/test/TestLogActivity.java | 89 ++++++++++++++++++++++++++++++--------------
1 files changed, 61 insertions(+), 28 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/test/TestLogActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/test/TestLogActivity.java
index 971bfb9..9deeb11 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/test/TestLogActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/test/TestLogActivity.java
@@ -4,6 +4,7 @@
import android.os.Bundle;
import android.text.Spannable;
import android.text.SpannableStringBuilder;
+import android.text.TextUtils;
import android.text.style.ForegroundColorSpan;
import android.view.View;
@@ -75,6 +76,19 @@
}
});
+
+ viewBinding.clickToBottomTv.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+// int offset = (viewBinding.sv.getChildAt(0).getMeasuredHeight() - viewBinding.sv.getHeight()); // 璁＄畻闇�瑕佹粴鍔ㄧ殑璺濈
+// if (offset > 0) {
+// viewBinding.sv.smoothScrollTo(0, offset); // 骞虫粦鍦版粴鍔ㄥ埌搴曢儴浣嶇疆
+// } else {
+// viewBinding.sv.fullScroll(View.FOCUS_DOWN); // 鐩存帴婊氬姩鍒版渶鍚庝竴琛�
+// }
+ viewBinding.sv.fullScroll(View.FOCUS_DOWN); // 鐩存帴婊氬姩鍒版渶鍚庝竴琛�
+ }
+ });
//涓婁紶鏃ュ織鍒颁簯绔笂
viewBinding.uploadingLogTv.setOnClickListener(new View.OnClickListener() {
@Override
@@ -126,39 +140,58 @@
* 鍒濆鍖栫晫闈�
*/
private void initView() {
- HdlThreadLogic.runMainThread(new Runnable() {
+ String homeId = "娴嬭瘯浣忓畢ID=" + UserConfigManage.getInstance().getHomeId();
+ String homeName = "娴嬭瘯浣忓畢鍚嶇О=" + UserConfigManage.getInstance().getHomeName();
+ viewBinding.homeIdTv.setText(homeId);
+ viewBinding.homeNameTv.setText(homeName);
+ showLoading();
+ HdlThreadLogic.runSubThread(new Runnable() {
@Override
public void run() {
-
- String homeId = "娴嬭瘯浣忓畢ID=" + UserConfigManage.getInstance().getHomeId();
- String homeName = "娴嬭瘯浣忓畢鍚嶇О=" + UserConfigManage.getInstance().getHomeName();
- viewBinding.homeIdTv.setText(homeId);
- viewBinding.homeNameTv.setText(homeName);
-
HdlFileLogic.getInstance().delFileLien(HdlFileLogic.getInstance().getLogFileNamePath(), 2);
String content = HdlLogLogic.readLog();
- int startIndex = 0;
- int endIndex;
- Map<Integer, Integer> map = new IdentityHashMap<>();
- String[] s = content.split("\r\n");
- for (int i = 0; i < s.length; i++) {
- if (i == 0) {
- endIndex = s[i].indexOf("s%");
- } else {
- startIndex = 2 + startIndex + s[i - 1].length();//2鎹㈣绗﹂暱搴�
- endIndex = 2 + startIndex + s[i].indexOf("s%");//2鎹㈣绗﹂暱搴�
+ HdlThreadLogic.runMainThread(new Runnable() {
+ @Override
+ public void run() {
+ hideLoading();
+ if (TextUtils.isEmpty(content)) {
+ return;
+ }
+ int startIndex = 0;
+ int endIndex;
+ Map<Integer, Integer> map = new IdentityHashMap<>();
+ String[] newArray = content.split("\r\n");
+// String[] newArray = new String[oldArray.length];//鍊掑簭
+// for (int i = oldArray.length - 1, j = 0; i >= 0; i--, j++) {
+// newArray[j] = oldArray[i];
+// }
+// StringBuilder stringBuilder = new StringBuilder();
+// for (String s : newArray) {
+// stringBuilder.append(s).append("\r\n");
+// }
+// content = stringBuilder.toString();
+ for (int i = 0; i < newArray.length; i++) {
+ if (i == 0) {
+ endIndex = newArray[i].indexOf("s%");
+ } else {
+ startIndex = 2 + startIndex + newArray[i - 1].length();//2鎹㈣绗﹂暱搴�
+ endIndex = 2 + startIndex + newArray[i].indexOf("s%");//2鎹㈣绗﹂暱搴�
+ }
+ map.put(startIndex, endIndex);
+ }
+ SpannableStringBuilder spannable = new SpannableStringBuilder(content.replace("s%", " "));//娉ㄦ剰s%鏄袱涓瓧绗�,鎵�浠ュ崰涓や綅
+ for (Map.Entry<Integer, Integer> entry : map.entrySet()) {
+ int start = entry.getKey();
+ int end = entry.getValue();
+ //璁剧疆鏃堕棿浣撻獙鏄彟涓�绉嶉鑹�
+ spannable.setSpan(new ForegroundColorSpan(getColor(R.color.text_245EC3)), start, end, Spannable.SPAN_INCLUSIVE_EXCLUSIVE);
+ }
+ viewBinding.replyContentTv.setText(spannable);
+
}
- map.put(startIndex, endIndex);
- }
- SpannableStringBuilder spannable = new SpannableStringBuilder(content.replace("s%", " "));//娉ㄦ剰s%鏄袱涓瓧绗�,鎵�浠ュ崰涓や綅
- for (Map.Entry<Integer, Integer> entry : map.entrySet()) {
- int start = entry.getKey();
- int end = entry.getValue();
- //璁剧疆鏃堕棿浣撻獙鏄彟涓�绉嶉鑹�
- spannable.setSpan(new ForegroundColorSpan(getColor(R.color.text_245EC3)), start, end, Spannable.SPAN_INCLUSIVE_EXCLUSIVE);
- }
- viewBinding.replyContentTv.setText(spannable);
+ });
}
- }, null, null);
+ });
+
}
}
\ No newline at end of file
--
Gitblit v1.8.0