From 719dbeef76ac166d39b864dcd839c2d7b0e2662f Mon Sep 17 00:00:00 2001 From: kehaoyuan Date: Tue, 26 Dec 2017 17:30:59 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E7=90=86=E9=A1=B5=E9=9D=A2toolbar?= =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E5=A4=8D=E5=BC=80=E6=9C=8D=E8=A1=A8=E8=B7=A8?= =?UTF-8?q?=E5=B9=B4=E6=98=BE=E7=A4=BA=E5=BC=82=E5=B8=B8=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/AndroidManifest.xml | 4 - .../base/fragment/BaseFragment_ViewPager.java | 3 +- .../java/com/gh/gamecenter/AboutActivity.java | 10 +- .../com/gh/gamecenter/CleanApkActivity.java | 11 +- .../gh/gamecenter/CommentDetailActivity.java | 10 +- .../com/gh/gamecenter/ConcernActivity.java | 10 +- .../gamecenter/DownloadManagerActivity.java | 91 +++++++-------- .../com/gh/gamecenter/GameDetailActivity.java | 13 ++- .../com/gh/gamecenter/GameNewsActivity.java | 10 +- .../java/com/gh/gamecenter/KaiFuActivity.java | 9 +- .../java/com/gh/gamecenter/LibaoActivity.java | 10 +- .../java/com/gh/gamecenter/LoginActivity.java | 32 +----- .../com/gh/gamecenter/MessageActivity.java | 10 +- .../com/gh/gamecenter/NewsDetailActivity.java | 5 - .../com/gh/gamecenter/NewsSearchActivity.java | 10 +- .../com/gh/gamecenter/NormalActivity.java | 16 +++ .../gh/gamecenter/SelectUserIconActivity.java | 10 +- .../com/gh/gamecenter/SettingActivity.java | 16 ++- .../com/gh/gamecenter/SubjectActivity.java | 12 +- .../com/gh/gamecenter/UserInfoActivity.java | 10 +- .../gh/gamecenter/UserInfoEditActivity.java | 12 +- .../com/gh/gamecenter/UserRegionActivity.java | 10 +- .../java/com/gh/gamecenter/VoteActivity.java | 19 ++-- .../java/com/gh/gamecenter/WebActivity.java | 107 +++++++++++------- .../gamecenter/adapter/PlatformAdapter.java | 4 +- .../ask/AskQuestionsNewFragment.java | 4 +- .../{adapter => ask}/AskTabOrderAdapter.java | 2 +- .../AskTabOrderFragment.java} | 33 +++--- .../gamecenter/download/DownloadFragment.java | 2 + .../gh/gamecenter/fragment/LoginFragment.java | 17 ++- .../fragment/SearchToolbarFragment.java | 2 +- .../gamedetail/GameDetailFragment.java | 63 +++++------ .../gamedetail/GameDetailKaiFuAdapter.java | 1 + .../kaifu/KaiFuWrapperFragment.java | 4 +- .../libao/LibaoWrapperFragment.java | 4 +- .../gamecenter/receiver/DownloadReceiver.java | 2 +- .../subject/SubjectWrapperFragment.java | 4 +- .../assistant/fragment/AboutFragment.java | 4 +- .../fragment/ApkCleanerFragment.java | 4 +- .../assistant/fragment/SettingsFragment.java | 4 +- .../halo/assistant/fragment/VoteFragment.java | 8 +- .../halo/assistant/fragment/WebFragment.java | 45 +++----- .../comment/CommentDetailFragment.java | 4 +- .../fragment/game/GameNewsSearchFragment.java | 4 +- .../game/GameNewsSearchResultFragment.java | 4 +- .../fragment/myconcern/MyConcernFragment.java | 4 +- .../fragment/user/SelectPortraitFragment.java | 4 +- .../fragment/user/SelectRegionFragment.java | 4 +- .../fragment/user/UserInfoEditFragment.java | 4 +- .../fragment/user/UserInfoFragment.java | 4 +- app/src/main/res/layout/activity_normal.xml | 26 +---- app/src/main/res/layout/fragment_ask.xml | 2 +- app/src/main/res/layout/reuse_toolbar.xml | 23 ++++ 53 files changed, 374 insertions(+), 366 deletions(-) rename app/src/main/java/com/gh/gamecenter/{adapter => ask}/AskTabOrderAdapter.java (97%) rename app/src/main/java/com/gh/gamecenter/{AskTabOrderActivity.java => ask/AskTabOrderFragment.java} (89%) create mode 100644 app/src/main/res/layout/reuse_toolbar.xml diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 7d0b0eafbd..5fe3a9273c 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -239,10 +239,6 @@ android:name = "com.gh.gamecenter.NormalActivity" android:screenOrientation = "portrait" /> - - diff --git a/app/src/main/java/com/gh/base/fragment/BaseFragment_ViewPager.java b/app/src/main/java/com/gh/base/fragment/BaseFragment_ViewPager.java index 1d60e19309..c852a1f7f1 100755 --- a/app/src/main/java/com/gh/base/fragment/BaseFragment_ViewPager.java +++ b/app/src/main/java/com/gh/base/fragment/BaseFragment_ViewPager.java @@ -19,6 +19,7 @@ import android.support.v4.view.PagerAdapter; import android.support.v4.view.ViewPager; import android.view.View; +import com.gh.gamecenter.normal.NormalFragment; import com.lightgame.adapter.BaseFragmentPagerAdapter; import com.lightgame.config.CommonDebug; import com.lightgame.view.DoubleTapTextView; @@ -33,7 +34,7 @@ import java.util.List; * @author CsHeng * @date 2013-3-6 */ -public abstract class BaseFragment_ViewPager extends BaseFragment implements DoubleTapTextView.OnDoubleTapListener { +public abstract class BaseFragment_ViewPager extends NormalFragment implements DoubleTapTextView.OnDoubleTapListener { public static final String ARGS_INDEX = "index"; protected int mCheckedIndex = 0; diff --git a/app/src/main/java/com/gh/gamecenter/AboutActivity.java b/app/src/main/java/com/gh/gamecenter/AboutActivity.java index 0d420a1b15..690f5e3292 100644 --- a/app/src/main/java/com/gh/gamecenter/AboutActivity.java +++ b/app/src/main/java/com/gh/gamecenter/AboutActivity.java @@ -5,20 +5,20 @@ import android.content.Intent; import android.support.annotation.NonNull; import com.halo.assistant.fragment.AboutFragment; -import com.halo.assistant.ui.IntentFactory; /** * Created by khy on 2017/2/28. */ @Deprecated -public class AboutActivity extends CommonActivity { +public class AboutActivity extends NormalActivity { @NonNull public static Intent getIntent(Context context) { - return new IntentFactory.Builder(context) - .setActivity(AboutActivity.class) - .setFragment(AboutFragment.class).build(); +// return new IntentFactory.Builder(context) +// .setActivity(AboutActivity.class) +// .setFragment(AboutFragment.class).build(); + return getIntent(context, AboutFragment.class); } } diff --git a/app/src/main/java/com/gh/gamecenter/CleanApkActivity.java b/app/src/main/java/com/gh/gamecenter/CleanApkActivity.java index c6d24aa5bf..4945c8269c 100644 --- a/app/src/main/java/com/gh/gamecenter/CleanApkActivity.java +++ b/app/src/main/java/com/gh/gamecenter/CleanApkActivity.java @@ -5,20 +5,21 @@ import android.content.Intent; import android.support.annotation.NonNull; import com.halo.assistant.fragment.ApkCleanerFragment; -import com.halo.assistant.ui.IntentFactory; /** * Created by khy on 2017/1/24. */ @Deprecated -public class CleanApkActivity extends CommonActivity { +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 new IntentFactory.Builder(context) +// .setActivity(CleanApkActivity.class) +// .setFragment(ApkCleanerFragment.class).build(); + + return getIntent(context, ApkCleanerFragment.class); } } diff --git a/app/src/main/java/com/gh/gamecenter/CommentDetailActivity.java b/app/src/main/java/com/gh/gamecenter/CommentDetailActivity.java index f3f5a6d607..396a0e5cd3 100644 --- a/app/src/main/java/com/gh/gamecenter/CommentDetailActivity.java +++ b/app/src/main/java/com/gh/gamecenter/CommentDetailActivity.java @@ -6,20 +6,20 @@ import android.os.Bundle; import com.gh.common.util.EntranceUtils; import com.halo.assistant.fragment.comment.CommentDetailFragment; -import com.halo.assistant.ui.IntentFactory; /** * Created by khy on 2017/3/22. */ @Deprecated -public class CommentDetailActivity extends CommonActivity { +public class CommentDetailActivity extends NormalActivity { public static Intent getIntent(Context context, String commentId) { Bundle args = new Bundle(); args.putString(EntranceUtils.KEY_COMMENTID, commentId); - return new IntentFactory.Builder(context) - .setActivity(CommentDetailActivity.class) - .setFragment(CommentDetailFragment.class).setArgs(args).build(); +// return new IntentFactory.Builder(context) +// .setActivity(CommentDetailActivity.class) +// .setFragment(CommentDetailFragment.class).setArgs(args).build(); + return getIntent(context, CommentDetailFragment.class, args); } } diff --git a/app/src/main/java/com/gh/gamecenter/ConcernActivity.java b/app/src/main/java/com/gh/gamecenter/ConcernActivity.java index d3045685db..958bb9b996 100644 --- a/app/src/main/java/com/gh/gamecenter/ConcernActivity.java +++ b/app/src/main/java/com/gh/gamecenter/ConcernActivity.java @@ -7,21 +7,21 @@ import android.support.annotation.NonNull; import com.gh.common.util.EntranceUtils; import com.halo.assistant.fragment.myconcern.MyConcernFragment; -import com.halo.assistant.ui.IntentFactory; /** * 我的关注页面 */ @Deprecated -public class ConcernActivity extends CommonActivity { +public class ConcernActivity extends NormalActivity { @NonNull 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 new IntentFactory.Builder(context) +// .setActivity(ConcernActivity.class) +// .setFragment(MyConcernFragment.class).setArgs(args).build(); + return getIntent(context, 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 e7de893c5a..832bc33aa4 100644 --- a/app/src/main/java/com/gh/gamecenter/DownloadManagerActivity.java +++ b/app/src/main/java/com/gh/gamecenter/DownloadManagerActivity.java @@ -4,7 +4,6 @@ import android.content.Context; import android.content.Intent; import android.os.Bundle; -import com.gh.base.BaseActivity; import com.gh.common.util.EntranceUtils; import com.gh.gamecenter.download.DownloadFragment; @@ -13,7 +12,7 @@ import com.gh.gamecenter.download.DownloadFragment; * * @author 黄壮华 */ -public class DownloadManagerActivity extends BaseActivity { +public class DownloadManagerActivity extends NormalActivity { public static final int INDEX_DOWNLOAD = 0; public static final int INDEX_UPDATE = 1; @@ -22,51 +21,53 @@ public class DownloadManagerActivity extends BaseActivity { public static final String TAG = "DownloadManagerActivity"; - // TODO: 20/09/17 增加currentItem 入口 插件更新可能需要 public static Intent getDownloadMangerIntent(Context context, String url, String entrance) { - Intent intent = new Intent(context, DownloadManagerActivity.class); - intent.putExtra(EntranceUtils.KEY_URL, url); - intent.putExtra(EntranceUtils.KEY_ENTRANCE, entrance); - return intent; +// Intent intent = new Intent(context, DownloadManagerActivity.class); +// intent.putExtra(EntranceUtils.KEY_URL, url); +// intent.putExtra(EntranceUtils.KEY_ENTRANCE, entrance); + Bundle bundle = new Bundle(); + bundle.putString(EntranceUtils.KEY_URL, url); + bundle.putString(EntranceUtils.KEY_ENTRANCE, entrance); + return getIntent(context, DownloadFragment.class, bundle); } - public static void startDownloadManagerActivity(Context context, String url, String entrance) { - Intent intent = new Intent(context, DownloadManagerActivity.class); - intent.putExtra(EntranceUtils.KEY_URL, url); - intent.putExtra(EntranceUtils.KEY_ENTRANCE, entrance); - intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); - context.startActivity(intent); - } +// public static void startDownloadManagerActivity(Context context, String url, String entrance) { +// Intent intent = new Intent(context, DownloadManagerActivity.class); +// intent.putExtra(EntranceUtils.KEY_URL, url); +// intent.putExtra(EntranceUtils.KEY_ENTRANCE, entrance); +// intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); +// context.startActivity(intent); +// } +// +// @Override +// protected int getLayoutId() { +// return R.layout.activity_downloadmanager; +// } - @Override - protected int getLayoutId() { - return R.layout.activity_downloadmanager; - } - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - - setNavigationTitle(getString(R.string.title_downloadmanager)); - - startDownloadFragment(); - } - - private void startDownloadFragment() { - int currentItem = getIntent().getIntExtra(EntranceUtils.KEY_CURRENTITEM, 0); - Bundle data = getIntent().getBundleExtra(EntranceUtils.KEY_DATA); - if (data != null) { - currentItem = data.getInt(EntranceUtils.KEY_CURRENTITEM, 0); - } - - getSupportFragmentManager().beginTransaction().replace( - R.id.layout_fragment_content, DownloadFragment.newInstance(currentItem)).commitAllowingStateLoss(); - } - - @Override - protected void onNewIntent(Intent intent) { - super.onNewIntent(intent); - startDownloadFragment(); - setIntent(intent); - } +// @Override +// protected void onCreate(Bundle savedInstanceState) { +// super.onCreate(savedInstanceState); +// +// setNavigationTitle(getString(R.string.title_downloadmanager)); +// +// startDownloadFragment(); +// } +// +// private void startDownloadFragment() { +// int currentItem = getIntent().getIntExtra(EntranceUtils.KEY_CURRENTITEM, 0); +// Bundle data = getIntent().getBundleExtra(EntranceUtils.KEY_DATA); +// if (data != null) { +// currentItem = data.getInt(EntranceUtils.KEY_CURRENTITEM, 0); +// } +// +// getSupportFragmentManager().beginTransaction().replace( +// R.id.layout_fragment_content, DownloadFragment.newInstance(currentItem)).commitAllowingStateLoss(); +// } +// +// @Override +// protected void onNewIntent(Intent intent) { +// super.onNewIntent(intent); +// startDownloadFragment(); +// setIntent(intent); +// } } \ 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 b1d30dd63c..2e83a28321 100644 --- a/app/src/main/java/com/gh/gamecenter/GameDetailActivity.java +++ b/app/src/main/java/com/gh/gamecenter/GameDetailActivity.java @@ -6,13 +6,12 @@ import android.os.Bundle; import com.gh.common.util.EntranceUtils; import com.gh.gamecenter.entity.GameEntity; import com.gh.gamecenter.gamedetail.GameDetailFragment; -import com.halo.assistant.ui.IntentFactory; /** * Created by khy on 2017/3/24. * 游戏详情适配器 */ -public class GameDetailActivity extends CommonActivity { +public class GameDetailActivity extends NormalActivity { /** * 启动游戏详情页面 @@ -21,8 +20,9 @@ public class GameDetailActivity extends CommonActivity { 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(new IntentFactory.Builder(context).setActivity(GameDetailActivity.class) +// .setFragment(GameDetailFragment.class).setArgs(bundle).build()); + context.startActivity(getIntent(context, GameDetailFragment.class, bundle)); } /** @@ -32,8 +32,9 @@ public class GameDetailActivity extends CommonActivity { 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(new IntentFactory.Builder(context).setActivity(GameDetailActivity.class) +// .setFragment(GameDetailFragment.class).setArgs(bundle).build()); + context.startActivity(getIntent(context, 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 5131b8415e..d02ce405f3 100644 --- a/app/src/main/java/com/gh/gamecenter/GameNewsActivity.java +++ b/app/src/main/java/com/gh/gamecenter/GameNewsActivity.java @@ -7,14 +7,13 @@ import android.support.annotation.NonNull; import com.gh.common.util.EntranceUtils; import com.halo.assistant.fragment.game.GameNewsSearchFragment; -import com.halo.assistant.ui.IntentFactory; /** * Created by LGT on 2016/8/29. * 游戏新闻界面，由于MTA界面统计未重新记录的原因，暂留此傀儡，连名字都不能改，真是可怕 */ @Deprecated -public class GameNewsActivity extends CommonActivity { +public class GameNewsActivity extends NormalActivity { @NonNull public static Intent getIntent(Context context, String gameName, String gameId, String entrance) { @@ -28,9 +27,10 @@ public class GameNewsActivity extends CommonActivity { 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 new IntentFactory.Builder(context) +// .setActivity(GameNewsActivity.class) +// .setFragment(GameNewsSearchFragment.class).setArgs(args).build(); + return getIntent(context, 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 593f43007b..4f56968583 100644 --- a/app/src/main/java/com/gh/gamecenter/KaiFuActivity.java +++ b/app/src/main/java/com/gh/gamecenter/KaiFuActivity.java @@ -28,15 +28,16 @@ import butterknife.BindView; * Created by khy on 18/08/17. */ @Deprecated -public class KaiFuActivity extends CommonActivity { +public class KaiFuActivity extends NormalActivity { @NonNull 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 new IntentFactory.Builder(context) +// .setActivity(KaiFuActivity.class) +// .setFragment(KaiFuWrapperFragment.class).setArgs(args).build(); + return getIntent(context, KaiFuWrapperFragment.class, args); } } diff --git a/app/src/main/java/com/gh/gamecenter/LibaoActivity.java b/app/src/main/java/com/gh/gamecenter/LibaoActivity.java index 738075acf0..15588ed9cc 100644 --- a/app/src/main/java/com/gh/gamecenter/LibaoActivity.java +++ b/app/src/main/java/com/gh/gamecenter/LibaoActivity.java @@ -7,21 +7,21 @@ import android.support.annotation.NonNull; import com.gh.common.util.EntranceUtils; import com.gh.gamecenter.libao.LibaoWrapperFragment; -import com.halo.assistant.ui.IntentFactory; /** * Created by khy on 2016/12/12. */ @Deprecated -public class LibaoActivity extends CommonActivity { +public class LibaoActivity extends NormalActivity { @NonNull public static Intent getIntent(Context context, String entrance) { Bundle args = new Bundle(); args.putString(EntranceUtils.KEY_ENTRANCE, entrance); - return new IntentFactory.Builder(context) - .setActivity(LibaoActivity.class) - .setFragment(LibaoWrapperFragment.class).setArgs(args).build(); +// return new IntentFactory.Builder(context) +// .setActivity(LibaoActivity.class) +// .setFragment(LibaoWrapperFragment.class).setArgs(args).build(); + return getIntent(context, LibaoWrapperFragment.class, args); } } diff --git a/app/src/main/java/com/gh/gamecenter/LoginActivity.java b/app/src/main/java/com/gh/gamecenter/LoginActivity.java index 24eac51802..f06fe60719 100644 --- a/app/src/main/java/com/gh/gamecenter/LoginActivity.java +++ b/app/src/main/java/com/gh/gamecenter/LoginActivity.java @@ -2,46 +2,18 @@ package com.gh.gamecenter; import android.content.Context; import android.content.Intent; -import android.os.Bundle; import android.support.annotation.NonNull; -import com.gh.base.BaseActivity; -import com.gh.common.util.GetLoginDataUtils; import com.gh.gamecenter.fragment.LoginFragment; -import com.tencent.connect.common.Constants; /** * Created by khy on 14/08/17. */ -public class LoginActivity extends BaseActivity { +public class LoginActivity extends NormalActivity { @NonNull public static Intent getIntent(Context context) { - return new Intent(context, LoginActivity.class); + return getIntent(context, LoginFragment.class); } - - @Override - protected int getLayoutId() { - return R.layout.activity_login; - } - - @Override - protected void onActivityResult(int requestCode, int resultCode, Intent data) { - super.onActivityResult(requestCode, resultCode, data); - if (requestCode == Constants.REQUEST_LOGIN) { // QQ Login callback - GetLoginDataUtils.getInstance(this).onQQCallback(requestCode, resultCode, data); - } else if (requestCode == 32973) { - GetLoginDataUtils.getInstance(this).onWeiboCallback(requestCode, resultCode, data); - } - - } - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setNavigationTitle("登录光环助手"); - getSupportFragmentManager().beginTransaction().replace(R.id.layout_fragment_content, new LoginFragment()).commitAllowingStateLoss(); - } - } diff --git a/app/src/main/java/com/gh/gamecenter/MessageActivity.java b/app/src/main/java/com/gh/gamecenter/MessageActivity.java index cbddfda75b..6dc83d6630 100644 --- a/app/src/main/java/com/gh/gamecenter/MessageActivity.java +++ b/app/src/main/java/com/gh/gamecenter/MessageActivity.java @@ -4,18 +4,18 @@ import android.content.Context; import android.content.Intent; import com.gh.gamecenter.message.MessageCenterFragment; -import com.halo.assistant.ui.IntentFactory; /** * Created by khy on 21/07/17. */ @Deprecated -public class MessageActivity extends CommonActivity { +public class MessageActivity extends NormalActivity { public static Intent getIntent(Context context) { - return new IntentFactory.Builder(context) - .setActivity(MessageActivity.class) - .setFragment(MessageCenterFragment.class).build(); +// return new IntentFactory.Builder(context) +// .setActivity(MessageActivity.class) +// .setFragment(MessageCenterFragment.class).build(); + return getIntent(context, MessageCenterFragment.class); } } diff --git a/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java b/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java index 6ebdcc524e..5e3442c6e0 100644 --- a/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java +++ b/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java @@ -497,11 +497,6 @@ public class NewsDetailActivity extends BaseActivity implements OnClickListener, }); } - /** - * 增加手势监听，控制字体大小 - * - * @author 柯皓源 - */ @Override public boolean dispatchTouchEvent(MotionEvent ev) { switch (ev.getAction() & MotionEventCompat.ACTION_MASK) { diff --git a/app/src/main/java/com/gh/gamecenter/NewsSearchActivity.java b/app/src/main/java/com/gh/gamecenter/NewsSearchActivity.java index c96f3bf4fd..4b0b9023f2 100644 --- a/app/src/main/java/com/gh/gamecenter/NewsSearchActivity.java +++ b/app/src/main/java/com/gh/gamecenter/NewsSearchActivity.java @@ -7,14 +7,13 @@ import android.support.annotation.NonNull; import com.gh.common.util.EntranceUtils; import com.halo.assistant.fragment.game.GameNewsSearchResultFragment; -import com.halo.assistant.ui.IntentFactory; /** * Created by khy on 2016/8/22. * 新闻搜索界面 */ @Deprecated -public class NewsSearchActivity extends CommonActivity { +public class NewsSearchActivity extends NormalActivity { @NonNull public static Intent getIntent(Context context, String gameName, String searchKey, String gameId, String entrance) { @@ -23,9 +22,10 @@ public class NewsSearchActivity extends CommonActivity { 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 new IntentFactory.Builder(context) +// .setActivity(NewsSearchActivity.class) +// .setFragment(GameNewsSearchResultFragment.class).setArgs(args).build(); + return getIntent(context, GameNewsSearchResultFragment.class, args); } } diff --git a/app/src/main/java/com/gh/gamecenter/NormalActivity.java b/app/src/main/java/com/gh/gamecenter/NormalActivity.java index 61c9a6d991..2909ee9ec1 100644 --- a/app/src/main/java/com/gh/gamecenter/NormalActivity.java +++ b/app/src/main/java/com/gh/gamecenter/NormalActivity.java @@ -36,6 +36,22 @@ public class NormalActivity extends BaseActivity implements ToolbarController, T public static final String NORMAL_FRAGMENT_NAME = "normalFragmentName"; public static final String NORMAL_FRAGMENT_BUNDLE = "normalFragmentBundle"; + @Deprecated + protected static Intent getIntent(Context context, Class t) { + Intent intent = new Intent(context, NormalActivity.class); + intent.putExtra(NORMAL_FRAGMENT_NAME, t.getCanonicalName()); + return intent; + } + + @Deprecated + protected static Intent getIntent(Context context, Class t, Bundle bundle) { + Intent intent = new Intent(context, NormalActivity.class); + intent.putExtra(NORMAL_FRAGMENT_NAME, t.getCanonicalName()); + intent.putExtra(NORMAL_FRAGMENT_BUNDLE, bundle); + return intent; + } + + public static void startFragment(Context context, Class t) { Intent intent = new Intent(context, NormalActivity.class); intent.putExtra(NORMAL_FRAGMENT_NAME, t.getCanonicalName()); diff --git a/app/src/main/java/com/gh/gamecenter/SelectUserIconActivity.java b/app/src/main/java/com/gh/gamecenter/SelectUserIconActivity.java index 9db5b06bb0..59bbf2030c 100644 --- a/app/src/main/java/com/gh/gamecenter/SelectUserIconActivity.java +++ b/app/src/main/java/com/gh/gamecenter/SelectUserIconActivity.java @@ -5,19 +5,19 @@ import android.content.Intent; import android.support.annotation.NonNull; import com.halo.assistant.fragment.user.SelectPortraitFragment; -import com.halo.assistant.ui.IntentFactory; /** * Created by khy on 2017/2/10. */ @Deprecated -public class SelectUserIconActivity extends CommonActivity { +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 new IntentFactory.Builder(context) +// .setActivity(SelectUserIconActivity.class) +// .setFragment(SelectPortraitFragment.class).build(); + return getIntent(context, 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 aa662ace24..b4de920d0d 100644 --- a/app/src/main/java/com/gh/gamecenter/SettingActivity.java +++ b/app/src/main/java/com/gh/gamecenter/SettingActivity.java @@ -2,10 +2,11 @@ package com.gh.gamecenter; import android.content.Context; import android.content.Intent; +import android.os.Bundle; import android.support.annotation.NonNull; +import com.gh.common.util.EntranceUtils; import com.halo.assistant.fragment.SettingsFragment; -import com.halo.assistant.ui.IntentFactory; /** * 游戏设置页面 @@ -14,17 +15,20 @@ import com.halo.assistant.ui.IntentFactory; * @since 0814 */ @Deprecated -public class SettingActivity extends CommonActivity { +public class SettingActivity extends NormalActivity { @NonNull public static Intent getIntent(Context context, 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(); +// return new IntentFactory.Builder(context) +// .setEntrance(entrance) +// .setActivity(SettingActivity.class) +// .setFragment(SettingsFragment.class).build(); + Bundle args = new Bundle(); + args.putString(EntranceUtils.KEY_ENTRANCE, entrance); + return getIntent(context, SettingsFragment.class); } } diff --git a/app/src/main/java/com/gh/gamecenter/SubjectActivity.java b/app/src/main/java/com/gh/gamecenter/SubjectActivity.java index 81650caac1..5fae45ca90 100644 --- a/app/src/main/java/com/gh/gamecenter/SubjectActivity.java +++ b/app/src/main/java/com/gh/gamecenter/SubjectActivity.java @@ -5,14 +5,13 @@ import android.os.Bundle; import com.gh.common.util.EntranceUtils; import com.gh.gamecenter.subject.SubjectWrapperFragment; -import com.halo.assistant.ui.IntentFactory; /** * Created by khy on 2017/4/29. */ @Deprecated -public class SubjectActivity extends CommonActivity { +public class SubjectActivity extends NormalActivity { /** * 启动专题页面 @@ -24,10 +23,11 @@ public class SubjectActivity extends CommonActivity { args.putBoolean(EntranceUtils.KEY_ORDER, isOrder); args.putString(EntranceUtils.KEY_ENTRANCE, entrance); - new IntentFactory.Builder(context) - .setArgs(args) - .setActivity(SubjectActivity.class) - .setFragment(SubjectWrapperFragment.class).start(); +// new IntentFactory.Builder(context) +// .setArgs(args) +// .setActivity(SubjectActivity.class) +// .setFragment(SubjectWrapperFragment.class).start(); + context.startActivity(getIntent(context, SubjectWrapperFragment.class, args)); } } diff --git a/app/src/main/java/com/gh/gamecenter/UserInfoActivity.java b/app/src/main/java/com/gh/gamecenter/UserInfoActivity.java index 19edee6ab7..15c2cadc2b 100644 --- a/app/src/main/java/com/gh/gamecenter/UserInfoActivity.java +++ b/app/src/main/java/com/gh/gamecenter/UserInfoActivity.java @@ -5,19 +5,19 @@ import android.content.Intent; import android.support.annotation.NonNull; import com.halo.assistant.fragment.user.UserInfoFragment; -import com.halo.assistant.ui.IntentFactory; /** * Created by khy on 23/06/17. */ @Deprecated -public class UserInfoActivity extends CommonActivity { +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 new IntentFactory.Builder(context) +// .setActivity(UserInfoActivity.class) +// .setFragment(UserInfoFragment.class).build(); + return getIntent(context, 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 77d18469dd..e9bb1d2a00 100644 --- a/app/src/main/java/com/gh/gamecenter/UserInfoEditActivity.java +++ b/app/src/main/java/com/gh/gamecenter/UserInfoEditActivity.java @@ -7,22 +7,22 @@ import android.support.annotation.NonNull; import com.gh.gamecenter.login.UserViewModel; import com.halo.assistant.fragment.user.UserInfoEditFragment; -import com.halo.assistant.ui.IntentFactory; /** * Created by khy on 30/06/17. */ @Deprecated -public class UserInfoEditActivity extends CommonActivity { +public class UserInfoEditActivity extends NormalActivity { @NonNull 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 new IntentFactory.Builder(context) +// .setArgs(args) +// .setActivity(UserInfoEditActivity.class) +// .setFragment(UserInfoEditFragment.class).build(); + return getIntent(context, 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 c4c0341c25..5cc22fd0a1 100644 --- a/app/src/main/java/com/gh/gamecenter/UserRegionActivity.java +++ b/app/src/main/java/com/gh/gamecenter/UserRegionActivity.java @@ -4,18 +4,18 @@ import android.content.Context; import android.content.Intent; import com.halo.assistant.fragment.user.SelectRegionFragment; -import com.halo.assistant.ui.IntentFactory; /** * Created by khy on 25/09/17. */ @Deprecated -public class UserRegionActivity extends CommonActivity { +public class UserRegionActivity extends NormalActivity { public static Intent getIntent(Context context) { - return new IntentFactory.Builder(context) - .setActivity(UserRegionActivity.class) - .setFragment(SelectRegionFragment.class).build(); +// return new IntentFactory.Builder(context) +// .setActivity(UserRegionActivity.class) +// .setFragment(SelectRegionFragment.class).build(); + return getIntent(context, 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 35cc5931eb..8e4d5eb77c 100644 --- a/app/src/main/java/com/gh/gamecenter/VoteActivity.java +++ b/app/src/main/java/com/gh/gamecenter/VoteActivity.java @@ -2,28 +2,29 @@ package com.gh.gamecenter; import android.content.Context; import android.content.Intent; +import android.os.Bundle; import android.support.annotation.NonNull; import com.gh.common.util.EntranceUtils; import com.halo.assistant.fragment.VoteFragment; -import com.halo.assistant.ui.IntentFactory; /** * Created by khy on 2017/4/11. * 求版本投票页面 */ @Deprecated -public class VoteActivity extends CommonActivity { +public class VoteActivity extends NormalActivity { @NonNull public static Intent getIntent(Context context, String gameName, String gameId) { - Intent intent = new Intent(context, VoteActivity.class); - intent.putExtra(EntranceUtils.KEY_GAMENAME, gameName); - intent.putExtra(EntranceUtils.KEY_GAMEID, gameId); - return new IntentFactory.Builder(context) - .setArgs(intent.getExtras()) - .setActivity(VoteActivity.class) - .setFragment(VoteFragment.class).build(); + 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 getIntent(context, 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 d3636548f1..7134b2736f 100644 --- a/app/src/main/java/com/gh/gamecenter/WebActivity.java +++ b/app/src/main/java/com/gh/gamecenter/WebActivity.java @@ -2,6 +2,7 @@ package com.gh.gamecenter; import android.content.Context; import android.content.Intent; +import android.os.Bundle; import android.support.annotation.NonNull; import com.gh.common.util.EntranceUtils; @@ -9,73 +10,99 @@ import com.gh.gamecenter.entity.ConcernEntity; import com.gh.gamecenter.entity.NewsEntity; import com.gh.gamecenter.entity.ToolBoxEntity; import com.halo.assistant.fragment.WebFragment; -import com.halo.assistant.ui.IntentFactory; /** * Created by khy on 2016/10/18. */ @Deprecated -public class WebActivity extends CommonActivity { +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(); +// 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)); + return getIntent(context, WebFragment.class, bundle); } @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(); +// 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); + bundle.putString(EntranceUtils.KEY_GAMENAME, toolBoxEntity.getName()); + bundle.putParcelable(ToolBoxEntity.TAG, toolBoxEntity); + bundle.putBoolean(WebFragment.KEY_ISCOLLECTIONTOOLS, isCollectionTools); + return getIntent(context, WebFragment.class, bundle); } @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(); +// 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()); + bundle.putString(EntranceUtils.KEY_NEWSID, concernEntity.getId()); + bundle.putString(EntranceUtils.KEY_ENTRANCE, entrance); + return getIntent(context, WebFragment.class, bundle); } @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(); +// 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()); + bundle.putString(EntranceUtils.KEY_NEWSID, newsEntity.getId()); + bundle.putString(EntranceUtils.KEY_ENTRANCE, entrance); + return getIntent(context, WebFragment.class, bundle); } @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(); +// 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 getIntent(context, WebFragment.class, bundle); } } diff --git a/app/src/main/java/com/gh/gamecenter/adapter/PlatformAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/PlatformAdapter.java index 322c80dcc6..91a4dd567f 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/PlatformAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/PlatformAdapter.java @@ -146,8 +146,8 @@ public class PlatformAdapter extends BaseRecyclerAdapter { case "插件化下载中": case "更新下载中": // 打开下载管理界面 - DownloadManagerActivity.startDownloadManagerActivity(mContext, apkEntity.getUrl() - , mEntrance + "(" + mLocation.split(":")[0] + ")"); + mContext.startActivity(DownloadManagerActivity.getDownloadMangerIntent(mContext, apkEntity.getUrl() + , mEntrance + "(" + mLocation.split(":")[0] + ")")); break; case "启动": Map kv = new HashMap<>(); diff --git a/app/src/main/java/com/gh/gamecenter/ask/AskQuestionsNewFragment.java b/app/src/main/java/com/gh/gamecenter/ask/AskQuestionsNewFragment.java index ba8bbcf7e0..a5d3998e72 100644 --- a/app/src/main/java/com/gh/gamecenter/ask/AskQuestionsNewFragment.java +++ b/app/src/main/java/com/gh/gamecenter/ask/AskQuestionsNewFragment.java @@ -17,7 +17,7 @@ import com.gh.base.adapter.FragmentAdapter; import com.gh.base.fragment.BaseFragment; import com.gh.common.util.ImageUtils; import com.gh.common.view.TabIndicatorView; -import com.gh.gamecenter.AskTabOrderActivity; +import com.gh.gamecenter.NormalActivity; import com.gh.gamecenter.R; import com.gh.gamecenter.ask.entity.AskTagGroupsEntity; import com.gh.gamecenter.ask.viewmodel.AskQuestionsNewViewModel; @@ -152,7 +152,7 @@ public class AskQuestionsNewFragment extends BaseFragment { tagList.setIcon("res:///" + R.drawable.ask_tag_order); tabView = getTabView(tagList); tabView.setOnClickListener((view)->{ - startActivity(AskTabOrderActivity.getIntent(getContext())); + NormalActivity.startFragment(getContext(), AskTabOrderFragment.class); }); } tab.setCustomView(tabView); diff --git a/app/src/main/java/com/gh/gamecenter/adapter/AskTabOrderAdapter.java b/app/src/main/java/com/gh/gamecenter/ask/AskTabOrderAdapter.java similarity index 97% rename from app/src/main/java/com/gh/gamecenter/adapter/AskTabOrderAdapter.java rename to app/src/main/java/com/gh/gamecenter/ask/AskTabOrderAdapter.java index d1ab7d5dfa..b7b8d965ed 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/AskTabOrderAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/ask/AskTabOrderAdapter.java @@ -1,4 +1,4 @@ -package com.gh.gamecenter.adapter; +package com.gh.gamecenter.ask; import android.content.Context; import android.support.v7.widget.RecyclerView; diff --git a/app/src/main/java/com/gh/gamecenter/AskTabOrderActivity.java b/app/src/main/java/com/gh/gamecenter/ask/AskTabOrderFragment.java similarity index 89% rename from app/src/main/java/com/gh/gamecenter/AskTabOrderActivity.java rename to app/src/main/java/com/gh/gamecenter/ask/AskTabOrderFragment.java index 33ff1b062d..fbd21c803c 100644 --- a/app/src/main/java/com/gh/gamecenter/AskTabOrderActivity.java +++ b/app/src/main/java/com/gh/gamecenter/ask/AskTabOrderFragment.java @@ -1,10 +1,8 @@ -package com.gh.gamecenter; +package com.gh.gamecenter.ask; import android.app.Service; import android.arch.lifecycle.Observer; import android.arch.lifecycle.ViewModelProviders; -import android.content.Context; -import android.content.Intent; import android.graphics.Color; import android.os.Bundle; import android.os.Vibrator; @@ -19,10 +17,10 @@ import android.view.MotionEvent; import android.view.View; import android.widget.TextView; -import com.gh.base.BaseActivity; -import com.gh.gamecenter.adapter.AskTabOrderAdapter; +import com.gh.gamecenter.R; import com.gh.gamecenter.ask.entity.AskTagGroupsEntity; import com.gh.gamecenter.ask.viewmodel.AskQuestionsNewViewModel; +import com.gh.gamecenter.normal.NormalFragment; import java.util.Collections; import java.util.List; @@ -30,9 +28,11 @@ import java.util.List; import butterknife.BindView; /** - * Created by khy on 6/12/17. + * Created by khy on 26/12/17. */ -public class AskTabOrderActivity extends BaseActivity { + +public class AskTabOrderFragment extends NormalFragment { + @BindView(R.id.asktab_order_hint) TextView mAsktabOrderHint; @BindView(R.id.asktab_order_rv) @@ -46,22 +46,17 @@ public class AskTabOrderActivity extends BaseActivity { private List mTagList; - @NonNull - public static Intent getIntent(Context context) { - return new Intent(context, AskTabOrderActivity.class); - } - @Override protected int getLayoutId() { return R.layout.activity_asktab_order; } @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); + public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) { + super.onViewCreated(view, savedInstanceState); setNavigationTitle(getString(R.string.ask_tab_order_title)); - final AskQuestionsNewViewModel.Factory factory = new AskQuestionsNewViewModel.Factory(getApplication()); + final AskQuestionsNewViewModel.Factory factory = new AskQuestionsNewViewModel.Factory(getActivity().getApplication()); mViewModel = ViewModelProviders.of(this, factory) .get(AskQuestionsNewViewModel.class); @@ -75,7 +70,7 @@ public class AskTabOrderActivity extends BaseActivity { } } else { mViewModel.cacheAndNotifyTagGroups(null); - finish(); + getActivity().finish(); } } }); @@ -84,9 +79,9 @@ public class AskTabOrderActivity extends BaseActivity { private void initView() { itemTouchHelper.attachToRecyclerView(mAsktabOrderRv); - mAsktabOrderRv.setLayoutManager(new GridLayoutManager(this, 5)); + mAsktabOrderRv.setLayoutManager(new GridLayoutManager(getContext(), 5)); - mAdapter = new AskTabOrderAdapter(this, mTagList); + mAdapter = new AskTabOrderAdapter(getContext(), mTagList); mAsktabOrderRv.setAdapter(mAdapter); mAsktabOrderRv.addOnItemTouchListener(new OnRvLongClickListener(mAsktabOrderRv) { @@ -106,7 +101,7 @@ public class AskTabOrderActivity extends BaseActivity { } if (actionState == ItemTouchHelper.ACTION_STATE_DRAG) { //获取系统震动服务 - Vibrator vib = (Vibrator) getSystemService(Service.VIBRATOR_SERVICE); + Vibrator vib = (Vibrator) getContext().getSystemService(Service.VIBRATOR_SERVICE); if (vib != null) vib.vibrate(70); } super.onSelectedChanged(viewHolder, actionState); diff --git a/app/src/main/java/com/gh/gamecenter/download/DownloadFragment.java b/app/src/main/java/com/gh/gamecenter/download/DownloadFragment.java index 010e7495de..7a22497cc3 100644 --- a/app/src/main/java/com/gh/gamecenter/download/DownloadFragment.java +++ b/app/src/main/java/com/gh/gamecenter/download/DownloadFragment.java @@ -105,6 +105,8 @@ public class DownloadFragment extends BaseFragment_ViewPager_Checkable { public void onViewCreated(View view, @Nullable Bundle savedInstanceState) { super.onViewCreated(view, savedInstanceState); + setNavigationTitle(getString(R.string.title_downloadmanager)); + int updateSize = PackageManager.getUpdateList().size(); if (updateSize != 0) { mDownloadmanagerUpdateNumber.setVisibility(View.VISIBLE); diff --git a/app/src/main/java/com/gh/gamecenter/fragment/LoginFragment.java b/app/src/main/java/com/gh/gamecenter/fragment/LoginFragment.java index fb0d215666..3718caee4e 100644 --- a/app/src/main/java/com/gh/gamecenter/fragment/LoginFragment.java +++ b/app/src/main/java/com/gh/gamecenter/fragment/LoginFragment.java @@ -3,6 +3,7 @@ package com.gh.gamecenter.fragment; import android.app.Dialog; import android.arch.lifecycle.Observer; import android.arch.lifecycle.ViewModelProviders; +import android.content.Intent; import android.graphics.drawable.Drawable; import android.os.Bundle; import android.os.Handler; @@ -16,7 +17,6 @@ import android.view.View; import android.widget.EditText; import android.widget.TextView; -import com.gh.base.fragment.BaseFragment; import com.gh.common.util.DialogUtils; import com.gh.common.util.GetLoginDataUtils; import com.gh.common.util.LoginUtils; @@ -27,7 +27,9 @@ import com.gh.gamecenter.eventbus.EBReuse; import com.gh.gamecenter.login.ApiResponse; import com.gh.gamecenter.login.LoginTag; import com.gh.gamecenter.login.UserViewModel; +import com.gh.gamecenter.normal.NormalFragment; import com.gh.gamecenter.personal.PersonalFragment; +import com.tencent.connect.common.Constants; import org.greenrobot.eventbus.EventBus; import org.json.JSONObject; @@ -42,7 +44,7 @@ import butterknife.OnClick; * Created by khy on 14/08/17. */ -public class LoginFragment extends BaseFragment implements LoginUtils.onCaptchaCallBackListener +public class LoginFragment extends NormalFragment implements LoginUtils.onCaptchaCallBackListener , GetLoginDataUtils.OnLoginDataListener, View.OnClickListener, Observer> { @BindView(R.id.login_phone_et) @@ -83,6 +85,16 @@ public class LoginFragment extends BaseFragment implements LoginUtils.onCaptchaC } }; + @Override + public void onActivityResult(int requestCode, int resultCode, Intent data) { + super.onActivityResult(requestCode, resultCode, data); + if (requestCode == Constants.REQUEST_LOGIN) { // QQ Login callback + GetLoginDataUtils.getInstance(getContext()).onQQCallback(requestCode, resultCode, data); + } else if (requestCode == 32973) { // WeiBo Login callback + GetLoginDataUtils.getInstance(getContext()).onWeiboCallback(requestCode, resultCode, data); + } + } + @Override protected int getLayoutId() { @@ -92,6 +104,7 @@ public class LoginFragment extends BaseFragment implements LoginUtils.onCaptchaC @Override public void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); + setNavigationTitle("登录光环助手"); final UserViewModel.Factory factory = new UserViewModel.Factory(getActivity().getApplication()); mUserViewModel = ViewModelProviders.of(this, factory).get(UserViewModel.class); diff --git a/app/src/main/java/com/gh/gamecenter/fragment/SearchToolbarFragment.java b/app/src/main/java/com/gh/gamecenter/fragment/SearchToolbarFragment.java index c8f41fe68c..3e82c68fb3 100644 --- a/app/src/main/java/com/gh/gamecenter/fragment/SearchToolbarFragment.java +++ b/app/src/main/java/com/gh/gamecenter/fragment/SearchToolbarFragment.java @@ -209,7 +209,7 @@ public class SearchToolbarFragment extends BaseFragment implements View.OnClickL DataUtils.onEvent(getActivity(), "主页", "下载图标"); DataCollectionUtils.uploadClick(getActivity(), "下载图标", "主页"); - DownloadManagerActivity.startDownloadManagerActivity(getContext(), null, "(工具栏)"); + startActivity(DownloadManagerActivity.getDownloadMangerIntent(getContext(), null, "(工具栏)")); break; case R.id.actionbar_iv_search: DataUtils.onEvent(getActivity(), "主页", "搜索图标"); diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailFragment.java b/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailFragment.java index 5f37c44719..ceb68dbe7d 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailFragment.java +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailFragment.java @@ -9,8 +9,6 @@ import android.support.v4.app.Fragment; import android.support.v4.content.ContextCompat; import android.support.v4.view.ViewPager; import android.text.TextUtils; -import android.view.Menu; -import android.view.MenuInflater; import android.view.MenuItem; import android.view.MotionEvent; import android.view.View; @@ -18,7 +16,6 @@ import android.widget.TextView; import com.facebook.drawee.view.SimpleDraweeView; import com.gh.base.BaseActivity; -import com.gh.base.fragment.BaseFragment; import com.gh.common.util.ApkActiveUtils; import com.gh.common.util.CheckLoginUtils; import com.gh.common.util.ConcernUtils; @@ -41,6 +38,7 @@ import com.gh.gamecenter.eventbus.EBConcernChanged; import com.gh.gamecenter.eventbus.EBDownloadStatus; import com.gh.gamecenter.eventbus.EBPackage; import com.gh.gamecenter.eventbus.EBReuse; +import com.gh.gamecenter.normal.NormalFragment; import com.gh.gamecenter.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; import com.lightgame.adapter.BaseFragmentPagerAdapter; @@ -69,7 +67,7 @@ import rx.schedulers.Schedulers; * Created by CsHeng on 19/12/2017. * \游戏详情适配器 */ -public class GameDetailFragment extends BaseFragment implements View.OnTouchListener { +public class GameDetailFragment extends NormalFragment implements View.OnTouchListener { public static final int INDEX_DYNAMIC = 0; @@ -161,41 +159,11 @@ public class GameDetailFragment extends BaseFragment implements View.OnTouchList } - @Override - public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { - super.onCreateOptionsMenu(menu, inflater); - inflater.inflate(R.menu.menu_share, menu); - } - - @Override - public boolean onOptionsItemSelected(MenuItem item) { - - switch (item.getItemId()) { - case R.id.menu_share: - if (!TextUtils.isEmpty(shareCode)) { - Map kv = new HashMap<>(); - kv.put("点击", "分享"); - DataUtils.onEvent(getContext(), "插件数据", mGameEntity.getName(), kv); - - DataCollectionUtils.uploadClick(getContext(), "分享", "游戏详情", mGameEntity.getName()); - - String url = "http://www.ghzs666.com/game/" + shareCode; - if (getActivity() instanceof BaseActivity) { - ((BaseActivity) getActivity()).showShare(url, mGameEntity.getName(), mGameEntity.getIcon(), - null, mGameEntity.getTag(), false); - } - } - break; - } - - return super.onOptionsItemSelected(item); - } - @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setHasOptionsMenu(true); - setNavigationTitle(""); +// setNavigationTitle(""); + initMenu(R.menu.menu_share); mViewPager.setScrollable(true); @@ -212,7 +180,7 @@ public class GameDetailFragment extends BaseFragment implements View.OnTouchList mGameEntity = args.getParcelable(GameEntity.TAG); if (mGameEntity != null) { mGameId = mGameEntity.getId(); - setNavigationTitle(mGameEntity.getName()); +// setNavigationTitle(mGameEntity.getName()); title = mGameEntity.getName(); } } @@ -277,6 +245,27 @@ public class GameDetailFragment extends BaseFragment implements View.OnTouchList } + @Override + public void onMenuItemClick(MenuItem menuItem) { + switch (menuItem.getItemId()) { + case R.id.menu_share: + if (!TextUtils.isEmpty(shareCode)) { + Map kv = new HashMap<>(); + kv.put("点击", "分享"); + DataUtils.onEvent(getContext(), "插件数据", mGameEntity.getName(), kv); + + DataCollectionUtils.uploadClick(getContext(), "分享", "游戏详情", mGameEntity.getName()); + + String url = "http://www.ghzs666.com/game/" + shareCode; + if (getActivity() instanceof BaseActivity) { + ((BaseActivity) getActivity()).showShare(url, mGameEntity.getName(), mGameEntity.getIcon(), + null, mGameEntity.getTag(), false); + } + } + break; + } + } + @Override public void onPause() { super.onPause(); diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailKaiFuAdapter.java b/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailKaiFuAdapter.java index 87693e78ae..312f835de7 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailKaiFuAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailKaiFuAdapter.java @@ -224,6 +224,7 @@ public class GameDetailKaiFuAdapter extends BaseRecyclerAdapter { isNextMonth = true; if (curMonth == 12) { curMonth = 1; + curYear ++; } else { curMonth = curMonth + 1; } diff --git a/app/src/main/java/com/gh/gamecenter/kaifu/KaiFuWrapperFragment.java b/app/src/main/java/com/gh/gamecenter/kaifu/KaiFuWrapperFragment.java index 8e86da2fd3..efe6e2fb62 100644 --- a/app/src/main/java/com/gh/gamecenter/kaifu/KaiFuWrapperFragment.java +++ b/app/src/main/java/com/gh/gamecenter/kaifu/KaiFuWrapperFragment.java @@ -8,10 +8,10 @@ import android.view.MenuItem; import android.view.View; import android.widget.TextView; -import com.gh.base.fragment.BaseFragment; import com.gh.common.util.EntranceUtils; import com.gh.gamecenter.R; import com.gh.gamecenter.eventbus.EBKaiFuReset; +import com.gh.gamecenter.normal.NormalFragment; import org.greenrobot.eventbus.Subscribe; import org.greenrobot.eventbus.ThreadMode; @@ -21,7 +21,7 @@ import org.greenrobot.eventbus.ThreadMode; *

* 用于控制开服界面的切换 */ -public class KaiFuWrapperFragment extends BaseFragment { +public class KaiFuWrapperFragment extends NormalFragment { public static final String SINGLE_GAME_KAIFU = "SINGLE_GAME_KAIFU"; public static final String ALL_GAME_KAIFU = "ALL_GAME_KAIFU"; diff --git a/app/src/main/java/com/gh/gamecenter/libao/LibaoWrapperFragment.java b/app/src/main/java/com/gh/gamecenter/libao/LibaoWrapperFragment.java index 908fb4d0f8..24e176a8a1 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/LibaoWrapperFragment.java +++ b/app/src/main/java/com/gh/gamecenter/libao/LibaoWrapperFragment.java @@ -10,12 +10,12 @@ import android.widget.LinearLayout; import android.widget.TextView; import com.gh.base.adapter.FragmentAdapter; -import com.gh.base.fragment.BaseFragment; import com.gh.common.util.DisplayUtils; import com.gh.common.util.RandomUtils; import com.gh.gamecenter.R; import com.gh.gamecenter.eventbus.EBReuse; import com.gh.gamecenter.eventbus.EBUISwitch; +import com.gh.gamecenter.normal.NormalFragment; import com.lightgame.view.NoScrollableViewPager; import org.greenrobot.eventbus.EventBus; @@ -32,7 +32,7 @@ import butterknife.OnClick; * Created by CsHeng on 15/12/2017. */ -public class LibaoWrapperFragment extends BaseFragment implements View.OnClickListener, +public class LibaoWrapperFragment extends NormalFragment implements View.OnClickListener, ViewPager.OnPageChangeListener { @BindView(R.id.libao_vp_content) diff --git a/app/src/main/java/com/gh/gamecenter/receiver/DownloadReceiver.java b/app/src/main/java/com/gh/gamecenter/receiver/DownloadReceiver.java index 126667fcfb..a6ccf2f0cc 100644 --- a/app/src/main/java/com/gh/gamecenter/receiver/DownloadReceiver.java +++ b/app/src/main/java/com/gh/gamecenter/receiver/DownloadReceiver.java @@ -43,7 +43,7 @@ public class DownloadReceiver extends BroadcastReceiver { // 切换到游戏下载fragment EventBus.getDefault().post(new EBSkip(DownloadManagerActivity.TAG, DownloadManagerActivity.INDEX_UPDATE)); } else { - DownloadManagerActivity.startDownloadManagerActivity(context, null, ENTRANCE_DOWNLOAD); + context.startActivity(DownloadManagerActivity.getDownloadMangerIntent(context, null, ENTRANCE_DOWNLOAD)); } diff --git a/app/src/main/java/com/gh/gamecenter/subject/SubjectWrapperFragment.java b/app/src/main/java/com/gh/gamecenter/subject/SubjectWrapperFragment.java index 41657975c0..3b079e4582 100644 --- a/app/src/main/java/com/gh/gamecenter/subject/SubjectWrapperFragment.java +++ b/app/src/main/java/com/gh/gamecenter/subject/SubjectWrapperFragment.java @@ -9,10 +9,10 @@ import android.text.TextUtils; import android.view.View; import android.widget.LinearLayout; -import com.gh.base.fragment.BaseFragment; import com.gh.common.util.EntranceUtils; import com.gh.gamecenter.R; import com.gh.gamecenter.entity.SubjectHeadEntity; +import com.gh.gamecenter.normal.NormalFragment; import com.gh.gamecenter.retrofit.JSONObjectResponse; import com.gh.gamecenter.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; @@ -33,7 +33,7 @@ import rx.schedulers.Schedulers; /** * Created by CsHeng on 18/12/2017. */ -public class SubjectWrapperFragment extends BaseFragment { +public class SubjectWrapperFragment extends NormalFragment { @BindView(R.id.subject_viewpager) ViewPager mViewPager; diff --git a/app/src/main/java/com/halo/assistant/fragment/AboutFragment.java b/app/src/main/java/com/halo/assistant/fragment/AboutFragment.java index d3371d0324..06fefe6160 100644 --- a/app/src/main/java/com/halo/assistant/fragment/AboutFragment.java +++ b/app/src/main/java/com/halo/assistant/fragment/AboutFragment.java @@ -10,12 +10,12 @@ import android.widget.ProgressBar; import android.widget.RelativeLayout; import android.widget.TextView; -import com.gh.base.fragment.BaseFragment; import com.gh.common.util.PackageUtils; import com.gh.common.util.StringUtils; import com.gh.gamecenter.R; import com.gh.gamecenter.WebActivity; import com.gh.gamecenter.manager.UpdateManager; +import com.gh.gamecenter.normal.NormalFragment; import com.tencent.bugly.beta.tinker.TinkerManager; import java.lang.ref.WeakReference; @@ -28,7 +28,7 @@ import butterknife.OnLongClick; * Created by CsHeng on 14/12/2017. */ -public class AboutFragment extends BaseFragment { +public class AboutFragment extends NormalFragment { @BindView(R.id.about_version_tv) TextView mAboutVersion; diff --git a/app/src/main/java/com/halo/assistant/fragment/ApkCleanerFragment.java b/app/src/main/java/com/halo/assistant/fragment/ApkCleanerFragment.java index debafc6a96..feda117f04 100644 --- a/app/src/main/java/com/halo/assistant/fragment/ApkCleanerFragment.java +++ b/app/src/main/java/com/halo/assistant/fragment/ApkCleanerFragment.java @@ -12,7 +12,6 @@ import android.widget.CompoundButton; import android.widget.ProgressBar; import android.widget.TextView; -import com.gh.base.fragment.BaseFragment; import com.gh.common.util.DialogUtils; import com.gh.common.view.VerticalItemDecoration; import com.gh.gamecenter.MainActivity; @@ -20,6 +19,7 @@ import com.gh.gamecenter.R; import com.gh.gamecenter.adapter.CleanApkAdapter; import com.gh.gamecenter.entity.InstallGameEntity; import com.gh.gamecenter.eventbus.EBSkip; +import com.gh.gamecenter.normal.NormalFragment; import com.lightgame.utils.Utils; import org.greenrobot.eventbus.EventBus; @@ -36,7 +36,7 @@ import butterknife.OnClick; *

* 扫描并删除apk */ -public class ApkCleanerFragment extends BaseFragment implements CleanApkAdapter.OnScanListener { +public class ApkCleanerFragment extends NormalFragment implements CleanApkAdapter.OnScanListener { @BindView(R.id.apk_count) TextView mApkCount; diff --git a/app/src/main/java/com/halo/assistant/fragment/SettingsFragment.java b/app/src/main/java/com/halo/assistant/fragment/SettingsFragment.java index 3242e7ac0f..d643570125 100644 --- a/app/src/main/java/com/halo/assistant/fragment/SettingsFragment.java +++ b/app/src/main/java/com/halo/assistant/fragment/SettingsFragment.java @@ -16,7 +16,6 @@ import android.widget.RadioGroup; import android.widget.RelativeLayout; import android.widget.TextView; -import com.gh.base.fragment.BaseFragment; import com.gh.common.util.DialogUtils; import com.gh.common.util.LoginUtils; import com.gh.common.util.StringUtils; @@ -29,6 +28,7 @@ import com.gh.gamecenter.eventbus.EBReuse; import com.gh.gamecenter.eventbus.EBSkip; import com.gh.gamecenter.login.UserViewModel; import com.gh.gamecenter.manager.UserManager; +import com.gh.gamecenter.normal.NormalFragment; import com.kyleduo.switchbutton.SwitchButton; import com.lightgame.download.FileUtils; import com.lightgame.utils.Utils; @@ -52,7 +52,7 @@ import static java.lang.Thread.sleep; /** * Created by CsHeng on 12/12/2017. */ -public class SettingsFragment extends BaseFragment { +public class SettingsFragment extends NormalFragment { @BindView(R.id.setting_sb_autoinstall) SwitchButton mSettingAutoinstallSb; diff --git a/app/src/main/java/com/halo/assistant/fragment/VoteFragment.java b/app/src/main/java/com/halo/assistant/fragment/VoteFragment.java index 78fb2fce8f..07a90e1242 100644 --- a/app/src/main/java/com/halo/assistant/fragment/VoteFragment.java +++ b/app/src/main/java/com/halo/assistant/fragment/VoteFragment.java @@ -16,7 +16,6 @@ import android.widget.LinearLayout; import android.widget.TextView; import com.gc.materialdesign.views.ProgressBarCircularIndeterminate; -import com.gh.base.fragment.BaseFragment; import com.gh.common.util.CheckLoginUtils; import com.gh.common.util.DialogUtils; import com.gh.common.util.EntranceUtils; @@ -24,6 +23,7 @@ import com.gh.gamecenter.R; import com.gh.gamecenter.adapter.VoteAdapter; import com.gh.gamecenter.entity.UserDataEntity; import com.gh.gamecenter.entity.VersionVoteEntity; +import com.gh.gamecenter.normal.NormalFragment; import com.gh.gamecenter.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; import com.lightgame.utils.Util_System_Keyboard; @@ -45,7 +45,7 @@ import rx.schedulers.Schedulers; * Created by CsHeng on 18/12/2017. */ -public class VoteFragment extends BaseFragment implements SwipeRefreshLayout.OnRefreshListener, +public class VoteFragment extends NormalFragment implements SwipeRefreshLayout.OnRefreshListener, VoteAdapter.OnAddVoteListener { @BindView(R.id.vote_rv) @@ -130,11 +130,11 @@ public class VoteFragment extends BaseFragment implements SwipeRefreshLa } @Override - public void loadDone(final String obj) { + public void loadDone(Object obj) { CheckLoginUtils.checkLogin(getContext(), new CheckLoginUtils.OnLoggenInListener() { @Override public void onLoggedIn() { - postVersionVote(obj, false); // 投票 + postVersionVote((String) obj, false); // 投票 } }); } diff --git a/app/src/main/java/com/halo/assistant/fragment/WebFragment.java b/app/src/main/java/com/halo/assistant/fragment/WebFragment.java index c4acc5f834..d8a0988827 100644 --- a/app/src/main/java/com/halo/assistant/fragment/WebFragment.java +++ b/app/src/main/java/com/halo/assistant/fragment/WebFragment.java @@ -4,8 +4,6 @@ import android.content.Intent; import android.net.Uri; import android.os.Bundle; import android.text.TextUtils; -import android.view.Menu; -import android.view.MenuInflater; import android.view.MenuItem; import android.view.View; import android.webkit.DownloadListener; @@ -18,7 +16,6 @@ import android.widget.RelativeLayout; import android.widget.TextView; import com.gh.base.BaseActivity; -import com.gh.base.fragment.BaseFragment; import com.gh.common.util.CheckLoginUtils; import com.gh.common.util.CollectionUtils; import com.gh.common.util.EntranceUtils; @@ -29,6 +26,7 @@ import com.gh.gamecenter.entity.CommentnumEntity; import com.gh.gamecenter.entity.ToolBoxEntity; import com.gh.gamecenter.entity.UserDataEntity; import com.gh.gamecenter.message.MessageDetailFragment; +import com.gh.gamecenter.normal.NormalFragment; import com.gh.gamecenter.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; import com.google.gson.Gson; @@ -50,7 +48,7 @@ import rx.schedulers.Schedulers; * Created by CsHeng on 18/12/2017. * 网页浏览器页面 */ -public class WebFragment extends BaseFragment implements OnBackPressedListener { +public class WebFragment extends NormalFragment implements OnBackPressedListener { public static final String KEY_ISTOOLS = "isTools"; public static final String KEY_ISCOLLECTIONTOOLS = "isCollectionTools"; @@ -69,6 +67,7 @@ public class WebFragment extends BaseFragment implements OnBackPressedListener { private ToolBoxEntity mToolBoxEntity; private String newsId; + private String mNavigationTitle; private int commentNum; @@ -97,13 +96,10 @@ public class WebFragment extends BaseFragment implements OnBackPressedListener { } - @Override - public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { - super.onCreateOptionsMenu(menu, inflater); - inflater.inflate(R.menu.menu_web, menu); - - mMenuShare = menu.findItem(R.id.menu_share); - mMenuCollect = menu.findItem(R.id.menu_collect); + private void initMenu() { + initMenu(R.menu.menu_web); + mMenuShare = getItemMenu(R.id.menu_share); + mMenuCollect = getItemMenu(R.id.menu_collect); mMenuShare.setVisible(mIsTools); mMenuCollect.setVisible(mIsTools); @@ -121,9 +117,8 @@ public class WebFragment extends BaseFragment implements OnBackPressedListener { } @Override - public boolean onOptionsItemSelected(MenuItem item) { - - switch (item.getItemId()) { + public void onMenuItemClick(MenuItem menuItem) { + switch (menuItem.getItemId()) { case R.id.menu_share: if (mMenuShare != null && mToolBoxEntity != null) { if (getActivity() instanceof BaseActivity) { @@ -188,9 +183,8 @@ public class WebFragment extends BaseFragment implements OnBackPressedListener { }); break; } - //TODO concern item only - return super.onOptionsItemSelected(item); + } @Override @@ -198,7 +192,6 @@ public class WebFragment extends BaseFragment implements OnBackPressedListener { super.onCreate(savedInstanceState); setHasOptionsMenu(true); String webUrl; - String webTitle; Bundle args = getArguments(); @@ -206,14 +199,14 @@ public class WebFragment extends BaseFragment implements OnBackPressedListener { if (args.getBundle(EntranceUtils.KEY_DATA) != null) { Bundle data = args.getBundle(EntranceUtils.KEY_DATA); webUrl = data.getString(EntranceUtils.KEY_URL); - webTitle = ""; + mNavigationTitle = ""; } else { webUrl = args.getString(EntranceUtils.KEY_URL); - webTitle = args.getString(EntranceUtils.KEY_GAMENAME); + mNavigationTitle = args.getString(EntranceUtils.KEY_GAMENAME); newsId = args.getString(EntranceUtils.KEY_NEWSID); } - setNavigationTitle(webTitle); + setNavigationTitle(mNavigationTitle); webView.loadUrl(webUrl); @@ -270,13 +263,10 @@ public class WebFragment extends BaseFragment implements OnBackPressedListener { @Override public void onReceivedTitle(WebView view, String title) { super.onReceivedTitle(view, title); - // todo 显示 web标题 极有可能覆盖toolbar Buttom && TextUtils.isEmpty(newsTitle.getText().toString()) - if (TextUtils.isEmpty(newsId) && !mIsTools) { -// newsTitle.setEllipsize(TextUtils.TruncateAt.END); -// newsTitle.setPadding(DisplayUtils.dip2px(getContext(), 30), 0, DisplayUtils.dip2px(getContext(), 30), 0); -// newsTitle.setSingleLine(); -// newsTitle.setText(title); - setNavigationTitle(title); + // title 有可能超出边界 + if (TextUtils.isEmpty(newsId) && TextUtils.isEmpty(mNavigationTitle) && !mIsTools) { + mNavigationTitle = title; + setNavigationTitle(mNavigationTitle); } } }); @@ -289,6 +279,7 @@ public class WebFragment extends BaseFragment implements OnBackPressedListener { getToolsById(); // 对比查看是否修改 } + initMenu(); } private void getToolsById() { diff --git a/app/src/main/java/com/halo/assistant/fragment/comment/CommentDetailFragment.java b/app/src/main/java/com/halo/assistant/fragment/comment/CommentDetailFragment.java index 6c8e098e5f..08de3d1668 100644 --- a/app/src/main/java/com/halo/assistant/fragment/comment/CommentDetailFragment.java +++ b/app/src/main/java/com/halo/assistant/fragment/comment/CommentDetailFragment.java @@ -11,7 +11,6 @@ import android.widget.ScrollView; import android.widget.TextView; import com.facebook.drawee.view.SimpleDraweeView; -import com.gh.base.fragment.BaseFragment; import com.gh.common.util.CheckLoginUtils; import com.gh.common.util.DialogUtils; import com.gh.common.util.EntranceUtils; @@ -23,6 +22,7 @@ import com.gh.gamecenter.adapter.OnCommentCallBackListener; import com.gh.gamecenter.entity.CommentEntity; import com.gh.gamecenter.entity.UserInfoEntity; import com.gh.gamecenter.manager.UserManager; +import com.gh.gamecenter.normal.NormalFragment; import com.lightgame.utils.Util_System_Keyboard; import org.json.JSONException; @@ -39,7 +39,7 @@ import retrofit2.HttpException; * 评论详情页面-查看对话详情 * TODO: 16/11/17 时间比较紧 先暂时这么做 最好发表评论那块和评论详情整合 */ -public class CommentDetailFragment extends BaseFragment implements OnCommentCallBackListener { +public class CommentDetailFragment extends NormalFragment implements OnCommentCallBackListener { @BindView(R.id.comment_detail_rv) RecyclerView mRecyclerView; diff --git a/app/src/main/java/com/halo/assistant/fragment/game/GameNewsSearchFragment.java b/app/src/main/java/com/halo/assistant/fragment/game/GameNewsSearchFragment.java index 84034147e1..420b019c61 100644 --- a/app/src/main/java/com/halo/assistant/fragment/game/GameNewsSearchFragment.java +++ b/app/src/main/java/com/halo/assistant/fragment/game/GameNewsSearchFragment.java @@ -16,13 +16,13 @@ import android.view.ViewGroup; import android.widget.LinearLayout; import android.widget.TextView; -import com.gh.base.fragment.BaseFragment; import com.gh.common.util.DisplayUtils; import com.gh.common.util.EntranceUtils; import com.gh.gamecenter.R; import com.gh.gamecenter.adapter.GameNewsAdapter; import com.gh.gamecenter.adapter.GameNewsTypeListAdapter; import com.gh.gamecenter.eventbus.EBTypeChange; +import com.gh.gamecenter.normal.NormalFragment; import com.gh.gamecenter.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; @@ -42,7 +42,7 @@ import rx.schedulers.Schedulers; *

* Created by CsHeng on 14/12/2017. */ -public class GameNewsSearchFragment extends BaseFragment { +public class GameNewsSearchFragment extends NormalFragment { @BindView(R.id.game_news_list) RecyclerView mGameNewsRv; diff --git a/app/src/main/java/com/halo/assistant/fragment/game/GameNewsSearchResultFragment.java b/app/src/main/java/com/halo/assistant/fragment/game/GameNewsSearchResultFragment.java index 8c66d0a08f..36847cf829 100644 --- a/app/src/main/java/com/halo/assistant/fragment/game/GameNewsSearchResultFragment.java +++ b/app/src/main/java/com/halo/assistant/fragment/game/GameNewsSearchResultFragment.java @@ -12,7 +12,6 @@ import android.widget.EditText; import android.widget.LinearLayout; import android.widget.TextView; -import com.gh.base.fragment.BaseFragment; import com.gh.common.util.DataCollectionUtils; import com.gh.common.util.EntranceUtils; import com.gh.common.util.NewsUtils; @@ -23,6 +22,7 @@ import com.gh.gamecenter.R; import com.gh.gamecenter.adapter.viewholder.FooterViewHolder; import com.gh.gamecenter.adapter.viewholder.NewsTextViewHolder; import com.gh.gamecenter.entity.NewsEntity; +import com.gh.gamecenter.normal.NormalFragment; import com.gh.gamecenter.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; import com.lightgame.utils.Util_System_Keyboard; @@ -43,7 +43,7 @@ import rx.schedulers.Schedulers; * Created by CsHeng on 14/12/2017. * 游戏新闻搜索结果界面 */ -public class GameNewsSearchResultFragment extends BaseFragment { +public class GameNewsSearchResultFragment extends NormalFragment { @BindView(R.id.gamedetail_news_rv) RecyclerView mNewsSearchRv; diff --git a/app/src/main/java/com/halo/assistant/fragment/myconcern/MyConcernFragment.java b/app/src/main/java/com/halo/assistant/fragment/myconcern/MyConcernFragment.java index 5384e1345b..27c9c71643 100644 --- a/app/src/main/java/com/halo/assistant/fragment/myconcern/MyConcernFragment.java +++ b/app/src/main/java/com/halo/assistant/fragment/myconcern/MyConcernFragment.java @@ -10,13 +10,13 @@ import android.widget.RelativeLayout; import android.widget.TextView; import com.gh.base.OnRequestCallBackListener; -import com.gh.base.fragment.BaseFragment; import com.gh.common.view.Concern_LinearLayout; import com.gh.gamecenter.LoginActivity; import com.gh.gamecenter.R; import com.gh.gamecenter.entity.GameEntity; import com.gh.gamecenter.eventbus.EBConcernChanged; import com.gh.gamecenter.eventbus.EBReuse; +import com.gh.gamecenter.normal.NormalFragment; import org.greenrobot.eventbus.Subscribe; import org.greenrobot.eventbus.ThreadMode; @@ -33,7 +33,7 @@ import static com.gh.gamecenter.personal.PersonalFragment.LOGIN_TAG; *

* 我的关注grid页面 */ -public class MyConcernFragment extends BaseFragment implements View.OnClickListener, OnRequestCallBackListener { +public class MyConcernFragment extends NormalFragment implements View.OnClickListener, OnRequestCallBackListener { @BindView(R.id.concern_rv_show) RecyclerView mConcernRv; diff --git a/app/src/main/java/com/halo/assistant/fragment/user/SelectPortraitFragment.java b/app/src/main/java/com/halo/assistant/fragment/user/SelectPortraitFragment.java index 5ae2fbf5f2..ef65885e1c 100644 --- a/app/src/main/java/com/halo/assistant/fragment/user/SelectPortraitFragment.java +++ b/app/src/main/java/com/halo/assistant/fragment/user/SelectPortraitFragment.java @@ -14,7 +14,6 @@ import android.support.annotation.Nullable; import android.text.TextUtils; import android.view.View; -import com.gh.base.fragment.BaseFragment; import com.gh.common.util.DialogUtils; import com.gh.common.util.EntranceUtils; import com.gh.common.util.RandomUtils; @@ -24,6 +23,7 @@ import com.gh.gamecenter.R; import com.gh.gamecenter.entity.UserInfoEntity; import com.gh.gamecenter.login.ApiResponse; import com.gh.gamecenter.login.UserViewModel; +import com.gh.gamecenter.normal.NormalFragment; import com.lightgame.utils.Utils; import org.json.JSONException; @@ -41,7 +41,7 @@ import butterknife.OnClick; * 选择用户头像 * */ -public class SelectPortraitFragment extends BaseFragment { +public class SelectPortraitFragment extends NormalFragment { public final static int REQUEST_CROP_ICON = 12; public final static int REQUEST_MEDIA_ICON = 13; diff --git a/app/src/main/java/com/halo/assistant/fragment/user/SelectRegionFragment.java b/app/src/main/java/com/halo/assistant/fragment/user/SelectRegionFragment.java index 19c3552b64..7915185fca 100644 --- a/app/src/main/java/com/halo/assistant/fragment/user/SelectRegionFragment.java +++ b/app/src/main/java/com/halo/assistant/fragment/user/SelectRegionFragment.java @@ -9,13 +9,13 @@ import android.support.v4.app.Fragment; import android.support.v4.app.FragmentTransaction; import android.text.TextUtils; -import com.gh.base.fragment.BaseFragment; import com.gh.common.util.DialogUtils; import com.gh.common.util.EntranceUtils; import com.gh.gamecenter.R; import com.gh.gamecenter.entity.UserInfoEntity; import com.gh.gamecenter.login.ApiResponse; import com.gh.gamecenter.login.UserViewModel; +import com.gh.gamecenter.normal.NormalFragment; import com.halo.assistant.fragment.user.region.OnRegionSelectListener; import com.halo.assistant.fragment.user.region.RegionCountFragment; import com.halo.assistant.fragment.user.region.RegionProvFragment; @@ -30,7 +30,7 @@ import java.util.List; * 修改用户归属地 * */ -public class SelectRegionFragment extends BaseFragment implements OnBackPressedListener, OnRegionSelectListener { +public class SelectRegionFragment extends NormalFragment implements OnBackPressedListener, OnRegionSelectListener { private String mProvinceName; private RegionProvFragment mProvFragment; diff --git a/app/src/main/java/com/halo/assistant/fragment/user/UserInfoEditFragment.java b/app/src/main/java/com/halo/assistant/fragment/user/UserInfoEditFragment.java index 1def8d0106..f9acf59b6a 100644 --- a/app/src/main/java/com/halo/assistant/fragment/user/UserInfoEditFragment.java +++ b/app/src/main/java/com/halo/assistant/fragment/user/UserInfoEditFragment.java @@ -16,13 +16,13 @@ import android.widget.EditText; import android.widget.ImageView; import android.widget.TextView; -import com.gh.base.fragment.BaseFragment; import com.gh.common.util.DialogUtils; import com.gh.gamecenter.R; import com.gh.gamecenter.entity.UserInfoEntity; import com.gh.gamecenter.login.ApiResponse; import com.gh.gamecenter.login.UserViewModel; import com.gh.gamecenter.manager.UserManager; +import com.gh.gamecenter.normal.NormalFragment; import butterknife.BindView; import butterknife.OnClick; @@ -33,7 +33,7 @@ import butterknife.OnClick; * 修改用户信息总页面 * */ -public class UserInfoEditFragment extends BaseFragment { +public class UserInfoEditFragment extends NormalFragment { @BindView(R.id.userinfo_edit_sex) View mUserinfoEditSex; diff --git a/app/src/main/java/com/halo/assistant/fragment/user/UserInfoFragment.java b/app/src/main/java/com/halo/assistant/fragment/user/UserInfoFragment.java index 9d977873f0..4d659a49b1 100644 --- a/app/src/main/java/com/halo/assistant/fragment/user/UserInfoFragment.java +++ b/app/src/main/java/com/halo/assistant/fragment/user/UserInfoFragment.java @@ -9,7 +9,6 @@ import android.view.View; import android.widget.TextView; import com.facebook.drawee.view.SimpleDraweeView; -import com.gh.base.fragment.BaseFragment; import com.gh.gamecenter.R; import com.gh.gamecenter.SelectUserIconActivity; import com.gh.gamecenter.UserInfoEditActivity; @@ -17,6 +16,7 @@ import com.gh.gamecenter.UserRegionActivity; import com.gh.gamecenter.entity.UserInfoEntity; import com.gh.gamecenter.login.ApiResponse; import com.gh.gamecenter.login.UserViewModel; +import com.gh.gamecenter.normal.NormalFragment; import butterknife.BindView; import butterknife.OnClick; @@ -26,7 +26,7 @@ import butterknife.OnClick; *

* 个人中心，用户修改总览 */ -public class UserInfoFragment extends BaseFragment { +public class UserInfoFragment extends NormalFragment { @BindView(R.id.userinfo_icon_sd) SimpleDraweeView mUserinfoIconSd; diff --git a/app/src/main/res/layout/activity_normal.xml b/app/src/main/res/layout/activity_normal.xml index 4a580c34d4..e2635ea638 100644 --- a/app/src/main/res/layout/activity_normal.xml +++ b/app/src/main/res/layout/activity_normal.xml @@ -4,33 +4,11 @@ android:layout_height = "match_parent" android:orientation = "vertical" > - - - - - - - + + android:layout_height = "match_parent"/> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_ask.xml b/app/src/main/res/layout/fragment_ask.xml index 66bab6ec2b..82a4524a47 100644 --- a/app/src/main/res/layout/fragment_ask.xml +++ b/app/src/main/res/layout/fragment_ask.xml @@ -30,7 +30,7 @@ + + + + + + + \ No newline at end of file