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/utils/TimeUtils.java | 33 ++++++++++++++++++++++++++++++++-
1 files changed, 32 insertions(+), 1 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/utils/TimeUtils.java b/app/src/main/java/com/hdl/photovoltaic/utils/TimeUtils.java
index fee374f..0091ead 100644
--- a/app/src/main/java/com/hdl/photovoltaic/utils/TimeUtils.java
+++ b/app/src/main/java/com/hdl/photovoltaic/utils/TimeUtils.java
@@ -109,8 +109,38 @@
/**
* 鏃堕棿鎴宠浆鏃堕棿(鏍煎紡:yyyy-MM-dd HH:mm:ss)
*
- * @param timestamp 鏃堕棿鎴�
+ * @param timestamp 鏃堕棿鎴�
+ * @param isDisplaySeconds 鏄惁鏄剧ず绉掞紝true鏄剧ず
* @return -
+ */
+ public static String getTimeFromTimestamp(long timestamp, boolean isDisplaySeconds) {
+ try {
+ String pattern = "yyyy-MM-dd HH:mm:ss";
+ if (isDisplaySeconds) {
+ pattern = "yyyy-MM-dd HH:mm:ss";
+ if (UserConfigManage.getInstance().getCurrentAppLanguage().equals(LocalManageUtil.en)) {
+ pattern = "dd-MM-yyyy HH:mm:ss";
+ }
+ } else {
+ pattern = "yyyy-MM-dd HH:mm";
+ if (UserConfigManage.getInstance().getCurrentAppLanguage().equals(LocalManageUtil.en)) {
+ pattern = "dd-MM-yyyy HH:mm";
+ }
+ }
+ SimpleDateFormat dateFormat = new SimpleDateFormat(pattern, getLocale());
+ Date date = new Date(timestamp);
+ return dateFormat.format(date);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return "";
+ }
+
+ /**
+ * 鏃堕棿鎴宠浆鏃堕棿(鏍煎紡:yyyy-MM-dd HH:mm:ss)
+ *
+ * @param timestamp 鏃堕棿鎴�
+ * 卢 * @return -
*/
public static String getTimeFromTimestamp(long timestamp) {
try {
@@ -127,6 +157,7 @@
return "";
}
+
/**
* 鏃堕棿鎴宠浆鏃堕棿(鏍煎紡:yyyy-MM-dd HH:mm:ss)
*
--
Gitblit v1.8.0