diff --git a/app/build.gradle b/app/build.gradle index 65d8378..02a1900 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -2,13 +2,12 @@ apply plugin: 'com.android.application' apply plugin: 'kotlin-android' -apply plugin: 'kotlin-android-extensions' apply plugin: 'org.greenrobot.greendao' android { signingConfigs { release { - storeFile file('/Users/a203/Desktop/AndroidProjects/CommonDetector/app/Detector.jks') + storeFile file('Detector.jks') storePassword '123456789' keyAlias 'key0' keyPassword '123456789' @@ -21,8 +20,8 @@ applicationId "com.casic.detector" minSdkVersion 22 targetSdkVersion 33 - versionCode 1002 - versionName "1.0.0.2" + versionCode 1003 + versionName "1.0.0.3" ndk { moduleName "serial_port" @@ -35,7 +34,6 @@ release { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - signingConfig signingConfigs.release } } @@ -79,8 +77,8 @@ dependencies { //基础依赖库 implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.5' - implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' + implementation 'androidx.appcompat:appcompat:1.6.1' //Google官方授权框架 implementation 'pub.devrel:easypermissions:3.0.0' //腾讯Android UI框架 diff --git a/app/build.gradle b/app/build.gradle index 65d8378..02a1900 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -2,13 +2,12 @@ apply plugin: 'com.android.application' apply plugin: 'kotlin-android' -apply plugin: 'kotlin-android-extensions' apply plugin: 'org.greenrobot.greendao' android { signingConfigs { release { - storeFile file('/Users/a203/Desktop/AndroidProjects/CommonDetector/app/Detector.jks') + storeFile file('Detector.jks') storePassword '123456789' keyAlias 'key0' keyPassword '123456789' @@ -21,8 +20,8 @@ applicationId "com.casic.detector" minSdkVersion 22 targetSdkVersion 33 - versionCode 1002 - versionName "1.0.0.2" + versionCode 1003 + versionName "1.0.0.3" ndk { moduleName "serial_port" @@ -35,7 +34,6 @@ release { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - signingConfig signingConfigs.release } } @@ -79,8 +77,8 @@ dependencies { //基础依赖库 implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.5' - implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' + implementation 'androidx.appcompat:appcompat:1.6.1' //Google官方授权框架 implementation 'pub.devrel:easypermissions:3.0.0' //腾讯Android UI框架 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 298a718..bd4b317 100644 --- a/app/src/main/java/com/casic/detector/view/SearchLabelActivity.kt +++ b/app/src/main/java/com/casic/detector/view/SearchLabelActivity.kt @@ -137,10 +137,6 @@ } binding.markerInfoButton.setOnClickListener { - if (DataBaseManager.get.loadTaskLabels().isEmpty()) { - "电子标识器本地数据未同步,请先同步".show(this) - return@setOnClickListener - } //查库 val result = DataBaseManager.get.queryLabelById(identifierId) if (result.isNotEmpty()) {