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
This commit is contained in:
@@ -186,6 +186,16 @@
|
||||
android:label="编辑签名"
|
||||
android:windowSoftInputMode="stateHidden|adjustResize" />
|
||||
|
||||
<activity
|
||||
android:name=".activity.user.AuthActivity"
|
||||
android:label="实名认证"
|
||||
android:windowSoftInputMode="stateHidden|adjustResize" />
|
||||
|
||||
<activity
|
||||
android:name=".activity.user.AuthBloggerActivity"
|
||||
android:label="达人认证"
|
||||
android:windowSoftInputMode="stateHidden|adjustResize" />
|
||||
|
||||
<provider
|
||||
android:name="androidx.core.content.FileProvider"
|
||||
android:authorities="com.shayu.onetoone.fileprovider"
|
||||
|
||||
Reference in New Issue
Block a user