From 08bfe3072377b53c60e0952f00c26bce2e5b4bc0 Mon Sep 17 00:00:00 2001 From: zuoxiao <470321431@qq.com> Date: 星期三, 18 六月 2025 17:05:55 +0800 Subject: [PATCH] feat(card): 添加卡片返还功能- 新增 CardReturnActivity 用于执行卡片返还操作 - 在 BSCardFragment 中添加返还按钮,跳转到 CardReturnActivity - 在 CardOperationType 中添加 ReturnCard 类型 - 修改 CardReadActivity,优化卡片信息显示逻辑 - 更新 CardWriteSuccessActivity,支持返还成功提示 - 新增 ic_morny_back 图标用于返还操作 --- baselibrary/build.gradle | 29 +++++++++++++++++++++++------ 1 files changed, 23 insertions(+), 6 deletions(-) diff --git a/baselibrary/build.gradle b/baselibrary/build.gradle index 16f5ba9..cbf5578 100644 --- a/baselibrary/build.gradle +++ b/baselibrary/build.gradle @@ -1,7 +1,8 @@ apply plugin: 'com.android.library' android { - compileSdk 33 + namespace 'com.dayu.baselibrary' + compileSdk 34 defaultConfig { minSdk 23 targetSdk 26 @@ -26,11 +27,18 @@ viewBinding { enabled = true; } + sourceSets { + main { + aidl.srcDirs = ['src/main/aidl'] + } + } } dependencies { - implementation fileTree(include: ['*.jar', '*.aar'], dir: 'libs') + + implementation fileTree(include: ['*.jar'], dir: 'exlibs') + 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' @@ -38,18 +46,27 @@ compileOnly 'com.google.zxing:core:3.4.1' compileOnly 'com.tencent.bugly:crashreport:4.1.9.3' - + implementation project(':pickerviewlibrary') //loding - implementation 'com.wang.avi:library:2.1.3' +// implementation 'com.wang.avi:library:2.1.3' //婊氬姩閫夋嫨妗� - compileOnly 'com.contrarywind:Android-PickerView:4.1.9' +// compileOnly 'com.contrarywind:Android-PickerView:4.1.9' implementation "androidx.room:room-runtime:2.3.0" implementation "androidx.room:room-ktx:2.3.0" runtimeOnly("androidx.room:room-common:2.3.0") annotationProcessor "androidx.room:room-compiler:2.3.0" - + implementation 'com.pnikosis:materialish-progress:1.7' //鏉冮檺鐢宠 compileOnly 'com.github.getActivity:XXPermissions:18.5' + + //閫氫俊 + implementation 'com.squareup.retrofit2:retrofit:2.9.0' + implementation('com.squareup.retrofit2:converter-gson:2.9.0') { + exclude group: 'com.google.code.gson'; + } + implementation 'com.squareup.retrofit2:adapter-rxjava3:2.9.0' + implementation 'io.reactivex.rxjava3:rxandroid:3.0.0' + implementation 'com.squareup.okhttp3:logging-interceptor:4.11.0' } \ No newline at end of file -- Gitblit v1.8.0