From ddafb0f0951e68b4e56bfceef43cf78559f5161f Mon Sep 17 00:00:00 2001 From: zuoxiao <470321431@qq.com> Date: 星期三, 26 六月 2024 14:52:27 +0800 Subject: [PATCH] 1.修复河南版本域名卡结构不同问题 2.修复齐河版本最终购水日期的bug --- app/build.gradle | 45 ++++++++++++++++++++------------------------- 1 files changed, 20 insertions(+), 25 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index df6defb..ed99b59 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -16,13 +16,12 @@ applicationId "com.dayu.recharge" minSdk 23 targetSdk 26 - versionCode 1 - versionName "1.0" - + versionCode 253 + versionName "2.5.3" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" - ndk{ - abiFilters 'armeabi-v7a' + ndk { + abiFilters 'armeabi-v7a','arm64-v8a' } signingConfig signingConfigs.debug @@ -49,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" @@ -73,18 +68,16 @@ 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 'com.tencent.bugly:crashreport:latest.release' + + implementation project(':henanlibrary') + implementation project(':baselibrary') + implementation project(':qihealonelibrary') + + implementation 'com.tencent.bugly:crashreport:4.1.9.3' // 澶勭悊鍥剧墖 // implementation (name: 'ocr-library', ext: 'aar') - //鏉冮檺 - implementation ('com.guolindev.permissionx:permissionx:1.7.1'){ - exclude group: 'androidx.core'; - exclude group: 'androidx.appcompat'; - exclude group: 'androidx.annotation'; - } + //鏉冮檺鐢宠 + implementation 'com.github.getActivity:XXPermissions:18.5' //婊氬姩閫夋嫨妗� implementation 'com.contrarywind:Android-PickerView:4.1.9' @@ -94,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