From 4db3692de0001eea35f938c1224181746e72933a Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期四, 27 十一月 2025 21:30:07 +0800
Subject: [PATCH] 支持创建阿拉伯语言的脚本文件夹
---
app/src/main/java/com/hdl/photovoltaic/utils/TimeUtils.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 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 c882622..25ea163 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;
@@ -46,14 +47,14 @@
switch (timeType) {
case TimeType.day: {
timeDateFormat = TimeUtils.zhDateYearMonthDayFormat;
- if (!UserConfigManage.getInstance().isZh()) {
+ if (!UserConfigManage.getInstance().getCurrentAppLanguage().equals(Languages.zh)) {
timeDateFormat = TimeUtils.enDateYearMonthDayFormat;
}
}
break;
case TimeType.month: {
timeDateFormat = TimeUtils.zhDateYearMonthFormat;
- if (!UserConfigManage.getInstance().isZh()) {
+ if (!UserConfigManage.getInstance().getCurrentAppLanguage().equals(Languages.zh)) {
timeDateFormat = TimeUtils.enDateYearMonthFormat;
}
}
@@ -61,7 +62,7 @@
case TimeType.year:
case TimeType.all: {
timeDateFormat = TimeUtils.zhDateYearFormat;
- if (!UserConfigManage.getInstance().isZh()) {
+ if (!UserConfigManage.getInstance().getCurrentAppLanguage().equals(Languages.zh)) {
timeDateFormat = TimeUtils.enDateYearFormat;
}
}
@@ -118,12 +119,12 @@
String pattern = "yyyy-MM-dd HH:mm:ss";
if (isDisplaySeconds) {
pattern = "yyyy-MM-dd HH:mm:ss";
- if (UserConfigManage.getInstance().getCurrentAppLanguage().equals(LocalManageUtil.en)) {
+ 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(LocalManageUtil.en)) {
+ if (UserConfigManage.getInstance().getCurrentAppLanguage().equals(Languages.en)) {
pattern = "dd-MM-yyyy HH:mm";
}
}
@@ -145,7 +146,7 @@
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());
@@ -166,7 +167,7 @@
public static String getDataFromTimestamp(long timestamp) {
try {
String pattern = "MM-dd";
- if (UserConfigManage.getInstance().getCurrentAppLanguage().equals(LocalManageUtil.en)) {
+ if (UserConfigManage.getInstance().getCurrentAppLanguage().equals(Languages.en)) {
pattern = "dd-MM";
}
SimpleDateFormat dateFormat = new SimpleDateFormat(pattern, getLocale());
--
Gitblit v1.8.0