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

Merge branch 'dev-4.8.0' of git.ghzs.com:halo/assistant-android into dev-4.8.0

Browse Source
This commit is contained in:
张玉久
2021-03-22 15:36:28 +08:00
parent 98f0cf5fc0 cb345f49eb
commit 4eac5ff61c
6 changed files with 97 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
app/src/main/java/com/gh/gamecenter/SuggestionActivity.java
View File

@ -77,6 +77,7 @@ import com.gh.gamecenter.suggest.SuggestType;
import com.halo.assistant.HaloApp;
import com.lightgame.utils.Util_System_Keyboard;
import com.lightgame.utils.Utils;
import com.lightgame.view.CheckableImageView;
import com.walkud.rom.checker.RomIdentifier;
import org.jetbrains.annotations.NotNull;
@ -197,6 +198,12 @@ public class SuggestionActivity extends ToolBarActivity implements OnRequestCall
EditText mContactMethodEt;
@BindView(R.id.lookDetailDesTv)
TextView mLookDetailDesTv;
@BindView(R.id.suggest_crash_type_container)
View mCrashTypeContainer;
@BindView(R.id.appCrashTypeIv)
CheckableImageView mAppCrashTypeIv;
@BindView(R.id.gameCrashTypeIv)
CheckableImageView mGameCrashTypeIv;
public static final int MEDIA_STORE_REQUEST = 1;
public static final int MEDIA_STORE_CREDENTIALS_REQUEST = 2;
@ -376,7 +383,7 @@ public class SuggestionActivity extends ToolBarActivity implements OnRequestCall
mSuggestContent = extras.getString(EntranceUtils.KEY_CONTENT);
mSuggestHintType = extras.getString(EntranceUtils.KEY_SUGGEST_HINT_TYPE);
mHideHint = extras.getString(EntranceUtils.KEY_HIDE_SUGGEST_HINT, "");
String gamePlatform = mHideHint = extras.getString(EntranceUtils.KEY_PLATFORM, "");
String gamePlatform = extras.getString(EntranceUtils.KEY_PLATFORM, "");
mFunctionTypeName = getResources().getStringArray(R.array.suggest_function_type);
mGameEntity = extras.getParcelable(SimpleGameEntity.class.getSimpleName());
fromRating = extras.getBoolean(FROM_RATING_KEY, false);
@ -596,6 +603,11 @@ public class SuggestionActivity extends ToolBarActivity implements OnRequestCall
mSuggestTypeContainer.setVisibility(View.GONE);
mSuggestGameLl.setVisibility(View.GONE);
mCopyrightContainer.setVisibility(View.GONE);
mCrashTypeContainer.setVisibility(View.VISIBLE);
// 通过提示弹窗点击进入的意见反馈-发生闪退，[闪退类型]需要自动选择App闪退
if (mHideHint.equals("APP闪退：")) {
mAppCrashTypeIv.setChecked(true);
}
} else if (type == SuggestType.gameQuestion) {
mSuggestTypeContainer.setVisibility(View.GONE);
mCopyrightContainer.setVisibility(View.GONE);
@ -724,7 +736,7 @@ public class SuggestionActivity extends ToolBarActivity implements OnRequestCall
}
@OnClick({R.id.suggest_post_btn, R.id.suggest_game_container, R.id.type_accelerate, R.id.type_material,
R.id.type_other, R.id.type_standalone, R.id.lookDetailDesTv})
R.id.type_other, R.id.type_standalone, R.id.lookDetailDesTv, R.id.appCrashTypeIv, R.id.gameCrashTypeIv})
public void onViewClicked(View view) {
switch (view.getId()) {
case R.id.suggest_post_btn:
@ -739,6 +751,13 @@ public class SuggestionActivity extends ToolBarActivity implements OnRequestCall
return;
}
if (mSuggestType == SuggestType.crash
&& !mAppCrashTypeIv.isChecked()
&& !mGameCrashTypeIv.isChecked()) {
toast("请选择闪退类型");
return;
}
if (mSuggestGameLl.getVisibility() == View.VISIBLE &&
TextUtils.isEmpty(mSuggestGameName.getText().toString())) {
toast("请选择游戏");
@ -833,6 +852,18 @@ public class SuggestionActivity extends ToolBarActivity implements OnRequestCall
case R.id.lookDetailDesTv:
startActivity(WebActivity.getCopyrighyRulesIntent(this));
break;
case R.id.appCrashTypeIv:
if (!mAppCrashTypeIv.isChecked()) {
mAppCrashTypeIv.setChecked(!mAppCrashTypeIv.isChecked());
mGameCrashTypeIv.setChecked(!mAppCrashTypeIv.isChecked());
}
break;
case R.id.gameCrashTypeIv:
if (!mGameCrashTypeIv.isChecked()) {
mGameCrashTypeIv.setChecked(!mGameCrashTypeIv.isChecked());
mAppCrashTypeIv.setChecked(!mGameCrashTypeIv.isChecked());
}
break;
}
}
@ -1102,6 +1133,12 @@ public class SuggestionActivity extends ToolBarActivity implements OnRequestCall
params.put("suggestion_type", mSuggestType.getType() + "（评论）");
} else if (!mDiagnosisResult.isEmpty()) {
params.put("suggestion_type", "网络诊断");
} else if (mSuggestType == SuggestType.crash) {
if (mAppCrashTypeIv.isChecked()) {
params.put("suggestion_type", "APP闪退");
} else {
params.put("suggestion_type", "游戏闪退");
}
} else {
params.put("suggestion_type", mSuggestType.getType());
}