From 87cd5df70918e6ba1af849c5f026d3719bfdb1ac Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 09 四月 2025 09:06:29 +0800
Subject: [PATCH] Merge branch '1.5.2' into dev

---
 app/src/main/java/com/hdl/photovoltaic/utils/TimeUtils.java |  196 ++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 178 insertions(+), 18 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 2e9aed4..fee374f 100644
--- a/app/src/main/java/com/hdl/photovoltaic/utils/TimeUtils.java
+++ b/app/src/main/java/com/hdl/photovoltaic/utils/TimeUtils.java
@@ -1,9 +1,12 @@
 package com.hdl.photovoltaic.utils;
 
 import android.annotation.SuppressLint;
+import android.text.TextUtils;
 
 import com.hdl.photovoltaic.config.UserConfigManage;
+import com.hdl.photovoltaic.enums.TimeType;
 import com.hdl.photovoltaic.other.HdlThreadLogic;
+import com.hdl.photovoltaic.ui.home.HomePageFragment;
 import com.hdl.sdk.link.core.utils.LanguageUtils;
 
 import java.text.SimpleDateFormat;
@@ -16,8 +19,57 @@
  */
 public class TimeUtils {
 
-    public static final String zhDateFormat = "yyyy/MM/dd";
-    public static final String enDateFormat = "dd/MM/yyyy";
+    public static final String zhDateYearMonthDayFormat = "yyyy/MM/dd";
+    public static final String zhDateYearMonthFormat = "yyyy/MM";
+    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 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;
+    }
 
     /**
      * 鑾峰彇鍒嗛挓
@@ -27,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) {
@@ -40,12 +92,12 @@
      * 鏃堕棿鎴宠浆鏃堕棿(鏍煎紡:yyyy-MM-dd)
      *
      * @param timestamp   鏃堕棿鎴�
-     * @param date_format 鏃堕棿鏍煎紡(渚嬪"yyyy-MM-dd")
+     * @param date_format 鏃堕棿鏍煎紡(渚嬪"yyyy/MM/dd")
      * @return -
      */
     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) {
@@ -66,7 +118,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) {
@@ -100,30 +152,138 @@
     }
 
     /**
-     * 鍔犲ぉ鏁�
+     * 鍔狅紙鏃ワ紝鏈堬紝骞达級璁$畻
      *
-     * @param date      鏃ュ巻
-     * @param daysToAdd 澶╂暟
+     * @param date              鏃ュ巻
+     * @param dayMonthYearToAdd 澶╂暟锛堟棩锛屾湀锛屽勾锛�
      * @return 鏃ュ巻
      */
-    public static Calendar addDaysToDate(Calendar date, int daysToAdd) {
+    public static String addDayMonthYearToDate(Calendar date, int dayMonthYearToAdd, String dateFormat, String timeType) {
         Calendar newDate = (Calendar) date.clone();
-        newDate.add(Calendar.DAY_OF_MONTH, daysToAdd);
-        return newDate;
+        switch (timeType) {
+            case TimeType.day: {
+                newDate.add(Calendar.DAY_OF_MONTH, dayMonthYearToAdd);
+            }
+            break;
+            case TimeType.month: {
+                newDate.add(Calendar.MONTH, dayMonthYearToAdd);
+            }
+            break;
+            case TimeType.year:
+            case TimeType.all: {
+                newDate.add(Calendar.YEAR, dayMonthYearToAdd);
+            }
+            break;
+        }
+        return calendarToString(newDate, dateFormat);
     }
 
     /**
-     * 鍑忓ぉ鏁�
+     * 鍑忥紙鏃ワ紝鏈堬紝骞达級璁$畻
      *
-     * @param date           鏃ュ巻
-     * @param daysToSubtract 澶╂暟
+     * @param date                   鏃ュ巻
+     * @param dayMonthYearToSubtract 澶╂暟
      * @return 鏃ュ巻
      */
-    public static Calendar subtractDaysFromDate(Calendar date, int daysToSubtract) {
+    public static String subtractDayMonthYearFromDate(Calendar date, int dayMonthYearToSubtract, String dateFormat, String timeType) {
         Calendar newDate = (Calendar) date.clone();
-        newDate.add(Calendar.DAY_OF_MONTH, -daysToSubtract);
-        return newDate;
+        switch (timeType) {
+            case TimeType.day: {
+                newDate.add(Calendar.DAY_OF_MONTH, -dayMonthYearToSubtract);
+            }
+            break;
+            case TimeType.month: {
+                newDate.add(Calendar.MONTH, -dayMonthYearToSubtract);
+            }
+            break;
+            case TimeType.year:
+            case TimeType.all: {
+                newDate.add(Calendar.YEAR, -dayMonthYearToSubtract);
+            }
+            break;
+        }
+        return calendarToString(newDate, dateFormat);
     }
 
+    /**
+     * 鏃堕棿鎴宠浆Calendar
+     *
+     * @param timestamp 鏃堕棿鎴�
+     * @return Calendar瀵硅薄
+     */
+    public static Calendar timestampToCalendar(long timestamp) {
+        // 灏嗘椂闂存埑杞崲涓烘棩鏈�
+        Date date = new Date(timestamp);
+        // 浣跨敤Calendar绫昏缃棩鏈�
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(date);
+        return calendar;
+    }
+
+    /**
+     * 瀛楃涓叉棩鏈熸牸寮忚浆Calendar
+     *
+     * @param dateString (2023/04/01)
+     * @param dateFormat (yyyy/MM/dd)
+     * @return Calendar瀵硅薄
+     */
+    public static Calendar stringToCalendar(String dateString, String dateFormat) {
+        SimpleDateFormat sdf = new SimpleDateFormat(dateFormat, getLocale());
+        Calendar calendar = Calendar.getInstance();
+        try {
+            Date date = sdf.parse(dateString);
+            if (date != null) {
+                calendar.setTime(date);
+            }
+        } catch (Exception ignored) {
+        }
+        return calendar;
+    }
+
+    /**
+     * Calendar杞瓧绗︿覆鏃ユ湡鏍煎紡
+     *
+     * @param dateFormat (yyyy/MM/dd)
+     * @return Calendar瀵硅薄
+     */
+    public static String calendarToString(Calendar calendar, String dateFormat) {
+        SimpleDateFormat sdf = new SimpleDateFormat(dateFormat, getLocale());
+        return sdf.format(calendar.getTime());
+    }
+
+    /**
+     * Date杞瓧绗︿覆鏃ユ湡鏍煎紡
+     *
+     * @param dateFormat (yyyy/MM/dd)
+     * @return Calendar瀵硅薄
+     */
+    public static String dateToString(Date date, String dateFormat) {
+        SimpleDateFormat sdf = new SimpleDateFormat(dateFormat, getLocale());
+        return sdf.format(date.getTime());
+    }
+
+    /**
+     * 瀛楃涓叉棩鏈熸牸寮忚浆鏃堕棿鎴�
+     *
+     * @param dateString (2024/06/01)
+     * @param dateFormat (yyyy/MM/dd)
+     * @return 鏃堕棿鎴�
+     */
+    public static long stringDateToTimestamp(String dateString, String dateFormat) {
+        try {
+            SimpleDateFormat slf = new SimpleDateFormat(dateFormat, getLocale());
+            Date date = slf.parse(dateString);
+            if (date == null) {
+                return 0;
+            }
+            return date.getTime(); // 鑾峰彇鏃堕棿鎴�
+        } catch (Exception ignored) {
+        }
+        return 0;
+    }
+
+    private static Locale getLocale() {
+        return Locale.ENGLISH;
+    }
 
 }

--
Gitblit v1.8.0