From 15d9aae9a65c3385aaea29cb6d9810e4a8e8bd27 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期二, 07 五月 2024 11:04:45 +0800
Subject: [PATCH] 1.修复开卡列表显示异常bug 2.实现读卡界面相关功能 3.所有Activity去掉齐河后缀
---
app/build.gradle | 35 +++++++++++++++++------------------
1 files changed, 17 insertions(+), 18 deletions(-)
diff --git a/app/build.gradle b/app/build.gradle
index 494202c..ec755fd 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -16,13 +16,13 @@
applicationId "com.dayu.recharge"
minSdk 23
targetSdk 26
- versionCode 16
- versionName "1.6"
+ versionCode 22
+ versionName "2.2"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-// ndk{
-// abiFilters 'armeabi-v7a'
-// }
+ ndk {
+ abiFilters 'armeabi-v7a'
+ }
signingConfig signingConfigs.debug
}
@@ -48,21 +48,17 @@
// dirs 'libs'
// }
// }
- externalNativeBuild {
- cmake {
- path "CMakeLists.txt"
- }
- }
+
}
//ps:dycz@2023
//alias:dayu
//ps:dycz@2023
dependencies {
- implementation fileTree(include: ['*.jar','*.aar'], dir: 'libs')
- implementation 'com.android.support:appcompat-v7:28.0.0'
- implementation 'com.android.support.constraint:constraint-layout:1.1.3'
- implementation 'androidx.core:core-ktx:1.8.0'
- implementation 'androidx.appcompat:appcompat:1.5.0'
+ implementation fileTree(include: ['*.jar', '*.aar'], dir: 'libs')
+ compileOnly 'com.android.support:appcompat-v7:28.0.0'
+ compileOnly 'com.android.support.constraint:constraint-layout:1.1.3'
+ compileOnly 'androidx.core:core-ktx:1.8.0'
+ compileOnly 'androidx.appcompat:appcompat:1.5.0'
//room鏁版嵁搴�
implementation "androidx.room:room-runtime:2.3.0"
implementation "androidx.room:room-ktx:2.3.0"
@@ -72,9 +68,10 @@
implementation 'com.google.zxing:core:3.4.1'
implementation group: 'net.sourceforge.jexcelapi', name: 'jxl', version: '2.6.12'
implementation 'com.wang.avi:library:2.1.3'
- //鍦板潃閫夋嫨
- implementation project(':pickerviewlibrary')
- implementation project(':easysocket')
+
+ implementation project(':henanlibrary')
+ implementation project(':baselibrary')
+ implementation project(':qihealonelibrary')
implementation 'com.tencent.bugly:crashreport:4.1.9.3'
// 澶勭悊鍥剧墖
@@ -90,4 +87,6 @@
implementation 'androidx.recyclerview:recyclerview:1.2.0'//缁忓吀鍒锋柊澶�
implementation 'io.reactivex.rxjava3:rxandroid:3.0.0'
+
+
}
\ No newline at end of file
--
Gitblit v1.8.0