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 into level

This commit is contained in:
level 2024-07-30 15:09:14 +08:00
parent 8136dd2478 3734c5ea44
commit edf2468499
8 changed files with 18 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/yingmao/clash/act/ActivityActivity.kt
View File

@ -61,7 +61,7 @@ class ActivityActivity : BaseActivity() {
initRefreshLayout()
initLoadMore()
Log.d("uc=======>${MainApplication.getUserInfo()?.userCommand}")
// Log.d("uc=======>${MainApplication.getUserInfo()?.userCommand}")
}
private fun initView() {

37
app/src/main/java/com/yingmao/clash/act/ChangeNodeActivity.kt
View File

@ -11,7 +11,6 @@ import android.text.TextUtils
import android.view.View
import android.widget.ImageView
import androidx.lifecycle.ViewModelProvider
import androidx.lifecycle.lifecycleScope
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
@ -19,58 +18,28 @@ import androidx.swiperefreshlayout.widget.SwipeRefreshLayout.OnRefreshListener
import com.chad.library.adapter.base.BaseQuickAdapter
import com.google.gson.Gson
import com.google.gson.JsonParser
import com.tencent.mmkv.MMKV
import com.yingmao.clash.R
import com.yingmao.clash.app.MainApplication
import com.yingmao.clash.base.BaseActivity
import com.yingmao.clash.common.constants.Intents
import com.yingmao.clash.common.log.Log
import com.yingmao.clash.conf.BZYConstants
import com.yingmao.clash.conf.Conf
import com.yingmao.clash.core.Clash
import com.yingmao.clash.core.model.ConfigurationOverride
import com.yingmao.clash.core.model.LogMessage
import com.yingmao.clash.core.model.Provider
import com.yingmao.clash.core.model.ProviderList
import com.yingmao.clash.core.model.ProxyGroup
import com.yingmao.clash.core.model.ProxySort
import com.yingmao.clash.core.model.TunnelState
import com.yingmao.clash.core.model.UiConfiguration
import com.yingmao.clash.entity.ClashNodebBean
import com.yingmao.clash.fragment.NewAccFragment.Companion.CHECK_NODE_RESULT_CODE
import com.yingmao.clash.remote.Remote
import com.yingmao.clash.remote.Resource
import com.yingmao.clash.service.ClashManager
import com.yingmao.clash.service.ProfileManager
import com.yingmao.clash.service.data.Selection
import com.yingmao.clash.service.data.SelectionDao
import com.yingmao.clash.service.model.Profile
import com.yingmao.clash.service.remote.IClashManager
import com.yingmao.clash.service.remote.ILogObserver
import com.yingmao.clash.service.remote.IProfileManager
import com.yingmao.clash.service.remote.IRemoteService
import com.yingmao.clash.service.store.ServiceStore
import com.yingmao.clash.service.util.sendOverrideChanged
import com.yingmao.clash.util.withClash
import com.yingmao.clash.view.RxToast
import com.yingmao.clash.view.adapter.NodeListAdapter
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.GlobalScope
import kotlinx.coroutines.Job
import kotlinx.coroutines.NonCancellable
import kotlinx.coroutines.async
import kotlinx.coroutines.channels.ReceiveChannel
import kotlinx.coroutines.delay
import kotlinx.coroutines.isActive
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
import java.util.*
import kotlin.coroutines.cancellation.CancellationException
import java.util.Timer
import java.util.TimerTask
import java.util.UUID
class ChangeNodeActivity : BaseActivity() {

12
app/src/main/java/com/yingmao/clash/app/MainApplication.kt
View File

@ -102,12 +102,12 @@ class MainApplication : Application() {
val nm = getApp()?.getSystemService<NotificationManager>()!!
nm.createNotificationChannels(
listOf(
NotificationChannel(
SERVICE_CHANNEL,
getApp()?.getText(R.string.service_vpn),
if (Build.VERSION.SDK_INT >= 28) NotificationManager.IMPORTANCE_MIN
else NotificationManager.IMPORTANCE_LOW
), // #1355
// NotificationChannel(
// SERVICE_CHANNEL,
// getApp()?.getText(R.string.service_vpn),
// if (Build.VERSION.SDK_INT >= 28) NotificationManager.IMPORTANCE_MIN
// else NotificationManager.IMPORTANCE_LOW
// ), // #1355
NotificationChannel(
STATUS_CHANNEL,
getApp()?.getText(R.string.service_proxy),

12
app/src/main/java/com/yingmao/clash/base/BaseViewMode.kt
View File

@ -4,23 +4,17 @@ import android.text.TextUtils
import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import com.yingmao.clash.net.http.HttpReqType
import com.yingmao.clash.net.http.entity.BaseRsp
import com.yingmao.clash.net.http.HttpStatus
import com.google.gson.Gson
import com.yingmao.clash.common.log.Log
import com.yingmao.clash.net.http.HttpReqType
import com.yingmao.clash.net.http.HttpStatus
import com.yingmao.clash.net.http.HttpStatusDownLoad
import com.yingmao.clash.net.http.entity.BaseRsp
import com.yingmao.clash.util.AESUtil
import kotlinx.coroutines.CoroutineExceptionHandler
import kotlinx.coroutines.async
import kotlinx.coroutines.delay
import kotlinx.coroutines.flow.asFlow
import kotlinx.coroutines.flow.flow
import kotlinx.coroutines.launch
import okhttp3.ResponseBody
open class BaseViewMode : ViewModel() {

BIN
app/src/main/libs/common.aar
View File

Binary file not shown.

BIN
app/src/main/libs/core.aar
View File

Binary file not shown.

BIN
app/src/main/libs/service.aar
View File

Binary file not shown.

10
app/src/main/res/xml/network_security_config.xml
View File

@ -7,10 +7,10 @@
<certificates src="user" />
</trust-anchors>
</base-config>
<domain-config cleartextTrafficPermitted="true"
tools:ignore="NetworkSecurityConfig">
<domain includeSubdomains="true">113.108.210.50</domain>
<!-- <domain includeSubdomains="true">test.otcopusapp.cc</domain>-->
</domain-config>
<!-- <domain-config cleartextTrafficPermitted="true"-->
<!-- tools:ignore="NetworkSecurityConfig">-->
<!-- <domain includeSubdomains="true">113.108.210.50</domain>-->
<!--&lt;!&ndash; <domain includeSubdomains="true">test.otcopusapp.cc</domain>&ndash;&gt;-->
<!-- </domain-config>-->
</network-security-config>