From b9cc7390e8e8ce64c41c26fb369c98ce669d660c Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 07 五月 2025 15:02:30 +0800
Subject: [PATCH] Merge branch '1.2.0'
---
app/src/main/java/com/hdl/photovoltaic/ui/test/TestLogActivity.java | 31 +++++++++++++++++++++++++++----
1 files changed, 27 insertions(+), 4 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 81f8933..fe74ce6 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
@@ -1,12 +1,16 @@
package com.hdl.photovoltaic.ui.test;
+import android.content.Intent;
+import android.net.Uri;
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;
+
+import androidx.core.content.FileProvider;
import com.hdl.photovoltaic.R;
import com.hdl.photovoltaic.base.CustomBaseActivity;
@@ -18,6 +22,7 @@
import com.hdl.photovoltaic.widget.ConfirmationCancelDialog;
import com.hdl.photovoltaic.widget.ListStaticDialog;
+import java.io.File;
import java.util.IdentityHashMap;
import java.util.Map;
@@ -44,7 +49,7 @@
* 鐩戝惉鍣ㄥ垵濮嬪寲
*/
private void initEvent() {
- viewBinding.topBackBtn.setOnClickListener(new View.OnClickListener() {
+ viewBinding.topBackLl.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
finish();
@@ -94,7 +99,25 @@
@Override
public void onClick(View v) {
//todo 闇�瑕佽皟浜戠鐨勬帴鍙�
- HdlThreadLogic.toast(_mActivity, "杩樻病鏈夋敮鎸佷笂浼犳棩蹇�.");
+// HdlThreadLogic.toast(_mActivity, "杩樻病鏈夋敮鎸佷笂浼犳棩蹇�.");
+
+// Intent sendIntent = new Intent();
+// sendIntent.setAction(Intent.ACTION_SEND);
+// sendIntent.putExtra(Intent.EXTRA_TEXT, "This is my text to send.");
+// sendIntent.setType("text/plain");
+// startActivity(Intent.createChooser(sendIntent, "Share via"));
+ try {
+ // 鍦ˋctivity涓垱寤哄垎浜獻ntent
+ Intent shareIntent = new Intent(Intent.ACTION_SEND);
+ shareIntent.setType("application/pdf"); // 鏍规嵁瑕佸垎浜殑鏂囦欢绫诲瀷璁剧疆MIME绫诲瀷
+ File file = new File(HdlFileLogic.getInstance().getLogFileNamePath()); // 鎸囧畾鏂囦欢璺緞
+ Uri fileUri = FileProvider.getUriForFile(_mActivity, "com.hdl.photovoltaic.dc.fileprovider", file);
+ shareIntent.putExtra(Intent.EXTRA_STREAM, fileUri);
+ shareIntent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
+ startActivity(Intent.createChooser(shareIntent, "Share file using"));
+ } catch (Exception ignored) {
+ HdlThreadLogic.toast(_mActivity, "鍒嗕韩澶辫触");
+ }
}
});
@@ -140,8 +163,8 @@
* 鍒濆鍖栫晫闈�
*/
private void initView() {
- String homeId = "娴嬭瘯浣忓畢ID=" + UserConfigManage.getInstance().getHomeId();
- String homeName = "娴嬭瘯浣忓畢鍚嶇О=" + UserConfigManage.getInstance().getHomeName();
+ String homeId = "鏃ュ織浣忓畢ID=" + UserConfigManage.getInstance().getHomeId();
+ String homeName = "鏃ュ織浣忓畢鍚嶇О=" + UserConfigManage.getInstance().getHomeName();
viewBinding.homeIdTv.setText(homeId);
viewBinding.homeNameTv.setText(homeName);
showLoading();
--
Gitblit v1.8.0