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

# Conflicts:
#	OneToOne/src/main/java/com/shayu/onetoone/manager/OTONetManager.java
#	OneToOne/src/main/java/com/shayu/onetoone/network/OneToOneApi.java

OneToOne/src/main/AndroidManifest.xml

@@ -227,6 +227,12 @@
             android:label="修改密码"
             android:windowSoftInputMode="stateHidden|adjustResize" />
 
+
+        <activity
+            android:name=".activity.setting.WebViewActivity"
+            android:label="WebView"
+            android:windowSoftInputMode="stateHidden|adjustResize" />
+
         <provider
             android:name="androidx.core.content.FileProvider"
             android:authorities="com.shayu.onetoone.fileprovider"