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

云梯 

1.修复域名替换bug
This commit is contained in:
11111 2026-03-06 18:03:39 +08:00
parent be8f8e7fd9
commit 26da78e890
1 changed files with 44 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
app/src/main/java/com/yingmao/clash/act/MainActivity.kt
View File

@ -8,6 +8,7 @@ import android.content.Context
import android.content.Intent import android.content.Intent
import android.content.IntentFilter import android.content.IntentFilter
import android.content.pm.PackageManager import android.content.pm.PackageManager
import android.net.Uri
import android.os.Build import android.os.Build
import android.os.Bundle import android.os.Bundle
import android.os.Handler import android.os.Handler
@ -421,7 +422,6 @@ class MainActivity : BaseActivity() {
} }
}else{ }else{
val netSubStr = data.data val netSubStr = data.data
Log.i("AAAAAAAAAAAAAAAAAA::netSubStr:${netSubStr}")
val saveNet = MMKV.defaultMMKV().decodeString( val saveNet = MMKV.defaultMMKV().decodeString(
BZYConstants.MMKV_KEY_CURRENT_HOST, BZYConstants.MMKV_KEY_CURRENT_HOST,
BuildConfig.service_url BuildConfig.service_url
@ -431,42 +431,36 @@ class MainActivity : BaseActivity() {
MMKV.defaultMMKV().decodeString(BZYConstants.PROFILE_SUB_URL, "")!! MMKV.defaultMMKV().decodeString(BZYConstants.PROFILE_SUB_URL, "")!!
if (saveSubUrl.isNotEmpty()){ if (saveSubUrl.isNotEmpty()){
if(saveSubUrl == netSubStr){ subUrl = if(saveSubUrl == netSubStr){
//判断网络传过来的和现在的域名一样不,一样则等于 //判断网络传过来的和现在的域名一样不,一样则等于
if(netSubStr.contains(saveNet)){ if(netSubStr.contains(saveNet)){
subUrl=saveSubUrl saveSubUrl
}else{ }else{
val netSubSpStr = netSubStr.substringAfter(".com") replaceBaseUrl(netSubStr, saveNet)
subUrl=saveNet+netSubSpStr
MMKV.defaultMMKV().encode(BZYConstants.PROFILE_SUB_URL, subUrl)
} }
}else{ }else{
val subSpStr = saveSubUrl.substringAfter(".com") replaceBaseUrl(netSubStr, saveNet)
subUrl=saveNet+subSpStr
MMKV.defaultMMKV().encode(BZYConstants.PROFILE_SUB_URL, subUrl)
} }
}else{ }else{
if(netSubStr.contains(saveNet)){ subUrl = if(netSubStr.contains(saveNet)){
subUrl=netSubStr netSubStr
MMKV.defaultMMKV().encode(BZYConstants.PROFILE_SUB_URL, subUrl)
}else{ }else{
val netSubSpStr = netSubStr.substringAfter(".com") replaceBaseUrl(netSubStr, saveNet)
subUrl=saveNet+netSubSpStr
MMKV.defaultMMKV().encode(BZYConstants.PROFILE_SUB_URL, subUrl)
} }
} }
}else{ }else{
RxToast.info("获取的订阅连接为空!") RxToast.error("获取的订阅连接为空!")
} }
lifecycleScope.launch(Dispatchers.IO) { lifecycleScope.launch(Dispatchers.IO) {
subUrl?.let { subUrl?.let {
Log.i("机场链接::subUrl:${subUrl}") Log.i("::subUrl::${subUrl}")
AppLog.i("MainActivity", "机场链接:::${subUrl}") AppLog.i("MainActivity", "机场链接:::${subUrl}")
setSub2(it) MMKV.defaultMMKV().encode(BZYConstants.PROFILE_SUB_URL, subUrl)
} setSub2(it)
} }
}
} }
} }
@ -519,6 +513,16 @@ class MainActivity : BaseActivity() {
DialogManager.enqueue(noticeCloseDialog!!) DialogManager.enqueue(noticeCloseDialog!!)
} }
} }
}else{
if(endTimeDialog!=null){
DialogManager.enqueue(endTimeDialog!!)
}
if(userExpireDialog!=null){
DialogManager.enqueue(userExpireDialog!!)
}
if(noticeCloseDialog!=null){
DialogManager.enqueue(noticeCloseDialog!!)
}
} }
} }
@ -587,7 +591,15 @@ class MainActivity : BaseActivity() {
homeNoticeDialog.dismiss() homeNoticeDialog.dismiss()
} }
} }
}else{
MMKV.defaultMMKV()
.encode(BZYConstants.NOTICE_READ_TXT, true)
activityDialog?.show()
} }
}else{
MMKV.defaultMMKV()
.encode(BZYConstants.NOTICE_READ_TXT, true)
activityDialog?.show()
} }
} }
} }
@ -802,15 +814,6 @@ class MainActivity : BaseActivity() {
uTimerTask?.cancel() uTimerTask?.cancel()
uTimerTask = null uTimerTask = null
} }
fun isToday(timeMillis: Long): Boolean {
val now = Calendar.getInstance()
val target = Calendar.getInstance().apply {
timeInMillis = timeMillis
}
return now.get(Calendar.YEAR) == target.get(Calendar.YEAR) &&
now.get(Calendar.DAY_OF_YEAR) == target.get(Calendar.DAY_OF_YEAR)
}
@OptIn(DelicateCoroutinesApi::class) @OptIn(DelicateCoroutinesApi::class)
private fun cleanProfile() { private fun cleanProfile() {
Log.d("cleanProfile start") Log.d("cleanProfile start")
@ -1034,4 +1037,14 @@ class MainActivity : BaseActivity() {
AppLog.i("NewMainActivity", "校验访问https://www.google.com::${vpnCheChekGoogle}") AppLog.i("NewMainActivity", "校验访问https://www.google.com::${vpnCheChekGoogle}")
} }
} }
fun replaceBaseUrl(oldUrl: String, newBaseUrl: String): String {
val oldUri = Uri.parse(oldUrl)
val newUri = Uri.parse(newBaseUrl)
return oldUri.buildUpon()
.scheme(newUri.scheme) // https
.encodedAuthority(newUri.encodedAuthority) // host:port
.build()
.toString()
}
} }