From 794186d529b9f185032e6c3eb97d78f0c75555a6 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期三, 14 一月 2026 16:03:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/maanshan' into maanshan
---
keyCabinet-android/app/build.gradle | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/keyCabinet-android/app/build.gradle b/keyCabinet-android/app/build.gradle
index 903c1df..d7e696f 100644
--- a/keyCabinet-android/app/build.gradle
+++ b/keyCabinet-android/app/build.gradle
@@ -10,8 +10,8 @@
applicationId "com.doumee.keyCabinet"
minSdkVersion build_versions.min_sdk
targetSdkVersion build_versions.target_sdk
- versionCode 1
- versionName "1.0.0"
+ versionCode 5
+ versionName "1.0.5"
//鏀寔vectorDrawables鐭㈤噺鍥�
vectorDrawables.useSupportLibrary = true
@@ -26,7 +26,7 @@
ndk {
moduleName "facesdk"
ldLibs "log"
- abiFilters "armeabi-v7a","x86" // "armeabi", "x86", "arm64-v8a"
+ abiFilters "arm64-v8a"
}
multiDexEnabled true
}
@@ -108,7 +108,7 @@
implementation project(path: ':settinglibrary')
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
implementation files('libs\\simple-xml-2.7.1.jar')
- implementation files('libs\\API-20250310.jar')
+ implementation files('libs\\myservice_20240630.jar')
testImplementation deps.test.junit
androidTestImplementation deps.test.ext_junit
androidTestImplementation deps.test.test_espresso
@@ -126,8 +126,6 @@
//implementation 'com.github.Shouheng88:compressor:latest-version'
//鍘嬬缉鍥剧墖
implementation "id.zelory:compressor:1.0.3"
- //涓插彛
- implementation 'com.licheedev:android-serialport:2.1.3'
//浜岀淮鐮佺敓鎴�
implementation 'com.journeyapps:zxing-android-embedded:3.4.0'
@@ -136,4 +134,7 @@
implementation 'pl.droidsonroids.gif:android-gif-drawable:1.2.19'
//杞挱鍥�
implementation 'com.bigkoo:convenientbanner:2.0.5'
+ //澶村儚
+ implementation 'de.hdodenhof:circleimageview:3.1.0'
+
}
\ No newline at end of file
--
Gitblit v1.9.3