diff --git a/app/src/main/java/com/gh/gamecenter/gamecollection/publish/GameCollectionEditActivity.kt b/app/src/main/java/com/gh/gamecenter/gamecollection/publish/GameCollectionEditActivity.kt
index 77fd9b7083..cc7d2382aa 100644
--- a/app/src/main/java/com/gh/gamecenter/gamecollection/publish/GameCollectionEditActivity.kt
+++ b/app/src/main/java/com/gh/gamecenter/gamecollection/publish/GameCollectionEditActivity.kt
@@ -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
             }
         }
     }
diff --git a/module_common/src/main/java/com/gh/gamecenter/common/base/ToolBarActivity.java b/module_common/src/main/java/com/gh/gamecenter/common/base/ToolBarActivity.java
index eb7c71998b..74ed6d77da 100644
--- a/module_common/src/main/java/com/gh/gamecenter/common/base/ToolBarActivity.java
+++ b/module_common/src/main/java/com/gh/gamecenter/common/base/ToolBarActivity.java
@@ -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();