diff --git a/app/build.gradle b/app/build.gradle index b861428..4d76191 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -15,12 +15,12 @@ } } - compileSdkVersion 32 + compileSdkVersion 31 defaultConfig { applicationId "com.casic.detector" minSdkVersion 22 - targetSdkVersion 32 + targetSdkVersion 31 versionCode 1 versionName "1.0.0.0" @@ -35,6 +35,7 @@ release { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + signingConfig signingConfigs.release } } diff --git a/app/build.gradle b/app/build.gradle index b861428..4d76191 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -15,12 +15,12 @@ } } - compileSdkVersion 32 + compileSdkVersion 31 defaultConfig { applicationId "com.casic.detector" minSdkVersion 22 - targetSdkVersion 32 + targetSdkVersion 31 versionCode 1 versionName "1.0.0.0" @@ -35,6 +35,7 @@ release { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + signingConfig signingConfigs.release } } diff --git a/app/src/main/java/com/casic/detector/view/SearchLabelActivity.kt b/app/src/main/java/com/casic/detector/view/SearchLabelActivity.kt index 6307cec..b5b15f1 100644 --- a/app/src/main/java/com/casic/detector/view/SearchLabelActivity.kt +++ b/app/src/main/java/com/casic/detector/view/SearchLabelActivity.kt @@ -177,11 +177,11 @@ //去掉前缀并缩小100倍 var energy = energyResponse.substring(1).toInt() / 100 if (energy >= 50) { - //测试过程最大值(5189)52 + //测试过程最大值(5189)---> 5200 energy = 50 } - if (energy > 14) { + if (energy > 13) { depthButton.isEnabled = true degreeButton.isEnabled = true @@ -213,15 +213,15 @@ } } - if (energy < 11) {//40° + if (energy < 13) {//47° energyTipsView.text = "标识器信号较弱,可能距离较远" energyTipsView.setTextColor(Color.RED) //重新测试更精确的能量值,不让测距 - } else if (energy > 41) {//150° - energyTipsView.text = "标识器信号极强,可能就在附近" + } else if (energy > 41) {//148° + energyTipsView.text = "信号极强,接近标识器正上方" energyTipsView.setTextColor(Color.GREEN) - } else {//[40°,150°] - energyTipsView.text = "标识器器信号波动,请继续移动位置" + } else {//[47°,148°] + energyTipsView.text = "已靠近标识器,请继续移动" energyTipsView.setTextColor(Color.YELLOW) }