diff --git a/app/build.gradle b/app/build.gradle index c95e04f..6507f0a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -54,7 +54,7 @@ dependencies { //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.9' implementation 'androidx.core:core-ktx:1.9.0' def androidx_version = '1.6.1' implementation "androidx.appcompat:appcompat:${androidx_version}" diff --git a/app/build.gradle b/app/build.gradle index c95e04f..6507f0a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -54,7 +54,7 @@ dependencies { //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.9' implementation 'androidx.core:core-ktx:1.9.0' def androidx_version = '1.6.1' implementation "androidx.appcompat:appcompat:${androidx_version}" diff --git a/app/src/main/java/com/casic/br/app/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/br/app/retrofit/RetrofitServiceManager.kt index 0d438c4..0856595 100644 --- a/app/src/main/java/com/casic/br/app/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/br/app/retrofit/RetrofitServiceManager.kt @@ -22,14 +22,14 @@ val httpConfig = SaveKeyValues.getValue( LocaleConstant.DEFAULT_SERVER_CONFIG, LocaleConstant.SERVER_BASE_URL ) as String - RetrofitFactory.createRetrofit(httpConfig, timeout = 20) + RetrofitFactory.createRetrofit(httpConfig, 20, true) } private val aiApi by lazy { val httpConfig = SaveKeyValues.getValue( LocaleConstant.AI_SERVER_CONFIG, LocaleConstant.AI_BASE_URL ) as String - RetrofitFactory.createRetrofit(httpConfig, timeout = 20) + RetrofitFactory.createRetrofit(httpConfig, 20, false) } private val gson by lazy { Gson() } diff --git a/app/build.gradle b/app/build.gradle index c95e04f..6507f0a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -54,7 +54,7 @@ dependencies { //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.8' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.9' implementation 'androidx.core:core-ktx:1.9.0' def androidx_version = '1.6.1' implementation "androidx.appcompat:appcompat:${androidx_version}" diff --git a/app/src/main/java/com/casic/br/app/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/br/app/retrofit/RetrofitServiceManager.kt index 0d438c4..0856595 100644 --- a/app/src/main/java/com/casic/br/app/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/br/app/retrofit/RetrofitServiceManager.kt @@ -22,14 +22,14 @@ val httpConfig = SaveKeyValues.getValue( LocaleConstant.DEFAULT_SERVER_CONFIG, LocaleConstant.SERVER_BASE_URL ) as String - RetrofitFactory.createRetrofit(httpConfig, timeout = 20) + RetrofitFactory.createRetrofit(httpConfig, 20, true) } private val aiApi by lazy { val httpConfig = SaveKeyValues.getValue( LocaleConstant.AI_SERVER_CONFIG, LocaleConstant.AI_BASE_URL ) as String - RetrofitFactory.createRetrofit(httpConfig, timeout = 20) + RetrofitFactory.createRetrofit(httpConfig, 20, false) } private val gson by lazy { Gson() } diff --git a/app/src/main/java/com/casic/br/app/view/StartCheckActivity.kt b/app/src/main/java/com/casic/br/app/view/StartCheckActivity.kt index a309c40..7be114e 100644 --- a/app/src/main/java/com/casic/br/app/view/StartCheckActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/StartCheckActivity.kt @@ -70,7 +70,6 @@ private lateinit var imageAnalysis: ImageAnalysis private lateinit var configViewModel: ConfigViewModel private lateinit var imageFileViewModel: ImageFileViewModel - private var sceneName = "" private var isRecognizing = false private var mainDicModels: MutableList = ArrayList() @@ -86,7 +85,6 @@ imageFileViewModel = ViewModelProvider(this)[ImageFileViewModel::class.java] imageFileViewModel.recognizeResult.observe(this) { if (it.code == 200) { - sceneName = it.scene binding.titleView.setTitle(it.scene) binding.detectView.updateTargetPosition(it.result) } @@ -194,7 +192,9 @@ val bitmap = BitmapFactory.decodeByteArray(imageBytes, 0, imageBytes.size) val base64 = bitmap.rotateImage(90).encodeToBase64() - imageFileViewModel.getRecognizeResult(context, base64, sceneName) + imageFileViewModel.getRecognizeResult( + context, base64, binding.titleView.getTitle() + ) } } //检测完之后close就会继续生成下一帧图片,否则就会被阻塞不会继续生成下一帧 @@ -263,7 +263,7 @@ ActivityResultContracts.StartActivityForResult(), ActivityResultCallback { if (it.resultCode == Activity.RESULT_OK) { val data = it.data ?: return@ActivityResultCallback - sceneName = data.getStringExtra("sceneName").toString() + val sceneName = data.getStringExtra("sceneName").toString() binding.titleView.setTitle(sceneName) } })