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

处理 SonarQube 问题

Browse Source
This commit is contained in:
leafwai
2022-05-23 11:32:33 +08:00
parent e57d15d650
commit 04f2312e03
2 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/src/main/java/com/gh/gamecenter/gamecollection/publish/GameCollectionEditActivity.kt
View File

@ -173,11 +173,9 @@ class GameCollectionEditActivity : ToolBarActivity() {
initTagsUI(mViewModel.tags)
mViewModel.gameCollectionPatch?.run {
if (!activityTags.isNullOrEmpty()) {
if (mActivityId.isEmpty() && mActivityName.isEmpty()) {
mViewModel.selectActivityTag = activityTags!![0]
mBinding.activityTipTv.text = activityTags!![0].name
}
if (!activityTags.isNullOrEmpty() && mActivityId.isEmpty() && mActivityName.isEmpty()) {
mViewModel.selectActivityTag = activityTags!![0]
mBinding.activityTipTv.text = activityTags!![0].name
}
mViewModel.imageUrl = cover
if (status != "draft" && !isLocalDraft) {
@ -258,11 +256,9 @@ class GameCollectionEditActivity : ToolBarActivity() {
}
})
}
if (!it.activityTags.isNullOrEmpty()) {
if (mActivityId.isEmpty() && mActivityName.isEmpty()) {
mViewModel.selectActivityTag = it.activityTags!![0]
mBinding.activityTipTv.text = it.activityTags!![0].name
}
if (!it.activityTags.isNullOrEmpty() && mActivityId.isEmpty() && mActivityName.isEmpty()) {
mViewModel.selectActivityTag = it.activityTags!![0]
mBinding.activityTipTv.text = it.activityTags!![0].name
}
}
}

4
module_common/src/main/java/com/gh/gamecenter/common/base/ToolBarActivity.java
View File

@ -145,8 +145,6 @@ public abstract class ToolBarActivity extends BaseActivity implements ToolbarCon
mIconTitle = findViewById(R.id.iconTitle);
if (mToolbar != null) {
// setSupportActionBar(mToolbar); // 替换actionBar后 toolBar无法控制
// mToolbar.setNavigationIcon(provideNavigationIcon());
// mToolbar.setNavigationOnClickListener(provideNavigationItemClickListener());
if (mBackBtn != null) mBackBtn.setOnClickListener(provideNavigationItemClickListener());
if (mBackContainer != null) mBackContainer.setOnClickListener(provideNavigationItemClickListener());
if (mTitleTv != null) {
@ -188,8 +186,6 @@ public abstract class ToolBarActivity extends BaseActivity implements ToolbarCon
@Override
public void setToolbarMenu(int res) {
if (mActionMenuView == null) return;
// mToolbar.inflateMenu(res);
// mToolbar.setOnMenuItemClickListener(this);
inflateMenu(res);
mActionMenuView.setOnMenuItemClickListener(this);
Menu menu = mActionMenuView.getMenu();