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

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

BIN

FaceUnity/src/main/res/mipmap-xxhdpi/ico_home_animoji.png

View File

Binary file not shown.

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

BIN

FaceUnity/src/main/res/mipmap-xxhdpi/ico_home_animoji.webp Normal file

View File

Binary file not shown.

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

BIN

FaceUnity/src/main/res/mipmap-xxhdpi/ico_home_beauty.png

View File

Binary file not shown.

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

BIN

FaceUnity/src/main/res/mipmap-xxhdpi/ico_home_beauty.webp Normal file

View File

Binary file not shown.

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

BIN

FaceUnity/src/main/res/mipmap-xxhdpi/ico_home_beauty_body.png

View File

Binary file not shown.

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

BIN

FaceUnity/src/main/res/mipmap-xxhdpi/ico_home_beauty_body.webp Normal file

View File

Binary file not shown.

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

BIN

FaceUnity/src/main/res/mipmap-xxhdpi/ico_home_big_head.png

View File

Binary file not shown.

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

BIN

FaceUnity/src/main/res/mipmap-xxhdpi/ico_home_big_head.webp Normal file

View File

Binary file not shown.

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

BIN

FaceUnity/src/main/res/mipmap-xxhdpi/ico_home_fine_sticker.png

View File

Binary file not shown.

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

BIN

FaceUnity/src/main/res/mipmap-xxhdpi/ico_home_fine_sticker.webp Normal file

View File

Binary file not shown.

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

BIN

FaceUnity/src/main/res/mipmap-xxhdpi/ico_home_makeup.png

View File

Binary file not shown.

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

BIN

FaceUnity/src/main/res/mipmap-xxhdpi/ico_home_makeup.webp Normal file

View File

Binary file not shown.

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

BIN

FaceUnity/src/main/res/mipmap-xxhdpi/ico_home_sticker.png

View File

Binary file not shown.

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

BIN

FaceUnity/src/main/res/mipmap-xxhdpi/ico_home_sticker.webp Normal file

View File

Binary file not shown.

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

BIN

FaceUnity/src/main/res/mipmap-xxhdpi/icon_animoji_baihu.png

View File

Binary file not shown.

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

BIN

FaceUnity/src/main/res/mipmap-xxhdpi/icon_animoji_baihu.webp Normal file

View File

Binary file not shown.

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

BIN

FaceUnity/src/main/res/mipmap-xxhdpi/icon_animoji_baimao.png

View File

Binary file not shown.

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

BIN

FaceUnity/src/main/res/mipmap-xxhdpi/icon_animoji_baimao.webp Normal file

View File

Binary file not shown.

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

BIN

FaceUnity/src/main/res/mipmap-xxhdpi/icon_animoji_cartoon_princess.png

View File

Binary file not shown.

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

BIN

FaceUnity/src/main/res/mipmap-xxhdpi/icon_animoji_cartoon_princess.webp Normal file

View File

Binary file not shown.

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

BIN

FaceUnity/src/main/res/mipmap-xxhdpi/icon_animoji_douniuquan.png

View File

Binary file not shown.

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

BIN

FaceUnity/src/main/res/mipmap-xxhdpi/icon_animoji_douniuquan.webp Normal file

View File

Binary file not shown.

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

BIN

FaceUnity/src/main/res/mipmap-xxhdpi/icon_animoji_frog_st.png

View File

Binary file not shown.

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

BIN

FaceUnity/src/main/res/mipmap-xxhdpi/icon_animoji_frog_st.webp Normal file

View File

Binary file not shown.

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

BIN

FaceUnity/src/main/res/mipmap-xxhdpi/icon_animoji_hashiqi.png

View File

Binary file not shown.

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

BIN

FaceUnity/src/main/res/mipmap-xxhdpi/icon_animoji_hashiqi.webp Normal file

View File

Binary file not shown.

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

BIN

FaceUnity/src/main/res/mipmap-xxhdpi/icon_animoji_hetun.png

View File

Binary file not shown.

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

BIN

FaceUnity/src/main/res/mipmap-xxhdpi/icon_animoji_hetun.webp Normal file

View File

Binary file not shown.

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

BIN

FaceUnity/src/main/res/mipmap-xxhdpi/icon_animoji_huangya.png

View File

Binary file not shown.

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

BIN

FaceUnity/src/main/res/mipmap-xxhdpi/icon_animoji_huangya.webp Normal file

View File

Binary file not shown.

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

BIN

FaceUnity/src/main/res/mipmap-xxhdpi/icon_animoji_kaola.png

View File

Binary file not shown.

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

BIN

FaceUnity/src/main/res/mipmap-xxhdpi/icon_animoji_kaola.webp Normal file

View File

Binary file not shown.

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

BIN

FaceUnity/src/main/res/mipmap-xxhdpi/icon_animoji_kuloutou.png

View File

Binary file not shown.

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

BIN

FaceUnity/src/main/res/mipmap-xxhdpi/icon_animoji_kuloutou.webp Normal file

View File

Binary file not shown.

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

BIN

FaceUnity/src/main/res/mipmap-xxhdpi/icon_animoji_qgirl.png

View File

Binary file not shown.

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

BIN

FaceUnity/src/main/res/mipmap-xxhdpi/icon_animoji_qgirl.webp Normal file

View File

Binary file not shown.

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

BIN

FaceUnity/src/main/res/mipmap-xxhdpi/icon_animoji_wuxia.png

View File

Binary file not shown.

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

BIN

FaceUnity/src/main/res/mipmap-xxhdpi/icon_animoji_wuxia.webp Normal file

View File

Binary file not shown.

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

BIN

FaceUnity/src/main/res/mipmap-xxhdpi/icon_ar_baozi.png

View File

Binary file not shown.

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

BIN

FaceUnity/src/main/res/mipmap-xxhdpi/icon_ar_baozi.webp Normal file

View File

Binary file not shown.

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

BIN

FaceUnity/src/main/res/mipmap-xxhdpi/icon_ar_bluebird.png

View File

Binary file not shown.

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

BIN

FaceUnity/src/main/res/mipmap-xxhdpi/icon_ar_bluebird.webp Normal file

View File

Binary file not shown.

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

BIN

FaceUnity/src/main/res/mipmap-xxhdpi/icon_ar_fenhudie.png

View File

Binary file not shown.

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

BIN

FaceUnity/src/main/res/mipmap-xxhdpi/icon_ar_fenhudie.webp Normal file

View File

Binary file not shown.

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

BIN

FaceUnity/src/main/res/mipmap-xxhdpi/icon_ar_lanhudie.png

View File

Binary file not shown.

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

BIN

FaceUnity/src/main/res/mipmap-xxhdpi/icon_ar_lanhudie.webp Normal file

View File

Binary file not shown.

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

BIN

FaceUnity/src/main/res/mipmap-xxhdpi/icon_ar_tiger.png

View File

Binary file not shown.

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

BIN

FaceUnity/src/main/res/mipmap-xxhdpi/icon_ar_tiger.webp Normal file

View File

Binary file not shown.

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

BIN

FaceUnity/src/main/res/mipmap-xxhdpi/icon_ar_tiger_bai.png

View File

Binary file not shown.

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

BIN

FaceUnity/src/main/res/mipmap-xxhdpi/icon_ar_tiger_bai.webp Normal file

View File

Binary file not shown.

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

BIN

FaceUnity/src/main/res/mipmap-xxhdpi/icon_ar_tiger_huang.png

View File

Binary file not shown.

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

BIN

FaceUnity/src/main/res/mipmap-xxhdpi/icon_ar_tiger_huang.webp Normal file

View File

Binary file not shown.

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

BIN

FaceUnity/src/main/res/mipmap-xxhdpi/icon_ar_xiongmao.png

View File

Binary file not shown.

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

BIN

FaceUnity/src/main/res/mipmap-xxhdpi/icon_ar_xiongmao.webp Normal file

View File

Binary file not shown.

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

BIN

FaceUnity/src/main/res/mipmap-xxhdpi/icon_avatar_female.png

View File

Binary file not shown.

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

BIN

FaceUnity/src/main/res/mipmap-xxhdpi/icon_avatar_female.webp Normal file

View File

Binary file not shown.

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

BIN

FaceUnity/src/main/res/mipmap-xxhdpi/icon_avatar_male.png

View File

Binary file not shown.

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

BIN

FaceUnity/src/main/res/mipmap-xxhdpi/icon_avatar_male.webp Normal file

View File

Binary file not shown.

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

BIN

FaceUnity/src/main/res/mipmap-xxhdpi/icon_beauty_box_angle_close_checked.png

View File

Binary file not shown.

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

BIN

FaceUnity/src/main/res/mipmap-xxhdpi/icon_beauty_box_angle_close_checked.webp Normal file

View File

Binary file not shown.

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

BIN

FaceUnity/src/main/res/mipmap-xxhdpi/icon_beauty_box_angle_close_normal.png

View File

Binary file not shown.

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

BIN

FaceUnity/src/main/res/mipmap-xxhdpi/icon_beauty_box_angle_close_normal.webp Normal file

View File

Binary file not shown.

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

BIN

FaceUnity/src/main/res/mipmap-xxhdpi/icon_beauty_box_angle_open_checked.png

View File

Binary file not shown.

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

BIN

FaceUnity/src/main/res/mipmap-xxhdpi/icon_beauty_box_angle_open_checked.webp Normal file

View File

Binary file not shown.

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

BIN

FaceUnity/src/main/res/mipmap-xxhdpi/icon_beauty_box_angle_open_normal.png

View File

Binary file not shown.

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

BIN

FaceUnity/src/main/res/mipmap-xxhdpi/icon_beauty_box_angle_open_normal.webp Normal file

View File

Binary file not shown.

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

BIN

FaceUnity/src/main/res/mipmap-xxhdpi/icon_beauty_box_brow_height_close_checked.png

View File

Binary file not shown.

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

BIN

FaceUnity/src/main/res/mipmap-xxhdpi/icon_beauty_box_brow_height_close_checked.webp Normal file

View File

Binary file not shown.

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

BIN

FaceUnity/src/main/res/mipmap-xxhdpi/icon_beauty_box_brow_height_close_normal.png

View File

Binary file not shown.

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

BIN

FaceUnity/src/main/res/mipmap-xxhdpi/icon_beauty_box_brow_height_close_normal.webp Normal file

View File

Binary file not shown.

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

BIN

FaceUnity/src/main/res/mipmap-xxhdpi/icon_beauty_box_brow_height_open_checked.png

View File

Binary file not shown.

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

BIN

FaceUnity/src/main/res/mipmap-xxhdpi/icon_beauty_box_brow_height_open_checked.webp Normal file

View File

Binary file not shown.

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

BIN

FaceUnity/src/main/res/mipmap-xxhdpi/icon_beauty_box_brow_height_open_normal.png

View File

Binary file not shown.

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

BIN

FaceUnity/src/main/res/mipmap-xxhdpi/icon_beauty_box_brow_height_open_normal.webp Normal file

View File

Binary file not shown.

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

BIN

FaceUnity/src/main/res/mipmap-xxhdpi/icon_beauty_box_brow_space_close_checked.png

View File

Binary file not shown.

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

BIN

FaceUnity/src/main/res/mipmap-xxhdpi/icon_beauty_box_brow_space_close_checked.webp Normal file

View File

Binary file not shown.

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

BIN

FaceUnity/src/main/res/mipmap-xxhdpi/icon_beauty_box_brow_space_close_normal.png

View File

Binary file not shown.

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

BIN

FaceUnity/src/main/res/mipmap-xxhdpi/icon_beauty_box_brow_space_close_normal.webp Normal file

View File

Binary file not shown.

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

BIN

FaceUnity/src/main/res/mipmap-xxhdpi/icon_beauty_box_brow_space_open_checked.png

View File

Binary file not shown.

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

BIN

FaceUnity/src/main/res/mipmap-xxhdpi/icon_beauty_box_brow_space_open_checked.webp Normal file

View File

Binary file not shown.

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

BIN

FaceUnity/src/main/res/mipmap-xxhdpi/icon_beauty_box_brow_space_open_normal.png

View File

Binary file not shown.

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

BIN

FaceUnity/src/main/res/mipmap-xxhdpi/icon_beauty_box_brow_space_open_normal.webp Normal file

View File

Binary file not shown.

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

BIN

FaceUnity/src/main/res/mipmap-xxhdpi/icon_beauty_box_buffing_close_checked.png

View File

Binary file not shown.

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

BIN

FaceUnity/src/main/res/mipmap-xxhdpi/icon_beauty_box_buffing_close_checked.webp Normal file

View File

Binary file not shown.

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

BIN

FaceUnity/src/main/res/mipmap-xxhdpi/icon_beauty_box_buffing_close_normal.png

View File

Binary file not shown.

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

BIN

FaceUnity/src/main/res/mipmap-xxhdpi/icon_beauty_box_buffing_close_normal.webp Normal file

View File

Binary file not shown.

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

BIN

FaceUnity/src/main/res/mipmap-xxhdpi/icon_beauty_box_buffing_open_checked.png

View File

Binary file not shown.

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

BIN

FaceUnity/src/main/res/mipmap-xxhdpi/icon_beauty_box_buffing_open_checked.webp Normal file

View File

Binary file not shown.

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

BIN

FaceUnity/src/main/res/mipmap-xxhdpi/icon_beauty_box_buffing_open_normal.png

View File

Binary file not shown.

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

BIN

FaceUnity/src/main/res/mipmap-xxhdpi/icon_beauty_box_buffing_open_normal.webp Normal file

View File

Binary file not shown.

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

BIN

FaceUnity/src/main/res/mipmap-xxhdpi/icon_beauty_box_cheek_bones_close_checked.png

View File

Binary file not shown.

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

BIN

FaceUnity/src/main/res/mipmap-xxhdpi/icon_beauty_box_cheek_bones_close_checked.webp Normal file

View File

Binary file not shown.

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

BIN

FaceUnity/src/main/res/mipmap-xxhdpi/icon_beauty_box_cheek_bones_close_normal.png

View File

Binary file not shown.

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

BIN

FaceUnity/src/main/res/mipmap-xxhdpi/icon_beauty_box_cheek_bones_close_normal.webp Normal file

View File

Binary file not shown.

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

BIN

FaceUnity/src/main/res/mipmap-xxhdpi/icon_beauty_box_cheek_bones_open_checked.png

View File

Binary file not shown.

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

BIN

FaceUnity/src/main/res/mipmap-xxhdpi/icon_beauty_box_cheek_bones_open_checked.webp Normal file

View File

Binary file not shown.

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

BIN

FaceUnity/src/main/res/mipmap-xxhdpi/icon_beauty_box_cheek_bones_open_normal.png

View File

Binary file not shown.

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

BIN

FaceUnity/src/main/res/mipmap-xxhdpi/icon_beauty_box_cheek_bones_open_normal.webp Normal file

View File

Binary file not shown.

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

BIN

FaceUnity/src/main/res/mipmap-xxhdpi/icon_beauty_box_chin_close_checked.png

View File

Binary file not shown.

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

BIN

FaceUnity/src/main/res/mipmap-xxhdpi/icon_beauty_box_chin_close_checked.webp Normal file

View File

Binary file not shown.

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

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