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
#	OneToOne/src/main/java/com/shayu/onetoone/network/OneToOneApi.java
This commit is contained in:
hch
2023-10-16 18:21:11 +08:00
parent 9ae47dffc2 6211756744
commit 52d565c4ee
27 changed files with 970 additions and 309 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -141,7 +141,8 @@
<activity
android:name=".activity.HomepageRankingActivity"
android:windowSoftInputMode="stateHidden|adjustResize" />
<activity android:name=".activity.HomeSearchActivity" />
<activity android:name=".activity.HomeScreenActivity" android:windowSoftInputMode="stateHidden|adjustResize" />
<activity android:name=".activity.HomeSearchActivity" android:windowSoftInputMode="stateHidden|adjustResize" />
<provider