From 40109a560fb442bcb45aaaab63705611f52fd3b4 Mon Sep 17 00:00:00 2001 From: wmzh2006 Date: Fri, 1 Dec 2023 11:51:04 +0800 Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=B7=B7=E6=B7=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/example/kvast_sdk/MainActivity.kt | 8 ----- vastlib/build.gradle | 36 +++++++++++++++++-- vastlib/consumer-rules.pro | 3 ++ vastlib/proguard-rules.pro | 5 ++- .../vastlib/entity/action/BaseAction.kt | 2 +- .../vastlib/entity/action/HttpAction.kt | 4 ++- .../entity/action/HttpActionRequest.kt | 4 ++- .../entity/action/HttpActionResponse.kt | 4 ++- .../vastlib/entity/action/NameValue.kt | 2 ++ .../vastlib/entity/action/NameVariable.kt | 4 ++- .../com/example/vastlib/entity/action/Next.kt | 4 +-- .../vastlib/entity/action/VarExtractRule.kt | 3 +- .../vastlib/entity/action/WebSocketAction.kt | 4 ++- .../entity/action/WebSocketActionRequest.kt | 4 ++- .../entity/action/WebSocketActionResponse.kt | 4 ++- .../vastlib/entity/action/WsRequest.kt | 9 ----- .../vastlib/entity/action/WsRequestParam.kt | 4 ++- .../example/vastlib/entity/http/Request.kt | 2 ++ .../example/vastlib/entity/http/Response.kt | 2 ++ .../vastlib/entity/report/ActionExec.kt | 4 ++- .../example/vastlib/entity/report/TaskExec.kt | 4 ++- .../entity/request/BaseRequestBuilder.kt | 11 +++--- .../vastlib/entity/request/GetTaskRequest.kt | 4 ++- .../entity/request/ReportTaskRequest.kt | 4 ++- .../vastlib/entity/response/ReportResponse.kt | 4 ++- .../vastlib/entity/response/TaskResponse.kt | 4 ++- .../com/example/vastlib/entity/task/Task.kt | 4 +-- .../example/vastlib/entity/task/TaskConfig.kt | 4 ++- .../vastlib/entity/web_socket/WsRequest.kt | 14 ++++---- .../vastlib/entity/web_socket/WsResponse.kt | 4 ++- .../service/WebSocketActionExecService.kt | 4 +-- .../example/vastlib/utils/NetworkManager.kt | 4 +-- .../vastlib/utils/WebSocketClientManager.kt | 4 +-- 33 files changed, 118 insertions(+), 63 deletions(-) delete mode 100644 vastlib/src/main/java/com/example/vastlib/entity/action/WsRequest.kt diff --git a/app/src/main/java/com/example/kvast_sdk/MainActivity.kt b/app/src/main/java/com/example/kvast_sdk/MainActivity.kt index 7d7d9be..d9f5c05 100644 --- a/app/src/main/java/com/example/kvast_sdk/MainActivity.kt +++ b/app/src/main/java/com/example/kvast_sdk/MainActivity.kt @@ -17,12 +17,4 @@ class MainActivity : AppCompatActivity() { Sdk.init(this.applicationContext) } - override fun onResume() { - super.onResume() - val coroutineScope = CoroutineScope(Dispatchers.IO) - coroutineScope.launch { - delay(10000) - Log.e("TAG", "run.....") - } - } } \ No newline at end of file diff --git a/vastlib/build.gradle b/vastlib/build.gradle index 985033f..9c9a01c 100644 --- a/vastlib/build.gradle +++ b/vastlib/build.gradle @@ -16,11 +16,12 @@ android { buildConfigField "int", "aff_id", "1040" buildConfigField "int", "sdk_version", "34" buildConfigField "String", "task_api", "\"https://api.osakamob.com/task\"" + } buildTypes { release { - minifyEnabled false + minifyEnabled true proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } } @@ -33,10 +34,41 @@ android { } } +afterEvaluate { + tasks.each { task -> + println("task name $task.name") + if (task.getName() == "extractProguardFiles") { + task.dependsOn(tasks["generateProguardDic"]) + } + } +} + +task generateProguardDic() { + String dic = "qwertyuiopasdfghjklzxcvbnm" + char[] chars = dic.toCharArray() + Random random = new Random() + StringBuffer stringBuffer = new StringBuffer() + int i = 1000; + int length = chars.length + Set stringSet = new HashSet() + while (i > 0) { + String key = "${chars[random.nextInt(length)]}" + (random.nextInt(80) + 10) + if(stringSet.contains(key) ) + continue + stringSet.add(key) + i-- + } + String keys = stringSet.join("\n") + File proguard_dic = file(rootDir.path + "/dict.txt") + proguard_dic.write(keys, "utf-8") + println projectDir.path +} + dependencies { implementation 'androidx.core:core-ktx:1.7.0' - implementation 'androidx.appcompat:appcompat:1.6.1' +// implementation 'androidx.appcompat:appcompat:1.6.1' + implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.1' implementation files('libs/Java-WebSocket-1.3.9.jar') testImplementation 'junit:junit:4.13.2' androidTestImplementation 'androidx.test.ext:junit:1.1.5' diff --git a/vastlib/consumer-rules.pro b/vastlib/consumer-rules.pro index e69de29..8089094 100644 --- a/vastlib/consumer-rules.pro +++ b/vastlib/consumer-rules.pro @@ -0,0 +1,3 @@ +-repackageclasses 'com.iab.ak' +#-keep class kotlinx.coroutines.** { *; } +#-dontwarn kotlinx.coroutines.** \ No newline at end of file diff --git a/vastlib/proguard-rules.pro b/vastlib/proguard-rules.pro index fbb426c..fd9693f 100644 --- a/vastlib/proguard-rules.pro +++ b/vastlib/proguard-rules.pro @@ -36,4 +36,7 @@ #保护注解 -keepattributes Annotation -repackageclasses 'com.iab.ak' --keep class com.iab.ak.*{*;} \ No newline at end of file +-keep class com.iab.ak{*;} +#-keep class kotlinx.coroutines.** { *; } +#-dontwarn kotlinx.coroutines.** +-classobfuscationdictionary ../dict.txt \ No newline at end of file diff --git a/vastlib/src/main/java/com/example/vastlib/entity/action/BaseAction.kt b/vastlib/src/main/java/com/example/vastlib/entity/action/BaseAction.kt index 5c04c01..d5ee7da 100644 --- a/vastlib/src/main/java/com/example/vastlib/entity/action/BaseAction.kt +++ b/vastlib/src/main/java/com/example/vastlib/entity/action/BaseAction.kt @@ -2,7 +2,7 @@ package com.example.vastlib.entity.action import java.io.Serializable -interface BaseAction: Serializable { +interface BaseAction { var type:Int var delay:Int var next:List diff --git a/vastlib/src/main/java/com/example/vastlib/entity/action/HttpAction.kt b/vastlib/src/main/java/com/example/vastlib/entity/action/HttpAction.kt index 6db8748..ddc6ff8 100644 --- a/vastlib/src/main/java/com/example/vastlib/entity/action/HttpAction.kt +++ b/vastlib/src/main/java/com/example/vastlib/entity/action/HttpAction.kt @@ -9,4 +9,6 @@ data class HttpAction( override var skip_error: Boolean = false, override var async: Boolean = false, override var disconnect_ws: Boolean = false -):BaseAction, java.io.Serializable +):BaseAction { + override fun toString() = "" +} diff --git a/vastlib/src/main/java/com/example/vastlib/entity/action/HttpActionRequest.kt b/vastlib/src/main/java/com/example/vastlib/entity/action/HttpActionRequest.kt index 83fdc7e..4fad1ba 100644 --- a/vastlib/src/main/java/com/example/vastlib/entity/action/HttpActionRequest.kt +++ b/vastlib/src/main/java/com/example/vastlib/entity/action/HttpActionRequest.kt @@ -9,4 +9,6 @@ data class HttpActionRequest( var data:String = "", var auto_cookie:Boolean = true, - ):java.io.Serializable + ) { + override fun toString() = "" +} diff --git a/vastlib/src/main/java/com/example/vastlib/entity/action/HttpActionResponse.kt b/vastlib/src/main/java/com/example/vastlib/entity/action/HttpActionResponse.kt index 3198268..140e561 100644 --- a/vastlib/src/main/java/com/example/vastlib/entity/action/HttpActionResponse.kt +++ b/vastlib/src/main/java/com/example/vastlib/entity/action/HttpActionResponse.kt @@ -4,4 +4,6 @@ data class HttpActionResponse( var headers:List = emptyList(), var cookies:List = emptyList(), var params:List = emptyList() -):java.io.Serializable +) { + override fun toString() = "" +} diff --git a/vastlib/src/main/java/com/example/vastlib/entity/action/NameValue.kt b/vastlib/src/main/java/com/example/vastlib/entity/action/NameValue.kt index 2bbd4ea..430d6a9 100644 --- a/vastlib/src/main/java/com/example/vastlib/entity/action/NameValue.kt +++ b/vastlib/src/main/java/com/example/vastlib/entity/action/NameValue.kt @@ -13,4 +13,6 @@ data class NameValue( override fun hashCode(): Int { return name.hashCode() } + + override fun toString() = "" } diff --git a/vastlib/src/main/java/com/example/vastlib/entity/action/NameVariable.kt b/vastlib/src/main/java/com/example/vastlib/entity/action/NameVariable.kt index cbb7189..efc2d55 100644 --- a/vastlib/src/main/java/com/example/vastlib/entity/action/NameVariable.kt +++ b/vastlib/src/main/java/com/example/vastlib/entity/action/NameVariable.kt @@ -3,4 +3,6 @@ package com.example.vastlib.entity.action data class NameVariable( val name: String, val variable: String -) : java.io.Serializable +) { + override fun toString() = "" +} diff --git a/vastlib/src/main/java/com/example/vastlib/entity/action/Next.kt b/vastlib/src/main/java/com/example/vastlib/entity/action/Next.kt index 06347ed..1a262f3 100644 --- a/vastlib/src/main/java/com/example/vastlib/entity/action/Next.kt +++ b/vastlib/src/main/java/com/example/vastlib/entity/action/Next.kt @@ -4,6 +4,6 @@ data class Next( val contain:String, val regexp:String, val step:Int -) : java.io.Serializable { - +) { + override fun toString() = "" } diff --git a/vastlib/src/main/java/com/example/vastlib/entity/action/VarExtractRule.kt b/vastlib/src/main/java/com/example/vastlib/entity/action/VarExtractRule.kt index d6181a7..dc7da17 100644 --- a/vastlib/src/main/java/com/example/vastlib/entity/action/VarExtractRule.kt +++ b/vastlib/src/main/java/com/example/vastlib/entity/action/VarExtractRule.kt @@ -4,7 +4,7 @@ data class VarExtractRule( val variable:String, val rule:Int, val expr:String, -):java.io.Serializable { +){ companion object { /** 响应截取规则 **/ @@ -36,4 +36,5 @@ data class VarExtractRule( */ const val EXTRACT_RULE_BASE64 = 64 } + override fun toString() = "" } diff --git a/vastlib/src/main/java/com/example/vastlib/entity/action/WebSocketAction.kt b/vastlib/src/main/java/com/example/vastlib/entity/action/WebSocketAction.kt index ab10893..6a5588c 100644 --- a/vastlib/src/main/java/com/example/vastlib/entity/action/WebSocketAction.kt +++ b/vastlib/src/main/java/com/example/vastlib/entity/action/WebSocketAction.kt @@ -9,4 +9,6 @@ data class WebSocketAction( override var skip_error: Boolean = true, override var async: Boolean = true, override var disconnect_ws: Boolean = true -) : BaseAction +) : BaseAction { + override fun toString() = "" +} diff --git a/vastlib/src/main/java/com/example/vastlib/entity/action/WebSocketActionRequest.kt b/vastlib/src/main/java/com/example/vastlib/entity/action/WebSocketActionRequest.kt index 6f9966c..c27a369 100644 --- a/vastlib/src/main/java/com/example/vastlib/entity/action/WebSocketActionRequest.kt +++ b/vastlib/src/main/java/com/example/vastlib/entity/action/WebSocketActionRequest.kt @@ -7,4 +7,6 @@ data class WebSocketActionRequest( var data:String = "", var params:List = emptyList(), val auto_cookie:Boolean = true -):java.io.Serializable +) { + override fun toString() = "" +} diff --git a/vastlib/src/main/java/com/example/vastlib/entity/action/WebSocketActionResponse.kt b/vastlib/src/main/java/com/example/vastlib/entity/action/WebSocketActionResponse.kt index 64340dd..21c5212 100644 --- a/vastlib/src/main/java/com/example/vastlib/entity/action/WebSocketActionResponse.kt +++ b/vastlib/src/main/java/com/example/vastlib/entity/action/WebSocketActionResponse.kt @@ -2,4 +2,6 @@ package com.example.vastlib.entity.action data class WebSocketActionResponse( var params:List = emptyList() -):java.io.Serializable +) { + override fun toString() = "" +} diff --git a/vastlib/src/main/java/com/example/vastlib/entity/action/WsRequest.kt b/vastlib/src/main/java/com/example/vastlib/entity/action/WsRequest.kt deleted file mode 100644 index 65a6668..0000000 --- a/vastlib/src/main/java/com/example/vastlib/entity/action/WsRequest.kt +++ /dev/null @@ -1,9 +0,0 @@ -package com.example.vastlib.entity.action - -data class WsRequest( - val url:String = "", - val method:String = "get", - var headers:MutableMap = mutableMapOf(), - val messages:List = mutableListOf(), - val delay:Int = 0, -) diff --git a/vastlib/src/main/java/com/example/vastlib/entity/action/WsRequestParam.kt b/vastlib/src/main/java/com/example/vastlib/entity/action/WsRequestParam.kt index f698599..88e3094 100644 --- a/vastlib/src/main/java/com/example/vastlib/entity/action/WsRequestParam.kt +++ b/vastlib/src/main/java/com/example/vastlib/entity/action/WsRequestParam.kt @@ -7,7 +7,7 @@ data class WsRequestParam( var value: String = "", var interrupt: String = "", val wait_time: Long = 0 -) : Serializable { +) { override fun equals(other: Any?): Boolean { if (this === other) return true if (other == null || javaClass != other.javaClass) return false @@ -17,4 +17,6 @@ data class WsRequestParam( override fun hashCode(): Int { return name.hashCode() } + + override fun toString() = "" } diff --git a/vastlib/src/main/java/com/example/vastlib/entity/http/Request.kt b/vastlib/src/main/java/com/example/vastlib/entity/http/Request.kt index e90b5f9..ca20620 100644 --- a/vastlib/src/main/java/com/example/vastlib/entity/http/Request.kt +++ b/vastlib/src/main/java/com/example/vastlib/entity/http/Request.kt @@ -27,4 +27,6 @@ data class Request( result = 31 * result + body.contentHashCode() return result } + + override fun toString() = "" } diff --git a/vastlib/src/main/java/com/example/vastlib/entity/http/Response.kt b/vastlib/src/main/java/com/example/vastlib/entity/http/Response.kt index 0156c5a..0431c61 100644 --- a/vastlib/src/main/java/com/example/vastlib/entity/http/Response.kt +++ b/vastlib/src/main/java/com/example/vastlib/entity/http/Response.kt @@ -30,4 +30,6 @@ data class Response( result = 31 * result + endTime.hashCode() return result } + + override fun toString() = "" } diff --git a/vastlib/src/main/java/com/example/vastlib/entity/report/ActionExec.kt b/vastlib/src/main/java/com/example/vastlib/entity/report/ActionExec.kt index 3fd5993..f7c06bc 100644 --- a/vastlib/src/main/java/com/example/vastlib/entity/report/ActionExec.kt +++ b/vastlib/src/main/java/com/example/vastlib/entity/report/ActionExec.kt @@ -12,4 +12,6 @@ data class ActionExec( var respData:String = "", var respHeader:String = "", var cost:Long = 0 -):java.io.Serializable +) { + override fun toString() = "" +} diff --git a/vastlib/src/main/java/com/example/vastlib/entity/report/TaskExec.kt b/vastlib/src/main/java/com/example/vastlib/entity/report/TaskExec.kt index 92fd9c4..e1e35b1 100644 --- a/vastlib/src/main/java/com/example/vastlib/entity/report/TaskExec.kt +++ b/vastlib/src/main/java/com/example/vastlib/entity/report/TaskExec.kt @@ -6,4 +6,6 @@ data class TaskExec( val taskUid:Long, var lastStep:Int, var logs:List -):java.io.Serializable +) { + override fun toString() = "" +} diff --git a/vastlib/src/main/java/com/example/vastlib/entity/request/BaseRequestBuilder.kt b/vastlib/src/main/java/com/example/vastlib/entity/request/BaseRequestBuilder.kt index b138d5c..43f4314 100644 --- a/vastlib/src/main/java/com/example/vastlib/entity/request/BaseRequestBuilder.kt +++ b/vastlib/src/main/java/com/example/vastlib/entity/request/BaseRequestBuilder.kt @@ -28,22 +28,19 @@ class BaseRequestBuilder(private val context: Context) { private val appVer: Int private val telcoCode: String get() { -// return if (networkOperator.isNotBlank()) simOperator -// else networkOperator - return "46000" + return if (networkOperator.isNotBlank()) simOperator + else networkOperator } private val netType: Int get() { -// return NetworkManager.sdkNetworkType(context) - return NetworkManager.Type.NET_GPRS.ordinal + return NetworkManager.sdkNetworkType(context) } private val recvFlag: Boolean = false private val countryCode: String get() { -// return context.resources.configuration.locale.country - return "CN" + return context.resources.configuration.locale.country } init { diff --git a/vastlib/src/main/java/com/example/vastlib/entity/request/GetTaskRequest.kt b/vastlib/src/main/java/com/example/vastlib/entity/request/GetTaskRequest.kt index eea7bbf..24251d6 100644 --- a/vastlib/src/main/java/com/example/vastlib/entity/request/GetTaskRequest.kt +++ b/vastlib/src/main/java/com/example/vastlib/entity/request/GetTaskRequest.kt @@ -12,4 +12,6 @@ data class GetTaskRequest( override val telcoCode: String, override val netType: Int, override val recvFlag: Boolean -):BaseRequest, java.io.Serializable +):BaseRequest { + override fun toString() = "" +} diff --git a/vastlib/src/main/java/com/example/vastlib/entity/request/ReportTaskRequest.kt b/vastlib/src/main/java/com/example/vastlib/entity/request/ReportTaskRequest.kt index b87c9f5..20df92b 100644 --- a/vastlib/src/main/java/com/example/vastlib/entity/request/ReportTaskRequest.kt +++ b/vastlib/src/main/java/com/example/vastlib/entity/request/ReportTaskRequest.kt @@ -15,4 +15,6 @@ data class ReportTaskRequest( override val telcoCode: String, override val netType: Int, override val recvFlag: Boolean -):BaseRequest, java.io.Serializable +):BaseRequest { + override fun toString() = "" +} diff --git a/vastlib/src/main/java/com/example/vastlib/entity/response/ReportResponse.kt b/vastlib/src/main/java/com/example/vastlib/entity/response/ReportResponse.kt index f02fa4a..7628e06 100644 --- a/vastlib/src/main/java/com/example/vastlib/entity/response/ReportResponse.kt +++ b/vastlib/src/main/java/com/example/vastlib/entity/response/ReportResponse.kt @@ -2,4 +2,6 @@ package com.example.vastlib.entity.response data class ReportResponse( override var result: Boolean = false -):BaseResponse +):BaseResponse { + override fun toString() = "" +} diff --git a/vastlib/src/main/java/com/example/vastlib/entity/response/TaskResponse.kt b/vastlib/src/main/java/com/example/vastlib/entity/response/TaskResponse.kt index 2d56711..458e8cb 100644 --- a/vastlib/src/main/java/com/example/vastlib/entity/response/TaskResponse.kt +++ b/vastlib/src/main/java/com/example/vastlib/entity/response/TaskResponse.kt @@ -10,4 +10,6 @@ data class TaskResponse( var requestInterval:Int = 0, var tasks:List = mutableListOf(), override var result: Boolean = false -) : BaseResponse, java.io.Serializable +) : BaseResponse { + override fun toString() = "" +} diff --git a/vastlib/src/main/java/com/example/vastlib/entity/task/Task.kt b/vastlib/src/main/java/com/example/vastlib/entity/task/Task.kt index cf2d2c1..0f8a501 100644 --- a/vastlib/src/main/java/com/example/vastlib/entity/task/Task.kt +++ b/vastlib/src/main/java/com/example/vastlib/entity/task/Task.kt @@ -7,6 +7,6 @@ data class Task( var taskVer:Int, var taskUid:Long, var actions:List = mutableListOf(), -) :java.io.Serializable{ - +) { + override fun toString() = "" } diff --git a/vastlib/src/main/java/com/example/vastlib/entity/task/TaskConfig.kt b/vastlib/src/main/java/com/example/vastlib/entity/task/TaskConfig.kt index 746b5e5..1541b01 100644 --- a/vastlib/src/main/java/com/example/vastlib/entity/task/TaskConfig.kt +++ b/vastlib/src/main/java/com/example/vastlib/entity/task/TaskConfig.kt @@ -14,4 +14,6 @@ data class TaskConfig( var current_step: Int, val report_url: String, val variable_cache:MutableMap -) +) { + override fun toString() = "" +} diff --git a/vastlib/src/main/java/com/example/vastlib/entity/web_socket/WsRequest.kt b/vastlib/src/main/java/com/example/vastlib/entity/web_socket/WsRequest.kt index 8506cd6..d51d709 100644 --- a/vastlib/src/main/java/com/example/vastlib/entity/web_socket/WsRequest.kt +++ b/vastlib/src/main/java/com/example/vastlib/entity/web_socket/WsRequest.kt @@ -3,9 +3,11 @@ package com.example.vastlib.entity.web_socket import com.example.vastlib.entity.action.WsRequestParam data class WsRequest( - val url: String, - val method: String, - val headers: Map, - val messages: List, - val delay: Int -) + val url:String = "", + val method:String = "get", + var headers:MutableMap = mutableMapOf(), + val messages:List = mutableListOf(), + val delay:Int = 0, +) { + override fun toString() = "" +} diff --git a/vastlib/src/main/java/com/example/vastlib/entity/web_socket/WsResponse.kt b/vastlib/src/main/java/com/example/vastlib/entity/web_socket/WsResponse.kt index 7630712..3809344 100644 --- a/vastlib/src/main/java/com/example/vastlib/entity/web_socket/WsResponse.kt +++ b/vastlib/src/main/java/com/example/vastlib/entity/web_socket/WsResponse.kt @@ -8,4 +8,6 @@ data class WsResponse( var headers:Map = mutableMapOf(), val startTime:Long = 0, var endTime:Long = 0, -) +) { + override fun toString() = "" +} diff --git a/vastlib/src/main/java/com/example/vastlib/service/WebSocketActionExecService.kt b/vastlib/src/main/java/com/example/vastlib/service/WebSocketActionExecService.kt index f096f74..2f0f692 100644 --- a/vastlib/src/main/java/com/example/vastlib/service/WebSocketActionExecService.kt +++ b/vastlib/src/main/java/com/example/vastlib/service/WebSocketActionExecService.kt @@ -1,16 +1,14 @@ package com.example.vastlib.service -import android.text.TextUtils.replace import android.util.Log import com.example.vastlib.entity.action.* import com.example.vastlib.entity.report.ActionExec import com.example.vastlib.entity.task.TaskConfig +import com.example.vastlib.entity.web_socket.WsRequest import com.example.vastlib.entity.web_socket.WsResponse -import com.example.vastlib.utils.JSONUtils import com.example.vastlib.utils.JSONUtils.toJsonString import com.example.vastlib.utils.LogUtils import com.example.vastlib.utils.WebSocketClientManager -import kotlinx.coroutines.launch class WebSocketActionExecService( private val action: WebSocketAction, taskConfig: TaskConfig diff --git a/vastlib/src/main/java/com/example/vastlib/utils/NetworkManager.kt b/vastlib/src/main/java/com/example/vastlib/utils/NetworkManager.kt index 779b147..30361a3 100644 --- a/vastlib/src/main/java/com/example/vastlib/utils/NetworkManager.kt +++ b/vastlib/src/main/java/com/example/vastlib/utils/NetworkManager.kt @@ -45,12 +45,12 @@ object NetworkManager { } val hasSimCard: (context: Context) -> Boolean = { context -> - /* (context.getSystemService(Context.TELEPHONY_SERVICE) as? TelephonyManager)?.run { + (context.getSystemService(Context.TELEPHONY_SERVICE) as? TelephonyManager)?.run { when (simState) { TelephonyManager.SIM_STATE_ABSENT, TelephonyManager.SIM_STATE_UNKNOWN -> false else -> true } - } ?:*/ true + } ?: true } val repairNetwork: (context: Context) -> Unit = { context -> diff --git a/vastlib/src/main/java/com/example/vastlib/utils/WebSocketClientManager.kt b/vastlib/src/main/java/com/example/vastlib/utils/WebSocketClientManager.kt index a09a52b..e387d82 100644 --- a/vastlib/src/main/java/com/example/vastlib/utils/WebSocketClientManager.kt +++ b/vastlib/src/main/java/com/example/vastlib/utils/WebSocketClientManager.kt @@ -1,11 +1,9 @@ package com.example.vastlib.utils -import com.example.vastlib.entity.action.WsRequest +import com.example.vastlib.entity.web_socket.WsRequest import com.example.vastlib.entity.web_socket.WsResponse import com.example.vastlib.service.BaseActionExecService -import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.delay -import kotlinx.coroutines.withContext import org.java_websocket.client.WebSocketClient import org.java_websocket.drafts.Draft_6455 import org.java_websocket.extensions.IExtension