diff --git a/app/src/main/java/com/gh/base/BaseRichEditorActivity.kt b/app/src/main/java/com/gh/base/BaseRichEditorActivity.kt
index f1059e3064..04e4013af9 100644
--- a/app/src/main/java/com/gh/base/BaseRichEditorActivity.kt
+++ b/app/src/main/java/com/gh/base/BaseRichEditorActivity.kt
@@ -745,7 +745,7 @@ abstract class BaseRichEditorActivity<VM : BaseRichEditorViewModel> : ToolBarAct
 
     override fun onNightModeChange() {
         super.onNightModeChange()
-        updateStatusBarColor(R.color.text_292929, R.color.white)
+        updateStatusBarColor(R.color.background_white, R.color.background_white)
         mRichEditor.enableForceDark(NightModeUtils.isNightMode(this))
     }
 
diff --git a/app/src/main/java/com/gh/gamecenter/AboutActivity.java b/app/src/main/java/com/gh/gamecenter/AboutActivity.java
index 40ce8b3265..ce35159eba 100644
--- a/app/src/main/java/com/gh/gamecenter/AboutActivity.java
+++ b/app/src/main/java/com/gh/gamecenter/AboutActivity.java
@@ -22,7 +22,7 @@ public class AboutActivity extends ToolBarActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        ExtensionsKt.updateStatusBarColor(this, R.color.text_292929, R.color.white);
+        ExtensionsKt.updateStatusBarColor(this, R.color.background_white, R.color.background_white);
     }
 
     @NonNull
@@ -40,6 +40,6 @@ public class AboutActivity extends ToolBarActivity {
     @Override
     protected void onNightModeChange() {
         super.onNightModeChange();
-        ExtensionsKt.updateStatusBarColor(this, R.color.text_292929, R.color.white);
+        ExtensionsKt.updateStatusBarColor(this, R.color.background_white, R.color.background_white);
     }
 }
diff --git a/app/src/main/java/com/gh/gamecenter/CollectionActivity.java b/app/src/main/java/com/gh/gamecenter/CollectionActivity.java
index de2ec619d2..62d1873e94 100644
--- a/app/src/main/java/com/gh/gamecenter/CollectionActivity.java
+++ b/app/src/main/java/com/gh/gamecenter/CollectionActivity.java
@@ -16,7 +16,7 @@ public class CollectionActivity extends ToolBarActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        ExtensionsKt.updateStatusBarColor(this, R.color.text_292929, R.color.white);
+        ExtensionsKt.updateStatusBarColor(this, R.color.background_white, R.color.background_white);
     }
 
     @Override
@@ -27,7 +27,7 @@ public class CollectionActivity extends ToolBarActivity {
     @Override
     protected void onNightModeChange() {
         super.onNightModeChange();
-        ExtensionsKt.updateStatusBarColor(this, R.color.text_292929, R.color.white);
+        ExtensionsKt.updateStatusBarColor(this, R.color.background_white, R.color.background_white);
     }
 
     @NonNull
diff --git a/app/src/main/java/com/gh/gamecenter/ConcernActivity.java b/app/src/main/java/com/gh/gamecenter/ConcernActivity.java
index 3ed660a896..61bb637da7 100644
--- a/app/src/main/java/com/gh/gamecenter/ConcernActivity.java
+++ b/app/src/main/java/com/gh/gamecenter/ConcernActivity.java
@@ -17,7 +17,7 @@ public class ConcernActivity extends ToolBarActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        ExtensionsKt.updateStatusBarColor(this, R.color.text_292929, R.color.white);
+        ExtensionsKt.updateStatusBarColor(this, R.color.background_white, R.color.background_white);
     }
 
     @Override
@@ -28,7 +28,7 @@ public class ConcernActivity extends ToolBarActivity {
     @Override
     protected void onNightModeChange() {
         super.onNightModeChange();
-        ExtensionsKt.updateStatusBarColor(this, R.color.text_292929, R.color.white);
+        ExtensionsKt.updateStatusBarColor(this, R.color.background_white, R.color.background_white);
     }
 
     @NonNull
diff --git a/app/src/main/java/com/gh/gamecenter/ConcernInfoActivity.java b/app/src/main/java/com/gh/gamecenter/ConcernInfoActivity.java
index 3c75f7f8b2..85b0bcb60e 100644
--- a/app/src/main/java/com/gh/gamecenter/ConcernInfoActivity.java
+++ b/app/src/main/java/com/gh/gamecenter/ConcernInfoActivity.java
@@ -17,7 +17,7 @@ public class ConcernInfoActivity extends ToolBarActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        ExtensionsKt.updateStatusBarColor(this, R.color.text_292929, R.color.white);
+        ExtensionsKt.updateStatusBarColor(this, R.color.background_white, R.color.background_white);
     }
 
     public static Intent getIntent(Context context) {
@@ -27,6 +27,6 @@ public class ConcernInfoActivity extends ToolBarActivity {
     @Override
     protected void onNightModeChange() {
         super.onNightModeChange();
-        ExtensionsKt.updateStatusBarColor(this, R.color.text_292929, R.color.white);
+        ExtensionsKt.updateStatusBarColor(this, R.color.background_white, R.color.background_white);
     }
 }
diff --git a/app/src/main/java/com/gh/gamecenter/DownloadManagerActivity.java b/app/src/main/java/com/gh/gamecenter/DownloadManagerActivity.java
index 68ab338e1c..e804703ad3 100644
--- a/app/src/main/java/com/gh/gamecenter/DownloadManagerActivity.java
+++ b/app/src/main/java/com/gh/gamecenter/DownloadManagerActivity.java
@@ -25,7 +25,7 @@ public class DownloadManagerActivity extends ToolBarActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        ExtensionsKt.updateStatusBarColor(this, R.color.text_292929, R.color.white);
+        ExtensionsKt.updateStatusBarColor(this, R.color.background_white, R.color.background_white);
     }
 
     @Override
@@ -60,6 +60,6 @@ public class DownloadManagerActivity extends ToolBarActivity {
     @Override
     protected void onNightModeChange() {
         super.onNightModeChange();
-        ExtensionsKt.updateStatusBarColor(this, R.color.text_292929, R.color.white);
+        ExtensionsKt.updateStatusBarColor(this, R.color.background_white, R.color.background_white);
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/gh/gamecenter/HelpAndFeedbackActivity.kt b/app/src/main/java/com/gh/gamecenter/HelpAndFeedbackActivity.kt
index ff7188d0df..2b47a3978e 100644
--- a/app/src/main/java/com/gh/gamecenter/HelpAndFeedbackActivity.kt
+++ b/app/src/main/java/com/gh/gamecenter/HelpAndFeedbackActivity.kt
@@ -39,7 +39,7 @@ class HelpAndFeedbackActivity : BaseActivity_TabLayout() {
         setNavigationTitle("帮助与反馈")
         val defaultPosition = intent.getIntExtra(PAGE_INDEX, HELP_ITEM)
         setCurrentItem(defaultPosition)
-        updateStatusBarColor(R.color.text_292929, R.color.white)
+        updateStatusBarColor(R.color.background_white, R.color.background_white)
     }
 
     override fun onPageSelected(position: Int) {
@@ -57,7 +57,7 @@ class HelpAndFeedbackActivity : BaseActivity_TabLayout() {
 
     override fun onNightModeChange() {
         super.onNightModeChange()
-        updateStatusBarColor(R.color.text_292929, R.color.white)
+        updateStatusBarColor(R.color.background_white, R.color.background_white)
     }
 
     companion object {
diff --git a/app/src/main/java/com/gh/gamecenter/InfoActivity.java b/app/src/main/java/com/gh/gamecenter/InfoActivity.java
index 2185c26fe9..5b1788ccfe 100644
--- a/app/src/main/java/com/gh/gamecenter/InfoActivity.java
+++ b/app/src/main/java/com/gh/gamecenter/InfoActivity.java
@@ -17,7 +17,7 @@ public class InfoActivity extends ToolBarActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        ExtensionsKt.updateStatusBarColor(this, R.color.text_292929, R.color.white);
+        ExtensionsKt.updateStatusBarColor(this, R.color.background_white, R.color.background_white);
     }
 
     public static Intent getIntent(Context context) {
@@ -27,6 +27,6 @@ public class InfoActivity extends ToolBarActivity {
     @Override
     protected void onNightModeChange() {
         super.onNightModeChange();
-        ExtensionsKt.updateStatusBarColor(this, R.color.text_292929, R.color.white);
+        ExtensionsKt.updateStatusBarColor(this, R.color.background_white, R.color.background_white);
     }
 }
diff --git a/app/src/main/java/com/gh/gamecenter/LibaoDetailActivity.java b/app/src/main/java/com/gh/gamecenter/LibaoDetailActivity.java
index 995e15ed31..12650cb58e 100644
--- a/app/src/main/java/com/gh/gamecenter/LibaoDetailActivity.java
+++ b/app/src/main/java/com/gh/gamecenter/LibaoDetailActivity.java
@@ -198,7 +198,7 @@ public class LibaoDetailActivity extends ToolBarActivity implements LibaoDetailA
         if (mLibaoEntity != null) {
             mLibaoEntity.setClickReceiveBtnIn(isClickReceiveBtnIn);
         }
-        ExtensionsKt.updateStatusBarColor(this, R.color.text_292929, R.color.white);
+        ExtensionsKt.updateStatusBarColor(this, R.color.background_white, R.color.background_white);
         mIsScroll = true;
 
         mSkeleton = Skeleton.bind(mListSkeleton).shimmer(false).load(R.layout.activity_libaodetail_skeleton).show();
@@ -567,7 +567,7 @@ public class LibaoDetailActivity extends ToolBarActivity implements LibaoDetailA
             mLibaoDetailRv.removeItemDecorationAt(0);
             mLibaoDetailRv.addItemDecoration(getItemDecoration());
         }
-        ExtensionsKt.updateStatusBarColor(this, R.color.text_292929, R.color.white);
+        ExtensionsKt.updateStatusBarColor(this, R.color.background_white, R.color.background_white);
     }
 
     @Override
diff --git a/app/src/main/java/com/gh/gamecenter/LoginActivity.java b/app/src/main/java/com/gh/gamecenter/LoginActivity.java
index d522095612..a653b68c31 100644
--- a/app/src/main/java/com/gh/gamecenter/LoginActivity.java
+++ b/app/src/main/java/com/gh/gamecenter/LoginActivity.java
@@ -11,6 +11,7 @@ import com.gh.gamecenter.common.base.activity.ToolBarActivity;
 import com.gh.common.util.QuickLoginHelper;
 import com.gh.gamecenter.common.constant.EntranceConsts;
 import com.gh.gamecenter.common.constant.RouteConsts;
+import com.gh.gamecenter.common.utils.ExtensionsKt;
 import com.gh.gamecenter.core.utils.DisplayUtils;
 import com.gh.gamecenter.fragment.LoginFragment;
 
@@ -42,7 +43,18 @@ public class LoginActivity extends ToolBarActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         hideToolbar(true);
-        DisplayUtils.setLightStatusBar(this, true);
-        DisplayUtils.setStatusBarColor(this, R.color.transparent, true);
+        DisplayUtils.setLightStatusBar(this, !mNightMode);
+        DisplayUtils.setStatusBarColor(this, R.color.transparent, !mNightMode);
+    }
+
+    @Override
+    protected boolean isAutoResetViewBackgroundEnabled() {
+        return true;
+    }
+
+    @Override
+    protected void onNightModeChange() {
+        super.onNightModeChange();
+        ExtensionsKt.updateStatusBarColor(this, R.color.background_white, R.color.background_white);
     }
 }
diff --git a/app/src/main/java/com/gh/gamecenter/MessageActivity.java b/app/src/main/java/com/gh/gamecenter/MessageActivity.java
index 54e067b910..e014a34a71 100644
--- a/app/src/main/java/com/gh/gamecenter/MessageActivity.java
+++ b/app/src/main/java/com/gh/gamecenter/MessageActivity.java
@@ -18,7 +18,7 @@ public class MessageActivity extends ToolBarActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        ExtensionsKt.updateStatusBarColor(this, R.color.text_292929, R.color.white);
+        ExtensionsKt.updateStatusBarColor(this, R.color.background_white, R.color.background_white);
     }
 
     public static Intent getIntent(Context context, String entrance) {
@@ -30,6 +30,6 @@ public class MessageActivity extends ToolBarActivity {
     @Override
     protected void onNightModeChange() {
         super.onNightModeChange();
-        ExtensionsKt.updateStatusBarColor(this, R.color.text_292929, R.color.white);
+        ExtensionsKt.updateStatusBarColor(this, R.color.background_white, R.color.background_white);
     }
 }
diff --git a/app/src/main/java/com/gh/gamecenter/MessageInviteActivity.java b/app/src/main/java/com/gh/gamecenter/MessageInviteActivity.java
index 66eccff915..5a85535069 100644
--- a/app/src/main/java/com/gh/gamecenter/MessageInviteActivity.java
+++ b/app/src/main/java/com/gh/gamecenter/MessageInviteActivity.java
@@ -26,12 +26,12 @@ public class MessageInviteActivity extends ToolBarActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        ExtensionsKt.updateStatusBarColor(this, R.color.text_292929, R.color.white);
+        ExtensionsKt.updateStatusBarColor(this, R.color.background_white, R.color.background_white);
     }
 
     @Override
     protected void onNightModeChange() {
         super.onNightModeChange();
-        ExtensionsKt.updateStatusBarColor(this, R.color.text_292929, R.color.white);
+        ExtensionsKt.updateStatusBarColor(this, R.color.background_white, R.color.background_white);
     }
 }
diff --git a/app/src/main/java/com/gh/gamecenter/MessageKeFuActivity.java b/app/src/main/java/com/gh/gamecenter/MessageKeFuActivity.java
index e15c64fb9e..4ee5ea6c0e 100644
--- a/app/src/main/java/com/gh/gamecenter/MessageKeFuActivity.java
+++ b/app/src/main/java/com/gh/gamecenter/MessageKeFuActivity.java
@@ -29,12 +29,12 @@ public class MessageKeFuActivity extends ToolBarActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        ExtensionsKt.updateStatusBarColor(this, R.color.text_292929, R.color.white);
+        ExtensionsKt.updateStatusBarColor(this, R.color.background_white, R.color.background_white);
     }
 
     @Override
     protected void onNightModeChange() {
         super.onNightModeChange();
-        ExtensionsKt.updateStatusBarColor(this, R.color.text_292929, R.color.white);
+        ExtensionsKt.updateStatusBarColor(this, R.color.background_white, R.color.background_white);
     }
 }
diff --git a/app/src/main/java/com/gh/gamecenter/MessageVoteActivity.java b/app/src/main/java/com/gh/gamecenter/MessageVoteActivity.java
index 5bc84cddb0..364b433133 100644
--- a/app/src/main/java/com/gh/gamecenter/MessageVoteActivity.java
+++ b/app/src/main/java/com/gh/gamecenter/MessageVoteActivity.java
@@ -26,12 +26,12 @@ public class MessageVoteActivity extends ToolBarActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        ExtensionsKt.updateStatusBarColor(this, R.color.text_292929, R.color.white);
+        ExtensionsKt.updateStatusBarColor(this, R.color.background_white, R.color.background_white);
     }
 
     @Override
     protected void onNightModeChange() {
         super.onNightModeChange();
-        ExtensionsKt.updateStatusBarColor(this, R.color.text_292929, R.color.white);
+        ExtensionsKt.updateStatusBarColor(this, R.color.background_white, R.color.background_white);
     }
 }
diff --git a/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java b/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java
index 77080593e0..6d1ec9dcd3 100644
--- a/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java
+++ b/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java
@@ -237,7 +237,7 @@ public class NewsDetailActivity extends DownloadToolbarActivity implements OnCli
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        ExtensionsKt.updateStatusBarColor(this, R.color.text_292929, R.color.white);
+        ExtensionsKt.updateStatusBarColor(this, R.color.background_white, R.color.background_white);
 
         mDetailRv = findViewById(R.id.news_detail_rv_show);
         mDetailBottomLl = findViewById(R.id.news_detail_ll_bottom);
@@ -710,7 +710,7 @@ public class NewsDetailActivity extends DownloadToolbarActivity implements OnCli
     @Override
     protected void onNightModeChange() {
         super.onNightModeChange();
-        ExtensionsKt.updateStatusBarColor(this, R.color.text_292929, R.color.white);
+        ExtensionsKt.updateStatusBarColor(this, R.color.background_white, R.color.background_white);
         mNewsShare.setIcon(R.drawable.icon_share_black);
         mNewsCollection.setIcon(R.drawable.community_content_detail_collect_unselect);
         mDetailRv.removeItemDecoration(mItemDecoration);
diff --git a/app/src/main/java/com/gh/gamecenter/QaActivity.kt b/app/src/main/java/com/gh/gamecenter/QaActivity.kt
index 8fb1bc954a..0aa246d757 100644
--- a/app/src/main/java/com/gh/gamecenter/QaActivity.kt
+++ b/app/src/main/java/com/gh/gamecenter/QaActivity.kt
@@ -31,13 +31,13 @@ class QaActivity : ToolBarActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        updateStatusBarColor(R.color.text_292929, R.color.white)
+        updateStatusBarColor(R.color.background_white, R.color.background_white)
     }
 
     override fun isAutoResetViewBackgroundEnabled() = true
 
     override fun onNightModeChange() {
         super.onNightModeChange()
-        updateStatusBarColor(R.color.text_292929, R.color.white)
+        updateStatusBarColor(R.color.background_white, R.color.background_white)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/gh/gamecenter/SearchActivity.kt b/app/src/main/java/com/gh/gamecenter/SearchActivity.kt
index ecff66ef81..132bdaa258 100644
--- a/app/src/main/java/com/gh/gamecenter/SearchActivity.kt
+++ b/app/src/main/java/com/gh/gamecenter/SearchActivity.kt
@@ -61,7 +61,7 @@ open class SearchActivity : BaseActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
-        updateStatusBarColor(R.color.text_292929, R.color.white)
+        updateStatusBarColor(R.color.background_white, R.color.background_white)
 
         searchEt = findViewById(R.id.searchEt)
         searchBtn = findViewById(R.id.searchBtn)
@@ -266,28 +266,11 @@ open class SearchActivity : BaseActivity() {
 
     override fun onNightModeChange() {
         super.onNightModeChange()
-        updateStatusBarColor(R.color.text_292929, R.color.white)
-        findViewById<LinearLayout>(R.id.searchContainer)?.run {
-            setBackgroundColor(R.color.background_white.toColor(this@SearchActivity))
-            findViewById<RelativeLayout>(R.id.searchBackground)?.background = R.drawable.actionbar_search_bg.toDrawable(this@SearchActivity)
-            searchEt.setTextColor(R.color.text_title.toColor(this@SearchActivity))
-            searchBtn.setTextColor(R.color.text_title.toColor(this@SearchActivity))
-            searchEt.setHintTextColor(R.color.text_body.toColor(this@SearchActivity))
-            findViewById<ImageView>(R.id.iv_search)?.setImageDrawable(R.drawable.toolbar_search_icon.toDrawable(this@SearchActivity))
-            findViewById<ImageView>(R.id.backIv)?.setImageDrawable(R.drawable.ic_bar_back.toDrawable(this@SearchActivity))
-            deleteIv.setImageDrawable(R.drawable.ic_search_bar_clear.toDrawable(this@SearchActivity))
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-                searchEt.textCursorDrawable = R.drawable.cursor_color.toDrawable(this@SearchActivity)
-            }
-        }
+        updateStatusBarColor(R.color.background_white, R.color.background_white)
     }
 
     override fun isAutoResetViewBackgroundEnabled() = true
 
-    override fun updateStaticViewBackground(view: View?) {
-        updateStaticView(view, listOf(R.id.searchContainer))
-    }
-
     companion object {
         const val KEY_SEARCH_TYPE = "search_type"
         private const val KEY_DISPLAY_TYPE = "display_type"
diff --git a/app/src/main/java/com/gh/gamecenter/SettingActivity.kt b/app/src/main/java/com/gh/gamecenter/SettingActivity.kt
index 5122da43ea..a5d7f5cee6 100644
--- a/app/src/main/java/com/gh/gamecenter/SettingActivity.kt
+++ b/app/src/main/java/com/gh/gamecenter/SettingActivity.kt
@@ -11,14 +11,14 @@ import com.halo.assistant.fragment.SettingsFragment
 class SettingActivity : ToolBarActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        updateStatusBarColor(R.color.text_292929, R.color.white)
+        updateStatusBarColor(R.color.background_white, R.color.background_white)
     }
 
     override fun isAutoResetViewBackgroundEnabled() = true
 
     override fun onNightModeChange() {
         super.onNightModeChange()
-        updateStatusBarColor(R.color.text_292929, R.color.white)
+        updateStatusBarColor(R.color.background_white, R.color.background_white)
     }
 
     companion object {
diff --git a/app/src/main/java/com/gh/gamecenter/ShellActivity.kt b/app/src/main/java/com/gh/gamecenter/ShellActivity.kt
index 97aaee7045..57471af449 100644
--- a/app/src/main/java/com/gh/gamecenter/ShellActivity.kt
+++ b/app/src/main/java/com/gh/gamecenter/ShellActivity.kt
@@ -4,6 +4,7 @@ import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import android.os.Parcelable
+import android.view.View
 import com.gh.gamecenter.common.base.activity.ToolBarActivity
 import com.gh.gamecenter.common.base.fragment.BaseFragment
 import com.gh.gamecenter.common.constant.EntranceConsts
@@ -44,6 +45,12 @@ class ShellActivity : ToolBarActivity() {
         supportFragmentManager.beginTransaction().replace(R.id.placeholder, fragment).commitAllowingStateLoss()
     }
 
+    override fun isAutoResetViewBackgroundEnabled(): Boolean = true
+
+    override fun updateStaticViewBackground(view: View?) {
+        updateStaticView(view, listOf(R.id.selectedIv))
+    }
+
     companion object {
         const val INTENT_TYPE = "intent_type"
 
diff --git a/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java b/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java
index a6452de30a..9a61e7c236 100644
--- a/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java
+++ b/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java
@@ -328,7 +328,7 @@ public class SuggestionActivity extends ToolBarActivity implements OnRequestCall
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        ExtensionsKt.updateStatusBarColor(this, R.color.text_292929, R.color.white);
+        ExtensionsKt.updateStatusBarColor(this, R.color.background_white, R.color.background_white);
         initView();
 
         Bundle extras = getIntent().getExtras();
@@ -1529,7 +1529,7 @@ public class SuggestionActivity extends ToolBarActivity implements OnRequestCall
     @Override
     protected void onNightModeChange() {
         super.onNightModeChange();
-        ExtensionsKt.updateStatusBarColor(this, R.color.text_292929, R.color.white);
+        ExtensionsKt.updateStatusBarColor(this, R.color.background_white, R.color.background_white);
         ActivitySuggestBinding binding = ActivitySuggestBinding.bind(mContentView);
         binding.divider1.setBackgroundColor(ContextCompat.getColor(this, R.color.cutting_line));
         binding.divider2.setBackgroundColor(ContextCompat.getColor(this, R.color.cutting_line));
@@ -1540,24 +1540,5 @@ public class SuggestionActivity extends ToolBarActivity implements OnRequestCall
         binding.divider7.setBackgroundColor(ContextCompat.getColor(this, R.color.background));
         binding.divider8.setBackgroundColor(ContextCompat.getColor(this, R.color.background));
         binding.divider9.setBackgroundColor(ContextCompat.getColor(this, R.color.background));
-
-        binding.suggestPlatformEt.setTextColor(ContextCompat.getColor(this, R.color.text_title));
-        binding.suggestPlatformEt.setHintTextColor(ContextCompat.getColor(this, R.color.text_body));
-        binding.typeOtherName.setTextColor(ContextCompat.getColor(this, R.color.text_title));
-        binding.typeOtherName.setHintTextColor(ContextCompat.getColor(this, R.color.text_body));
-        binding.suggestContentEt.setTextColor(ContextCompat.getColor(this, R.color.text_title));
-        binding.suggestContentEt.setHintTextColor(ContextCompat.getColor(this, R.color.text_body));
-        binding.suggestLinkEt.setTextColor(ContextCompat.getColor(this, R.color.text_title));
-        binding.suggestLinkEt.setHintTextColor(ContextCompat.getColor(this, R.color.text_body));
-        binding.suggestEmailEt.setTextColor(ContextCompat.getColor(this, R.color.text_title));
-        binding.suggestEmailEt.setHintTextColor(ContextCompat.getColor(this, R.color.text_body));
-        binding.credentialsCodeEt.setTextColor(ContextCompat.getColor(this, R.color.text_title));
-        binding.credentialsCodeEt.setHintTextColor(ContextCompat.getColor(this, R.color.text_body));
-        binding.appNameEt.setTextColor(ContextCompat.getColor(this, R.color.text_title));
-        binding.appNameEt.setHintTextColor(ContextCompat.getColor(this, R.color.text_body));
-        binding.explanationEt.setTextColor(ContextCompat.getColor(this, R.color.text_title));
-        binding.explanationEt.setHintTextColor(ContextCompat.getColor(this, R.color.text_body));
-        binding.contactMethodEt.setTextColor(ContextCompat.getColor(this, R.color.text_title));
-        binding.contactMethodEt.setHintTextColor(ContextCompat.getColor(this, R.color.text_body));
     }
 }
diff --git a/app/src/main/java/com/gh/gamecenter/UserInfoActivity.kt b/app/src/main/java/com/gh/gamecenter/UserInfoActivity.kt
index 9961bbfdbf..4cc024f881 100644
--- a/app/src/main/java/com/gh/gamecenter/UserInfoActivity.kt
+++ b/app/src/main/java/com/gh/gamecenter/UserInfoActivity.kt
@@ -21,6 +21,6 @@ class UserInfoActivity : ToolBarActivity() {
 
     override fun onNightModeChange() {
         super.onNightModeChange()
-        updateStatusBarColor(R.color.text_292929, R.color.white)
+        updateStatusBarColor(R.color.background_white, R.color.background_white)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/gh/gamecenter/VoteActivity.java b/app/src/main/java/com/gh/gamecenter/VoteActivity.java
index 7bc6ed4b5e..e4b2173e18 100644
--- a/app/src/main/java/com/gh/gamecenter/VoteActivity.java
+++ b/app/src/main/java/com/gh/gamecenter/VoteActivity.java
@@ -32,24 +32,17 @@ public class VoteActivity extends ToolBarActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        ExtensionsKt.updateStatusBarColor(this, R.color.text_292929, R.color.white);
+        ExtensionsKt.updateStatusBarColor(this, R.color.background_white, R.color.background_white);
     }
 
     @Override
     protected void onNightModeChange() {
         super.onNightModeChange();
-        ExtensionsKt.updateStatusBarColor(this, R.color.text_292929, R.color.white);
+        ExtensionsKt.updateStatusBarColor(this, R.color.background_white, R.color.background_white);
     }
 
     @Override
     protected boolean isAutoResetViewBackgroundEnabled() {
         return true;
     }
-
-    @Override
-    protected void updateStaticViewBackground(View view) {
-        ArrayList<Integer> blackList = new ArrayList<>();
-        blackList.add(R.id.searchBarInclude);
-        updateStaticView(view, blackList);
-    }
 }
diff --git a/app/src/main/java/com/gh/gamecenter/WebActivity.kt b/app/src/main/java/com/gh/gamecenter/WebActivity.kt
index f37a6ba6c6..fc1439692e 100644
--- a/app/src/main/java/com/gh/gamecenter/WebActivity.kt
+++ b/app/src/main/java/com/gh/gamecenter/WebActivity.kt
@@ -41,7 +41,7 @@ open class WebActivity : ToolBarActivity() {
         } else {
             super.onCreate(savedInstanceState)
         }
-        updateStatusBarColor(R.color.text_292929, R.color.white)
+        updateStatusBarColor(R.color.background_white, R.color.background_white)
     }
 
     override fun provideNormalIntent(): Intent {
@@ -74,7 +74,7 @@ open class WebActivity : ToolBarActivity() {
 
     override fun onNightModeChange() {
         super.onNightModeChange()
-        updateStatusBarColor(R.color.text_292929, R.color.white)
+        updateStatusBarColor(R.color.background_white, R.color.background_white)
     }
 
     companion object {
diff --git a/app/src/main/java/com/gh/gamecenter/catalog/CatalogActivity.kt b/app/src/main/java/com/gh/gamecenter/catalog/CatalogActivity.kt
index d87a1a5b51..12b02b5831 100644
--- a/app/src/main/java/com/gh/gamecenter/catalog/CatalogActivity.kt
+++ b/app/src/main/java/com/gh/gamecenter/catalog/CatalogActivity.kt
@@ -13,7 +13,7 @@ class CatalogActivity : DownloadToolbarActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setToolbarMenu(R.menu.menu_download)
-        updateStatusBarColor(R.color.text_292929, R.color.white)
+        updateStatusBarColor(R.color.background_white, R.color.background_white)
     }
 
     override fun showDownloadMenu(): Boolean {
@@ -26,7 +26,7 @@ class CatalogActivity : DownloadToolbarActivity() {
 
     override fun onNightModeChange() {
         super.onNightModeChange()
-        updateStatusBarColor(R.color.text_292929, R.color.white)
+        updateStatusBarColor(R.color.background_white, R.color.background_white)
     }
 
     override fun isAutoResetViewBackgroundEnabled() = true
diff --git a/app/src/main/java/com/gh/gamecenter/catalog/NewCatalogListActivity.kt b/app/src/main/java/com/gh/gamecenter/catalog/NewCatalogListActivity.kt
index 3e1aaa9848..bbbbf1179c 100644
--- a/app/src/main/java/com/gh/gamecenter/catalog/NewCatalogListActivity.kt
+++ b/app/src/main/java/com/gh/gamecenter/catalog/NewCatalogListActivity.kt
@@ -14,7 +14,7 @@ class NewCatalogListActivity : DownloadToolbarActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setToolbarMenu(R.menu.menu_download)
-        updateStatusBarColor(R.color.text_292929, R.color.white)
+        updateStatusBarColor(R.color.background_white, R.color.background_white)
     }
 
     override fun showDownloadMenu(): Boolean {
@@ -23,7 +23,7 @@ class NewCatalogListActivity : DownloadToolbarActivity() {
 
     override fun onNightModeChange() {
         super.onNightModeChange()
-        updateStatusBarColor(R.color.text_292929, R.color.white)
+        updateStatusBarColor(R.color.background_white, R.color.background_white)
     }
 
     override fun isAutoResetViewBackgroundEnabled() = true
diff --git a/app/src/main/java/com/gh/gamecenter/category/CategoryDirectoryActivity.kt b/app/src/main/java/com/gh/gamecenter/category/CategoryDirectoryActivity.kt
index 4b99dc1893..f64adc30df 100644
--- a/app/src/main/java/com/gh/gamecenter/category/CategoryDirectoryActivity.kt
+++ b/app/src/main/java/com/gh/gamecenter/category/CategoryDirectoryActivity.kt
@@ -22,7 +22,7 @@ class CategoryDirectoryActivity : DownloadToolbarActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setToolbarMenu(R.menu.menu_download)
-        updateStatusBarColor(R.color.text_292929, R.color.white)
+        updateStatusBarColor(R.color.background_white, R.color.background_white)
     }
 
     override fun showDownloadMenu(): Boolean {
@@ -41,6 +41,6 @@ class CategoryDirectoryActivity : DownloadToolbarActivity() {
 
     override fun onNightModeChange() {
         super.onNightModeChange()
-        updateStatusBarColor(R.color.text_292929, R.color.white)
+        updateStatusBarColor(R.color.background_white, R.color.background_white)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/gh/gamecenter/category/CategoryListActivity.kt b/app/src/main/java/com/gh/gamecenter/category/CategoryListActivity.kt
index 55460926d9..c5d91ea32b 100644
--- a/app/src/main/java/com/gh/gamecenter/category/CategoryListActivity.kt
+++ b/app/src/main/java/com/gh/gamecenter/category/CategoryListActivity.kt
@@ -30,7 +30,7 @@ class CategoryListActivity : DownloadToolbarActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setToolbarMenu(R.menu.menu_download)
-        updateStatusBarColor(R.color.text_292929, R.color.white)
+        updateStatusBarColor(R.color.background_white, R.color.background_white)
     }
 
     override fun showDownloadMenu(): Boolean {
@@ -43,6 +43,6 @@ class CategoryListActivity : DownloadToolbarActivity() {
 
     override fun onNightModeChange() {
         super.onNightModeChange()
-        updateStatusBarColor(R.color.text_292929, R.color.white)
+        updateStatusBarColor(R.color.background_white, R.color.background_white)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/gh/gamecenter/category2/CategoryV2Activity.kt b/app/src/main/java/com/gh/gamecenter/category2/CategoryV2Activity.kt
index 04681f2611..19510ba56b 100644
--- a/app/src/main/java/com/gh/gamecenter/category2/CategoryV2Activity.kt
+++ b/app/src/main/java/com/gh/gamecenter/category2/CategoryV2Activity.kt
@@ -13,7 +13,7 @@ class CategoryV2Activity : DownloadToolbarActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setToolbarMenu(R.menu.menu_search)
-        updateStatusBarColor(R.color.text_292929, R.color.white)
+        updateStatusBarColor(R.color.background_white, R.color.background_white)
     }
 
     override fun showDownloadMenu(): Boolean {
@@ -28,7 +28,7 @@ class CategoryV2Activity : DownloadToolbarActivity() {
 
     override fun onNightModeChange() {
         super.onNightModeChange()
-        updateStatusBarColor(R.color.text_292929, R.color.white)
+        updateStatusBarColor(R.color.background_white, R.color.background_white)
     }
 
     companion object {
diff --git a/app/src/main/java/com/gh/gamecenter/forum/home/ForumActivityAdapter.kt b/app/src/main/java/com/gh/gamecenter/forum/home/ForumActivityAdapter.kt
index cf52f66b0e..b689767ad1 100644
--- a/app/src/main/java/com/gh/gamecenter/forum/home/ForumActivityAdapter.kt
+++ b/app/src/main/java/com/gh/gamecenter/forum/home/ForumActivityAdapter.kt
@@ -71,7 +71,7 @@ class ForumActivityAdapter(
                         // 未开始
                         currentTime < activityEntity.effectTime.start -> {
                             status = "未开始"
-                            statusContainer.setCardBackgroundColor(R.color.bg_F5F6F7.toColor(mContext))
+                            statusContainer.setCardBackgroundColor(R.color.background_space.toColor(mContext))
                             statusIv.setImageResource(R.drawable.ic_activity_waiting)
                             statusTv.text = "未开始"
                             statusTv.setTextColor(R.color.text_subtitleDesc.toColor(mContext))
@@ -89,7 +89,7 @@ class ForumActivityAdapter(
                                 || activityEntity.effectTime.end == null
                                 || activityEntity.effectTime.end == 0L) -> {
                             status = "进行中"
-                            statusContainer.setCardBackgroundColor(R.color.bg_FFF3EB.toColor(mContext))
+                            statusContainer.setCardBackgroundColor(R.color.bg_1AFA8850.toColor(mContext))
                             statusIv.setImageResource(R.drawable.ic_activity_ongoing)
                             statusTv.text = "进行中"
                             statusTv.setTextColor(R.color.text_FA8850.toColor(mContext))
@@ -111,7 +111,7 @@ class ForumActivityAdapter(
                         currentTime > activityEntity.effectTime.end
                                 && currentTime < activityEntity.awardTime.start -> {
                             status = "正在评奖"
-                            statusContainer.setCardBackgroundColor(R.color.bg_FFF3EB.toColor(mContext))
+                            statusContainer.setCardBackgroundColor(R.color.bg_1AFA8850.toColor(mContext))
                             statusIv.setImageResource(R.drawable.ic_activity_selection)
                             statusTv.text = "正在评奖"
                             statusTv.setTextColor(R.color.text_FA8850.toColor(mContext))
@@ -127,7 +127,7 @@ class ForumActivityAdapter(
                         currentTime > activityEntity.awardTime.start
                                 && currentTime < activityEntity.awardTime.end -> {
                             status = "奖励发放中"
-                            statusContainer.setCardBackgroundColor(R.color.bg_FFF3EB.toColor(mContext))
+                            statusContainer.setCardBackgroundColor(R.color.bg_1AFA8850.toColor(mContext))
                             statusIv.setImageResource(R.drawable.ic_activity_award)
                             statusTv.text = "奖励发放中"
                             statusTv.setTextColor(R.color.text_FA8850.toColor(mContext))
@@ -142,7 +142,7 @@ class ForumActivityAdapter(
                         // 已结束
                         currentTime > activityEntity.awardTime.end -> {
                             status = "已结束"
-                            statusContainer.setCardBackgroundColor(R.color.f8f8f8.toColor(mContext))
+                            statusContainer.setCardBackgroundColor(R.color.background_space.toColor(mContext))
                             statusIv.setImageResource(R.drawable.ic_activity_end)
                             statusTv.text = "已结束"
                             statusTv.setTextColor(R.color.text_body.toColor(mContext))
diff --git a/app/src/main/java/com/gh/gamecenter/forum/list/ForumListActivity.kt b/app/src/main/java/com/gh/gamecenter/forum/list/ForumListActivity.kt
index 8e2d642a46..14e3632ad6 100644
--- a/app/src/main/java/com/gh/gamecenter/forum/list/ForumListActivity.kt
+++ b/app/src/main/java/com/gh/gamecenter/forum/list/ForumListActivity.kt
@@ -14,7 +14,7 @@ class ForumListActivity : ToolBarActivity() {
 
     override fun onNightModeChange() {
         super.onNightModeChange()
-        updateStatusBarColor(R.color.text_292929, R.color.white)
+        updateStatusBarColor(R.color.background_white, R.color.background_white)
     }
 
     companion object {
diff --git a/app/src/main/java/com/gh/gamecenter/forum/moderator/ApplyModeratorActivity.kt b/app/src/main/java/com/gh/gamecenter/forum/moderator/ApplyModeratorActivity.kt
index 3ba676af22..d5fc9acbd5 100644
--- a/app/src/main/java/com/gh/gamecenter/forum/moderator/ApplyModeratorActivity.kt
+++ b/app/src/main/java/com/gh/gamecenter/forum/moderator/ApplyModeratorActivity.kt
@@ -42,7 +42,7 @@ class ApplyModeratorActivity : ToolBarActivity() {
     override fun onNightModeChange() {
         super.onNightModeChange()
 
-        updateStatusBarColor(R.color.text_292929, R.color.white)
+        updateStatusBarColor(R.color.background_white, R.color.background_white)
     }
     private fun setStatusBarTransparent() {
         DisplayUtils.transparentStatusBar(this)
diff --git a/app/src/main/java/com/gh/gamecenter/forum/moderator/ModeratorListActivity.kt b/app/src/main/java/com/gh/gamecenter/forum/moderator/ModeratorListActivity.kt
index 609f62bc98..34ad02ec72 100644
--- a/app/src/main/java/com/gh/gamecenter/forum/moderator/ModeratorListActivity.kt
+++ b/app/src/main/java/com/gh/gamecenter/forum/moderator/ModeratorListActivity.kt
@@ -25,7 +25,7 @@ class ModeratorListActivity : ToolBarActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         hideToolbar(true)
-        updateStatusBarColor(R.color.text_292929, R.color.white)
+        updateStatusBarColor(R.color.background_white, R.color.background_white)
     }
 
     override fun isAutoResetViewBackgroundEnabled(): Boolean = true
@@ -33,6 +33,6 @@ class ModeratorListActivity : ToolBarActivity() {
     override fun onNightModeChange() {
         super.onNightModeChange()
 
-        updateStatusBarColor(R.color.text_292929, R.color.white)
+        updateStatusBarColor(R.color.background_white, R.color.background_white)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/gh/gamecenter/game/columncollection/detail/ColumnCollectionDetailActivity.kt b/app/src/main/java/com/gh/gamecenter/game/columncollection/detail/ColumnCollectionDetailActivity.kt
index ed4ead37d8..ab96085e46 100644
--- a/app/src/main/java/com/gh/gamecenter/game/columncollection/detail/ColumnCollectionDetailActivity.kt
+++ b/app/src/main/java/com/gh/gamecenter/game/columncollection/detail/ColumnCollectionDetailActivity.kt
@@ -11,6 +11,11 @@ import com.gh.gamecenter.common.utils.updateStatusBarColor
 
 class ColumnCollectionDetailActivity : ToolBarActivity() {
 
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        updateStatusBarColor(R.color.background_white, R.color.background_white)
+    }
+
     override fun provideNormalIntent(): Intent {
         return getTargetIntent(this, ColumnCollectionDetailActivity::class.java, ColumnCollectionDetailFragment::class.java)
     }
@@ -19,7 +24,7 @@ class ColumnCollectionDetailActivity : ToolBarActivity() {
 
     override fun onNightModeChange() {
         super.onNightModeChange()
-        updateStatusBarColor(R.color.text_292929, R.color.white)
+        updateStatusBarColor(R.color.background_white, R.color.background_white)
     }
 
     override fun getBusinessId(): Pair<String, String> {
diff --git a/app/src/main/java/com/gh/gamecenter/game/commoncollection/detail/CommonCollectionDetailActivity.kt b/app/src/main/java/com/gh/gamecenter/game/commoncollection/detail/CommonCollectionDetailActivity.kt
index bcb4e99bd5..503464bfd1 100644
--- a/app/src/main/java/com/gh/gamecenter/game/commoncollection/detail/CommonCollectionDetailActivity.kt
+++ b/app/src/main/java/com/gh/gamecenter/game/commoncollection/detail/CommonCollectionDetailActivity.kt
@@ -18,7 +18,7 @@ class CommonCollectionDetailActivity : ToolBarActivity() {
 
     override fun onNightModeChange() {
         super.onNightModeChange()
-        updateStatusBarColor(R.color.text_292929, R.color.white)
+        updateStatusBarColor(R.color.background_white, R.color.background_white)
     }
 
     override fun getBusinessId(): Pair<String, String> {
diff --git a/app/src/main/java/com/gh/gamecenter/game/upload/GameSubmissionActivity.kt b/app/src/main/java/com/gh/gamecenter/game/upload/GameSubmissionActivity.kt
index f1452d1583..0c6a128f9e 100644
--- a/app/src/main/java/com/gh/gamecenter/game/upload/GameSubmissionActivity.kt
+++ b/app/src/main/java/com/gh/gamecenter/game/upload/GameSubmissionActivity.kt
@@ -29,6 +29,6 @@ class GameSubmissionActivity : ToolBarActivity() {
 
     override fun onNightModeChange() {
         super.onNightModeChange()
-        updateStatusBarColor(R.color.text_292929, R.color.white)
+        updateStatusBarColor(R.color.background_white, R.color.background_white)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/gh/gamecenter/gamecollection/choose/AddGamesActivity.kt b/app/src/main/java/com/gh/gamecenter/gamecollection/choose/AddGamesActivity.kt
index d278145a80..cc8642a103 100644
--- a/app/src/main/java/com/gh/gamecenter/gamecollection/choose/AddGamesActivity.kt
+++ b/app/src/main/java/com/gh/gamecenter/gamecollection/choose/AddGamesActivity.kt
@@ -11,7 +11,7 @@ class AddGamesActivity : ToolBarActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        updateStatusBarColor(R.color.text_292929, R.color.white)
+        updateStatusBarColor(R.color.background_white, R.color.background_white)
     }
 
     override fun provideNormalIntent(): Intent {
@@ -20,7 +20,7 @@ class AddGamesActivity : ToolBarActivity() {
 
     override fun onNightModeChange() {
         super.onNightModeChange()
-        updateStatusBarColor(R.color.text_292929, R.color.white)
+        updateStatusBarColor(R.color.background_white, R.color.background_white)
     }
 
     companion object {
diff --git a/app/src/main/java/com/gh/gamecenter/gamecollection/choose/ChooseGamesActivity.kt b/app/src/main/java/com/gh/gamecenter/gamecollection/choose/ChooseGamesActivity.kt
index af8ac5779d..da8abe0a20 100644
--- a/app/src/main/java/com/gh/gamecenter/gamecollection/choose/ChooseGamesActivity.kt
+++ b/app/src/main/java/com/gh/gamecenter/gamecollection/choose/ChooseGamesActivity.kt
@@ -11,7 +11,7 @@ class ChooseGamesActivity : ToolBarActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setNavigationTitle("选择游戏")
-        updateStatusBarColor(R.color.text_292929, R.color.white)
+        updateStatusBarColor(R.color.background_white, R.color.background_white)
     }
 
     override fun provideNormalIntent(): Intent {
@@ -20,7 +20,7 @@ class ChooseGamesActivity : ToolBarActivity() {
 
     override fun onNightModeChange() {
         super.onNightModeChange()
-        updateStatusBarColor(R.color.text_292929, R.color.white)
+        updateStatusBarColor(R.color.background_white, R.color.background_white)
     }
 
     companion object {
diff --git a/app/src/main/java/com/gh/gamecenter/gamecollection/detail/GameCollectionDetailAdapter.kt b/app/src/main/java/com/gh/gamecenter/gamecollection/detail/GameCollectionDetailAdapter.kt
index 22f43ca14f..36f4615d73 100644
--- a/app/src/main/java/com/gh/gamecenter/gamecollection/detail/GameCollectionDetailAdapter.kt
+++ b/app/src/main/java/com/gh/gamecenter/gamecollection/detail/GameCollectionDetailAdapter.kt
@@ -293,7 +293,7 @@ open class GameCollectionDetailAdapter(
     ) {
         binding.run {
             root.setBackgroundColor(R.color.background_white.toColor(mContext))
-            subCommentContainer.setBackgroundColor(R.color.background_space.toColor(mContext))
+            subCommentContainer.setBackgroundColor(R.color.background_space_2.toColor(mContext))
             divider.setBackgroundColor(R.color.text_F8F8F8.toColor(mContext))
             bottomDivider.setBackgroundColor(R.color.divider.toColor(mContext))
             userNameTv.setTextColor(R.color.text_subtitle.toColor(mContext))
@@ -486,7 +486,7 @@ open class GameCollectionDetailAdapter(
         binding.subCommentContainer.goneIf(subCommentList.isNullOrEmpty())
         binding.firstSubCommentTv.goneIf(subCommentList?.firstOrNull() == null)
         binding.secondSubCommentTv.goneIf(subCommentList?.secondOrNull() == null)
-        binding.subCommentContainer.setRoundedColorBackground(R.color.background_space, 5F)
+        binding.subCommentContainer.setRoundedColorBackground(R.color.background_space_2, 5F)
 
         subCommentList?.firstOrNull()?.let {
             binding.firstSubCommentTv.text = getSubCommentSpanned(
diff --git a/app/src/main/java/com/gh/gamecenter/gamecollection/detail/GameCollectionDetailFragment.kt b/app/src/main/java/com/gh/gamecenter/gamecollection/detail/GameCollectionDetailFragment.kt
index fd2968c54f..ecf8a068aa 100644
--- a/app/src/main/java/com/gh/gamecenter/gamecollection/detail/GameCollectionDetailFragment.kt
+++ b/app/src/main/java/com/gh/gamecenter/gamecollection/detail/GameCollectionDetailFragment.kt
@@ -155,7 +155,7 @@ class GameCollectionDetailFragment :
 
             inputContainer.run {
                 bottomShareGroup.visibility = View.VISIBLE
-                replyTv.setBackgroundResource(R.drawable.button_round_f5f5f5)
+                replyTv.setBackgroundResource(R.drawable.bg_shape_space2_radius_999)
                 replyTv.text = "说点什么吧"
                 (bottomLikeIv.layoutParams as ConstraintLayout.LayoutParams).apply {
                     rightMargin = 28f.dip2px()
diff --git a/app/src/main/java/com/gh/gamecenter/gamecollection/detail/conversation/GameCollectionCommentConversationFragment.kt b/app/src/main/java/com/gh/gamecenter/gamecollection/detail/conversation/GameCollectionCommentConversationFragment.kt
index 4b45b1bb84..25a7f929b3 100644
--- a/app/src/main/java/com/gh/gamecenter/gamecollection/detail/conversation/GameCollectionCommentConversationFragment.kt
+++ b/app/src/main/java/com/gh/gamecenter/gamecollection/detail/conversation/GameCollectionCommentConversationFragment.kt
@@ -112,7 +112,7 @@ class GameCollectionCommentConversationFragment :
             inputContainer.bottomStarIv.visibility = View.GONE
             inputContainer.bottomStarTv.visibility = View.GONE
 
-            inputContainer.replyTv.setRoundedColorBackground(R.color.text_F0F0F0, 19F)
+            inputContainer.replyTv.setRoundedColorBackground(R.color.background_space_2, 19F)
             inputContainer.replyTv.setDebouncedClickListener {
                 mViewModel.commentDetail?.let { startCommentActivity(it) }
             }
@@ -259,7 +259,7 @@ class GameCollectionCommentConversationFragment :
             )
             mBinding.inputContainer.run {
                 bottomContainer.setBackgroundColor(R.color.background_white.toColor(requireContext()))
-                replyTv.setBackgroundColor(R.color.background.toColor(requireContext()))
+                replyTv.setRoundedColorBackground(R.color.background_space_2, 19F)
                 replyTv.setTextColor(R.color.text_body.toColor(requireContext()))
                 bottomShareTv.setTextColor(R.color.text_subtitle.toColor(requireContext()))
                 bottomLikeTv.setTextColor(R.color.text_subtitle.toColor(requireContext()))
diff --git a/app/src/main/java/com/gh/gamecenter/gamecollection/mine/MyGameCollectionActivity.kt b/app/src/main/java/com/gh/gamecenter/gamecollection/mine/MyGameCollectionActivity.kt
index 826f83d9e8..fe3425279e 100644
--- a/app/src/main/java/com/gh/gamecenter/gamecollection/mine/MyGameCollectionActivity.kt
+++ b/app/src/main/java/com/gh/gamecenter/gamecollection/mine/MyGameCollectionActivity.kt
@@ -11,7 +11,7 @@ class MyGameCollectionActivity : ToolBarActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        updateStatusBarColor(R.color.text_292929, R.color.white)
+        updateStatusBarColor(R.color.background_white, R.color.background_white)
     }
 
     override fun provideNormalIntent(): Intent {
@@ -20,7 +20,7 @@ class MyGameCollectionActivity : ToolBarActivity() {
 
     override fun onNightModeChange() {
         super.onNightModeChange()
-        updateStatusBarColor(R.color.text_292929, R.color.white)
+        updateStatusBarColor(R.color.background_white, R.color.background_white)
     }
 
     companion object {
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 2d8e8222d0..427615d338 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
@@ -49,7 +49,7 @@ class GameCollectionEditActivity : ToolBarActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        updateStatusBarColor(R.color.text_292929, R.color.white)
+        updateStatusBarColor(R.color.background_white, R.color.background_white)
         mBinding = ActivityGameCollectionEditBinding.bind(mContentView)
         mViewModel = viewModelProvider()
         mChooseGamesViewModel = viewModelProvider(ChooseGamesViewModel.Factory())
@@ -496,7 +496,7 @@ class GameCollectionEditActivity : ToolBarActivity() {
 
     override fun onNightModeChange() {
         super.onNightModeChange()
-        updateStatusBarColor(R.color.text_292929, R.color.white)
+        updateStatusBarColor(R.color.background_white, R.color.background_white)
         mMenuPost.actionView.findViewById<TextView>(R.id.postTv)?.background = R.drawable.textview_concern_red_up_round.toDrawable(this)
         if (::mBinding.isInitialized) {
             mBinding.run {
diff --git a/app/src/main/java/com/gh/gamecenter/gamecollection/tag/GameCollectionTagSelectActivity.kt b/app/src/main/java/com/gh/gamecenter/gamecollection/tag/GameCollectionTagSelectActivity.kt
index 9980f9778d..92344b17a2 100644
--- a/app/src/main/java/com/gh/gamecenter/gamecollection/tag/GameCollectionTagSelectActivity.kt
+++ b/app/src/main/java/com/gh/gamecenter/gamecollection/tag/GameCollectionTagSelectActivity.kt
@@ -12,7 +12,7 @@ class GameCollectionTagSelectActivity : ToolBarActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        updateStatusBarColor(R.color.text_292929, R.color.white)
+        updateStatusBarColor(R.color.background_white, R.color.background_white)
         setNavigationTitle("选择标签")
         if (intent.getBundleExtra(NORMAL_FRAGMENT_BUNDLE)?.getBoolean(KEY_IS_SINGLE_CHOICE) == false) {
             setToolbarMenu(R.menu.menu_save)
@@ -23,7 +23,7 @@ class GameCollectionTagSelectActivity : ToolBarActivity() {
 
     override fun onNightModeChange() {
         super.onNightModeChange()
-        updateStatusBarColor(R.color.text_292929, R.color.white)
+        updateStatusBarColor(R.color.background_white, R.color.background_white)
     }
 
     companion object {
diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/rating/edit/RatingEditActivity.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/rating/edit/RatingEditActivity.kt
index 540be63dca..2ec81b16a8 100644
--- a/app/src/main/java/com/gh/gamecenter/gamedetail/rating/edit/RatingEditActivity.kt
+++ b/app/src/main/java/com/gh/gamecenter/gamedetail/rating/edit/RatingEditActivity.kt
@@ -493,7 +493,7 @@ class RatingEditActivity : ToolBarActivity(), KeyboardHeightObserver {
 
     override fun onNightModeChange() {
         super.onNightModeChange()
-        updateStatusBarColor(R.color.text_292929, R.color.white)
+        updateStatusBarColor(R.color.background_white, R.color.background_white)
         mBinding.mWebView.enableForceDark(NightModeUtils.isNightMode(this))
     }
 
diff --git a/app/src/main/java/com/gh/gamecenter/history/HistoryActivity.kt b/app/src/main/java/com/gh/gamecenter/history/HistoryActivity.kt
index 03c1b9e1b6..2b651447ac 100644
--- a/app/src/main/java/com/gh/gamecenter/history/HistoryActivity.kt
+++ b/app/src/main/java/com/gh/gamecenter/history/HistoryActivity.kt
@@ -12,14 +12,14 @@ class HistoryActivity: ToolBarActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        updateStatusBarColor(R.color.text_292929, R.color.white)
+        updateStatusBarColor(R.color.background_white, R.color.background_white)
     }
 
     override fun isAutoResetViewBackgroundEnabled() = true
 
     override fun onNightModeChange() {
         super.onNightModeChange()
-        updateStatusBarColor(R.color.text_292929, R.color.white)
+        updateStatusBarColor(R.color.background_white, R.color.background_white)
     }
 
     companion object {
diff --git a/app/src/main/java/com/gh/gamecenter/message/MessageItemViewHolder.java b/app/src/main/java/com/gh/gamecenter/message/MessageItemViewHolder.java
index c7db815e62..655d226c49 100644
--- a/app/src/main/java/com/gh/gamecenter/message/MessageItemViewHolder.java
+++ b/app/src/main/java/com/gh/gamecenter/message/MessageItemViewHolder.java
@@ -84,7 +84,7 @@ public class MessageItemViewHolder extends BaseRecyclerViewHolder<MessageEntity>
 
     public void setMessageItem(MessageEntity messageEntity, Context context, String entrance) {
         mBinding.messageItem.setBackground(ContextCompat.getDrawable(mBinding.getRoot().getContext(), R.drawable.reuse_listview_item_style));
-        mBinding.messageOriginal.setBackground(ContextCompat.getDrawable(mBinding.getRoot().getContext(), R.drawable.bg_shape_f8_radius_8));
+        mBinding.messageOriginal.setBackground(ContextCompat.getDrawable(mBinding.getRoot().getContext(), R.drawable.bg_shape_space_radius_8));
         mBinding.messageUserName.setTextColor(ContextCompat.getColor(mBinding.getRoot().getContext(), R.color.text_title));
         mBinding.messageUserMore.setTextColor(ContextCompat.getColor(mBinding.getRoot().getContext(), R.color.theme_font));
         mBinding.messageCommand.setTextColor(ContextCompat.getColor(mBinding.getRoot().getContext(), R.color.text_title));
diff --git a/app/src/main/java/com/gh/gamecenter/mygame/MyGameActivity.kt b/app/src/main/java/com/gh/gamecenter/mygame/MyGameActivity.kt
index 6821c8c146..74ec9b9189 100644
--- a/app/src/main/java/com/gh/gamecenter/mygame/MyGameActivity.kt
+++ b/app/src/main/java/com/gh/gamecenter/mygame/MyGameActivity.kt
@@ -29,7 +29,7 @@ class MyGameActivity : BaseActivity_TabLayout() {
         setToolbarMenu(R.menu.menu_my_game)
         mDividerLineView?.visibility = View.VISIBLE
         showGuide()
-        updateStatusBarColor(R.color.text_292929, R.color.white)
+        updateStatusBarColor(R.color.background_white, R.color.background_white)
     }
 
     override fun initFragmentList(fragments: MutableList<Fragment>?) {
@@ -63,7 +63,7 @@ class MyGameActivity : BaseActivity_TabLayout() {
 
     override fun onNightModeChange() {
         super.onNightModeChange()
-        updateStatusBarColor(R.color.text_292929, R.color.white)
+        updateStatusBarColor(R.color.background_white, R.color.background_white)
     }
 
     private fun showGuide() {
diff --git a/app/src/main/java/com/gh/gamecenter/personal/DeliveryInfoActivity.kt b/app/src/main/java/com/gh/gamecenter/personal/DeliveryInfoActivity.kt
index a42012f331..3ec7b92529 100644
--- a/app/src/main/java/com/gh/gamecenter/personal/DeliveryInfoActivity.kt
+++ b/app/src/main/java/com/gh/gamecenter/personal/DeliveryInfoActivity.kt
@@ -12,12 +12,12 @@ class DeliveryInfoActivity : ToolBarActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setNavigationTitle(R.string.delivery_info)
-        updateStatusBarColor(R.color.text_292929, R.color.white)
+        updateStatusBarColor(R.color.background_white, R.color.background_white)
     }
 
     override fun onNightModeChange() {
         super.onNightModeChange()
-        updateStatusBarColor(R.color.text_292929, R.color.white)
+        updateStatusBarColor(R.color.background_white, R.color.background_white)
     }
 
     companion object {
diff --git a/app/src/main/java/com/gh/gamecenter/personalhome/background/PersonalityBackgroundActivity.kt b/app/src/main/java/com/gh/gamecenter/personalhome/background/PersonalityBackgroundActivity.kt
index c91c2303db..011e53649c 100644
--- a/app/src/main/java/com/gh/gamecenter/personalhome/background/PersonalityBackgroundActivity.kt
+++ b/app/src/main/java/com/gh/gamecenter/personalhome/background/PersonalityBackgroundActivity.kt
@@ -12,14 +12,14 @@ class PersonalityBackgroundActivity : ToolBarActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setNavigationTitle("个性背景")
-        updateStatusBarColor(R.color.text_292929, R.color.white)
+        updateStatusBarColor(R.color.background_white, R.color.background_white)
     }
 
     override fun isAutoResetViewBackgroundEnabled(): Boolean = true
 
     override fun onNightModeChange() {
         super.onNightModeChange()
-        updateStatusBarColor(R.color.text_292929, R.color.white)
+        updateStatusBarColor(R.color.background_white, R.color.background_white)
     }
 
     companion object {
diff --git a/app/src/main/java/com/gh/gamecenter/personalhome/fans/FansActivity.kt b/app/src/main/java/com/gh/gamecenter/personalhome/fans/FansActivity.kt
index 3342ddd42a..186756810b 100644
--- a/app/src/main/java/com/gh/gamecenter/personalhome/fans/FansActivity.kt
+++ b/app/src/main/java/com/gh/gamecenter/personalhome/fans/FansActivity.kt
@@ -14,14 +14,14 @@ class FansActivity : ToolBarActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        updateStatusBarColor(R.color.text_292929, R.color.white)
+        updateStatusBarColor(R.color.background_white, R.color.background_white)
     }
 
     override fun isAutoResetViewBackgroundEnabled(): Boolean = true
 
     override fun onNightModeChange() {
         super.onNightModeChange()
-        updateStatusBarColor(R.color.text_292929, R.color.white)
+        updateStatusBarColor(R.color.background_white, R.color.background_white)
     }
 
     companion object {
diff --git a/app/src/main/java/com/gh/gamecenter/personalhome/followers/FollowersActivity.kt b/app/src/main/java/com/gh/gamecenter/personalhome/followers/FollowersActivity.kt
index 1b4c874cb7..b850058484 100644
--- a/app/src/main/java/com/gh/gamecenter/personalhome/followers/FollowersActivity.kt
+++ b/app/src/main/java/com/gh/gamecenter/personalhome/followers/FollowersActivity.kt
@@ -14,14 +14,14 @@ class FollowersActivity : ToolBarActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        updateStatusBarColor(R.color.text_292929, R.color.white)
+        updateStatusBarColor(R.color.background_white, R.color.background_white)
     }
 
     override fun isAutoResetViewBackgroundEnabled(): Boolean = true
 
     override fun onNightModeChange() {
         super.onNightModeChange()
-        updateStatusBarColor(R.color.text_292929, R.color.white)
+        updateStatusBarColor(R.color.background_white, R.color.background_white)
     }
     companion object {
         fun getIntent(context: Context, userId: String, entrance: String, path: String): Intent {
diff --git a/app/src/main/java/com/gh/gamecenter/personalhome/rating/RatingActivity.kt b/app/src/main/java/com/gh/gamecenter/personalhome/rating/RatingActivity.kt
index b206d535b2..1261aef6b2 100644
--- a/app/src/main/java/com/gh/gamecenter/personalhome/rating/RatingActivity.kt
+++ b/app/src/main/java/com/gh/gamecenter/personalhome/rating/RatingActivity.kt
@@ -28,7 +28,7 @@ class RatingActivity : ListActivity<MyRating, NormalListViewModel<MyRating>>() {
         } else {
             setNavigationTitle("Ta的评分")
         }
-        updateStatusBarColor(R.color.text_292929, R.color.white)
+        updateStatusBarColor(R.color.background_white, R.color.background_white)
     }
 
     override fun provideListAdapter(): RatingAdapter {
@@ -49,7 +49,7 @@ class RatingActivity : ListActivity<MyRating, NormalListViewModel<MyRating>>() {
 
     override fun onNightModeChange() {
         super.onNightModeChange()
-        updateStatusBarColor(R.color.text_292929, R.color.white)
+        updateStatusBarColor(R.color.background_white, R.color.background_white)
     }
 
 
diff --git a/app/src/main/java/com/gh/gamecenter/qa/answer/detail/AnswerDetailFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/answer/detail/AnswerDetailFragment.kt
index 1469f85510..9b7fb9d457 100644
--- a/app/src/main/java/com/gh/gamecenter/qa/answer/detail/AnswerDetailFragment.kt
+++ b/app/src/main/java/com/gh/gamecenter/qa/answer/detail/AnswerDetailFragment.kt
@@ -110,7 +110,7 @@ open class AnswerDetailFragment : ToolbarFragment() {
         mBinding.richEditor.setInputEnabled(false)
         mBinding.richEditor.setPadding(20, 15, 20, 15)
         mBinding.bottomController.replyTv.text = "说点什么吧"
-        mBinding.bottomController.replyTv.setRoundedColorBackground(R.color.background, 19F)
+        mBinding.bottomController.replyTv.setRoundedColorBackground(R.color.background_space_2, 19F)
 
         mElapsedHelper = TimeElapsedHelper(this)
         // 只对显示在屏幕上的 fragment 计时
diff --git a/app/src/main/java/com/gh/gamecenter/qa/answer/detail/SimpleAnswerDetailActivity.kt b/app/src/main/java/com/gh/gamecenter/qa/answer/detail/SimpleAnswerDetailActivity.kt
index 2c68d4c775..98e944c544 100644
--- a/app/src/main/java/com/gh/gamecenter/qa/answer/detail/SimpleAnswerDetailActivity.kt
+++ b/app/src/main/java/com/gh/gamecenter/qa/answer/detail/SimpleAnswerDetailActivity.kt
@@ -13,7 +13,7 @@ class SimpleAnswerDetailActivity : ToolBarActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        updateStatusBarColor(R.color.text_292929, R.color.white)
+        updateStatusBarColor(R.color.background_white, R.color.background_white)
     }
 
     override fun provideNormalIntent(): Intent? {
@@ -28,7 +28,7 @@ class SimpleAnswerDetailActivity : ToolBarActivity() {
 
     override fun onNightModeChange() {
         super.onNightModeChange()
-        updateStatusBarColor(R.color.text_292929, R.color.white)
+        updateStatusBarColor(R.color.background_white, R.color.background_white)
     }
 
     companion object {
diff --git a/app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailActivity.kt b/app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailActivity.kt
index 7060dff0e4..42a9c35dc3 100644
--- a/app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailActivity.kt
+++ b/app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailActivity.kt
@@ -21,7 +21,7 @@ class ArticleDetailActivity : ToolBarActivity() {
 
 //        TODO 让状态栏透明
 //        DisplayUtils.transparentStatusBar(this)
-        updateStatusBarColor(R.color.text_292929, R.color.white)
+        updateStatusBarColor(R.color.background_white, R.color.background_white)
     }
 
     override fun provideNormalIntent(): Intent {
@@ -39,7 +39,7 @@ class ArticleDetailActivity : ToolBarActivity() {
 
     override fun onNightModeChange() {
         super.onNightModeChange()
-        updateStatusBarColor(R.color.text_292929, R.color.white)
+        updateStatusBarColor(R.color.background_white, R.color.background_white)
     }
 
 
diff --git a/app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailFragment.kt
index 22390da594..92822f1224 100644
--- a/app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailFragment.kt
+++ b/app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailFragment.kt
@@ -278,7 +278,7 @@ class ArticleDetailFragment : BaseCommentFragment<CommentItemData, ArticleDetail
         mBinding.inputContainer.bottomStarTv.setOnClickListener { mBinding.inputContainer.bottomStarIv.performClick() }
 
         mBinding.inputContainer.replyTv.text = "说点什么吧"
-        mBinding.inputContainer.replyTv.setRoundedColorBackground(R.color.background, 19F)
+        mBinding.inputContainer.replyTv.setRoundedColorBackground(R.color.background_space_2, 19F)
         mBinding.inputContainer.replyTv.setDebouncedClickListener {
             MtaHelper.onEvent("帖子详情", "底部", "评论输入框")
             NewLogUtils.logCommentClick(
diff --git a/app/src/main/java/com/gh/gamecenter/qa/article/draft/ArticleDraftActivity.kt b/app/src/main/java/com/gh/gamecenter/qa/article/draft/ArticleDraftActivity.kt
index a8cdb394bf..5207e3e477 100644
--- a/app/src/main/java/com/gh/gamecenter/qa/article/draft/ArticleDraftActivity.kt
+++ b/app/src/main/java/com/gh/gamecenter/qa/article/draft/ArticleDraftActivity.kt
@@ -12,14 +12,14 @@ class ArticleDraftActivity : ToolBarActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        updateStatusBarColor(R.color.text_292929, R.color.white)
+        updateStatusBarColor(R.color.background_white, R.color.background_white)
     }
 
     override fun isAutoResetViewBackgroundEnabled(): Boolean =true
 
     override fun onNightModeChange() {
         super.onNightModeChange()
-        updateStatusBarColor(R.color.text_292929, R.color.white)
+        updateStatusBarColor(R.color.background_white, R.color.background_white)
     }
 
     companion object {
diff --git a/app/src/main/java/com/gh/gamecenter/qa/comment/base/BaseCommentAdapter.kt b/app/src/main/java/com/gh/gamecenter/qa/comment/base/BaseCommentAdapter.kt
index 0c041c5896..0d23da7052 100644
--- a/app/src/main/java/com/gh/gamecenter/qa/comment/base/BaseCommentAdapter.kt
+++ b/app/src/main/java/com/gh/gamecenter/qa/comment/base/BaseCommentAdapter.kt
@@ -508,7 +508,7 @@ abstract class BaseCommentAdapter(
             binding.subCommentContainer.goneIf(subCommentList.isNullOrEmpty())
             binding.firstSubCommentTv.goneIf(subCommentList?.firstOrNull() == null)
             binding.secondSubCommentTv.goneIf(subCommentList?.secondOrNull() == null)
-            binding.subCommentContainer.setRoundedColorBackground(R.color.background_space, 5F)
+            binding.subCommentContainer.setRoundedColorBackground(R.color.background_space_2, 5F)
 
             subCommentList?.firstOrNull()?.let {
                 binding.firstSubCommentTv.text = getSubCommentSpanned(
diff --git a/app/src/main/java/com/gh/gamecenter/qa/comment/conversation/CommentConversationFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/comment/conversation/CommentConversationFragment.kt
index 8502cdbf81..22f2bae12c 100644
--- a/app/src/main/java/com/gh/gamecenter/qa/comment/conversation/CommentConversationFragment.kt
+++ b/app/src/main/java/com/gh/gamecenter/qa/comment/conversation/CommentConversationFragment.kt
@@ -109,7 +109,7 @@ class CommentConversationFragment :
             inputContainer.bottomStarIv.visibility = View.GONE
             inputContainer.bottomStarTv.visibility = View.GONE
 
-            inputContainer.replyTv.setRoundedColorBackground(R.color.background, 19F)
+            inputContainer.replyTv.setRoundedColorBackground(R.color.background_space_2, 19F)
             inputContainer.replyTv.setDebouncedClickListener {
                 mViewModel.commentDetail?.let { startCommentActivity(it) }
             }
diff --git a/app/src/main/java/com/gh/gamecenter/qa/draft/CommunityDraftWrapperActivity.kt b/app/src/main/java/com/gh/gamecenter/qa/draft/CommunityDraftWrapperActivity.kt
index 801407aa9c..2d2b9c8027 100644
--- a/app/src/main/java/com/gh/gamecenter/qa/draft/CommunityDraftWrapperActivity.kt
+++ b/app/src/main/java/com/gh/gamecenter/qa/draft/CommunityDraftWrapperActivity.kt
@@ -16,7 +16,7 @@ class CommunityDraftWrapperActivity : BaseActivity_TabLayout() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setNavigationTitle("我的草稿")
-        updateStatusBarColor(R.color.text_292929, R.color.white)
+        updateStatusBarColor(R.color.background_white, R.color.background_white)
     }
 
     override fun initFragmentList(fragments: MutableList<Fragment>) {
@@ -35,7 +35,7 @@ class CommunityDraftWrapperActivity : BaseActivity_TabLayout() {
 
     override fun onNightModeChange() {
         super.onNightModeChange()
-        updateStatusBarColor(R.color.text_292929, R.color.white)
+        updateStatusBarColor(R.color.background_white, R.color.background_white)
     }
 
     companion object {
diff --git a/app/src/main/java/com/gh/gamecenter/qa/editor/GameActivity.kt b/app/src/main/java/com/gh/gamecenter/qa/editor/GameActivity.kt
index 2519f418da..dbba7c0a1f 100644
--- a/app/src/main/java/com/gh/gamecenter/qa/editor/GameActivity.kt
+++ b/app/src/main/java/com/gh/gamecenter/qa/editor/GameActivity.kt
@@ -12,7 +12,7 @@ import com.gh.gamecenter.common.utils.updateStatusBarColor
 class GameActivity : ToolBarActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        updateStatusBarColor(R.color.text_292929, R.color.white)
+        updateStatusBarColor(R.color.background_white, R.color.background_white)
     }
 
     override fun provideNormalIntent(): Intent {
@@ -23,7 +23,7 @@ class GameActivity : ToolBarActivity() {
 
     override fun onNightModeChange() {
         super.onNightModeChange()
-        updateStatusBarColor(R.color.text_292929, R.color.white)
+        updateStatusBarColor(R.color.background_white, R.color.background_white)
     }
 
     companion object {
diff --git a/app/src/main/java/com/gh/gamecenter/qa/editor/InsertAnswerWrapperActivity.kt b/app/src/main/java/com/gh/gamecenter/qa/editor/InsertAnswerWrapperActivity.kt
index 3a6d71c2d5..781d4ff69a 100644
--- a/app/src/main/java/com/gh/gamecenter/qa/editor/InsertAnswerWrapperActivity.kt
+++ b/app/src/main/java/com/gh/gamecenter/qa/editor/InsertAnswerWrapperActivity.kt
@@ -13,7 +13,7 @@ class InsertAnswerWrapperActivity : BaseActivity_TabLayout() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        updateStatusBarColor(R.color.text_292929, R.color.white)
+        updateStatusBarColor(R.color.background_white, R.color.background_white)
     }
 
     override fun getLayoutId(): Int = R.layout.activity_tablayout_no_title_viewpager
@@ -32,7 +32,7 @@ class InsertAnswerWrapperActivity : BaseActivity_TabLayout() {
 
     override fun onNightModeChange() {
         super.onNightModeChange()
-        updateStatusBarColor(R.color.text_292929, R.color.white)
+        updateStatusBarColor(R.color.background_white, R.color.background_white)
     }
 
     companion object {
diff --git a/app/src/main/java/com/gh/gamecenter/qa/editor/InsertArticleWrapperActivity.kt b/app/src/main/java/com/gh/gamecenter/qa/editor/InsertArticleWrapperActivity.kt
index 796535ea25..2355f9e700 100644
--- a/app/src/main/java/com/gh/gamecenter/qa/editor/InsertArticleWrapperActivity.kt
+++ b/app/src/main/java/com/gh/gamecenter/qa/editor/InsertArticleWrapperActivity.kt
@@ -13,7 +13,7 @@ class InsertArticleWrapperActivity : BaseActivity_TabLayout() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        updateStatusBarColor(R.color.text_292929, R.color.white)
+        updateStatusBarColor(R.color.background_white, R.color.background_white)
     }
     override fun getLayoutId(): Int = R.layout.activity_tablayout_no_title_viewpager
 
@@ -31,7 +31,7 @@ class InsertArticleWrapperActivity : BaseActivity_TabLayout() {
 
     override fun onNightModeChange() {
         super.onNightModeChange()
-        updateStatusBarColor(R.color.text_292929, R.color.white)
+        updateStatusBarColor(R.color.background_white, R.color.background_white)
     }
 
     companion object {
diff --git a/app/src/main/java/com/gh/gamecenter/qa/editor/InsertGameCollectionWrapperActivity.kt b/app/src/main/java/com/gh/gamecenter/qa/editor/InsertGameCollectionWrapperActivity.kt
index b86ad35b50..f645632665 100644
--- a/app/src/main/java/com/gh/gamecenter/qa/editor/InsertGameCollectionWrapperActivity.kt
+++ b/app/src/main/java/com/gh/gamecenter/qa/editor/InsertGameCollectionWrapperActivity.kt
@@ -16,7 +16,7 @@ class InsertGameCollectionWrapperActivity : BaseActivity_TabLayout() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        updateStatusBarColor(R.color.text_292929, R.color.white)
+        updateStatusBarColor(R.color.background_white, R.color.background_white)
     }
 
     override fun getLayoutId(): Int = R.layout.activity_tablayout_no_title_viewpager
@@ -52,7 +52,7 @@ class InsertGameCollectionWrapperActivity : BaseActivity_TabLayout() {
 
     override fun onNightModeChange() {
         super.onNightModeChange()
-        updateStatusBarColor(R.color.text_292929, R.color.white)
+        updateStatusBarColor(R.color.background_white, R.color.background_white)
     }
 
     companion object {
diff --git a/app/src/main/java/com/gh/gamecenter/qa/editor/InsertVideoWrapperActivity.kt b/app/src/main/java/com/gh/gamecenter/qa/editor/InsertVideoWrapperActivity.kt
index d7f156c8f2..8f56d9f32e 100644
--- a/app/src/main/java/com/gh/gamecenter/qa/editor/InsertVideoWrapperActivity.kt
+++ b/app/src/main/java/com/gh/gamecenter/qa/editor/InsertVideoWrapperActivity.kt
@@ -15,7 +15,7 @@ class InsertVideoWrapperActivity : BaseActivity_TabLayout() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        updateStatusBarColor(R.color.text_292929, R.color.white)
+        updateStatusBarColor(R.color.background_white, R.color.background_white)
     }
 
     override fun getLayoutId(): Int = R.layout.activity_tablayout_no_title_viewpager
@@ -48,7 +48,7 @@ class InsertVideoWrapperActivity : BaseActivity_TabLayout() {
 
     override fun onNightModeChange() {
         super.onNightModeChange()
-        updateStatusBarColor(R.color.text_292929, R.color.white)
+        updateStatusBarColor(R.color.background_white, R.color.background_white)
     }
 
     companion object {
diff --git a/app/src/main/java/com/gh/gamecenter/qa/editor/LocalMediaActivity.kt b/app/src/main/java/com/gh/gamecenter/qa/editor/LocalMediaActivity.kt
index 991ab8d344..eb16d71e39 100644
--- a/app/src/main/java/com/gh/gamecenter/qa/editor/LocalMediaActivity.kt
+++ b/app/src/main/java/com/gh/gamecenter/qa/editor/LocalMediaActivity.kt
@@ -119,7 +119,7 @@ class LocalMediaActivity : ToolBarActivity(), AlbumCollection.AlbumCallbacks {
 
     override fun onNightModeChange() {
         super.onNightModeChange()
-        updateStatusBarColor(R.color.text_292929, R.color.white)
+        updateStatusBarColor(R.color.background_white, R.color.background_white)
     }
 
     companion object {
diff --git a/app/src/main/java/com/gh/gamecenter/qa/myqa/MyAskActivity.java b/app/src/main/java/com/gh/gamecenter/qa/myqa/MyAskActivity.java
index d6180c0cdf..3d6edab778 100644
--- a/app/src/main/java/com/gh/gamecenter/qa/myqa/MyAskActivity.java
+++ b/app/src/main/java/com/gh/gamecenter/qa/myqa/MyAskActivity.java
@@ -17,7 +17,7 @@ public class MyAskActivity extends ToolBarActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        ExtensionsKt.updateStatusBarColor(this, R.color.text_292929, R.color.white);
+        ExtensionsKt.updateStatusBarColor(this, R.color.background_white, R.color.background_white);
     }
 
     @Override
@@ -28,7 +28,7 @@ public class MyAskActivity extends ToolBarActivity {
     @Override
     protected void onNightModeChange() {
         super.onNightModeChange();
-        ExtensionsKt.updateStatusBarColor(this, R.color.text_292929, R.color.white);
+        ExtensionsKt.updateStatusBarColor(this, R.color.background_white, R.color.background_white);
     }
 
     public static Intent getIntent(Context context) {
diff --git a/app/src/main/java/com/gh/gamecenter/qa/questions/draft/QuestionDraftActivity.kt b/app/src/main/java/com/gh/gamecenter/qa/questions/draft/QuestionDraftActivity.kt
index ab218c4281..ab409c59e9 100644
--- a/app/src/main/java/com/gh/gamecenter/qa/questions/draft/QuestionDraftActivity.kt
+++ b/app/src/main/java/com/gh/gamecenter/qa/questions/draft/QuestionDraftActivity.kt
@@ -11,14 +11,14 @@ class QuestionDraftActivity : ToolBarActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        updateStatusBarColor(R.color.text_292929, R.color.white)
+        updateStatusBarColor(R.color.background_white, R.color.background_white)
     }
 
     override fun isAutoResetViewBackgroundEnabled(): Boolean = true
 
     override fun onNightModeChange() {
         super.onNightModeChange()
-        updateStatusBarColor(R.color.text_292929, R.color.white)
+        updateStatusBarColor(R.color.background_white, R.color.background_white)
     }
 
     companion object {
diff --git a/app/src/main/java/com/gh/gamecenter/qa/questions/invite/QuestionsInviteActivity.java b/app/src/main/java/com/gh/gamecenter/qa/questions/invite/QuestionsInviteActivity.java
index 8ece9290fa..50dedf9d3c 100644
--- a/app/src/main/java/com/gh/gamecenter/qa/questions/invite/QuestionsInviteActivity.java
+++ b/app/src/main/java/com/gh/gamecenter/qa/questions/invite/QuestionsInviteActivity.java
@@ -24,7 +24,7 @@ public class QuestionsInviteActivity extends ToolBarActivity {
     @Override
     protected void onNightModeChange() {
         super.onNightModeChange();
-        ExtensionsKt.updateStatusBarColor(this, R.color.text_292929, R.color.white);
+        ExtensionsKt.updateStatusBarColor(this, R.color.background_white, R.color.background_white);
     }
 
     public static Intent getIntent(Context context, QuestionsDetailEntity entity, String entrance) {
diff --git a/app/src/main/java/com/gh/gamecenter/qa/questions/newdetail/NewQuestionDetailActivity.kt b/app/src/main/java/com/gh/gamecenter/qa/questions/newdetail/NewQuestionDetailActivity.kt
index c171c4790d..a4b2b961f9 100644
--- a/app/src/main/java/com/gh/gamecenter/qa/questions/newdetail/NewQuestionDetailActivity.kt
+++ b/app/src/main/java/com/gh/gamecenter/qa/questions/newdetail/NewQuestionDetailActivity.kt
@@ -39,7 +39,7 @@ class NewQuestionDetailActivity : ToolBarActivity() {
 
     override fun onNightModeChange() {
         super.onNightModeChange()
-        updateStatusBarColor(R.color.text_292929, R.color.white)
+        updateStatusBarColor(R.color.background_white, R.color.background_white)
     }
 
     companion object {
diff --git a/app/src/main/java/com/gh/gamecenter/qa/questions/newdetail/NewQuestionDetailFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/questions/newdetail/NewQuestionDetailFragment.kt
index 0e1a795eeb..1bb5773235 100644
--- a/app/src/main/java/com/gh/gamecenter/qa/questions/newdetail/NewQuestionDetailFragment.kt
+++ b/app/src/main/java/com/gh/gamecenter/qa/questions/newdetail/NewQuestionDetailFragment.kt
@@ -163,7 +163,7 @@ class NewQuestionDetailFragment :
                 insets.systemWindowInsetTop
             insets.consumeSystemWindowInsets()
         }
-        mBinding.root.setBackgroundColor(Color.WHITE)
+        mBinding.root.setBackgroundColor(R.color.background_white.toColor(requireContext()))
         mSkeletonScreen = Skeleton.bind(skeletonView)
             .shimmer(true)
             .angle(Constants.SHIMMER_ANGLE)
@@ -176,7 +176,7 @@ class NewQuestionDetailFragment :
 
         val bbsType = if (mViewModel.questionDetail?.type == "game_bbs") "游戏论坛" else "综合论坛"
         mBinding.inputContainer.replyTv.text = "说点什么吧"
-        mBinding.inputContainer.replyTv.setRoundedColorBackground(R.color.background, 19F)
+        mBinding.inputContainer.replyTv.setRoundedColorBackground(R.color.background_space_2, 19F)
         mBinding.inputContainer.replyTv.setDebouncedClickListener {
             clickToastByStatus(mViewModel.questionDetail?.status ?: "") {
                 startCommentActivity()
diff --git a/app/src/main/java/com/gh/gamecenter/qa/video/publish/VideoPublishActivity.kt b/app/src/main/java/com/gh/gamecenter/qa/video/publish/VideoPublishActivity.kt
index e3e3bfdc6a..f5f7df308f 100644
--- a/app/src/main/java/com/gh/gamecenter/qa/video/publish/VideoPublishActivity.kt
+++ b/app/src/main/java/com/gh/gamecenter/qa/video/publish/VideoPublishActivity.kt
@@ -24,7 +24,7 @@ class VideoPublishActivity : ToolBarActivity() {
 
     override fun onNightModeChange() {
         super.onNightModeChange()
-        updateStatusBarColor(R.color.text_292929, R.color.white)
+        updateStatusBarColor(R.color.background_white, R.color.background_white)
     }
 
     companion object {
diff --git a/app/src/main/java/com/gh/gamecenter/security/BindPhoneActivity.kt b/app/src/main/java/com/gh/gamecenter/security/BindPhoneActivity.kt
index 2ac79ae8c3..3472ddd864 100644
--- a/app/src/main/java/com/gh/gamecenter/security/BindPhoneActivity.kt
+++ b/app/src/main/java/com/gh/gamecenter/security/BindPhoneActivity.kt
@@ -15,14 +15,14 @@ class BindPhoneActivity : ToolBarActivity() {
         super.onCreate(savedInstanceState)
         hideToolbar(intent.extras?.getBundle(NORMAL_FRAGMENT_BUNDLE)?.getBoolean(EntranceConsts.KEY_FROM_LOGIN) == true)
 
-        updateStatusBarColor(R.color.text_292929, R.color.white)
+        updateStatusBarColor(R.color.background_white, R.color.background_white)
     }
 
     override fun isAutoResetViewBackgroundEnabled() = true
 
     override fun onNightModeChange() {
         super.onNightModeChange()
-        updateStatusBarColor(R.color.text_292929, R.color.white)
+        updateStatusBarColor(R.color.background_white, R.color.background_white)
     }
 
     companion object {
diff --git a/app/src/main/java/com/gh/gamecenter/security/SecurityActivity.kt b/app/src/main/java/com/gh/gamecenter/security/SecurityActivity.kt
index 96eec2edd5..0be29fe608 100644
--- a/app/src/main/java/com/gh/gamecenter/security/SecurityActivity.kt
+++ b/app/src/main/java/com/gh/gamecenter/security/SecurityActivity.kt
@@ -13,14 +13,14 @@ class SecurityActivity : ToolBarActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setNavigationTitle(R.string.setting_security)
-        updateStatusBarColor(R.color.text_292929, R.color.white)
+        updateStatusBarColor(R.color.background_white, R.color.background_white)
     }
 
     override fun isAutoResetViewBackgroundEnabled() = true
 
     override fun onNightModeChange() {
         super.onNightModeChange()
-        updateStatusBarColor(R.color.text_292929, R.color.white)
+        updateStatusBarColor(R.color.background_white, R.color.background_white)
     }
 
     companion object {
diff --git a/app/src/main/java/com/gh/gamecenter/servers/GameServerTestActivity.kt b/app/src/main/java/com/gh/gamecenter/servers/GameServerTestActivity.kt
index e1a558c5c9..c901674760 100644
--- a/app/src/main/java/com/gh/gamecenter/servers/GameServerTestActivity.kt
+++ b/app/src/main/java/com/gh/gamecenter/servers/GameServerTestActivity.kt
@@ -13,7 +13,7 @@ class GameServerTestActivity : DownloadToolbarActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setToolbarMenu(R.menu.menu_download)
-        updateStatusBarColor(R.color.text_292929, R.color.white)
+        updateStatusBarColor(R.color.background_white, R.color.background_white)
     }
 
     override fun showDownloadMenu() = true
@@ -24,7 +24,7 @@ class GameServerTestActivity : DownloadToolbarActivity() {
 
     override fun onNightModeChange() {
         super.onNightModeChange()
-        updateStatusBarColor(R.color.text_292929, R.color.white)
+        updateStatusBarColor(R.color.background_white, R.color.background_white)
     }
 
     companion object {
diff --git a/app/src/main/java/com/gh/gamecenter/servers/GameServersActivity.kt b/app/src/main/java/com/gh/gamecenter/servers/GameServersActivity.kt
index 398c35c456..558bbc75be 100644
--- a/app/src/main/java/com/gh/gamecenter/servers/GameServersActivity.kt
+++ b/app/src/main/java/com/gh/gamecenter/servers/GameServersActivity.kt
@@ -47,7 +47,7 @@ class GameServersActivity : DownloadToolbarActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
-        updateStatusBarColor(R.color.text_292929, R.color.white)
+        updateStatusBarColor(R.color.background_white, R.color.background_white)
         mServersTest = findViewById(R.id.server_test)
         mServersPublish = findViewById(R.id.server_publish)
         mViewpager = findViewById(R.id.viewpager)
@@ -154,7 +154,7 @@ class GameServersActivity : DownloadToolbarActivity() {
 
     override fun onNightModeChange() {
         super.onNightModeChange()
-        updateStatusBarColor(R.color.text_292929, R.color.white)
+        updateStatusBarColor(R.color.background_white, R.color.background_white)
         mServersTest?.setTextColor(DrawableView.getSelectorColorStyle(R.color.text_black, R.color.theme_font, this))
         mServersPublish?.setTextColor(DrawableView.getSelectorColorStyle(R.color.text_black, R.color.theme_font, this))
     }
diff --git a/app/src/main/java/com/gh/gamecenter/servers/add/AddKaiFuActivity.kt b/app/src/main/java/com/gh/gamecenter/servers/add/AddKaiFuActivity.kt
index 98fbf87e7a..43511f53db 100644
--- a/app/src/main/java/com/gh/gamecenter/servers/add/AddKaiFuActivity.kt
+++ b/app/src/main/java/com/gh/gamecenter/servers/add/AddKaiFuActivity.kt
@@ -52,7 +52,7 @@ class AddKaiFuActivity : ToolBarActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        updateStatusBarColor(R.color.text_292929, R.color.white)
+        updateStatusBarColor(R.color.background_white, R.color.background_white)
         setNavigationTitle("新增开服")
         mSelectTime = intent.getLongExtra(EntranceConsts.KEY_KAIFU_SELECT_TIME, 0)
 
@@ -202,7 +202,7 @@ class AddKaiFuActivity : ToolBarActivity() {
 
     override fun onNightModeChange() {
         super.onNightModeChange()
-        updateStatusBarColor(R.color.text_292929, R.color.white)
+        updateStatusBarColor(R.color.background_white, R.color.background_white)
         mBinding?.run {
             root.setBackgroundColor(R.color.background.toColor(this@AddKaiFuActivity))
             container.setBackgroundColor(R.color.background_white.toColor(this@AddKaiFuActivity))
diff --git a/app/src/main/java/com/gh/gamecenter/servers/patch/PatchKaifuActivity.kt b/app/src/main/java/com/gh/gamecenter/servers/patch/PatchKaifuActivity.kt
index e2f22b39c0..a82998e02c 100644
--- a/app/src/main/java/com/gh/gamecenter/servers/patch/PatchKaifuActivity.kt
+++ b/app/src/main/java/com/gh/gamecenter/servers/patch/PatchKaifuActivity.kt
@@ -29,7 +29,7 @@ class PatchKaifuActivity : ToolBarActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        updateStatusBarColor(R.color.text_292929, R.color.white)
+        updateStatusBarColor(R.color.background_white, R.color.background_white)
         setNavigationTitle("修改开服")
 
         mViewModel = ViewModelProviders.of(this).get(PatchKaifuViewModel::class.java)
@@ -106,7 +106,7 @@ class PatchKaifuActivity : ToolBarActivity() {
 
     override fun onNightModeChange() {
         super.onNightModeChange()
-        updateStatusBarColor(R.color.text_292929, R.color.white)
+        updateStatusBarColor(R.color.background_white, R.color.background_white)
         mBinding?.run {
             root.setBackgroundColor(R.color.background.toColor(this@PatchKaifuActivity))
             kaifuAddItemTitle.root.setBackgroundColor(R.color.title.toColor(this@PatchKaifuActivity))
diff --git a/app/src/main/java/com/gh/gamecenter/setting/GameDownloadSettingActivity.kt b/app/src/main/java/com/gh/gamecenter/setting/GameDownloadSettingActivity.kt
index c523531e11..2e5ae3066b 100644
--- a/app/src/main/java/com/gh/gamecenter/setting/GameDownloadSettingActivity.kt
+++ b/app/src/main/java/com/gh/gamecenter/setting/GameDownloadSettingActivity.kt
@@ -23,13 +23,13 @@ class GameDownloadSettingActivity : ToolBarActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setNavigationTitle(R.string.setting_game_download)
-        updateStatusBarColor(R.color.text_292929, R.color.white)
+        updateStatusBarColor(R.color.background_white, R.color.background_white)
     }
 
     override fun isAutoResetViewBackgroundEnabled() = true
 
     override fun onNightModeChange() {
         super.onNightModeChange()
-        updateStatusBarColor(R.color.text_292929, R.color.white)
+        updateStatusBarColor(R.color.background_white, R.color.background_white)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/gh/gamecenter/setting/VideoSettingActivity.kt b/app/src/main/java/com/gh/gamecenter/setting/VideoSettingActivity.kt
index dcfed7c348..42406841a2 100644
--- a/app/src/main/java/com/gh/gamecenter/setting/VideoSettingActivity.kt
+++ b/app/src/main/java/com/gh/gamecenter/setting/VideoSettingActivity.kt
@@ -23,13 +23,13 @@ class VideoSettingActivity : ToolBarActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setNavigationTitle(R.string.setting_video)
-        updateStatusBarColor(R.color.text_292929, R.color.white)
+        updateStatusBarColor(R.color.background_white, R.color.background_white)
     }
 
     override fun isAutoResetViewBackgroundEnabled() = true
 
     override fun onNightModeChange() {
         super.onNightModeChange()
-        updateStatusBarColor(R.color.text_292929, R.color.white)
+        updateStatusBarColor(R.color.background_white, R.color.background_white)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/gh/gamecenter/simulatorgame/SimulatorGameActivity.kt b/app/src/main/java/com/gh/gamecenter/simulatorgame/SimulatorGameActivity.kt
index 1bf7891290..951c3da60f 100644
--- a/app/src/main/java/com/gh/gamecenter/simulatorgame/SimulatorGameActivity.kt
+++ b/app/src/main/java/com/gh/gamecenter/simulatorgame/SimulatorGameActivity.kt
@@ -12,14 +12,14 @@ class SimulatorGameActivity : ToolBarActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setNavigationTitle("模拟器游戏")
-        updateStatusBarColor(R.color.text_292929, R.color.white)
+        updateStatusBarColor(R.color.background_white, R.color.background_white)
     }
 
     override fun isAutoResetViewBackgroundEnabled() = true
 
     override fun onNightModeChange() {
         super.onNightModeChange()
-        updateStatusBarColor(R.color.text_292929, R.color.white)
+        updateStatusBarColor(R.color.background_white, R.color.background_white)
     }
 
     companion object {
diff --git a/app/src/main/java/com/gh/gamecenter/simulatorgame/SimulatorManagementActivity.kt b/app/src/main/java/com/gh/gamecenter/simulatorgame/SimulatorManagementActivity.kt
index ed687165f5..3610c18b23 100644
--- a/app/src/main/java/com/gh/gamecenter/simulatorgame/SimulatorManagementActivity.kt
+++ b/app/src/main/java/com/gh/gamecenter/simulatorgame/SimulatorManagementActivity.kt
@@ -12,14 +12,14 @@ class SimulatorManagementActivity : ToolBarActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setNavigationTitle("模拟器管理")
-        updateStatusBarColor(R.color.text_292929, R.color.white)
+        updateStatusBarColor(R.color.background_white, R.color.background_white)
     }
 
     override fun isAutoResetViewBackgroundEnabled() = true
 
     override fun onNightModeChange() {
         super.onNightModeChange()
-        updateStatusBarColor(R.color.text_292929, R.color.white)
+        updateStatusBarColor(R.color.background_white, R.color.background_white)
     }
 
     companion object {
diff --git a/app/src/main/java/com/gh/gamecenter/subject/SubjectActivity.kt b/app/src/main/java/com/gh/gamecenter/subject/SubjectActivity.kt
index 9364886ac1..6dc193ea99 100644
--- a/app/src/main/java/com/gh/gamecenter/subject/SubjectActivity.kt
+++ b/app/src/main/java/com/gh/gamecenter/subject/SubjectActivity.kt
@@ -20,7 +20,7 @@ class SubjectActivity : DownloadToolbarActivity() {
         super.onCreate(savedInstanceState)
 
         val factory = SubjectViewModel.Factory(HaloApp.getInstance().application, intent.getParcelableExtra(EntranceConsts.KEY_SUBJECT_DATA))
-        updateStatusBarColor(R.color.text_292929, R.color.white)
+        updateStatusBarColor(R.color.background_white, R.color.background_white)
         mViewModel = ViewModelProviders.of(this, factory).get(SubjectViewModel::class.java)
     }
 
@@ -39,7 +39,7 @@ class SubjectActivity : DownloadToolbarActivity() {
     override fun onNightModeChange() {
         super.onNightModeChange()
 
-        updateStatusBarColor(R.color.text_292929, R.color.white)
+        updateStatusBarColor(R.color.background_white, R.color.background_white)
     }
 
     companion object {
diff --git a/app/src/main/java/com/gh/gamecenter/tag/TagsActivity.kt b/app/src/main/java/com/gh/gamecenter/tag/TagsActivity.kt
index e4d68906e6..f9307065d3 100644
--- a/app/src/main/java/com/gh/gamecenter/tag/TagsActivity.kt
+++ b/app/src/main/java/com/gh/gamecenter/tag/TagsActivity.kt
@@ -39,7 +39,7 @@ class TagsActivity : DownloadToolbarActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setToolbarMenu(R.menu.menu_download)
-        updateStatusBarColor(R.color.text_292929, R.color.white)
+        updateStatusBarColor(R.color.background_white, R.color.background_white)
     }
 
     override fun showDownloadMenu(): Boolean {
@@ -52,7 +52,7 @@ class TagsActivity : DownloadToolbarActivity() {
 
     override fun onNightModeChange() {
         super.onNightModeChange()
-        updateStatusBarColor(R.color.text_292929, R.color.white)
+        updateStatusBarColor(R.color.background_white, R.color.background_white)
     }
 
     enum class From(val value: String) {
diff --git a/app/src/main/java/com/gh/gamecenter/teenagermode/TeenagerModeActivity.kt b/app/src/main/java/com/gh/gamecenter/teenagermode/TeenagerModeActivity.kt
index a24cb1240e..c145469c4b 100644
--- a/app/src/main/java/com/gh/gamecenter/teenagermode/TeenagerModeActivity.kt
+++ b/app/src/main/java/com/gh/gamecenter/teenagermode/TeenagerModeActivity.kt
@@ -16,7 +16,7 @@ class TeenagerModeActivity : BaseActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        updateStatusBarColor(R.color.text_292929, R.color.white)
+        updateStatusBarColor(R.color.background_white, R.color.background_white)
         mContainerFragment = supportFragmentManager.findFragmentByTag(TeenagerModeFragment::class.java.simpleName)
             ?: TeenagerModeFragment().with(intent.extras)
         if (mContainerFragment?.isAdded == false) {
@@ -28,7 +28,7 @@ class TeenagerModeActivity : BaseActivity() {
 
     override fun onNightModeChange() {
         super.onNightModeChange()
-        updateStatusBarColor(R.color.text_292929, R.color.white)
+        updateStatusBarColor(R.color.background_white, R.color.background_white)
     }
 
     companion object {
diff --git a/app/src/main/java/com/gh/gamecenter/toolbox/ToolBoxBlockActivity.kt b/app/src/main/java/com/gh/gamecenter/toolbox/ToolBoxBlockActivity.kt
index f84ca17fea..42d44b27bb 100644
--- a/app/src/main/java/com/gh/gamecenter/toolbox/ToolBoxBlockActivity.kt
+++ b/app/src/main/java/com/gh/gamecenter/toolbox/ToolBoxBlockActivity.kt
@@ -50,7 +50,7 @@ class ToolBoxBlockActivity : ToolBarActivity() {
         mSearchAdapter = ToolBoxItemAdapter(this, false, mViewModel)
         mLayoutManager = LinearLayoutManager(this@ToolBoxBlockActivity)
         setNavigationTitle("光环工具箱")
-        updateStatusBarColor(R.color.text_292929, R.color.white)
+        updateStatusBarColor(R.color.background_white, R.color.background_white)
 
         // 跳转到工具箱 https://gitlab.ghzs.com/pm/halo-app-issues/issues/636
         val gameId = intent.getStringExtra(EntranceConsts.KEY_GAMEID)
@@ -261,29 +261,15 @@ class ToolBoxBlockActivity : ToolBarActivity() {
         }
     }
 
+    override fun isAutoResetViewBackgroundEnabled(): Boolean = true
+
     override fun onNightModeChange() {
         super.onNightModeChange()
-        updateStatusBarColor(R.color.text_292929, R.color.white)
+        updateStatusBarColor(R.color.background_white, R.color.background_white)
         if (::mBinding.isInitialized) {
             mBinding.run {
                 toolboxRv.adapter?.run { notifyItemRangeChanged(0, itemCount) }
-                root.setBackgroundColor(R.color.background.toColor(this@ToolBoxBlockActivity))
-                toolboxAppbar.setBackgroundColor(R.color.background.toColor(this@ToolBoxBlockActivity))
-                toolboxRv.setBackgroundColor(R.color.background_white.toColor(this@ToolBoxBlockActivity))
                 feedbackCv.setCardBackgroundColor(R.color.background_white.toColor(this@ToolBoxBlockActivity))
-                feedbackTv.setTextColor(R.color.text_subtitleDesc.toColor(this@ToolBoxBlockActivity))
-                reuseSearchBar.run {
-                    root.setBackgroundColor(R.color.background_white.toColor(this@ToolBoxBlockActivity))
-                    searchBackground.background = R.drawable.actionbar_search_bg.toDrawable(this@ToolBoxBlockActivity)
-                    tvSearch.setTextColor(R.color.theme_font.toColor(this@ToolBoxBlockActivity))
-                    etSearch.setTextColor(R.color.text_title.toColor(this@ToolBoxBlockActivity))
-                    etSearch.setHintTextColor(R.color.text_body.toColor(this@ToolBoxBlockActivity))
-                    searchIv.setImageDrawable(R.drawable.toolbar_search_icon.toDrawable(this@ToolBoxBlockActivity))
-                    tvBack.setImageDrawable(R.drawable.ic_search_bar_clear.toDrawable(this@ToolBoxBlockActivity))
-                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-                        etSearch.textCursorDrawable = R.drawable.cursor_color.toDrawable(this@ToolBoxBlockActivity)
-                    }
-                }
             }
         }
     }
diff --git a/app/src/main/java/com/gh/gamecenter/toolbox/ToolBoxItemAdapter.kt b/app/src/main/java/com/gh/gamecenter/toolbox/ToolBoxItemAdapter.kt
index b7603ab6c7..e87ba903be 100644
--- a/app/src/main/java/com/gh/gamecenter/toolbox/ToolBoxItemAdapter.kt
+++ b/app/src/main/java/com/gh/gamecenter/toolbox/ToolBoxItemAdapter.kt
@@ -83,7 +83,7 @@ class ToolBoxItemAdapter(context: Context, private val isBlockInside: Boolean =
 
     private fun initToolBoxViewHolder(viewHolder: ToolBoxViewHolder, toolBoxEntity: ToolBoxEntity) {
         viewHolder.binding.run {
-            divider.setBackgroundColor(R.color.F2F2F2.toColor(mContext))
+            divider.setBackgroundColor(R.color.divider.toColor(mContext))
             toolboxItemTitle.setTextColor(R.color.text_title.toColor(mContext))
             toolboxItemDes.setTextColor(R.color.text_subtitleDesc.toColor(mContext))
         }
diff --git a/app/src/main/java/com/gh/gamecenter/video/videomanager/VideoDraftActivity.kt b/app/src/main/java/com/gh/gamecenter/video/videomanager/VideoDraftActivity.kt
index c3e1b170ab..97f2922635 100644
--- a/app/src/main/java/com/gh/gamecenter/video/videomanager/VideoDraftActivity.kt
+++ b/app/src/main/java/com/gh/gamecenter/video/videomanager/VideoDraftActivity.kt
@@ -12,14 +12,14 @@ class VideoDraftActivity : ToolBarActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setNavigationTitle("视频草稿")
-        updateStatusBarColor(R.color.text_292929, R.color.white)
+        updateStatusBarColor(R.color.background_white, R.color.background_white)
     }
 
     override fun isAutoResetViewBackgroundEnabled(): Boolean =true
 
     override fun onNightModeChange() {
         super.onNightModeChange()
-        updateStatusBarColor(R.color.text_292929, R.color.white)
+        updateStatusBarColor(R.color.background_white, R.color.background_white)
     }
     companion object {
         fun getIntent(context: Context): Intent {
diff --git a/app/src/main/java/com/gh/gamecenter/vote/VoteFragment.kt b/app/src/main/java/com/gh/gamecenter/vote/VoteFragment.kt
index 512f4a5d67..a4db73b2ce 100644
--- a/app/src/main/java/com/gh/gamecenter/vote/VoteFragment.kt
+++ b/app/src/main/java/com/gh/gamecenter/vote/VoteFragment.kt
@@ -355,20 +355,4 @@ class VoteFragment: ListFragment<VersionVoteEntity, VoteViewModel>() {
             false
         }
     }
-
-    override fun onNightModeChange() {
-        super.onNightModeChange()
-        mBinding.searchBarInclude.run {
-            root.setBackgroundColor(R.color.background_white.toColor(requireContext()))
-            searchBackground.background = R.drawable.actionbar_search_bg.toDrawable(requireContext())
-            tvSearch.setTextColor(R.color.theme_font.toColor(requireContext()))
-            etSearch.setTextColor(R.color.text_title.toColor(requireContext()))
-            etSearch.setHintTextColor(R.color.text_body.toColor(requireContext()))
-            searchIv.setImageDrawable(R.drawable.toolbar_search_icon.toDrawable(requireContext()))
-            tvBack.setImageDrawable(R.drawable.ic_search_bar_clear.toDrawable(requireContext()))
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-                etSearch.textCursorDrawable = R.drawable.cursor_color.toDrawable(requireContext())
-            }
-        }
-    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/halo/assistant/fragment/SwitchInstallMethodFragment.kt b/app/src/main/java/com/halo/assistant/fragment/SwitchInstallMethodFragment.kt
index 4be91395d1..738d0f96e0 100644
--- a/app/src/main/java/com/halo/assistant/fragment/SwitchInstallMethodFragment.kt
+++ b/app/src/main/java/com/halo/assistant/fragment/SwitchInstallMethodFragment.kt
@@ -14,6 +14,8 @@ import com.gh.gamecenter.R
 import com.gh.gamecenter.WebActivity
 import com.gh.gamecenter.databinding.FragmentSwitchInstallMethodBinding
 import com.gh.gamecenter.common.base.fragment.ToolbarFragment
+import com.gh.gamecenter.common.utils.toColor
+import com.gh.gamecenter.common.utils.updateStatusBarColor
 import java.util.*
 
 /**
@@ -29,6 +31,7 @@ class SwitchInstallMethodFragment : ToolbarFragment() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
+        requireActivity().updateStatusBarColor(R.color.background_white, R.color.background_white)
 
         initView()
         changeSwitch(SPUtils.getBoolean(Constants.SP_USE_BROWSER_TO_INSTALL))
@@ -115,4 +118,13 @@ class SwitchInstallMethodFragment : ToolbarFragment() {
         }
     }
 
+    override fun onNightModeChange() {
+        super.onNightModeChange()
+        requireActivity().updateStatusBarColor(R.color.background_white, R.color.background_white)
+        mBinding?.toolbar?.run {
+            normalToolbar.setBackgroundColor(R.color.background_white.toColor(requireContext()))
+            backBtn.setImageResource(R.drawable.ic_bar_back)
+            normalTitle.setTextColor(R.color.text_title.toColor(requireContext()))
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/res/drawable-xxhdpi/community_edit_article.webp b/app/src/main/res/drawable-xxhdpi/community_edit_article.webp
deleted file mode 100644
index 5fb8624587..0000000000
Binary files a/app/src/main/res/drawable-xxhdpi/community_edit_article.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/community_edit_question.webp b/app/src/main/res/drawable-xxhdpi/community_edit_question.webp
deleted file mode 100644
index c093c8cfa8..0000000000
Binary files a/app/src/main/res/drawable-xxhdpi/community_edit_question.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/community_edit_video.webp b/app/src/main/res/drawable-xxhdpi/community_edit_video.webp
deleted file mode 100644
index 2a7459bff8..0000000000
Binary files a/app/src/main/res/drawable-xxhdpi/community_edit_video.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/community_edit_article.webp b/app/src/main/res/drawable-xxxhdpi/community_edit_article.webp
new file mode 100644
index 0000000000..3932de2d97
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/community_edit_article.webp differ
diff --git a/app/src/main/res/drawable-xxxhdpi/community_edit_question.webp b/app/src/main/res/drawable-xxxhdpi/community_edit_question.webp
new file mode 100644
index 0000000000..d3233ba9a8
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/community_edit_question.webp differ
diff --git a/app/src/main/res/drawable-xxxhdpi/community_edit_video.webp b/app/src/main/res/drawable-xxxhdpi/community_edit_video.webp
new file mode 100644
index 0000000000..a31545ee97
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/community_edit_video.webp differ
diff --git a/app/src/main/res/drawable/actionbar_search_bg.xml b/app/src/main/res/drawable/actionbar_search_bg.xml
index 8d70c7fe6d..963cd94d81 100644
--- a/app/src/main/res/drawable/actionbar_search_bg.xml
+++ b/app/src/main/res/drawable/actionbar_search_bg.xml
@@ -4,6 +4,6 @@
 
     <corners android:radius="5dp" />
 
-    <solid android:color="@color/btn_gray_light" />
+    <solid android:color="@color/background_space_2" />
 
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_shape_space2_radius_4.xml b/app/src/main/res/drawable/bg_shape_space2_radius_4.xml
new file mode 100644
index 0000000000..4d7009e867
--- /dev/null
+++ b/app/src/main/res/drawable/bg_shape_space2_radius_4.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners android:radius="4dp" />
+    <solid android:color="@color/background_space_2" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_shape_space2_radius_999.xml b/app/src/main/res/drawable/bg_shape_space2_radius_999.xml
new file mode 100644
index 0000000000..6d5ba0aaa9
--- /dev/null
+++ b/app/src/main/res/drawable/bg_shape_space2_radius_999.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners android:radius="999dp" />
+    <solid android:color="@color/background_space_2" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/download_dialog_background.xml b/app/src/main/res/drawable/download_dialog_background.xml
index 503ee0fcb5..434b7cee5e 100644
--- a/app/src/main/res/drawable/download_dialog_background.xml
+++ b/app/src/main/res/drawable/download_dialog_background.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/f8f8f8" />
+    <solid android:color="@color/background" />
 
     <corners
         android:topLeftRadius="12dp"
diff --git a/app/src/main/res/drawable/download_dialog_item_background.xml b/app/src/main/res/drawable/download_dialog_item_background.xml
index 3de1c30b1d..0a6f5baaf0 100644
--- a/app/src/main/res/drawable/download_dialog_item_background.xml
+++ b/app/src/main/res/drawable/download_dialog_item_background.xml
@@ -3,6 +3,6 @@
 
     <corners android:radius="8dp" />
 
-    <solid android:color="@color/white" />
+    <solid android:color="@color/background_white" />
 
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/home_amway_rating_unselect.xml b/app/src/main/res/drawable/home_amway_rating_unselect.xml
index 708ae6b901..f20e7234cf 100644
--- a/app/src/main/res/drawable/home_amway_rating_unselect.xml
+++ b/app/src/main/res/drawable/home_amway_rating_unselect.xml
@@ -2,7 +2,7 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
 
-    <solid android:color="@color/background" />
+    <solid android:color="@color/background_space" />
 
     <corners
         android:bottomLeftRadius="5dp"
diff --git a/app/src/main/res/drawable/home_amway_unselect.xml b/app/src/main/res/drawable/home_amway_unselect.xml
index f9fbb09373..7d66c27df2 100644
--- a/app/src/main/res/drawable/home_amway_unselect.xml
+++ b/app/src/main/res/drawable/home_amway_unselect.xml
@@ -2,7 +2,7 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
 
-    <solid android:color="@color/background" />
+    <solid android:color="@color/background_space" />
 
     <corners android:radius="5dp" />
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_suggest.xml b/app/src/main/res/layout/activity_suggest.xml
index 955b097e57..d2f9071368 100644
--- a/app/src/main/res/layout/activity_suggest.xml
+++ b/app/src/main/res/layout/activity_suggest.xml
@@ -4,6 +4,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="@color/background"
     android:orientation="vertical">
 
     <include layout = "@layout/reuse_toolbar" />
diff --git a/app/src/main/res/layout/activity_toolbox_block.xml b/app/src/main/res/layout/activity_toolbox_block.xml
index 22785e7e0e..5666d3581f 100644
--- a/app/src/main/res/layout/activity_toolbox_block.xml
+++ b/app/src/main/res/layout/activity_toolbox_block.xml
@@ -3,6 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="@color/background"
     android:orientation="vertical">
 
     <include layout="@layout/reuse_toolbar" />
diff --git a/app/src/main/res/layout/common_collection_item.xml b/app/src/main/res/layout/common_collection_item.xml
index 11838098b6..9846ba5df8 100644
--- a/app/src/main/res/layout/common_collection_item.xml
+++ b/app/src/main/res/layout/common_collection_item.xml
@@ -86,7 +86,7 @@
         android:layout_marginTop="8dp"
         android:ellipsize="end"
         android:maxLines="1"
-        android:textColor="@color/black"
+        android:textColor="@color/text_title"
         android:textSize="14sp"
         android:visibility="gone" />
 
diff --git a/app/src/main/res/layout/fm_search_history_item.xml b/app/src/main/res/layout/fm_search_history_item.xml
index 3d60cd91ea..949f4d2ca7 100644
--- a/app/src/main/res/layout/fm_search_history_item.xml
+++ b/app/src/main/res/layout/fm_search_history_item.xml
@@ -21,7 +21,7 @@
         android:gravity="center_vertical"
         android:padding="16dp"
         android:singleLine="true"
-        android:textColor="@color/bg_303030"
+        android:textColor="@color/text_title"
         android:textSize="14sp" />
 </LinearLayout>
 
diff --git a/app/src/main/res/layout/forum_activity_item.xml b/app/src/main/res/layout/forum_activity_item.xml
index b5652380a7..e72226b1c1 100644
--- a/app/src/main/res/layout/forum_activity_item.xml
+++ b/app/src/main/res/layout/forum_activity_item.xml
@@ -46,7 +46,7 @@
         android:layout_height="16dp"
         android:layout_marginTop="8dp"
         android:layout_marginLeft="16dp"
-        app:cardBackgroundColor="@color/bg_FFF3EB"
+        app:cardBackgroundColor="@color/bg_1AFA8850"
         app:contentPaddingRight="4dp"
         app:cardCornerRadius="3dp"
         app:cardElevation="0dp"
diff --git a/app/src/main/res/layout/fragment_login.xml b/app/src/main/res/layout/fragment_login.xml
index 2bae70aa61..61e84029cf 100644
--- a/app/src/main/res/layout/fragment_login.xml
+++ b/app/src/main/res/layout/fragment_login.xml
@@ -46,7 +46,7 @@
             android:paddingTop="10dp"
             android:paddingBottom="10dp"
             android:paddingRight="16dp"
-            android:textColor="@color/black"
+            android:textColor="@color/text_title"
             android:textColorHint="@color/text_body"
             android:textCursorDrawable="@drawable/cursor_color"
             android:textSize="14sp" />
@@ -73,7 +73,7 @@
             android:maxLength="8"
             android:paddingTop="10dp"
             android:paddingBottom="10dp"
-            android:textColor="@color/black"
+            android:textColor="@color/text_title"
             android:textColorHint="@color/text_body"
             android:textCursorDrawable="@drawable/cursor_color"
             android:textSize="14sp" />
@@ -111,7 +111,7 @@
             android:hint="@string/input_invite_code_hint"
             android:paddingTop="10dp"
             android:paddingBottom="10dp"
-            android:textColor="@color/black"
+            android:textColor="@color/text_title"
             android:textColorHint="@color/text_body"
             android:textCursorDrawable="@drawable/cursor_color"
             android:textSize="14sp" />
diff --git a/app/src/main/res/layout/fragment_switch_install_method.xml b/app/src/main/res/layout/fragment_switch_install_method.xml
index 16abbe2bc3..25938e7fe9 100644
--- a/app/src/main/res/layout/fragment_switch_install_method.xml
+++ b/app/src/main/res/layout/fragment_switch_install_method.xml
@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/bg_F7F7F7">
+    android:background="@color/background">
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/imprint_content_item.xml b/app/src/main/res/layout/imprint_content_item.xml
index 788e84df12..00e2adf9f0 100644
--- a/app/src/main/res/layout/imprint_content_item.xml
+++ b/app/src/main/res/layout/imprint_content_item.xml
@@ -14,7 +14,7 @@
         android:layout_height="match_parent"
         android:layout_marginRight="1dp"
         android:layout_weight="4"
-        android:background="@color/white"
+        android:background="@color/background_white"
         android:gravity="center"
         android:maxLines="2"
         android:textColor="@color/text_5d5d5d"
@@ -26,7 +26,7 @@
         android:layout_height="match_parent"
         android:layout_marginRight="1dp"
         android:layout_weight="4"
-        android:background="@color/white"
+        android:background="@color/background_white"
         android:gravity="center"
         android:maxLines="2"
         android:textColor="@color/text_5d5d5d"
@@ -37,7 +37,7 @@
         android:layout_width="0dp"
         android:layout_height="match_parent"
         android:layout_weight="5"
-        android:background="@color/white"
+        android:background="@color/background_white"
         android:gravity="center"
         android:maxLines="2"
         android:textColor="@color/text_5d5d5d"
diff --git a/app/src/main/res/layout/item_toolbox.xml b/app/src/main/res/layout/item_toolbox.xml
index b89ef574f0..44d40f93e7 100644
--- a/app/src/main/res/layout/item_toolbox.xml
+++ b/app/src/main/res/layout/item_toolbox.xml
@@ -63,6 +63,6 @@
         android:layout_height="1dp"
         android:layout_marginStart="78dp"
         android:layout_marginEnd="16dp"
-        android:background="@color/F2F2F2"
+        android:background="@color/divider"
         android:visibility="gone" />
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/layout_search_game_content_tag.xml b/app/src/main/res/layout/layout_search_game_content_tag.xml
index f62cc69e74..a532c8bf9b 100644
--- a/app/src/main/res/layout/layout_search_game_content_tag.xml
+++ b/app/src/main/res/layout/layout_search_game_content_tag.xml
@@ -5,7 +5,7 @@
     android:layout_width="76dp"
     android:layout_height="28dp"
     android:gravity="center"
-    android:background="@drawable/bg_shape_f5_radius_4">
+    android:background="@drawable/bg_shape_space2_radius_4">
 
     <com.facebook.drawee.view.SimpleDraweeView
         android:id="@+id/tagIv"
diff --git a/app/src/main/res/layout/message_item.xml b/app/src/main/res/layout/message_item.xml
index dd8a723c59..732d25964b 100644
--- a/app/src/main/res/layout/message_item.xml
+++ b/app/src/main/res/layout/message_item.xml
@@ -108,7 +108,7 @@
         android:layout_width="0dp"
         android:layout_height="52dp"
         android:layout_marginTop="10dp"
-        android:background="@drawable/bg_shape_f8_radius_8"
+        android:background="@drawable/bg_shape_space_radius_8"
         app:layout_constraintLeft_toLeftOf="@id/message_user_name"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toBottomOf="@id/message_content">
diff --git a/app/src/main/res/layout/piece_article_input_container.xml b/app/src/main/res/layout/piece_article_input_container.xml
index f515f2a7f8..a5158f521d 100644
--- a/app/src/main/res/layout/piece_article_input_container.xml
+++ b/app/src/main/res/layout/piece_article_input_container.xml
@@ -17,7 +17,7 @@
         android:layout_height="32dp"
         android:layout_marginLeft="16dp"
         android:layout_marginRight="28dp"
-        android:background="@drawable/bg_shape_f5_radius_999"
+        android:background="@drawable/bg_shape_space2_radius_999"
         android:gravity="center_vertical"
         android:includeFontPadding="false"
         android:maxLines="1"
diff --git a/app/src/main/res/layout/search_game_index_item.xml b/app/src/main/res/layout/search_game_index_item.xml
index 5778505776..d81781de5e 100644
--- a/app/src/main/res/layout/search_game_index_item.xml
+++ b/app/src/main/res/layout/search_game_index_item.xml
@@ -34,6 +34,6 @@
         android:layout_height="1dp"
         android:layout_marginLeft="16dp"
         android:layout_marginRight="16dp"
-        android:background="@color/background"
+        android:background="@color/divider"
         android:visibility="gone" />
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/user_history_item.xml b/app/src/main/res/layout/user_history_item.xml
index 9c8b8062b0..b250869275 100644
--- a/app/src/main/res/layout/user_history_item.xml
+++ b/app/src/main/res/layout/user_history_item.xml
@@ -164,7 +164,7 @@
             android:paddingLeft="12dp"
             android:paddingRight="12dp"
             android:paddingBottom="10dp"
-            android:background="@drawable/bg_shape_f8_radius_8"
+            android:background="@drawable/bg_shape_space_radius_8"
             android:ellipsize="end"
             android:includeFontPadding="false"
             android:lineSpacingExtra="6dp"
diff --git a/module_common/src/main/java/com/gh/gamecenter/common/base/CustomLayoutInflaterFactory.kt b/module_common/src/main/java/com/gh/gamecenter/common/base/CustomLayoutInflaterFactory.kt
index 6ef4461e3a..05751f14c5 100644
--- a/module_common/src/main/java/com/gh/gamecenter/common/base/CustomLayoutInflaterFactory.kt
+++ b/module_common/src/main/java/com/gh/gamecenter/common/base/CustomLayoutInflaterFactory.kt
@@ -33,7 +33,8 @@ class CustomLayoutInflaterFactory(
             val attributeName = attrs.getAttributeName(i).toString()
             when {
                 attributeName.contains("background") -> view?.setTag(TAG_BACKGROUND_ID, attrs.getAttributeValue(i))
-                attributeName.contains("textColor") -> view?.setTag(TAG_TEXT_COLOR_ID, attrs.getAttributeValue(i))
+                attributeName == "textColor" -> view?.setTag(TAG_TEXT_COLOR_ID, attrs.getAttributeValue(i))
+                attributeName == "textColorHint" -> view?.setTag(TAG_TEXT_COLOR_HINT_ID, attrs.getAttributeValue(i))
                 attributeName.contains("src") -> view?.setTag(TAG_SRC_ID, attrs.getAttributeValue(i))
                 attributeName.contains("drawableLeft") || attributeName.contains("drawableStart") -> view?.setTag(TAG_DRAWABLE_LEFT_ID, attrs.getAttributeValue(i))
                 attributeName.contains("drawableTop") -> view?.setTag(TAG_DRAWABLE_TOP_ID, attrs.getAttributeValue(i))
@@ -52,6 +53,7 @@ class CustomLayoutInflaterFactory(
     companion object {
         var TAG_BACKGROUND_ID = R.string.background_id
         var TAG_TEXT_COLOR_ID = R.string.text_color_id
+        var TAG_TEXT_COLOR_HINT_ID = R.string.text_color_hint_id
         var TAG_SRC_ID = R.string.src_id
         var TAG_DRAWABLE_LEFT_ID = R.string.drawable_left_id
         var TAG_DRAWABLE_TOP_ID = R.string.drawable_top_id
diff --git a/module_common/src/main/java/com/gh/gamecenter/common/base/activity/BaseActivity.java b/module_common/src/main/java/com/gh/gamecenter/common/base/activity/BaseActivity.java
index 6b77e51dd1..e94163dd4a 100644
--- a/module_common/src/main/java/com/gh/gamecenter/common/base/activity/BaseActivity.java
+++ b/module_common/src/main/java/com/gh/gamecenter/common/base/activity/BaseActivity.java
@@ -22,6 +22,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.view.Window;
 import android.view.WindowManager;
+import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
@@ -67,6 +68,7 @@ import com.lightgame.BaseAppCompatActivity;
 import com.lightgame.download.DownloadEntity;
 import com.lightgame.download.FileUtils;
 import com.lightgame.utils.Utils;
+import com.lightgame.view.CheckableImageView;
 import com.tencent.tauth.Tencent;
 
 import org.greenrobot.eventbus.EventBus;
@@ -570,6 +572,7 @@ public abstract class BaseActivity extends BaseAppCompatActivity implements Easy
 
         String backgroundString = (String) view.getTag(CustomLayoutInflaterFactory.Companion.getTAG_BACKGROUND_ID());
         String textColorString = (String) view.getTag(CustomLayoutInflaterFactory.Companion.getTAG_TEXT_COLOR_ID());
+        String textColorHintString = (String) view.getTag(CustomLayoutInflaterFactory.Companion.getTAG_TEXT_COLOR_HINT_ID());
         String srcString = (String) view.getTag(CustomLayoutInflaterFactory.Companion.getTAG_SRC_ID());
         String drawableLeftString = (String) view.getTag(CustomLayoutInflaterFactory.Companion.getTAG_DRAWABLE_LEFT_ID());
         String drawableTopString = (String) view.getTag(CustomLayoutInflaterFactory.Companion.getTAG_DRAWABLE_TOP_ID());
@@ -619,6 +622,24 @@ public abstract class BaseActivity extends BaseAppCompatActivity implements Easy
             }
         }
 
+        if (textColorHintString != null && view instanceof EditText) {
+            if (textColorHintString.startsWith("#")) return;
+            int textColorHintId = Integer.parseInt(
+                    textColorHintString
+                            .replace("@", "")
+                            .replace("?", "")
+            );
+
+            if (textColorHintId != 0) {
+                try {
+                    final ColorStateList colorStateList = ContextCompat.getColorStateList(context, textColorHintId);
+                    ((EditText) view).setHintTextColor(colorStateList);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+
         if (view instanceof ImageView && srcString != null) {
             if (srcString.startsWith("#")) return;
             int srcId = Integer.parseInt(
diff --git a/module_common/src/main/res/values-night/colors.xml b/module_common/src/main/res/values-night/colors.xml
index 07dc9b9fac..f259427c39 100644
--- a/module_common/src/main/res/values-night/colors.xml
+++ b/module_common/src/main/res/values-night/colors.xml
@@ -36,11 +36,12 @@
     <color name="text_aw_tertiary">#7AFFFFFF</color>
 
     <!-- 通用背景 -->
-    <color name="background">#121212</color>
+    <color name="background">#1A1A1A</color>
     <!-- 空间背景 -->
-    <color name="background_space">#08FFFFFF</color>
+    <color name="background_space">#2C2C2C</color>
+    <color name="background_space_2">#0AFFFFFF</color>
     <!-- 表面背景 -->
-    <color name="background_white">#292929</color>
+    <color name="background_white">#232323</color>
     <color name="background_alpha_0">#00121212</color>
     <!-- 分隔线 -->
     <color name="divider">#333333</color>
@@ -98,7 +99,7 @@
     <!-- 新游标签背景色 -->
     <color name="type_xinyou">#2EC991</color>
     <!-- 占位符背景 -->
-    <color name="placeholder_bg">#ECECEC</color>
+    <color name="placeholder_bg">@color/transparent</color>
     <!-- 图片点击效果 -->
     <color name="pressed_bg">#30000000</color>
     <!-- 快传扫描页面背景 -->
diff --git a/module_common/src/main/res/values/colors.xml b/module_common/src/main/res/values/colors.xml
index a4b140d4de..7568981473 100644
--- a/module_common/src/main/res/values/colors.xml
+++ b/module_common/src/main/res/values/colors.xml
@@ -40,6 +40,7 @@
     <color name="background">#F5F5F5</color>
     <!-- 空间背景 -->
     <color name="background_space">@color/bg_F8F8F8</color>
+    <color name="background_space_2">@color/background</color>
     <!-- 表面背景 -->
     <color name="background_white">#FFFFFF</color>
     <color name="background_alpha_0">#00F5F5F5</color>
@@ -99,7 +100,7 @@
     <!-- 新游标签背景色 -->
     <color name="type_xinyou">#2EC991</color>
     <!-- 占位符背景 -->
-    <color name="placeholder_bg">#ECECEC</color>
+    <color name="placeholder_bg">@color/transparent</color>
     <!-- 图片点击效果 -->
     <color name="pressed_bg">#30000000</color>
     <!-- 快传扫描页面背景 -->
@@ -324,7 +325,7 @@
     <color name="text_07B896">#07B896</color>
     <color name="text_279BFE">#279BFE</color>
     <color name="text_C4C4C4">#C4C4C4</color>
-    <color name="bg_FFF3EB">#FFF3EB</color>
+    <color name="bg_1AFA8850">#1AFA8850</color>
     <color name="bg_F5F6F7">#F5F6F7</color>
     <color name="bg_46DBAA">#46DBAA</color>
     <color name="text_FA8850">#FA8850</color>
diff --git a/module_common/src/main/res/values/strings.xml b/module_common/src/main/res/values/strings.xml
index 5c7244421b..3b293bb516 100644
--- a/module_common/src/main/res/values/strings.xml
+++ b/module_common/src/main/res/values/strings.xml
@@ -26,6 +26,7 @@
 
     <string name="background_id">background_id</string>
     <string name="text_color_id">text_color_id</string>
+    <string name="text_color_hint_id">text_color_hint_id</string>
     <string name="src_id">src_id</string>
     <string name="drawable_left_id">drawable_left_id</string>
     <string name="drawable_top_id">drawable_top_id</string>