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

Merge remote-tracking branch 'refs/remotes/origin/master'

This commit is contained in:
cyh 2024-11-14 11:39:22 +08:00
parent eeff57cc25 4148f113ec
commit 2639203dcd
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -941,10 +941,10 @@ 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",locale)
SimpleDateFormat("MM/dd/yyyy HH:mm",locale)
} else {
val locale = Locale.ENGLISH
SimpleDateFormat("dd/MM/yyyy HH:mm",locale)
SimpleDateFormat("MM/dd/yyyy HH:mm",locale)
}
endTimeInfo = dateFormat.format(validPeriod)
} else {
@ -959,10 +959,10 @@ class NewMainActivity : BaseActivity() {
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)
SimpleDateFormat("MM/dd/yyyy HH:mm",locale)
} else {
val locale = Locale.ENGLISH
SimpleDateFormat("dd/MM/yyyy HH:mm",locale)
SimpleDateFormat("MM/dd/yyyy HH:mm",locale)
}
endTimeInfo = dateFormat.format(validPeriod)
}else{

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

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