diff --git a/app/src/main/java/com/gh/base/BaseActivity_TabLayout.java b/app/src/main/java/com/gh/base/BaseActivity_TabLayout.java index 43ba7b4423..80143d005a 100644 --- a/app/src/main/java/com/gh/base/BaseActivity_TabLayout.java +++ b/app/src/main/java/com/gh/base/BaseActivity_TabLayout.java @@ -10,6 +10,7 @@ import androidx.fragment.app.Fragment; import androidx.viewpager.widget.ViewPager; import com.gh.gamecenter.R; +import com.gh.gamecenter.common.base.ToolBarActivity; import com.gh.gamecenter.common.base.adapter.FragmentAdapter; import com.gh.gamecenter.common.base.fragment.BaseFragment_TabLayout; import com.gh.gamecenter.common.view.TabIndicatorView; diff --git a/app/src/main/java/com/gh/base/BaseRichEditorActivity.kt b/app/src/main/java/com/gh/base/BaseRichEditorActivity.kt index bf67741269..329545b7a0 100644 --- a/app/src/main/java/com/gh/base/BaseRichEditorActivity.kt +++ b/app/src/main/java/com/gh/base/BaseRichEditorActivity.kt @@ -14,12 +14,12 @@ import android.widget.CheckBox import android.widget.FrameLayout import android.widget.TextView import androidx.lifecycle.Observer -import com.gh.common.util.* import com.gh.common.util.DialogUtils import com.gh.common.util.NewLogUtils import com.gh.common.view.RichEditor import com.gh.gamecenter.CropImageActivity import com.gh.gamecenter.R +import com.gh.gamecenter.common.base.ToolBarActivity import com.gh.gamecenter.common.utils.* import com.gh.gamecenter.core.AppExecutor import com.gh.gamecenter.core.runOnIoThread diff --git a/app/src/main/java/com/gh/base/DownloadToolbarActivity.kt b/app/src/main/java/com/gh/base/DownloadToolbarActivity.kt new file mode 100644 index 0000000000..350a7a5bb1 --- /dev/null +++ b/app/src/main/java/com/gh/base/DownloadToolbarActivity.kt @@ -0,0 +1,115 @@ +package com.gh.base + +import android.os.Bundle +import android.text.TextUtils +import android.view.MenuItem +import android.view.View +import android.widget.ImageView +import android.widget.TextView +import androidx.core.content.ContextCompat +import androidx.lifecycle.ViewModelProviders +import com.gh.download.DownloadManager +import com.gh.gamecenter.DownloadManagerActivity +import com.gh.gamecenter.R +import com.gh.gamecenter.common.base.ToolBarActivity +import com.gh.gamecenter.common.constant.Constants +import com.gh.gamecenter.common.utils.viewModelProvider +import com.gh.gamecenter.core.utils.DisplayUtils +import com.gh.gamecenter.core.utils.SPUtils.getBoolean +import com.gh.gamecenter.entity.GameUpdateEntity +import com.gh.gamecenter.eventbus.EBDownloadStatus +import com.gh.gamecenter.packagehelper.PackageViewModel +import org.greenrobot.eventbus.Subscribe +import org.greenrobot.eventbus.ThreadMode + +// TODO:移动到module_download模块中 +abstract class DownloadToolbarActivity : ToolBarActivity() { + + private var mDownloadCountHint: TextView? = null + private var mPackageViewModel: PackageViewModel? = null + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + if (!getBoolean(Constants.SP_TEENAGER_MODE) && showDownloadMenu()) { + mPackageViewModel = ViewModelProviders.of(this, PackageViewModel.Factory())[PackageViewModel::class.java] + mPackageViewModel = viewModelProvider(PackageViewModel.Factory()) + mPackageViewModel?.filterSameUpdateLiveData?.observe(this) { updateList: List -> + updateDownloadCountHint(updateList) + } + } + } + + override fun setToolbarMenu(res: Int) { + // 青少年模式下要隐藏下载按钮 + if (getBoolean(Constants.SP_TEENAGER_MODE) && res == R.menu.menu_download) return + super.setToolbarMenu(res) + } + + override fun inflateMenu(res: Int) { + super.inflateMenu(res) + if (showDownloadMenu()) { + createDownloadMenu(res) + } + } + + private fun createDownloadMenu(res: Int) { + if (res != R.menu.menu_download) { + menuInflater.inflate(R.menu.menu_download, mActionMenuView.menu) + } + if (mPackageViewModel != null) { + updateDownloadCountHint(mPackageViewModel?.filterSameUpdateLiveData?.value) + } + val downloadMenuView = mActionMenuView.menu.findItem(R.id.menu_download).actionView + mDownloadCountHint = downloadMenuView.findViewById(R.id.menu_download_count_hint) + } + + override fun onMenuItemClick(item: MenuItem?): Boolean { + if (item!!.itemId == R.id.menu_download) { +// MtaHelper.onEvent("下载管理", "下载管理入口", getActivityNameInChinese()); + val intent = DownloadManagerActivity.getDownloadMangerIntent(this, mEntrance) + startActivity(intent) + return true + } + return super.onMenuItemClick(item) + } + + private fun updateDownloadCountHint(updateList: List?) { + if (mDownloadCountHint == null || updateList.isNullOrEmpty()) return + val count = DownloadManager.getInstance().getDownloadOrUpdateCount(updateList) + if (count != null) { + mDownloadCountHint!!.visibility = View.VISIBLE + mDownloadCountHint!!.text = count + val params = mDownloadCountHint!!.layoutParams + if (TextUtils.isEmpty(count)) { + params.width = DisplayUtils.dip2px(6f) + params.height = DisplayUtils.dip2px(6f) + } else { + params.width = DisplayUtils.dip2px(12f) + params.height = DisplayUtils.dip2px(12f) + } + mDownloadCountHint!!.layoutParams = params + } else { + mDownloadCountHint!!.visibility = View.GONE + } + } + + protected open fun showDownloadMenu(): Boolean { + return false + } + + @Subscribe(threadMode = ThreadMode.MAIN) + fun onEventMainThread(status: EBDownloadStatus?) { + if (!getBoolean(Constants.SP_TEENAGER_MODE) && showDownloadMenu() && mPackageViewModel != null) { + updateDownloadCountHint(mPackageViewModel?.filterSameUpdateLiveData?.value) + } + } + + override fun onNightModeChange() { + super.onNightModeChange() + if (showDownloadMenu() && getMenuItem(R.id.menu_download) != null) { + (getMenuItem(R.id.menu_download).actionView.findViewById(R.id.menu_download_iv) as ImageView).setImageDrawable( + ContextCompat.getDrawable(this, R.drawable.toolbar_download) + ) + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/gh/common/util/DirectUtils.kt b/app/src/main/java/com/gh/common/util/DirectUtils.kt index 1d53932cad..317193830b 100644 --- a/app/src/main/java/com/gh/common/util/DirectUtils.kt +++ b/app/src/main/java/com/gh/common/util/DirectUtils.kt @@ -11,7 +11,7 @@ import android.text.TextUtils import androidx.appcompat.app.AppCompatActivity import com.gh.gamecenter.common.base.BaseActivity import com.gh.base.BaseActivity_TabLayout -import com.gh.base.ToolBarActivity +import com.gh.gamecenter.common.base.ToolBarActivity import com.gh.gamecenter.common.base.fragment.BaseFragment_TabLayout import com.gh.gamecenter.core.AppExecutor import com.gh.common.constant.Config diff --git a/app/src/main/java/com/gh/common/util/EntranceUtils.java b/app/src/main/java/com/gh/common/util/EntranceUtils.java index ef2f050a81..79f2ab79ea 100644 --- a/app/src/main/java/com/gh/common/util/EntranceUtils.java +++ b/app/src/main/java/com/gh/common/util/EntranceUtils.java @@ -15,18 +15,18 @@ import android.text.TextUtils; import androidx.annotation.Nullable; import androidx.appcompat.app.AppCompatActivity; -import com.gh.gamecenter.common.avoidcallback.AvoidOnResultManager; -import com.gh.gamecenter.common.avoidcallback.Callback; +import com.gh.gamecenter.common.base.ToolBarActivity; import com.gh.gamecenter.BuildConfig; import com.gh.gamecenter.MainActivity; -import com.gh.gamecenter.NormalActivity; import com.gh.gamecenter.SplashScreenActivity; +import com.gh.gamecenter.common.avoidcallback.AvoidOnResultManager; +import com.gh.gamecenter.common.avoidcallback.Callback; +import com.gh.gamecenter.common.base.fragment.ToolbarFragment; import com.gh.gamecenter.common.constant.EntranceConsts; import com.gh.gamecenter.core.utils.ClassUtils; import com.gh.gamecenter.core.utils.GsonUtils; import com.gh.gamecenter.core.utils.RunningUtils; import com.gh.gamecenter.core.utils.SPUtils; -import com.gh.gamecenter.common.base.fragment.NormalFragment; import com.halo.assistant.HaloApp; import com.lightgame.utils.Utils; @@ -48,8 +48,8 @@ public class EntranceUtils { String to = bundle.getString(KEY_TO); Class clazz = ClassUtils.forName(to); if (clazz == null) clazz = MainActivity.class; - if (NormalFragment.class.isAssignableFrom(clazz)) { // 兼容NormalFragment - NormalActivity.startFragmentNewTask(context, (Class) clazz, bundle); + if (ToolbarFragment.class.isAssignableFrom(clazz)) { // 兼容ToolbarFragment + ToolBarActivity.startFragmentNewTask(context, (Class) clazz, bundle); } else { Intent intent1 = new Intent(context, clazz); intent1.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); @@ -76,8 +76,8 @@ public class EntranceUtils { String to = bundle.getString(KEY_TO); Class clazz = ClassUtils.forName(to); if (clazz == null) clazz = MainActivity.class; - if (NormalFragment.class.isAssignableFrom(clazz)) { // 兼容NormalFragment - NormalActivity.startFragmentNewTask(context, (Class) clazz, bundle); + if (ToolbarFragment.class.isAssignableFrom(clazz)) { // 兼容ToolbarFragment + ToolBarActivity.startFragmentNewTask(context, (Class) clazz, bundle); } else { Intent intent1 = new Intent(context, clazz); //TODO:添加FLAG_ACTIVITY_NEW_TASK会导致一跳转页面callback就被调用 diff --git a/app/src/main/java/com/gh/common/util/GameCollectionSquareBrowseTaskHelper.kt b/app/src/main/java/com/gh/common/util/GameCollectionSquareBrowseTaskHelper.kt index 5b3ddbd3a4..b32d165686 100644 --- a/app/src/main/java/com/gh/common/util/GameCollectionSquareBrowseTaskHelper.kt +++ b/app/src/main/java/com/gh/common/util/GameCollectionSquareBrowseTaskHelper.kt @@ -9,16 +9,16 @@ import android.view.Gravity import android.view.View import android.widget.ImageView import android.widget.ProgressBar -import com.gh.gamecenter.core.utils.CurrentActivityHolder -import com.gh.gamecenter.core.GHThreadFactory -import com.gh.gamecenter.core.runOnUiThread -import com.gh.gamecenter.NormalActivity +import com.gh.gamecenter.common.base.ToolBarActivity import com.gh.gamecenter.R +import com.gh.gamecenter.common.retrofit.BiResponse import com.gh.gamecenter.common.utils.singleToMain import com.gh.gamecenter.common.utils.tryWithDefaultCatch +import com.gh.gamecenter.core.GHThreadFactory +import com.gh.gamecenter.core.runOnUiThread +import com.gh.gamecenter.core.utils.CurrentActivityHolder import com.gh.gamecenter.gamecollection.detail.GameCollectionDetailActivity import com.gh.gamecenter.gamecollection.square.GameCollectionSquareActivity -import com.gh.gamecenter.common.retrofit.BiResponse import com.gh.gamecenter.retrofit.RetrofitManager import com.halo.assistant.HaloApp import com.lzf.easyfloat.EasyFloat @@ -161,7 +161,7 @@ object GameCollectionSquareBrowseTaskHelper { private fun isTopActivityGameCollectionRelated(activity: Activity): Boolean { return isGameCollectionSquare(activity) || (activity is GameCollectionDetailActivity - && activity.intent.getBundleExtra(NormalActivity.NORMAL_FRAGMENT_BUNDLE)?.getBoolean(KEY_IS_FORM_BROWSE_TASK) == true) + && activity.intent.getBundleExtra(ToolBarActivity.NORMAL_FRAGMENT_BUNDLE)?.getBoolean(KEY_IS_FORM_BROWSE_TASK) == true) } private fun isGameCollectionSquare(activity: Activity, checkIsFromTask: Boolean = true): Boolean { diff --git a/app/src/main/java/com/gh/gamecenter/AboutActivity.java b/app/src/main/java/com/gh/gamecenter/AboutActivity.java index a06f3a1e84..a3d607b144 100644 --- a/app/src/main/java/com/gh/gamecenter/AboutActivity.java +++ b/app/src/main/java/com/gh/gamecenter/AboutActivity.java @@ -7,6 +7,7 @@ import android.os.Bundle; import androidx.annotation.NonNull; import com.alibaba.android.arouter.facade.annotation.Route; +import com.gh.gamecenter.common.base.ToolBarActivity; import com.gh.gamecenter.common.constant.EntranceConsts; import com.gh.gamecenter.common.constant.RouteConsts; import com.gh.gamecenter.common.utils.ExtensionsKt; @@ -16,7 +17,7 @@ import com.halo.assistant.fragment.AboutFragment; * Created by khy on 2017/2/28. */ @Route(path = RouteConsts.activity.aboutActivity) -public class AboutActivity extends NormalActivity { +public class AboutActivity extends ToolBarActivity { @Override protected void onCreate(Bundle savedInstanceState) { diff --git a/app/src/main/java/com/gh/gamecenter/BlockActivity.kt b/app/src/main/java/com/gh/gamecenter/BlockActivity.kt index 2cb2b31069..3c4412923d 100644 --- a/app/src/main/java/com/gh/gamecenter/BlockActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/BlockActivity.kt @@ -3,11 +3,12 @@ package com.gh.gamecenter import android.content.Context import android.content.Intent import android.os.Bundle +import com.gh.base.DownloadToolbarActivity import com.gh.gamecenter.common.constant.EntranceConsts import com.gh.gamecenter.entity.SubjectRecommendEntity import com.gh.gamecenter.game.GameFragment -class BlockActivity : NormalActivity() { +class BlockActivity : DownloadToolbarActivity() { companion object { fun getIntent(context: Context, blockData: SubjectRecommendEntity, entrance: String): Intent { diff --git a/app/src/main/java/com/gh/gamecenter/CleanApkActivity.java b/app/src/main/java/com/gh/gamecenter/CleanApkActivity.java index ca7d564ddb..dc5235211d 100644 --- a/app/src/main/java/com/gh/gamecenter/CleanApkActivity.java +++ b/app/src/main/java/com/gh/gamecenter/CleanApkActivity.java @@ -6,13 +6,14 @@ import android.os.Bundle; import androidx.annotation.NonNull; +import com.gh.gamecenter.common.base.ToolBarActivity; import com.gh.gamecenter.common.constant.EntranceConsts; import com.halo.assistant.fragment.ApkCleanerFragment; /** * Created by khy on 2017/1/24. */ -public class CleanApkActivity extends NormalActivity { +public class CleanApkActivity extends ToolBarActivity { @NonNull public static Intent getIntent(Context context) { diff --git a/app/src/main/java/com/gh/gamecenter/CollectionActivity.java b/app/src/main/java/com/gh/gamecenter/CollectionActivity.java index bcf6b0b51b..652b58474b 100644 --- a/app/src/main/java/com/gh/gamecenter/CollectionActivity.java +++ b/app/src/main/java/com/gh/gamecenter/CollectionActivity.java @@ -3,7 +3,10 @@ package com.gh.gamecenter; import android.content.Context; import android.content.Intent; import android.os.Bundle; + import androidx.annotation.NonNull; + +import com.gh.gamecenter.common.base.ToolBarActivity; import com.gh.gamecenter.collection.CollectionWrapperFragment; import com.gh.gamecenter.common.constant.EntranceConsts; import com.gh.gamecenter.common.utils.ExtensionsKt; @@ -11,7 +14,7 @@ import com.gh.gamecenter.common.utils.ExtensionsKt; /** * Created by khy on 18/07/17. */ -public class CollectionActivity extends NormalActivity { +public class CollectionActivity extends ToolBarActivity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); diff --git a/app/src/main/java/com/gh/gamecenter/CommentDetailActivity.java b/app/src/main/java/com/gh/gamecenter/CommentDetailActivity.java index b1ee6dc541..f894eefba6 100644 --- a/app/src/main/java/com/gh/gamecenter/CommentDetailActivity.java +++ b/app/src/main/java/com/gh/gamecenter/CommentDetailActivity.java @@ -6,8 +6,9 @@ import android.os.Bundle; import android.view.View; import android.view.ViewGroup; -import com.gh.gamecenter.core.utils.DisplayUtils; +import com.gh.gamecenter.common.base.ToolBarActivity; import com.gh.gamecenter.common.constant.EntranceConsts; +import com.gh.gamecenter.core.utils.DisplayUtils; import com.gh.gamecenter.entity.LinkEntity; import com.gh.gamecenter.entity.MessageEntity; import com.gh.gamecenter.qa.comment.CommentActivity; @@ -17,7 +18,7 @@ import com.halo.assistant.fragment.comment.CommentDetailFragment; /** * Created by khy on 2017/3/22. */ -public class CommentDetailActivity extends NormalActivity { +public class CommentDetailActivity extends ToolBarActivity { private View mShadowView; diff --git a/app/src/main/java/com/gh/gamecenter/ConcernActivity.java b/app/src/main/java/com/gh/gamecenter/ConcernActivity.java index afc5050d5b..b563e71c67 100644 --- a/app/src/main/java/com/gh/gamecenter/ConcernActivity.java +++ b/app/src/main/java/com/gh/gamecenter/ConcernActivity.java @@ -3,8 +3,10 @@ package com.gh.gamecenter; import android.content.Context; import android.content.Intent; import android.os.Bundle; + import androidx.annotation.NonNull; +import com.gh.gamecenter.common.base.ToolBarActivity; import com.gh.gamecenter.common.constant.EntranceConsts; import com.gh.gamecenter.common.utils.ExtensionsKt; import com.halo.assistant.fragment.myconcern.MyConcernFragment; @@ -12,7 +14,7 @@ import com.halo.assistant.fragment.myconcern.MyConcernFragment; /** * 我的关注页面 */ -public class ConcernActivity extends NormalActivity { +public class ConcernActivity extends ToolBarActivity { @Override protected void onCreate(Bundle savedInstanceState) { diff --git a/app/src/main/java/com/gh/gamecenter/ConcernInfoActivity.java b/app/src/main/java/com/gh/gamecenter/ConcernInfoActivity.java index 1398ca5f01..b87d242508 100644 --- a/app/src/main/java/com/gh/gamecenter/ConcernInfoActivity.java +++ b/app/src/main/java/com/gh/gamecenter/ConcernInfoActivity.java @@ -4,6 +4,7 @@ import android.content.Context; import android.content.Intent; import android.os.Bundle; +import com.gh.gamecenter.common.base.ToolBarActivity; import com.gh.gamecenter.common.utils.ExtensionsKt; import com.gh.gamecenter.info.ConcernFragment; @@ -11,7 +12,7 @@ import com.gh.gamecenter.info.ConcernFragment; * Created by khy on 10/04/18. */ -public class ConcernInfoActivity extends NormalActivity { +public class ConcernInfoActivity extends ToolBarActivity { @Override protected void onCreate(Bundle savedInstanceState) { diff --git a/app/src/main/java/com/gh/gamecenter/CropImageActivity.java b/app/src/main/java/com/gh/gamecenter/CropImageActivity.java index 23399f6d15..5b16cdf55a 100644 --- a/app/src/main/java/com/gh/gamecenter/CropImageActivity.java +++ b/app/src/main/java/com/gh/gamecenter/CropImageActivity.java @@ -11,7 +11,7 @@ import android.view.View; import android.widget.ImageView; import android.widget.TextView; -import com.gh.base.ToolBarActivity; +import com.gh.gamecenter.common.base.ToolBarActivity; import com.gh.gamecenter.common.utils.BitmapUtils; import com.gh.gamecenter.core.utils.DisplayUtils; import com.gh.gamecenter.common.constant.EntranceConsts; diff --git a/app/src/main/java/com/gh/gamecenter/DownloadManagerActivity.java b/app/src/main/java/com/gh/gamecenter/DownloadManagerActivity.java index 806499b0de..35d67303df 100644 --- a/app/src/main/java/com/gh/gamecenter/DownloadManagerActivity.java +++ b/app/src/main/java/com/gh/gamecenter/DownloadManagerActivity.java @@ -4,6 +4,7 @@ import android.content.Context; import android.content.Intent; import android.os.Bundle; +import com.gh.gamecenter.common.base.ToolBarActivity; import com.gh.gamecenter.common.base.fragment.BaseFragment_TabLayout; import com.gh.gamecenter.common.constant.EntranceConsts; import com.gh.gamecenter.common.utils.ExtensionsKt; @@ -14,7 +15,7 @@ import com.gh.gamecenter.download.DownloadFragment; * * @author 黄壮华 */ -public class DownloadManagerActivity extends NormalActivity { +public class DownloadManagerActivity extends ToolBarActivity { public static final int INDEX_DOWNLOAD = 0; public static final int INDEX_UPDATE = 1; diff --git a/app/src/main/java/com/gh/gamecenter/GameDetailActivity.kt b/app/src/main/java/com/gh/gamecenter/GameDetailActivity.kt index 28acb5f8fa..dc31127417 100644 --- a/app/src/main/java/com/gh/gamecenter/GameDetailActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/GameDetailActivity.kt @@ -4,13 +4,13 @@ import android.content.Context import android.content.ContextWrapper import android.content.Intent import android.os.Bundle +import com.gh.base.DownloadToolbarActivity import com.gh.gamecenter.common.constant.Constants import com.gh.common.exposure.ExposureEvent import com.gh.common.exposure.ExposureEvent.Companion.createEvent import com.gh.common.exposure.ExposureManager.log import com.gh.common.exposure.ExposureTraceUtils.appendTrace import com.gh.common.exposure.ExposureType -import com.gh.common.util.DataUtils import com.gh.gamecenter.core.utils.DisplayUtils import com.gh.gamecenter.common.constant.EntranceConsts import com.gh.gamecenter.entity.GameEntity @@ -21,7 +21,7 @@ import com.halo.assistant.HaloApp * Created by khy on 2017/3/24. * 游戏详情适配器 */ -class GameDetailActivity : NormalActivity() { +class GameDetailActivity : DownloadToolbarActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) diff --git a/app/src/main/java/com/gh/gamecenter/GameNewsActivity.java b/app/src/main/java/com/gh/gamecenter/GameNewsActivity.java index cd78071061..1f2e81451f 100644 --- a/app/src/main/java/com/gh/gamecenter/GameNewsActivity.java +++ b/app/src/main/java/com/gh/gamecenter/GameNewsActivity.java @@ -6,6 +6,7 @@ import android.os.Bundle; import androidx.annotation.NonNull; +import com.gh.gamecenter.common.base.ToolBarActivity; import com.gh.gamecenter.common.constant.EntranceConsts; import com.halo.assistant.fragment.game.GameNewsSearchFragment; @@ -14,7 +15,7 @@ import com.halo.assistant.fragment.game.GameNewsSearchFragment; * 游戏新闻界面，由于MTA界面统计未重新记录的原因，暂留此傀儡，连名字都不能改，真是可怕 */ @Deprecated -public class GameNewsActivity extends NormalActivity { +public class GameNewsActivity extends ToolBarActivity { @NonNull public static Intent getIntent(Context context, String gameName, String gameId, String entrance) { diff --git a/app/src/main/java/com/gh/gamecenter/InfoActivity.java b/app/src/main/java/com/gh/gamecenter/InfoActivity.java index afef0c40c1..b4b8aeacfe 100644 --- a/app/src/main/java/com/gh/gamecenter/InfoActivity.java +++ b/app/src/main/java/com/gh/gamecenter/InfoActivity.java @@ -4,6 +4,7 @@ import android.content.Context; import android.content.Intent; import android.os.Bundle; +import com.gh.gamecenter.common.base.ToolBarActivity; import com.gh.gamecenter.common.utils.ExtensionsKt; import com.gh.gamecenter.info.InfoWrapperFragment; @@ -11,7 +12,7 @@ import com.gh.gamecenter.info.InfoWrapperFragment; * Created by khy on 10/04/18. */ -public class InfoActivity extends NormalActivity { +public class InfoActivity extends ToolBarActivity { @Override protected void onCreate(Bundle savedInstanceState) { diff --git a/app/src/main/java/com/gh/gamecenter/LibaoActivity.java b/app/src/main/java/com/gh/gamecenter/LibaoActivity.java index f6845bf82c..2585cf95f4 100644 --- a/app/src/main/java/com/gh/gamecenter/LibaoActivity.java +++ b/app/src/main/java/com/gh/gamecenter/LibaoActivity.java @@ -3,8 +3,10 @@ package com.gh.gamecenter; import android.content.Context; import android.content.Intent; import android.os.Bundle; + import androidx.annotation.NonNull; +import com.gh.gamecenter.common.base.ToolBarActivity; import com.gh.gamecenter.common.constant.EntranceConsts; import com.gh.gamecenter.libao.LibaoFragment; @@ -12,7 +14,7 @@ import com.gh.gamecenter.libao.LibaoFragment; * Created by khy on 2016/12/12. */ @Deprecated -public class LibaoActivity extends NormalActivity { +public class LibaoActivity extends ToolBarActivity { @NonNull public static Intent getIntent(Context context, String entrance) { diff --git a/app/src/main/java/com/gh/gamecenter/LibaoDetailActivity.java b/app/src/main/java/com/gh/gamecenter/LibaoDetailActivity.java index 78204a23d5..675e124b01 100644 --- a/app/src/main/java/com/gh/gamecenter/LibaoDetailActivity.java +++ b/app/src/main/java/com/gh/gamecenter/LibaoDetailActivity.java @@ -20,7 +20,7 @@ import androidx.recyclerview.widget.RecyclerView; import com.ethanhua.skeleton.Skeleton; import com.ethanhua.skeleton.ViewSkeletonScreen; -import com.gh.base.ToolBarActivity; +import com.gh.gamecenter.common.base.ToolBarActivity; import com.gh.common.filter.RegionSettingHelper; import com.gh.common.util.ApkActiveUtils; import com.gh.common.util.CheckLoginUtils; diff --git a/app/src/main/java/com/gh/gamecenter/LoginActivity.java b/app/src/main/java/com/gh/gamecenter/LoginActivity.java index 564326b069..4cffee4aac 100644 --- a/app/src/main/java/com/gh/gamecenter/LoginActivity.java +++ b/app/src/main/java/com/gh/gamecenter/LoginActivity.java @@ -7,6 +7,7 @@ import android.os.Bundle; import androidx.annotation.NonNull; import com.alibaba.android.arouter.facade.annotation.Route; +import com.gh.gamecenter.common.base.ToolBarActivity; import com.gh.common.util.QuickLoginHelper; import com.gh.gamecenter.common.constant.EntranceConsts; import com.gh.gamecenter.common.constant.RouteConsts; @@ -17,7 +18,7 @@ import com.gh.gamecenter.fragment.LoginFragment; * Created by khy on 14/08/17. */ @Route(path = RouteConsts.activity.loginActivity) -public class LoginActivity extends NormalActivity { +public class LoginActivity extends ToolBarActivity { @Override protected Intent provideNormalIntent() { diff --git a/app/src/main/java/com/gh/gamecenter/MainActivity.java b/app/src/main/java/com/gh/gamecenter/MainActivity.java index 43ada44c47..ca84968c3f 100644 --- a/app/src/main/java/com/gh/gamecenter/MainActivity.java +++ b/app/src/main/java/com/gh/gamecenter/MainActivity.java @@ -1,5 +1,6 @@ package com.gh.gamecenter; +import static com.gh.common.util.LoginHelper.WEIBO_SCOPE; import static com.gh.gamecenter.common.constant.EntranceConsts.ENTRANCE_BROWSER; import static com.gh.gamecenter.common.constant.EntranceConsts.HOST_LAUNCH_SIMULATOR_GAME; import static com.gh.gamecenter.common.constant.EntranceConsts.HOST_QQ; @@ -10,7 +11,6 @@ import static com.gh.gamecenter.common.constant.EntranceConsts.KEY_MARKET_DETAIL import static com.gh.gamecenter.common.constant.EntranceConsts.KEY_NEXT_TO; import static com.gh.gamecenter.common.constant.EntranceConsts.KEY_TO; import static com.gh.gamecenter.common.constant.EntranceConsts.KEY_TYPE; -import static com.gh.common.util.LoginHelper.WEIBO_SCOPE; import static com.gh.gamecenter.common.utils.ExtensionsKt.observableToMain; import static com.gh.gamecenter.fragment.MainWrapperFragment.INDEX_PERSONAL; import static com.gh.gamecenter.personal.PersonalFragment.LOGIN_TAG; @@ -40,10 +40,8 @@ import androidx.fragment.app.Fragment; import androidx.lifecycle.ViewModelProviders; import com.gh.base.AppUncaughtHandler; -import com.gh.gamecenter.common.base.BaseActivity; -import com.gh.gamecenter.common.base.fragment.BaseFragment_ViewPager; +import com.gh.gamecenter.common.base.ToolBarActivity; import com.gh.common.DefaultUrlHandler; -import com.gh.gamecenter.common.avoidcallback.AvoidOnResultManager; import com.gh.common.constant.Config; import com.gh.common.history.HistoryDatabase; import com.gh.common.history.HistoryHelper; @@ -55,7 +53,6 @@ import com.gh.common.util.DataUtils; import com.gh.common.util.DeviceTokenUtils; import com.gh.common.util.DialogUtils; import com.gh.common.util.DirectUtils; -import com.gh.gamecenter.common.constant.EntranceConsts; import com.gh.common.util.EntranceUtils; import com.gh.common.util.ErrorHelper; import com.gh.common.util.HomePluggableHelper; @@ -66,14 +63,21 @@ import com.gh.common.util.PackageInstaller; import com.gh.common.util.PackageUtils; import com.gh.common.util.PlatformUtils; import com.gh.common.util.QuickLoginHelper; -import com.gh.gamecenter.common.utils.ShareUtils; import com.gh.common.util.WechatBindHelper; import com.gh.download.DownloadManager; +import com.gh.gamecenter.common.avoidcallback.AvoidOnResultManager; +import com.gh.gamecenter.common.base.BaseActivity; +import com.gh.gamecenter.common.base.fragment.BaseFragment_ViewPager; +import com.gh.gamecenter.common.base.fragment.ToolbarFragment; import com.gh.gamecenter.common.constant.Constants; +import com.gh.gamecenter.common.constant.EntranceConsts; import com.gh.gamecenter.common.exposure.meta.MetaUtil; +import com.gh.gamecenter.common.retrofit.BiResponse; +import com.gh.gamecenter.common.retrofit.Response; import com.gh.gamecenter.common.utils.DeviceUtils; import com.gh.gamecenter.common.utils.DialogHelper; import com.gh.gamecenter.common.utils.ExtensionsKt; +import com.gh.gamecenter.common.utils.ShareUtils; import com.gh.gamecenter.core.AppExecutor; import com.gh.gamecenter.core.utils.ClassUtils; import com.gh.gamecenter.core.utils.DisplayUtils; @@ -97,10 +101,7 @@ import com.gh.gamecenter.home.skip.PackageSkipActivity; import com.gh.gamecenter.manager.DataCollectionManager; import com.gh.gamecenter.manager.UpdateManager; import com.gh.gamecenter.manager.UserManager; -import com.gh.gamecenter.common.base.fragment.NormalFragment; import com.gh.gamecenter.packagehelper.PackageViewModel; -import com.gh.gamecenter.common.retrofit.BiResponse; -import com.gh.gamecenter.common.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; import com.gh.gamecenter.room.AppDatabase; import com.gh.gamecenter.room.dao.SimulatorGameDao; @@ -571,8 +572,8 @@ public class MainActivity extends BaseActivity { bundle.putInt(BaseFragment_ViewPager.ARGS_INDEX, 1); } - if (NormalFragment.class.isAssignableFrom(clazz)) { - NormalActivity.startFragment(MainActivity.this, (Class) clazz, bundle); + if (ToolbarFragment.class.isAssignableFrom(clazz)) { + ToolBarActivity.startFragment(MainActivity.this, (Class) clazz, bundle); } else { Intent skipIntent = new Intent(MainActivity.this, clazz); skipIntent.putExtras(bundle); diff --git a/app/src/main/java/com/gh/gamecenter/MessageActivity.java b/app/src/main/java/com/gh/gamecenter/MessageActivity.java index 9ad1e87334..03f3e39a34 100644 --- a/app/src/main/java/com/gh/gamecenter/MessageActivity.java +++ b/app/src/main/java/com/gh/gamecenter/MessageActivity.java @@ -4,6 +4,7 @@ import android.content.Context; import android.content.Intent; import android.os.Bundle; +import com.gh.gamecenter.common.base.ToolBarActivity; import com.gh.gamecenter.common.constant.EntranceConsts; import com.gh.gamecenter.common.utils.ExtensionsKt; import com.gh.gamecenter.message.MessageFragment; @@ -12,7 +13,7 @@ import com.gh.gamecenter.message.MessageFragment; * Created by khy on 21/07/17. */ @Deprecated -public class MessageActivity extends NormalActivity { +public class MessageActivity extends ToolBarActivity { @Override protected void onCreate(Bundle savedInstanceState) { diff --git a/app/src/main/java/com/gh/gamecenter/MessageDetailActivity.java b/app/src/main/java/com/gh/gamecenter/MessageDetailActivity.java index f8de33fd7e..7aabeb0583 100644 --- a/app/src/main/java/com/gh/gamecenter/MessageDetailActivity.java +++ b/app/src/main/java/com/gh/gamecenter/MessageDetailActivity.java @@ -6,8 +6,9 @@ import android.os.Bundle; import android.view.View; import android.view.ViewGroup; -import com.gh.gamecenter.core.utils.DisplayUtils; +import com.gh.gamecenter.common.base.ToolBarActivity; import com.gh.gamecenter.common.constant.EntranceConsts; +import com.gh.gamecenter.core.utils.DisplayUtils; import com.gh.gamecenter.entity.CommentEntity; import com.gh.gamecenter.entity.ConcernEntity; import com.gh.gamecenter.message.MessageDetailFragment; @@ -18,7 +19,7 @@ import com.halo.assistant.HaloApp; * 消息详情界面(评论详情） */ @Deprecated -public class MessageDetailActivity extends NormalActivity { +public class MessageDetailActivity extends ToolBarActivity { private View mShadowView; diff --git a/app/src/main/java/com/gh/gamecenter/MessageInviteActivity.java b/app/src/main/java/com/gh/gamecenter/MessageInviteActivity.java index 212c986a81..bef06e760d 100644 --- a/app/src/main/java/com/gh/gamecenter/MessageInviteActivity.java +++ b/app/src/main/java/com/gh/gamecenter/MessageInviteActivity.java @@ -4,6 +4,7 @@ import android.content.Context; import android.content.Intent; import android.os.Bundle; +import com.gh.gamecenter.common.base.ToolBarActivity; import com.gh.gamecenter.common.constant.EntranceConsts; import com.gh.gamecenter.common.utils.ExtensionsKt; import com.gh.gamecenter.message.MessageNormalFragment; @@ -12,7 +13,7 @@ import com.gh.gamecenter.message.MessageNormalFragment; * Created by khy on 10/04/18. */ -public class MessageInviteActivity extends NormalActivity { +public class MessageInviteActivity extends ToolBarActivity { public static Intent getIntent(Context context, String messageType, String outerInfo, String entrance) { Bundle bundle = new Bundle(); diff --git a/app/src/main/java/com/gh/gamecenter/MessageKeFuActivity.java b/app/src/main/java/com/gh/gamecenter/MessageKeFuActivity.java index 7f977d3edf..c1482e746d 100644 --- a/app/src/main/java/com/gh/gamecenter/MessageKeFuActivity.java +++ b/app/src/main/java/com/gh/gamecenter/MessageKeFuActivity.java @@ -4,6 +4,7 @@ import android.content.Context; import android.content.Intent; import android.os.Bundle; +import com.gh.gamecenter.common.base.ToolBarActivity; import com.gh.gamecenter.common.constant.EntranceConsts; import com.gh.gamecenter.common.utils.ExtensionsKt; import com.gh.gamecenter.message.KeFuFragment; @@ -12,7 +13,7 @@ import com.gh.gamecenter.message.KeFuFragment; * Created by khy on 10/04/18. */ -public class MessageKeFuActivity extends NormalActivity { +public class MessageKeFuActivity extends ToolBarActivity { @Override protected Intent provideNormalIntent() { diff --git a/app/src/main/java/com/gh/gamecenter/MessageVoteActivity.java b/app/src/main/java/com/gh/gamecenter/MessageVoteActivity.java index 35c0e4409a..1fb3388a30 100644 --- a/app/src/main/java/com/gh/gamecenter/MessageVoteActivity.java +++ b/app/src/main/java/com/gh/gamecenter/MessageVoteActivity.java @@ -4,6 +4,7 @@ import android.content.Context; import android.content.Intent; import android.os.Bundle; +import com.gh.gamecenter.common.base.ToolBarActivity; import com.gh.gamecenter.common.constant.EntranceConsts; import com.gh.gamecenter.common.utils.ExtensionsKt; import com.gh.gamecenter.message.MessageNormalFragment; @@ -12,7 +13,7 @@ import com.gh.gamecenter.message.MessageNormalFragment; * Created by khy on 10/04/18. */ -public class MessageVoteActivity extends NormalActivity { +public class MessageVoteActivity extends ToolBarActivity { public static Intent getIntent(Context context, String messageType, String outerInfo, String entrance) { Bundle bundle = new Bundle(); diff --git a/app/src/main/java/com/gh/gamecenter/NetworkDiagnosisActivity.kt b/app/src/main/java/com/gh/gamecenter/NetworkDiagnosisActivity.kt index e3823158e7..3dd0eec4a3 100644 --- a/app/src/main/java/com/gh/gamecenter/NetworkDiagnosisActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/NetworkDiagnosisActivity.kt @@ -17,7 +17,7 @@ import android.webkit.WebView import android.webkit.WebViewClient import android.widget.ScrollView import android.widget.TextView -import com.gh.base.ToolBarActivity +import com.gh.gamecenter.common.base.ToolBarActivity import com.gh.common.util.* import com.gh.gamecenter.common.utils.DialogHelper import com.gh.gamecenter.common.utils.tryCatchInRelease diff --git a/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java b/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java index 354cfce9f0..64461f2772 100644 --- a/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java +++ b/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java @@ -1,5 +1,7 @@ package com.gh.gamecenter; +import static com.gh.gamecenter.personal.PersonalFragment.LOGIN_TAG; + import android.app.Activity; import android.content.Context; import android.content.Intent; @@ -25,26 +27,27 @@ import androidx.recyclerview.widget.RecyclerView; import com.ethanhua.skeleton.Skeleton; import com.ethanhua.skeleton.ViewSkeletonScreen; -import com.gh.gamecenter.common.callback.OnRequestCallBackListener; -import com.gh.base.ToolBarActivity; +import com.gh.base.DownloadToolbarActivity; import com.gh.common.filter.RegionSettingHelper; import com.gh.common.history.HistoryHelper; import com.gh.common.util.ApkActiveUtils; import com.gh.common.util.CheckLoginUtils; -import com.gh.gamecenter.common.utils.ExtensionsKt; -import com.gh.gamecenter.core.utils.ClickUtils; import com.gh.common.util.CollectionUtils; import com.gh.common.util.DataCollectionUtils; import com.gh.common.util.DetailDownloadUtils; -import com.gh.gamecenter.core.utils.DisplayUtils; -import com.gh.gamecenter.common.constant.EntranceConsts; -import com.gh.gamecenter.core.utils.MtaHelper; import com.gh.common.util.NewLogUtils; +import com.gh.download.DownloadManager; +import com.gh.gamecenter.adapter.viewholder.DetailViewHolder; +import com.gh.gamecenter.common.callback.OnRequestCallBackListener; +import com.gh.gamecenter.common.constant.EntranceConsts; +import com.gh.gamecenter.common.retrofit.Response; +import com.gh.gamecenter.common.utils.ExtensionsKt; import com.gh.gamecenter.common.utils.ShareUtils; import com.gh.gamecenter.common.view.FixLinearLayoutManager; import com.gh.gamecenter.common.view.VerticalItemDecoration; -import com.gh.download.DownloadManager; -import com.gh.gamecenter.adapter.viewholder.DetailViewHolder; +import com.gh.gamecenter.core.utils.ClickUtils; +import com.gh.gamecenter.core.utils.DisplayUtils; +import com.gh.gamecenter.core.utils.MtaHelper; import com.gh.gamecenter.entity.GameEntity; import com.gh.gamecenter.entity.MeEntity; import com.gh.gamecenter.entity.NewsDetailEntity; @@ -55,7 +58,6 @@ import com.gh.gamecenter.eventbus.EBNetworkState; import com.gh.gamecenter.eventbus.EBPackage; import com.gh.gamecenter.eventbus.EBReuse; import com.gh.gamecenter.newsdetail.NewsDetailAdapter; -import com.gh.gamecenter.common.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; import com.halo.assistant.fragment.SettingsFragment; import com.lightgame.download.DataWatcher; @@ -71,15 +73,13 @@ import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.schedulers.Schedulers; import retrofit2.HttpException; -import static com.gh.gamecenter.personal.PersonalFragment.LOGIN_TAG; - /** * 文章详情页面 要启动该页面 需要传入一下参数 放入 EssayEntity中传过来 文章 id 文章标题 title 文章发表时间 time * * @author 黄壮华 */ -public class NewsDetailActivity extends ToolBarActivity implements OnClickListener, OnRequestCallBackListener { +public class NewsDetailActivity extends DownloadToolbarActivity implements OnClickListener, OnRequestCallBackListener { RecyclerView mDetailRv; LinearLayout mDetailBottomLl; diff --git a/app/src/main/java/com/gh/gamecenter/NewsSearchActivity.java b/app/src/main/java/com/gh/gamecenter/NewsSearchActivity.java index 04eaff4f3a..3fcd9dddbd 100644 --- a/app/src/main/java/com/gh/gamecenter/NewsSearchActivity.java +++ b/app/src/main/java/com/gh/gamecenter/NewsSearchActivity.java @@ -3,8 +3,10 @@ package com.gh.gamecenter; import android.content.Context; import android.content.Intent; import android.os.Bundle; + import androidx.annotation.NonNull; +import com.gh.gamecenter.common.base.ToolBarActivity; import com.gh.gamecenter.common.constant.EntranceConsts; import com.halo.assistant.fragment.game.GameNewsSearchResultFragment; @@ -13,7 +15,7 @@ import com.halo.assistant.fragment.game.GameNewsSearchResultFragment; * 新闻搜索界面 */ @Deprecated -public class NewsSearchActivity extends NormalActivity { +public class NewsSearchActivity extends ToolBarActivity { @NonNull public static Intent getIntent(Context context, String gameName, String searchKey, String gameId, String entrance) { diff --git a/app/src/main/java/com/gh/gamecenter/NormalActivity.java b/app/src/main/java/com/gh/gamecenter/NormalActivity.java deleted file mode 100644 index 8287306d47..0000000000 --- a/app/src/main/java/com/gh/gamecenter/NormalActivity.java +++ /dev/null @@ -1,136 +0,0 @@ -package com.gh.gamecenter; - -import android.content.Context; -import android.content.Intent; -import android.os.Bundle; -import android.text.TextUtils; -import android.view.MenuItem; -import android.view.MotionEvent; - -import com.gh.base.ToolBarActivity; -import com.gh.gamecenter.common.base.fragment.NormalFragment; - -import androidx.fragment.app.Fragment; - -/** - * Created by khy on 17/10/17. - */ - -public abstract class NormalActivity extends ToolBarActivity { - - private Fragment mTargetFragment; - - public static final String NORMAL_FRAGMENT_NAME = "normalFragmentName"; - public static final String NORMAL_FRAGMENT_BUNDLE = "normalFragmentBundle"; - - // 针对部分跳转不符合NormalActivity规则的额外处理，主要绑定NormalFragment - protected Intent provideNormalIntent() { - return null; - } - - protected static Intent getTargetIntent(Context context, Class cls, Class t, Bundle bundle) { - Intent intent = new Intent(context, cls); - intent.putExtra(NORMAL_FRAGMENT_NAME, t.getCanonicalName()); - intent.putExtra(NORMAL_FRAGMENT_BUNDLE, bundle); - return intent; - } - - protected static Intent getTargetIntent(Context context, Class cls, Class t) { - Intent intent = new Intent(context, cls); - intent.putExtra(NORMAL_FRAGMENT_NAME, t.getCanonicalName()); - return intent; - } - - - public static void startFragmentNewTask(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); - intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); - context.startActivity(intent); - } - - public static void startFragment(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); - context.startActivity(intent); - } - - - @Override - protected int getLayoutId() { - return R.layout.activity_normal; - } - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - if (getIntent() != null) { - if (savedInstanceState == null) { - handleIntent(getIntent()); - } else { - for (Fragment fragment : getSupportFragmentManager().getFragments()) { - if (fragment instanceof NormalFragment) mTargetFragment = fragment; - } - } - } - } - - @Override - protected void onNewIntent(Intent intent) { - super.onNewIntent(intent); - if (getIntent() != null) handleIntent(intent); - } - - private void handleIntent(Intent intent) { - String fraName = intent.getStringExtra(NORMAL_FRAGMENT_NAME); - Bundle bundle = intent.getBundleExtra(NORMAL_FRAGMENT_BUNDLE); - if (TextUtils.isEmpty(fraName)) { - if (provideNormalIntent() == null) { - return; - } - fraName = provideNormalIntent().getStringExtra(NORMAL_FRAGMENT_NAME); - if (bundle == null) bundle = getIntent().getExtras(); - if (TextUtils.isEmpty(fraName)) return; - } - mTargetFragment = getSupportFragmentManager().findFragmentByTag(fraName); - if (mTargetFragment == null) { - mTargetFragment = Fragment.instantiate(this, fraName, bundle); - } - getSupportFragmentManager().beginTransaction().replace(getFragmentPlaceholderId(), mTargetFragment, fraName).commitNowAllowingStateLoss(); - } - - @Override - public boolean onMenuItemClick(MenuItem item) { - if (mTargetFragment instanceof NormalFragment) { - ((NormalFragment) mTargetFragment).onMenuItemClick(item); - } - return super.onMenuItemClick(item); - } - - @Override - public void onBackPressed() { - if (mTargetFragment instanceof NormalFragment - && mTargetFragment.isAdded() - && !((NormalFragment) mTargetFragment).onBackPressed()) { - super.onBackPressed(); - } - } - - @Override - public boolean dispatchTouchEvent(MotionEvent ev) { - if (mTargetFragment instanceof NormalFragment) { - ((NormalFragment) mTargetFragment).onTouchEvent(ev); - } - return super.dispatchTouchEvent(ev); - } - - public Fragment getTargetFragment() { - return mTargetFragment; - } - - public int getFragmentPlaceholderId() { - return R.id.normal_content; - } -} diff --git a/app/src/main/java/com/gh/gamecenter/QaActivity.kt b/app/src/main/java/com/gh/gamecenter/QaActivity.kt index e38a02773b..4d5bfe170f 100644 --- a/app/src/main/java/com/gh/gamecenter/QaActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/QaActivity.kt @@ -3,11 +3,12 @@ package com.gh.gamecenter import android.content.Context import android.content.Intent import android.os.Bundle +import com.gh.gamecenter.common.base.ToolBarActivity import com.gh.gamecenter.common.constant.EntranceConsts import com.gh.gamecenter.common.utils.updateStatusBarColor import com.gh.gamecenter.help.HelpContainerFragment -class QaActivity : NormalActivity() { +class QaActivity : ToolBarActivity() { companion object { /** diff --git a/app/src/main/java/com/gh/gamecenter/SelectUserIconActivity.java b/app/src/main/java/com/gh/gamecenter/SelectUserIconActivity.java index 95da8d82d4..9020c73de5 100644 --- a/app/src/main/java/com/gh/gamecenter/SelectUserIconActivity.java +++ b/app/src/main/java/com/gh/gamecenter/SelectUserIconActivity.java @@ -2,14 +2,16 @@ package com.gh.gamecenter; import android.content.Context; import android.content.Intent; + import androidx.annotation.NonNull; +import com.gh.gamecenter.common.base.ToolBarActivity; import com.halo.assistant.fragment.user.SelectPortraitFragment; /** * Created by khy on 2017/2/10. */ -public class SelectUserIconActivity extends NormalActivity { +public class SelectUserIconActivity extends ToolBarActivity { @NonNull public static Intent getIntent(Context context) { diff --git a/app/src/main/java/com/gh/gamecenter/SettingActivity.kt b/app/src/main/java/com/gh/gamecenter/SettingActivity.kt index b52eaf3277..4e112e51f7 100644 --- a/app/src/main/java/com/gh/gamecenter/SettingActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/SettingActivity.kt @@ -3,11 +3,12 @@ package com.gh.gamecenter import android.content.Context import android.content.Intent import android.os.Bundle +import com.gh.gamecenter.common.base.ToolBarActivity import com.gh.gamecenter.common.constant.EntranceConsts import com.gh.gamecenter.common.utils.updateStatusBarColor import com.halo.assistant.fragment.SettingsFragment -class SettingActivity : NormalActivity() { +class SettingActivity : ToolBarActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) updateStatusBarColor(R.color.black, R.color.white) diff --git a/app/src/main/java/com/gh/gamecenter/ShareCardActivity.java b/app/src/main/java/com/gh/gamecenter/ShareCardActivity.java index bf345dda3b..5168bf767e 100644 --- a/app/src/main/java/com/gh/gamecenter/ShareCardActivity.java +++ b/app/src/main/java/com/gh/gamecenter/ShareCardActivity.java @@ -18,7 +18,7 @@ import androidx.annotation.NonNull; import androidx.core.content.ContextCompat; import com.facebook.drawee.view.SimpleDraweeView; -import com.gh.base.ToolBarActivity; +import com.gh.gamecenter.common.base.ToolBarActivity; import com.gh.gamecenter.common.constant.EntranceConsts; import com.gh.gamecenter.common.utils.ImageUtils; import com.gh.common.util.MessageShareUtils; diff --git a/app/src/main/java/com/gh/gamecenter/ShareCardPicActivity.java b/app/src/main/java/com/gh/gamecenter/ShareCardPicActivity.java index e3ae6148ac..40b2bb3b6b 100644 --- a/app/src/main/java/com/gh/gamecenter/ShareCardPicActivity.java +++ b/app/src/main/java/com/gh/gamecenter/ShareCardPicActivity.java @@ -26,7 +26,7 @@ import com.facebook.drawee.controller.ControllerListener; import com.facebook.drawee.interfaces.DraweeController; import com.facebook.drawee.view.SimpleDraweeView; import com.facebook.imagepipeline.image.ImageInfo; -import com.gh.base.ToolBarActivity; +import com.gh.gamecenter.common.base.ToolBarActivity; import com.gh.gamecenter.common.constant.EntranceConsts; import com.gh.gamecenter.common.utils.ImageUtils; import com.gh.common.util.MessageShareUtils; diff --git a/app/src/main/java/com/gh/gamecenter/ShareGhActivity.java b/app/src/main/java/com/gh/gamecenter/ShareGhActivity.java index 82e70f530b..501a46fe57 100644 --- a/app/src/main/java/com/gh/gamecenter/ShareGhActivity.java +++ b/app/src/main/java/com/gh/gamecenter/ShareGhActivity.java @@ -11,7 +11,7 @@ import android.widget.TextView; import androidx.annotation.NonNull; -import com.gh.base.ToolBarActivity; +import com.gh.gamecenter.common.base.ToolBarActivity; import com.gh.common.util.MessageShareUtils; import com.gh.gamecenter.common.utils.ExtensionsKt; import com.gh.gamecenter.core.utils.MtaHelper; diff --git a/app/src/main/java/com/gh/gamecenter/ShellActivity.kt b/app/src/main/java/com/gh/gamecenter/ShellActivity.kt index a31e0db3a7..1cdfb007bf 100644 --- a/app/src/main/java/com/gh/gamecenter/ShellActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/ShellActivity.kt @@ -4,7 +4,7 @@ import android.content.Context import android.content.Intent import android.os.Bundle import android.os.Parcelable -import com.gh.base.ToolBarActivity +import com.gh.gamecenter.common.base.ToolBarActivity import com.gh.gamecenter.common.base.fragment.BaseFragment import com.gh.gamecenter.common.constant.EntranceConsts import com.gh.gamecenter.amway.AmwaySuccessFragment diff --git a/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java b/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java index be9f1d2f07..b4fbe6b207 100644 --- a/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java +++ b/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java @@ -33,7 +33,7 @@ import androidx.core.content.ContextCompat; import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.RecyclerView; -import com.gh.base.ToolBarActivity; +import com.gh.gamecenter.common.base.ToolBarActivity; import com.gh.common.filter.RegionSettingHelper; import com.gh.common.util.AdHelper; import com.gh.common.util.ApkActiveUtils; diff --git a/app/src/main/java/com/gh/gamecenter/ToolBoxActivity.java b/app/src/main/java/com/gh/gamecenter/ToolBoxActivity.java index 0eb0f604af..533ed575a7 100644 --- a/app/src/main/java/com/gh/gamecenter/ToolBoxActivity.java +++ b/app/src/main/java/com/gh/gamecenter/ToolBoxActivity.java @@ -11,7 +11,7 @@ //import android.widget.TextView; // //import com.gh.gamecenter.common.callback.OnRequestCallBackListener; -//import com.gh.base.ToolBarActivity; +//import com.gh.gamecenter.common.base.ToolBarActivity; //import com.gh.common.util.EntranceUtils; //import com.gh.gamecenter.core.utils.MtaHelper; //import com.gh.gamecenter.common.utils.TextHelper; diff --git a/app/src/main/java/com/gh/gamecenter/UserInfoActivity.kt b/app/src/main/java/com/gh/gamecenter/UserInfoActivity.kt index 52ea77d14e..9af8e858a9 100644 --- a/app/src/main/java/com/gh/gamecenter/UserInfoActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/UserInfoActivity.kt @@ -2,10 +2,11 @@ package com.gh.gamecenter import android.content.Context import android.content.Intent +import com.gh.gamecenter.common.base.ToolBarActivity import com.gh.gamecenter.common.utils.updateStatusBarColor import com.halo.assistant.fragment.user.UserInfoFragment -class UserInfoActivity : NormalActivity() { +class UserInfoActivity : ToolBarActivity() { companion object { fun getIntent(context: Context?): Intent? { return getTargetIntent( diff --git a/app/src/main/java/com/gh/gamecenter/UserInfoEditActivity.kt b/app/src/main/java/com/gh/gamecenter/UserInfoEditActivity.kt index 5bc2706519..cfd8d88f54 100644 --- a/app/src/main/java/com/gh/gamecenter/UserInfoEditActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/UserInfoEditActivity.kt @@ -3,11 +3,12 @@ package com.gh.gamecenter import android.content.Context import android.content.Intent import android.os.Bundle +import com.gh.gamecenter.common.base.ToolBarActivity import com.gh.gamecenter.common.constant.EntranceConsts import com.gh.gamecenter.user.UserViewModel import com.halo.assistant.fragment.user.UserInfoEditFragment -class UserInfoEditActivity : NormalActivity() { +class UserInfoEditActivity : ToolBarActivity() { companion object { fun getIntent(context: Context, editType: String): Intent { return getIntent(context, editType, false) diff --git a/app/src/main/java/com/gh/gamecenter/UserRegionActivity.java b/app/src/main/java/com/gh/gamecenter/UserRegionActivity.java index 28bea7553c..b6c83d5c66 100644 --- a/app/src/main/java/com/gh/gamecenter/UserRegionActivity.java +++ b/app/src/main/java/com/gh/gamecenter/UserRegionActivity.java @@ -3,12 +3,13 @@ package com.gh.gamecenter; import android.content.Context; import android.content.Intent; +import com.gh.gamecenter.common.base.ToolBarActivity; import com.halo.assistant.fragment.user.SelectRegionFragment; /** * Created by khy on 25/09/17. */ -public class UserRegionActivity extends NormalActivity { +public class UserRegionActivity extends ToolBarActivity { public static Intent getIntent(Context context) { 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 2b8c16dd40..1095ca5bf4 100644 --- a/app/src/main/java/com/gh/gamecenter/VoteActivity.java +++ b/app/src/main/java/com/gh/gamecenter/VoteActivity.java @@ -3,8 +3,10 @@ package com.gh.gamecenter; import android.content.Context; import android.content.Intent; import android.os.Bundle; + import androidx.annotation.NonNull; +import com.gh.gamecenter.common.base.ToolBarActivity; import com.gh.gamecenter.common.constant.EntranceConsts; import com.halo.assistant.fragment.VoteFragment; @@ -13,7 +15,7 @@ import com.halo.assistant.fragment.VoteFragment; * 求版本投票页面 */ @Deprecated -public class VoteActivity extends NormalActivity { +public class VoteActivity extends ToolBarActivity { @NonNull public static Intent getIntent(Context context, String gameName, String gameId) { diff --git a/app/src/main/java/com/gh/gamecenter/WebActivity.kt b/app/src/main/java/com/gh/gamecenter/WebActivity.kt index 2254e231b7..12a88b7c21 100644 --- a/app/src/main/java/com/gh/gamecenter/WebActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/WebActivity.kt @@ -9,6 +9,7 @@ import android.text.TextUtils import android.view.KeyEvent import android.view.View import com.alibaba.android.arouter.facade.annotation.Route +import com.gh.gamecenter.common.base.ToolBarActivity import com.gh.gamecenter.common.constant.Constants import com.gh.gamecenter.common.constant.EntranceConsts import com.gh.gamecenter.common.constant.RouteConsts @@ -20,7 +21,7 @@ import com.gh.gamecenter.entity.ToolBoxEntity import com.halo.assistant.fragment.WebFragment @Route(path = RouteConsts.activity.webActivity) -open class WebActivity : NormalActivity() { +open class WebActivity : ToolBarActivity() { private var mIsFullScreen = false override fun onCreate(savedInstanceState: Bundle?) { @@ -300,7 +301,7 @@ open class WebActivity : NormalActivity() { } private fun getWebTargetIntent(context: Context?, bundle: Bundle, url: String?): Intent { - val cls: Class = if (url?.contains("android_page_type=singleton") == true) { + val cls: Class = if (url?.contains("android_page_type=singleton") == true) { SingletonWebActivity::class.java } else { WebActivity::class.java diff --git a/app/src/main/java/com/gh/gamecenter/amway/AmwaySuccessFragment.kt b/app/src/main/java/com/gh/gamecenter/amway/AmwaySuccessFragment.kt index 6b528e9fb8..32661a3dd7 100644 --- a/app/src/main/java/com/gh/gamecenter/amway/AmwaySuccessFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/amway/AmwaySuccessFragment.kt @@ -8,9 +8,9 @@ import com.gh.gamecenter.R import com.gh.gamecenter.WebActivity import com.gh.gamecenter.databinding.FragmentAmwaySuccessBinding import com.gh.gamecenter.entity.GameEntity -import com.gh.gamecenter.common.base.fragment.NormalFragment +import com.gh.gamecenter.common.base.fragment.ToolbarFragment -class AmwaySuccessFragment : NormalFragment() { +class AmwaySuccessFragment : ToolbarFragment() { private var mGameEntity: GameEntity? = null private val mBinding: FragmentAmwaySuccessBinding by lazy { FragmentAmwaySuccessBinding.inflate(layoutInflater) } diff --git a/app/src/main/java/com/gh/gamecenter/amway/search/AmwaySearchListFragment.kt b/app/src/main/java/com/gh/gamecenter/amway/search/AmwaySearchListFragment.kt index 3d6bac9e98..47f3a78370 100644 --- a/app/src/main/java/com/gh/gamecenter/amway/search/AmwaySearchListFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/amway/search/AmwaySearchListFragment.kt @@ -8,10 +8,10 @@ import com.gh.gamecenter.common.utils.viewModelProviderFromParent import com.gh.gamecenter.SuggestionActivity import com.gh.gamecenter.baselist.LoadStatus import com.gh.gamecenter.databinding.FragmentAmwaySearchBinding -import com.gh.gamecenter.common.base.fragment.NormalFragment +import com.gh.gamecenter.common.base.fragment.ToolbarFragment import com.gh.gamecenter.suggest.SuggestType -class AmwaySearchListFragment : NormalFragment() { +class AmwaySearchListFragment : ToolbarFragment() { private lateinit var mAdapter: AmwaySearchAdapter private lateinit var mViewModel: AmwaySearchViewModel diff --git a/app/src/main/java/com/gh/gamecenter/baselist/ListActivity.java b/app/src/main/java/com/gh/gamecenter/baselist/ListActivity.java index 4c54dda238..9f6e955957 100644 --- a/app/src/main/java/com/gh/gamecenter/baselist/ListActivity.java +++ b/app/src/main/java/com/gh/gamecenter/baselist/ListActivity.java @@ -14,7 +14,7 @@ import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.StaggeredGridLayoutManager; import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; -import com.gh.base.ToolBarActivity; +import com.gh.gamecenter.common.base.ToolBarActivity; import com.gh.gamecenter.core.utils.NumberUtils; import com.gh.gamecenter.common.view.FixLinearLayoutManager; import com.gh.gamecenter.common.view.VerticalItemDecoration; diff --git a/app/src/main/java/com/gh/gamecenter/baselist/ListFragment.java b/app/src/main/java/com/gh/gamecenter/baselist/ListFragment.java index cc1b7edda5..1651b827b8 100644 --- a/app/src/main/java/com/gh/gamecenter/baselist/ListFragment.java +++ b/app/src/main/java/com/gh/gamecenter/baselist/ListFragment.java @@ -20,7 +20,7 @@ import com.gh.gamecenter.core.utils.NumberUtils; import com.gh.gamecenter.common.view.FixLinearLayoutManager; import com.gh.gamecenter.common.view.VerticalItemDecoration; import com.gh.gamecenter.R; -import com.gh.gamecenter.common.base.fragment.NormalFragment; +import com.gh.gamecenter.common.base.fragment.ToolbarFragment; import com.halo.assistant.HaloApp; import java.lang.reflect.ParameterizedType; @@ -34,7 +34,7 @@ import io.reactivex.Single; * Created by khy on 2/12/17. */ -public abstract class ListFragment extends NormalFragment implements +public abstract class ListFragment extends ToolbarFragment implements Observer>, SwipeRefreshLayout.OnRefreshListener, OnDataObservable { diff --git a/app/src/main/java/com/gh/gamecenter/catalog/CatalogActivity.kt b/app/src/main/java/com/gh/gamecenter/catalog/CatalogActivity.kt index 111adc259b..6d23b4ae2d 100644 --- a/app/src/main/java/com/gh/gamecenter/catalog/CatalogActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/catalog/CatalogActivity.kt @@ -3,12 +3,12 @@ package com.gh.gamecenter.catalog import android.content.Context import android.content.Intent import android.os.Bundle -import com.gh.gamecenter.common.constant.EntranceConsts -import com.gh.gamecenter.NormalActivity +import com.gh.base.DownloadToolbarActivity import com.gh.gamecenter.R +import com.gh.gamecenter.common.constant.EntranceConsts import com.gh.gamecenter.common.utils.updateStatusBarColor -class CatalogActivity : NormalActivity() { +class CatalogActivity : DownloadToolbarActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) diff --git a/app/src/main/java/com/gh/gamecenter/catalog/NewCatalogListActivity.kt b/app/src/main/java/com/gh/gamecenter/catalog/NewCatalogListActivity.kt index af4557c7ea..a18c525148 100644 --- a/app/src/main/java/com/gh/gamecenter/catalog/NewCatalogListActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/catalog/NewCatalogListActivity.kt @@ -3,13 +3,13 @@ package com.gh.gamecenter.catalog import android.content.Context import android.content.Intent import android.os.Bundle -import com.gh.gamecenter.common.constant.EntranceConsts -import com.gh.gamecenter.NormalActivity +import com.gh.base.DownloadToolbarActivity import com.gh.gamecenter.R +import com.gh.gamecenter.common.constant.EntranceConsts import com.gh.gamecenter.common.utils.updateStatusBarColor import com.gh.gamecenter.entity.CatalogEntity -class NewCatalogListActivity : NormalActivity() { +class NewCatalogListActivity : DownloadToolbarActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) diff --git a/app/src/main/java/com/gh/gamecenter/catalog/SubCatalogFragment.kt b/app/src/main/java/com/gh/gamecenter/catalog/SubCatalogFragment.kt index 35455f54f9..333e40499b 100644 --- a/app/src/main/java/com/gh/gamecenter/catalog/SubCatalogFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/catalog/SubCatalogFragment.kt @@ -9,9 +9,9 @@ import com.gh.gamecenter.common.utils.viewModelProvider import com.gh.gamecenter.common.utils.viewModelProviderFromParent import com.gh.gamecenter.databinding.FragmentSubCatalogBinding import com.gh.gamecenter.entity.CatalogEntity -import com.gh.gamecenter.common.base.fragment.NormalFragment +import com.gh.gamecenter.common.base.fragment.ToolbarFragment -class SubCatalogFragment : NormalFragment() { +class SubCatalogFragment : ToolbarFragment() { private var mBinding: FragmentSubCatalogBinding? = null private var mViewModel: SubCatalogViewModel? = null diff --git a/app/src/main/java/com/gh/gamecenter/category/CategoryDirectoryActivity.kt b/app/src/main/java/com/gh/gamecenter/category/CategoryDirectoryActivity.kt index e34d8bfdbc..8a6cf7f12f 100644 --- a/app/src/main/java/com/gh/gamecenter/category/CategoryDirectoryActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/category/CategoryDirectoryActivity.kt @@ -3,12 +3,12 @@ package com.gh.gamecenter.category import android.content.Context import android.content.Intent import android.os.Bundle -import com.gh.gamecenter.common.constant.EntranceConsts -import com.gh.gamecenter.NormalActivity +import com.gh.base.DownloadToolbarActivity import com.gh.gamecenter.R +import com.gh.gamecenter.common.constant.EntranceConsts import com.gh.gamecenter.common.utils.updateStatusBarColor -class CategoryDirectoryActivity : NormalActivity() { +class CategoryDirectoryActivity : DownloadToolbarActivity() { companion object { fun getIntent(context: Context, categoryId: String, categoryTitle: String): Intent { diff --git a/app/src/main/java/com/gh/gamecenter/category/CategoryListActivity.kt b/app/src/main/java/com/gh/gamecenter/category/CategoryListActivity.kt index 11ad692bfc..b35c755c29 100644 --- a/app/src/main/java/com/gh/gamecenter/category/CategoryListActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/category/CategoryListActivity.kt @@ -3,13 +3,13 @@ package com.gh.gamecenter.category import android.content.Context import android.content.Intent import android.os.Bundle -import com.gh.gamecenter.common.constant.EntranceConsts -import com.gh.gamecenter.NormalActivity +import com.gh.base.DownloadToolbarActivity import com.gh.gamecenter.R +import com.gh.gamecenter.common.constant.EntranceConsts import com.gh.gamecenter.common.utils.updateStatusBarColor import com.gh.gamecenter.entity.CategoryEntity -class CategoryListActivity : NormalActivity() { +class CategoryListActivity : DownloadToolbarActivity() { companion object { fun getIntent(context: Context, categoryTitle: String, category: CategoryEntity, initTitle: String): Intent { diff --git a/app/src/main/java/com/gh/gamecenter/category2/CategoryV2Activity.kt b/app/src/main/java/com/gh/gamecenter/category2/CategoryV2Activity.kt index c7538d630e..07b011a66c 100644 --- a/app/src/main/java/com/gh/gamecenter/category2/CategoryV2Activity.kt +++ b/app/src/main/java/com/gh/gamecenter/category2/CategoryV2Activity.kt @@ -3,12 +3,12 @@ package com.gh.gamecenter.category2 import android.content.Context import android.content.Intent import android.os.Bundle -import com.gh.gamecenter.common.constant.EntranceConsts -import com.gh.gamecenter.NormalActivity +import com.gh.base.DownloadToolbarActivity import com.gh.gamecenter.R +import com.gh.gamecenter.common.constant.EntranceConsts import com.gh.gamecenter.common.utils.updateStatusBarColor -class CategoryV2Activity : NormalActivity() { +class CategoryV2Activity : DownloadToolbarActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) diff --git a/app/src/main/java/com/gh/gamecenter/download/NewInstalledGameFragment.kt b/app/src/main/java/com/gh/gamecenter/download/NewInstalledGameFragment.kt index f8999f527c..e8ed7612c1 100644 --- a/app/src/main/java/com/gh/gamecenter/download/NewInstalledGameFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/download/NewInstalledGameFragment.kt @@ -23,7 +23,7 @@ import com.gh.gamecenter.eventbus.EBDownloadStatus import com.gh.gamecenter.eventbus.EBReuse import com.gh.gamecenter.fragment.MainWrapperFragment import com.gh.gamecenter.manager.PackagesManager -import com.gh.gamecenter.common.base.fragment.NormalFragment +import com.gh.gamecenter.common.base.fragment.ToolbarFragment import com.gh.gamecenter.packagehelper.PackageViewModel import com.lightgame.download.DataWatcher import com.lightgame.download.DownloadEntity @@ -31,7 +31,7 @@ import com.lightgame.download.DownloadStatus import org.greenrobot.eventbus.Subscribe import org.greenrobot.eventbus.ThreadMode -class NewInstalledGameFragment : NormalFragment() { +class NewInstalledGameFragment : ToolbarFragment() { private lateinit var mBinding: FragmentMyGameBinding private var mPackageViewModel: PackageViewModel? = null diff --git a/app/src/main/java/com/gh/gamecenter/energy/EnergyCenterActivity.kt b/app/src/main/java/com/gh/gamecenter/energy/EnergyCenterActivity.kt index 317351c499..d3b0ed2258 100644 --- a/app/src/main/java/com/gh/gamecenter/energy/EnergyCenterActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/energy/EnergyCenterActivity.kt @@ -4,11 +4,11 @@ import android.content.Context import android.content.Intent import android.os.Build import android.os.Bundle -import com.gh.gamecenter.core.utils.DisplayUtils +import com.gh.gamecenter.common.base.ToolBarActivity import com.gh.gamecenter.common.constant.EntranceConsts -import com.gh.gamecenter.NormalActivity +import com.gh.gamecenter.core.utils.DisplayUtils -class EnergyCenterActivity : NormalActivity() { +class EnergyCenterActivity : ToolBarActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) diff --git a/app/src/main/java/com/gh/gamecenter/energy/EnergyHouseActivity.kt b/app/src/main/java/com/gh/gamecenter/energy/EnergyHouseActivity.kt index 55586c0ba3..768a66e913 100644 --- a/app/src/main/java/com/gh/gamecenter/energy/EnergyHouseActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/energy/EnergyHouseActivity.kt @@ -3,11 +3,11 @@ package com.gh.gamecenter.energy import android.content.Context import android.content.Intent import android.os.Bundle -import com.gh.gamecenter.core.utils.DisplayUtils +import com.gh.gamecenter.common.base.ToolBarActivity import com.gh.gamecenter.common.constant.EntranceConsts -import com.gh.gamecenter.NormalActivity +import com.gh.gamecenter.core.utils.DisplayUtils -class EnergyHouseActivity : NormalActivity() { +class EnergyHouseActivity : ToolBarActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) diff --git a/app/src/main/java/com/gh/gamecenter/forum/list/ForumListActivity.kt b/app/src/main/java/com/gh/gamecenter/forum/list/ForumListActivity.kt index 24f23502e9..69a472a554 100644 --- a/app/src/main/java/com/gh/gamecenter/forum/list/ForumListActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/forum/list/ForumListActivity.kt @@ -3,12 +3,12 @@ package com.gh.gamecenter.forum.list import android.content.Context import android.content.Intent import android.os.Bundle -import com.gh.gamecenter.common.constant.EntranceConsts -import com.gh.gamecenter.NormalActivity +import com.gh.gamecenter.common.base.ToolBarActivity import com.gh.gamecenter.R +import com.gh.gamecenter.common.constant.EntranceConsts import com.gh.gamecenter.common.utils.updateStatusBarColor -class ForumListActivity : NormalActivity() { +class ForumListActivity : ToolBarActivity() { override fun isAutoResetViewBackgroundEnabled(): Boolean = true diff --git a/app/src/main/java/com/gh/gamecenter/forum/moderator/ApplyModeratorActivity.kt b/app/src/main/java/com/gh/gamecenter/forum/moderator/ApplyModeratorActivity.kt index 4a5a66f729..2f90567f03 100644 --- a/app/src/main/java/com/gh/gamecenter/forum/moderator/ApplyModeratorActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/forum/moderator/ApplyModeratorActivity.kt @@ -5,14 +5,14 @@ import android.content.Intent import android.os.Build import android.os.Bundle import android.view.View -import com.gh.gamecenter.core.utils.DisplayUtils -import com.gh.gamecenter.common.constant.EntranceConsts -import com.gh.gamecenter.NormalActivity +import com.gh.gamecenter.common.base.ToolBarActivity import com.gh.gamecenter.R +import com.gh.gamecenter.common.constant.EntranceConsts import com.gh.gamecenter.common.utils.updateStatusBarColor +import com.gh.gamecenter.core.utils.DisplayUtils import com.gh.gamecenter.entity.ApplyModeratorStatusEntity -class ApplyModeratorActivity : NormalActivity() { +class ApplyModeratorActivity : ToolBarActivity() { companion object { fun getIntent(context: Context, bbsId: String, status: ApplyModeratorStatusEntity): Intent { val bundle = Bundle() diff --git a/app/src/main/java/com/gh/gamecenter/forum/moderator/ApplyModeratorFragment.kt b/app/src/main/java/com/gh/gamecenter/forum/moderator/ApplyModeratorFragment.kt index 9495e2ed3b..1fb0761a1a 100644 --- a/app/src/main/java/com/gh/gamecenter/forum/moderator/ApplyModeratorFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/forum/moderator/ApplyModeratorFragment.kt @@ -23,12 +23,12 @@ import com.gh.gamecenter.entity.ApplyModeratorStatusEntity import com.gh.gamecenter.entity.ApplyModeratorTaskEntity import com.gh.gamecenter.forum.detail.ForumDetailActivity import com.gh.gamecenter.manager.UserManager -import com.gh.gamecenter.common.base.fragment.NormalFragment +import com.gh.gamecenter.common.base.fragment.ToolbarFragment import com.lightgame.utils.AppManager import com.lightgame.utils.Utils -class ApplyModeratorFragment : NormalFragment() { +class ApplyModeratorFragment : ToolbarFragment() { private var mBinding: FragmentApplyModeratorBinding? = null private var mViewModel: ApplyModeratorViewModel? = null diff --git a/app/src/main/java/com/gh/gamecenter/forum/moderator/ModeratorListActivity.kt b/app/src/main/java/com/gh/gamecenter/forum/moderator/ModeratorListActivity.kt index f10b978e82..91d70c4b98 100644 --- a/app/src/main/java/com/gh/gamecenter/forum/moderator/ModeratorListActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/forum/moderator/ModeratorListActivity.kt @@ -3,12 +3,12 @@ package com.gh.gamecenter.forum.moderator import android.content.Context import android.content.Intent import android.os.Bundle -import com.gh.gamecenter.common.constant.EntranceConsts -import com.gh.gamecenter.NormalActivity +import com.gh.gamecenter.common.base.ToolBarActivity import com.gh.gamecenter.R +import com.gh.gamecenter.common.constant.EntranceConsts import com.gh.gamecenter.common.utils.updateStatusBarColor -class ModeratorListActivity : NormalActivity() { +class ModeratorListActivity : ToolBarActivity() { companion object { fun getIntent(context: Context, bbsId: String, bbsName: String, bbsType: String, entrance: String, path: String): Intent { diff --git a/app/src/main/java/com/gh/gamecenter/forum/moderator/ModeratorListFragment.kt b/app/src/main/java/com/gh/gamecenter/forum/moderator/ModeratorListFragment.kt index b9cb8196cd..3a940390ef 100644 --- a/app/src/main/java/com/gh/gamecenter/forum/moderator/ModeratorListFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/forum/moderator/ModeratorListFragment.kt @@ -17,11 +17,11 @@ import com.gh.gamecenter.core.utils.* import com.gh.gamecenter.databinding.FragmentModeratorListBinding import com.gh.gamecenter.entity.ApplyModeratorStatusEntity import com.gh.gamecenter.eventbus.EBUserFollow -import com.gh.gamecenter.common.base.fragment.NormalFragment +import com.gh.gamecenter.common.base.fragment.ToolbarFragment import org.greenrobot.eventbus.Subscribe import org.greenrobot.eventbus.ThreadMode -class ModeratorListFragment : NormalFragment() { +class ModeratorListFragment : ToolbarFragment() { private lateinit var mBinding: FragmentModeratorListBinding private var mViewModel: ModeratorListViewModel? = null private var mAdapter: ModeratorListAdapter? = null diff --git a/app/src/main/java/com/gh/gamecenter/forum/select/ForumSelectActivity.kt b/app/src/main/java/com/gh/gamecenter/forum/select/ForumSelectActivity.kt index dc3fb8520d..921b070728 100644 --- a/app/src/main/java/com/gh/gamecenter/forum/select/ForumSelectActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/forum/select/ForumSelectActivity.kt @@ -3,9 +3,9 @@ package com.gh.gamecenter.forum.select import android.content.Context import android.content.Intent import android.os.Bundle -import com.gh.gamecenter.NormalActivity +import com.gh.gamecenter.common.base.ToolBarActivity -class ForumSelectActivity : NormalActivity() { +class ForumSelectActivity : ToolBarActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) diff --git a/app/src/main/java/com/gh/gamecenter/forum/select/ForumSelectFragment.kt b/app/src/main/java/com/gh/gamecenter/forum/select/ForumSelectFragment.kt index ca6aae18bc..919934232a 100644 --- a/app/src/main/java/com/gh/gamecenter/forum/select/ForumSelectFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/forum/select/ForumSelectFragment.kt @@ -11,11 +11,11 @@ import com.gh.gamecenter.entity.CommunityEntity import com.gh.gamecenter.entity.ForumCategoryEntity import com.gh.gamecenter.eventbus.EBForumFollowChange import com.gh.gamecenter.mvvm.Status -import com.gh.gamecenter.common.base.fragment.NormalFragment +import com.gh.gamecenter.common.base.fragment.ToolbarFragment import org.greenrobot.eventbus.Subscribe import org.greenrobot.eventbus.ThreadMode -class ForumSelectFragment : NormalFragment() { +class ForumSelectFragment : ToolbarFragment() { private lateinit var mBinding: FragmentForumSelectBinding private var mForumCategoryAdapter: ForumCategoryAdapter? = null 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 5073cf75a6..c8e314bef4 100644 --- a/app/src/main/java/com/gh/gamecenter/fragment/LoginFragment.java +++ b/app/src/main/java/com/gh/gamecenter/fragment/LoginFragment.java @@ -38,7 +38,7 @@ import com.gh.common.util.LoginUtils; import com.gh.common.util.QuickLoginHelper; import com.gh.gamecenter.R; import com.gh.gamecenter.WebActivity; -import com.gh.gamecenter.common.base.fragment.NormalFragment; +import com.gh.gamecenter.common.base.fragment.ToolbarFragment; import com.gh.gamecenter.common.base.fragment.WaitingDialogFragment; import com.gh.gamecenter.common.constant.Constants; import com.gh.gamecenter.common.constant.EntranceConsts; @@ -76,7 +76,7 @@ import kotlin.collections.CollectionsKt; */ public class LoginFragment - extends NormalFragment + extends ToolbarFragment implements LoginUtils.onCaptchaCallBackListener, LoginHelper.LoginCallback, View.OnClickListener, diff --git a/app/src/main/java/com/gh/gamecenter/game/columncollection/detail/ColumnCollectionDetailActivity.kt b/app/src/main/java/com/gh/gamecenter/game/columncollection/detail/ColumnCollectionDetailActivity.kt index 431fb149fe..3fd8cb05e0 100644 --- a/app/src/main/java/com/gh/gamecenter/game/columncollection/detail/ColumnCollectionDetailActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/game/columncollection/detail/ColumnCollectionDetailActivity.kt @@ -3,16 +3,16 @@ package com.gh.gamecenter.game.columncollection.detail import android.content.Context import android.content.Intent import android.os.Bundle -import com.gh.gamecenter.common.constant.EntranceConsts -import com.gh.gamecenter.NormalActivity +import com.gh.gamecenter.common.base.ToolBarActivity import com.gh.gamecenter.R import com.gh.gamecenter.catalog.CatalogActivity +import com.gh.gamecenter.common.constant.EntranceConsts import com.gh.gamecenter.common.utils.updateStatusBarColor -class ColumnCollectionDetailActivity : NormalActivity() { +class ColumnCollectionDetailActivity : ToolBarActivity() { override fun provideNormalIntent(): Intent { - return NormalActivity.getTargetIntent(this, ColumnCollectionDetailActivity::class.java, ColumnCollectionDetailFragment::class.java) + return getTargetIntent(this, ColumnCollectionDetailActivity::class.java, ColumnCollectionDetailFragment::class.java) } override fun isAutoResetViewBackgroundEnabled(): Boolean = true @@ -33,7 +33,7 @@ class ColumnCollectionDetailActivity : NormalActivity() { bundle.putString(EntranceConsts.KEY_COLLECTION_ID, collectionId) bundle.putInt(EntranceConsts.KEY_POSITION, position) bundle.putString(EntranceConsts.KEY_COLUMNNAME, columnName) - return NormalActivity.getTargetIntent(context, CatalogActivity::class.java, ColumnCollectionDetailFragment::class.java, bundle) + return getTargetIntent(context, CatalogActivity::class.java, ColumnCollectionDetailFragment::class.java, bundle) } } diff --git a/app/src/main/java/com/gh/gamecenter/game/commoncollection/detail/CommonCollectionDetailActivity.kt b/app/src/main/java/com/gh/gamecenter/game/commoncollection/detail/CommonCollectionDetailActivity.kt index fde52aee1a..1c8efe891e 100644 --- a/app/src/main/java/com/gh/gamecenter/game/commoncollection/detail/CommonCollectionDetailActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/game/commoncollection/detail/CommonCollectionDetailActivity.kt @@ -3,12 +3,12 @@ package com.gh.gamecenter.game.commoncollection.detail import android.content.Context import android.content.Intent import android.os.Bundle -import com.gh.gamecenter.common.constant.EntranceConsts -import com.gh.gamecenter.NormalActivity +import com.gh.gamecenter.common.base.ToolBarActivity import com.gh.gamecenter.R +import com.gh.gamecenter.common.constant.EntranceConsts import com.gh.gamecenter.common.utils.updateStatusBarColor -class CommonCollectionDetailActivity : NormalActivity() { +class CommonCollectionDetailActivity : ToolBarActivity() { override fun provideNormalIntent(): Intent { return getTargetIntent(this, CommonCollectionDetailActivity::class.java, CommonCollectionDetailFragment::class.java) diff --git a/app/src/main/java/com/gh/gamecenter/game/upload/GameSubmissionActivity.kt b/app/src/main/java/com/gh/gamecenter/game/upload/GameSubmissionActivity.kt index 67db15b363..d394a5d5df 100644 --- a/app/src/main/java/com/gh/gamecenter/game/upload/GameSubmissionActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/game/upload/GameSubmissionActivity.kt @@ -3,16 +3,16 @@ package com.gh.gamecenter.game.upload import android.content.Context import android.content.Intent import android.os.Bundle +import com.gh.gamecenter.common.base.ToolBarActivity +import com.gh.gamecenter.R import com.gh.gamecenter.common.base.BaseActivity import com.gh.gamecenter.common.constant.EntranceConsts -import com.gh.gamecenter.NormalActivity -import com.gh.gamecenter.R import com.gh.gamecenter.common.utils.updateStatusBarColor /** * 游戏投稿 */ -class GameSubmissionActivity : NormalActivity() { +class GameSubmissionActivity : ToolBarActivity() { companion object { @JvmStatic fun getIntent(context: Context, entrance: String, path: String): Intent { diff --git a/app/src/main/java/com/gh/gamecenter/game/upload/GameUploadFragment.kt b/app/src/main/java/com/gh/gamecenter/game/upload/GameUploadFragment.kt index 8384d59b94..00f8e833cd 100644 --- a/app/src/main/java/com/gh/gamecenter/game/upload/GameUploadFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/game/upload/GameUploadFragment.kt @@ -32,7 +32,7 @@ import com.gh.gamecenter.common.utils.TextHelper import com.gh.gamecenter.core.utils.* import com.gh.gamecenter.databinding.FragmentGameUploadBinding import com.gh.gamecenter.entity.InstallGameEntity -import com.gh.gamecenter.common.base.fragment.NormalFragment +import com.gh.gamecenter.common.base.fragment.ToolbarFragment import com.gh.gamecenter.suggest.SuggestPicAdapter import com.gh.gamecenter.suggest.SuggestSelectGameAdapter import com.halo.assistant.HaloApp @@ -49,7 +49,7 @@ import kotlin.collections.component1 import kotlin.collections.component2 import kotlin.collections.set -class GameUploadFragment : NormalFragment() { +class GameUploadFragment : ToolbarFragment() { private var mAdapter: SuggestPicAdapter? = null private var mIconAdapter: SuggestPicAdapter? = null diff --git a/app/src/main/java/com/gh/gamecenter/gamecollection/choose/AddGamesActivity.kt b/app/src/main/java/com/gh/gamecenter/gamecollection/choose/AddGamesActivity.kt index cf6639179e..cbb2c3f6e6 100644 --- a/app/src/main/java/com/gh/gamecenter/gamecollection/choose/AddGamesActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/gamecollection/choose/AddGamesActivity.kt @@ -3,11 +3,11 @@ package com.gh.gamecenter.gamecollection.choose import android.content.Context import android.content.Intent import android.os.Bundle -import com.gh.gamecenter.NormalActivity +import com.gh.gamecenter.common.base.ToolBarActivity import com.gh.gamecenter.R import com.gh.gamecenter.common.utils.updateStatusBarColor -class AddGamesActivity : NormalActivity() { +class AddGamesActivity : ToolBarActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) diff --git a/app/src/main/java/com/gh/gamecenter/gamecollection/choose/ChooseGamesActivity.kt b/app/src/main/java/com/gh/gamecenter/gamecollection/choose/ChooseGamesActivity.kt index dd46c7b1c3..fa4b5fe015 100644 --- a/app/src/main/java/com/gh/gamecenter/gamecollection/choose/ChooseGamesActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/gamecollection/choose/ChooseGamesActivity.kt @@ -3,11 +3,11 @@ package com.gh.gamecenter.gamecollection.choose import android.content.Context import android.content.Intent import android.os.Bundle -import com.gh.gamecenter.NormalActivity +import com.gh.gamecenter.common.base.ToolBarActivity import com.gh.gamecenter.R import com.gh.gamecenter.common.utils.updateStatusBarColor -class ChooseGamesActivity : NormalActivity() { +class ChooseGamesActivity : ToolBarActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setNavigationTitle("选择游戏") diff --git a/app/src/main/java/com/gh/gamecenter/gamecollection/choose/ChooseGamesFragment.kt b/app/src/main/java/com/gh/gamecenter/gamecollection/choose/ChooseGamesFragment.kt index 36cff0b9d7..d4e01ff6d0 100644 --- a/app/src/main/java/com/gh/gamecenter/gamecollection/choose/ChooseGamesFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/gamecollection/choose/ChooseGamesFragment.kt @@ -12,12 +12,12 @@ import com.gh.gamecenter.common.utils.viewModelProvider import com.gh.gamecenter.R import com.gh.gamecenter.databinding.FragmentChooseGamesBinding import com.gh.gamecenter.entity.GameEntity -import com.gh.gamecenter.common.base.fragment.NormalFragment +import com.gh.gamecenter.common.base.fragment.ToolbarFragment import com.gh.gamecenter.common.utils.toColor import java.lang.ref.WeakReference import java.util.* -class ChooseGamesFragment : NormalFragment(), ChooseGamesAdapter.ItemDragListener { +class ChooseGamesFragment : ToolbarFragment(), ChooseGamesAdapter.ItemDragListener { private lateinit var mBinding: FragmentChooseGamesBinding private lateinit var mViewModel: ChooseGamesViewModel diff --git a/app/src/main/java/com/gh/gamecenter/gamecollection/detail/GameCollectionDetailActivity.kt b/app/src/main/java/com/gh/gamecenter/gamecollection/detail/GameCollectionDetailActivity.kt index ce17d2c3ac..91f28ba12c 100644 --- a/app/src/main/java/com/gh/gamecenter/gamecollection/detail/GameCollectionDetailActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/gamecollection/detail/GameCollectionDetailActivity.kt @@ -3,14 +3,14 @@ package com.gh.gamecenter.gamecollection.detail import android.content.Context import android.content.Intent import android.os.Bundle -import com.gh.gamecenter.core.utils.DisplayUtils -import com.gh.gamecenter.common.constant.EntranceConsts +import com.gh.gamecenter.common.base.ToolBarActivity import com.gh.common.util.GameCollectionSquareBrowseTaskHelper -import com.gh.gamecenter.NormalActivity import com.gh.gamecenter.R +import com.gh.gamecenter.common.constant.EntranceConsts +import com.gh.gamecenter.core.utils.DisplayUtils import com.gh.gamecenter.gamecollection.square.GameCollectionSquareActivity -class GameCollectionDetailActivity : NormalActivity() { +class GameCollectionDetailActivity : ToolBarActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) diff --git a/app/src/main/java/com/gh/gamecenter/gamecollection/detail/GameCollectionPosterActivity.kt b/app/src/main/java/com/gh/gamecenter/gamecollection/detail/GameCollectionPosterActivity.kt index 01dd09ab69..1f71bad2ab 100644 --- a/app/src/main/java/com/gh/gamecenter/gamecollection/detail/GameCollectionPosterActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/gamecollection/detail/GameCollectionPosterActivity.kt @@ -3,13 +3,13 @@ package com.gh.gamecenter.gamecollection.detail import android.content.Context import android.content.Intent import android.os.Bundle -import com.gh.gamecenter.core.utils.DisplayUtils -import com.gh.gamecenter.common.constant.EntranceConsts -import com.gh.gamecenter.NormalActivity +import com.gh.gamecenter.common.base.ToolBarActivity import com.gh.gamecenter.R +import com.gh.gamecenter.common.constant.EntranceConsts +import com.gh.gamecenter.core.utils.DisplayUtils import com.gh.gamecenter.entity.GamesCollectionDetailEntity -class GameCollectionPosterActivity : NormalActivity() { +class GameCollectionPosterActivity : ToolBarActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) diff --git a/app/src/main/java/com/gh/gamecenter/gamecollection/detail/GameCollectionPosterFragment.kt b/app/src/main/java/com/gh/gamecenter/gamecollection/detail/GameCollectionPosterFragment.kt index 50fb47f647..86f2f2cabc 100644 --- a/app/src/main/java/com/gh/gamecenter/gamecollection/detail/GameCollectionPosterFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/gamecollection/detail/GameCollectionPosterFragment.kt @@ -17,9 +17,9 @@ import com.gh.gamecenter.databinding.FragmentGameCollectionPosterBinding import com.gh.gamecenter.databinding.LayoutGameCollectionTagBinding import com.gh.gamecenter.entity.GamesCollectionDetailEntity import com.gh.gamecenter.manager.UserManager -import com.gh.gamecenter.common.base.fragment.NormalFragment +import com.gh.gamecenter.common.base.fragment.ToolbarFragment -class GameCollectionPosterFragment : NormalFragment() { +class GameCollectionPosterFragment : ToolbarFragment() { private val mBinding by lazy { FragmentGameCollectionPosterBinding.inflate(layoutInflater) } private var mViewModel: GameCollectionPosterViewModel? = null diff --git a/app/src/main/java/com/gh/gamecenter/gamecollection/mine/MyGameCollectionActivity.kt b/app/src/main/java/com/gh/gamecenter/gamecollection/mine/MyGameCollectionActivity.kt index 1a08861357..8300e15d80 100644 --- a/app/src/main/java/com/gh/gamecenter/gamecollection/mine/MyGameCollectionActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/gamecollection/mine/MyGameCollectionActivity.kt @@ -3,11 +3,11 @@ package com.gh.gamecenter.gamecollection.mine import android.content.Context import android.content.Intent import android.os.Bundle -import com.gh.gamecenter.NormalActivity +import com.gh.gamecenter.common.base.ToolBarActivity import com.gh.gamecenter.R import com.gh.gamecenter.common.utils.updateStatusBarColor -class MyGameCollectionActivity : NormalActivity() { +class MyGameCollectionActivity : ToolBarActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) diff --git a/app/src/main/java/com/gh/gamecenter/gamecollection/mine/MyGameCollectionFragment.kt b/app/src/main/java/com/gh/gamecenter/gamecollection/mine/MyGameCollectionFragment.kt index 7d89a19708..eb7a80b852 100644 --- a/app/src/main/java/com/gh/gamecenter/gamecollection/mine/MyGameCollectionFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/gamecollection/mine/MyGameCollectionFragment.kt @@ -12,7 +12,7 @@ import com.gh.common.util.DirectUtils import com.gh.common.util.NewLogUtils import com.gh.gamecenter.common.utils.showRegulationTestDialogIfNeeded import com.gh.gamecenter.common.view.VerticalItemDecoration -import com.gh.base.ToolBarActivity +import com.gh.gamecenter.common.base.ToolBarActivity import com.gh.gamecenter.R import com.gh.gamecenter.WebActivity import com.gh.gamecenter.baselist.ListAdapter diff --git a/app/src/main/java/com/gh/gamecenter/gamecollection/publish/GameCollectionActivityLabelFragment.kt b/app/src/main/java/com/gh/gamecenter/gamecollection/publish/GameCollectionActivityLabelFragment.kt index 68957c527c..7f27833828 100644 --- a/app/src/main/java/com/gh/gamecenter/gamecollection/publish/GameCollectionActivityLabelFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/gamecollection/publish/GameCollectionActivityLabelFragment.kt @@ -6,7 +6,7 @@ import androidx.core.content.ContextCompat import androidx.recyclerview.widget.DefaultItemAnimator import androidx.recyclerview.widget.LinearLayoutManager import com.gh.gamecenter.R -import com.gh.gamecenter.common.base.fragment.NormalFragment +import com.gh.gamecenter.common.base.fragment.ToolbarFragment import com.gh.gamecenter.common.utils.dip2px import com.gh.gamecenter.common.utils.viewModelProvider import com.gh.gamecenter.common.view.divider.HorizontalDividerItemDecoration @@ -15,7 +15,7 @@ import com.gh.gamecenter.entity.ActivityLabelEntity import com.gh.gamecenter.video.label.VideoLabelActivity import com.gh.gamecenter.video.label.VideoLabelAdapter -class GameCollectionActivityLabelFragment : NormalFragment() { +class GameCollectionActivityLabelFragment : ToolbarFragment() { private lateinit var mBinding: FragmentListBaseBinding private var mAdapter: VideoLabelAdapter? = null private lateinit var mViewModel: GameCollectionActivityLabelViewModel diff --git a/app/src/main/java/com/gh/gamecenter/gamecollection/publish/GameCollectionEditActivity.kt b/app/src/main/java/com/gh/gamecenter/gamecollection/publish/GameCollectionEditActivity.kt index 8e24c80a07..77fd9b7083 100644 --- a/app/src/main/java/com/gh/gamecenter/gamecollection/publish/GameCollectionEditActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/gamecollection/publish/GameCollectionEditActivity.kt @@ -9,7 +9,7 @@ import android.view.MenuItem import android.view.View import android.widget.TextView import androidx.core.widget.doOnTextChanged -import com.gh.base.ToolBarActivity +import com.gh.gamecenter.common.base.ToolBarActivity import com.gh.common.util.ErrorHelper import com.gh.common.util.NewLogUtils import com.gh.gamecenter.common.base.fragment.WaitingDialogFragment diff --git a/app/src/main/java/com/gh/gamecenter/gamecollection/tag/GameCollectionTagSelectActivity.kt b/app/src/main/java/com/gh/gamecenter/gamecollection/tag/GameCollectionTagSelectActivity.kt index 96335bd317..11d28158ec 100644 --- a/app/src/main/java/com/gh/gamecenter/gamecollection/tag/GameCollectionTagSelectActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/gamecollection/tag/GameCollectionTagSelectActivity.kt @@ -3,12 +3,12 @@ package com.gh.gamecenter.gamecollection.tag import android.content.Context import android.content.Intent import android.os.Bundle -import com.gh.gamecenter.NormalActivity +import com.gh.gamecenter.common.base.ToolBarActivity import com.gh.gamecenter.R import com.gh.gamecenter.common.utils.updateStatusBarColor import com.gh.gamecenter.entity.TagInfoEntity -class GameCollectionTagSelectActivity : NormalActivity() { +class GameCollectionTagSelectActivity : ToolBarActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) diff --git a/app/src/main/java/com/gh/gamecenter/gamecollection/tag/GameCollectionTagSelectFragment.kt b/app/src/main/java/com/gh/gamecenter/gamecollection/tag/GameCollectionTagSelectFragment.kt index bc4ab6ceff..2581bf77b0 100644 --- a/app/src/main/java/com/gh/gamecenter/gamecollection/tag/GameCollectionTagSelectFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/gamecollection/tag/GameCollectionTagSelectFragment.kt @@ -14,10 +14,10 @@ import com.gh.gamecenter.R import com.gh.gamecenter.databinding.FragmentGameCollectionTagSelectBinding import com.gh.gamecenter.databinding.ItemGameCollectionSelectedTagBinding import com.gh.gamecenter.entity.TagInfoEntity -import com.gh.gamecenter.common.base.fragment.NormalFragment +import com.gh.gamecenter.common.base.fragment.ToolbarFragment import com.gh.gamecenter.common.utils.toColor -class GameCollectionTagSelectFragment : NormalFragment() { +class GameCollectionTagSelectFragment : ToolbarFragment() { private var mSingleChoice = false private var mMaxSelectCount = 1 diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailFragment.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailFragment.kt index 16bbf74704..522a6e066d 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailFragment.kt @@ -55,7 +55,7 @@ import com.gh.gamecenter.gamedetail.rating.RatingFragment import com.gh.gamecenter.gamedetail.video.TopVideoView import com.gh.gamecenter.home.video.ScrollCalculatorHelper import com.gh.gamecenter.mvvm.Status -import com.gh.gamecenter.common.base.fragment.NormalFragment +import com.gh.gamecenter.common.base.fragment.ToolbarFragment import com.gh.gamecenter.packagehelper.PackageViewModel import com.gh.gamecenter.setting.VideoSettingFragment import com.gh.gamecenter.simulatorgame.SimulatorGameActivity @@ -80,7 +80,7 @@ import retrofit2.HttpException import java.util.* import kotlin.math.abs -class GameDetailFragment : NormalFragment() { +class GameDetailFragment : ToolbarFragment() { private var mDownloadMenuIcon: ImageView? = null private var mDownloadCountHint: TextView? = null diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/kaifu/ServersCalendarActivity.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/kaifu/ServersCalendarActivity.kt index c1915226ed..d5b19545c2 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/kaifu/ServersCalendarActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/kaifu/ServersCalendarActivity.kt @@ -14,7 +14,7 @@ import androidx.lifecycle.ViewModelProviders import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView -import com.gh.base.ToolBarActivity +import com.gh.gamecenter.common.base.ToolBarActivity import com.gh.common.util.NewLogUtils import com.gh.gamecenter.R import com.gh.gamecenter.SuggestionActivity diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/history/HistoryApkListActivity.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/history/HistoryApkListActivity.kt index ebf4ccf958..736ffd0477 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/history/HistoryApkListActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/history/HistoryApkListActivity.kt @@ -3,13 +3,13 @@ package com.gh.gamecenter.gamedetail.history import android.content.Context import android.content.Intent import android.os.Bundle +import com.gh.gamecenter.common.base.ToolBarActivity +import com.gh.gamecenter.R import com.gh.gamecenter.common.base.BaseActivity import com.gh.gamecenter.common.constant.EntranceConsts -import com.gh.gamecenter.NormalActivity -import com.gh.gamecenter.R import com.gh.gamecenter.entity.GameEntity -class HistoryApkListActivity : NormalActivity() { +class HistoryApkListActivity : ToolBarActivity() { companion object { fun getIntent(context: Context, gameEntity: GameEntity, entrance: String, path: String): Intent { diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/myrating/MyRatingActivity.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/myrating/MyRatingActivity.kt index 6df435d0aa..2e6373cd8c 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/myrating/MyRatingActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/myrating/MyRatingActivity.kt @@ -3,15 +3,15 @@ package com.gh.gamecenter.gamedetail.myrating import android.content.Context import android.content.Intent import android.os.Bundle +import com.gh.gamecenter.common.base.ToolBarActivity +import com.gh.gamecenter.R import com.gh.gamecenter.common.base.BaseActivity import com.gh.gamecenter.common.constant.EntranceConsts -import com.gh.gamecenter.NormalActivity -import com.gh.gamecenter.R /** * 我的游戏评论 */ -class MyRatingActivity : NormalActivity() { +class MyRatingActivity : ToolBarActivity() { companion object { fun getIntent(context: Context, entrance: String, path: String): Intent { diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingFoldActivity.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingFoldActivity.kt index 5c45e62b58..4db4e4dd97 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingFoldActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingFoldActivity.kt @@ -3,11 +3,11 @@ package com.gh.gamecenter.gamedetail.rating import android.content.Context import android.content.Intent import android.os.Bundle +import com.gh.gamecenter.common.base.ToolBarActivity import com.gh.gamecenter.common.constant.EntranceConsts -import com.gh.gamecenter.NormalActivity import com.gh.gamecenter.entity.GameEntity -class RatingFoldActivity : NormalActivity() { +class RatingFoldActivity : ToolBarActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingReplyActivity.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingReplyActivity.kt index f63f389be9..3f387b8e27 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingReplyActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingReplyActivity.kt @@ -240,9 +240,8 @@ class RatingReplyActivity : ListActivity() diff --git a/app/src/main/java/com/gh/gamecenter/simulatorgame/SimulatorManagementActivity.kt b/app/src/main/java/com/gh/gamecenter/simulatorgame/SimulatorManagementActivity.kt index 627a8ad2b6..31ae443ca1 100644 --- a/app/src/main/java/com/gh/gamecenter/simulatorgame/SimulatorManagementActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/simulatorgame/SimulatorManagementActivity.kt @@ -3,11 +3,11 @@ package com.gh.gamecenter.simulatorgame import android.content.Context import android.content.Intent import android.os.Bundle -import com.gh.gamecenter.NormalActivity +import com.gh.gamecenter.common.base.ToolBarActivity import com.gh.gamecenter.R import com.gh.gamecenter.common.utils.updateStatusBarColor -class SimulatorManagementActivity : NormalActivity() { +class SimulatorManagementActivity : ToolBarActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) diff --git a/app/src/main/java/com/gh/gamecenter/subject/SubjectActivity.kt b/app/src/main/java/com/gh/gamecenter/subject/SubjectActivity.kt index 1604a12c86..651317633f 100644 --- a/app/src/main/java/com/gh/gamecenter/subject/SubjectActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/subject/SubjectActivity.kt @@ -4,16 +4,15 @@ import android.content.Context import android.content.Intent import android.os.Bundle import androidx.lifecycle.ViewModelProviders - -import com.gh.gamecenter.common.constant.EntranceConsts -import com.gh.gamecenter.core.utils.MtaHelper -import com.gh.gamecenter.NormalActivity +import com.gh.base.DownloadToolbarActivity import com.gh.gamecenter.R +import com.gh.gamecenter.common.constant.EntranceConsts import com.gh.gamecenter.common.utils.updateStatusBarColor +import com.gh.gamecenter.core.utils.MtaHelper import com.gh.gamecenter.entity.SubjectData import com.halo.assistant.HaloApp -class SubjectActivity : NormalActivity() { +class SubjectActivity : DownloadToolbarActivity() { private var mViewModel: SubjectViewModel? = null diff --git a/app/src/main/java/com/gh/gamecenter/tag/TagsActivity.kt b/app/src/main/java/com/gh/gamecenter/tag/TagsActivity.kt index 3e7998b728..3ace315c98 100644 --- a/app/src/main/java/com/gh/gamecenter/tag/TagsActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/tag/TagsActivity.kt @@ -3,15 +3,15 @@ package com.gh.gamecenter.tag import android.content.Context import android.content.Intent import android.os.Bundle -import com.gh.gamecenter.common.base.BaseActivity +import com.gh.base.DownloadToolbarActivity import com.gh.gamecenter.GameDetailActivity -import com.gh.gamecenter.NormalActivity import com.gh.gamecenter.R import com.gh.gamecenter.SearchActivity +import com.gh.gamecenter.common.base.BaseActivity import com.gh.gamecenter.common.constant.EntranceConsts import com.gh.gamecenter.common.utils.updateStatusBarColor -class TagsActivity : NormalActivity() { +class TagsActivity : DownloadToolbarActivity() { companion object { diff --git a/app/src/main/java/com/gh/gamecenter/teenagermode/PasswordSettingFragment.kt b/app/src/main/java/com/gh/gamecenter/teenagermode/PasswordSettingFragment.kt index f8af79901f..3b6af3a752 100644 --- a/app/src/main/java/com/gh/gamecenter/teenagermode/PasswordSettingFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/teenagermode/PasswordSettingFragment.kt @@ -13,11 +13,11 @@ import com.gh.gamecenter.MainActivity import com.gh.gamecenter.R import com.gh.gamecenter.WebActivity import com.gh.gamecenter.databinding.FragmentPasswordSettingBinding -import com.gh.gamecenter.common.base.fragment.NormalFragment +import com.gh.gamecenter.common.base.fragment.ToolbarFragment import com.gh.gamecenter.common.utils.toDrawable import com.lightgame.utils.AppManager -class PasswordSettingFragment : NormalFragment() { +class PasswordSettingFragment : ToolbarFragment() { private var mBinding: FragmentPasswordSettingBinding? = null private var mViewModel: TeenagerModeViewModel? = null diff --git a/app/src/main/java/com/gh/gamecenter/teenagermode/TeenagerModeFragment.kt b/app/src/main/java/com/gh/gamecenter/teenagermode/TeenagerModeFragment.kt index 7ae3c3b08b..5dc8ab77bc 100644 --- a/app/src/main/java/com/gh/gamecenter/teenagermode/TeenagerModeFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/teenagermode/TeenagerModeFragment.kt @@ -12,12 +12,12 @@ import com.gh.gamecenter.common.view.CustomLinkMovementMethod import com.gh.gamecenter.R import com.gh.gamecenter.WebActivity import com.gh.gamecenter.databinding.FragmentTeenagerModeBinding -import com.gh.gamecenter.common.base.fragment.NormalFragment +import com.gh.gamecenter.common.base.fragment.ToolbarFragment import com.gh.gamecenter.common.utils.toColor import com.gh.gamecenter.common.utils.toDrawable import com.gh.gamecenter.core.utils.ClickUtils -class TeenagerModeFragment : NormalFragment() { +class TeenagerModeFragment : ToolbarFragment() { private var mBinding: FragmentTeenagerModeBinding? = null diff --git a/app/src/main/java/com/gh/gamecenter/toolbox/ToolBoxBlockActivity.kt b/app/src/main/java/com/gh/gamecenter/toolbox/ToolBoxBlockActivity.kt index 2b5481d320..1b3eafce23 100644 --- a/app/src/main/java/com/gh/gamecenter/toolbox/ToolBoxBlockActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/toolbox/ToolBoxBlockActivity.kt @@ -14,7 +14,7 @@ import android.widget.TextView import androidx.activity.viewModels import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.SimpleItemAnimator -import com.gh.base.ToolBarActivity +import com.gh.gamecenter.common.base.ToolBarActivity import com.gh.gamecenter.common.view.CustomLinkMovementMethod import com.gh.gamecenter.R import com.gh.gamecenter.SuggestionActivity diff --git a/app/src/main/java/com/gh/gamecenter/video/game/GameVideoActivity.kt b/app/src/main/java/com/gh/gamecenter/video/game/GameVideoActivity.kt index 308ff4cfbd..c83766c452 100644 --- a/app/src/main/java/com/gh/gamecenter/video/game/GameVideoActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/video/game/GameVideoActivity.kt @@ -9,7 +9,7 @@ import androidx.core.content.ContextCompat import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProviders import com.gh.gamecenter.common.base.BaseActivity -import com.gh.base.ToolBarActivity +import com.gh.gamecenter.common.base.ToolBarActivity import com.gh.gamecenter.common.base.adapter.FragmentAdapter import com.gh.gamecenter.GameDetailActivity import com.gh.gamecenter.R diff --git a/app/src/main/java/com/gh/gamecenter/video/label/VideoLabelActivity.kt b/app/src/main/java/com/gh/gamecenter/video/label/VideoLabelActivity.kt index c2f1c2bde5..3a9226578a 100644 --- a/app/src/main/java/com/gh/gamecenter/video/label/VideoLabelActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/video/label/VideoLabelActivity.kt @@ -3,10 +3,10 @@ package com.gh.gamecenter.video.label import android.content.Context import android.content.Intent import android.os.Bundle -import com.gh.gamecenter.NormalActivity +import com.gh.gamecenter.common.base.ToolBarActivity @Deprecated("v5.0.0废弃") -class VideoLabelActivity : NormalActivity() { +class VideoLabelActivity : ToolBarActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) diff --git a/app/src/main/java/com/gh/gamecenter/video/label/VideoLabelFragment.kt b/app/src/main/java/com/gh/gamecenter/video/label/VideoLabelFragment.kt index 82baa966d3..69314d48b3 100644 --- a/app/src/main/java/com/gh/gamecenter/video/label/VideoLabelFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/video/label/VideoLabelFragment.kt @@ -13,10 +13,10 @@ import com.gh.gamecenter.common.view.divider.HorizontalDividerItemDecoration import com.gh.gamecenter.R import com.gh.gamecenter.databinding.FragmentListBaseBinding import com.gh.gamecenter.entity.ActivityLabelEntity -import com.gh.gamecenter.common.base.fragment.NormalFragment +import com.gh.gamecenter.common.base.fragment.ToolbarFragment import com.gh.gamecenter.qa.dialog.ChooseActivityDialogFragment -class VideoLabelFragment : NormalFragment() { +class VideoLabelFragment : ToolbarFragment() { private lateinit var mBinding: FragmentListBaseBinding private var mAdapter: VideoLabelAdapter? = null private lateinit var mViewModel: VideoLabelViewModel diff --git a/app/src/main/java/com/gh/gamecenter/video/poster/PosterClipActivity.kt b/app/src/main/java/com/gh/gamecenter/video/poster/PosterClipActivity.kt index 9939775538..c5d13521af 100644 --- a/app/src/main/java/com/gh/gamecenter/video/poster/PosterClipActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/video/poster/PosterClipActivity.kt @@ -5,7 +5,7 @@ import android.content.Context import android.content.Intent import android.os.Bundle import android.view.View -import com.gh.base.ToolBarActivity +import com.gh.gamecenter.common.base.ToolBarActivity import com.gh.gamecenter.common.utils.DialogHelper import com.gh.gamecenter.core.utils.DisplayUtils import com.gh.gamecenter.common.constant.EntranceConsts diff --git a/app/src/main/java/com/gh/gamecenter/video/upload/view/UploadVideoActivity.kt b/app/src/main/java/com/gh/gamecenter/video/upload/view/UploadVideoActivity.kt index e6f91d3216..2a0aca3adc 100644 --- a/app/src/main/java/com/gh/gamecenter/video/upload/view/UploadVideoActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/video/upload/view/UploadVideoActivity.kt @@ -25,7 +25,7 @@ import android.widget.TextView import androidx.core.content.ContextCompat import androidx.lifecycle.Observer import androidx.lifecycle.ViewModelProviders -import com.gh.base.ToolBarActivity +import com.gh.gamecenter.common.base.ToolBarActivity import com.gh.gamecenter.common.base.fragment.WaitingDialogFragment import com.gh.gamecenter.core.AppExecutor import com.gh.common.util.* diff --git a/app/src/main/java/com/gh/gamecenter/video/videomanager/VideoDraftActivity.kt b/app/src/main/java/com/gh/gamecenter/video/videomanager/VideoDraftActivity.kt index a133d63b04..a86461233d 100644 --- a/app/src/main/java/com/gh/gamecenter/video/videomanager/VideoDraftActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/video/videomanager/VideoDraftActivity.kt @@ -3,11 +3,11 @@ package com.gh.gamecenter.video.videomanager import android.content.Context import android.content.Intent import android.os.Bundle -import com.gh.gamecenter.NormalActivity +import com.gh.gamecenter.common.base.ToolBarActivity import com.gh.gamecenter.R import com.gh.gamecenter.common.utils.updateStatusBarColor -class VideoDraftActivity : NormalActivity() { +class VideoDraftActivity : ToolBarActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) diff --git a/app/src/main/java/com/halo/assistant/fragment/AboutFragment.kt b/app/src/main/java/com/halo/assistant/fragment/AboutFragment.kt index f20c917920..ca1341c523 100644 --- a/app/src/main/java/com/halo/assistant/fragment/AboutFragment.kt +++ b/app/src/main/java/com/halo/assistant/fragment/AboutFragment.kt @@ -19,12 +19,12 @@ import com.gh.gamecenter.core.utils.StringUtils import com.gh.gamecenter.core.utils.ToastUtils import com.gh.gamecenter.databinding.FragmentAboutBinding import com.gh.gamecenter.manager.UpdateManager -import com.gh.gamecenter.common.base.fragment.NormalFragment +import com.gh.gamecenter.common.base.fragment.ToolbarFragment import com.gh.gamecenter.common.utils.* import com.halo.assistant.HaloApp import java.util.* -class AboutFragment : NormalFragment() { +class AboutFragment : ToolbarFragment() { private lateinit var mBinding: FragmentAboutBinding 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 0a9006daf9..2a84552216 100644 --- a/app/src/main/java/com/halo/assistant/fragment/ApkCleanerFragment.java +++ b/app/src/main/java/com/halo/assistant/fragment/ApkCleanerFragment.java @@ -28,7 +28,7 @@ import com.gh.gamecenter.R; import com.gh.gamecenter.adapter.CleanApkAdapter; import com.gh.gamecenter.entity.InstallGameEntity; import com.gh.gamecenter.fragment.MainWrapperFragment; -import com.gh.gamecenter.common.base.fragment.NormalFragment; +import com.gh.gamecenter.common.base.fragment.ToolbarFragment; import com.lightgame.utils.Utils; import java.io.File; @@ -40,7 +40,7 @@ import java.util.List; *

* 扫描并删除apk */ -public class ApkCleanerFragment extends NormalFragment implements CleanApkAdapter.OnScanListener { +public class ApkCleanerFragment extends ToolbarFragment implements CleanApkAdapter.OnScanListener { private TextView mApkCount; private TextView mApkDeleteBtn; diff --git a/app/src/main/java/com/halo/assistant/fragment/SettingsFragment.kt b/app/src/main/java/com/halo/assistant/fragment/SettingsFragment.kt index 7660bfe715..9349451a05 100644 --- a/app/src/main/java/com/halo/assistant/fragment/SettingsFragment.kt +++ b/app/src/main/java/com/halo/assistant/fragment/SettingsFragment.kt @@ -30,7 +30,7 @@ import com.gh.gamecenter.eventbus.EBReuse import com.gh.gamecenter.fragment.MainWrapperFragment import com.gh.gamecenter.game.upload.GameSubmissionActivity import com.gh.gamecenter.manager.UserManager -import com.gh.gamecenter.common.base.fragment.NormalFragment +import com.gh.gamecenter.common.base.fragment.ToolbarFragment import com.gh.gamecenter.common.callback.CancelListener import com.gh.gamecenter.common.utils.* import com.gh.gamecenter.security.SecurityActivity @@ -50,7 +50,7 @@ import io.reactivex.schedulers.Schedulers import org.greenrobot.eventbus.EventBus import java.io.File -class SettingsFragment : NormalFragment() { +class SettingsFragment : ToolbarFragment() { private lateinit var mBinding: FragmentSettingBinding private var checkSizeIndex = 0 diff --git a/app/src/main/java/com/halo/assistant/fragment/SwitchInstallMethodFragment.kt b/app/src/main/java/com/halo/assistant/fragment/SwitchInstallMethodFragment.kt index f43b282b30..4be91395d1 100644 --- a/app/src/main/java/com/halo/assistant/fragment/SwitchInstallMethodFragment.kt +++ b/app/src/main/java/com/halo/assistant/fragment/SwitchInstallMethodFragment.kt @@ -13,13 +13,13 @@ import com.gh.download.server.BrowserInstallHelper import com.gh.gamecenter.R import com.gh.gamecenter.WebActivity import com.gh.gamecenter.databinding.FragmentSwitchInstallMethodBinding -import com.gh.gamecenter.common.base.fragment.NormalFragment +import com.gh.gamecenter.common.base.fragment.ToolbarFragment import java.util.* /** * 切换安装方式 */ -class SwitchInstallMethodFragment : NormalFragment() { +class SwitchInstallMethodFragment : ToolbarFragment() { private var mBinding: FragmentSwitchInstallMethodBinding? = null 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 9fd039c5e8..58134c4189 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 @@ -34,7 +34,7 @@ import com.gh.gamecenter.adapter.CommentDetailAdapter; import com.gh.gamecenter.adapter.OnCommentCallBackListener; import com.gh.gamecenter.entity.CommentEntity; import com.gh.gamecenter.entity.MessageEntity; -import com.gh.gamecenter.common.base.fragment.NormalFragment; +import com.gh.gamecenter.common.base.fragment.ToolbarFragment; import com.lightgame.utils.Util_System_Keyboard; import org.json.JSONException; @@ -47,7 +47,7 @@ import retrofit2.HttpException; *

* 评论详情页面-查看对话详情 */ -public class CommentDetailFragment extends NormalFragment implements OnCommentCallBackListener, KeyboardHeightObserver { +public class CommentDetailFragment extends ToolbarFragment implements OnCommentCallBackListener, KeyboardHeightObserver { private EditText mCommentDetailCommentEt; private TextView mCommentSend; 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 5054504957..bc629402e2 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 @@ -24,7 +24,7 @@ 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.common.base.fragment.NormalFragment; +import com.gh.gamecenter.common.base.fragment.ToolbarFragment; import com.gh.gamecenter.common.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; @@ -43,7 +43,7 @@ import retrofit2.HttpException; *

* Created by CsHeng on 14/12/2017. */ -public class GameNewsSearchFragment extends NormalFragment { +public class GameNewsSearchFragment extends ToolbarFragment { private RecyclerView mGameNewsRv; private RecyclerView mGameNewsTypeRv; 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 9c44f19059..f6e025e43a 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 @@ -28,7 +28,7 @@ import com.gh.gamecenter.adapter.viewholder.FooterViewHolder; import com.gh.gamecenter.adapter.viewholder.NewsTextViewHolder; import com.gh.gamecenter.databinding.NewsTextItemBinding; import com.gh.gamecenter.entity.NewsEntity; -import com.gh.gamecenter.common.base.fragment.NormalFragment; +import com.gh.gamecenter.common.base.fragment.ToolbarFragment; import com.gh.gamecenter.common.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; import com.lightgame.utils.Util_System_Keyboard; @@ -44,7 +44,7 @@ import retrofit2.HttpException; * Created by CsHeng on 14/12/2017. * 游戏新闻搜索结果界面 */ -public class GameNewsSearchResultFragment extends NormalFragment { +public class GameNewsSearchResultFragment extends ToolbarFragment { private LinearLayout mNoneData; private EditText mNewsSearchEt; 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 aabbd498bb..f8e8eefb4e 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 @@ -12,7 +12,7 @@ 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.common.base.fragment.NormalFragment; +import com.gh.gamecenter.common.base.fragment.ToolbarFragment; import org.greenrobot.eventbus.Subscribe; import org.greenrobot.eventbus.ThreadMode; @@ -30,7 +30,7 @@ import static com.gh.gamecenter.personal.PersonalFragment.LOGIN_TAG; *

* 我的关注grid页面 */ -public class MyConcernFragment extends NormalFragment implements OnRequestCallBackListener { +public class MyConcernFragment extends ToolbarFragment implements OnRequestCallBackListener { private RecyclerView mConcernRv; private LinearLayout mNoneData; diff --git a/app/src/main/java/com/halo/assistant/fragment/user/ManuallyRealNameFragment.kt b/app/src/main/java/com/halo/assistant/fragment/user/ManuallyRealNameFragment.kt index 96d959f5ea..194a8d5405 100644 --- a/app/src/main/java/com/halo/assistant/fragment/user/ManuallyRealNameFragment.kt +++ b/app/src/main/java/com/halo/assistant/fragment/user/ManuallyRealNameFragment.kt @@ -20,11 +20,11 @@ import com.gh.gamecenter.common.utils.enlargeTouchArea import com.gh.gamecenter.common.utils.ImageUtils import com.gh.gamecenter.databinding.FragmentManuallyRealNameBinding import com.gh.gamecenter.entity.IdCardEntity -import com.gh.gamecenter.common.base.fragment.NormalFragment +import com.gh.gamecenter.common.base.fragment.ToolbarFragment import com.squareup.picasso.MemoryPolicy import io.reactivex.disposables.Disposable -class ManuallyRealNameFragment : NormalFragment() { +class ManuallyRealNameFragment : ToolbarFragment() { private var mDialog: WaitingDialogFragment? = null private var mDisposable: Disposable? = null diff --git a/app/src/main/java/com/halo/assistant/fragment/user/RealNameInfoFragment.kt b/app/src/main/java/com/halo/assistant/fragment/user/RealNameInfoFragment.kt index 693e0abdd2..4217787f8d 100644 --- a/app/src/main/java/com/halo/assistant/fragment/user/RealNameInfoFragment.kt +++ b/app/src/main/java/com/halo/assistant/fragment/user/RealNameInfoFragment.kt @@ -25,10 +25,10 @@ import com.gh.gamecenter.common.utils.TextHelper import com.gh.gamecenter.common.utils.visibleIf import com.gh.gamecenter.core.utils.* import com.gh.gamecenter.databinding.FragmentRealNameBinding -import com.gh.gamecenter.common.base.fragment.NormalFragment +import com.gh.gamecenter.common.base.fragment.ToolbarFragment import org.json.JSONObject -class RealNameInfoFragment : NormalFragment() { +class RealNameInfoFragment : ToolbarFragment() { private var mHasBackdoor: Boolean = false // 是否留有不实名完成也自动开始下载的后门 private var mIsForcedToCertificate: Boolean = false 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 c8b4821ca1..3f429cfcf4 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 @@ -21,7 +21,7 @@ import com.gh.gamecenter.common.utils.PermissionHelper; import com.gh.gamecenter.core.utils.RandomUtils; import com.gh.gamecenter.common.utils.UserIconUtils; import com.gh.gamecenter.R; -import com.gh.gamecenter.common.base.fragment.NormalFragment; +import com.gh.gamecenter.common.base.fragment.ToolbarFragment; import com.gh.gamecenter.user.UserViewModel; import com.lightgame.utils.Utils; import com.zhihu.matisse.internal.utils.PathUtils; @@ -38,7 +38,7 @@ import java.util.Locale; *

* 选择用户头像 */ -public class SelectPortraitFragment extends NormalFragment { +public class SelectPortraitFragment extends ToolbarFragment { 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 8a0d778f37..24ea8c9a64 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 @@ -19,7 +19,7 @@ import com.gh.gamecenter.R; import com.gh.gamecenter.entity.UserInfoEntity; import com.gh.gamecenter.common.retrofit.ApiResponse; import com.gh.gamecenter.user.UserViewModel; -import com.gh.gamecenter.common.base.fragment.NormalFragment; +import com.gh.gamecenter.common.base.fragment.ToolbarFragment; import com.halo.assistant.fragment.user.region.OnRegionSelectListener; import com.halo.assistant.fragment.user.region.RegionCountFragment; import com.halo.assistant.fragment.user.region.RegionProvFragment; @@ -33,7 +33,7 @@ import java.util.List; *

* 修改用户归属地 */ -public class SelectRegionFragment extends NormalFragment implements OnBackPressedListener, OnRegionSelectListener { +public class SelectRegionFragment extends ToolbarFragment implements OnBackPressedListener, OnRegionSelectListener { private String mProvinceName; private RegionProvFragment mProvFragment; diff --git a/app/src/main/java/com/halo/assistant/fragment/user/UserInfoEditFragment.kt b/app/src/main/java/com/halo/assistant/fragment/user/UserInfoEditFragment.kt index 22673e1d63..48432487ac 100644 --- a/app/src/main/java/com/halo/assistant/fragment/user/UserInfoEditFragment.kt +++ b/app/src/main/java/com/halo/assistant/fragment/user/UserInfoEditFragment.kt @@ -25,7 +25,7 @@ import com.gh.gamecenter.common.utils.TextHelper import com.gh.gamecenter.databinding.FragmentUserinfoEditBinding import com.gh.gamecenter.entity.UserInfoEntity import com.gh.gamecenter.manager.UserManager -import com.gh.gamecenter.common.base.fragment.NormalFragment +import com.gh.gamecenter.common.base.fragment.ToolbarFragment import com.gh.gamecenter.common.retrofit.JSONObjectResponse import com.gh.gamecenter.retrofit.RetrofitManager import com.gh.gamecenter.common.retrofit.ApiResponse @@ -38,7 +38,7 @@ import org.json.JSONObject import java.lang.StringBuilder import java.util.* -class UserInfoEditFragment : NormalFragment() { +class UserInfoEditFragment : ToolbarFragment() { private lateinit var mBinding: FragmentUserinfoEditBinding private var mSaveMenuItem: MenuItem? = null diff --git a/app/src/main/java/com/halo/assistant/fragment/user/UserInfoFragment.kt b/app/src/main/java/com/halo/assistant/fragment/user/UserInfoFragment.kt index af9f890285..b7c78490a8 100644 --- a/app/src/main/java/com/halo/assistant/fragment/user/UserInfoFragment.kt +++ b/app/src/main/java/com/halo/assistant/fragment/user/UserInfoFragment.kt @@ -10,11 +10,11 @@ import com.gh.gamecenter.core.utils.MtaHelper import com.gh.gamecenter.* import com.gh.gamecenter.databinding.FragmentUserinfoBinding import com.gh.gamecenter.entity.UserInfoEntity -import com.gh.gamecenter.common.base.fragment.NormalFragment +import com.gh.gamecenter.common.base.fragment.ToolbarFragment import com.gh.gamecenter.common.retrofit.ApiResponse import com.gh.gamecenter.user.UserViewModel -class UserInfoFragment : NormalFragment() { +class UserInfoFragment : ToolbarFragment() { private lateinit var mBinding: FragmentUserinfoBinding diff --git a/app/src/main/java/com/gh/base/ToolBarActivity.java b/module_common/src/main/java/com/gh/gamecenter/common/base/ToolBarActivity.java similarity index 66% rename from app/src/main/java/com/gh/base/ToolBarActivity.java rename to module_common/src/main/java/com/gh/gamecenter/common/base/ToolBarActivity.java index 9a625592cc..eb7c71998b 100644 --- a/app/src/main/java/com/gh/base/ToolBarActivity.java +++ b/module_common/src/main/java/com/gh/gamecenter/common/base/ToolBarActivity.java @@ -1,16 +1,16 @@ -package com.gh.base; +package com.gh.gamecenter.common.base; import android.annotation.SuppressLint; import android.app.Activity; +import android.content.Context; import android.content.Intent; import android.os.Build; import android.os.Bundle; import android.text.TextUtils; import android.view.Menu; -import android.view.MenuInflater; import android.view.MenuItem; +import android.view.MotionEvent; import android.view.View; -import android.view.ViewGroup; import android.view.Window; import android.widget.FrameLayout; import android.widget.ImageView; @@ -18,33 +18,19 @@ import android.widget.LinearLayout; import android.widget.TextView; import androidx.annotation.DrawableRes; -import androidx.annotation.Nullable; import androidx.annotation.StringRes; import androidx.appcompat.widget.ActionMenuView; import androidx.appcompat.widget.Toolbar; import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; -import androidx.lifecycle.ViewModelProviders; import com.facebook.drawee.view.SimpleDraweeView; -import com.gh.gamecenter.common.base.BaseActivity; -import com.gh.gamecenter.common.constant.Constants; -import com.gh.gamecenter.core.utils.DisplayUtils; -import com.gh.gamecenter.common.utils.ImageUtils; -import com.gh.gamecenter.core.utils.SPUtils; -import com.gh.common.view.GameIconView; -import com.gh.download.DownloadManager; -import com.gh.gamecenter.DownloadManagerActivity; -import com.gh.gamecenter.R; -import com.gh.gamecenter.entity.GameUpdateEntity; -import com.gh.gamecenter.eventbus.EBDownloadStatus; +import com.gh.gamecenter.common.R; import com.gh.gamecenter.common.base.fragment.ToolbarController; -import com.gh.gamecenter.packagehelper.PackageViewModel; +import com.gh.gamecenter.common.base.fragment.ToolbarFragment; +import com.gh.gamecenter.common.utils.ImageUtils; import com.lightgame.OnTitleClickListener; -import org.greenrobot.eventbus.Subscribe; -import org.greenrobot.eventbus.ThreadMode; - import java.lang.reflect.Field; import java.lang.reflect.Method; import java.util.List; @@ -57,8 +43,10 @@ import java.util.List; public abstract class ToolBarActivity extends BaseActivity implements ToolbarController, ActionMenuView.OnMenuItemClickListener { - @Nullable - private PackageViewModel mPackageViewModel; + public static final String NORMAL_FRAGMENT_NAME = "normalFragmentName"; + public static final String NORMAL_FRAGMENT_BUNDLE = "normalFragmentBundle"; + + private Fragment mTargetFragment; protected View mToolbarContainer; @@ -76,14 +64,16 @@ public abstract class ToolBarActivity extends BaseActivity implements ToolbarCon protected View mBackBtn; - protected GameIconView mGameIconView; +// protected GameIconView mGameIconView; protected SimpleDraweeView mUserAvatarIv; protected TextView mIconTitle; - @Nullable - private TextView mDownloadCountHint; + @Override + protected int getLayoutId() { + return R.layout.activity_normal; + } @Override protected void onCreate(Bundle savedInstanceState) { @@ -91,12 +81,41 @@ public abstract class ToolBarActivity extends BaseActivity implements ToolbarCon setStatusBarDarkMode(true, this); initToolbar(); - if (!SPUtils.getBoolean(Constants.SP_TEENAGER_MODE) && showDownloadMenu()) { - mPackageViewModel = ViewModelProviders.of(this, new PackageViewModel.Factory()).get(PackageViewModel.class); - mPackageViewModel.getFilterSameUpdateLiveData().observe(this, this::updateDownloadCountHint); + if (getIntent() != null) { + if (savedInstanceState == null) { + handleIntent(getIntent()); + } else { + for (Fragment fragment : getSupportFragmentManager().getFragments()) { + if (fragment instanceof ToolbarFragment) mTargetFragment = fragment; + } + } } } + @Override + protected void onNewIntent(Intent intent) { + super.onNewIntent(intent); + if (getIntent() != null) handleIntent(intent); + } + + private void handleIntent(Intent intent) { + String fraName = intent.getStringExtra(NORMAL_FRAGMENT_NAME); + Bundle bundle = intent.getBundleExtra(NORMAL_FRAGMENT_BUNDLE); + if (TextUtils.isEmpty(fraName)) { + if (provideNormalIntent() == null) { + return; + } + fraName = provideNormalIntent().getStringExtra(NORMAL_FRAGMENT_NAME); + if (bundle == null) bundle = getIntent().getExtras(); + if (TextUtils.isEmpty(fraName)) return; + } + mTargetFragment = getSupportFragmentManager().findFragmentByTag(fraName); + if (mTargetFragment == null) { + mTargetFragment = Fragment.instantiate(this, fraName, bundle); + } + getSupportFragmentManager().beginTransaction().replace(getFragmentPlaceholderId(), mTargetFragment, fraName).commitNowAllowingStateLoss(); + } + // 小米沉浸式黑色字体 @SuppressLint("PrivateApi") public void setStatusBarDarkMode(boolean darkmode, Activity activity) { @@ -121,7 +140,7 @@ public abstract class ToolBarActivity extends BaseActivity implements ToolbarCon mIconTitleContainer = findViewById(R.id.iconTitleContainer); mBackContainer = findViewById(R.id.backContainer); mBackBtn = findViewById(R.id.backBtn); - mGameIconView = findViewById(R.id.gameIv); +// mGameIconView = findViewById(R.id.gameIv); mUserAvatarIv = findViewById(R.id.userAvatar); mIconTitle = findViewById(R.id.iconTitle); if (mToolbar != null) { @@ -169,18 +188,10 @@ public abstract class ToolBarActivity extends BaseActivity implements ToolbarCon @Override public void setToolbarMenu(int res) { if (mActionMenuView == null) return; - // 青少年模式下要隐藏下载按钮 - if (SPUtils.getBoolean(Constants.SP_TEENAGER_MODE) && res == R.menu.menu_download) return; // mToolbar.inflateMenu(res); // mToolbar.setOnMenuItemClickListener(this); - - getMenuInflater().inflate(res, mActionMenuView.getMenu()); + inflateMenu(res); mActionMenuView.setOnMenuItemClickListener(this); - - if (showDownloadMenu()) { - createDownloadMenu(res); - } - Menu menu = mActionMenuView.getMenu(); for (int i = 0; i < menu.size(); i++) { MenuItem menuItem = menu.getItem(i); @@ -198,6 +209,10 @@ public abstract class ToolBarActivity extends BaseActivity implements ToolbarCon setTitleCenter(); } + public void inflateMenu(int res){ + getMenuInflater().inflate(res, mActionMenuView.getMenu()); + } + @Override protected void onResume() { super.onResume(); @@ -215,12 +230,12 @@ public abstract class ToolBarActivity extends BaseActivity implements ToolbarCon } } - public void setGameIconToolbar(String icon, String iconSubscript) { + /*public void setGameIconToolbar(String icon, String iconSubscript) { mTitleContainer.setVisibility(View.GONE); mGameIconView.displayGameIcon(icon, iconSubscript); mGameIconView.setVisibility(View.VISIBLE); mIconTitleContainer.setVisibility(View.VISIBLE); - } + }*/ public void setUserAvatarIconToolbar(String icon) { mTitleContainer.setVisibility(View.GONE); @@ -229,49 +244,6 @@ public abstract class ToolBarActivity extends BaseActivity implements ToolbarCon mIconTitleContainer.setVisibility(View.VISIBLE); } - private void createDownloadMenu(int res) { - if (res != R.menu.menu_download) { - MenuInflater inflater = getMenuInflater(); - inflater.inflate(R.menu.menu_download, mActionMenuView.getMenu()); - } - - if (mPackageViewModel != null) { - updateDownloadCountHint(mPackageViewModel.getFilterSameUpdateLiveData().getValue()); - } - - View downloadMenuView = mActionMenuView.getMenu().findItem(R.id.menu_download).getActionView(); - mDownloadCountHint = downloadMenuView.findViewById(R.id.menu_download_count_hint); - } - - private void updateDownloadCountHint(List updateList) { - if (mDownloadCountHint == null) return; - - String count = DownloadManager.getInstance().getDownloadOrUpdateCount(updateList); - if (count != null) { - mDownloadCountHint.setVisibility(View.VISIBLE); - mDownloadCountHint.setText(count); - - ViewGroup.LayoutParams params = mDownloadCountHint.getLayoutParams(); - if (TextUtils.isEmpty(count)) { - params.width = DisplayUtils.dip2px(6); - params.height = DisplayUtils.dip2px(6); - } else { - params.width = DisplayUtils.dip2px(12); - params.height = DisplayUtils.dip2px(12); - } - mDownloadCountHint.setLayoutParams(params); - } else { - mDownloadCountHint.setVisibility(View.GONE); - } - } - - @Subscribe(threadMode = ThreadMode.MAIN) - public void onEventMainThread(EBDownloadStatus status) { - if (!SPUtils.getBoolean(Constants.SP_TEENAGER_MODE) && showDownloadMenu() && mPackageViewModel != null) { - updateDownloadCountHint(mPackageViewModel.getFilterSameUpdateLiveData().getValue()); - } - } - @Override public MenuItem getMenuItem(int res) { if (mToolbar == null) return null; //后续页面做好判断 @@ -295,10 +267,8 @@ public abstract class ToolBarActivity extends BaseActivity implements ToolbarCon @Override public boolean onMenuItemClick(MenuItem item) { - if (item.getItemId() == R.id.menu_download) { -// MtaHelper.onEvent("下载管理", "下载管理入口", getActivityNameInChinese()); - Intent intent = DownloadManagerActivity.getDownloadMangerIntent(this, mEntrance); - startActivity(intent); + if (mTargetFragment instanceof ToolbarFragment) { + ((ToolbarFragment) mTargetFragment).onMenuItemClick(item); } return false; } @@ -307,8 +277,29 @@ public abstract class ToolBarActivity extends BaseActivity implements ToolbarCon return view -> onBackPressed(); } - protected boolean showDownloadMenu() { - return false; + @Override + public void onBackPressed() { + if (mTargetFragment instanceof ToolbarFragment + && mTargetFragment.isAdded() + && !((ToolbarFragment) mTargetFragment).onBackPressed()) { + super.onBackPressed(); + } + } + + @Override + public boolean dispatchTouchEvent(MotionEvent ev) { + if (mTargetFragment instanceof ToolbarFragment) { + ((ToolbarFragment) mTargetFragment).onTouchEvent(ev); + } + return super.dispatchTouchEvent(ev); + } + + public Fragment getTargetFragment() { + return mTargetFragment; + } + + public int getFragmentPlaceholderId() { + return R.id.normal_content; } @Override @@ -318,6 +309,40 @@ public abstract class ToolBarActivity extends BaseActivity implements ToolbarCon } } + // 针对部分跳转不符合ToolbarActivity规则的额外处理，主要绑定ToolbarFragment + protected Intent provideNormalIntent() { + return null; + } + + protected static Intent getTargetIntent(Context context, Class cls, Class t, Bundle bundle) { + Intent intent = new Intent(context, cls); + intent.putExtra(NORMAL_FRAGMENT_NAME, t.getCanonicalName()); + intent.putExtra(NORMAL_FRAGMENT_BUNDLE, bundle); + return intent; + } + + protected static Intent getTargetIntent(Context context, Class cls, Class t) { + Intent intent = new Intent(context, cls); + intent.putExtra(NORMAL_FRAGMENT_NAME, t.getCanonicalName()); + return intent; + } + + + public static void startFragmentNewTask(Context context, Class t, Bundle bundle) { + Intent intent = new Intent(context, ToolBarActivity.class); + intent.putExtra(NORMAL_FRAGMENT_NAME, t.getCanonicalName()); + intent.putExtra(NORMAL_FRAGMENT_BUNDLE, bundle); + intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + context.startActivity(intent); + } + + public static void startFragment(Context context, Class t, Bundle bundle) { + Intent intent = new Intent(context, ToolBarActivity.class); + intent.putExtra(NORMAL_FRAGMENT_NAME, t.getCanonicalName()); + intent.putExtra(NORMAL_FRAGMENT_BUNDLE, bundle); + context.startActivity(intent); + } + @Override protected void onNightModeChange() { super.onNightModeChange(); @@ -334,8 +359,5 @@ public abstract class ToolBarActivity extends BaseActivity implements ToolbarCon if (mTitleTv != null) { mTitleTv.setTextColor(ContextCompat.getColor(this, R.color.text_black)); } - if (showDownloadMenu() && getMenuItem(R.id.menu_download) != null) { - ((ImageView) getMenuItem(R.id.menu_download).getActionView().findViewById(R.id.menu_download_iv)).setImageDrawable(ContextCompat.getDrawable(this, R.drawable.toolbar_download)); - } } } diff --git a/module_common/src/main/java/com/gh/gamecenter/common/base/fragment/BaseFragment_TabLayout.java b/module_common/src/main/java/com/gh/gamecenter/common/base/fragment/BaseFragment_TabLayout.java index 570adda100..ab1500996d 100644 --- a/module_common/src/main/java/com/gh/gamecenter/common/base/fragment/BaseFragment_TabLayout.java +++ b/module_common/src/main/java/com/gh/gamecenter/common/base/fragment/BaseFragment_TabLayout.java @@ -29,7 +29,7 @@ import java.util.List; * Created by khy on 15/03/18. */ -public abstract class BaseFragment_TabLayout extends NormalFragment implements ViewPager.OnPageChangeListener { +public abstract class BaseFragment_TabLayout extends ToolbarFragment implements ViewPager.OnPageChangeListener { public static final String PAGE_INDEX = "PAGE_INDEX"; diff --git a/module_common/src/main/java/com/gh/gamecenter/common/base/fragment/BaseFragment_ViewPager.java b/module_common/src/main/java/com/gh/gamecenter/common/base/fragment/BaseFragment_ViewPager.java index 6ce117b710..264030a677 100644 --- a/module_common/src/main/java/com/gh/gamecenter/common/base/fragment/BaseFragment_ViewPager.java +++ b/module_common/src/main/java/com/gh/gamecenter/common/base/fragment/BaseFragment_ViewPager.java @@ -34,7 +34,7 @@ import java.util.List; * @author CsHeng * @date 2013-3-6 */ -public abstract class BaseFragment_ViewPager extends NormalFragment implements DoubleTapTextView.OnDoubleTapListener { +public abstract class BaseFragment_ViewPager extends ToolbarFragment implements DoubleTapTextView.OnDoubleTapListener { public static final String ARGS_INDEX = "index"; protected int mCheckedIndex = 0; diff --git a/module_common/src/main/java/com/gh/gamecenter/common/base/fragment/BaseLazyFragment.kt b/module_common/src/main/java/com/gh/gamecenter/common/base/fragment/BaseLazyFragment.kt index 03d01f442f..489e6578b6 100644 --- a/module_common/src/main/java/com/gh/gamecenter/common/base/fragment/BaseLazyFragment.kt +++ b/module_common/src/main/java/com/gh/gamecenter/common/base/fragment/BaseLazyFragment.kt @@ -5,7 +5,7 @@ import android.os.Bundle /** * 懒加载（支持多层嵌套） */ -abstract class BaseLazyFragment : NormalFragment() { +abstract class BaseLazyFragment : ToolbarFragment() { private var mIsFirstVisible = true diff --git a/module_common/src/main/java/com/gh/gamecenter/common/base/fragment/NormalFragment.java b/module_common/src/main/java/com/gh/gamecenter/common/base/fragment/ToolbarFragment.java similarity index 96% rename from module_common/src/main/java/com/gh/gamecenter/common/base/fragment/NormalFragment.java rename to module_common/src/main/java/com/gh/gamecenter/common/base/fragment/ToolbarFragment.java index df739c1a6a..9392151c3d 100644 --- a/module_common/src/main/java/com/gh/gamecenter/common/base/fragment/NormalFragment.java +++ b/module_common/src/main/java/com/gh/gamecenter/common/base/fragment/ToolbarFragment.java @@ -16,7 +16,7 @@ import com.gh.gamecenter.common.constant.EntranceConsts; * Created by khy on 17/10/17. */ -public abstract class NormalFragment extends BaseFragment { +public abstract class ToolbarFragment extends BaseFragment { @Override public void onCreate(@Nullable Bundle savedInstanceState) { diff --git a/app/src/main/res/layout/activity_normal.xml b/module_common/src/main/res/layout/activity_normal.xml similarity index 100% rename from app/src/main/res/layout/activity_normal.xml rename to module_common/src/main/res/layout/activity_normal.xml diff --git a/app/src/main/res/layout/reuse_toolbar.xml b/module_common/src/main/res/layout/reuse_toolbar.xml similarity index 97% rename from app/src/main/res/layout/reuse_toolbar.xml rename to module_common/src/main/res/layout/reuse_toolbar.xml index b93500986b..563d31c440 100644 --- a/app/src/main/res/layout/reuse_toolbar.xml +++ b/module_common/src/main/res/layout/reuse_toolbar.xml @@ -67,14 +67,14 @@ android:layout_width="wrap_content" android:layout_height="wrap_content"> - + tools:visibility="visible" />-->