Merge branch 'main' into zhong_1

2025-11-10 11:20:08 +08:00
parent e2de134180 aac3220a69
commit 30563a75f3
128 changed files with 2107 additions and 725 deletions
--- a/app/src/main/res/mipmap-xhdpi/bi.png
+++ b/app/src/main/res/mipmap-xhdpi/bi.png
--- a/app/src/main/res/mipmap-xhdpi/collect.png
+++ b/app/src/main/res/mipmap-xhdpi/collect.png
--- a/app/src/main/res/mipmap-xhdpi/feedback_icon.png
+++ b/app/src/main/res/mipmap-xhdpi/feedback_icon.png
--- a/app/src/main/res/mipmap-xhdpi/fengm.png
+++ b/app/src/main/res/mipmap-xhdpi/fengm.png
--- a/app/src/main/res/mipmap-xhdpi/icon_email_light.png
+++ b/app/src/main/res/mipmap-xhdpi/icon_email_light.png
--- a/app/src/main/res/mipmap-xhdpi/icon_eyes_closed_light.png
+++ b/app/src/main/res/mipmap-xhdpi/icon_eyes_closed_light.png
--- a/app/src/main/res/mipmap-xhdpi/icon_lock_light.png
+++ b/app/src/main/res/mipmap-xhdpi/icon_lock_light.png
--- a/app/src/main/res/mipmap-xhdpi/icons_about.png
+++ b/app/src/main/res/mipmap-xhdpi/icons_about.png
--- a/app/src/main/res/mipmap-xhdpi/icons_account_and_security.png
+++ b/app/src/main/res/mipmap-xhdpi/icons_account_and_security.png
--- a/app/src/main/res/mipmap-xhdpi/icons_bell.png
+++ b/app/src/main/res/mipmap-xhdpi/icons_bell.png
--- a/app/src/main/res/mipmap-xhdpi/icons_block.png
+++ b/app/src/main/res/mipmap-xhdpi/icons_block.png
--- a/app/src/main/res/mipmap-xhdpi/icons_dark_mode.png
+++ b/app/src/main/res/mipmap-xhdpi/icons_dark_mode.png
--- a/app/src/main/res/mipmap-xhdpi/icons_edited_data.png
+++ b/app/src/main/res/mipmap-xhdpi/icons_edited_data.png
--- a/app/src/main/res/mipmap-xhdpi/icons_padlock.png
+++ b/app/src/main/res/mipmap-xhdpi/icons_padlock.png
--- a/app/src/main/res/mipmap-xhdpi/icons_remove.png
+++ b/app/src/main/res/mipmap-xhdpi/icons_remove.png
--- a/app/src/main/res/mipmap-xhdpi/l_empty_img.png
+++ b/app/src/main/res/mipmap-xhdpi/l_empty_img.png
--- a/app/src/main/res/mipmap-xhdpi/log_out_icon.png
+++ b/app/src/main/res/mipmap-xhdpi/log_out_icon.png
--- a/app/src/main/res/mipmap-xhdpi/menu_ico.png
+++ b/app/src/main/res/mipmap-xhdpi/menu_ico.png
--- a/app/src/main/res/mipmap-xhdpi/menu_icon.png
+++ b/app/src/main/res/mipmap-xhdpi/menu_icon.png
--- a/app/src/main/res/mipmap-xhdpi/naoz.png
+++ b/app/src/main/res/mipmap-xhdpi/naoz.png
--- a/app/src/main/res/mipmap-xhdpi/paip_coin_img.png
+++ b/app/src/main/res/mipmap-xhdpi/paip_coin_img.png
--- a/app/src/main/res/mipmap-xhdpi/qr_code_icon.png
+++ b/app/src/main/res/mipmap-xhdpi/qr_code_icon.png
--- a/app/src/main/res/mipmap-xhdpi/sao.png
+++ b/app/src/main/res/mipmap-xhdpi/sao.png
--- a/app/src/main/res/mipmap-xhdpi/xingzuo.png
+++ b/app/src/main/res/mipmap-xhdpi/xingzuo.png