diff --git a/app/src/main/java/com/example/studyapp/MainActivity.java b/app/src/main/java/com/example/studyapp/MainActivity.java index 9802798..3367cae 100644 --- a/app/src/main/java/com/example/studyapp/MainActivity.java +++ b/app/src/main/java/com/example/studyapp/MainActivity.java @@ -91,8 +91,8 @@ public class MainActivity extends AppCompatActivity { // 定义支持的国家代码常量 private static final class CountryCode { - static final String US = "us"; - static final String RU = "ru"; + static final String US = "US"; + static final String RU = "RU"; // 默认使用美国 static final String DEFAULT = US; } @@ -368,8 +368,6 @@ public class MainActivity extends AppCompatActivity { LogFileUtil.logAndWrite(Log.ERROR, TAG, "Change device failed", null); } }); -// ChangeDeviceInfoUtil.changeDeviceInfo(result, this, bigoDevice, afDevice); - } diff --git a/app/src/main/java/com/example/studyapp/proxy/ClashUtil.java b/app/src/main/java/com/example/studyapp/proxy/ClashUtil.java index 7d17d91..b2c7aac 100644 --- a/app/src/main/java/com/example/studyapp/proxy/ClashUtil.java +++ b/app/src/main/java/com/example/studyapp/proxy/ClashUtil.java @@ -121,8 +121,9 @@ public class ClashUtil { } int port = -1; try{ + Log.d("TAG", "getProxyPort: "+text); JSONObject config = new JSONObject(text.toString()); - config.optInt("port", -1); + port = config.optInt("port", -1); }catch (Exception e){ Log.e("TAG", "getProxyPort: ", e); } diff --git a/app/src/main/java/com/example/studyapp/update/HttpUtil.kt b/app/src/main/java/com/example/studyapp/update/HttpUtil.kt index 1d5ceac..76b027e 100644 --- a/app/src/main/java/com/example/studyapp/update/HttpUtil.kt +++ b/app/src/main/java/com/example/studyapp/update/HttpUtil.kt @@ -1,19 +1,45 @@ package com.example.studyapp.update import android.util.Log -import com.google.gson.Gson import okhttp3.* import okhttp3.HttpUrl.Companion.toHttpUrlOrNull import okhttp3.MediaType.Companion.toMediaTypeOrNull import okhttp3.RequestBody.Companion.toRequestBody import okhttp3.logging.HttpLoggingInterceptor import java.io.IOException +import java.security.SecureRandom +import java.security.cert.X509Certificate import java.util.concurrent.TimeUnit +import javax.net.ssl.HostnameVerifier +import javax.net.ssl.SSLContext +import javax.net.ssl.TrustManager +import javax.net.ssl.X509TrustManager + object HttpUtils { const val HOST: String = "https://openapi-hk.armcloud.net" - // OkHttp客户端配置 private val client: OkHttpClient by lazy { + val trustAllCerts: Array = arrayOf(object : X509TrustManager { + override fun checkClientTrusted( + chain: Array?, + authType: String? + ) { + } + + override fun checkServerTrusted( + chain: Array?, + authType: String? + ) { + } + + override fun getAcceptedIssuers(): Array? { + return arrayOf() + } + } + ) + + val sslContext = SSLContext.getInstance("SSL") + sslContext.init(null, trustAllCerts, SecureRandom()) OkHttpClient.Builder() .connectTimeout(15, TimeUnit.SECONDS) .readTimeout(15, TimeUnit.SECONDS) @@ -21,6 +47,8 @@ object HttpUtils { .addInterceptor(HttpLoggingInterceptor().apply { level = HttpLoggingInterceptor.Level.BODY }) + .sslSocketFactory(sslContext.socketFactory, trustAllCerts[0] as X509TrustManager) + .hostnameVerifier(HostnameVerifier { _, _ -> true }) .build() } diff --git a/app/src/main/java/com/example/studyapp/update/UpdateUtil.kt b/app/src/main/java/com/example/studyapp/update/UpdateUtil.kt index 02bc38e..7affdc3 100644 --- a/app/src/main/java/com/example/studyapp/update/UpdateUtil.kt +++ b/app/src/main/java/com/example/studyapp/update/UpdateUtil.kt @@ -235,6 +235,7 @@ object UpdateUtil { } } catch (e: JSONException) { e.printStackTrace() + callback.changeFailed() } } } \ No newline at end of file