yutou/pdlivexp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	OneToOne/src/main/java/com/shayu/onetoone/manager/RouteManager.java
This commit is contained in:
hch
2023-10-19 18:28:24 +08:00
parent bcfd1c22e6 38471cedc8
commit 0287995bf9
27 changed files with 933 additions and 406 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OneToOne/src/main/AndroidManifest.xml
View File

@@ -149,9 +149,11 @@
android:windowSoftInputMode="stateHidden|adjustResize" />
<activity
android:name=".activity.message.CallVideoActivity"
android:windowSoftInputMode="stateHidden|adjustResize">
android:windowSoftInputMode="stateHidden|adjustResize"/>
<activity
android:name=".activity.message.CallAudioActivity"
android:windowSoftInputMode="stateHidden|adjustResize"/>
</activity>
<activity
android:name=".activity.login.ChooseLabelActivity"