Merge remote-tracking branch 'origin/release' into dev
# Conflicts: # app/src/main/java/com/gh/gamecenter/forum/detail/ForumArticleAskListViewModel.kt # dependencies.gradle
This commit is contained in:
@ -119,6 +119,7 @@ public class SkipActivity extends BaseActivity {
|
||||
String gameId = uri.getQueryParameter(EntranceConsts.KEY_GAMEID);
|
||||
String packageMd5 = uri.getQueryParameter(EntranceConsts.KEY_PACKAGE_MD5);
|
||||
String isQaFeedbackString = uri.getQueryParameter(EntranceConsts.KEY_IS_QA_FEEDBACK);
|
||||
String suggestionType = uri.getQueryParameter(KEY_TYPE);
|
||||
boolean isQaFeedback = !TextUtils.isEmpty(isQaFeedbackString) && isQaFeedbackString.equals("true");
|
||||
String content = (TextUtils.isEmpty(gameId) || TextUtils.isEmpty(packageMd5)) ?
|
||||
String.format("%s-%s-V%s,",
|
||||
@ -134,6 +135,8 @@ public class SkipActivity extends BaseActivity {
|
||||
String qaTitle = uri.getQueryParameter(EntranceConsts.KEY_QA_TITLE);
|
||||
if (!TextUtils.isEmpty(qaId)) {
|
||||
DirectUtils.directToQa(this, qaTitle, qaId);
|
||||
} else if ("vgame".equals(suggestionType)) {
|
||||
DirectUtils.directToFeedback(this, content, "game", isQaFeedback, qaContentId, EntranceConsts.ENTRANCE_BROWSER);
|
||||
} else {
|
||||
DirectUtils.directToFeedback(this, content, null, isQaFeedback, qaContentId, EntranceConsts.ENTRANCE_BROWSER);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user