Merge remote-tracking branch 'origin/dev_6.5.5_语聊' into dev_6.5.5_语聊

2023-10-18 14:33:13 +08:00
parent 1a36077fba d4305708f4
commit 9e68f35627
12 changed files with 1072 additions and 157 deletions
--- a/OneToOne/src/main/AndroidManifest.xml
+++ b/OneToOne/src/main/AndroidManifest.xml
@@ -147,6 +147,11 @@
        <activity
            android:name=".activity.HomeSearchActivity"
            android:windowSoftInputMode="stateHidden|adjustResize" />
+        <activity
+            android:name=".activity.message.CallVideoActivity"
+            android:windowSoftInputMode="stateHidden|adjustResize">
+
+        </activity>

        <activity
            android:name=".activity.login.ChooseLabelActivity"