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 图标用于返还操作 --- app/src/main/res/values/styles.xml | 28 ++-------------------------- 1 files changed, 2 insertions(+), 26 deletions(-) diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 666b988..1ae5666 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -1,36 +1,12 @@ <resources> <!-- Base application theme. --> - <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar"> + <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar"> <!-- Customize your theme here. --> <item name="colorPrimary">@color/colorPrimary</item> <item name="colorPrimaryDark">@color/colorPrimaryDark</item> <item name="colorAccent">@color/colorAccent</item> - </style> - - - <style name="newCardLL"> - <item name="android:layout_marginLeft">20dp</item> - <item name="android:layout_marginRight">20dp</item> - <item name="android:layout_marginTop">10dp</item> - <item name="android:layout_marginBottom">10dp</item> - - </style> - - <style name="date_picker_dialog" parent="android:style/Theme.Dialog"> - <item name="android:windowFrame">@null</item> - <item name="android:windowNoTitle">true</item> - <item name="android:windowIsFloating">true</item> - <item name="android:windowContentOverlay">@null</item> - <item name="android:windowBackground">@color/date_picker_bg</item> - </style> - - <style name="ws_pay_showSelfDialog" parent="@android:style/Theme.Holo.DialogWhenLarge"> - <item name="android:windowFrame">@null</item> - <item name="android:windowNoTitle">true</item> - <item name="android:windowIsFloating">true</item> - <item name="android:windowBackground">@color/ws_pay_alpha</item> - <item name="android:windowContentOverlay">@null</item> + <item name="android:windowAnimationStyle">@null</item> </style> </resources> -- Gitblit v1.8.0