diff --git a/app/src/main/java/com/android/grape/net/MyGet.kt b/app/src/main/java/com/android/grape/net/MyGet.kt index 0773232..77ed273 100644 --- a/app/src/main/java/com/android/grape/net/MyGet.kt +++ b/app/src/main/java/com/android/grape/net/MyGet.kt @@ -16,17 +16,14 @@ import java.util.concurrent.TimeUnit object MyGet { private const val TAG = "MyGet" - val affHttpClient: OkHttpClient = OkHttpClient() - - fun getAffHttpClient(): OkHttpClient { - affHttpClient.dispatcher.maxRequests = 1000 - affHttpClient.dispatcher.maxRequestsPerHost = 1000 - return affHttpClient + val affHttpClient: OkHttpClient = OkHttpClient().apply { + dispatcher.maxRequests = 1000 + dispatcher.maxRequestsPerHost = 1000 } fun get(url_: String): String { var response: Response? = null - val client: OkHttpClient = getAffHttpClient().newBuilder() + val client: OkHttpClient = affHttpClient.newBuilder() .connectTimeout(5, TimeUnit.SECONDS) .readTimeout(5, TimeUnit.SECONDS) .build() diff --git a/app/src/main/java/com/android/grape/util/ChangeDeviceInfoUtil.kt b/app/src/main/java/com/android/grape/util/ChangeDeviceInfoUtil.kt index 57b9c78..3fabe74 100644 --- a/app/src/main/java/com/android/grape/util/ChangeDeviceInfoUtil.kt +++ b/app/src/main/java/com/android/grape/util/ChangeDeviceInfoUtil.kt @@ -159,6 +159,7 @@ object ChangeDeviceInfoUtil { } } catch (e: JSONException) { e.printStackTrace() + callBack.changeFailed() } } diff --git a/app/src/main/java/com/android/grape/util/Util.kt b/app/src/main/java/com/android/grape/util/Util.kt index 28285ba..54be1b6 100644 --- a/app/src/main/java/com/android/grape/util/Util.kt +++ b/app/src/main/java/com/android/grape/util/Util.kt @@ -785,7 +785,6 @@ object Util { nRandom++ if (nRandom % 3 == 0) { -// execInstallTask(context); execReloginTask(context) } else { execInstallTask(context)