From 8b43d4e1190fc9e2261be0579e53cc6c2987f946 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期四, 27 十一月 2025 19:37:56 +0800
Subject: [PATCH] 2025年11月27日19:37:50 备份代码

---
 app/src/main/java/com/hdl/photovoltaic/utils/TimeUtils.java |   57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 55 insertions(+), 2 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..760184a 100644
--- a/app/src/main/java/com/hdl/photovoltaic/utils/TimeUtils.java
+++ b/app/src/main/java/com/hdl/photovoltaic/utils/TimeUtils.java
@@ -4,6 +4,7 @@
 import android.text.TextUtils;
 
 import com.hdl.photovoltaic.config.UserConfigManage;
+import com.hdl.photovoltaic.enums.Languages;
 import com.hdl.photovoltaic.enums.TimeType;
 import com.hdl.photovoltaic.other.HdlThreadLogic;
 import com.hdl.photovoltaic.ui.home.HomePageFragment;
@@ -109,13 +110,43 @@
     /**
      * 鏃堕棿鎴宠浆鏃堕棿(鏍煎紡: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(Languages.en)) {
+                    pattern = "dd-MM-yyyy HH:mm:ss";
+                }
+            } else {
+                pattern = "yyyy-MM-dd HH:mm";
+                if (UserConfigManage.getInstance().getCurrentAppLanguage().equals(Languages.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 {
             String pattern = "yyyy-MM-dd HH:mm";
-            if (UserConfigManage.getInstance().getCurrentAppLanguage().equals(LocalManageUtil.en)) {
+            if (UserConfigManage.getInstance().getCurrentAppLanguage().equals(Languages.en)) {
                 pattern = "dd-MM-yyyy HH:mm";
             }
             SimpleDateFormat dateFormat = new SimpleDateFormat(pattern, getLocale());
@@ -128,6 +159,28 @@
     }
 
     /**
+     * 鏃堕棿鎴宠浆鏃ユ湡(鏍煎紡:MM-dd)
+     *
+     * @param timestamp 鏃堕棿鎴�
+     *                  卢     * @return -
+     */
+    public static String getDataFromTimestamp(long timestamp) {
+        try {
+            String pattern = "MM-dd";
+            if (UserConfigManage.getInstance().getCurrentAppLanguage().equals(Languages.en)) {
+                pattern = "dd-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 鏃堕棿鎴�

--
Gitblit v1.8.0