Merge branch 'master' into live_sdk

# Conflicts: # app/src/main/AndroidManifest.xml # app/src/main/java/com/mogo/cloud/MainActivity.java # modules/mogo-realtime/src/main/java/com/mogo/realtime/socket/SocketHandler.java
2021-02-04 11:34:40 +08:00
parent 1c655fb208 638d30d0bd
commit 3e79f0854c
12 changed files with 182 additions and 48 deletions
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -32,6 +32,10 @@
                <category android:name="android.intent.category.LAUNCHER" />
            </intent-filter>
        </activity>
+
+        <activity
+            android:name=".ConfigInfoActivity"
+            android:label="配置信息"/>
        <activity
            android:name=".LivePushActivity"
            android:label="直播播放" />