parent
725656f833
commit
f0ecc79975
|
|
@ -199,13 +199,6 @@ class MainActivity : BaseActivity() {
|
||||||
observe(this, mainAtyVM)
|
observe(this, mainAtyVM)
|
||||||
mainAtyVM.startHeartBeat()
|
mainAtyVM.startHeartBeat()
|
||||||
mainAtyVM.getAirNodes()
|
mainAtyVM.getAirNodes()
|
||||||
val isGlobal = MMKV.defaultMMKV().decodeBool(BZYConstants.MMKV_KEY_GLOBAL_MODEL, false)
|
|
||||||
newMainActGlo = isGlobal
|
|
||||||
startLog()
|
|
||||||
firstEntry()
|
|
||||||
mainAtyVM.getExpensesRecord(mPageInfo)
|
|
||||||
|
|
||||||
|
|
||||||
val intentFilter = IntentFilter(Intents.ACTION_NODE_LIST)
|
val intentFilter = IntentFilter(Intents.ACTION_NODE_LIST)
|
||||||
mainBroadcastReceiver = NodeListBR()
|
mainBroadcastReceiver = NodeListBR()
|
||||||
if (Build.VERSION.SDK_INT >= 34 && applicationInfo.targetSdkVersion >= 34) {
|
if (Build.VERSION.SDK_INT >= 34 && applicationInfo.targetSdkVersion >= 34) {
|
||||||
|
|
@ -220,6 +213,11 @@ class MainActivity : BaseActivity() {
|
||||||
intentFilter
|
intentFilter
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
val isGlobal = MMKV.defaultMMKV().decodeBool(BZYConstants.MMKV_KEY_GLOBAL_MODEL, false)
|
||||||
|
newMainActGlo = isGlobal
|
||||||
|
startLog()
|
||||||
|
firstEntry()
|
||||||
|
mainAtyVM.getExpensesRecord(mPageInfo)
|
||||||
}
|
}
|
||||||
|
|
||||||
inner class NodeListBR : BroadcastReceiver() {
|
inner class NodeListBR : BroadcastReceiver() {
|
||||||
|
|
@ -228,25 +226,7 @@ class MainActivity : BaseActivity() {
|
||||||
Intents.ACTION_NODE_LIST -> {
|
Intents.ACTION_NODE_LIST -> {
|
||||||
Log.i("MainActivity ACTION_NODE_LIST")
|
Log.i("MainActivity ACTION_NODE_LIST")
|
||||||
val userTraffic=serStore.userTraffic
|
val userTraffic=serStore.userTraffic
|
||||||
Log.d("userTraffic::::${userTraffic}")
|
|
||||||
userTrafficMethod(userTraffic)
|
userTrafficMethod(userTraffic)
|
||||||
val selectedName =
|
|
||||||
MMKV.defaultMMKV()
|
|
||||||
.decodeString(BZYConstants.NODE_SELECTED_NAME_KEY, "")
|
|
||||||
if(TextUtils.isEmpty(selectedName)){
|
|
||||||
val json = serStore.nodes
|
|
||||||
val nodesInfo = getNodesInfo(json)
|
|
||||||
val proxies = nodesInfo[0].proxies[0]
|
|
||||||
Log.i("MainActivity baseChoose::${proxies} true:${proxies.isNotEmpty()}")
|
|
||||||
if(proxies.isNotEmpty()){
|
|
||||||
MMKV.defaultMMKV().encode(BZYConstants.NODE_All_ITEM_NAME_KEY, json)
|
|
||||||
MMKV.defaultMMKV().encode(BZYConstants.NODE_SELECTED_NAME_KEY, proxies)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (TextUtils.isEmpty(userTraffic)) {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
else -> {
|
else -> {
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -203,8 +203,6 @@ class NodeGroupActivity : BaseActivity(){
|
||||||
hideLoading()
|
hideLoading()
|
||||||
timerJob?.cancel()
|
timerJob?.cancel()
|
||||||
val json = serStore.nodes
|
val json = serStore.nodes
|
||||||
val trsss=serStore.userTraffic
|
|
||||||
Log.d("AAAAAAAAAAAAAAAAAAAA${trsss}")
|
|
||||||
if (TextUtils.isEmpty(json)) {
|
if (TextUtils.isEmpty(json)) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -683,6 +683,9 @@ open class HomeFragment : BaseFragment(), CoroutineScope by CoroutineScope(Dispa
|
||||||
val selectedName =
|
val selectedName =
|
||||||
MMKV.defaultMMKV()
|
MMKV.defaultMMKV()
|
||||||
.decodeString(BZYConstants.NODE_SELECTED_NAME_KEY, "")
|
.decodeString(BZYConstants.NODE_SELECTED_NAME_KEY, "")
|
||||||
|
if(TextUtils.isEmpty(selectedName)){
|
||||||
|
MMKV.defaultMMKV().encode(BZYConstants.NODE_SELECTED_NAME_KEY, "自动选择")
|
||||||
|
}
|
||||||
Log.i("selected_name ==>${selectedName}")
|
Log.i("selected_name ==>${selectedName}")
|
||||||
if (!TextUtils.isEmpty(selectedName)) {
|
if (!TextUtils.isEmpty(selectedName)) {
|
||||||
val o = cm.queryOverride(Clash.OverrideSlot.Session)
|
val o = cm.queryOverride(Clash.OverrideSlot.Session)
|
||||||
|
|
@ -712,12 +715,11 @@ open class HomeFragment : BaseFragment(), CoroutineScope by CoroutineScope(Dispa
|
||||||
if (TextUtils.isEmpty(selectedName)) {
|
if (TextUtils.isEmpty(selectedName)) {
|
||||||
subUrl?.let {
|
subUrl?.let {
|
||||||
val json = serStore.nodes
|
val json = serStore.nodes
|
||||||
Log.d("getNodes json==>${json}")
|
if(json.isNotEmpty()){
|
||||||
currentNode=getNodesInfo(json)
|
Log.d("getNodes json==>${json}")
|
||||||
Log.d("getNodes currentNode==>${currentNode} dataname:${currentNode[0].proxies[0]}")
|
currentNode=getNodesInfo(json)
|
||||||
val baseNodeName=currentNode[0].proxies[0]
|
Log.d("getNodes currentNode==>${currentNode} dataname:${currentNode[0].proxies[0]}")
|
||||||
|
val baseNodeName=currentNode[0].proxies[0]
|
||||||
if (!TextUtils.isEmpty(baseNodeName)) {
|
|
||||||
GlobalScope.launch(Dispatchers.IO) {
|
GlobalScope.launch(Dispatchers.IO) {
|
||||||
clashBinder?.let { cm ->
|
clashBinder?.let { cm ->
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -64,8 +64,8 @@ subprojects {
|
||||||
}
|
}
|
||||||
minSdk = 21
|
minSdk = 21
|
||||||
targetSdk = 34
|
targetSdk = 34
|
||||||
versionName = "1.0.5.2"
|
versionName = "1.0.5.3"
|
||||||
versionCode = 1052
|
versionCode = 1053
|
||||||
resValue("string", "release_name", "v$versionName")
|
resValue("string", "release_name", "v$versionName")
|
||||||
resValue("integer", "release_code", "$versionCode")
|
resValue("integer", "release_code", "$versionCode")
|
||||||
externalNativeBuild {
|
externalNativeBuild {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue