diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index f83f59760d..8eeb157448 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -397,10 +397,6 @@
             </intent-filter >
         </activity >
 
-        <activity
-            android:name = ".CommonActivity"
-            android:screenOrientation = "portrait" />
-
         <provider
             android:name = "android.support.v4.content.FileProvider"
             android:authorities = "${applicationId}"
diff --git a/app/src/main/java/com/gh/gamecenter/CleanApkActivity.java b/app/src/main/java/com/gh/gamecenter/CleanApkActivity.java
index 1ba1f50857..338e9ed164 100644
--- a/app/src/main/java/com/gh/gamecenter/CleanApkActivity.java
+++ b/app/src/main/java/com/gh/gamecenter/CleanApkActivity.java
@@ -13,11 +13,6 @@ public class CleanApkActivity extends NormalActivity {
 
     @NonNull
     public static Intent getIntent(Context context) {
-//        Intent intent = new Intent(context, CleanApkActivity.class);
-//        return new IntentFactory.Builder(context)
-//                .setActivity(CleanApkActivity.class)
-//                .setFragment(ApkCleanerFragment.class).build();
-
         return getTargetIntent(context, CleanApkActivity.class, ApkCleanerFragment.class);
     }
 
diff --git a/app/src/main/java/com/gh/gamecenter/CommonActivity.java b/app/src/main/java/com/gh/gamecenter/CommonActivity.java
deleted file mode 100644
index 581b4b269d..0000000000
--- a/app/src/main/java/com/gh/gamecenter/CommonActivity.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.gh.gamecenter;
-
-import android.view.MenuItem;
-
-import com.gh.base.BaseToolBarActivity;
-import com.gh.gamecenter.normal.ToolbarController;
-
-public class CommonActivity extends BaseToolBarActivity implements ToolbarController {
-
-    @Override
-    protected int getLayoutId() {
-        return R.layout.layout_wrapper_activity_toolbar;
-    }
-
-    @Override
-    protected boolean onNavigationIconClicked() {
-        onBackPressed();
-        return true;
-    }
-
-    @Override
-    public void setNavigationTitle(int res) {
-
-    }
-
-    @Override
-    public void setToolbarMenu(int res) {
-
-    }
-
-
-    @Deprecated
-    @Override
-    public MenuItem getMenuItem(int res) {
-        return null;
-    }
-
-}
diff --git a/app/src/main/java/com/gh/gamecenter/ConcernActivity.java b/app/src/main/java/com/gh/gamecenter/ConcernActivity.java
index 87fe5f57a2..d9eca5eb7c 100644
--- a/app/src/main/java/com/gh/gamecenter/ConcernActivity.java
+++ b/app/src/main/java/com/gh/gamecenter/ConcernActivity.java
@@ -17,9 +17,6 @@ public class ConcernActivity extends NormalActivity {
     public static Intent getIntent(Context context, String entrance) {
         Bundle args = new Bundle();
         args.putString(EntranceUtils.KEY_ENTRANCE, entrance);
-//        return new IntentFactory.Builder(context)
-//                .setActivity(ConcernActivity.class)
-//                .setFragment(MyConcernFragment.class).setArgs(args).build();
         return getTargetIntent(context, ConcernActivity.class, MyConcernFragment.class, args);
     }
 
diff --git a/app/src/main/java/com/gh/gamecenter/DownloadManagerActivity.java b/app/src/main/java/com/gh/gamecenter/DownloadManagerActivity.java
index bfcb9ac823..b357627b07 100644
--- a/app/src/main/java/com/gh/gamecenter/DownloadManagerActivity.java
+++ b/app/src/main/java/com/gh/gamecenter/DownloadManagerActivity.java
@@ -39,4 +39,15 @@ public class DownloadManagerActivity extends NormalActivity {
         bundle.putInt(BaseFragment_TabLayout.PAGE_INDEX, position);
         return getTargetIntent(context, DownloadManagerActivity.class, DownloadFragment.class, bundle);
     }
+
+    /**
+     * 根据packageName检查是否可以更新/插件化 如果可以则自动下载
+     */
+    public static Intent getDownloadMangerIntent(Context context, String packageName, int position, String entrance) {
+        Bundle bundle = new Bundle();
+        bundle.putString(EntranceUtils.KEY_ENTRANCE, entrance);
+        bundle.putInt(BaseFragment_TabLayout.PAGE_INDEX, position);
+        bundle.putString(EntranceUtils.KEY_PACKAGENAME, packageName);
+        return getTargetIntent(context, DownloadManagerActivity.class, DownloadFragment.class, bundle);
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/gh/gamecenter/GameDetailActivity.java b/app/src/main/java/com/gh/gamecenter/GameDetailActivity.java
index 60b19f4eaa..43355b5c55 100644
--- a/app/src/main/java/com/gh/gamecenter/GameDetailActivity.java
+++ b/app/src/main/java/com/gh/gamecenter/GameDetailActivity.java
@@ -34,8 +34,6 @@ public class GameDetailActivity extends NormalActivity {
         Bundle bundle = new Bundle();
         bundle.putString(EntranceUtils.KEY_ENTRANCE, entrance);
         bundle.putParcelable(GameEntity.TAG, gameEntity);
-//        context.startActivity(new IntentFactory.Builder(context).setActivity(GameDetailActivity.class)
-//                .setFragment(GameDetailFragment.class).setArgs(bundle).build());
         context.startActivity(getTargetIntent(context, GameDetailActivity.class, GameDetailFragment.class, bundle));
     }
 
@@ -46,8 +44,6 @@ public class GameDetailActivity extends NormalActivity {
         Bundle bundle = new Bundle();
         bundle.putString(EntranceUtils.KEY_GAMEID, gameId);
         bundle.putString(EntranceUtils.KEY_ENTRANCE, entrance);
-//        context.startActivity(new IntentFactory.Builder(context).setActivity(GameDetailActivity.class)
-//                .setFragment(GameDetailFragment.class).setArgs(bundle).build());
         context.startActivity(getTargetIntent(context, GameDetailActivity.class, GameDetailFragment.class, bundle));
     }
 
diff --git a/app/src/main/java/com/gh/gamecenter/GameNewsActivity.java b/app/src/main/java/com/gh/gamecenter/GameNewsActivity.java
index 25925c49c2..0ec214516d 100644
--- a/app/src/main/java/com/gh/gamecenter/GameNewsActivity.java
+++ b/app/src/main/java/com/gh/gamecenter/GameNewsActivity.java
@@ -17,19 +17,11 @@ public class GameNewsActivity extends NormalActivity {
 
     @NonNull
     public static Intent getIntent(Context context, String gameName, String gameId, String entrance) {
-//        Intent intent = new Intent(context, GameNewsActivity.class);
-//        intent.putExtra(EntranceUtils.KEY_GAMENAME, gameName);
-//        intent.putExtra(EntranceUtils.KEY_GAMEID, gameId);
-//        intent.putExtra(EntranceUtils.KEY_ENTRANCE, entrance);
-//        return intent;
 
         final Bundle args = new Bundle();
         args.putString(EntranceUtils.KEY_GAMENAME, gameName);
         args.putString(EntranceUtils.KEY_GAMEID, gameId);
         args.putString(EntranceUtils.KEY_ENTRANCE, entrance);
-//        return new IntentFactory.Builder(context)
-//                .setActivity(GameNewsActivity.class)
-//                .setFragment(GameNewsSearchFragment.class).setArgs(args).build();
         return getTargetIntent(context, GameNewsActivity.class, GameNewsSearchFragment.class, args);
     }
 
diff --git a/app/src/main/java/com/gh/gamecenter/KaiFuActivity.java b/app/src/main/java/com/gh/gamecenter/KaiFuActivity.java
index bd9629b67c..6f2d72797e 100644
--- a/app/src/main/java/com/gh/gamecenter/KaiFuActivity.java
+++ b/app/src/main/java/com/gh/gamecenter/KaiFuActivity.java
@@ -18,9 +18,6 @@ public class KaiFuActivity extends NormalActivity {
     public static Intent getIntent(Context context, String entrance) {
         Bundle args = new Bundle();
         args.putString(EntranceUtils.KEY_ENTRANCE, entrance);
-//        return new IntentFactory.Builder(context)
-//                .setActivity(KaiFuActivity.class)
-//                .setFragment(KaiFuWrapperFragment.class).setArgs(args).build();
         return getTargetIntent(context, KaiFuActivity.class, KaiFuWrapperFragment.class, args);
     }
 
diff --git a/app/src/main/java/com/gh/gamecenter/MainActivity.java b/app/src/main/java/com/gh/gamecenter/MainActivity.java
index 99f4be9de9..1d84aa5637 100644
--- a/app/src/main/java/com/gh/gamecenter/MainActivity.java
+++ b/app/src/main/java/com/gh/gamecenter/MainActivity.java
@@ -50,6 +50,7 @@ import com.gh.common.util.PlatformUtils;
 import com.gh.common.util.UrlFilterUtils;
 import com.gh.download.DownloadManager;
 import com.gh.download.DownloadNotification;
+import com.gh.gamecenter.download.DownloadFragment;
 import com.gh.gamecenter.entity.CommunityEntity;
 import com.gh.gamecenter.entity.GameDigestEntity;
 import com.gh.gamecenter.entity.GameEntity;
@@ -61,11 +62,11 @@ import com.gh.gamecenter.eventbus.EBReuse;
 import com.gh.gamecenter.eventbus.EBShowDialog;
 import com.gh.gamecenter.eventbus.EBSkip;
 import com.gh.gamecenter.fragment.MainWrapperFragment;
-import com.gh.gamecenter.packagehelper.PackageViewModel;
 import com.gh.gamecenter.manager.DataCollectionManager;
 import com.gh.gamecenter.manager.UpdateManager;
 import com.gh.gamecenter.manager.UserManager;
 import com.gh.gamecenter.normal.NormalFragment;
+import com.gh.gamecenter.packagehelper.PackageViewModel;
 import com.gh.gamecenter.qa.AskFragment;
 import com.gh.gamecenter.retrofit.Response;
 import com.gh.gamecenter.retrofit.RetrofitManager;
@@ -684,13 +685,10 @@ public class MainActivity extends BaseActivity {
                 while (entries.hasMoreElements()) {
                     ZipEntry entry = ((ZipEntry) entries.nextElement());
                     String entryName = entry.getName();
-                    if (entryName.contains("gh_assist")) { // TODO: 20/09/17 统一入口
+                    if (entryName.contains("gh_assist")) {
                         String packageName = entryName.substring(entryName.lastIndexOf("_") + 1);
-                        Intent intent = new Intent(MainActivity.this, DownloadManagerActivity.class);
-                        intent.putExtra("currentItem", 1);
-                        intent.putExtra("packageName", packageName);
-                        intent.putExtra(EntranceUtils.KEY_ENTRANCE, "(游戏插件)");
-                        startActivity(intent);
+                        startActivity(DownloadManagerActivity.getDownloadMangerIntent(MainActivity.this,
+                                packageName, DownloadFragment.INDEX_UPDATE, "(游戏插件)"));
                         break;
                     } else if (entryName.contains("halo_skip.json")) {
                         InputStream in = zipfile.getInputStream(entry);
diff --git a/app/src/main/java/com/gh/gamecenter/MessageActivity.java b/app/src/main/java/com/gh/gamecenter/MessageActivity.java
index 9a4581c565..c99dbf386f 100644
--- a/app/src/main/java/com/gh/gamecenter/MessageActivity.java
+++ b/app/src/main/java/com/gh/gamecenter/MessageActivity.java
@@ -14,9 +14,6 @@ import com.gh.gamecenter.message.MessageFragment;
 public class MessageActivity extends NormalActivity {
 
     public static Intent getIntent(Context context, String entrance) {
-//        return new IntentFactory.Builder(context)
-//                .setActivity(MessageActivity.class)
-//                .setFragment(MessageCenterFragment.class).build();
         Bundle bundle = new Bundle();
         bundle.putString(EntranceUtils.KEY_ENTRANCE, entrance);
         return getTargetIntent(context, MessageActivity.class, MessageFragment.class, bundle);
diff --git a/app/src/main/java/com/gh/gamecenter/NewsSearchActivity.java b/app/src/main/java/com/gh/gamecenter/NewsSearchActivity.java
index 9fd4fa884f..2056d75330 100644
--- a/app/src/main/java/com/gh/gamecenter/NewsSearchActivity.java
+++ b/app/src/main/java/com/gh/gamecenter/NewsSearchActivity.java
@@ -22,9 +22,6 @@ public class NewsSearchActivity extends NormalActivity {
         args.putString(EntranceUtils.KEY_SEARCHKEY, searchKey);
         args.putString(EntranceUtils.KEY_GAMEID, gameId);
         args.putString(EntranceUtils.KEY_ENTRANCE, entrance);
-//        return new IntentFactory.Builder(context)
-//                .setActivity(NewsSearchActivity.class)
-//                .setFragment(GameNewsSearchResultFragment.class).setArgs(args).build();
         return getTargetIntent(context, NewsSearchActivity.class, GameNewsSearchResultFragment.class, args);
     }
 
diff --git a/app/src/main/java/com/gh/gamecenter/SelectUserIconActivity.java b/app/src/main/java/com/gh/gamecenter/SelectUserIconActivity.java
index 8dc74934b8..8b7e883436 100644
--- a/app/src/main/java/com/gh/gamecenter/SelectUserIconActivity.java
+++ b/app/src/main/java/com/gh/gamecenter/SelectUserIconActivity.java
@@ -13,9 +13,6 @@ public class SelectUserIconActivity extends NormalActivity {
 
     @NonNull
     public static Intent getIntent(Context context) {
-//        return new IntentFactory.Builder(context)
-//                .setActivity(SelectUserIconActivity.class)
-//                .setFragment(SelectPortraitFragment.class).build();
         return getTargetIntent(context,SelectUserIconActivity.class, SelectPortraitFragment.class);
     }
 
diff --git a/app/src/main/java/com/gh/gamecenter/SettingActivity.java b/app/src/main/java/com/gh/gamecenter/SettingActivity.java
index 5ecf614a2c..31d9907f39 100644
--- a/app/src/main/java/com/gh/gamecenter/SettingActivity.java
+++ b/app/src/main/java/com/gh/gamecenter/SettingActivity.java
@@ -19,13 +19,6 @@ public class SettingActivity extends NormalActivity {
 
     @NonNull
     public static Intent getIntent(Context context, boolean isUpdate, String entrance) {
-//        Intent intent = new Intent(context, SettingActivity.class);
-//        intent.putExtra(EntranceUtils.KEY_ENTRANCE, entrance);
-//        return intent;
-//        return new IntentFactory.Builder(context)
-//                .setEntrance(entrance)
-//                .setActivity(SettingActivity.class)
-//                .setFragment(SettingsFragment.class).build();
         Bundle args = new Bundle();
         args.putString(EntranceUtils.KEY_ENTRANCE, entrance);
         args.putBoolean(EntranceUtils.KEY_VERSION_UPDATE, isUpdate);
diff --git a/app/src/main/java/com/gh/gamecenter/UserInfoActivity.java b/app/src/main/java/com/gh/gamecenter/UserInfoActivity.java
index e4c0e8e967..74c994aad7 100644
--- a/app/src/main/java/com/gh/gamecenter/UserInfoActivity.java
+++ b/app/src/main/java/com/gh/gamecenter/UserInfoActivity.java
@@ -13,9 +13,6 @@ public class UserInfoActivity extends NormalActivity {
 
     @NonNull
     public static Intent getIntent(Context context) {
-//        return new IntentFactory.Builder(context)
-//                .setActivity(UserInfoActivity.class)
-//                .setFragment(UserInfoFragment.class).build();
         return getTargetIntent(context, UserInfoActivity.class, UserInfoFragment.class);
     }
 
diff --git a/app/src/main/java/com/gh/gamecenter/UserInfoEditActivity.java b/app/src/main/java/com/gh/gamecenter/UserInfoEditActivity.java
index f67f6af9e1..0eef8993f8 100644
--- a/app/src/main/java/com/gh/gamecenter/UserInfoEditActivity.java
+++ b/app/src/main/java/com/gh/gamecenter/UserInfoEditActivity.java
@@ -18,10 +18,6 @@ public class UserInfoEditActivity extends NormalActivity {
     public static Intent getIntent(Context context, String editType) {
         Bundle args = new Bundle();
         args.putString(UserViewModel.KEY_EDITTYPE, editType);
-//        return new IntentFactory.Builder(context)
-//                .setArgs(args)
-//                .setActivity(UserInfoEditActivity.class)
-//                .setFragment(UserInfoEditFragment.class).build();
         return getTargetIntent(context, UserInfoEditActivity.class, UserInfoEditFragment.class, args);
     }
 
diff --git a/app/src/main/java/com/gh/gamecenter/UserRegionActivity.java b/app/src/main/java/com/gh/gamecenter/UserRegionActivity.java
index de7966da10..28bea7553c 100644
--- a/app/src/main/java/com/gh/gamecenter/UserRegionActivity.java
+++ b/app/src/main/java/com/gh/gamecenter/UserRegionActivity.java
@@ -11,9 +11,6 @@ import com.halo.assistant.fragment.user.SelectRegionFragment;
 public class UserRegionActivity extends NormalActivity {
 
     public static Intent getIntent(Context context) {
-//        return new IntentFactory.Builder(context)
-//                .setActivity(UserRegionActivity.class)
-//                .setFragment(SelectRegionFragment.class).build();
         return getTargetIntent(context, UserRegionActivity.class, SelectRegionFragment.class);
     }
 
diff --git a/app/src/main/java/com/gh/gamecenter/VoteActivity.java b/app/src/main/java/com/gh/gamecenter/VoteActivity.java
index f79f864769..6c7400f4de 100644
--- a/app/src/main/java/com/gh/gamecenter/VoteActivity.java
+++ b/app/src/main/java/com/gh/gamecenter/VoteActivity.java
@@ -20,10 +20,6 @@ public class VoteActivity extends NormalActivity {
         Bundle args = new Bundle();
         args.putString(EntranceUtils.KEY_GAMENAME, gameName);
         args.putString(EntranceUtils.KEY_GAMEID, gameId);
-//        return new IntentFactory.Builder(context)
-//                .setArgs(intent.getExtras())
-//                .setActivity(VoteActivity.class)
-//                .setFragment(VoteFragment.class).build();
         return getTargetIntent(context, VoteActivity.class, VoteFragment.class, args);
     }
 
diff --git a/app/src/main/java/com/gh/gamecenter/WebActivity.java b/app/src/main/java/com/gh/gamecenter/WebActivity.java
index e259a37d53..7f8d67343d 100644
--- a/app/src/main/java/com/gh/gamecenter/WebActivity.java
+++ b/app/src/main/java/com/gh/gamecenter/WebActivity.java
@@ -24,14 +24,6 @@ public class WebActivity extends NormalActivity {
 
     @NonNull
     public static Intent getWebIntent(Context context) {
-        Intent intent = new Intent(context, WebActivity.class);
-        intent.putExtra(EntranceUtils.KEY_GAMENAME, context.getString(R.string.disclaimer_title));
-        intent.putExtra(EntranceUtils.KEY_URL, context.getString(R.string.disclaimer_url));
-//        return new IntentFactory.Builder(context)
-//                .setArgs(intent.getExtras())
-//                .setActivity(WebActivity.class)
-//                .setFragment(WebFragment.class).build();
-
         Bundle bundle = new Bundle();
         bundle.putString(EntranceUtils.KEY_GAMENAME, context.getString(R.string.disclaimer_title));
         bundle.putString(EntranceUtils.KEY_URL, context.getString(R.string.disclaimer_url));
@@ -40,16 +32,6 @@ public class WebActivity extends NormalActivity {
 
     @NonNull
     public static Intent getWebByCollectionTools(Context context, ToolBoxEntity toolBoxEntity, boolean isCollectionTools) {
-//        Intent intent = new Intent(context, WebActivity.class);
-//        intent.putExtra(EntranceUtils.KEY_URL, toolBoxEntity.getUrl());
-//        intent.putExtra(WebFragment.KEY_ISTOOLS, true);
-////        intent.putExtra("gameName", toolBoxEntity.getName());
-//        intent.putExtra(ToolBoxEntity.TAG, toolBoxEntity);
-//        intent.putExtra(WebFragment.KEY_ISCOLLECTIONTOOLS, isCollectionTools);
-//        return new IntentFactory.Builder(context)
-//                .setArgs(intent.getExtras())
-//                .setActivity(WebActivity.class)
-//                .setFragment(WebFragment.class).build();
         Bundle bundle = new Bundle();
         bundle.putString(EntranceUtils.KEY_URL, toolBoxEntity.getUrl());
         bundle.putBoolean(WebFragment.KEY_ISTOOLS, true);
@@ -61,15 +43,6 @@ public class WebActivity extends NormalActivity {
 
     @NonNull
     public static Intent getIntentByNews(Context context, ConcernEntity concernEntity, String entrance) {
-//        Intent intent = new Intent(context, WebActivity.class);
-//        intent.putExtra(EntranceUtils.KEY_URL, concernEntity.getLink());
-//        intent.putExtra(EntranceUtils.KEY_GAMENAME, concernEntity.getGameName());
-//        intent.putExtra(EntranceUtils.KEY_NEWSID, concernEntity.getId());
-//        intent.putExtra(EntranceUtils.KEY_ENTRANCE, entrance);
-//        return new IntentFactory.Builder(context)
-//                .setArgs(intent.getExtras())
-//                .setActivity(WebActivity.class)
-//                .setFragment(WebFragment.class).build();
         Bundle bundle = new Bundle();
         bundle.putString(EntranceUtils.KEY_URL, concernEntity.getLink());
         bundle.putString(EntranceUtils.KEY_GAMENAME, concernEntity.getGameName());
@@ -80,15 +53,6 @@ public class WebActivity extends NormalActivity {
 
     @NonNull
     public static Intent getIntentByNews(Context context, NewsEntity newsEntity, String entrance) {
-//        Intent intent = new Intent(context, WebActivity.class);
-//        intent.putExtra(EntranceUtils.KEY_URL, newsEntity.getLink());
-//        intent.putExtra(EntranceUtils.KEY_GAMENAME, newsEntity.getGameName());
-//        intent.putExtra(EntranceUtils.KEY_NEWSID, newsEntity.getId());
-//        intent.putExtra(EntranceUtils.KEY_ENTRANCE, entrance);
-//        return new IntentFactory.Builder(context)
-//                .setArgs(intent.getExtras())
-//                .setActivity(WebActivity.class)
-//                .setFragment(WebFragment.class).build();
         Bundle bundle = new Bundle();
         bundle.putString(EntranceUtils.KEY_URL, newsEntity.getLink());
         bundle.putString(EntranceUtils.KEY_GAMENAME, newsEntity.getGameName());
@@ -99,12 +63,6 @@ public class WebActivity extends NormalActivity {
 
     @NonNull
     public static Intent getIntentByUrl(Context context, String url) {
-//        Intent intent = new Intent(context, WebActivity.class);
-//        intent.putExtra(EntranceUtils.KEY_URL, url);
-//        return new IntentFactory.Builder(context)
-//                .setArgs(intent.getExtras())
-//                .setActivity(WebActivity.class)
-//                .setFragment(WebFragment.class).build();
         Bundle bundle = new Bundle();
         bundle.putString(EntranceUtils.KEY_URL, url);
         return getTargetIntent(context, WebActivity.class, WebFragment.class, bundle);
diff --git a/app/src/main/java/com/gh/gamecenter/download/DownloadFragment.kt b/app/src/main/java/com/gh/gamecenter/download/DownloadFragment.kt
index 96954fd090..df40d8db04 100644
--- a/app/src/main/java/com/gh/gamecenter/download/DownloadFragment.kt
+++ b/app/src/main/java/com/gh/gamecenter/download/DownloadFragment.kt
@@ -25,6 +25,7 @@ class DownloadFragment : BaseFragment_TabLayout() {
 
     companion object {
         val INDEX_DOWNLOAD = 0
+        @JvmField
         val INDEX_UPDATE = 1
         val INDEX_KC = 2
     }
diff --git a/app/src/main/java/com/gh/gamecenter/download/GameUpdateFragment.java b/app/src/main/java/com/gh/gamecenter/download/GameUpdateFragment.java
index ce73268e3f..7e005d5cc6 100644
--- a/app/src/main/java/com/gh/gamecenter/download/GameUpdateFragment.java
+++ b/app/src/main/java/com/gh/gamecenter/download/GameUpdateFragment.java
@@ -66,7 +66,7 @@ public class GameUpdateFragment extends BaseFragment {
     protected void initView(View view) {
         super.initView(view);
         Intent intent = getActivity().getIntent();
-        String packageName = intent.getStringExtra("packageName");
+        String packageName = intent.getStringExtra(EntranceUtils.KEY_PACKAGENAME);
         String entrance = intent.getStringExtra(EntranceUtils.KEY_ENTRANCE);
 
         mGameUpdateNoDataSkip.setVisibility(View.GONE);
diff --git a/app/src/main/java/com/gh/gamecenter/info/InfoViewModel.java b/app/src/main/java/com/gh/gamecenter/info/InfoViewModel.java
index b0924289db..ed6884f14f 100644
--- a/app/src/main/java/com/gh/gamecenter/info/InfoViewModel.java
+++ b/app/src/main/java/com/gh/gamecenter/info/InfoViewModel.java
@@ -4,6 +4,7 @@ import android.app.Application;
 import android.arch.lifecycle.LiveData;
 import android.support.annotation.NonNull;
 
+import com.gh.common.util.UrlFilterUtils;
 import com.gh.gamecenter.baselist.ListViewModel;
 import com.gh.gamecenter.entity.NewsEntity;
 import com.gh.gamecenter.entity.ViewsEntity;
@@ -62,6 +63,7 @@ public class InfoViewModel extends ListViewModel<NewsEntity, NewsEntity> {
 
     @Override
     public Observable<List<NewsEntity>> provideDataObservable(int offset) {
-        return RetrofitManager.getInstance(getApplication()).getApi().getZiXun(offset);
+        return RetrofitManager.getInstance(getApplication()).getApi()
+                .getArticleList(UrlFilterUtils.getFilterQuery("type_group", "资讯"), offset);
     }
 }
diff --git a/app/src/main/java/com/gh/gamecenter/info/OriginalViewModel.java b/app/src/main/java/com/gh/gamecenter/info/OriginalViewModel.java
index 24c95a179e..7d34e665cd 100644
--- a/app/src/main/java/com/gh/gamecenter/info/OriginalViewModel.java
+++ b/app/src/main/java/com/gh/gamecenter/info/OriginalViewModel.java
@@ -4,6 +4,7 @@ import android.app.Application;
 import android.arch.lifecycle.LiveData;
 import android.support.annotation.NonNull;
 
+import com.gh.common.util.UrlFilterUtils;
 import com.gh.gamecenter.baselist.ListViewModel;
 import com.gh.gamecenter.entity.NewsEntity;
 import com.gh.gamecenter.entity.ViewsEntity;
@@ -63,7 +64,8 @@ public class OriginalViewModel extends ListViewModel<NewsEntity, NewsEntity> {
 
     @Override
     public Observable<List<NewsEntity>> provideDataObservable(int offset) {
-        return RetrofitManager.getInstance(getApplication()).getApi().getYuanChuang(offset);
+        return RetrofitManager.getInstance(getApplication()).getApi()
+                .getArticleList(UrlFilterUtils.getFilterQuery("type_group", "原创"), offset);
     }
 
 }
diff --git a/app/src/main/java/com/gh/gamecenter/info/StrategyAdapter.java b/app/src/main/java/com/gh/gamecenter/info/StrategyAdapter.java
index fbe53588d6..074935a442 100644
--- a/app/src/main/java/com/gh/gamecenter/info/StrategyAdapter.java
+++ b/app/src/main/java/com/gh/gamecenter/info/StrategyAdapter.java
@@ -11,6 +11,7 @@ import com.gh.base.OnListClickListener;
 import com.gh.base.OnRequestCallBackListener;
 import com.gh.common.constant.Config;
 import com.gh.common.util.NewsUtils;
+import com.gh.common.util.UrlFilterUtils;
 import com.gh.gamecenter.R;
 import com.gh.gamecenter.adapter.viewholder.NewsFooterViewHolder;
 import com.gh.gamecenter.adapter.viewholder.NewsTextViewHolder;
@@ -121,7 +122,7 @@ class StrategyAdapter extends BaseRecyclerAdapter<ViewHolder> {
         isLoading = true;
         RetrofitManager.getInstance(mContext)
                 .getApi()
-                .getStrategy(mPage)
+                .getArticleList(UrlFilterUtils.getFilterQuery("type_group", "攻略"), mPage)
                 .map(new Function<List<NewsEntity>, List<NewsEntity>>() {
                     @Override
                     public List<NewsEntity> apply(List<NewsEntity> newsEntities) {
diff --git a/app/src/main/java/com/gh/gamecenter/qa/AskViewModel.kt b/app/src/main/java/com/gh/gamecenter/qa/AskViewModel.kt
index 3eba4544b4..9d3a943537 100644
--- a/app/src/main/java/com/gh/gamecenter/qa/AskViewModel.kt
+++ b/app/src/main/java/com/gh/gamecenter/qa/AskViewModel.kt
@@ -52,6 +52,9 @@ class AskViewModel(application: Application) : AndroidViewModel(application) {
 
     override fun onCleared() {
         super.onCleared()
-        mTimer.cancel()
+        // kotlin.UninitializedPropertyAccessException: lateinit property mTimer has not been initialized
+        if (::mTimer.isInitialized) {
+            mTimer.cancel()
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/gh/gamecenter/qa/article/edit/ArticleEditActivity.kt b/app/src/main/java/com/gh/gamecenter/qa/article/edit/ArticleEditActivity.kt
index 6ca054a1b7..33db457155 100644
--- a/app/src/main/java/com/gh/gamecenter/qa/article/edit/ArticleEditActivity.kt
+++ b/app/src/main/java/com/gh/gamecenter/qa/article/edit/ArticleEditActivity.kt
@@ -40,7 +40,6 @@ import com.gh.gamecenter.qa.article.draft.ArticleDraftActivity
 import com.gh.gamecenter.qa.entity.ArticleDetailEntity
 import com.gh.gamecenter.qa.entity.ArticleDraftEntity
 import com.gh.gamecenter.qa.questions.edit.TagsSelectFragment
-import com.lightgame.utils.Utils
 import kotterknife.bindView
 
 class ArticleEditActivity : BaseActivity() {
@@ -116,10 +115,8 @@ class ArticleEditActivity : BaseActivity() {
         // 保存草稿
         mViewModel?.postArticleDrafts?.observe(this, Observer {
             if (it!!) {
-                Utils.log("======111")
                 finish()
             } else {
-                Utils.log("======222")
                 showDraftFailureDialog()
             }
         })
diff --git a/app/src/main/java/com/gh/gamecenter/qa/questions/edit/QuestionEditActivity.kt b/app/src/main/java/com/gh/gamecenter/qa/questions/edit/QuestionEditActivity.kt
index cf6effb71c..aa284ec678 100644
--- a/app/src/main/java/com/gh/gamecenter/qa/questions/edit/QuestionEditActivity.kt
+++ b/app/src/main/java/com/gh/gamecenter/qa/questions/edit/QuestionEditActivity.kt
@@ -229,8 +229,9 @@ class QuestionEditActivity : BaseActivity() {
         override fun afterTextChanged(s: Editable) {}
     }
 
+
     // 退出提示
-    override fun onBackPressed() {
+    override fun handleBackPressed(): Boolean {
         // 需要检查的内容,其中任意一个不为空都要打开提示弹窗
         val imgList = mViewModel.picList.value
         val title = mBinding.questionseditTitle.text.toString().trim()
@@ -240,13 +241,13 @@ class QuestionEditActivity : BaseActivity() {
             DialogUtils.showCancelAlertDialog(this, "提示"
                     , "确定退出修改？已编辑的内容将丢失"
                     , "继续编辑", " 退出", null) { finish() }
-            return
+            return true
         } else if (imgList != null && imgList.size > 0 || title.isNotEmpty() || content.isNotEmpty()) {
             DialogUtils.showCancelAlertDialog(this, "提示"
                     , if (mViewModel.questionEntity == null) "确定放弃提问吗？" else "确定放弃编辑吗？"
                     , "再想想", " 放弃", null) { finish() }
-            return
+            return true
         }
-        super.onBackPressed()
+        return false
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/gh/gamecenter/retrofit/service/ApiService.java b/app/src/main/java/com/gh/gamecenter/retrofit/service/ApiService.java
index 36680eaedb..b8cac8ddb3 100644
--- a/app/src/main/java/com/gh/gamecenter/retrofit/service/ApiService.java
+++ b/app/src/main/java/com/gh/gamecenter/retrofit/service/ApiService.java
@@ -84,23 +84,14 @@ public interface ApiService {
     @GET("users/{user_id}/follows/articles")
     Observable<List<ConcernEntity>> getZiXunConcern(@Path("user_id") String user_id, @Query("page") int page);
 
-    /**
-     * 获取资讯-资讯
-     */
-    @GET("articles?filter=type_group:资讯&view=digest")
-    Observable<List<NewsEntity>> getZiXun(@Query("page") int page); // todo 与原创合并
 
     /**
-     * 获取资讯-原创
+     * 获取文章列表
+     *
+     * @param filter :type_group(攻略/原创/资讯)
      */
-    @GET("articles?filter=type_group:原创&view=digest")
-    Observable<List<NewsEntity>> getYuanChuang(@Query("page") int page);
-
-    /**
-     * 获取资讯-攻略
-     */
-    @GET("articles?filter=type_group:攻略&view=digest")
-    Observable<List<NewsEntity>> getStrategy(@Query("page") int page);
+    @GET("articles?view=digest")
+    Observable<List<NewsEntity>> getArticleList(@Query("filter") String filter, @Query("page") int page);
 
     /**
      * 获取游戏摘要
diff --git a/app/src/main/java/com/halo/assistant/ui/IntentFactory.java b/app/src/main/java/com/halo/assistant/ui/IntentFactory.java
deleted file mode 100644
index 94d56d1926..0000000000
--- a/app/src/main/java/com/halo/assistant/ui/IntentFactory.java
+++ /dev/null
@@ -1,148 +0,0 @@
-package com.halo.assistant.ui;
-
-import android.app.Activity;
-import android.content.Context;
-import android.content.Intent;
-import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v4.app.Fragment;
-import android.text.TextUtils;
-
-import com.gh.common.util.EntranceUtils;
-import com.gh.gamecenter.CommonActivity;
-
-/**
- * 各种UI集合点
- * <p>
- * Created by CsHeng on 12/12/2017.
- */
-public class IntentFactory {
-
-    public static class Builder {
-
-        private Context mContext;
-        private Class<? extends Activity> mActivityClass = CommonActivity.class;
-        private Class<? extends Fragment> mFragmentClass;
-        private int mFlags;
-        private String mEntrance;
-        private Bundle mBundleArgs;
-
-        public Builder(@NonNull Context context) {
-            mContext = context;
-        }
-
-        @NonNull
-        public Builder setActivity(Class<? extends Activity> activityClass) {
-            mActivityClass = activityClass;
-            return this;
-        }
-
-        @NonNull
-        public Builder setFragment(@NonNull Class<? extends Fragment> cls) {
-            mFragmentClass = cls;
-            return this;
-        }
-
-        @NonNull
-        public Builder setEntrance(@NonNull String entrance) {
-            mEntrance = entrance;
-            return this;
-        }
-
-        @NonNull
-        public Builder setArgs(@NonNull Bundle args) {
-            mBundleArgs = args;
-            return this;
-        }
-
-        @NonNull
-        public Builder addFlags(int flags) {
-            mFlags |= flags;
-            return this;
-        }
-
-        @NonNull
-        public Builder setFlags(int flags) {
-            mFlags = flags;
-            return this;
-        }
-
-        @NonNull
-        public Intent build() {
-            Intent intent = getFragmentIntent(mContext, mActivityClass, mFragmentClass, mBundleArgs);
-            if (!TextUtils.isEmpty(mEntrance)) {
-                intent.putExtra(EntranceUtils.KEY_ENTRANCE, mEntrance);
-            }
-            intent.setFlags(mFlags);
-            return intent;
-        }
-
-        public void start() {
-            mContext.startActivity(build());
-        }
-
-    }
-
-    protected static final String ARGS_FRAGMENT_NAME = "frgName";
-    protected static final String ARGS_FRAGMENT_BUNDLE = "frgBundle";
-
-    protected static Intent clearTop(Context context, Class<? extends Activity> cls) {
-        final Intent intent = getReorderToFrontIntent(context, cls);
-        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
-        return intent;
-    }
-
-    protected static Intent getReorderToFrontIntent(Context context, Class<? extends Activity> cls) {
-        final Intent intent = new Intent(context, cls);
-        intent.addFlags(Intent.FLAG_ACTIVITY_BROUGHT_TO_FRONT);
-        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        return intent;
-    }
-
-    protected static void showActivity(Context context, Class<? extends Activity> cls) {
-        final Intent intent = getReorderToFrontIntent(context, cls);
-        context.startActivity(intent);
-    }
-
-    protected static void startFragmentForResult(Context context, Class<? extends Activity> activity,
-                                                 Class<? extends Fragment> fragment, Bundle bundle, int requestCode) {
-        if (context instanceof Activity) {
-            ((Activity) context).startActivityForResult(getFragmentIntent(context, activity, fragment, bundle),
-                    requestCode);
-        }
-    }
-
-    /**
-     * 根据传进来的fragment class和bundle extra来决定跳转到哪一个fragment
-     *
-     * @param context
-     * @param fragment fragment.getCanonicalName()
-     * @param bundle   fragment的构造参数
-     * @return
-     */
-    protected static Intent getFragmentIntent(Context context, Class<? extends Activity> activity,
-                                              Class<? extends Fragment> fragment, Bundle bundle) {
-        final Intent intent = getReorderToFrontIntent(context, activity);
-        intent.putExtra(ARGS_FRAGMENT_NAME, fragment.getCanonicalName());
-        intent.putExtra(ARGS_FRAGMENT_BUNDLE, bundle);
-        return intent;
-    }
-
-    protected static void startFragment(Context context, Class<? extends Activity> activity,
-                                        Class<? extends Fragment> fragment) {
-        startFragment(context, activity, fragment, null);
-    }
-
-    /**
-     * 启动Fragment
-     *
-     * @param context
-     * @param fragment
-     * @param bundle
-     */
-    protected static void startFragment(Context context, Class<? extends Activity> activity,
-                                        Class<? extends Fragment> fragment, Bundle bundle) {
-        context.startActivity(getFragmentIntent(context, activity, fragment, bundle));
-    }
-
-}
diff --git a/app/src/main/res/layout/activity_downloadmanager.xml b/app/src/main/res/layout/activity_downloadmanager.xml
index a145ff0689..637caed611 100644
--- a/app/src/main/res/layout/activity_downloadmanager.xml
+++ b/app/src/main/res/layout/activity_downloadmanager.xml
@@ -4,7 +4,7 @@
     android:layout_height = "match_parent"
     android:orientation = "vertical" >
 
-    <include layout = "@layout/toolbar_title" />
+    <include layout = "@layout/reuse_toolbar" />
 
     <FrameLayout
         android:id = "@id/layout_fragment_content"
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index a827d4a77d..fdd8a7e520 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -4,7 +4,7 @@
     android:layout_height = "match_parent"
     android:orientation = "vertical" >
 
-    <include layout = "@layout/toolbar_title" />
+    <include layout = "@layout/reuse_toolbar" />
 
     <RelativeLayout
         android:layout_width = "match_parent"
diff --git a/app/src/main/res/layout/layout_wrapper_activity_toolbar.xml b/app/src/main/res/layout/layout_wrapper_activity_toolbar.xml
deleted file mode 100755
index 58244e571c..0000000000
--- a/app/src/main/res/layout/layout_wrapper_activity_toolbar.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android = "http://schemas.android.com/apk/res/android"
-    android:layout_width = "match_parent"
-    android:layout_height = "match_parent"
-    android:fitsSystemWindows = "true"
-    android:orientation = "vertical" >
-
-    <include layout = "@layout/toolbar_title" />
-
-    <FrameLayout
-        android:id = "@id/layout_activity_content"
-        android:layout_width = "match_parent"
-        android:layout_height = "0dp"
-        android:layout_weight = "1" />
-
-</LinearLayout >
\ No newline at end of file
diff --git a/app/src/main/res/layout/toolbar_title.xml b/app/src/main/res/layout/toolbar_title.xml
deleted file mode 100644
index f5d47d6450..0000000000
--- a/app/src/main/res/layout/toolbar_title.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.widget.Toolbar xmlns:android = "http://schemas.android.com/apk/res/android"
-    android:id = "@id/toolbar_navigation"
-    style = "@style/Base_ToolbarStyle" >
-
-    <!-- TODO 处理完之后只保留TitleTextView，其他删掉-->
-    <RelativeLayout
-        android:id = "@+id/reuse_actionbar"
-        android:layout_width = "match_parent"
-        android:layout_height = "match_parent" >
-
-        <RelativeLayout
-            android:id = "@+id/actionbar_rl_back"
-            android:layout_width = "@dimen/appbar_height"
-            android:layout_height = "match_parent" >
-
-            <ImageView
-                android:layout_width = "17dp"
-                android:layout_height = "17dp"
-                android:layout_centerInParent = "true"
-                android:src = "@drawable/ic_bar_back" />
-
-        </RelativeLayout >
-
-        <TextView
-            android:id = "@+id/actionbar_tv_title"
-            android:layout_width = "match_parent"
-            android:layout_height = "wrap_content"
-            android:layout_centerHorizontal = "true"
-            android:layout_centerVertical = "true"
-            android:gravity = "center"
-            android:singleLine = "true"
-            android:textColor = "@color/black"
-            android:textSize = "16sp"
-            android:textStyle = "bold"
-            android:visibility = "invisible" />
-        <!--android:text = "@string/text_holder"-->
-
-    </RelativeLayout >
-
-</android.support.v7.widget.Toolbar >