From ae6fff187b368385f8142a98da6067897201d544 Mon Sep 17 00:00:00 2001 From: zuoxiao <470321431@qq.com> Date: 星期一, 29 四月 2024 15:47:22 +0800 Subject: [PATCH] 1.修改架构将河南版本提取成library 2.修复密码修改的bug 3.添加登录页选择模块功能 --- app/build.gradle | 34 ++++++++++++++++------------------ 1 files changed, 16 insertions(+), 18 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index ca782cd..2aedab6 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -16,14 +16,13 @@ applicationId "com.dayu.recharge" minSdk 23 targetSdk 26 - versionCode 14 - versionName "1.4" - + versionCode 22 + versionName "2.2" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" -// ndk{ -// abiFilters 'armeabi-v7a' -// } + ndk{ + abiFilters 'armeabi-v7a' + } 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' + 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,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' // 澶勭悊鍥剧墖 @@ -91,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