hch ba7e59a946 Merge branch 'pandorapan_社区相关' into dev_改版主分支 ... # Conflicts: # common/build.gradle # common/src/main/java/com/yunbao/common/bean/MessageUserInfoBean.java # common/src/main/java/com/yunbao/common/http/PDLiveApi.java # common/src/main/java/com/yunbao/common/http/live/LiveNetManager.java # common/src/main/java/com/yunbao/common/utils/RouteUtil.java # common/src/main/res/values/strings.xml # main/src/main/java/com/yunbao/main/activity/MainActivity.java		2024-03-15 17:27:31 +08:00
app	add 分享	2024-03-15 16:06:18 +08:00
baidu	1	2024-02-23 16:07:50 +08:00
beauty	1	2024-02-23 16:07:50 +08:00
common	Merge branch 'pandorapan_社区相关' into dev_改版主分支	2024-03-15 17:27:31 +08:00
FaceUnity	1	2024-02-23 16:07:50 +08:00
gradle/wrapper	1	2024-02-23 16:07:50 +08:00
IAP6Helper	社区主要UI	2024-03-08 14:34:05 +08:00
lib_country_code	1	2024-02-23 16:07:50 +08:00
lib_google	改版消息主页面	2024-03-06 13:46:55 +08:00
lib_huawei	1	2024-02-23 16:07:50 +08:00
libs	1	2024-02-23 16:07:50 +08:00
live	Merge branch 'pandorapan_社区相关' into dev_改版主分支	2024-03-15 17:27:31 +08:00
main	Merge branch 'pandorapan_社区相关' into dev_改版主分支	2024-03-15 17:27:31 +08:00
pluginsForAnchor	1	2024-02-23 16:07:50 +08:00
Share	add 分享	2024-03-15 16:06:18 +08:00
video	视频播放UI	2024-03-12 18:30:02 +08:00
.gitignore	1	2024-02-23 16:07:50 +08:00
build.gradle	1	2024-02-23 16:07:50 +08:00
config.gradle	社区主要UI	2024-03-08 14:34:05 +08:00
dependencies.gradle	1	2024-02-23 16:07:50 +08:00
gradle.properties	改版消息主页面	2024-03-06 13:46:55 +08:00
gradlew	1	2024-02-23 16:07:50 +08:00
gradlew.bat	1	2024-02-23 16:07:50 +08:00
hdl.jks	1	2024-02-23 16:07:50 +08:00
settings.gradle	1	2024-02-23 16:07:50 +08:00