androidcode
/
yijianlianUI
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

描述： 

1.解决因引入语言切换功能导致的首页时间无显示问题
This commit is contained in:
level 2024-11-06 15:48:06 +08:00
parent 8c08d28e43
commit cfdc3be86d
3 changed files with 55 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
app/src/main/java/com/yingmao/clash/act/NewMainActivity.kt
View File

@ -924,6 +924,7 @@ class NewMainActivity : BaseActivity() {
return true; return true;
} }
@SuppressLint("SimpleDateFormat")
fun setExpireDate() { fun setExpireDate() {
var isExpire = checkExpire() var isExpire = checkExpire()
var endTimeInfo = "--" var endTimeInfo = "--"
@ -938,28 +939,37 @@ class NewMainActivity : BaseActivity() {
val config = resources.configuration val config = resources.configuration
val language = config.locale.language val language = config.locale.language
if (language.equals("en")) { if (language.equals("en")) {
val locale = Locale.getDefault() val dateFormat = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
SimpleDateFormat("dd/MM/yyyy HH:mm:ss", locale) val locale = Locale.ENGLISH
SimpleDateFormat("dd/MM/yyyy HH:mm",locale)
} else {
val locale = Locale.ENGLISH
SimpleDateFormat("dd/MM/yyyy HH:mm",locale)
}
endTimeInfo = dateFormat.format(validPeriod)
} else { } else {
SimpleDateFormat("yyyy年MM月dd日 HH:mm:ss") val dateFormat = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
SimpleDateFormat("yyyy年MM月dd日 HH:mm")
} else {
SimpleDateFormat("yyyy年MM月dd日 HH:mm")
}
endTimeInfo = dateFormat.format(validPeriod)
} }
}else{ }else{
if(decodeString == "English"){ if(decodeString == "English"){
val locale = Locale.ENGLISH
SimpleDateFormat("dd/MM/yyyy HH:mm:ss", locale)
val dateFormat = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { val dateFormat = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
val locale = Locale.ENGLISH val locale = Locale.ENGLISH
SimpleDateFormat("dd/MM/yyyy HH:mm:ss",locale) SimpleDateFormat("dd/MM/yyyy HH:mm",locale)
} else { } else {
val locale = Locale.ENGLISH val locale = Locale.ENGLISH
SimpleDateFormat("dd/MM/yyyy HH:mm:ss",locale) SimpleDateFormat("dd/MM/yyyy HH:mm",locale)
} }
endTimeInfo = dateFormat.format(validPeriod) endTimeInfo = dateFormat.format(validPeriod)
}else{ }else{
val dateFormat = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { val dateFormat = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
SimpleDateFormat("yyyy年MM月dd日 HH:mm:ss") SimpleDateFormat("yyyy年MM月dd日 HH:mm")
} else { } else {
SimpleDateFormat("yyyy年MM月dd日 HH:mm:ss") SimpleDateFormat("yyyy年MM月dd日 HH:mm")
} }
endTimeInfo = dateFormat.format(validPeriod) endTimeInfo = dateFormat.format(validPeriod)

6
app/src/main/java/com/yingmao/clash/act/SettingActivity.kt
View File

@ -157,7 +157,7 @@ class SettingActivity : BaseActivity() {
} else { } else {
val languageInfoEntity1 = LanguageInfoEntity(1, "中文简体", "当前语言", true) val languageInfoEntity1 = LanguageInfoEntity(1, "中文简体", "当前语言", true)
val languageInfoEntity2 = LanguageInfoEntity(2, "中文繁体", "中文繁体", false) val languageInfoEntity2 = LanguageInfoEntity(2, "中文繁体", "中文繁体", false)
val languageInfoEntity3 = LanguageInfoEntity(3, "英文", "英文", false) val languageInfoEntity3 = LanguageInfoEntity(3, "English", "英文", false)
languageInfoList.add(languageInfoEntity1) languageInfoList.add(languageInfoEntity1)
languageInfoList.add(languageInfoEntity2) languageInfoList.add(languageInfoEntity2)
languageInfoList.add(languageInfoEntity3) languageInfoList.add(languageInfoEntity3)
@ -170,7 +170,7 @@ class SettingActivity : BaseActivity() {
LanguageInfoEntity(1, "中文简体", "当前语言", true) LanguageInfoEntity(1, "中文简体", "当前语言", true)
val languageInfoEntity2 = val languageInfoEntity2 =
LanguageInfoEntity(2, "中文繁体", "中文繁体", false) LanguageInfoEntity(2, "中文繁体", "中文繁体", false)
val languageInfoEntity3 = LanguageInfoEntity(3, "英文", "英文", false) val languageInfoEntity3 = LanguageInfoEntity(3, "English", "英文", false)
languageInfoList.add(languageInfoEntity1) languageInfoList.add(languageInfoEntity1)
languageInfoList.add(languageInfoEntity2) languageInfoList.add(languageInfoEntity2)
languageInfoList.add(languageInfoEntity3) languageInfoList.add(languageInfoEntity3)
@ -198,7 +198,7 @@ class SettingActivity : BaseActivity() {
false false
) )
val languageInfoEntity3 = val languageInfoEntity3 =
LanguageInfoEntity(3, "English", "Device language", true) LanguageInfoEntity(3, "English", "Current language", true)
languageInfoList.add(languageInfoEntity1) languageInfoList.add(languageInfoEntity1)
languageInfoList.add(languageInfoEntity2) languageInfoList.add(languageInfoEntity2)
languageInfoList.add(languageInfoEntity3) languageInfoList.add(languageInfoEntity3)

56
app/src/main/java/com/yingmao/clash/fragment/NewAccFragment.kt
View File

@ -507,32 +507,42 @@ class NewAccFragment : BaseFragment(), CoroutineScope by CoroutineScope(Dispatch
val config = resources.configuration val config = resources.configuration
val language = config.locale.language val language = config.locale.language
if (language.equals("en")) { if (language.equals("en")) {
val locale = Locale.getDefault() val dateFormat = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
SimpleDateFormat("dd/MM/yyyy HH:mm:ss", locale) val localEN = Locale.ENGLISH
SimpleDateFormat("dd/MM/yyyy HH:mm",localEN)
} else {
val localEN = Locale.ENGLISH
SimpleDateFormat("dd/MM/yyyy HH:mm",localEN)
}
endTimeInfo = dateFormat.format(validPeriod)
} else { } else {
SimpleDateFormat("yyyy年MM月dd日 HH:mm:ss") val dateFormat = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
SimpleDateFormat("yyyy年MM月dd日 HH:mm")
} else {
SimpleDateFormat("yyyy年MM月dd日 HH:mm")
}
endTimeInfo = dateFormat.format(validPeriod)
} }
}else{
if(decodeString == "English"){
val locale = Locale.ENGLISH
SimpleDateFormat("dd/MM/yyyy HH:mm:ss", locale)
val dateFormat = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
val locale = Locale.ENGLISH
SimpleDateFormat("dd/MM/yyyy HH:mm:ss",locale)
} else {
val locale = Locale.ENGLISH
SimpleDateFormat("dd/MM/yyyy HH:mm:ss",locale)
}
endTimeInfo = dateFormat.format(validPeriod)
}else{
val dateFormat = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
SimpleDateFormat("yyyy年MM月dd日 HH:mm:ss")
} else {
SimpleDateFormat("yyyy年MM月dd日 HH:mm:ss")
}
endTimeInfo = dateFormat.format(validPeriod)
} }else{
if(decodeString == "English"){
val dateFormat = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
val locale = Locale.ENGLISH
SimpleDateFormat("dd/MM/yyyy HH:mm",locale)
} else {
val locale = Locale.ENGLISH
SimpleDateFormat("dd/MM/yyyy HH:mm",locale)
}
endTimeInfo = dateFormat.format(validPeriod)
}else{
val dateFormat = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
SimpleDateFormat("yyyy年MM月dd日 HH:mm")
} else {
SimpleDateFormat("yyyy年MM月dd日 HH:mm")
}
endTimeInfo = dateFormat.format(validPeriod)
}
} }
} }