Leaf-WAI/assistant-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

模块/组件化前期改造(解耦ToolBarActivity) https://git.shanqu.cc/halo/android/assistant-android/-/issues/64

Browse Source
This commit is contained in:
张玉久
2022-05-20 17:00:50 +08:00
parent 6401711f7e
commit c05dfebf1b
183 changed files with 665 additions and 634 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/com/gh/base/BaseActivity_TabLayout.java
View File

@ -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;

2
app/src/main/java/com/gh/base/BaseRichEditorActivity.kt
View File

@ -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

115
app/src/main/java/com/gh/base/DownloadToolbarActivity.kt Normal file
View File

@ -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<GameUpdateEntity> ->
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<GameUpdateEntity>?) {
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)
)
}
}
}

341
app/src/main/java/com/gh/base/ToolBarActivity.java
View File

@ -1,341 +0,0 @@
package com.gh.base;
import android.annotation.SuppressLint;
import android.app.Activity;
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.View;
import android.view.ViewGroup;
import android.view.Window;
import android.widget.FrameLayout;
import android.widget.ImageView;
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.base.fragment.ToolbarController;
import com.gh.gamecenter.packagehelper.PackageViewModel;
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;
/**
* 需要用到工具栏的页面使用
* <p>
* 特殊页面请参考{@link BaseActivity}
*/
public abstract class ToolBarActivity extends BaseActivity implements ToolbarController, ActionMenuView.OnMenuItemClickListener {
@Nullable
private PackageViewModel mPackageViewModel;
protected View mToolbarContainer;
protected Toolbar mToolbar;
protected TextView mTitleTv;
protected LinearLayout mTitleContainer;
protected LinearLayout mIconTitleContainer;
protected FrameLayout mBackContainer;
protected ActionMenuView mActionMenuView;
protected View mBackBtn;
protected GameIconView mGameIconView;
protected SimpleDraweeView mUserAvatarIv;
protected TextView mIconTitle;
@Nullable
private TextView mDownloadCountHint;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
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);
}
}
// 小米沉浸式黑色字体
@SuppressLint("PrivateApi")
public void setStatusBarDarkMode(boolean darkmode, Activity activity) {
Class<? extends Window> clazz = activity.getWindow().getClass();
try {
Class<?> layoutParams = Class.forName("android.view.MiuiWindowManager$LayoutParams");
Field field = layoutParams.getField("EXTRA_FLAG_STATUS_BAR_DARK_MODE");
int darkModeFlag = field.getInt(layoutParams);
Method extraFlagField = clazz.getMethod("setExtraFlags", int.class, int.class);
extraFlagField.invoke(activity.getWindow(), darkmode ? darkModeFlag : 0, darkModeFlag);
} catch (Exception ignore) {
}
}
private void initToolbar() {
mToolbarContainer = findViewById(R.id.normal_toolbar_container);
mToolbar = findViewById(R.id.normal_toolbar);
mTitleTv = findViewById(R.id.normal_title);
mActionMenuView = findViewById(R.id.actionMenuView);
mTitleContainer = findViewById(R.id.titleContainer);
mIconTitleContainer = findViewById(R.id.iconTitleContainer);
mBackContainer = findViewById(R.id.backContainer);
mBackBtn = findViewById(R.id.backBtn);
mGameIconView = findViewById(R.id.gameIv);
mUserAvatarIv = findViewById(R.id.userAvatar);
mIconTitle = findViewById(R.id.iconTitle);
if (mToolbar != null) {
// setSupportActionBar(mToolbar); // 替换actionBar后 toolBar无法控制
// mToolbar.setNavigationIcon(provideNavigationIcon());
// mToolbar.setNavigationOnClickListener(provideNavigationItemClickListener());
if (mBackBtn != null) mBackBtn.setOnClickListener(provideNavigationItemClickListener());
if (mBackContainer != null) mBackContainer.setOnClickListener(provideNavigationItemClickListener());
if (mTitleTv != null) {
mTitleTv.setOnClickListener(view -> {
final List<Fragment> fragmentList = getSupportFragmentManager().getFragments();
for (Fragment fragment : fragmentList) {
if (fragment instanceof OnTitleClickListener) {
((OnTitleClickListener) fragment).onTitleClick();
}
}
});
}
}
}
@DrawableRes
public int provideNavigationIcon() {
return R.drawable.ic_bar_back; // default navigation icon
}
@Override
public void setNavigationTitle(String title) {
if (mTitleTv != null) mTitleTv.setText(title);
if (mIconTitle != null) mIconTitle.setText(title);
}
@Override
public void setNavigationTitle(@StringRes int res) {
setNavigationTitle(getString(res));
}
/**
* 重写此方法以将标题靠左显示
*/
public boolean showToolbarAtLeft() {
return false;
}
@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());
mActionMenuView.setOnMenuItemClickListener(this);
if (showDownloadMenu()) {
createDownloadMenu(res);
}
Menu menu = mActionMenuView.getMenu();
for (int i = 0; i < menu.size(); i++) {
MenuItem menuItem = menu.getItem(i);
// menu设置actionLayout后，无法捕捉点击事件，以icon为tag，如果icon is null 手动设置menuItem点击事件
if (menuItem != null && menuItem.getIcon() == null) {
if (menuItem.getActionView() != null) {
menuItem.getActionView().setOnClickListener((v) -> this.onMenuItemClick(menuItem));
}
}
}
if (showToolbarAtLeft() && Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1 && mTitleTv != null) {
mTitleTv.setTextAlignment(View.TEXT_ALIGNMENT_TEXT_START);
}
setTitleCenter();
}
@Override
protected void onResume() {
super.onResume();
setTitleCenter();
}
// 设置标题居中
public void setTitleCenter() {
if (mActionMenuView != null && mTitleContainer != null && mBackContainer != null && !showToolbarAtLeft()) {
mActionMenuView.post(() -> {
LinearLayout.LayoutParams params = (LinearLayout.LayoutParams) mTitleContainer.getLayoutParams();
params.setMargins(mActionMenuView.getWidth() - mBackContainer.getWidth(), 0, 0, 0);
mTitleContainer.setLayoutParams(params);
});
}
}
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);
ImageUtils.display(mUserAvatarIv, icon);
mUserAvatarIv.setVisibility(View.VISIBLE);
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<GameUpdateEntity> 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; //后续页面做好判断
return mActionMenuView.getMenu().findItem(res);
}
public void clearMenu() {
if (mToolbar != null) {
mActionMenuView.getMenu().clear();
setTitleCenter();
}
}
public Menu getMenu() {
return mActionMenuView.getMenu();
}
public ActionMenuView getActionMenuView() {
return mActionMenuView;
}
@Override
public boolean onMenuItemClick(MenuItem item) {
if (item.getItemId() == R.id.menu_download) {
// MtaHelper.onEvent("下载管理", "下载管理入口", getActivityNameInChinese());
Intent intent = DownloadManagerActivity.getDownloadMangerIntent(this, mEntrance);
startActivity(intent);
}
return false;
}
protected View.OnClickListener provideNavigationItemClickListener() {
return view -> onBackPressed();
}
protected boolean showDownloadMenu() {
return false;
}
@Override
public void hideToolbar(boolean isHide) {
if (mToolbarContainer != null) {
mToolbarContainer.setVisibility(isHide ? View.GONE : View.VISIBLE);
}
}
@Override
protected void onNightModeChange() {
super.onNightModeChange();
if (mToolbar != null) {
mToolbar.setBackgroundColor(ContextCompat.getColor(this, R.color.background_white));
}
if (mBackBtn != null) {
if (mBackBtn instanceof ImageView) {
((ImageView) mBackBtn).setImageDrawable(ContextCompat.getDrawable(this, R.drawable.ic_bar_back));
} else if (mBackBtn instanceof TextView) {
((TextView) mBackBtn).setTextColor(ContextCompat.getColor(this, R.color.text_subtitle));
}
}
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));
}
}
}

2
app/src/main/java/com/gh/common/util/DirectUtils.kt
View File

@ -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

16
app/src/main/java/com/gh/common/util/EntranceUtils.java
View File

@ -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<? extends NormalFragment>) clazz, bundle);
if (ToolbarFragment.class.isAssignableFrom(clazz)) { // 兼容ToolbarFragment
ToolBarActivity.startFragmentNewTask(context, (Class<? extends ToolbarFragment>) 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<? extends NormalFragment>) clazz, bundle);
if (ToolbarFragment.class.isAssignableFrom(clazz)) { // 兼容ToolbarFragment
ToolBarActivity.startFragmentNewTask(context, (Class<? extends ToolbarFragment>) clazz, bundle);
} else {
Intent intent1 = new Intent(context, clazz);
//TODO:添加FLAG_ACTIVITY_NEW_TASK会导致一跳转页面callback就被调用

12
app/src/main/java/com/gh/common/util/GameCollectionSquareBrowseTaskHelper.kt
View File

@ -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 {

3
app/src/main/java/com/gh/gamecenter/AboutActivity.java
View File

@ -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) {

3
app/src/main/java/com/gh/gamecenter/BlockActivity.kt
View File

@ -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 {

3
app/src/main/java/com/gh/gamecenter/CleanApkActivity.java
View File

@ -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) {

5
app/src/main/java/com/gh/gamecenter/CollectionActivity.java
View File

@ -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);

5
app/src/main/java/com/gh/gamecenter/CommentDetailActivity.java
View File

@ -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;

4
app/src/main/java/com/gh/gamecenter/ConcernActivity.java
View File

@ -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) {

3
app/src/main/java/com/gh/gamecenter/ConcernInfoActivity.java
View File

@ -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) {

2
app/src/main/java/com/gh/gamecenter/CropImageActivity.java
View File

@ -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;

3
app/src/main/java/com/gh/gamecenter/DownloadManagerActivity.java
View File

@ -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;

4
app/src/main/java/com/gh/gamecenter/GameDetailActivity.kt
View File

@ -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)

3
app/src/main/java/com/gh/gamecenter/GameNewsActivity.java
View File

@ -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) {

3
app/src/main/java/com/gh/gamecenter/InfoActivity.java
View File

@ -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) {

4
app/src/main/java/com/gh/gamecenter/LibaoActivity.java
View File

@ -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) {

2
app/src/main/java/com/gh/gamecenter/LibaoDetailActivity.java
View File

@ -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;

3
app/src/main/java/com/gh/gamecenter/LoginActivity.java
View File

@ -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() {

23
app/src/main/java/com/gh/gamecenter/MainActivity.java
View File

@ -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<? extends NormalFragment>) clazz, bundle);
if (ToolbarFragment.class.isAssignableFrom(clazz)) {
ToolBarActivity.startFragment(MainActivity.this, (Class<? extends ToolbarFragment>) clazz, bundle);
} else {
Intent skipIntent = new Intent(MainActivity.this, clazz);
skipIntent.putExtras(bundle);

3
app/src/main/java/com/gh/gamecenter/MessageActivity.java
View File

@ -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) {

5
app/src/main/java/com/gh/gamecenter/MessageDetailActivity.java
View File

@ -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;

3
app/src/main/java/com/gh/gamecenter/MessageInviteActivity.java
View File

@ -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();

3
app/src/main/java/com/gh/gamecenter/MessageKeFuActivity.java
View File

@ -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() {

3
app/src/main/java/com/gh/gamecenter/MessageVoteActivity.java
View File

@ -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();

2
app/src/main/java/com/gh/gamecenter/NetworkDiagnosisActivity.kt
View File

@ -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

26
app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java
View File

@ -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;

4
app/src/main/java/com/gh/gamecenter/NewsSearchActivity.java
View File

@ -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) {

136
app/src/main/java/com/gh/gamecenter/NormalActivity.java
View File

@ -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<? extends NormalActivity> cls, Class<? extends NormalFragment> 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<? extends NormalActivity> cls, Class<? extends NormalFragment> t) {
Intent intent = new Intent(context, cls);
intent.putExtra(NORMAL_FRAGMENT_NAME, t.getCanonicalName());
return intent;
}
public static void startFragmentNewTask(Context context, Class<? extends NormalFragment> 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<? extends NormalFragment> 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;
}
}

3
app/src/main/java/com/gh/gamecenter/QaActivity.kt
View File

@ -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 {
/**

4
app/src/main/java/com/gh/gamecenter/SelectUserIconActivity.java
View File

@ -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) {

3
app/src/main/java/com/gh/gamecenter/SettingActivity.kt
View File

@ -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)

2
app/src/main/java/com/gh/gamecenter/ShareCardActivity.java
View File

@ -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;

2
app/src/main/java/com/gh/gamecenter/ShareCardPicActivity.java
View File

@ -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;

2
app/src/main/java/com/gh/gamecenter/ShareGhActivity.java
View File

@ -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;

2
app/src/main/java/com/gh/gamecenter/ShellActivity.kt
View File

@ -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

2
app/src/main/java/com/gh/gamecenter/SuggestionActivity.java
View File

@ -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;

2
app/src/main/java/com/gh/gamecenter/ToolBoxActivity.java
View File

@ -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;

3
app/src/main/java/com/gh/gamecenter/UserInfoActivity.kt
View File

@ -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(

3
app/src/main/java/com/gh/gamecenter/UserInfoEditActivity.kt
View File

@ -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)

3
app/src/main/java/com/gh/gamecenter/UserRegionActivity.java
View File

@ -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);

4
app/src/main/java/com/gh/gamecenter/VoteActivity.java
View File

@ -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) {

5
app/src/main/java/com/gh/gamecenter/WebActivity.kt
View File

@ -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<out NormalActivity?> = if (url?.contains("android_page_type=singleton") == true) {
val cls: Class<out ToolBarActivity?> = if (url?.contains("android_page_type=singleton") == true) {
SingletonWebActivity::class.java
} else {
WebActivity::class.java

4
app/src/main/java/com/gh/gamecenter/amway/AmwaySuccessFragment.kt
View File

@ -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) }

4
app/src/main/java/com/gh/gamecenter/amway/search/AmwaySearchListFragment.kt
View File

@ -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

2
app/src/main/java/com/gh/gamecenter/baselist/ListActivity.java
View File

@ -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;

4
app/src/main/java/com/gh/gamecenter/baselist/ListFragment.java
View File

@ -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<T, VM extends BaseListViewModel /* 该泛型位置对应getViewModelClass */> extends NormalFragment implements
public abstract class ListFragment<T, VM extends BaseListViewModel /* 该泛型位置对应getViewModelClass */> extends ToolbarFragment implements
Observer<List<T>>,
SwipeRefreshLayout.OnRefreshListener,
OnDataObservable<T> {

6
app/src/main/java/com/gh/gamecenter/catalog/CatalogActivity.kt
View File

@ -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)

6
app/src/main/java/com/gh/gamecenter/catalog/NewCatalogListActivity.kt
View File

@ -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)

4
app/src/main/java/com/gh/gamecenter/catalog/SubCatalogFragment.kt
View File

@ -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

6
app/src/main/java/com/gh/gamecenter/category/CategoryDirectoryActivity.kt
View File

@ -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 {

6
app/src/main/java/com/gh/gamecenter/category/CategoryListActivity.kt
View File

@ -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 {

6
app/src/main/java/com/gh/gamecenter/category2/CategoryV2Activity.kt
View File

@ -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)

4
app/src/main/java/com/gh/gamecenter/download/NewInstalledGameFragment.kt
View File

@ -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

6
app/src/main/java/com/gh/gamecenter/energy/EnergyCenterActivity.kt
View File

@ -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)

6
app/src/main/java/com/gh/gamecenter/energy/EnergyHouseActivity.kt
View File

@ -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)

6
app/src/main/java/com/gh/gamecenter/forum/list/ForumListActivity.kt
View File

@ -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

8
app/src/main/java/com/gh/gamecenter/forum/moderator/ApplyModeratorActivity.kt
View File

@ -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()

4
app/src/main/java/com/gh/gamecenter/forum/moderator/ApplyModeratorFragment.kt
View File

@ -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

6
app/src/main/java/com/gh/gamecenter/forum/moderator/ModeratorListActivity.kt
View File

@ -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 {

4
app/src/main/java/com/gh/gamecenter/forum/moderator/ModeratorListFragment.kt
View File

@ -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

4
app/src/main/java/com/gh/gamecenter/forum/select/ForumSelectActivity.kt
View File

@ -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)

4
app/src/main/java/com/gh/gamecenter/forum/select/ForumSelectFragment.kt
View File

@ -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

4
app/src/main/java/com/gh/gamecenter/fragment/LoginFragment.java
View File

@ -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,

10
app/src/main/java/com/gh/gamecenter/game/columncollection/detail/ColumnCollectionDetailActivity.kt
View File

@ -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)
}
}

6
app/src/main/java/com/gh/gamecenter/game/commoncollection/detail/CommonCollectionDetailActivity.kt
View File

@ -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)

6
app/src/main/java/com/gh/gamecenter/game/upload/GameSubmissionActivity.kt
View File

@ -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 {

4
app/src/main/java/com/gh/gamecenter/game/upload/GameUploadFragment.kt
View File

@ -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

4
app/src/main/java/com/gh/gamecenter/gamecollection/choose/AddGamesActivity.kt
View File

@ -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)

4
app/src/main/java/com/gh/gamecenter/gamecollection/choose/ChooseGamesActivity.kt
View File

@ -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("选择游戏")

4
app/src/main/java/com/gh/gamecenter/gamecollection/choose/ChooseGamesFragment.kt
View File

@ -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

8
app/src/main/java/com/gh/gamecenter/gamecollection/detail/GameCollectionDetailActivity.kt
View File

@ -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)

8
app/src/main/java/com/gh/gamecenter/gamecollection/detail/GameCollectionPosterActivity.kt
View File

@ -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)

4
app/src/main/java/com/gh/gamecenter/gamecollection/detail/GameCollectionPosterFragment.kt
View File

@ -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

4
app/src/main/java/com/gh/gamecenter/gamecollection/mine/MyGameCollectionActivity.kt
View File

@ -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)

2
app/src/main/java/com/gh/gamecenter/gamecollection/mine/MyGameCollectionFragment.kt
View File

@ -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

4
app/src/main/java/com/gh/gamecenter/gamecollection/publish/GameCollectionActivityLabelFragment.kt
View File

@ -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

2
app/src/main/java/com/gh/gamecenter/gamecollection/publish/GameCollectionEditActivity.kt
View File

@ -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

4
app/src/main/java/com/gh/gamecenter/gamecollection/tag/GameCollectionTagSelectActivity.kt
View File

@ -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)

4
app/src/main/java/com/gh/gamecenter/gamecollection/tag/GameCollectionTagSelectFragment.kt
View File

@ -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

4
app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailFragment.kt
View File

@ -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

2
app/src/main/java/com/gh/gamecenter/gamedetail/fuli/kaifu/ServersCalendarActivity.kt
View File

@ -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

6
app/src/main/java/com/gh/gamecenter/gamedetail/history/HistoryApkListActivity.kt
View File

@ -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 {

6
app/src/main/java/com/gh/gamecenter/gamedetail/myrating/MyRatingActivity.kt
View File

@ -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 {

4
app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingFoldActivity.kt
View File

@ -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)

5
app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingReplyActivity.kt
View File

@ -240,9 +240,8 @@ class RatingReplyActivity : ListActivity<RatingReplyEntity, RatingReplyViewModel
return super.handleBackPressed()
}
override fun onEventMainThread(status: EBDownloadStatus?) {
super.onEventMainThread(status)
@Subscribe(threadMode = ThreadMode.MAIN)
fun onEventMainThread(status: EBDownloadStatus?) {
if ("delete" == status?.status) {
mAdapter?.notifyItemChanged(0)
}

2
app/src/main/java/com/gh/gamecenter/gamedetail/rating/edit/RatingEditActivity.kt
View File

@ -13,7 +13,7 @@ import android.view.View
import android.webkit.*
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.DefaultJsApi

4
app/src/main/java/com/gh/gamecenter/help/HelpContainerFragment.kt
View File

@ -17,7 +17,7 @@ import com.gh.gamecenter.R
import com.gh.gamecenter.databinding.FragmentHelpContaierBinding
import com.gh.gamecenter.eventbus.EBNetworkState
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.common.utils.toColor
import com.halo.assistant.HaloApp
import com.lightgame.utils.Util_System_Keyboard
@ -30,7 +30,7 @@ import org.greenrobot.eventbus.ThreadMode
* 2.Q&A合集(qaCollectionId 存在时)
* 3.Q&A(qaId 存在时)
*/
class HelpContainerFragment : NormalFragment() {
class HelpContainerFragment : ToolbarFragment() {
private lateinit var mBinding: FragmentHelpContaierBinding

2
app/src/main/java/com/gh/gamecenter/help/HelpDetailActivity.kt
View File

@ -3,7 +3,7 @@ package com.gh.gamecenter.help
import android.content.Context
import android.content.Intent
import android.os.Bundle
import com.gh.base.ToolBarActivity
import com.gh.gamecenter.common.base.ToolBarActivity
import com.gh.gamecenter.R
import com.gh.gamecenter.databinding.ActivityHelpDetailBinding
import com.gh.gamecenter.entity.HelpEntity

4
app/src/main/java/com/gh/gamecenter/help/HelpQaCategoryFragment.kt
View File

@ -15,9 +15,9 @@ import com.gh.gamecenter.R
import com.gh.gamecenter.databinding.FragmentQaCategoryBinding
import com.gh.gamecenter.entity.ErrorEntity
import com.gh.gamecenter.mvvm.Status
import com.gh.gamecenter.common.base.fragment.NormalFragment
import com.gh.gamecenter.common.base.fragment.ToolbarFragment
class HelpQaCategoryFragment : NormalFragment() {
class HelpQaCategoryFragment : ToolbarFragment() {
private var mQaCollectionId = ""
private var mQaId = ""

8
app/src/main/java/com/gh/gamecenter/history/HistoryActivity.kt
View File

@ -3,12 +3,12 @@ package com.gh.gamecenter.history
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 HistoryActivity: NormalActivity() {
class HistoryActivity: ToolBarActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
@ -27,7 +27,7 @@ class HistoryActivity: NormalActivity() {
fun getHistoryIntent(context: Context, entrance: String): Intent {
val bundle = Bundle()
bundle.putString(EntranceConsts.KEY_ENTRANCE, entrance)
return NormalActivity.getTargetIntent(context, HistoryActivity::class.java, HistoryWrapperFragment::class.java, bundle)
return getTargetIntent(context, HistoryActivity::class.java, HistoryWrapperFragment::class.java, bundle)
}
}

6
app/src/main/java/com/gh/gamecenter/info/ConcernFragment.java
View File

@ -18,7 +18,7 @@ import androidx.recyclerview.widget.RecyclerView;
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
import com.gh.gamecenter.common.callback.OnRequestCallBackListener;
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;
@ -46,7 +46,7 @@ import com.gh.gamecenter.eventbus.EBConcernChanged;
import com.gh.gamecenter.eventbus.EBNetworkState;
import com.gh.gamecenter.eventbus.EBReuse;
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.Response;
import com.gh.gamecenter.retrofit.RetrofitManager;
import com.halo.assistant.fragment.myconcern.MyConcernRecommendAdapter;
@ -64,7 +64,7 @@ import io.reactivex.schedulers.Schedulers;
* Created by khy on 2016/8/15.
* 资讯-关注界面
*/
public class ConcernFragment extends NormalFragment implements SwipeRefreshLayout.OnRefreshListener {
public class ConcernFragment extends ToolbarFragment implements SwipeRefreshLayout.OnRefreshListener {
private FragmentInfoConcernBinding mBinding;

4
app/src/main/java/com/gh/gamecenter/message/MessageDetailFragment.java
View File

@ -44,7 +44,7 @@ import com.gh.gamecenter.entity.ViewsEntity;
import com.gh.gamecenter.eventbus.EBReuse;
import com.gh.gamecenter.manager.CommentManager;
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.OkHttpCache;
import com.gh.gamecenter.common.retrofit.Response;
import com.gh.gamecenter.retrofit.RetrofitManager;
@ -69,7 +69,7 @@ import retrofit2.HttpException;
* Created by CsHeng on 18/12/2017.
* 消息详情界面--评论详情--对话详情
*/
public class MessageDetailFragment extends NormalFragment implements OnCommentCallBackListener, OnBackPressedListener, KeyboardHeightObserver {
public class MessageDetailFragment extends ToolbarFragment implements OnCommentCallBackListener, OnBackPressedListener, KeyboardHeightObserver {
public static final int REQUEST_UPDATE_COMMENT = 9; // 刷新文章web页面评论数

4
app/src/main/java/com/gh/gamecenter/mygame/PlayedGameActivity.kt
View File

@ -3,11 +3,11 @@ package com.gh.gamecenter.mygame
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.BaseActivity
import com.gh.gamecenter.common.constant.EntranceConsts
import com.gh.gamecenter.NormalActivity
class PlayedGameActivity: NormalActivity() {
class PlayedGameActivity: ToolBarActivity() {
companion object {
fun getIntent(context: Context, userId: String, entrance: String, path: String): Intent {

4
app/src/main/java/com/gh/gamecenter/personal/DeliveryInfoActivity.kt
View File

@ -3,11 +3,11 @@ package com.gh.gamecenter.personal
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 DeliveryInfoActivity : NormalActivity() {
class DeliveryInfoActivity : ToolBarActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)

4
app/src/main/java/com/gh/gamecenter/personal/DeliveryInfoFragment.kt
View File

@ -5,10 +5,10 @@ import android.view.View
import com.gh.common.util.DirectUtils
import com.gh.gamecenter.R
import com.gh.gamecenter.databinding.FragmentDeliveryInfoBinding
import com.gh.gamecenter.common.base.fragment.NormalFragment
import com.gh.gamecenter.common.base.fragment.ToolbarFragment
import com.gh.gamecenter.common.utils.toColor
class DeliveryInfoFragment: NormalFragment() {
class DeliveryInfoFragment: ToolbarFragment() {
private val mBinding by lazy { FragmentDeliveryInfoBinding.inflate(layoutInflater) }

4
app/src/main/java/com/gh/gamecenter/personal/NewPersonalActivity.kt
View File

@ -3,10 +3,10 @@ package com.gh.gamecenter.personal
import android.content.Context
import android.content.Intent
import android.os.Bundle
import com.gh.gamecenter.common.base.ToolBarActivity
import com.gh.gamecenter.core.utils.DisplayUtils
import com.gh.gamecenter.NormalActivity
class NewPersonalActivity : NormalActivity() {
class NewPersonalActivity : ToolBarActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)

Some files were not shown because too many files have changed in this diff Show More