ppn/olcng
3
0
Fork 0
mirror of https://github.com/openlibrecommunity/olcng.git synced 2026-07-03 14:05:17 +02:00
Code Issues Packages Projects Releases 3 Wiki Activity

Refactor V2RayTestService

Browse Source
This commit is contained in:
2dust
2026-01-10 18:25:38 +08:00
parent e684bef35d
commit 3ad6464595
2 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
V2rayNG/app/src/main/java/com/v2ray/ang/service/V2RayTestService.kt
+17 -9
View File
@@ -36,6 +36,7 @@ class V2RayTestService : Service() {
// simple counter for currently running tasks
private val realTestRunningCount = AtomicInteger(0)
private val realTestCount = AtomicInteger(0)
/**
* Initializes the V2Ray environment.
@@ -56,15 +57,22 @@ class V2RayTestService : Service() {
override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
when (intent?.getIntExtra("key", 0)) {
MSG_MEASURE_CONFIG -> {
val guid = intent.serializable<String>("content") ?: ""
realTestScope.launch {
realTestRunningCount.incrementAndGet()
try {
val result = startRealPing(guid)
MessageUtil.sendMsg2UI(this@V2RayTestService, MSG_MEASURE_CONFIG_SUCCESS, Pair(guid, result))
} finally {
val left = realTestRunningCount.decrementAndGet()
MessageUtil.sendMsg2UI(this@V2RayTestService, AppConfig.MSG_MEASURE_CONFIG_FINISH, left.toString())
val guidsList = intent.serializable<ArrayList<String>>("content")
if (guidsList == null || guidsList.isEmpty()) {
return super.onStartCommand(intent, flags, startId)
}
for (guid in guidsList) {
realTestCount.incrementAndGet()
realTestScope.launch {
realTestRunningCount.incrementAndGet()
try {
val result = startRealPing(guid)
MessageUtil.sendMsg2UI(this@V2RayTestService, MSG_MEASURE_CONFIG_SUCCESS, Pair(guid, result))
} finally {
val count = realTestCount.decrementAndGet()
val left = realTestRunningCount.decrementAndGet()
MessageUtil.sendMsg2UI(this@V2RayTestService, AppConfig.MSG_MEASURE_CONFIG_FINISH, "$left / $count")
}
}
}
}
V2rayNG/app/src/main/java/com/v2ray/ang/viewmodel/MainViewModel.kt
+4 -2
View File
@@ -237,9 +237,11 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
val serversCopy = serversCache.toList()
viewModelScope.launch(Dispatchers.Default) {
for (item in serversCopy) {
MessageUtil.sendMsg2TestService(getApplication(), AppConfig.MSG_MEASURE_CONFIG, item.guid)
val guids = ArrayList<String>(serversCopy.map { it.guid })
if (guids.isEmpty()) {
return@launch
}
MessageUtil.sendMsg2TestService(getApplication(), AppConfig.MSG_MEASURE_CONFIG, guids)
}
}