Merge remote-tracking branch 'origin/dev_6.5.5_语聊' into dev_6.5.5_语聊
# Conflicts: # OneToOne/src/main/java/com/shayu/onetoone/manager/RouteManager.java
This commit is contained in:
@@ -18,7 +18,8 @@ public class RouteManager {
|
||||
public static final String ACTIVITY_HOME_SEARCH = "/activity/HomeSearchActivity";
|
||||
public static final String ACTIVITY_HOME_SCREEN = "/activity/HomeScreenActivity";
|
||||
public static final String ACTIVITY_CALL_VIDEO = "/activity/CallVideoActivity";
|
||||
public static final String PATH_EDITPROFILE = "/activity/EditProfileActivity";
|
||||
public static final String ACTIVITY_CALL_AUDIO = "/activity/CallVAudioActivity";
|
||||
public static final String PATH_EDITPROFILE = "/main/EditProfileActivity";
|
||||
|
||||
//设置基本资料
|
||||
public static final String ACTIVITY_COMPLETE = "/activity/CompleteActivity";
|
||||
|
||||
Reference in New Issue
Block a user