Leaf-WAI/assistant-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature-bbs' into dev-5.0.0

Browse Source 
# Conflicts:
#	app/src/main/AndroidManifest.xml
#	app/src/main/java/com/gh/common/util/NewLogUtils.kt
#	app/src/main/java/com/gh/gamecenter/personalhome/UserHomeFragment.kt
#	app/src/main/java/com/gh/gamecenter/qa/dialog/MoreFunctionPanelDialog.kt
#	app/src/main/res/layout/fragment_home.xml
#	app/src/main/res/values/colors.xml
This commit is contained in:
juntao
2021-06-11 17:34:03 +08:00
parent 03f87c46ba 4a8e91bbff
commit 8e28766449
368 changed files with 18699 additions and 5617 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/com/gh/common/util/EntranceUtils.java
View File

@ -236,6 +236,11 @@ public class EntranceUtils {
public static final String KEY_IS_QA_FEEDBACK = "is_qa_feedback";
public static final String KEY_IS_CLICK_RECEIVE_BTN = "is_click_receive_btn";
public static final String KEY_SHOW_QUICK_LOGIN = "show_quick_login";
public static final String KEY_VIDEO_LIST = "video_list";
public static final String KEY_CHOOSE_FORUM_TYPE = "choose_forum_type";
public static final String KEY_CHOOSE_MAX_COUNT = "choose_max_count";
public static final String KEY_COMMENT_COUNT = "comment_count";
public static final String KEY_IS_COMMENT_CONVERSATION = "is_comment_conversation";
public static void jumpActivity(Context context, Bundle bundle) {
bundle.putBoolean(KEY_REQUIRE_REDIRECT, true);