From 65f17fba52451a3e17076891734a90e492294cfa Mon Sep 17 00:00:00 2001 From: cyh Date: Fri, 25 Apr 2025 17:43:22 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=88=B0=E6=9C=9F=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E5=88=B7=E6=96=B0=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../clash/fragment/home/HomeFragment.kt | 129 ++++++++++-------- 1 file changed, 70 insertions(+), 59 deletions(-) diff --git a/app/src/main/java/com/yingmao/clash/fragment/home/HomeFragment.kt b/app/src/main/java/com/yingmao/clash/fragment/home/HomeFragment.kt index 7278ace..517615e 100644 --- a/app/src/main/java/com/yingmao/clash/fragment/home/HomeFragment.kt +++ b/app/src/main/java/com/yingmao/clash/fragment/home/HomeFragment.kt @@ -198,10 +198,11 @@ class HomeFragment : BaseFragment(), CoroutineScope by CoroutineScope(Dispatcher noVerticalPadding = true, horizontalPadding = false ) - getCustomView().findViewById(R.id.tv_pay_finish).setOnClickListener { - goNewRecharge() - dismiss() - } + getCustomView().findViewById(R.id.tv_pay_finish) + .setOnClickListener { + goNewRecharge() + dismiss() + } } } return@setOnClickListener @@ -820,70 +821,80 @@ class HomeFragment : BaseFragment(), CoroutineScope by CoroutineScope(Dispatcher @SuppressLint("SimpleDateFormat") fun setExpireDate() { - val isExpire = checkExpire() - var endTimeInfo = "--" - if (isExpire) { - if (isAdded) { - endTimeInfo = resources.getString(R.string.AccountExpired) + lifecycleScope.launch { + val isExpire = checkExpire() + var endTimeInfo = "--" + if (isExpire) { + if (isAdded) { + endTimeInfo = resources.getString(R.string.AccountExpired) + this@HomeFragment.context?.let { mc -> + tvExpirationTime.setTextColor( + ContextCompat.getColor( + mc, R.color.red + ) + ) + } + } + } else { + val validPeriod = + MMKV.defaultMMKV().decodeLong(BZYConstants.MMKV_KEY_VPN_VALID_PERIOD) + + val decodeString = MMKV.defaultMMKV().decodeString(BZYConstants.languageInfo, "") + if (decodeString.isNullOrEmpty()) { + //获取当前系统语言 + val config = resources.configuration + val language = config.locale.language + if (language.equals("en")) { + val dateFormat = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { + val localEN = Locale.ENGLISH + SimpleDateFormat("MM/dd/yyyy HH:mm", localEN) + } else { + val localEN = Locale.ENGLISH + SimpleDateFormat("MM/dd/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") + } else { + SimpleDateFormat("yyyy年MM月dd日 HH:mm") + + } + endTimeInfo = dateFormat.format(validPeriod) + } + + } else { + if (decodeString == "English") { + val dateFormat = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { + val locale = Locale.ENGLISH + SimpleDateFormat("MM/dd/yyyy HH:mm", locale) + } else { + val locale = Locale.ENGLISH + SimpleDateFormat("MM/dd/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) + + } + } this@HomeFragment.context?.let { mc -> tvExpirationTime.setTextColor( ContextCompat.getColor( - mc, R.color.red + mc, R.color.blue_0136CB ) ) } } - } else { - val validPeriod = MMKV.defaultMMKV().decodeLong(BZYConstants.MMKV_KEY_VPN_VALID_PERIOD) - val decodeString = MMKV.defaultMMKV().decodeString(BZYConstants.languageInfo, "") - if (decodeString.isNullOrEmpty()) { - //获取当前系统语言 - val config = resources.configuration - val language = config.locale.language - if (language.equals("en")) { - val dateFormat = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { - val localEN = Locale.ENGLISH - SimpleDateFormat("MM/dd/yyyy HH:mm", localEN) - } else { - val localEN = Locale.ENGLISH - SimpleDateFormat("MM/dd/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") - } else { - SimpleDateFormat("yyyy年MM月dd日 HH:mm") - - } - endTimeInfo = dateFormat.format(validPeriod) - } - - } else { - if (decodeString == "English") { - val dateFormat = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { - val locale = Locale.ENGLISH - SimpleDateFormat("MM/dd/yyyy HH:mm", locale) - } else { - val locale = Locale.ENGLISH - SimpleDateFormat("MM/dd/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) - - } - } + tvExpirationTime.text = endTimeInfo } - - tvExpirationTime.text = endTimeInfo } private fun goNewRecharge() {