Merge remote-tracking branch 'origin/master'

2022-12-30 14:58:12 +08:00
parent 54923304dc 8b357233c2
commit bafea09e44
53 changed files with 1875 additions and 301 deletions
--- a/live/src/main/res/layout/view_live_play_ksy.xml
+++ b/live/src/main/res/layout/view_live_play_ksy.xml
@@ -7,7 +7,7 @@
    android:layout_height="match_parent">


-    <com.tencent.rtmp.ui.TXCloudVideoView
+    <SurfaceView
        android:id="@+id/video_view"
        android:layout_width="match_parent"
        android:layout_height="match_parent" />
--- a/live/src/main/res/mipmap-mdpi/icon_live_type_normal_1.png
+++ b/live/src/main/res/mipmap-mdpi/icon_live_type_normal_1.png
--- a/live/src/main/res/mipmap-mdpi/icon_live_type_normal_2.png
+++ b/live/src/main/res/mipmap-mdpi/icon_live_type_normal_2.png
--- a/live/src/main/res/mipmap-mdpi/icon_live_type_pay_1.png
+++ b/live/src/main/res/mipmap-mdpi/icon_live_type_pay_1.png
--- a/live/src/main/res/mipmap-mdpi/icon_live_type_pay_2.png
+++ b/live/src/main/res/mipmap-mdpi/icon_live_type_pay_2.png
--- a/live/src/main/res/mipmap-mdpi/icon_live_type_pwd_1.png
+++ b/live/src/main/res/mipmap-mdpi/icon_live_type_pwd_1.png
--- a/live/src/main/res/mipmap-mdpi/icon_live_type_pwd_2.png
+++ b/live/src/main/res/mipmap-mdpi/icon_live_type_pwd_2.png
--- a/live/src/main/res/mipmap-mdpi/icon_live_type_time_1.png
+++ b/live/src/main/res/mipmap-mdpi/icon_live_type_time_1.png
--- a/live/src/main/res/mipmap-mdpi/icon_live_type_time_2.png
+++ b/live/src/main/res/mipmap-mdpi/icon_live_type_time_2.png