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-mdpi/bi.png
+++ b/app/src/main/res/mipmap-mdpi/bi.png
--- a/app/src/main/res/mipmap-mdpi/collect.png
+++ b/app/src/main/res/mipmap-mdpi/collect.png
--- a/app/src/main/res/mipmap-mdpi/feedback_icon.png
+++ b/app/src/main/res/mipmap-mdpi/feedback_icon.png
--- a/app/src/main/res/mipmap-mdpi/fengm.png
+++ b/app/src/main/res/mipmap-mdpi/fengm.png
--- a/app/src/main/res/mipmap-mdpi/icon_email_light.png
+++ b/app/src/main/res/mipmap-mdpi/icon_email_light.png
--- a/app/src/main/res/mipmap-mdpi/icon_eyes_closed_light.png
+++ b/app/src/main/res/mipmap-mdpi/icon_eyes_closed_light.png
--- a/app/src/main/res/mipmap-mdpi/icon_lock_light.png
+++ b/app/src/main/res/mipmap-mdpi/icon_lock_light.png
--- a/app/src/main/res/mipmap-mdpi/icons_about.png
+++ b/app/src/main/res/mipmap-mdpi/icons_about.png
--- a/app/src/main/res/mipmap-mdpi/icons_account_and_security.png
+++ b/app/src/main/res/mipmap-mdpi/icons_account_and_security.png
--- a/app/src/main/res/mipmap-mdpi/icons_bell.png
+++ b/app/src/main/res/mipmap-mdpi/icons_bell.png
--- a/app/src/main/res/mipmap-mdpi/icons_block.png
+++ b/app/src/main/res/mipmap-mdpi/icons_block.png
--- a/app/src/main/res/mipmap-mdpi/icons_dark_mode.png
+++ b/app/src/main/res/mipmap-mdpi/icons_dark_mode.png
--- a/app/src/main/res/mipmap-mdpi/icons_edited_data.png
+++ b/app/src/main/res/mipmap-mdpi/icons_edited_data.png
--- a/app/src/main/res/mipmap-mdpi/icons_padlock.png
+++ b/app/src/main/res/mipmap-mdpi/icons_padlock.png
--- a/app/src/main/res/mipmap-mdpi/icons_remove.png
+++ b/app/src/main/res/mipmap-mdpi/icons_remove.png
--- a/app/src/main/res/mipmap-mdpi/l_empty_img.png
+++ b/app/src/main/res/mipmap-mdpi/l_empty_img.png
--- a/app/src/main/res/mipmap-mdpi/log_out_icon.png
+++ b/app/src/main/res/mipmap-mdpi/log_out_icon.png
--- a/app/src/main/res/mipmap-mdpi/menu_ico.png
+++ b/app/src/main/res/mipmap-mdpi/menu_ico.png
--- a/app/src/main/res/mipmap-mdpi/menu_icon.png
+++ b/app/src/main/res/mipmap-mdpi/menu_icon.png
--- a/app/src/main/res/mipmap-mdpi/naoz.png
+++ b/app/src/main/res/mipmap-mdpi/naoz.png
--- a/app/src/main/res/mipmap-mdpi/paip_coin_img.png
+++ b/app/src/main/res/mipmap-mdpi/paip_coin_img.png
--- a/app/src/main/res/mipmap-mdpi/qr_code_icon.png
+++ b/app/src/main/res/mipmap-mdpi/qr_code_icon.png
--- a/app/src/main/res/mipmap-mdpi/sao.png
+++ b/app/src/main/res/mipmap-mdpi/sao.png
--- a/app/src/main/res/mipmap-mdpi/xingzuo.png
+++ b/app/src/main/res/mipmap-mdpi/xingzuo.png