Merge branch 'refs/heads/for_master_0829_体积优化' into 6.8.2

Browse Source

# Conflicts:
#	common/build.gradle
#	lib_faceunity/src/main/java/io/agora/beautyapi/faceunity/agora/SWManager.java
#	main/src/main/res/mipmap-xxxhdpi/login_twitter.png

...

This commit is contained in:

老皮

2024-09-23 17:39:49 +08:00

parent 6678dbb6d6 cf73d3218e

commit 13a373c73b

4550 changed files with 324 additions and 44557 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

live/src/main/res/mipmap-mdpi/address_choice.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 920 B

BIN

live/src/main/res/mipmap-mdpi/address_choice.webp Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 612 B

BIN

live/src/main/res/mipmap-mdpi/annual_bg.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 7.6 KiB

BIN

live/src/main/res/mipmap-mdpi/annual_bg.webp Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 7.4 KiB

BIN

live/src/main/res/mipmap-mdpi/backdrop_luck.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 9.2 KiB

BIN

live/src/main/res/mipmap-mdpi/backdrop_luck.webp Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 5.0 KiB

BIN

live/src/main/res/mipmap-mdpi/beauty_jingbai.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 9.4 KiB

BIN

live/src/main/res/mipmap-mdpi/beauty_jingbai.webp Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 8.6 KiB

BIN

live/src/main/res/mipmap-mdpi/beauty_keai.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 9.3 KiB

BIN

live/src/main/res/mipmap-mdpi/beauty_keai.webp Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 8.6 KiB

BIN

live/src/main/res/mipmap-mdpi/beauty_nvshen.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 9.3 KiB

BIN

live/src/main/res/mipmap-mdpi/beauty_nvshen.webp Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 8.5 KiB

BIN

live/src/main/res/mipmap-mdpi/beauty_ziran.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 9.2 KiB

BIN

live/src/main/res/mipmap-mdpi/beauty_ziran.webp Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 8.5 KiB

BIN

live/src/main/res/mipmap-mdpi/bey_bg.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 187 B

BIN

live/src/main/res/mipmap-mdpi/bey_bg.webp Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 66 B

BIN

live/src/main/res/mipmap-mdpi/bg_chat_active.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 762 B

BIN

live/src/main/res/mipmap-mdpi/bg_chat_active.webp Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 458 B

BIN

live/src/main/res/mipmap-mdpi/bg_dragon_notify.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 133 KiB

BIN

live/src/main/res/mipmap-mdpi/bg_dragon_notify.webp Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 85 KiB

BIN

live/src/main/res/mipmap-mdpi/bg_gift_list.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 2.5 KiB

BIN

live/src/main/res/mipmap-mdpi/bg_gift_list.webp Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 428 B

BIN

live/src/main/res/mipmap-mdpi/bg_guard_buy_top_1.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 3.5 KiB

BIN

live/src/main/res/mipmap-mdpi/bg_guard_buy_top_1.webp Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.3 KiB

BIN

live/src/main/res/mipmap-mdpi/bg_guard_buy_top_2.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 3.4 KiB

BIN

live/src/main/res/mipmap-mdpi/bg_guard_buy_top_2.webp Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.3 KiB

BIN

live/src/main/res/mipmap-mdpi/bg_kirin_notify.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 152 KiB

BIN

live/src/main/res/mipmap-mdpi/bg_kirin_notify.webp Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 88 KiB

BIN

live/src/main/res/mipmap-mdpi/bg_phoenix_notify.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 104 KiB

BIN

live/src/main/res/mipmap-mdpi/bg_phoenix_notify.webp Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 51 KiB

BIN

live/src/main/res/mipmap-mdpi/bg_pk_black_bg.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 2.1 KiB

BIN

live/src/main/res/mipmap-mdpi/bg_pk_black_bg.webp Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.3 KiB

BIN

live/src/main/res/mipmap-mdpi/bg_time_box.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 748 B

BIN

live/src/main/res/mipmap-mdpi/bg_time_box.webp Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 644 B

BIN

live/src/main/res/mipmap-mdpi/bg_wishlist_audience.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 38 KiB

BIN

live/src/main/res/mipmap-mdpi/bg_wishlist_audience.webp Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 35 KiB

BIN

live/src/main/res/mipmap-mdpi/bixin.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 26 KiB

BIN

live/src/main/res/mipmap-mdpi/bixin.webp Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 12 KiB

BIN

live/src/main/res/mipmap-mdpi/box.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 619 B

BIN

live/src/main/res/mipmap-mdpi/box.webp Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 252 B

BIN

live/src/main/res/mipmap-mdpi/box_c.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 903 B

BIN

live/src/main/res/mipmap-mdpi/box_c.webp Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 526 B

BIN

live/src/main/res/mipmap-mdpi/bright_eyes.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 2.1 KiB

BIN

live/src/main/res/mipmap-mdpi/bright_eyes.webp Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.2 KiB

BIN

live/src/main/res/mipmap-mdpi/btn_big_blue.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 1.9 KiB

BIN

live/src/main/res/mipmap-mdpi/btn_big_blue.webp Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.3 KiB

BIN

live/src/main/res/mipmap-mdpi/btn_follow_bg.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 850 B

BIN

live/src/main/res/mipmap-mdpi/btn_follow_bg.webp Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 520 B

BIN

live/src/main/res/mipmap-mdpi/btn_joinfans.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 1.5 KiB

BIN

live/src/main/res/mipmap-mdpi/btn_joinfans.webp Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.0 KiB

BIN

live/src/main/res/mipmap-mdpi/btn_login.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 1.8 KiB

BIN

live/src/main/res/mipmap-mdpi/btn_login.webp Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.0 KiB

BIN

live/src/main/res/mipmap-mdpi/btn_openprotection.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 1.6 KiB

BIN

live/src/main/res/mipmap-mdpi/btn_openprotection.webp Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.2 KiB

BIN

live/src/main/res/mipmap-mdpi/btn_openvip.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 1.7 KiB

BIN

live/src/main/res/mipmap-mdpi/btn_openvip.webp Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.3 KiB

BIN

live/src/main/res/mipmap-mdpi/btn_purple.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 2.0 KiB

BIN

live/src/main/res/mipmap-mdpi/btn_purple.webp Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.3 KiB

BIN

live/src/main/res/mipmap-mdpi/btn_reg.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 1.8 KiB

BIN

live/src/main/res/mipmap-mdpi/btn_reg.webp Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.0 KiB

BIN

live/src/main/res/mipmap-mdpi/btn_white.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 1.2 KiB

BIN

live/src/main/res/mipmap-mdpi/btn_white.webp Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 772 B

BIN

live/src/main/res/mipmap-mdpi/chin.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 1.8 KiB

BIN

live/src/main/res/mipmap-mdpi/chin.webp Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 930 B

BIN

live/src/main/res/mipmap-mdpi/day_list_no_1.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 5.7 KiB

BIN

live/src/main/res/mipmap-mdpi/day_list_no_1.webp Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.3 KiB

BIN

live/src/main/res/mipmap-mdpi/day_list_no_2.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 5.9 KiB

BIN

live/src/main/res/mipmap-mdpi/day_list_no_2.webp Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.6 KiB

BIN

live/src/main/res/mipmap-mdpi/day_list_no_3.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 6.1 KiB

BIN

live/src/main/res/mipmap-mdpi/day_list_no_3.webp Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.7 KiB

BIN

live/src/main/res/mipmap-mdpi/filter_baixixx.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 10 KiB

BIN

live/src/main/res/mipmap-mdpi/filter_baixixx.webp Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 9.5 KiB

BIN

live/src/main/res/mipmap-mdpi/filter_fugu.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 10 KiB

BIN

live/src/main/res/mipmap-mdpi/filter_fugu.webp Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 9.6 KiB

BIN

live/src/main/res/mipmap-mdpi/filter_heibai.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 9.1 KiB

BIN

live/src/main/res/mipmap-mdpi/filter_heibai.webp Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 8.8 KiB

BIN

live/src/main/res/mipmap-mdpi/filter_huaxiang.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 10 KiB

BIN

live/src/main/res/mipmap-mdpi/filter_huaxiang.webp Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 9.8 KiB

BIN

live/src/main/res/mipmap-mdpi/filter_mingliang.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 9.0 KiB

BIN

live/src/main/res/mipmap-mdpi/filter_mingliang.webp Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 8.6 KiB

BIN

live/src/main/res/mipmap-mdpi/filter_nuanguang.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 10 KiB

BIN

live/src/main/res/mipmap-mdpi/filter_nuanguang.webp Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 9.4 KiB

BIN

live/src/main/res/mipmap-mdpi/filter_qingyang.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 9.7 KiB

BIN

live/src/main/res/mipmap-mdpi/filter_qingyang.webp Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 9.1 KiB

BIN

live/src/main/res/mipmap-mdpi/filter_rii.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 9.5 KiB

BIN

live/src/main/res/mipmap-mdpi/filter_rii.webp Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 9.0 KiB

BIN

live/src/main/res/mipmap-mdpi/filter_rouhe.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 11 KiB

BIN

live/src/main/res/mipmap-mdpi/filter_rouhe.webp Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 10 KiB

BIN

live/src/main/res/mipmap-mdpi/filter_shenhai.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 9.2 KiB

BIN

live/src/main/res/mipmap-mdpi/filter_shenhai.webp Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 8.8 KiB

BIN

live/src/main/res/mipmap-mdpi/filter_xianming.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 8.7 KiB

BIN

live/src/main/res/mipmap-mdpi/filter_xianming.webp Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 8.3 KiB

BIN

live/src/main/res/mipmap-mdpi/filter_xiyang.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 8.8 KiB

BIN

live/src/main/res/mipmap-mdpi/filter_xiyang.webp Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 8.5 KiB

BIN

live/src/main/res/mipmap-mdpi/filter_yuanqi.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 9.9 KiB

BIN

live/src/main/res/mipmap-mdpi/filter_yuanqi.webp Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 9.4 KiB

BIN

live/src/main/res/mipmap-mdpi/filter_zhiyu.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 8.9 KiB

BIN

live/src/main/res/mipmap-mdpi/filter_zhiyu.webp Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 8.1 KiB

BIN

live/src/main/res/mipmap-mdpi/filter_ziran.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 10 KiB

BIN

live/src/main/res/mipmap-mdpi/filter_ziran.webp Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 9.7 KiB

Some files were not shown because too many files have changed in this diff Show More