From e4cb9970046ef8e7392368a051cae2ab5c84799a Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期一, 29 四月 2024 17:03:11 +0800
Subject: [PATCH] 2024年04月29日17:03:06
---
app/src/main/java/com/hdl/photovoltaic/utils/TimeUtils.java | 45 +++++++++++++++++++++++++++++++--------------
1 files changed, 31 insertions(+), 14 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 899010f..3d5578d 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.TimeType;
import com.hdl.photovoltaic.other.HdlThreadLogic;
import com.hdl.photovoltaic.ui.home.HomePageFragment;
import com.hdl.sdk.link.core.utils.LanguageUtils;
@@ -113,14 +114,22 @@
* @param dayMonthYearToAdd 澶╂暟锛堟棩锛屾湀锛屽勾锛�
* @return 鏃ュ巻
*/
- public static String addDayMonthYearToDate(Calendar date, int dayMonthYearToAdd, String dateFormat, HomePageFragment.TimeType timeType) {
+ public static String addDayMonthYearToDate(Calendar date, int dayMonthYearToAdd, String dateFormat, String timeType) {
Calendar newDate = (Calendar) date.clone();
- if (timeType == HomePageFragment.TimeType.day) {
- newDate.add(Calendar.DAY_OF_MONTH, dayMonthYearToAdd);
- } else if (timeType == HomePageFragment.TimeType.month) {
- newDate.add(Calendar.MONTH, dayMonthYearToAdd);
- } else if (timeType == HomePageFragment.TimeType.year || timeType == HomePageFragment.TimeType.lifecycle) {
- newDate.add(Calendar.YEAR, dayMonthYearToAdd);
+ 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);
}
@@ -132,14 +141,22 @@
* @param dayMonthYearToSubtract 澶╂暟
* @return 鏃ュ巻
*/
- public static String subtractDayMonthYearFromDate(Calendar date, int dayMonthYearToSubtract, String dateFormat, HomePageFragment.TimeType timeType) {
+ public static String subtractDayMonthYearFromDate(Calendar date, int dayMonthYearToSubtract, String dateFormat, String timeType) {
Calendar newDate = (Calendar) date.clone();
- if (timeType == HomePageFragment.TimeType.day) {
- newDate.add(Calendar.DAY_OF_MONTH, -dayMonthYearToSubtract);
- } else if (timeType == HomePageFragment.TimeType.month) {
- newDate.add(Calendar.MONTH, -dayMonthYearToSubtract);
- } else if (timeType == HomePageFragment.TimeType.year) {
- newDate.add(Calendar.YEAR, -dayMonthYearToSubtract);
+ 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);
}
--
Gitblit v1.8.0