From 5d3efa4c93dde0cde474951e5310bb72ebbf4184 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 07 五月 2025 15:18:26 +0800
Subject: [PATCH] 2025年05月07日15:18:20 1.2.0

---
 app/src/main/java/com/hdl/photovoltaic/utils/TimeUtils.java |   97 ++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 88 insertions(+), 9 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 3d5578d..0091ead 100644
--- a/app/src/main/java/com/hdl/photovoltaic/utils/TimeUtils.java
+++ b/app/src/main/java/com/hdl/photovoltaic/utils/TimeUtils.java
@@ -24,8 +24,52 @@
     public static final String zhDateYearFormat = "yyyy";
 
     public static final String enDateYearMonthDayFormat = "dd/MM/yyyy";
-    public static final String enDateYearMonthFormat = "/MM/yyyy";
+    public static final String enDateYearMonthFormat = "MM/yyyy";
     public static final String enDateYearFormat = "yyyy";
+
+    /**
+     * 鑾峰彇褰撳墠绯荤粺鏃ユ湡鏃堕棿鎴�
+     *
+     * @return 鏃堕棿鎴�
+     */
+    public static long getCurrentTimestamp() {
+        return new Date().getTime();
+    }
+
+    /**
+     * 鑾峰彇鏃ユ湡鏍煎紡 (2024/2/09,yyyy/DD/dd)
+     *
+     * @return 鏃ユ湡鏍煎紡 (2024/2/09,yyyy/DD/dd)
+     */
+    public static String getTimeDateFormat(String timeType) {
+        String timeDateFormat = TimeUtils.zhDateYearMonthDayFormat;
+        switch (timeType) {
+            case TimeType.day: {
+                timeDateFormat = TimeUtils.zhDateYearMonthDayFormat;
+                if (!UserConfigManage.getInstance().isZh()) {
+                    timeDateFormat = TimeUtils.enDateYearMonthDayFormat;
+                }
+            }
+            break;
+            case TimeType.month: {
+                timeDateFormat = TimeUtils.zhDateYearMonthFormat;
+                if (!UserConfigManage.getInstance().isZh()) {
+                    timeDateFormat = TimeUtils.enDateYearMonthFormat;
+                }
+            }
+            break;
+            case TimeType.year:
+            case TimeType.all: {
+                timeDateFormat = TimeUtils.zhDateYearFormat;
+                if (!UserConfigManage.getInstance().isZh()) {
+                    timeDateFormat = TimeUtils.enDateYearFormat;
+                }
+            }
+            break;
+
+        }
+        return timeDateFormat;
+    }
 
     /**
      * 鑾峰彇鍒嗛挓
@@ -35,7 +79,7 @@
      */
     public static String getMinuteTime(long timestamp) {
         try {
-            SimpleDateFormat dateFormat = new SimpleDateFormat("mm", Locale.ENGLISH);
+            SimpleDateFormat dateFormat = new SimpleDateFormat("mm", getLocale());
             Date date = new Date(timestamp);
             return dateFormat.format(date);
         } catch (Exception e) {
@@ -53,7 +97,37 @@
      */
     public static String getDateTimestamp(long timestamp, String date_format) {
         try {
-            SimpleDateFormat dateFormat = new SimpleDateFormat(date_format, Locale.ENGLISH);
+            SimpleDateFormat dateFormat = new SimpleDateFormat(date_format, getLocale());
+            Date date = new Date(timestamp);
+            return dateFormat.format(date);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return "";
+    }
+
+    /**
+     * 鏃堕棿鎴宠浆鏃堕棿(鏍煎紡:yyyy-MM-dd HH:mm:ss)
+     *
+     * @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) {
@@ -66,7 +140,7 @@
      * 鏃堕棿鎴宠浆鏃堕棿(鏍煎紡:yyyy-MM-dd HH:mm:ss)
      *
      * @param timestamp 鏃堕棿鎴�
-     * @return -
+     *                  卢     * @return -
      */
     public static String getTimeFromTimestamp(long timestamp) {
         try {
@@ -74,7 +148,7 @@
             if (UserConfigManage.getInstance().getCurrentAppLanguage().equals(LocalManageUtil.en)) {
                 pattern = "dd-MM-yyyy HH:mm";
             }
-            SimpleDateFormat dateFormat = new SimpleDateFormat(pattern, Locale.ENGLISH);
+            SimpleDateFormat dateFormat = new SimpleDateFormat(pattern, getLocale());
             Date date = new Date(timestamp);
             return dateFormat.format(date);
         } catch (Exception e) {
@@ -82,6 +156,7 @@
         }
         return "";
     }
+
 
     /**
      * 鏃堕棿鎴宠浆鏃堕棿(鏍煎紡:yyyy-MM-dd HH:mm:ss)
@@ -184,7 +259,7 @@
      * @return Calendar瀵硅薄
      */
     public static Calendar stringToCalendar(String dateString, String dateFormat) {
-        SimpleDateFormat sdf = new SimpleDateFormat(dateFormat, Locale.ENGLISH);
+        SimpleDateFormat sdf = new SimpleDateFormat(dateFormat, getLocale());
         Calendar calendar = Calendar.getInstance();
         try {
             Date date = sdf.parse(dateString);
@@ -203,7 +278,7 @@
      * @return Calendar瀵硅薄
      */
     public static String calendarToString(Calendar calendar, String dateFormat) {
-        SimpleDateFormat sdf = new SimpleDateFormat(dateFormat, Locale.ENGLISH);
+        SimpleDateFormat sdf = new SimpleDateFormat(dateFormat, getLocale());
         return sdf.format(calendar.getTime());
     }
 
@@ -214,7 +289,7 @@
      * @return Calendar瀵硅薄
      */
     public static String dateToString(Date date, String dateFormat) {
-        SimpleDateFormat sdf = new SimpleDateFormat(dateFormat, Locale.ENGLISH);
+        SimpleDateFormat sdf = new SimpleDateFormat(dateFormat, getLocale());
         return sdf.format(date.getTime());
     }
 
@@ -227,7 +302,7 @@
      */
     public static long stringDateToTimestamp(String dateString, String dateFormat) {
         try {
-            SimpleDateFormat slf = new SimpleDateFormat(dateFormat, Locale.getDefault());
+            SimpleDateFormat slf = new SimpleDateFormat(dateFormat, getLocale());
             Date date = slf.parse(dateString);
             if (date == null) {
                 return 0;
@@ -238,4 +313,8 @@
         return 0;
     }
 
+    private static Locale getLocale() {
+        return Locale.ENGLISH;
+    }
+
 }

--
Gitblit v1.8.0