zlzw 3d4ad99c99 Merge branch 'refs/heads/master' into v681小游戏 ... # Conflicts: # live/src/main/java/com/yunbao/live/activity/SystemMessageActivity.java # main/src/main/java/com/yunbao/main/activity/MainActivity.java		2024-08-16 14:36:44 +08:00
app	Merge branch 'refs/heads/master' into v681小游戏	2024-08-16 14:36:44 +08:00
baidu	fix[修复BUG]	2024-06-05 13:27:22 +08:00
beauty	fix[修复BUG]	2024-06-05 13:27:22 +08:00
common	Merge branch 'refs/heads/master' into v681小游戏	2024-08-16 14:36:44 +08:00
FaceUnity	Merge branch 'master' into dev_680_礼物展馆	2024-07-17 09:53:22 +08:00
gradle/wrapper	升级34 grd8.0	2024-07-13 10:37:37 +08:00
IAP6Helper	调整三星包	2024-07-31 13:45:41 +08:00
lib_country_code	升级34 grd8.0	2024-07-13 10:37:37 +08:00
lib_faceunity	修复测试反馈内容	2024-07-25 15:00:05 +08:00
lib_google	Merge branch 'master' into dev_680_礼物展馆	2024-07-17 09:53:22 +08:00
lib_huawei	Merge branch 'master' into dev_680_礼物展馆	2024-07-17 09:53:22 +08:00
libs	替换友盟为本地aar	2024-05-08 09:52:35 +08:00
live	Merge branch 'refs/heads/master' into v681小游戏	2024-08-16 14:36:44 +08:00
main	Merge branch 'refs/heads/master' into v681小游戏	2024-08-16 14:36:44 +08:00
pluginsForAnchor	升级34 grd8.0	2024-07-13 10:37:37 +08:00
Share	修复语言问题	2024-07-29 10:21:06 +08:00
SVGAlibrary	新增礼物墙相关内容	2024-07-13 09:28:02 +08:00
TabLayout	update	2024-07-17 11:06:52 +08:00
video	升级34 grd8.0	2024-07-13 10:37:37 +08:00
.gitignore	androidx版本首次提交	2022-07-18 15:31:45 +08:00
build.gradle	update	2024-07-17 12:12:14 +08:00
config.gradle	新增小游戏相关内容	2024-08-09 14:06:46 +08:00
dependencies.gradle	升级34 grd8.0	2024-07-13 10:37:37 +08:00
gradle.properties	Merge branch 'master' into dev_680_礼物展馆	2024-07-17 09:53:22 +08:00
gradlew	androidx版本首次提交	2022-07-18 15:31:45 +08:00
gradlew.bat	androidx版本首次提交	2022-07-18 15:31:45 +08:00
hdl.jks	androidx版本首次提交	2022-07-18 15:31:45 +08:00
package_config.gradle	优化打包脚本，兼容低版本AndroidStudio使用	2024-06-27 14:28:33 +08:00
settings.gradle	新增礼物墙相关内容	2024-07-13 09:28:02 +08:00