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

Merge remote-tracking branch 'origin/master'

This commit is contained in:
cyh 2024-11-07 15:31:04 +08:00
parent 2fb09b7252 cfdc3be86d
commit 0504c0cc9e
3 changed files with 39 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -924,6 +924,7 @@ class NewMainActivity : BaseActivity() {
return true;
}
@SuppressLint("SimpleDateFormat")
fun setExpireDate() {
var isExpire = checkExpire()
var endTimeInfo = "--"
@ -940,38 +941,36 @@ class NewMainActivity : BaseActivity() {
if (language.equals("en")) {
val dateFormat = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
val locale = Locale.ENGLISH
SimpleDateFormat("dd/MM/yyyy HH:mm:ss",locale)
SimpleDateFormat("dd/MM/yyyy HH:mm",locale)
} else {
val locale = Locale.ENGLISH
SimpleDateFormat("dd/MM/yyyy HH:mm:ss",locale)
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:ss")
SimpleDateFormat("yyyy年MM月dd日 HH:mm")
} else {
SimpleDateFormat("yyyy年MM月dd日 HH:mm:ss")
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)
SimpleDateFormat("dd/MM/yyyy HH:mm",locale)
} else {
val locale = Locale.ENGLISH
SimpleDateFormat("dd/MM/yyyy HH:mm:ss",locale)
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:ss")
SimpleDateFormat("yyyy年MM月dd日 HH:mm")
} else {
SimpleDateFormat("yyyy年MM月dd日 HH:mm:ss")
SimpleDateFormat("yyyy年MM月dd日 HH:mm")
}
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 {
val languageInfoEntity1 = LanguageInfoEntity(1, "中文简体", "当前语言", true)
val languageInfoEntity2 = LanguageInfoEntity(2, "中文繁体", "中文繁体", false)
val languageInfoEntity3 = LanguageInfoEntity(3, "英文", "英文", false)
val languageInfoEntity3 = LanguageInfoEntity(3, "English", "英文", false)
languageInfoList.add(languageInfoEntity1)
languageInfoList.add(languageInfoEntity2)
languageInfoList.add(languageInfoEntity3)
@ -170,7 +170,7 @@ class SettingActivity : BaseActivity() {
LanguageInfoEntity(1, "中文简体", "当前语言", true)
val languageInfoEntity2 =
LanguageInfoEntity(2, "中文繁体", "中文繁体", false)
val languageInfoEntity3 = LanguageInfoEntity(3, "英文", "英文", false)
val languageInfoEntity3 = LanguageInfoEntity(3, "English", "英文", false)
languageInfoList.add(languageInfoEntity1)
languageInfoList.add(languageInfoEntity2)
languageInfoList.add(languageInfoEntity3)
@ -198,7 +198,7 @@ class SettingActivity : BaseActivity() {
false
)
val languageInfoEntity3 =
LanguageInfoEntity(3, "English", "Device language", true)
LanguageInfoEntity(3, "English", "Current language", true)
languageInfoList.add(languageInfoEntity1)
languageInfoList.add(languageInfoEntity2)
languageInfoList.add(languageInfoEntity3)

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

@ -508,42 +508,43 @@ class NewAccFragment : BaseFragment(), CoroutineScope by CoroutineScope(Dispatch
val language = config.locale.language
if (language.equals("en")) {
val dateFormat = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
val locale = Locale.ENGLISH
SimpleDateFormat("dd/MM/yyyy HH:mm:ss",locale)
val localEN = Locale.ENGLISH
SimpleDateFormat("dd/MM/yyyy HH:mm",localEN)
} else {
val locale = Locale.ENGLISH
SimpleDateFormat("dd/MM/yyyy HH:mm:ss",locale)
val localEN = Locale.ENGLISH
SimpleDateFormat("dd/MM/yyyy HH:mm",localEN)
}
endTimeInfo = dateFormat.format(validPeriod)
} else {
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 {
SimpleDateFormat("yyyy年MM月dd日 HH:mm:ss")
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)
}
}
}