From ba84a556dc93fcf75e6ec76f999344d3f96ad788 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期五, 02 二月 2024 18:05:24 +0800
Subject: [PATCH] 2024年02月02日18:04:36

---
 app/src/main/java/com/hdl/photovoltaic/utils/TimeUtils.java |   27 ++++++++++++++++++++++++++-
 1 files changed, 26 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 e0dbce4..b7d267e 100644
--- a/app/src/main/java/com/hdl/photovoltaic/utils/TimeUtils.java
+++ b/app/src/main/java/com/hdl/photovoltaic/utils/TimeUtils.java
@@ -2,6 +2,10 @@
 
 import android.annotation.SuppressLint;
 
+import com.hdl.photovoltaic.config.UserConfigManage;
+import com.hdl.photovoltaic.other.HdlThreadLogic;
+import com.hdl.sdk.link.core.utils.LanguageUtils;
+
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.Date;
@@ -30,6 +34,23 @@
     }
 
     /**
+     * 鏃堕棿鎴宠浆鏃堕棿(鏍煎紡:yyyy-MM-dd)
+     *
+     * @param timestamp 鏃堕棿鎴�
+     * @return -
+     */
+    public static String getDateTimestamp(long timestamp) {
+        try {
+            SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd ", Locale.ENGLISH);
+            Date date = new Date(timestamp);
+            return dateFormat.format(date);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return "";
+    }
+
+    /**
      * 鏃堕棿鎴宠浆鏃堕棿(鏍煎紡:yyyy-MM-dd HH:mm:ss)
      *
      * @param timestamp 鏃堕棿鎴�
@@ -37,7 +58,11 @@
      */
     public static String getTimeFromTimestamp(long timestamp) {
         try {
-            SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.ENGLISH);
+            String pattern = "yyyy-MM-dd HH:mm";
+            if (UserConfigManage.getInstance().getCurrentAppLanguage().equals(LocalManageUtil.en)) {
+                pattern = "dd-MM-yyyy HH:mm";
+            }
+            SimpleDateFormat dateFormat = new SimpleDateFormat(pattern, Locale.ENGLISH);
             Date date = new Date(timestamp);
             return dateFormat.format(date);
         } catch (Exception e) {

--
Gitblit v1.8.0