From f3b7c4b538ea50ef0834c2c3b5099bdd6663e06d Mon Sep 17 00:00:00 2001 From: cyh Date: Wed, 9 Oct 2024 16:00:13 +0800 Subject: [PATCH] fix --- .../com/yingmao/clash/act/NewMainActivity.kt | 62 +++++++++++-------- .../yingmao/clash/fragment/NewAccFragment.kt | 2 - .../com/yingmao/clash/net/http/NetService.kt | 2 +- build.gradle.kts | 4 +- 4 files changed, 38 insertions(+), 32 deletions(-) diff --git a/app/src/main/java/com/yingmao/clash/act/NewMainActivity.kt b/app/src/main/java/com/yingmao/clash/act/NewMainActivity.kt index e64ef0e..404ac34 100644 --- a/app/src/main/java/com/yingmao/clash/act/NewMainActivity.kt +++ b/app/src/main/java/com/yingmao/clash/act/NewMainActivity.kt @@ -167,40 +167,48 @@ class NewMainActivity : BaseActivity() { return } isUpload = true - GlobalScope.async { - val hostsJsonArray = JsonArray() - for (hostItem in hostsMem) { - val hostAndTime = hostItem.split("{") - val hostJsonObject = JsonObject() - hostJsonObject.addProperty( - "id", MMKV.defaultMMKV().decodeInt(BZYConstants.MMKV_KEY_NOTE_NODE_ID, 0) - ) - hostJsonObject.addProperty("requestHosts", hostAndTime[0]) - hostJsonObject.addProperty("requestTime", hostAndTime[1]) - hostsJsonArray.add(hostJsonObject) - } + try { - val httpApi = NetService.instances.createHttps(HttpApi::class.java) - val hostsJsonArrayStr = hostsJsonArray.toString() + + GlobalScope.async { + val hostsJsonArray = JsonArray() + for (hostItem in hostsMem) { + val hostAndTime = hostItem.split("{") + val hostJsonObject = JsonObject() + hostJsonObject.addProperty( + "id", MMKV.defaultMMKV().decodeInt(BZYConstants.MMKV_KEY_NOTE_NODE_ID, 0) + ) + hostJsonObject.addProperty("requestHosts", hostAndTime[0]) + hostJsonObject.addProperty("requestTime", hostAndTime[1]) + hostsJsonArray.add(hostJsonObject) + } + + val httpApi = NetService.instances.createHttps(HttpApi::class.java) + val hostsJsonArrayStr = hostsJsonArray.toString() // Log.d("hostsJsonArrayStr==>$hostsJsonArrayStr") - val hostsJsonArrayStrObject = JsonObject() - hostsJsonArrayStrObject.addProperty("requestLogs", hostsJsonArrayStr) - val phToken = MMKV.defaultMMKV().decodeString(BZYConstants.MMKV_KEY_PH_TOKEN, "") - hostsJsonArrayStrObject.addProperty("phToken", phToken) + val hostsJsonArrayStrObject = JsonObject() + hostsJsonArrayStrObject.addProperty("requestLogs", hostsJsonArrayStr) + val phToken = MMKV.defaultMMKV().decodeString(BZYConstants.MMKV_KEY_PH_TOKEN, "") + hostsJsonArrayStrObject.addProperty("phToken", phToken) - val encryptHostsJsonArrayStrObject = AESUtil.byteArrayToHexStr( - AESUtil.encrypt(hostsJsonArrayStrObject.toString()) - ) + val encryptHostsJsonArrayStrObject = AESUtil.byteArrayToHexStr( + AESUtil.encrypt(hostsJsonArrayStrObject.toString()) + ) // Log.d("encryptHostsJsonArrayStrObject==>$encryptHostsJsonArrayStrObject") - val requestBody: RequestBody = RequestBody.create( - "text/plain".toMediaTypeOrNull(), encryptHostsJsonArrayStrObject - ) - val uploadRequestLogs = httpApi.uploadRequestLogs(requestBody) - Log.d("uploadRequestLogs==>${uploadRequestLogs}") + val requestBody: RequestBody = RequestBody.create( + "text/plain".toMediaTypeOrNull(), encryptHostsJsonArrayStrObject + ) + val uploadRequestLogs = httpApi.uploadRequestLogs(requestBody) + Log.d("uploadRequestLogs==>${uploadRequestLogs}") // if ("0" == uploadRequestLogs.code) { + +// } + } + } catch (e: Exception) { + e.printStackTrace() + } finally { hostsMem.clear() isUpload = false -// } } } diff --git a/app/src/main/java/com/yingmao/clash/fragment/NewAccFragment.kt b/app/src/main/java/com/yingmao/clash/fragment/NewAccFragment.kt index 49e257d..5fdcfd5 100644 --- a/app/src/main/java/com/yingmao/clash/fragment/NewAccFragment.kt +++ b/app/src/main/java/com/yingmao/clash/fragment/NewAccFragment.kt @@ -119,11 +119,9 @@ class NewAccFragment : BaseFragment(), CoroutineScope by CoroutineScope(Dispatch getNodesStatus() // accelerateViewModel.getAirNodes() // accelerateViewModel.appCheck() - val token = MMKV.defaultMMKV().decodeString( BZYConstants.MMKV_KEY_TOKEN ).toString() - Log.d("token==>$token") } diff --git a/app/src/main/java/com/yingmao/clash/net/http/NetService.kt b/app/src/main/java/com/yingmao/clash/net/http/NetService.kt index 1f79de9..c206967 100644 --- a/app/src/main/java/com/yingmao/clash/net/http/NetService.kt +++ b/app/src/main/java/com/yingmao/clash/net/http/NetService.kt @@ -53,7 +53,7 @@ class NetService private constructor() : INetService { val hh = if (!BuildConfig.is_back_cn) { // "https://app.bazhuayujiasu.cc:18001" // "https://api.gaogaoshousoft.cc:18001" -// "https://api.yingmaovpnpro.win:18002" +// "https://api.yingmaox.cc:8700" // "https://113.108.210.50:21002" MMKV.defaultMMKV().decodeString(BZYConstants.MMKV_KEY_CURRENT_HOST, BuildConfig.service_url)!! // MMKV.defaultMMKV().decodeString(BZYConstants.MMKV_KEY_CURRENT_HOST, "https://app.bazhuayujiasu.cc:18001") diff --git a/build.gradle.kts b/build.gradle.kts index 24869c3..947cd58 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -51,8 +51,8 @@ subprojects { minSdk = 21 //noinspection ExpiredTargetSdkVersion targetSdk = 31 - versionName = "1.0.1.9" - versionCode = 1019 + versionName = "1.0.2.0" + versionCode = 1020 resValue("string", "release_name", "v$versionName") resValue("integer", "release_code", "$versionCode") externalNativeBuild {