Martin d5b60523a5 Merge remote-tracking branch 'origin/master' into dev_6.7.0 ... # Conflicts: # app/src/main/AndroidManifest.xml # app/src/main/java/com/shayu/phonelive/AppContext.java # common/src/main/java/com/yunbao/common/CommonAppConfig.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/manager/OpenAdManager.java # common/src/main/res/values-zh-rHK/strings.xml # common/src/main/res/values-zh-rTW/strings.xml # common/src/main/res/values-zh/strings.xml # common/src/main/res/values/strings.xml # live/src/main/java/com/yunbao/live/utils/LiveTextRender.java # live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java # live/src/main/java/com/yunbao/live/views/LiveRyAnchorViewHolder.java		2024-06-16 10:28:31 +08:00
..
attrs.xml	androidx版本首次提交	2022-07-18 15:31:45 +08:00
colors.xml	推送管理	2024-01-09 14:52:27 +08:00
dimens.xml	11111	2022-08-05 18:16:48 +08:00
strings.xml	Merge remote-tracking branch 'origin/master' into dev_6.7.0	2024-06-16 10:28:31 +08:00
style.xml	add[整蛊翻译]	2024-06-11 16:55:07 +08:00