Merge remote-tracking branch 'origin/release' into dev
# Conflicts: # dependencies.gradle
This commit is contained in:
@ -364,8 +364,11 @@ public class EntranceConsts {
|
||||
|
||||
public static final String KEY_DISPLAY_TYPE = "display_type";
|
||||
public static final String KEY_SHOW_FLOATING_WINDOW = "key_show_floating_window";
|
||||
public static final String KEY_SHOW_PULL_DOWN_PUSH = "key_show_pull_down_push";
|
||||
public static final String KEY_HIDE_TOOLBAR = "hide_toolbar";
|
||||
|
||||
public static final String KEY_THE_ROUTER_PATH = "therouter_path";
|
||||
|
||||
public static final String KEY_ACCT_ZONE_INFO = "acct_zone_info";
|
||||
public static final String KEY_IS_NEED_RECORD = "is_need_record";
|
||||
public static final String KEY_HAS_MULTI_ZONE = "has_multi_zone";
|
||||
|
||||
Reference in New Issue
Block a user