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

Merge branch 'master' of 10.10.25.26:/usr/local/git/v_clash_android

This commit is contained in:
level 2025-07-21 12:01:30 +08:00
parent 3729279449 77ae53e43d
commit dd4069538c
3 changed files with 44 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -65,3 +65,4 @@ google-services.json
# MacOS # MacOS
.DS_Store .DS_Store
gradle/wrapper/gradle-wrapper.properties

91
app/src/main/java/com/yingmao/clash/act/SplashActivity.kt
View File

@ -2,7 +2,7 @@ package com.yingmao.clash.act
import android.Manifest import android.Manifest
import android.annotation.SuppressLint import android.annotation.SuppressLint
import android.content.Context
import android.content.Intent import android.content.Intent
import android.content.pm.PackageManager import android.content.pm.PackageManager
import android.graphics.Bitmap import android.graphics.Bitmap
@ -11,10 +11,7 @@ import android.net.Uri
import android.os.Build import android.os.Build
import android.os.Bundle import android.os.Bundle
import android.provider.Settings import android.provider.Settings
import android.text.SpannableString
import android.text.TextPaint
import android.text.TextUtils import android.text.TextUtils
import android.text.style.ClickableSpan
import android.util.Log import android.util.Log
import android.view.View import android.view.View
import android.view.WindowManager import android.view.WindowManager
@ -71,9 +68,7 @@ import com.yingmao.clash.view.dialog.DialogAppVersion
import com.yingmao.clash.view.dialog.DialogDoMainChoose import com.yingmao.clash.view.dialog.DialogDoMainChoose
import com.yingmao.clash.view.dialog.RxDialogSureCancel import com.yingmao.clash.view.dialog.RxDialogSureCancel
import com.yingmao.clash.vm.SplashAtyVM import com.yingmao.clash.vm.SplashAtyVM
import kotlinx.coroutines.DelicateCoroutinesApi
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.GlobalScope
import kotlinx.coroutines.MainScope import kotlinx.coroutines.MainScope
import kotlinx.coroutines.async import kotlinx.coroutines.async
import kotlinx.coroutines.delay import kotlinx.coroutines.delay
@ -983,54 +978,54 @@ class SplashActivity : BaseActivity() {
com.cncat.vpn.common.log.Log.d("httpFailure HttpReqType.CHECK_LOGIN") com.cncat.vpn.common.log.Log.d("httpFailure HttpReqType.CHECK_LOGIN")
try { try {
RxToast.error("检测到网络异常,请尝试切换其他地址.") RxToast.error("检测到网络异常,请尝试切换其他地址.")
SplashHelper(splashAtyVM).getHostWithFallback { success -> // SplashHelper(splashAtyVM).getHostWithFallback { success ->
MainScope().launch { // MainScope().launch {
if (success) { // if (success) {
if (dialogDoMainChoose == null) { // if (dialogDoMainChoose == null) {
dialogDoMainChoose = DialogDoMainChoose(this@SplashActivity) // dialogDoMainChoose = DialogDoMainChoose(this@SplashActivity)
} // }
if (dialogDoMainChoose?.isShowing == false) { // if (dialogDoMainChoose?.isShowing == false) {
dialogDoMainChoose?.setOnTryButtonListener(object : // dialogDoMainChoose?.setOnTryButtonListener(object :
DialogDoMainChoose.OnTryButtonListener { // DialogDoMainChoose.OnTryButtonListener {
override fun tryButton() { // override fun tryButton() {
var currentHost = MMKV.defaultMMKV() // var currentHost = MMKV.defaultMMKV()
.decodeString( // .decodeString(
BZYConstants.MMKV_KEY_CURRENT_HOST, // BZYConstants.MMKV_KEY_CURRENT_HOST,
"" // ""
) // )
// com.cncat.vpn.common.log.Log.d("tryButton CHECK_LOGIN currentHost==>${currentHost}") //// com.cncat.vpn.common.log.Log.d("tryButton CHECK_LOGIN currentHost==>${currentHost}")
splashAtyVM.checkLogin() // splashAtyVM.checkLogin()
} // }
//
override fun cancel() { // override fun cancel() {
com.cncat.vpn.common.log.Log.d("tryButton CHECK_LOGIN cancel") // com.cncat.vpn.common.log.Log.d("tryButton CHECK_LOGIN cancel")
dialogDoMainChoose?.dismiss() // dialogDoMainChoose?.dismiss()
} // }
}) // })
dialogDoMainChoose?.setOnListItemListener(object : // dialogDoMainChoose?.setOnListItemListener(object :
DialogDoMainChoose.OnListItemListener { // DialogDoMainChoose.OnListItemListener {
override fun listItemClick() { // override fun listItemClick() {
splashAtyVM.checkLogin() // splashAtyVM.checkLogin()
//
} // }
//
}) // })
dialogDoMainChoose?.show() // dialogDoMainChoose?.show()
} // }
} // }
} // }
} // }
} catch (e: Exception) { } catch (e: Exception) {
e.printStackTrace() e.printStackTrace()
toLoginPage() toLoginPage()
} }
// if (super.switchServer()) { if (super.switchServer2()) {
// splashAtyVM.checkLogin() splashAtyVM.checkLogin()
// } else { } else {
// toLoginPage() toLoginPage()
// } }
} }
else -> {} else -> {}

8
gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -1,8 +0,0 @@
#Tue Jun 04 19:03:37 CST 2024
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionSha256Sum=bed1da33cca0f557ab13691c77f38bb67388119e4794d113e051039b80af9bb1
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists