diff --git a/app/build.gradle b/app/build.gradle index 6a35015967..3e1a0dff7f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -101,39 +101,9 @@ android { } /** - * 多渠道打包，所有渠道值均通过java code设置 + * 多渠道打包，渠道请参考"channel.txt"文件，所有渠道值均通过java code设置 */ // productFlavors { -// GH_100 {} -// GH_101 {} -// GH_102 {} -// GH_103 {} -// GH_104 {} -// GH_106 {} -// GH_107 {} -// GH_108 {} -// GH_109 {} -// GH_110 {} -// GH_111 {} -// GH_113 {} -// GH_114 {} -// GH_115 {} -// GH_116 {} -// GH_117 {} -// GH_118 {} -// GH_119 {} -// GH_120 {} -// GH_121 {} -// GH_123 {} -// GH_127 {} -// GH_200 {} -// GH_201 {} -// GH_202 {} -// GH_203 {} -// GH_204 {} -// GH_205 {} -// GH_222 {} -// GH_307 {} // GH_TEST {} // } // productFlavors.all { flavor -> @@ -218,7 +188,6 @@ dependencies { compile libs.eventbus apt libs.eventbusApt -// compile project(':libraries:EventBus') compile project(':libraries:MiPush') compile project(':libraries:MTA') compile project(':libraries:QQShare') diff --git a/app/src/main/java/com/gh/base/AppControllerLike.java b/app/src/main/java/com/gh/base/AppControllerLike.java deleted file mode 100644 index 779a0595da..0000000000 --- a/app/src/main/java/com/gh/base/AppControllerLike.java +++ /dev/null @@ -1,51 +0,0 @@ -//package com.gh.base; -// -// -//import android.annotation.TargetApi; -//import android.app.Application; -//import android.content.Context; -//import android.content.Intent; -//import android.os.Build; -//import android.support.multidex.MultiDex; -// -//import com.tencent.tinker.lib.listener.DefaultPatchListener; -//import com.tencent.tinker.lib.listener.PatchListener; -//import com.tencent.tinker.lib.patch.AbstractPatch; -//import com.tencent.tinker.lib.patch.UpgradePatch; -//import com.tencent.tinker.lib.reporter.DefaultLoadReporter; -//import com.tencent.tinker.lib.reporter.DefaultPatchReporter; -//import com.tencent.tinker.lib.reporter.LoadReporter; -//import com.tencent.tinker.lib.reporter.PatchReporter; -//import com.tencent.tinker.lib.tinker.TinkerInstaller; -//import com.tencent.tinker.loader.app.DefaultApplicationLike; -// -//public class AppControllerLike extends DefaultApplicationLike { -// -// public AppControllerLike(Application application, int tinkerFlags, boolean tinkerLoadVerifyFlag, -// long applicationStartElapsedTime, long applicationStartMillisTime, -// Intent tinkerResultIntent) { -// super(application, tinkerFlags, tinkerLoadVerifyFlag, applicationStartElapsedTime, -// applicationStartMillisTime, tinkerResultIntent); -// } -// -// @Override -// public void onBaseContextAttached(Context base) { -// super.onBaseContextAttached(base); -// MultiDex.install(base); -// -// LoadReporter loadReporter = new DefaultLoadReporter(getApplication()); -// PatchReporter patchReporter = new DefaultPatchReporter(getApplication()); -// PatchListener patchListener = new DefaultPatchListener(getApplication()); -// AbstractPatch upgradePatchProcessor = new UpgradePatch(); -// -// TinkerInstaller.install(this, loadReporter, patchReporter, patchListener, -// AppTinkerResultService.class, upgradePatchProcessor); -//// TinkerInstaller.install(this); -// } -// -// @TargetApi(Build.VERSION_CODES.ICE_CREAM_SANDWICH) -// public void registerActivityLifecycleCallbacks(Application.ActivityLifecycleCallbacks callback) { -// getApplication().registerActivityLifecycleCallbacks(callback); -// } -// -//} diff --git a/app/src/main/java/com/gh/base/AppTinkerResultService.java b/app/src/main/java/com/gh/base/AppTinkerResultService.java deleted file mode 100644 index d3e94e4d1b..0000000000 --- a/app/src/main/java/com/gh/base/AppTinkerResultService.java +++ /dev/null @@ -1,29 +0,0 @@ -//package com.gh.base; -// -//import com.gh.common.util.Utils; -//import com.tencent.tinker.lib.service.DefaultTinkerResultService; -//import com.tencent.tinker.lib.service.PatchResult; -//import com.tencent.tinker.lib.util.TinkerServiceInternals; -// -//import java.io.File; -// -// -//public class AppTinkerResultService extends DefaultTinkerResultService { -// -// @Override -// public void onPatchResult(PatchResult result) { -// if (result == null) { -// return; -// } -// Utils.log(result); -// -// //first, we want to kill the recover process -// TinkerServiceInternals.killTinkerPatchServiceProcess(getApplicationContext()); -// -// if (result.isSuccess) { -// Utils.log("Tinkder Success"); -// deleteRawPatchFile(new File(result.rawPatchFilePath)); -// } -// } -// -//} diff --git a/app/src/main/java/com/gh/base/BaseActivity.java b/app/src/main/java/com/gh/base/BaseActivity.java index 5cf57da399..7c271d0677 100644 --- a/app/src/main/java/com/gh/base/BaseActivity.java +++ b/app/src/main/java/com/gh/base/BaseActivity.java @@ -22,7 +22,7 @@ import com.gh.common.util.ShareUtils; import com.gh.download.DownloadManager; import com.gh.gamecenter.R; import com.gh.gamecenter.eventbus.EBShowDialog; -import com.gh.gamecenter.listener.OnCallBackListener; +import com.gh.listener.OnCallBackListener; import com.readystatesoftware.systembartint.SystemBarTintManager.SystemBarConfig; import org.greenrobot.eventbus.EventBus; diff --git a/app/src/main/java/com/gh/base/BaseFragment.java b/app/src/main/java/com/gh/base/BaseFragment.java index 31eb78f30c..de613b0a89 100644 --- a/app/src/main/java/com/gh/base/BaseFragment.java +++ b/app/src/main/java/com/gh/base/BaseFragment.java @@ -9,9 +9,13 @@ import android.view.ViewGroup; import android.widget.Toast; import com.gh.common.util.EntranceUtils; -import com.gh.gamecenter.listener.OnCallBackListener; +import com.gh.common.util.RuntimeUtils; +import com.gh.gamecenter.eventbus.EBMiPush; +import com.gh.listener.OnCallBackListener; import org.greenrobot.eventbus.EventBus; +import org.greenrobot.eventbus.Subscribe; +import org.greenrobot.eventbus.ThreadMode; import butterknife.ButterKnife; @@ -19,32 +23,51 @@ import butterknife.ButterKnife; * Created by LGT on 2016/9/4. * Fragment 基类 */ -public class BaseFragment extends Fragment implements OnCallBackListener { +public abstract class BaseFragment extends Fragment implements OnCallBackListener { + // TODO private view protected View view; - protected boolean isEverpause; + protected boolean isEverPause; protected String mEntrance; - protected void init(int layout) { - view = View.inflate(getActivity(), layout, null); + protected abstract int getLayoutId(); - ButterKnife.bind(this, view); + protected void initView(View view) { + } + + protected void postRunnable(Runnable runnable) { +// if (getView() != null) { +// getView().post(runnable); +// } + RuntimeUtils.getInstance().runOnUiThread(runnable); + } + + protected void postDelayedRunnable(Runnable runnable, long delayMillis) { + RuntimeUtils.getInstance().runOnUiThread(runnable, delayMillis); } @Override public void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); mEntrance = getActivity().getIntent().getStringExtra(EntranceUtils.KEY_ENTRANCE); - isEverpause = false; + isEverPause = false; EventBus.getDefault().register(this); + view = View.inflate(getContext(), getLayoutId(), null); + ButterKnife.bind(this, view); + initView(view); + } + + //TODO 尴尬，必须的有subscribe才能register + @Subscribe(threadMode = ThreadMode.BACKGROUND) + public void onDummyEvent(EBMiPush push) { + // } @Nullable @Override - public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, - @Nullable Bundle savedInstanceState) { + public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { if (container != null) { container.removeView(view); } @@ -54,13 +77,13 @@ public class BaseFragment extends Fragment implements OnCallBackListener { @Override public void onResume() { super.onResume(); - isEverpause = false; + isEverPause = false; } @Override public void onPause() { super.onPause(); - isEverpause = true; + isEverPause = true; } @Override @@ -73,8 +96,8 @@ public class BaseFragment extends Fragment implements OnCallBackListener { Toast.makeText(getContext(), msg, Toast.LENGTH_SHORT).show(); } - public boolean isEverpause() { - return isEverpause; + public boolean isEverPause() { + return isEverPause; } @Override diff --git a/app/src/main/java/com/gh/base/BaseFragmentActivity.java b/app/src/main/java/com/gh/base/BaseFragmentActivity.java deleted file mode 100644 index 3c910cf103..0000000000 --- a/app/src/main/java/com/gh/base/BaseFragmentActivity.java +++ /dev/null @@ -1,206 +0,0 @@ -//package com.gh.base; -// -//import android.annotation.TargetApi; -//import android.content.Context; -//import android.graphics.Color; -//import android.os.Build; -//import android.os.Bundle; -//import android.support.v4.app.FragmentActivity; -//import android.view.*; -//import android.view.View.OnClickListener; -//import android.view.ViewGroup.LayoutParams; -//import android.widget.*; -//import butterknife.ButterKnife; -//import com.gh.common.constant.Config; -//import com.gh.common.util.*; -//import com.gh.download.DownloadManager; -//import com.gh.gamecenter.R; -//import com.gh.gamecenter.eventbus.EBShowDialog; -//import com.readystatesoftware.systembartint.SystemBarTintManager; -//import com.readystatesoftware.systembartint.SystemBarTintManager.SystemBarConfig; -//import de.greenrobot.event.EventBus; -// -//import java.lang.reflect.Field; -//import java.lang.reflect.Method; -//import java.util.ArrayList; -// -//public class BaseFragmentActivity extends FragmentActivity { -// -// protected String mEntrance; -// -// private boolean isPause; -// -// @Override -// protected void onCreate(Bundle savedInstanceState) { -// super.onCreate(savedInstanceState); -// AppManager.getInstance().addActivity(this); -// EventBus.getDefault().register(this); -// mEntrance = getIntent().getStringExtra("mEntrance"); -// if (getIntent().getBundleExtra("data") != null) { -// mEntrance = getIntent().getBundleExtra("data").getString("mEntrance"); -// } -// } -// -// public void init(View contentView, String title) { -// init(contentView); -// TextView actionbar_tv_title = (TextView) findViewById(R.id.actionbar_tv_title); -// actionbar_tv_title.setText(title); -// } -// -// public void init(View contentView) { -// if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) { -// setTheme(R.style.AppTheme); -// setTranslucentStatus(true); -// SystemBarTintManager tintManager = new SystemBarTintManager(this); -// tintManager.setStatusBarTintEnabled(true); -// if (Build.MANUFACTURER.equals("Meizu") || Build.MANUFACTURER.equals("Xiaomi")) { -// tintManager.setStatusBarTintColor(Color.WHITE); -// } else { -// tintManager.setStatusBarTintColor(Color.BLACK); -// } -// SystemBarConfig config = tintManager.getConfig(); -// contentView.setPadding(0, config.getPixelInsetTop(false), 0, -// config.getPixelInsetBottom()); -// -// if (Build.MANUFACTURER.equals("Meizu")) { -// try { -// Window window = getWindow(); -// if (window != null) { -// WindowManager.LayoutParams lp = window.getAttributes(); -// Field darkFlag = WindowManager.LayoutParams.class.getDeclaredField("MEIZU_FLAG_DARK_STATUS_BAR_ICON"); -// Field meizuFlags = WindowManager.LayoutParams.class.getDeclaredField("meizuFlags"); -// darkFlag.setAccessible(true); -// meizuFlags.setAccessible(true); -// int bit = darkFlag.getInt(null); -// int value = meizuFlags.getInt(lp); -// value |= bit; -// meizuFlags.setInt(lp, value); -// window.setAttributes(lp); -// } -// } catch (Exception e) { -// e.printStackTrace(); -// } -// } else if (Build.MANUFACTURER.equals("Xiaomi")) { -// try { -// Window window = getWindow(); -// if (window != null) { -// Class clazz = window.getClass(); -// 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(window, darkModeFlag, darkModeFlag); -// } -// } catch (Exception e) { -// e.printStackTrace(); -// } -// } -// } -// -// setContentView(contentView); -// -// ButterKnife.bind(this); -// -// int actionbar_height = getSharedPreferences(Config.PREFERENCE, -// Context.MODE_PRIVATE).getInt("actionbar_height", -// DisplayUtils.dip2px(getApplicationContext(), 48)); -// -// RelativeLayout reuse_actionbar = (RelativeLayout) findViewById(R.id.reuse_actionbar); -// LinearLayout.LayoutParams params = new LinearLayout.LayoutParams( -// LayoutParams.MATCH_PARENT, actionbar_height); -// reuse_actionbar.setLayoutParams(params); -// -// findViewById(R.id.actionbar_rl_back).setOnClickListener( -// new OnClickListener() { -// @Override -// public void onClick(View v) { -// finish(); -// } -// }); -// } -// -// public void toast(String msg) { -// Toast.makeText(this, msg, Toast.LENGTH_SHORT).show(); -// } -// -// public void toast(int msg) { -// Toast.makeText(this, msg, Toast.LENGTH_SHORT).show(); -// } -// -// @TargetApi(19) -// protected void setTranslucentStatus(boolean status) { -// Window window = getWindow(); -// WindowManager.LayoutParams winParams = window.getAttributes(); -// final int bits = WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS; -// if (status) { -// winParams.flags |= bits; -// } else { -// winParams.flags &= ~bits; -// } -// window.setAttributes(winParams); -// } -// -// //如果是游戏分享，newsTitle默认为空 -// public void showShare(String url, String gameName, String icon, String newsTitle, ArrayList tag) { -// -// //判断是否是官方版 -// boolean isPlugin = false; -// if (tag != null) { -// for (String s : tag) { -// if (!"官方版".equals(s)) { -// isPlugin = true; -// } -// } -// } -// -// ShareUtils.getInstance(this).showShareWindows(new View(this), url, gameName, icon, newsTitle, isPlugin, true); -// -// if (newsTitle == null) { -// DataUtils.onEvent(this, "内容分享", gameName); -// } else { -// DataUtils.onEvent(this, "内容分享", newsTitle); -// } -// } -// -// public void onEventMainThread(final EBShowDialog showDialog) { -// if (!isPause && this.getClass().getName().equals(RunningUtils.getTopActivity(this))) { -// if ("hijack".equals(showDialog.getType())) { -// DialogUtils.showQqSessionDialog(this, null);// 建议用户联系客服 -// } else if ("plugin".equals(showDialog.getType())) { -// DialogUtils.showPluginDialog(this, new DialogUtils.ConfirmListener() { -// @Override -// public void onConfirm() { -// if (FileUtils.isEmptyFile(showDialog.getPath())) { -// Toast.makeText(BaseFragmentActivity.this, "解析包出错（可能被误删了），请重新下载", Toast.LENGTH_SHORT).show(); -// } else { -// startActivity(PackageUtils.getUninstallIntent(BaseFragmentActivity.this, showDialog.getPath())); -// } -// } -// }); -// } -// } -// } -// -// @Override -// protected void onDestroy() { -// super.onDestroy(); -// EventBus.getDefault().unregister(this); -// AppManager.getInstance().finishActivity(this); -// } -// -// @Override -// protected void onPause() { -// super.onPause(); -// DataUtils.onPause(this); -// isPause = true; -// } -// -// @Override -// protected void onResume() { -// super.onResume(); -// DataUtils.onResume(this); -// isPause = false; -// DownloadManager.getInstance(this).initGameMap(); -// } -// -//} diff --git a/app/src/main/java/com/gh/gamecenter/adapter/BaseRecyclerAdapter.java b/app/src/main/java/com/gh/base/BaseRecyclerAdapter.java similarity index 91% rename from app/src/main/java/com/gh/gamecenter/adapter/BaseRecyclerAdapter.java rename to app/src/main/java/com/gh/base/BaseRecyclerAdapter.java index 0716354471..7053e2722a 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/BaseRecyclerAdapter.java +++ b/app/src/main/java/com/gh/base/BaseRecyclerAdapter.java @@ -1,28 +1,31 @@ -package com.gh.gamecenter.adapter; - -import android.content.Context; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.RecyclerView.ViewHolder; -import android.view.LayoutInflater; - -/** - * @author CsHeng - * @Date 2017/4/25 - * @Time 10:19 - */ - -public abstract class BaseRecyclerAdapter extends RecyclerView.Adapter { - - protected static final int TAG_POSITION = 0x12345678; - - protected Context mContext; - protected LayoutInflater mLayoutInflater; - - public BaseRecyclerAdapter(Context context) { - //TODO 排查必须使用activity context的场景，比如startActivity -// mContext = context.getApplicationContext(); - mContext = context; - mLayoutInflater = LayoutInflater.from(mContext); - } - -} +package com.gh.base; + +import android.content.Context; +import android.support.v7.widget.RecyclerView; +import android.support.v7.widget.RecyclerView.ViewHolder; +import android.view.LayoutInflater; + +/** + * @author CsHeng + * @Date 2017/4/25 + * @Time 10:19 + */ + +public abstract class BaseRecyclerAdapter extends RecyclerView.Adapter { + + /** + * 用于click listener的处理 + */ + protected static final int TAG_POSITION = 0x12345678; + + protected Context mContext; + protected LayoutInflater mLayoutInflater; + + public BaseRecyclerAdapter(Context context) { + //TODO 排查必须使用activity context的场景，比如startActivity +// mContext = context.getApplicationContext(); + mContext = context; + mLayoutInflater = LayoutInflater.from(mContext); + } + +} diff --git a/app/src/main/java/com/gh/base/BaseRecyclerViewHolder.java b/app/src/main/java/com/gh/base/BaseRecyclerViewHolder.java new file mode 100644 index 0000000000..3557f19dd1 --- /dev/null +++ b/app/src/main/java/com/gh/base/BaseRecyclerViewHolder.java @@ -0,0 +1,23 @@ +package com.gh.base; + +import android.support.v7.widget.RecyclerView; +import android.view.View; + +import butterknife.ButterKnife; + +/** + * 目前仅提供butterknife bind方法 + * + * @author CsHeng + * @Date 16/06/2017 + * @Time 9:55 AM + */ + +public abstract class BaseRecyclerViewHolder extends RecyclerView.ViewHolder { + + public BaseRecyclerViewHolder(View itemView) { + super(itemView); + ButterKnife.bind(this, itemView); + } + +} diff --git a/app/src/main/java/com/gh/common/util/DataUtils.java b/app/src/main/java/com/gh/common/util/DataUtils.java index 5432076cf2..953594be10 100644 --- a/app/src/main/java/com/gh/common/util/DataUtils.java +++ b/app/src/main/java/com/gh/common/util/DataUtils.java @@ -36,7 +36,7 @@ public class DataUtils { if (!debug) { TCAgent.init(context, Config.TD_APPID, channel); //TODO 去除为了测试MTA的问题，这个版本不启用 -// TCAgent.setReportUncaughtExceptions(true); + TCAgent.setReportUncaughtExceptions(true); } // 打开debug开关，可查看mta上报日志或错误 diff --git a/app/src/main/java/com/gh/common/view/DownloadDialog.java b/app/src/main/java/com/gh/common/view/DownloadDialog.java index c4dfd04659..6dcedf45fa 100644 --- a/app/src/main/java/com/gh/common/view/DownloadDialog.java +++ b/app/src/main/java/com/gh/common/view/DownloadDialog.java @@ -32,7 +32,7 @@ import com.gh.gamecenter.entity.GameEntity; import com.gh.gamecenter.eventbus.EBDownloadStatus; import com.gh.gamecenter.eventbus.EBPackage; import com.gh.gamecenter.eventbus.EBReuse; -import com.gh.gamecenter.listener.OnCollectionCallBackListener; +import com.gh.listener.OnCollectionCallBackListener; import com.gh.gamecenter.manager.PackageManager; import org.greenrobot.eventbus.EventBus; diff --git a/app/src/main/java/com/gh/download/DataWatcher.java b/app/src/main/java/com/gh/download/DataWatcher.java index 2f72e6bad5..e9c12c54f0 100644 --- a/app/src/main/java/com/gh/download/DataWatcher.java +++ b/app/src/main/java/com/gh/download/DataWatcher.java @@ -8,7 +8,7 @@ public abstract class DataWatcher implements Observer { @Override public void update(Observable observable, Object data) { - if (data != null && data instanceof DownloadEntity) { + if (data instanceof DownloadEntity) { onDataChanged((DownloadEntity) data); } } diff --git a/app/src/main/java/com/gh/gamecenter/MainActivity.java b/app/src/main/java/com/gh/gamecenter/MainActivity.java index 8e3eee3331..b7e1c65fa8 100644 --- a/app/src/main/java/com/gh/gamecenter/MainActivity.java +++ b/app/src/main/java/com/gh/gamecenter/MainActivity.java @@ -63,7 +63,7 @@ import com.gh.gamecenter.eventbus.EBReuse; import com.gh.gamecenter.eventbus.EBShowDialog; import com.gh.gamecenter.eventbus.EBSkip; import com.gh.gamecenter.eventbus.EBUISwitch; -import com.gh.gamecenter.game.GameFragment; +import com.gh.gamecenter.fragment.GameFragment; import com.gh.gamecenter.manager.ConcernManager; import com.gh.gamecenter.manager.DataCollectionManager; import com.gh.gamecenter.manager.FilterManager; diff --git a/app/src/main/java/com/gh/gamecenter/SubjectActivity.java b/app/src/main/java/com/gh/gamecenter/SubjectActivity.java index cdd325b098..fceaacbd08 100644 --- a/app/src/main/java/com/gh/gamecenter/SubjectActivity.java +++ b/app/src/main/java/com/gh/gamecenter/SubjectActivity.java @@ -195,7 +195,7 @@ public class SubjectActivity extends BaseActivity { new VPFragmentAdapter(getSupportFragmentManager(), fragments, tag); mViewPager.setAdapter(adapter); mTabLayout.setupWithViewPager(mViewPager); - mTabLayout.setTabsFromPagerAdapter(adapter); +// mTabLayout.setTabsFromPagerAdapter(adapter); } } } diff --git a/app/src/main/java/com/gh/gamecenter/adapter/CleanApkAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/CleanApkAdapter.java index 66bfb4fdf5..ee94d376c3 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/CleanApkAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/CleanApkAdapter.java @@ -14,6 +14,7 @@ import android.view.ViewGroup; import android.widget.CheckBox; import android.widget.TextView; +import com.gh.base.BaseRecyclerAdapter; import com.gh.common.util.BitmapUtils; import com.gh.common.util.PackageUtils; import com.gh.common.util.StringUtils; diff --git a/app/src/main/java/com/gh/gamecenter/adapter/CommentDetailAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/CommentDetailAdapter.java index e891f0f111..51ba305969 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/CommentDetailAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/CommentDetailAdapter.java @@ -9,6 +9,7 @@ import android.support.v7.widget.RecyclerView.ViewHolder; import android.view.View; import android.view.ViewGroup; +import com.gh.base.BaseRecyclerAdapter; import com.gh.common.constant.Config; import com.gh.common.constant.ItemViewType; import com.gh.common.util.CommentUtils; diff --git a/app/src/main/java/com/gh/gamecenter/adapter/ConcernAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/ConcernAdapter.java index f0d2cd229b..8b783e6ca2 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/ConcernAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/ConcernAdapter.java @@ -4,6 +4,7 @@ import android.view.View; import android.view.ViewGroup; import android.widget.Toast; +import com.gh.base.BaseRecyclerAdapter; import com.gh.common.util.ApkActiveUtils; import com.gh.common.util.DataCollectionUtils; import com.gh.common.util.DataUtils; @@ -16,7 +17,7 @@ import com.gh.gamecenter.R; import com.gh.gamecenter.adapter.viewholder.ConcernViewHolder; import com.gh.gamecenter.db.info.ConcernInfo; import com.gh.gamecenter.entity.GameEntity; -import com.gh.gamecenter.listener.OnCallBackListener; +import com.gh.listener.OnCallBackListener; import com.gh.gamecenter.manager.ConcernManager; import com.gh.gamecenter.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; diff --git a/app/src/main/java/com/gh/gamecenter/adapter/ConcernRecommendAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/ConcernRecommendAdapter.java index f0bfcec5ef..a82a839895 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/ConcernRecommendAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/ConcernRecommendAdapter.java @@ -5,6 +5,7 @@ import android.view.View; import android.view.ViewGroup; import android.widget.Toast; +import com.gh.base.BaseRecyclerAdapter; import com.gh.common.util.ApkActiveUtils; import com.gh.common.util.DataCollectionUtils; import com.gh.common.util.DataUtils; @@ -15,7 +16,7 @@ import com.gh.gamecenter.R; import com.gh.gamecenter.adapter.viewholder.ConcernViewHolder; import com.gh.gamecenter.db.info.ConcernInfo; import com.gh.gamecenter.entity.GameEntity; -import com.gh.gamecenter.listener.OnCallBackListener; +import com.gh.listener.OnCallBackListener; import com.gh.gamecenter.manager.ConcernManager; import com.gh.gamecenter.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; diff --git a/app/src/main/java/com/gh/gamecenter/adapter/FileReceiverAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/FileReceiverAdapter.java index 6d1151605e..bcffeca55c 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/FileReceiverAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/FileReceiverAdapter.java @@ -8,6 +8,7 @@ import android.support.v4.content.ContextCompat; import android.view.View; import android.view.ViewGroup; +import com.gh.base.BaseRecyclerAdapter; import com.gh.common.util.DisplayUtils; import com.gh.common.util.PackageUtils; import com.gh.common.util.SpeedUtils; diff --git a/app/src/main/java/com/gh/gamecenter/adapter/FileSenderAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/FileSenderAdapter.java index b386a4f2ee..34b13ac189 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/FileSenderAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/FileSenderAdapter.java @@ -5,6 +5,7 @@ import android.support.v4.content.ContextCompat; import android.view.View; import android.view.ViewGroup; +import com.gh.base.BaseRecyclerAdapter; import com.gh.common.util.DisplayUtils; import com.gh.common.util.SpeedUtils; import com.gh.common.util.Utils; diff --git a/app/src/main/java/com/gh/gamecenter/adapter/GameNewsAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/GameNewsAdapter.java index bbe522b2f6..a446a89bff 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/GameNewsAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/GameNewsAdapter.java @@ -12,6 +12,7 @@ import android.view.inputmethod.InputMethodManager; import android.widget.LinearLayout; import android.widget.Toast; +import com.gh.base.BaseRecyclerAdapter; import com.gh.common.util.DataCollectionUtils; import com.gh.common.util.DataUtils; import com.gh.common.util.DisplayUtils; diff --git a/app/src/main/java/com/gh/gamecenter/adapter/GameNewsTypeListAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/GameNewsTypeListAdapter.java index 20df867b07..4846c69b6a 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/GameNewsTypeListAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/GameNewsTypeListAdapter.java @@ -7,6 +7,7 @@ import android.graphics.drawable.StateListDrawable; import android.view.View; import android.view.ViewGroup; +import com.gh.base.BaseRecyclerAdapter; import com.gh.gamecenter.R; import com.gh.gamecenter.adapter.viewholder.GameNewsTypeViewHolder; import com.gh.gamecenter.eventbus.EBTypeChange; diff --git a/app/src/main/java/com/gh/gamecenter/adapter/KaiFuAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/KaiFuAdapter.java index 143cd6d410..52c9d1d843 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/KaiFuAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/KaiFuAdapter.java @@ -9,6 +9,7 @@ import android.view.ViewGroup; import android.widget.LinearLayout; import android.widget.Toast; +import com.gh.base.BaseRecyclerAdapter; import com.gh.common.constant.ItemViewType; import com.gh.common.util.ApkActiveUtils; import com.gh.common.util.DataCollectionUtils; @@ -28,7 +29,7 @@ import com.gh.gamecenter.adapter.viewholder.ReuseViewHolder; import com.gh.gamecenter.entity.ApkEntity; import com.gh.gamecenter.entity.GameEntity; import com.gh.gamecenter.entity.KaiFuServerEntity; -import com.gh.gamecenter.listener.OnCallBackListener; +import com.gh.listener.OnCallBackListener; import com.gh.gamecenter.manager.GameManager; import com.gh.gamecenter.retrofit.JSONObjectResponse; import com.gh.gamecenter.retrofit.Response; diff --git a/app/src/main/java/com/gh/gamecenter/adapter/KaiFuDialogAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/KaiFuDialogAdapter.java index 1118450937..84806012cb 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/KaiFuDialogAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/KaiFuDialogAdapter.java @@ -11,6 +11,7 @@ import android.view.ViewGroup; import android.widget.LinearLayout; import android.widget.TextView; +import com.gh.base.BaseRecyclerAdapter; import com.gh.common.util.DisplayUtils; import com.gh.gamecenter.R; import com.gh.gamecenter.adapter.viewholder.StrategyDialogViewHolder; diff --git a/app/src/main/java/com/gh/gamecenter/adapter/KcSelectGameAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/KcSelectGameAdapter.java index 0e52e0cd17..be33cb6b56 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/KcSelectGameAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/KcSelectGameAdapter.java @@ -6,7 +6,6 @@ import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.graphics.Color; import android.graphics.drawable.Drawable; -import android.os.Handler; import android.support.v4.content.ContextCompat; import android.support.v7.widget.RecyclerView; import android.support.v7.widget.RecyclerView.ViewHolder; @@ -20,6 +19,7 @@ import android.widget.ProgressBar; import android.widget.TextView; import com.gh.base.AppController; +import com.gh.base.BaseRecyclerAdapter; import com.gh.common.constant.ItemViewType; import com.gh.common.util.BitmapUtils; import com.gh.common.util.DisplayUtils; diff --git a/app/src/main/java/com/gh/gamecenter/adapter/LiBaoCodeAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/LiBaoCodeAdapter.java index eefc6707e8..3bee5eed88 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/LiBaoCodeAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/LiBaoCodeAdapter.java @@ -6,6 +6,7 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import com.gh.base.BaseRecyclerAdapter; import com.gh.common.util.LibaoUtils; import com.gh.common.util.StringUtils; import com.gh.gamecenter.R; diff --git a/app/src/main/java/com/gh/gamecenter/adapter/LibaoDetailAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/LibaoDetailAdapter.java index 442b5e55a4..5b5cda6b90 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/LibaoDetailAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/LibaoDetailAdapter.java @@ -15,6 +15,7 @@ import android.view.View; import android.view.ViewGroup; import android.widget.TextView; +import com.gh.base.BaseRecyclerAdapter; import com.gh.common.util.DisplayUtils; import com.gh.common.util.ImageUtils; import com.gh.common.util.LibaoUtils; @@ -29,8 +30,8 @@ import com.gh.gamecenter.db.info.LibaoInfo; import com.gh.gamecenter.entity.LibaoDetailEntity; import com.gh.gamecenter.entity.LibaoEntity; import com.gh.gamecenter.entity.LibaoStatusEntity; -import com.gh.gamecenter.gamedetail.GameDetailNewsViewHolder; -import com.gh.gamecenter.listener.OnCallBackListener; +import com.gh.gamecenter.adapter.viewholder.GameDetailNewsViewHolder; +import com.gh.listener.OnCallBackListener; import com.gh.gamecenter.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; diff --git a/app/src/main/java/com/gh/gamecenter/adapter/MessageDetailAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/MessageDetailAdapter.java index 9abe9d8df8..da3be2d99d 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/MessageDetailAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/MessageDetailAdapter.java @@ -14,6 +14,7 @@ import android.view.View; import android.view.ViewGroup; import android.widget.LinearLayout; +import com.gh.base.BaseRecyclerAdapter; import com.gh.common.constant.Config; import com.gh.common.util.CommentUtils; import com.gh.common.util.ConcernContentUtils; diff --git a/app/src/main/java/com/gh/gamecenter/adapter/PlatformAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/PlatformAdapter.java index 0aa78a30ab..a41e185762 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/PlatformAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/PlatformAdapter.java @@ -19,6 +19,7 @@ import android.view.ViewGroup; import android.widget.TextView; import android.widget.Toast; +import com.gh.base.BaseRecyclerAdapter; import com.gh.common.constant.Config; import com.gh.common.util.DataUtils; import com.gh.common.util.DialogUtils; @@ -38,7 +39,7 @@ import com.gh.gamecenter.adapter.viewholder.PlatformViewHolder; import com.gh.gamecenter.entity.ApkEntity; import com.gh.gamecenter.entity.CollectionColseEntity; import com.gh.gamecenter.entity.GameEntity; -import com.gh.gamecenter.listener.OnCollectionCallBackListener; +import com.gh.listener.OnCollectionCallBackListener; import com.gh.gamecenter.manager.PackageManager; import java.io.File; diff --git a/app/src/main/java/com/gh/gamecenter/adapter/PlatformPagerAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/PlatformPagerAdapter.java index 37153e4f4f..e7ed6806cc 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/PlatformPagerAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/PlatformPagerAdapter.java @@ -18,7 +18,7 @@ import com.gh.download.DownloadManager; import com.gh.gamecenter.entity.ApkEntity; import com.gh.gamecenter.entity.CollectionColseEntity; import com.gh.gamecenter.entity.GameEntity; -import com.gh.gamecenter.listener.OnCollectionCallBackListener; +import com.gh.listener.OnCollectionCallBackListener; import java.util.List; diff --git a/app/src/main/java/com/gh/gamecenter/adapter/PluginAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/PluginAdapter.java index 28803cf515..2dc9e0efbf 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/PluginAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/PluginAdapter.java @@ -4,6 +4,7 @@ import android.support.v4.util.ArrayMap; import android.view.View; import android.view.ViewGroup; +import com.gh.base.BaseRecyclerAdapter; import com.gh.common.util.DataCollectionUtils; import com.gh.common.util.DataUtils; import com.gh.common.util.DownloadItemUtils; @@ -19,7 +20,7 @@ import com.gh.gamecenter.adapter.viewholder.GameNormalViewHolder; import com.gh.gamecenter.entity.ApkEntity; import com.gh.gamecenter.entity.GameEntity; import com.gh.gamecenter.entity.GameUpdateEntity; -import com.gh.gamecenter.listener.OnCallBackListener; +import com.gh.listener.OnCallBackListener; import com.gh.gamecenter.manager.GameManager; import com.gh.gamecenter.manager.PackageManager; diff --git a/app/src/main/java/com/gh/gamecenter/adapter/SubjectTypeAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/SubjectTypeAdapter.java index be738cd4b5..a4693fb0fa 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/SubjectTypeAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/SubjectTypeAdapter.java @@ -12,6 +12,7 @@ import android.widget.LinearLayout; import android.widget.RelativeLayout; import android.widget.TextView; +import com.gh.base.BaseRecyclerAdapter; import com.gh.common.util.DisplayUtils; import com.gh.gamecenter.R; import com.gh.gamecenter.adapter.SubjectTypeAdapter.GameTypeViewHolder; diff --git a/app/src/main/java/com/gh/gamecenter/adapter/ToolBoxRvAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/ToolBoxRvAdapter.java index 5be94b32a7..a3757900a5 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/ToolBoxRvAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/ToolBoxRvAdapter.java @@ -10,6 +10,7 @@ import android.view.ViewGroup; import android.view.inputmethod.InputMethodManager; import com.gh.base.AppController; +import com.gh.base.BaseRecyclerAdapter; import com.gh.common.util.EntranceUtils; import com.gh.common.util.ImageUtils; import com.gh.common.util.MD5Utils; @@ -23,7 +24,7 @@ import com.gh.gamecenter.adapter.viewholder.LibaoSearchViewHolder; import com.gh.gamecenter.adapter.viewholder.ToolBoxViewHolder; import com.gh.gamecenter.db.info.ConcernInfo; import com.gh.gamecenter.entity.ToolBoxEntity; -import com.gh.gamecenter.listener.OnCallBackListener; +import com.gh.listener.OnCallBackListener; import com.gh.gamecenter.manager.ConcernManager; import com.gh.gamecenter.retrofit.ObservableUtil; import com.gh.gamecenter.retrofit.Response; diff --git a/app/src/main/java/com/gh/gamecenter/adapter/VoteAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/VoteAdapter.java index a2febd8f94..d9a0e7e9ae 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/VoteAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/VoteAdapter.java @@ -9,13 +9,14 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import com.gh.base.BaseRecyclerAdapter; import com.gh.common.util.DisplayUtils; import com.gh.gamecenter.R; import com.gh.gamecenter.adapter.viewholder.FooterViewHolder; import com.gh.gamecenter.adapter.viewholder.VoteViewHolder; import com.gh.gamecenter.db.VersionVoteDao; import com.gh.gamecenter.entity.VersionVoteEntity; -import com.gh.gamecenter.listener.OnCallBackListener; +import com.gh.listener.OnCallBackListener; import com.gh.gamecenter.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/CommentHeadViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/CommentHeadViewHolder.java index 111ca06bef..ae9b637ba6 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/CommentHeadViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/CommentHeadViewHolder.java @@ -1,18 +1,17 @@ package com.gh.gamecenter.adapter.viewholder; -import android.support.v7.widget.RecyclerView; import android.view.View; import android.widget.TextView; +import com.gh.base.BaseRecyclerViewHolder; import com.gh.gamecenter.R; import butterknife.BindView; -import butterknife.ButterKnife; /** * Created by khy on 2016/11/9. */ -public class CommentHeadViewHolder extends RecyclerView.ViewHolder { +public class CommentHeadViewHolder extends BaseRecyclerViewHolder { @BindView(R.id.comment_head_line) public View commentHeadLine; @@ -21,6 +20,6 @@ public class CommentHeadViewHolder extends RecyclerView.ViewHolder { public CommentHeadViewHolder(View itemView) { super(itemView); - ButterKnife.bind(this, itemView); } + } diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/CommentViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/CommentViewHolder.java index d74dddef1c..3032c24f5d 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/CommentViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/CommentViewHolder.java @@ -1,20 +1,19 @@ package com.gh.gamecenter.adapter.viewholder; -import android.support.v7.widget.RecyclerView; import android.view.View; import android.widget.ImageView; import android.widget.TextView; import com.facebook.drawee.view.SimpleDraweeView; +import com.gh.base.BaseRecyclerViewHolder; import com.gh.gamecenter.R; import butterknife.BindView; -import butterknife.ButterKnife; /** * Created by khy on 2016/11/9. */ -public class CommentViewHolder extends RecyclerView.ViewHolder { +public class CommentViewHolder extends BaseRecyclerViewHolder { @BindView(R.id.comment_line) public View commentLine; @@ -35,6 +34,5 @@ public class CommentViewHolder extends RecyclerView.ViewHolder { public CommentViewHolder(View itemView) { super(itemView); - ButterKnife.bind(this, itemView); } } diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/ConcernViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/ConcernViewHolder.java index f6f0956f20..49afb52764 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/ConcernViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/ConcernViewHolder.java @@ -1,30 +1,34 @@ package com.gh.gamecenter.adapter.viewholder; -import android.support.v7.widget.RecyclerView; import android.view.View; import android.widget.ImageView; import android.widget.TextView; import com.facebook.drawee.view.SimpleDraweeView; +import com.gh.base.BaseRecyclerViewHolder; import com.gh.gamecenter.R; +import butterknife.BindView; + /** * Created by LGT on 2016/9/20. */ -public class ConcernViewHolder extends RecyclerView.ViewHolder { +public class ConcernViewHolder extends BaseRecyclerViewHolder { + @BindView(R.id.concern_item_icon) public SimpleDraweeView concern_item_icon; + + @BindView(R.id.concern_item_name) public TextView concern_item_name; + + @BindView(R.id.concern_item_concern) public TextView concern_item_concern; + + @BindView(R.id.concern_libao_icon) public ImageView concern_libao_icon; public ConcernViewHolder(View itemView) { super(itemView); - - concern_item_icon = (SimpleDraweeView) itemView.findViewById(R.id.concern_item_icon); - concern_item_name = (TextView) itemView.findViewById(R.id.concern_item_name); - concern_item_concern = (TextView) itemView.findViewById(R.id.concern_item_concern); - concern_libao_icon = (ImageView) itemView.findViewById(R.id.concern_libao_icon); } } diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/DownloadHeadViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/DownloadHeadViewHolder.java index fe5d570eb9..6bd372d4d0 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/DownloadHeadViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/DownloadHeadViewHolder.java @@ -1,25 +1,25 @@ package com.gh.gamecenter.adapter.viewholder; -import android.support.v7.widget.RecyclerView; import android.view.View; import android.widget.TextView; +import com.gh.base.BaseRecyclerViewHolder; import com.gh.gamecenter.R; +import butterknife.BindView; + /** * Created by LGT on 2016/8/15. */ -public class DownloadHeadViewHolder extends RecyclerView.ViewHolder { +public class DownloadHeadViewHolder extends BaseRecyclerViewHolder { + @BindView(R.id.dm_item_head_tv_task) public TextView dm_item_head_tv_task; + @BindView(R.id.dm_item_head_tv_allstart) public TextView dm_item_head_tv_allstart; public DownloadHeadViewHolder(View itemView) { super(itemView); - - dm_item_head_tv_task = (TextView) itemView.findViewById(R.id.dm_item_head_tv_task); - dm_item_head_tv_allstart = (TextView) itemView.findViewById(R.id.dm_item_head_tv_allstart); - } } diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/FooterViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/FooterViewHolder.java index 71c9954e87..f3a0276f64 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/FooterViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/FooterViewHolder.java @@ -1,15 +1,14 @@ package com.gh.gamecenter.adapter.viewholder; -import android.support.v7.widget.RecyclerView.ViewHolder; import android.view.View; import android.view.View.OnClickListener; import android.widget.ProgressBar; import android.widget.TextView; +import com.gh.base.BaseRecyclerViewHolder; import com.gh.gamecenter.R; import butterknife.BindView; -import butterknife.ButterKnife; /** * @author 温冠超 @@ -18,47 +17,36 @@ import butterknife.ButterKnife; * @update 2015-8-11 * @des 下拉或上啦刷新中，进度显示控件 */ -public class FooterViewHolder extends ViewHolder { +public class FooterViewHolder extends BaseRecyclerViewHolder { @BindView(R.id.footerview_loading) public ProgressBar loading; + @BindView(R.id.footerview_hint) public TextView hint; + @BindView(R.id.footerview_line_left) public View lineLeft; + @BindView(R.id.footerview_line_right) public View lineRight; - private View mView; - public FooterViewHolder(View itemView) { super(itemView); - mView = itemView; - ButterKnife.bind(this, itemView); } // 减去recyclerView item间隔（个别列表间隔很大） public void initItemPadding() { - mView.setPadding(0, 0, 0, 0); + itemView.setPadding(0, 0, 0, 0); } - - public void initFooterViewHolder(boolean mIsNetworkError, boolean mIsOver, - OnClickListener onClickListener) { + public void initFooterViewHolder(boolean mIsNetworkError, boolean mIsOver, OnClickListener onClickListener) { if (mIsNetworkError) { lineLeft.setVisibility(View.GONE); lineRight.setVisibility(View.GONE); loading.setVisibility(View.GONE); hint.setText("加载失败，点击重试"); itemView.setClickable(true); -// holder.itemView.setOnClickListener(new View.OnClickListener() { -// @Override -// public void onClick(View v) { -// mIsNetworkError = false; -// notifyItemChanged(getItemCount() - 1); -// initSubjectList(); -// } -// }); itemView.setOnClickListener(onClickListener); } else if (mIsOver) { lineLeft.setVisibility(View.VISIBLE); diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameDetaiLibaoViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameDetaiLibaoViewHolder.java new file mode 100644 index 0000000000..4abce9871f --- /dev/null +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameDetaiLibaoViewHolder.java @@ -0,0 +1,26 @@ +package com.gh.gamecenter.adapter.viewholder; + +import android.support.v7.widget.RecyclerView; +import android.view.View; +import android.widget.RelativeLayout; + +import com.gh.base.BaseRecyclerViewHolder; +import com.gh.gamecenter.R; + +import butterknife.BindView; + +/** + * Created by khy on 2016/12/14. + */ +public class GameDetaiLibaoViewHolder extends BaseRecyclerViewHolder { + + @BindView(R.id.gamedetail_item_libao_gallery) + public RecyclerView libaoRv; + @BindView(R.id.gamedetail_item_open_list) + public RelativeLayout openList; + + public GameDetaiLibaoViewHolder(View itemView) { + super(itemView); + } + +} diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameDetailCalenderViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameDetailCalenderViewHolder.java new file mode 100644 index 0000000000..e39816aed4 --- /dev/null +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameDetailCalenderViewHolder.java @@ -0,0 +1,25 @@ +package com.gh.gamecenter.adapter.viewholder; + +import android.view.View; +import android.widget.TextView; + +import com.gh.base.BaseRecyclerViewHolder; +import com.gh.gamecenter.R; + +import butterknife.BindView; + +/** + * Created by khy on 2017/3/28. + */ +public class GameDetailCalenderViewHolder extends BaseRecyclerViewHolder { + + @BindView(R.id.calendar_day) + public TextView calendarDay; + @BindView(R.id.calendar_kaifu) + public TextView calendarKaifu; + + public GameDetailCalenderViewHolder(View itemView) { + super(itemView); + } + +} diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameDetailFuLiViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameDetailFuLiViewHolder.java new file mode 100644 index 0000000000..5c02808243 --- /dev/null +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameDetailFuLiViewHolder.java @@ -0,0 +1,42 @@ +package com.gh.gamecenter.adapter.viewholder; + +import android.view.View; +import android.widget.LinearLayout; +import android.widget.RelativeLayout; +import android.widget.TextView; + +import com.gh.base.BaseRecyclerViewHolder; +import com.gh.common.view.MarqueeView; +import com.gh.gamecenter.R; + +import butterknife.BindView; + +/** + * Created by khy on 2017/3/27. + */ +public class GameDetailFuLiViewHolder extends BaseRecyclerViewHolder { + + @BindView(R.id.gamedetail_item_fuli_des) + public TextView fuliDes; + @BindView(R.id.gamedetail_qq_rl) + public RelativeLayout fuliQqRl; + @BindView(R.id.gamedetail_qq_des) + public TextView fuliQqDes; + @BindView(R.id.gamedetail_qq_btn) + public TextView fuliQqBtn; + @BindView(R.id.gamedetail_qqun_rl) + public RelativeLayout fuliQqunRl; + @BindView(R.id.gamedetail_qqun_btn) + public TextView fuliQqunBtn; + @BindView(R.id.gamedetail_qqun_des) + public TextView fuliQqunDes; + @BindView(R.id.gamedetail_item_notice) + public MarqueeView filiNotice; + @BindView(R.id.gamedetail_item_notice_ll) + public LinearLayout filiNoticeLl; + + public GameDetailFuLiViewHolder(View itemView) { + super(itemView); + } + +} diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameDetailGameTagTypeViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameDetailGameTagTypeViewHolder.java new file mode 100644 index 0000000000..e73e256221 --- /dev/null +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameDetailGameTagTypeViewHolder.java @@ -0,0 +1,17 @@ +package com.gh.gamecenter.adapter.viewholder; + +import android.view.View; +import android.widget.TextView; + +import com.gh.base.BaseRecyclerViewHolder; + +public class GameDetailGameTagTypeViewHolder extends BaseRecyclerViewHolder { + + public TextView type; + + public GameDetailGameTagTypeViewHolder(View itemView) { + super(itemView); + type = (TextView) itemView; + } + +} \ No newline at end of file diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameDetailGameTagViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameDetailGameTagViewHolder.java new file mode 100644 index 0000000000..3cda0635a3 --- /dev/null +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameDetailGameTagViewHolder.java @@ -0,0 +1,23 @@ +package com.gh.gamecenter.adapter.viewholder; + +import android.support.v7.widget.RecyclerView; +import android.view.View; + +import com.gh.base.BaseRecyclerViewHolder; +import com.gh.gamecenter.R; + +import butterknife.BindView; + +/** + * Created by khy on 2017/3/28. + */ +public class GameDetailGameTagViewHolder extends BaseRecyclerViewHolder { + + @BindView(R.id.gamedetail_gametag_rv) + public RecyclerView gametagRv; + + public GameDetailGameTagViewHolder(View itemView) { + super(itemView); + } + +} diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameDetailGameViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameDetailGameViewHolder.java new file mode 100644 index 0000000000..60b9fd48f0 --- /dev/null +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameDetailGameViewHolder.java @@ -0,0 +1,16 @@ +package com.gh.gamecenter.adapter.viewholder; + +import android.view.View; + +import com.gh.base.BaseRecyclerViewHolder; + +/** + * Created by khy on 2017/3/29. + */ +public class GameDetailGameViewHolder extends BaseRecyclerViewHolder { + + public GameDetailGameViewHolder(View itemView) { + super(itemView); + } + +} diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameDetailIntroViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameDetailIntroViewHolder.java new file mode 100644 index 0000000000..296cd8a319 --- /dev/null +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameDetailIntroViewHolder.java @@ -0,0 +1,26 @@ +package com.gh.gamecenter.adapter.viewholder; + +import android.support.v7.widget.RecyclerView; +import android.view.View; +import android.widget.TextView; + +import com.gh.base.BaseRecyclerViewHolder; +import com.gh.gamecenter.R; + +import butterknife.BindView; + +/** + * Created by LGT on 2016/9/8. + */ +public class GameDetailIntroViewHolder extends BaseRecyclerViewHolder { + + @BindView(R.id.gamedetail_item_intro_gallery) + public RecyclerView gamedetail_item_intro_gallery; + @BindView(R.id.gamedetail_item_intro_content) + public TextView gamedetail_item_intro_content; + + public GameDetailIntroViewHolder(View itemView) { + super(itemView); + } + +} diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameDetailKaiFuViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameDetailKaiFuViewHolder.java new file mode 100644 index 0000000000..3428e8d3c4 --- /dev/null +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameDetailKaiFuViewHolder.java @@ -0,0 +1,47 @@ +package com.gh.gamecenter.adapter.viewholder; + +import android.support.v7.widget.RecyclerView; +import android.view.View; +import android.widget.LinearLayout; +import android.widget.RelativeLayout; +import android.widget.ScrollView; +import android.widget.TextView; + +import com.gh.base.BaseRecyclerViewHolder; +import com.gh.gamecenter.R; + +import butterknife.BindView; + +/** + * Created by khy on 2017/3/28. + */ +public class GameDetailKaiFuViewHolder extends BaseRecyclerViewHolder { + + @BindView(R.id.gamedetail_kaifu_rv) + public RecyclerView kaifuRv; + @BindView(R.id.gamedetail_kaifu_cur_month) + public TextView curMonth; + @BindView(R.id.gamedetail_kaifu_next_month) + public TextView nextMonth; + @BindView(R.id.gamedetail_kaifu_rl) + public RelativeLayout kaifuRl; + @BindView(R.id.gamedetail_kaifu_detail) + public RelativeLayout kaifuDetailRl; + @BindView(R.id.gamedetail_kaifu_colse_detail) + public TextView colseDetail; + @BindView(R.id.gamedetail_kaifu_suggest) + public TextView kaifuSuggest; + @BindView(R.id.gamedetail_kaifu_detail_time) + public TextView detailTime; + @BindView(R.id.gamedetail_kaifu_detail_list) + public LinearLayout detailList; + @BindView(R.id.gamedetail_kaifu_detail_sv) + public ScrollView detailSv; + @BindView(R.id.gamedetail_kaifu_des) + public TextView kaifuDes; + + public GameDetailKaiFuViewHolder(View itemView) { + super(itemView); + } + +} diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameDetailNewsServerItemViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameDetailNewsServerItemViewHolder.java new file mode 100644 index 0000000000..42605d74c8 --- /dev/null +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameDetailNewsServerItemViewHolder.java @@ -0,0 +1,30 @@ +package com.gh.gamecenter.adapter.viewholder; + +import android.view.View; +import android.widget.ImageView; +import android.widget.TextView; + +import com.gh.base.BaseRecyclerViewHolder; +import com.gh.gamecenter.R; + +import butterknife.BindView; + +/** + * Created by LGT on 2016/9/18. + */ +public class GameDetailNewsServerItemViewHolder extends BaseRecyclerViewHolder { + + @BindView(R.id.newsserver_item_name) + public TextView newsserver_item_name; + @BindView(R.id.newsserver_item_line) + public View newsserver_item_line; + @BindView(R.id.newsserver_item_point) + public ImageView newsserver_item_point; + @BindView(R.id.newsserver_item_time) + public TextView newsserver_item_time; + + public GameDetailNewsServerItemViewHolder(View itemView) { + super(itemView); + } + +} diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameDetailNewsViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameDetailNewsViewHolder.java new file mode 100644 index 0000000000..df80fe41eb --- /dev/null +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameDetailNewsViewHolder.java @@ -0,0 +1,32 @@ +package com.gh.gamecenter.adapter.viewholder; + +import android.view.View; +import android.widget.LinearLayout; +import android.widget.TextView; + +import com.gh.base.BaseRecyclerViewHolder; +import com.gh.gamecenter.R; + +import butterknife.BindView; + +/** + * Created by LGT on 2016/9/8. + */ +public class GameDetailNewsViewHolder extends BaseRecyclerViewHolder { + + @BindView(R.id.gamedetail_item_news_more) + public LinearLayout gamedetail_item_news_more; + @BindView(R.id.gamedetail_item_news_list) + public LinearLayout gamedetail_item_news_list; + @BindView(R.id.gamedetail_item_news_title) + public TextView gamedetail_item_news_title; + @BindView(R.id.gamedetail_item_line) + public View gamedetail_item_line; + @BindView(R.id.gamedetail_item_news_line_top) + public View gamedetail_item_news_line_top; + + public GameDetailNewsViewHolder(View itemView) { + super(itemView); + } + +} diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameDetailNoticeViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameDetailNoticeViewHolder.java new file mode 100644 index 0000000000..0fce9b1414 --- /dev/null +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameDetailNoticeViewHolder.java @@ -0,0 +1,25 @@ +package com.gh.gamecenter.adapter.viewholder; + +import android.view.View; + +import com.gh.base.BaseRecyclerViewHolder; +import com.gh.common.view.MarqueeView; +import com.gh.gamecenter.R; + +import butterknife.BindView; + +/** + * Created by khy on 2017/3/30. + */ +public class GameDetailNoticeViewHolder extends BaseRecyclerViewHolder { + + @BindView(R.id.gamedetail_item_notice) + public MarqueeView mvNotice; + @BindView(R.id.gamedetail_item_notice_line) + public View noticeLine; + + public GameDetailNoticeViewHolder(View itemView) { + super(itemView); + } + +} diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameDetailPluginViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameDetailPluginViewHolder.java new file mode 100644 index 0000000000..0c0631d8d3 --- /dev/null +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameDetailPluginViewHolder.java @@ -0,0 +1,30 @@ +package com.gh.gamecenter.adapter.viewholder; + +import android.support.v7.widget.RecyclerView; +import android.view.View; +import android.widget.TextView; + +import com.gh.base.BaseRecyclerViewHolder; +import com.gh.gamecenter.R; + +import butterknife.BindView; + +/** + * Created by LGT on 2016/9/8. + */ +public class GameDetailPluginViewHolder extends BaseRecyclerViewHolder { + + @BindView(R.id.gamedetail_plugin_rv) + public RecyclerView gameDetailPluginRv; + @BindView(R.id.gamedetail_plugin_open_list) + public View gamedetailPluginOpen; + @BindView(R.id.gamedetail_plugin_line_top) + public View gamedetailPluginLine; + @BindView(R.id.gamedetail_plugin_title) + public TextView gamedetailPluginTitle; + + public GameDetailPluginViewHolder(View itemView) { + super(itemView); + } + +} diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameDetailSkinViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameDetailSkinViewHolder.java new file mode 100644 index 0000000000..0c74e4aa58 --- /dev/null +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameDetailSkinViewHolder.java @@ -0,0 +1,31 @@ +package com.gh.gamecenter.adapter.viewholder; + +import android.view.View; +import android.widget.ProgressBar; +import android.widget.TextView; + +import com.gh.base.BaseRecyclerViewHolder; +import com.gh.gamecenter.R; + +import butterknife.BindView; + +/** + * Created by khy on 2016/11/16. + */ +public class GameDetailSkinViewHolder extends BaseRecyclerViewHolder { + + @BindView(R.id.skin_tv_download) + public TextView skinDownloadTv; + @BindView(R.id.skin_pb_progressbar) + public ProgressBar skinDownloadPb; + @BindView(R.id.skin_tv_per) + public TextView skinDownloadPerTv; + @BindView(R.id.skin_tv_des) + public TextView skinDownloadDes; + @BindView(R.id.skin_tv_name) + public TextView skinDownloadName; + + public GameDetailSkinViewHolder(View itemView) { + super(itemView); + } +} diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameDetailTopViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameDetailTopViewHolder.java new file mode 100644 index 0000000000..5c2f81afcf --- /dev/null +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameDetailTopViewHolder.java @@ -0,0 +1,30 @@ +package com.gh.gamecenter.adapter.viewholder; + +import android.view.View; +import android.widget.TextView; + +import com.facebook.drawee.view.SimpleDraweeView; +import com.gh.base.BaseRecyclerViewHolder; +import com.gh.gamecenter.R; + +import butterknife.BindView; + +/** + * Created by LGT on 2016/9/8. + */ +public class GameDetailTopViewHolder extends BaseRecyclerViewHolder { + + @BindView(R.id.gamedetail_iv_thumb) + public SimpleDraweeView gamedetail_iv_thumb; + @BindView(R.id.gamedetail_tv_name) + public TextView gamedetail_tv_name; + @BindView(R.id.gamedetail_tv_info) + public TextView gamedetail_tv_info; + @BindView(R.id.gamedetail_tv_concern) + public TextView gamedetail_tv_concern; + + public GameDetailTopViewHolder(View itemView) { + super(itemView); + } + +} diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameDownloadViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameDownloadViewHolder.java index 95824b8b31..d0a11c8a24 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameDownloadViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameDownloadViewHolder.java @@ -1,40 +1,47 @@ package com.gh.gamecenter.adapter.viewholder; -import android.support.v7.widget.RecyclerView; import android.view.View; import android.widget.ImageView; import android.widget.ProgressBar; import android.widget.TextView; import com.facebook.drawee.view.SimpleDraweeView; +import com.gh.base.BaseRecyclerViewHolder; import com.gh.gamecenter.R; +import butterknife.BindView; + /** * Created by LGT on 2016/8/15. */ -public class GameDownloadViewHolder extends RecyclerView.ViewHolder { +public class GameDownloadViewHolder extends BaseRecyclerViewHolder { + @BindView(R.id.dm_item_iv_icon) public SimpleDraweeView dm_item_iv_icon; + + @BindView(R.id.dm_item_tv_title) public TextView dm_item_tv_title; + + @BindView(R.id.dm_item_tv_downloads) public TextView dm_item_tv_downloads; + + @BindView(R.id.dm_item_iv_delete) public ImageView dm_item_iv_delete; + + @BindView(R.id.dm_item_tv_speed) public TextView dm_item_tv_speed; + + @BindView(R.id.dm_item_progressbar) public ProgressBar dm_item_progressbar; + + @BindView(R.id.dm_item_tv_startorpause) public TextView dm_item_tv_startorpause; + + @BindView(R.id.dm_item_line) public View dm_item_line; public GameDownloadViewHolder(View itemView) { super(itemView); - - dm_item_iv_icon = (SimpleDraweeView) itemView.findViewById(R.id.dm_item_iv_icon); - dm_item_tv_title = (TextView) itemView.findViewById(R.id.dm_item_tv_title); - dm_item_tv_downloads = (TextView) itemView.findViewById(R.id.dm_item_tv_downloads); - dm_item_iv_delete = (ImageView) itemView.findViewById(R.id.dm_item_iv_delete); - dm_item_tv_speed = (TextView) itemView.findViewById(R.id.dm_item_tv_speed); - dm_item_progressbar = (ProgressBar) itemView.findViewById(R.id.dm_item_progressbar); - dm_item_tv_startorpause = (TextView) itemView.findViewById(R.id.dm_item_tv_startorpause); - dm_item_line = itemView.findViewById(R.id.dm_item_line); - } } diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/GameGalleryViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameGalleryViewHolder.java similarity index 52% rename from app/src/main/java/com/gh/gamecenter/gamedetail/GameGalleryViewHolder.java rename to app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameGalleryViewHolder.java index 5e44de79eb..de33717a8d 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/GameGalleryViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameGalleryViewHolder.java @@ -1,22 +1,23 @@ -package com.gh.gamecenter.gamedetail; +package com.gh.gamecenter.adapter.viewholder; -import android.support.v7.widget.RecyclerView; import android.view.View; import com.facebook.drawee.view.SimpleDraweeView; +import com.gh.base.BaseRecyclerViewHolder; import com.gh.gamecenter.R; +import butterknife.BindView; + /** * Created by LGT on 2016/9/8. */ -public class GameGalleryViewHolder extends RecyclerView.ViewHolder { +public class GameGalleryViewHolder extends BaseRecyclerViewHolder { + @BindView(R.id.screenshot_item_iv) public SimpleDraweeView screenshot_item_iv; public GameGalleryViewHolder(View itemView) { super(itemView); - - screenshot_item_iv = (SimpleDraweeView) itemView.findViewById(R.id.screenshot_item_iv); } } diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameHeadViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameHeadViewHolder.java index 62fd5d44b4..b7af523ac0 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameHeadViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameHeadViewHolder.java @@ -1,34 +1,40 @@ package com.gh.gamecenter.adapter.viewholder; -import android.support.v7.widget.RecyclerView; import android.view.View; import android.widget.ImageView; import android.widget.ProgressBar; import android.widget.TextView; +import com.gh.base.BaseRecyclerViewHolder; import com.gh.gamecenter.R; +import butterknife.BindView; + /** * Created by LGT on 2016/7/5. */ -public class GameHeadViewHolder extends RecyclerView.ViewHolder { +public class GameHeadViewHolder extends BaseRecyclerViewHolder { + @BindView(R.id.head_thumb) public ImageView thumb; + + @BindView(R.id.head_title) public TextView title; + + @BindView(R.id.head_more) public TextView more; + + @BindView(R.id.head_pb) public ProgressBar progressBar; + + @BindView(R.id.head_line) public View line; + + @BindView(R.id.head_line_top) public View lineTop; public GameHeadViewHolder(View itemView) { super(itemView); - - this.thumb = (ImageView) itemView.findViewById(R.id.head_thumb); - this.title = (TextView) itemView.findViewById(R.id.head_title); - this.more = (TextView) itemView.findViewById(R.id.head_more); - this.progressBar = (ProgressBar) itemView.findViewById(R.id.head_pb); - this.line = itemView.findViewById(R.id.head_line); - this.lineTop = itemView.findViewById(R.id.head_line_top); } } diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameImageViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameImageViewHolder.java index 3abc2014ec..92c677da1b 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameImageViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameImageViewHolder.java @@ -1,24 +1,26 @@ package com.gh.gamecenter.adapter.viewholder; -import android.support.v7.widget.RecyclerView; import android.view.View; import com.facebook.drawee.view.SimpleDraweeView; +import com.gh.base.BaseRecyclerViewHolder; import com.gh.gamecenter.R; +import butterknife.BindView; + /** * Created by LGT on 2016/7/5. */ -public class GameImageViewHolder extends RecyclerView.ViewHolder { +public class GameImageViewHolder extends BaseRecyclerViewHolder { + @BindView(R.id.home_game_iv_image) public SimpleDraweeView image; + + @BindView(R.id.home_game_line) public View line; public GameImageViewHolder(View itemView) { super(itemView); - - image = (SimpleDraweeView) itemView.findViewById(R.id.home_game_iv_image); - line = itemView.findViewById(R.id.home_game_line); } } diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/GameLibaoGalleryViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameLibaoGalleryViewHolder.java similarity index 66% rename from app/src/main/java/com/gh/gamecenter/gamedetail/GameLibaoGalleryViewHolder.java rename to app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameLibaoGalleryViewHolder.java index cba7bb47d4..ddde825a6d 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/GameLibaoGalleryViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameLibaoGalleryViewHolder.java @@ -1,18 +1,17 @@ -package com.gh.gamecenter.gamedetail; +package com.gh.gamecenter.adapter.viewholder; -import android.support.v7.widget.RecyclerView; import android.view.View; import android.widget.TextView; +import com.gh.base.BaseRecyclerViewHolder; import com.gh.gamecenter.R; import butterknife.BindView; -import butterknife.ButterKnife; /** * Created by khy on 2016/12/14. */ -public class GameLibaoGalleryViewHolder extends RecyclerView.ViewHolder { +public class GameLibaoGalleryViewHolder extends BaseRecyclerViewHolder { @BindView(R.id.gamedetail_libao_name) public TextView libaoName; @@ -21,9 +20,8 @@ public class GameLibaoGalleryViewHolder extends RecyclerView.ViewHolder { @BindView(R.id.gamedetail_libao_btn) public TextView libaoBtn; - public GameLibaoGalleryViewHolder(View itemView) { super(itemView); - ButterKnife.bind(this, itemView); } + } diff --git a/app/src/main/java/com/gh/gamecenter/changeskin/ChangeSkinUtils.java b/app/src/main/java/com/gh/gamecenter/changeskin/ChangeSkinUtils.java index d918b9b8d4..dcd5253123 100644 --- a/app/src/main/java/com/gh/gamecenter/changeskin/ChangeSkinUtils.java +++ b/app/src/main/java/com/gh/gamecenter/changeskin/ChangeSkinUtils.java @@ -10,7 +10,7 @@ import android.widget.TextView; import com.gh.base.AppController; import com.gh.common.util.Utils; import com.gh.gamecenter.R; -import com.gh.gamecenter.gamedetail.GameDetailSkinViewHolder; +import com.gh.gamecenter.adapter.viewholder.GameDetailSkinViewHolder; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; diff --git a/app/src/main/java/com/gh/gamecenter/download/FileSendFragment.java b/app/src/main/java/com/gh/gamecenter/download/FileSendFragment.java index 66323834da..db930a33d1 100644 --- a/app/src/main/java/com/gh/gamecenter/download/FileSendFragment.java +++ b/app/src/main/java/com/gh/gamecenter/download/FileSendFragment.java @@ -1,16 +1,12 @@ package com.gh.gamecenter.download; import android.content.Intent; -import android.os.Bundle; import android.os.Handler; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; import android.text.Html; -import android.view.LayoutInflater; import android.view.View; -import android.view.ViewGroup; import android.widget.TextView; +import com.gh.base.BaseFragment; import com.gh.common.util.DialogUtils; import com.gh.common.util.StringUtils; import com.gh.gamecenter.CleanApkActivity; @@ -22,9 +18,7 @@ import com.gh.gamecenter.ShareGhActivity; /** * Created by khy on 2017/1/20. */ -public class FileSendFragment extends Fragment { - - View view; +public class FileSendFragment extends BaseFragment { @Override public void onActivityResult(int requestCode, int resultCode, Intent data) { @@ -37,56 +31,49 @@ public class FileSendFragment extends Fragment { } @Override - public void onCreate(@Nullable Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - + protected int getLayoutId() { + return R.layout.fragment_file_send; } - @Nullable @Override - public View onCreateView(final LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { - if (view == null) { - view = inflater.inflate(R.layout.fragment_file_send, container, false); + protected void initView(View view) { + super.initView(view); + view.findViewById(R.id.file_send_btn).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + Intent intent = new Intent(getActivity(), KcSelectGameActivity.class); + startActivityForResult(intent, 0x170); + } + }); - view.findViewById(R.id.file_send_btn).setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - Intent intent = new Intent(getActivity(), KcSelectGameActivity.class); - startActivityForResult(intent, 0x170); - } - }); + view.findViewById(R.id.file_receiver_btn).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + Intent intent = new Intent(getActivity(), ReceiverWaitingActivity.class); + startActivityForResult(intent, 0x180); + } + }); - view.findViewById(R.id.file_receiver_btn).setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - Intent intent = new Intent(getActivity(), ReceiverWaitingActivity.class); - startActivityForResult(intent, 0x180); - } - }); + TextView shareGh = (TextView) view.findViewById(R.id.share_gh); + shareGh.setText(Html.fromHtml(StringUtils.buildString("", "好友还没安装光环助手？请点这里", ""))); + shareGh.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + Intent intent = new Intent(getActivity(), ShareGhActivity.class); + getActivity().startActivity(intent); + } + }); - TextView shareGh = (TextView) view.findViewById(R.id.share_gh); - shareGh.setText(Html.fromHtml(StringUtils.buildString("", "好友还没安装光环助手？请点这里", ""))); - shareGh.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - Intent intent = new Intent(getActivity(), ShareGhActivity.class); - getActivity().startActivity(intent); - } - }); + TextView cleanApk = (TextView) view.findViewById(R.id.clean_apk_tv); + cleanApk.setText(Html.fromHtml(StringUtils.buildString("手机空间不足？试试 ", "", "安装包清理", ""))); - TextView cleanApk = (TextView) view.findViewById(R.id.clean_apk_tv); - cleanApk.setText(Html.fromHtml(StringUtils.buildString("手机空间不足？试试 ", "", "安装包清理", ""))); - - cleanApk.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - Intent intent = new Intent(getActivity(), CleanApkActivity.class); - getActivity().startActivity(intent); - } - }); - - } - - return view; + cleanApk.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + Intent intent = new Intent(getActivity(), CleanApkActivity.class); + getActivity().startActivity(intent); + } + }); } + } diff --git a/app/src/main/java/com/gh/gamecenter/download/GameDownLoadFragment.java b/app/src/main/java/com/gh/gamecenter/download/GameDownLoadFragment.java index b8f07e4f85..4f41cafc91 100644 --- a/app/src/main/java/com/gh/gamecenter/download/GameDownLoadFragment.java +++ b/app/src/main/java/com/gh/gamecenter/download/GameDownLoadFragment.java @@ -3,15 +3,11 @@ package com.gh.gamecenter.download; import android.app.NotificationManager; import android.content.Context; import android.content.Intent; -import android.os.Bundle; import android.os.Message; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; import android.support.v4.content.ContextCompat; import android.support.v7.widget.DefaultItemAnimator; import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.RecyclerView; -import android.view.LayoutInflater; import android.view.MotionEvent; import android.view.View; import android.view.ViewGroup; @@ -19,6 +15,7 @@ import android.widget.LinearLayout; import android.widget.RelativeLayout; import android.widget.TextView; +import com.gh.base.BaseFragment; import com.gh.common.constant.Constants; import com.gh.common.util.DialogUtils; import com.gh.common.util.NetworkUtils; @@ -47,9 +44,8 @@ import org.greenrobot.eventbus.ThreadMode; * * @author 黄壮华 */ -public class GameDownLoadFragment extends Fragment implements View.OnClickListener { +public class GameDownLoadFragment extends BaseFragment implements View.OnClickListener { - private View view; private RecyclerViewExtended downloadmanager_rv_show; private GameDownloadFragmentAdapter adapter; private LinearLayoutManager layoutManager; @@ -162,10 +158,13 @@ public class GameDownLoadFragment extends Fragment implements View.OnClickListen }; @Override - public void onCreate(@Nullable Bundle savedInstanceState) { - - super.onCreate(savedInstanceState); + protected int getLayoutId() { + return R.layout.downloadmanager; + } + @Override + protected void initView(View view) { + super.initView(view); String path = getActivity().getIntent().getStringExtra("path"); url = getActivity().getIntent().getStringExtra("url"); if (getActivity().getIntent().getBundleExtra("data") != null) { @@ -175,8 +174,6 @@ public class GameDownLoadFragment extends Fragment implements View.OnClickListen isScroll = false; - view = View.inflate(getActivity(), R.layout.downloadmanager, null); - downloadmanager_rl_head = (RelativeLayout) view.findViewById(R.id.downloadmanager_rl_head); downloadmanager_tv_task = (TextView) view.findViewById(R.id.downloadmanager_tv_task); downloadmanager_tv_allstart = (TextView) view.findViewById(R.id.downloadmanager_tv_allstart); @@ -269,18 +266,6 @@ public class GameDownLoadFragment extends Fragment implements View.OnClickListen if (path != null) { adapter.showPluginDialog(path); } - - EventBus.getDefault().register(this); - } - - @Override - @Nullable - public View onCreateView(LayoutInflater inflater, - @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { - if (container != null) { - container.removeView(view); - } - return view; } @Override @@ -319,12 +304,6 @@ public class GameDownLoadFragment extends Fragment implements View.OnClickListen DownloadManager.getInstance(getActivity()).removeObserver(dataWatcher); } - @Override - public void onDestroy() { - super.onDestroy(); - EventBus.getDefault().unregister(this); - } - @Subscribe(threadMode = ThreadMode.MAIN) public void onEventMainThread(EBMiPush mipush) { if ("plugin_install".equals(mipush.getFrom())) { diff --git a/app/src/main/java/com/gh/gamecenter/download/GameDownloadFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/download/GameDownloadFragmentAdapter.java index 7050f977f9..aaba97ba11 100644 --- a/app/src/main/java/com/gh/gamecenter/download/GameDownloadFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/download/GameDownloadFragmentAdapter.java @@ -32,7 +32,7 @@ import com.gh.download.DownloadEntity; import com.gh.download.DownloadManager; import com.gh.download.DownloadStatus; import com.gh.gamecenter.R; -import com.gh.gamecenter.adapter.BaseRecyclerAdapter; +import com.gh.base.BaseRecyclerAdapter; import com.gh.gamecenter.adapter.viewholder.DownloadHeadViewHolder; import com.gh.gamecenter.adapter.viewholder.GameDownloadViewHolder; import com.gh.gamecenter.eventbus.EBDownloadChanged; diff --git a/app/src/main/java/com/gh/gamecenter/download/GameUpdateFragment.java b/app/src/main/java/com/gh/gamecenter/download/GameUpdateFragment.java index b0e74ed4e1..ff40f55e54 100644 --- a/app/src/main/java/com/gh/gamecenter/download/GameUpdateFragment.java +++ b/app/src/main/java/com/gh/gamecenter/download/GameUpdateFragment.java @@ -1,17 +1,13 @@ package com.gh.gamecenter.download; import android.content.Intent; -import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.RecyclerView; -import android.view.LayoutInflater; import android.view.View; -import android.view.ViewGroup; import android.widget.LinearLayout; import android.widget.TextView; +import com.gh.base.BaseFragment; import com.gh.common.util.EntranceUtils; import com.gh.gamecenter.MainActivity; import com.gh.gamecenter.R; @@ -34,18 +30,21 @@ import java.util.ArrayList; * * @author 黄壮华 */ -public class GameUpdateFragment extends Fragment { +public class GameUpdateFragment extends BaseFragment { - private View view; private RecyclerView gameupdate_rv_show; private GameUpdateFragmentAdapter adapter; private LinearLayout gameupdate_ll_loading; private LinearLayout reuse_nodata_skip; @Override - public void onCreate(@Nullable Bundle savedInstanceState) { - super.onCreate(savedInstanceState); + protected int getLayoutId() { + return R.layout.gameupdate; + } + @Override + protected void initView(View view) { + super.initView(view); Intent intent = getActivity().getIntent(); String packageName = intent.getStringExtra("packageName"); boolean isUpdate = intent.getBooleanExtra("isPushIntent", false); @@ -55,8 +54,6 @@ public class GameUpdateFragment extends Fragment { } String entrance = intent.getStringExtra(EntranceUtils.KEY_ENTRANCE); - view = View.inflate(getActivity(), R.layout.gameupdate, null); - gameupdate_ll_loading = (LinearLayout) view.findViewById(R.id.gameupdate_ll_loading); reuse_nodata_skip = (LinearLayout) view.findViewById(R.id.reuse_nodata_skip); @@ -87,23 +84,6 @@ public class GameUpdateFragment extends Fragment { reuse_nodata_skip, packageName, isUpdate, entrance); gameupdate_rv_show.setAdapter(adapter); - EventBus.getDefault().register(this); - } - - @Override - @Nullable - public View onCreateView(LayoutInflater inflater, - @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { - if (container != null) { - container.removeView(view); - } - return view; - } - - @Override - public void onDestroy() { - super.onDestroy(); - EventBus.getDefault().unregister(this); } @Subscribe(threadMode = ThreadMode.MAIN) diff --git a/app/src/main/java/com/gh/gamecenter/download/GameUpdateFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/download/GameUpdateFragmentAdapter.java index f8985955ed..38d18770cf 100644 --- a/app/src/main/java/com/gh/gamecenter/download/GameUpdateFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/download/GameUpdateFragmentAdapter.java @@ -28,7 +28,7 @@ import com.gh.download.DownloadManager; import com.gh.download.DownloadStatus; import com.gh.gamecenter.DownloadManagerActivity; import com.gh.gamecenter.R; -import com.gh.gamecenter.adapter.BaseRecyclerAdapter; +import com.gh.base.BaseRecyclerAdapter; import com.gh.gamecenter.adapter.viewholder.DownloadHeadViewHolder; import com.gh.gamecenter.adapter.viewholder.GameUpdateViewHolder; import com.gh.gamecenter.db.info.ConcernInfo; diff --git a/app/src/main/java/com/gh/gamecenter/game/GameFragment.java b/app/src/main/java/com/gh/gamecenter/fragment/GameFragment.java similarity index 97% rename from app/src/main/java/com/gh/gamecenter/game/GameFragment.java rename to app/src/main/java/com/gh/gamecenter/fragment/GameFragment.java index 227d32bc3c..f72c93f004 100644 --- a/app/src/main/java/com/gh/gamecenter/game/GameFragment.java +++ b/app/src/main/java/com/gh/gamecenter/fragment/GameFragment.java @@ -1,7 +1,5 @@ -package com.gh.gamecenter.game; +package com.gh.gamecenter.fragment; -import android.os.Bundle; -import android.support.annotation.Nullable; import android.support.v4.widget.SwipeRefreshLayout; import android.support.v7.widget.DefaultItemAnimator; import android.support.v7.widget.LinearLayoutManager; @@ -11,7 +9,6 @@ import android.widget.LinearLayout; import com.facebook.drawee.backends.pipeline.Fresco; import com.gc.materialdesign.views.ProgressBarCircularIndeterminate; -import com.gh.base.HomeFragment; import com.gh.common.util.ApkActiveUtils; import com.gh.common.util.DownloadItemUtils; import com.gh.download.DataWatcher; @@ -27,7 +24,8 @@ import com.gh.gamecenter.eventbus.EBNetworkState; import com.gh.gamecenter.eventbus.EBPackage; import com.gh.gamecenter.eventbus.EBReuse; import com.gh.gamecenter.eventbus.EBUISwitch; -import com.gh.gamecenter.listener.OnCallBackListener; +import com.gh.gamecenter.game.GameFragmentAdapter; +import com.gh.listener.OnCallBackListener; import org.greenrobot.eventbus.Subscribe; import org.greenrobot.eventbus.ThreadMode; @@ -86,12 +84,15 @@ public class GameFragment extends HomeFragment implements SwipeRefreshLayout.OnR }; @Override - public void onCreate(@Nullable Bundle savedInstanceState) { - super.onCreate(savedInstanceState); + protected int getLayoutId() { + return R.layout.fragment_game; + } + @Override + protected void initView(final View view) { + super.initView(view); View inflate = View.inflate(getActivity(), R.layout.fragment_game, null); ((LinearLayout) view).addView(inflate); - reuse_no_connection = (LinearLayout) view.findViewById(R.id.reuse_no_connection); fm_game_swipe_refresh = (SwipeRefreshLayout) view.findViewById(R.id.fm_game_swipe_refresh); fm_game_rv_list = (RecyclerView) view.findViewById(R.id.fm_game_rv_list); diff --git a/app/src/main/java/com/gh/base/HomeFragment.java b/app/src/main/java/com/gh/gamecenter/fragment/HomeFragment.java similarity index 87% rename from app/src/main/java/com/gh/base/HomeFragment.java rename to app/src/main/java/com/gh/gamecenter/fragment/HomeFragment.java index 570e080311..5c9404e453 100644 --- a/app/src/main/java/com/gh/base/HomeFragment.java +++ b/app/src/main/java/com/gh/gamecenter/fragment/HomeFragment.java @@ -1,18 +1,17 @@ -package com.gh.base; +package com.gh.gamecenter.fragment; import android.content.Intent; import android.os.Bundle; import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; -import android.view.LayoutInflater; import android.view.View; -import android.view.ViewGroup; import android.view.animation.AlphaAnimation; import android.view.animation.Animation; import android.view.animation.ScaleAnimation; import android.widget.LinearLayout; import android.widget.TextView; +import com.gh.base.BaseFragment; +import com.gh.base.SearchBarHint; import com.gh.common.constant.Config; import com.gh.common.util.DataCollectionUtils; import com.gh.common.util.DataUtils; @@ -27,20 +26,19 @@ import com.gh.gamecenter.eventbus.EBDownloadStatus; import com.gh.gamecenter.eventbus.EBReuse; import com.gh.gamecenter.manager.PackageManager; -import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; import org.greenrobot.eventbus.ThreadMode; import java.util.ArrayList; +import butterknife.BindView; + /** * Created by LGT on 2016/9/9. * 工具栏 搜索控制 */ -public class HomeFragment extends Fragment implements View.OnClickListener, SearchBarHint { - - protected View view; +public abstract class HomeFragment extends BaseFragment implements View.OnClickListener, SearchBarHint { private TextView downloadHint; private TextView searchHint; @@ -50,18 +48,12 @@ public class HomeFragment extends Fragment implements View.OnClickListener, Sear private ArrayList hintList; private int hintIndex; + @BindView(R.id.actionbar_rl_download) + View mActionBarDownloadView; + @Override - public void onCreate(@Nullable Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - - if (savedInstanceState != null) { - hintList = savedInstanceState.getStringArrayList("hint"); - } - - hintIndex = 0; - - view = View.inflate(getActivity(), R.layout.fragment_home, null); - + protected void initView(View view) { + super.initView(view); // SharedPreferences sp = getActivity().getSharedPreferences( // Config.PREFERENCE, Context.MODE_PRIVATE); LinearLayout home_actionbar = (LinearLayout) view.findViewById(R.id.home_actionbar); @@ -75,7 +67,7 @@ public class HomeFragment extends Fragment implements View.OnClickListener, Sear // } home_actionbar.setLayoutParams(lparams); - initActionBar(); + initActionBar(view); final ScaleAnimation scaleAnimation = new ScaleAnimation(0.4f, 1.0f, 0.4f, 1.0f , Animation.RELATIVE_TO_SELF, 0.5f, Animation.RELATIVE_TO_SELF, 0.5f); @@ -141,17 +133,18 @@ public class HomeFragment extends Fragment implements View.OnClickListener, Sear } } - EventBus.getDefault().register(this); } - @Nullable @Override - public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, - @Nullable Bundle savedInstanceState) { - if (container != null) { - container.removeView(view); + public void onCreate(@Nullable Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + + if (savedInstanceState != null) { + hintList = savedInstanceState.getStringArrayList("hint"); } - return view; + + hintIndex = 0; + } @Override @@ -162,22 +155,17 @@ public class HomeFragment extends Fragment implements View.OnClickListener, Sear } } - @Override - public void onDestroy() { - super.onDestroy(); - EventBus.getDefault().unregister(this); - } + private void initActionBar(View view) { + mActionBarDownloadView.setOnClickListener(this); - private void initActionBar() { - view.findViewById(R.id.actionbar_rl_download).setOnClickListener(this); view.findViewById(R.id.actionbar_iv_search).setOnClickListener(this); view.findViewById(R.id.actionbar_notification).setOnClickListener(this); view.findViewById(R.id.actionbar_search_rl).setOnClickListener(this); if (Config.isShow(getActivity())) { - view.findViewById(R.id.actionbar_rl_download).setVisibility(View.VISIBLE); + mActionBarDownloadView.setVisibility(View.VISIBLE); } else { - view.findViewById(R.id.actionbar_rl_download).setVisibility(View.GONE); + mActionBarDownloadView.setVisibility(View.GONE); } downloadHint = (TextView) view.findViewById(R.id.action_tip); @@ -238,9 +226,9 @@ public class HomeFragment extends Fragment implements View.OnClickListener, Sear public void onEventMainThread(EBReuse reuse) { if ("Refresh".equals(reuse.getType())) { if (Config.isShow(getActivity())) { - view.findViewById(R.id.actionbar_rl_download).setVisibility(View.VISIBLE); + mActionBarDownloadView.setVisibility(View.VISIBLE); } else { - view.findViewById(R.id.actionbar_rl_download).setVisibility(View.GONE); + mActionBarDownloadView.setVisibility(View.GONE); } } } diff --git a/app/src/main/java/com/gh/gamecenter/fragment/MainFragment.java b/app/src/main/java/com/gh/gamecenter/fragment/MainFragment.java index e17e395370..ba241ecb20 100644 --- a/app/src/main/java/com/gh/gamecenter/fragment/MainFragment.java +++ b/app/src/main/java/com/gh/gamecenter/fragment/MainFragment.java @@ -1,10 +1,10 @@ -package com.gh.gamecenter.fragment; - -/** - * @author CsHeng - * @Date 05/05/2017 - * @Time 3:26 PM - */ - -public class MainFragment { -} +//package com.gh.gamecenter.fragment; +// +///** +// * @author CsHeng +// * @Date 05/05/2017 +// * @Time 3:26 PM +// */ +// +//public class MainFragment { +//} diff --git a/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.java index 76c272e4e4..8872be504f 100644 --- a/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.java @@ -46,7 +46,7 @@ import com.gh.gamecenter.PluginActivity; import com.gh.gamecenter.R; import com.gh.gamecenter.SubjectActivity; import com.gh.gamecenter.ToolBoxActivity; -import com.gh.gamecenter.adapter.BaseRecyclerAdapter; +import com.gh.base.BaseRecyclerAdapter; import com.gh.gamecenter.adapter.ImagePagerAdapter; import com.gh.gamecenter.adapter.viewholder.FooterViewHolder; import com.gh.gamecenter.adapter.viewholder.GameHeadViewHolder; @@ -61,7 +61,8 @@ import com.gh.gamecenter.entity.GameUpdateEntity; import com.gh.gamecenter.entity.SlideEntity; import com.gh.gamecenter.entity.SubjectDigestEntity; import com.gh.gamecenter.entity.SubjectEntity; -import com.gh.gamecenter.listener.OnCallBackListener; +import com.gh.gamecenter.fragment.GameFragment; +import com.gh.listener.OnCallBackListener; import com.gh.gamecenter.manager.GameManager; import com.gh.gamecenter.manager.PackageManager; import com.gh.gamecenter.retrofit.Response; @@ -109,7 +110,7 @@ public class GameFragmentAdapter extends BaseRecyclerAdapter { private boolean mIsAutoScroll; private int mTopHeight; - GameFragmentAdapter(GameFragment gameFragment, SwipeRefreshLayout refreshLayout) { + public GameFragmentAdapter(GameFragment gameFragment, SwipeRefreshLayout refreshLayout) { super(gameFragment.getContext()); mGameFragment = gameFragment; @@ -148,7 +149,7 @@ public class GameFragmentAdapter extends BaseRecyclerAdapter { return mLocationMap; } - GameEntity getGameEntityByLocation(int location) { + public GameEntity getGameEntityByLocation(int location) { if (!mPluginList.isEmpty() && location > 1 && location <= 1 + mPluginList.size()) { return mPluginList.get(location - 2); @@ -169,7 +170,7 @@ public class GameFragmentAdapter extends BaseRecyclerAdapter { return null; } - void initSubjectDigest(final boolean isLoadMore) { + public void initSubjectDigest(final boolean isLoadMore) { RetrofitManager.getApi() .getSubjectDigest() .subscribeOn(Schedulers.io()) @@ -313,7 +314,7 @@ public class GameFragmentAdapter extends BaseRecyclerAdapter { }); } - void initPlugin() { + public void initPlugin() { if (mIsInitPlugin) { return; } @@ -441,7 +442,7 @@ public class GameFragmentAdapter extends BaseRecyclerAdapter { } } - void initItemCount() { + public void initItemCount() { int pluginSize = 0; if (!mPluginList.isEmpty()) { pluginSize += 1 + mPluginList.size(); @@ -1080,21 +1081,21 @@ public class GameFragmentAdapter extends BaseRecyclerAdapter { }); } - void startAutoScroll() { + public void startAutoScroll() { mIsAutoScroll = true; notifyItemChanged(0); } - void stopAutoScroll() { + public void stopAutoScroll() { mIsAutoScroll = false; notifyItemChanged(0); } - List getPluginList() { + public List getPluginList() { return mPluginList; } - List getSubjectList() { + public List getSubjectList() { return mSubjectList; } @@ -1106,7 +1107,7 @@ public class GameFragmentAdapter extends BaseRecyclerAdapter { mIsNetworkError = networkError; } - boolean isInitPlugin() { + public boolean isInitPlugin() { return mIsInitPlugin; } } diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/FuLiAdapter.java b/app/src/main/java/com/gh/gamecenter/gamedetail/FuLiAdapter.java index 5f4e131cda..4c114713a8 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/FuLiAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/FuLiAdapter.java @@ -32,7 +32,7 @@ import com.gh.gamecenter.GameNewsActivity; import com.gh.gamecenter.NewsDetailActivity; import com.gh.gamecenter.R; import com.gh.gamecenter.SuggestionActivity; -import com.gh.gamecenter.adapter.BaseRecyclerAdapter; +import com.gh.base.BaseRecyclerAdapter; import com.gh.gamecenter.adapter.viewholder.ReuseViewHolder; import com.gh.gamecenter.db.LibaoDao; import com.gh.gamecenter.entity.GameDetailEntity; @@ -42,6 +42,12 @@ import com.gh.gamecenter.entity.LibaoStatusEntity; import com.gh.gamecenter.entity.NewsEntity; import com.gh.gamecenter.entity.ToolBoxEntity; import com.gh.gamecenter.eventbus.EBReuse; +import com.gh.gamecenter.adapter.viewholder.GameDetaiLibaoViewHolder; +import com.gh.gamecenter.adapter.viewholder.GameDetailFuLiViewHolder; +import com.gh.gamecenter.adapter.viewholder.GameDetailKaiFuViewHolder; +import com.gh.gamecenter.adapter.viewholder.GameDetailNewsViewHolder; +import com.gh.gamecenter.adapter.viewholder.GameDetailNoticeViewHolder; +import com.gh.gamecenter.adapter.viewholder.GameDetailPluginViewHolder; import com.gh.gamecenter.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/FuliFragment.java b/app/src/main/java/com/gh/gamecenter/gamedetail/FuliFragment.java index 257b975fc8..e40be171e5 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/FuliFragment.java +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/FuliFragment.java @@ -3,6 +3,7 @@ package com.gh.gamecenter.gamedetail; import android.os.Bundle; import android.support.annotation.Nullable; import android.support.v7.widget.RecyclerView; +import android.view.View; import com.gh.base.BaseFragment; import com.gh.common.view.MeasureLinearLayoutManager; @@ -29,12 +30,13 @@ public class FuliFragment extends BaseFragment { private boolean isCanScroll; @Override - public void onCreate(@Nullable Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - init(R.layout.fragment_fuli); - - isCanScroll = true; + protected int getLayoutId() { + return R.layout.fragment_fuli; + } + @Override + protected void initView(View view) { + super.initView(view); mRecyclerView = (RecyclerView) view.findViewById(R.id.fm_fuli_rv); mAdapter = new FuLiAdapter(getContext(), mEntrance); @@ -61,6 +63,14 @@ public class FuliFragment extends BaseFragment { }); } + @Override + public void onCreate(@Nullable Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + + isCanScroll = true; + + } + public int getHeight() { return layoutManager.getRvHeight(); } diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailGameTagAdapter.java b/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailGameTagAdapter.java index d1b1dfc202..fe04497e72 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailGameTagAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailGameTagAdapter.java @@ -2,32 +2,30 @@ package com.gh.gamecenter.gamedetail; import android.content.Context; import android.graphics.Color; -import android.support.v7.widget.RecyclerView; -import android.view.View; import android.view.ViewGroup; import android.widget.TextView; import com.gh.common.util.DisplayUtils; import com.gh.gamecenter.R; -import com.gh.gamecenter.adapter.BaseRecyclerAdapter; -import com.gh.gamecenter.gamedetail.GameDetailGameTagAdapter.TypeViewHolder; +import com.gh.base.BaseRecyclerAdapter; +import com.gh.gamecenter.adapter.viewholder.GameDetailGameTagTypeViewHolder; import java.util.List; /** * Created by khy on 2017/3/28. */ -public class GameDetailGameTagAdapter extends BaseRecyclerAdapter { +public class GameDetailGameTagAdapter extends BaseRecyclerAdapter { private List mGameType; public GameDetailGameTagAdapter(Context context, List gameType) { super(context); - this.mGameType = gameType; + mGameType = gameType; } @Override - public TypeViewHolder onCreateViewHolder(ViewGroup parent, int viewType) { + public GameDetailGameTagTypeViewHolder onCreateViewHolder(ViewGroup parent, int viewType) { TextView textView = new TextView(mContext); textView.setTextColor(Color.WHITE); @@ -35,11 +33,11 @@ public class GameDetailGameTagAdapter extends BaseRecyclerAdapter { skipPosition = position; } - public interface OnSearchCallBackListener { - void search(boolean isSearch, String searchKey); - } } diff --git a/app/src/main/java/com/gh/gamecenter/libao/Libao2Fragment.java b/app/src/main/java/com/gh/gamecenter/libao/Libao2Fragment.java index ecf4b1da37..232b53ee31 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/Libao2Fragment.java +++ b/app/src/main/java/com/gh/gamecenter/libao/Libao2Fragment.java @@ -53,11 +53,13 @@ public class Libao2Fragment extends BaseFragment implements SwipeRefreshLayout.O private boolean isConcernChanged; @Override - public void onCreate(@Nullable Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - init(R.layout.fragment_libao2); + protected int getLayoutId() { + return R.layout.fragment_libao2; + } - isConcernChanged = false; + @Override + protected void initView(View view) { + super.initView(view); mRefreshLayout.setColorSchemeResources(R.color.theme); mRefreshLayout.setOnRefreshListener(this); @@ -82,6 +84,14 @@ public class Libao2Fragment extends BaseFragment implements SwipeRefreshLayout.O }); } + @Override + public void onCreate(@Nullable Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + + isConcernChanged = false; + + } + @Override public void loadDone() { // 数据加载成功回调 mRefreshLayout.setRefreshing(false); @@ -122,7 +132,7 @@ public class Libao2Fragment extends BaseFragment implements SwipeRefreshLayout.O @Override public void onRefresh() { - view.postDelayed(runnable, 1000); + postDelayedRunnable(runnable, 1000); } @OnClick(R.id.reuse_no_connection) @@ -131,7 +141,7 @@ public class Libao2Fragment extends BaseFragment implements SwipeRefreshLayout.O mRecyclerView.setVisibility(View.VISIBLE); mLoadingLayout.setVisibility(View.VISIBLE); mNoConnectionLayout.setVisibility(View.GONE); - view.postDelayed(runnable, 1000); + postDelayedRunnable(runnable, 1000); } // 资讯Fragment界面切换事件 diff --git a/app/src/main/java/com/gh/gamecenter/libao/Libao2FragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/libao/Libao2FragmentAdapter.java index 263dc97383..225d41959c 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/Libao2FragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/libao/Libao2FragmentAdapter.java @@ -22,14 +22,14 @@ import com.gh.common.util.PlatformUtils; import com.gh.gamecenter.ConcernActivity; import com.gh.gamecenter.LibaoDetailActivity; import com.gh.gamecenter.R; -import com.gh.gamecenter.adapter.BaseRecyclerAdapter; +import com.gh.base.BaseRecyclerAdapter; import com.gh.gamecenter.adapter.viewholder.FooterViewHolder; import com.gh.gamecenter.adapter.viewholder.LibaoNormalViewHolder; import com.gh.gamecenter.db.LibaoDao; import com.gh.gamecenter.db.info.ConcernInfo; import com.gh.gamecenter.entity.LibaoEntity; import com.gh.gamecenter.entity.LibaoStatusEntity; -import com.gh.gamecenter.listener.OnCallBackListener; +import com.gh.listener.OnCallBackListener; import com.gh.gamecenter.manager.ConcernManager; import com.gh.gamecenter.newsdetail.NewsDetailCommentViewHolder; import com.gh.gamecenter.retrofit.ObservableUtil; diff --git a/app/src/main/java/com/gh/gamecenter/libao/Libao3Fragment.java b/app/src/main/java/com/gh/gamecenter/libao/Libao3Fragment.java index 8645947490..7d964c17ef 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/Libao3Fragment.java +++ b/app/src/main/java/com/gh/gamecenter/libao/Libao3Fragment.java @@ -45,10 +45,14 @@ public class Libao3Fragment extends BaseFragment implements SwipeRefreshLayout.O } }; + @Override + protected int getLayoutId() { + return R.layout.fragment_libao3; + } + @Override public void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); - init(R.layout.fragment_libao3); mRefreshLayout.setColorSchemeResources(R.color.theme); mRefreshLayout.setOnRefreshListener(this); @@ -79,7 +83,7 @@ public class Libao3Fragment extends BaseFragment implements SwipeRefreshLayout.O @Override public void onRefresh() { - view.postDelayed(runnable, 1000); + postDelayedRunnable(runnable, 1000); } // 礼包数据库数量改变事件 diff --git a/app/src/main/java/com/gh/gamecenter/libao/Libao3FragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/libao/Libao3FragmentAdapter.java index f4256a7c9f..9279610377 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/Libao3FragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/libao/Libao3FragmentAdapter.java @@ -17,12 +17,12 @@ import com.gh.common.util.StringUtils; import com.gh.common.util.Utils; import com.gh.gamecenter.LibaoDetailActivity; import com.gh.gamecenter.R; -import com.gh.gamecenter.adapter.BaseRecyclerAdapter; +import com.gh.base.BaseRecyclerAdapter; import com.gh.gamecenter.adapter.viewholder.LibaoNormalViewHolder; import com.gh.gamecenter.db.LibaoDao; import com.gh.gamecenter.db.info.LibaoInfo; import com.gh.gamecenter.entity.LibaoEntity; -import com.gh.gamecenter.listener.OnCallBackListener; +import com.gh.listener.OnCallBackListener; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/gh/gamecenter/libao/LibaoHistoryAdapter.java b/app/src/main/java/com/gh/gamecenter/libao/LibaoHistoryAdapter.java index 08ba09740a..4c6dd1250e 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/LibaoHistoryAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/libao/LibaoHistoryAdapter.java @@ -13,13 +13,13 @@ import com.gh.common.constant.ItemViewType; import com.gh.common.util.DisplayUtils; import com.gh.common.util.LibaoUtils; import com.gh.gamecenter.R; -import com.gh.gamecenter.adapter.BaseRecyclerAdapter; +import com.gh.base.BaseRecyclerAdapter; import com.gh.gamecenter.adapter.viewholder.FooterViewHolder; import com.gh.gamecenter.adapter.viewholder.LibaoNormalViewHolder; import com.gh.gamecenter.db.LibaoDao; import com.gh.gamecenter.db.info.LibaoInfo; import com.gh.gamecenter.entity.LibaoEntity; -import com.gh.gamecenter.listener.OnCallBackListener; +import com.gh.listener.OnCallBackListener; import com.gh.gamecenter.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; diff --git a/app/src/main/java/com/gh/gamecenter/libao/OnSearchCallBackListener.java b/app/src/main/java/com/gh/gamecenter/libao/OnSearchCallBackListener.java new file mode 100644 index 0000000000..f426934196 --- /dev/null +++ b/app/src/main/java/com/gh/gamecenter/libao/OnSearchCallBackListener.java @@ -0,0 +1,5 @@ +package com.gh.gamecenter.libao; + +public interface OnSearchCallBackListener { + void search(boolean isSearch, String searchKey); +} \ No newline at end of file diff --git a/app/src/main/java/com/gh/gamecenter/message/CommentFragment.java b/app/src/main/java/com/gh/gamecenter/message/CommentFragment.java index 6ca556cd41..eeb1191701 100644 --- a/app/src/main/java/com/gh/gamecenter/message/CommentFragment.java +++ b/app/src/main/java/com/gh/gamecenter/message/CommentFragment.java @@ -56,10 +56,14 @@ public class CommentFragment extends BaseFragment implements SwipeRefreshLayout. } }; + @Override + protected int getLayoutId() { + return R.layout.fragment_normal_message; + } + @Override public void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); - init(R.layout.fragment_normal_message); mNoneDataTv.setText("暂无评论消息"); @@ -126,7 +130,7 @@ public class CommentFragment extends BaseFragment implements SwipeRefreshLayout. mRecyclerview.setVisibility(View.VISIBLE); mLoadingPb.setVisibility(View.VISIBLE); mNoConnection.setVisibility(View.GONE); - view.postDelayed(runnable, 1000); + postDelayedRunnable(runnable, 1000); } // Fragment界面切换事件 @@ -141,6 +145,6 @@ public class CommentFragment extends BaseFragment implements SwipeRefreshLayout. @Override public void onRefresh() { - view.postDelayed(runnable, 1000); + postDelayedRunnable(runnable, 1000); } } diff --git a/app/src/main/java/com/gh/gamecenter/message/CommentFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/message/CommentFragmentAdapter.java index 6054df4286..d9639e3154 100644 --- a/app/src/main/java/com/gh/gamecenter/message/CommentFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/message/CommentFragmentAdapter.java @@ -12,12 +12,12 @@ import com.gh.common.util.TokenUtils; import com.gh.gamecenter.CommentDetailActivity; import com.gh.gamecenter.MessageDetailActivity; import com.gh.gamecenter.R; -import com.gh.gamecenter.adapter.BaseRecyclerAdapter; +import com.gh.base.BaseRecyclerAdapter; import com.gh.gamecenter.adapter.viewholder.FooterViewHolder; import com.gh.gamecenter.entity.MessageCommentEntity; import com.gh.gamecenter.entity.UserEntity; import com.gh.gamecenter.eventbus.EBUISwitch; -import com.gh.gamecenter.listener.OnCallBackListener; +import com.gh.listener.OnCallBackListener; import com.gh.gamecenter.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; @@ -92,7 +92,7 @@ public class CommentFragmentAdapter extends BaseRecyclerAdapter { } mCommentList.addAll(response); - if (!fragment.isHidden() && !fragment.isEverpause()) { + if (!fragment.isHidden() && !fragment.isEverPause()) { notifyItemRangeInserted(mCommentList.size() - response.size(), response.size()); } else { notifyDataSetChanged(); diff --git a/app/src/main/java/com/gh/gamecenter/message/CommentNormalViewHolder.java b/app/src/main/java/com/gh/gamecenter/message/CommentNormalViewHolder.java index eecd84f4b6..de8601ae74 100644 --- a/app/src/main/java/com/gh/gamecenter/message/CommentNormalViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/message/CommentNormalViewHolder.java @@ -1,20 +1,19 @@ package com.gh.gamecenter.message; -import android.support.v7.widget.RecyclerView; import android.view.View; import android.widget.TextView; import com.facebook.drawee.view.SimpleDraweeView; +import com.gh.base.BaseRecyclerViewHolder; import com.gh.gamecenter.R; import butterknife.BindView; -import butterknife.ButterKnife; /** * Created by khy on 2017/4/6. * 消息-评论实体 */ -public class CommentNormalViewHolder extends RecyclerView.ViewHolder { +public class CommentNormalViewHolder extends BaseRecyclerViewHolder { @BindView(R.id.message_comment_user_icon) public SimpleDraweeView userIcon; @@ -31,6 +30,5 @@ public class CommentNormalViewHolder extends RecyclerView.ViewHolder { public CommentNormalViewHolder(View itemView) { super(itemView); - ButterKnife.bind(this, itemView); } } diff --git a/app/src/main/java/com/gh/gamecenter/message/CommentVoteViewHolder.java b/app/src/main/java/com/gh/gamecenter/message/CommentVoteViewHolder.java index af0a03c2c6..c65a94fee6 100644 --- a/app/src/main/java/com/gh/gamecenter/message/CommentVoteViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/message/CommentVoteViewHolder.java @@ -1,20 +1,19 @@ package com.gh.gamecenter.message; -import android.support.v7.widget.RecyclerView; import android.view.View; import android.widget.TextView; import com.facebook.drawee.view.SimpleDraweeView; +import com.gh.base.BaseRecyclerViewHolder; import com.gh.gamecenter.R; import butterknife.BindView; -import butterknife.ButterKnife; /** * Created by khy on 2017/4/6. * 消息-评论实体 */ -public class CommentVoteViewHolder extends RecyclerView.ViewHolder { +public class CommentVoteViewHolder extends BaseRecyclerViewHolder { @BindView(R.id.message_comment_user_icon) public SimpleDraweeView userIcon; @@ -27,6 +26,5 @@ public class CommentVoteViewHolder extends RecyclerView.ViewHolder { public CommentVoteViewHolder(View itemView) { super(itemView); - ButterKnife.bind(this, itemView); } } diff --git a/app/src/main/java/com/gh/gamecenter/message/KeFuFragment.java b/app/src/main/java/com/gh/gamecenter/message/KeFuFragment.java index d4636eea03..c83fbfdfc2 100644 --- a/app/src/main/java/com/gh/gamecenter/message/KeFuFragment.java +++ b/app/src/main/java/com/gh/gamecenter/message/KeFuFragment.java @@ -53,10 +53,14 @@ public class KeFuFragment extends BaseFragment implements SwipeRefreshLayout.OnR } }; + @Override + protected int getLayoutId() { + return R.layout.fragment_normal_message; + } + @Override public void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); - init(R.layout.fragment_normal_message); mNoneDataTv.setText("暂无客服消息"); @@ -115,7 +119,7 @@ public class KeFuFragment extends BaseFragment implements SwipeRefreshLayout.OnR mRecyclerview.setVisibility(View.VISIBLE); mLoadingPb.setVisibility(View.VISIBLE); mNoConnection.setVisibility(View.GONE); - view.postDelayed(runnable, 1000); + postDelayedRunnable(runnable, 1000); } // Fragment界面切换事件 @@ -130,6 +134,6 @@ public class KeFuFragment extends BaseFragment implements SwipeRefreshLayout.OnR @Override public void onRefresh() { - view.postDelayed(runnable, 1000); + postDelayedRunnable(runnable, 1000); } } diff --git a/app/src/main/java/com/gh/gamecenter/message/KeFuFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/message/KeFuFragmentAdapter.java index 3d6814b031..4ef7ffc1b4 100644 --- a/app/src/main/java/com/gh/gamecenter/message/KeFuFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/message/KeFuFragmentAdapter.java @@ -5,7 +5,6 @@ import android.support.v7.widget.RecyclerView; import android.support.v7.widget.RecyclerView.ViewHolder; import android.text.Html; import android.text.TextUtils; -import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -19,7 +18,7 @@ import com.gh.gamecenter.NewsDetailActivity; import com.gh.gamecenter.R; import com.gh.gamecenter.SubjectActivity; import com.gh.gamecenter.WebActivity; -import com.gh.gamecenter.adapter.BaseRecyclerAdapter; +import com.gh.base.BaseRecyclerAdapter; import com.gh.gamecenter.adapter.viewholder.FooterViewHolder; import com.gh.gamecenter.db.KeFuMarkReadDao; import com.gh.gamecenter.db.MessageMarkReadDao; @@ -27,7 +26,7 @@ import com.gh.gamecenter.db.info.KeFuMarkReadInfo; import com.gh.gamecenter.db.info.MessageMarkReadInfo; import com.gh.gamecenter.entity.MessageKeFuEntity; import com.gh.gamecenter.eventbus.EBUISwitch; -import com.gh.gamecenter.listener.OnCallBackListener; +import com.gh.listener.OnCallBackListener; import com.gh.gamecenter.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; import com.google.gson.Gson; @@ -118,10 +117,10 @@ public class KeFuFragmentAdapter extends BaseRecyclerAdapter { } mKeFuList.addAll(response); -// if (!fragment.isHidden() && !fragment.isEverpause()) { +// if (!fragment.isHidden() && !fragment.isEverPause()) { // notifyItemRangeInserted(mKeFuList.size() - response.size(), response.size()); // } else { - notifyDataSetChanged(); + notifyDataSetChanged(); // } if (mReceiveIds.size() > 0) { @@ -193,16 +192,22 @@ public class KeFuFragmentAdapter extends BaseRecyclerAdapter { @Override public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) { if (viewType == 0) { - View view = LayoutInflater.from(mContext).inflate(R.layout.refresh_footerview, parent, false); + View view = mLayoutInflater.inflate(R.layout.refresh_footerview, parent, false); return new FooterViewHolder(view); } else { - View view = LayoutInflater.from(mContext).inflate(R.layout.message_kefu_item, parent, false); + View view = mLayoutInflater.inflate(R.layout.message_kefu_item, parent, false); return new KeFuViewHolder(view); } } @Override public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) { +// switch (getItemViewType(position)) { +// case 0: +// break; +// case 1: +// break; +// } if (holder instanceof KeFuViewHolder) { MessageKeFuEntity keFuEntity = mKeFuList.get(position); KeFuViewHolder viewHolder = (KeFuViewHolder) holder; diff --git a/app/src/main/java/com/gh/gamecenter/message/KeFuViewHolder.java b/app/src/main/java/com/gh/gamecenter/message/KeFuViewHolder.java index 288080a4cf..0e0b6c6115 100644 --- a/app/src/main/java/com/gh/gamecenter/message/KeFuViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/message/KeFuViewHolder.java @@ -1,18 +1,17 @@ package com.gh.gamecenter.message; -import android.support.v7.widget.RecyclerView; import android.view.View; import android.widget.TextView; +import com.gh.base.BaseRecyclerViewHolder; import com.gh.gamecenter.R; import butterknife.BindView; -import butterknife.ButterKnife; /** * Created by khy on 2017/4/10. */ -public class KeFuViewHolder extends RecyclerView.ViewHolder { +public class KeFuViewHolder extends BaseRecyclerViewHolder { @BindView(R.id.message_kefu_time) public TextView time; @@ -27,6 +26,6 @@ public class KeFuViewHolder extends RecyclerView.ViewHolder { public KeFuViewHolder(View itemView) { super(itemView); - ButterKnife.bind(this, itemView); } + } diff --git a/app/src/main/java/com/gh/gamecenter/message/MessageFragment.java b/app/src/main/java/com/gh/gamecenter/message/MessageFragment.java index 9347d72a82..53f0235ae5 100644 --- a/app/src/main/java/com/gh/gamecenter/message/MessageFragment.java +++ b/app/src/main/java/com/gh/gamecenter/message/MessageFragment.java @@ -1,8 +1,6 @@ package com.gh.gamecenter.message; import android.content.Context; -import android.os.Bundle; -import android.support.annotation.Nullable; import android.support.v4.app.Fragment; import android.support.v4.app.FragmentTransaction; import android.support.v4.view.ViewPager; @@ -70,10 +68,13 @@ public class MessageFragment extends BaseFragment implements ViewPager.OnPageCha private int mKeFuUnreadCount; @Override - public void onCreate(@Nullable Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - init(R.layout.fragment_message); + protected int getLayoutId() { + return R.layout.fragment_message; + } + @Override + protected void initView(View view) { + super.initView(view); LinearLayout title = (LinearLayout) view.findViewById(R.id.actionbar_title_ll); LinearLayout.LayoutParams tparams = new LinearLayout.LayoutParams( LinearLayout.LayoutParams.MATCH_PARENT, DisplayUtils.dip2px(getActivity(), 55)); diff --git a/app/src/main/java/com/gh/gamecenter/message/NoticeFragment.java b/app/src/main/java/com/gh/gamecenter/message/NoticeFragment.java index fc9b623216..dc633ea79a 100644 --- a/app/src/main/java/com/gh/gamecenter/message/NoticeFragment.java +++ b/app/src/main/java/com/gh/gamecenter/message/NoticeFragment.java @@ -53,10 +53,14 @@ public class NoticeFragment extends BaseFragment implements SwipeRefreshLayout.O } }; + @Override + protected int getLayoutId() { + return R.layout.fragment_normal_message; + } + @Override public void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); - init(R.layout.fragment_normal_message); mNoneDataTv.setText("暂无公告消息"); @@ -113,7 +117,7 @@ public class NoticeFragment extends BaseFragment implements SwipeRefreshLayout.O mRecyclerview.setVisibility(View.VISIBLE); mLoadingPb.setVisibility(View.VISIBLE); mNoConnection.setVisibility(View.GONE); - view.postDelayed(runnable, 1000); + postDelayedRunnable(runnable, 1000); } // Fragment界面切换事件 @@ -128,6 +132,6 @@ public class NoticeFragment extends BaseFragment implements SwipeRefreshLayout.O @Override public void onRefresh() { - view.postDelayed(runnable, 1000); + postDelayedRunnable(runnable, 1000); } } diff --git a/app/src/main/java/com/gh/gamecenter/message/NoticeFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/message/NoticeFragmentAdapter.java index 3583ff992a..dc3d7bd159 100644 --- a/app/src/main/java/com/gh/gamecenter/message/NoticeFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/message/NoticeFragmentAdapter.java @@ -18,7 +18,7 @@ import com.gh.gamecenter.NewsDetailActivity; import com.gh.gamecenter.R; import com.gh.gamecenter.SubjectActivity; import com.gh.gamecenter.WebActivity; -import com.gh.gamecenter.adapter.BaseRecyclerAdapter; +import com.gh.base.BaseRecyclerAdapter; import com.gh.gamecenter.adapter.viewholder.FooterViewHolder; import com.gh.gamecenter.db.MessageMarkReadDao; import com.gh.gamecenter.db.NoticeMarkReadDao; @@ -26,7 +26,7 @@ import com.gh.gamecenter.db.info.MessageMarkReadInfo; import com.gh.gamecenter.db.info.NoticeMarkReadInfo; import com.gh.gamecenter.entity.MessageNoticeEntity; import com.gh.gamecenter.eventbus.EBUISwitch; -import com.gh.gamecenter.listener.OnCallBackListener; +import com.gh.listener.OnCallBackListener; import com.gh.gamecenter.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; import com.google.gson.Gson; @@ -118,7 +118,7 @@ public class NoticeFragmentAdapter extends BaseRecyclerAdapter { } mNoticeList.addAll(response); - if (!fragment.isHidden() && !fragment.isEverpause()) { + if (!fragment.isHidden() && !fragment.isEverPause()) { notifyItemRangeInserted(mNoticeList.size() - response.size(), response.size()); } else { notifyDataSetChanged(); diff --git a/app/src/main/java/com/gh/gamecenter/message/WenDaViewHolder.java b/app/src/main/java/com/gh/gamecenter/message/WenDaViewHolder.java index 06b710a335..4c370dbcf5 100644 --- a/app/src/main/java/com/gh/gamecenter/message/WenDaViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/message/WenDaViewHolder.java @@ -1,39 +1,37 @@ -package com.gh.gamecenter.message; - -import android.support.v7.widget.RecyclerView; -import android.view.View; -import android.widget.TextView; - -import com.facebook.drawee.view.SimpleDraweeView; -import com.gh.gamecenter.R; - -import butterknife.BindView; -import butterknife.ButterKnife; - -/** - * Created by khy on 2017/4/5. - */ -public class WenDaViewHolder extends RecyclerView.ViewHolder { - - @BindView(R.id.wenda_user_icon) - public SimpleDraweeView userIcon; - @BindView(R.id.wenda_user_name) - public TextView userName; - @BindView(R.id.wenda_request_control) - public TextView requestControl; - @BindView(R.id.wenda_comment_answer) - public TextView commentAnswer; - @BindView(R.id.wenda_game_icon) - public SimpleDraweeView gameIcon; - @BindView(R.id.wenda_content) - public TextView wendaContent; - @BindView(R.id.wenda_comment) - public TextView wendaComment; - @BindView(R.id.wenda_time) - public TextView wendaTime; - - public WenDaViewHolder(View itemView) { - super(itemView); - ButterKnife.bind(this, itemView); - } -} +//package com.gh.gamecenter.message; +// +//import android.view.View; +//import android.widget.TextView; +// +//import com.facebook.drawee.view.SimpleDraweeView; +//import com.gh.base.BaseRecyclerViewHolder; +//import com.gh.gamecenter.R; +// +//import butterknife.BindView; +// +///** +// * Created by khy on 2017/4/5. +// */ +//public class WenDaViewHolder extends BaseRecyclerViewHolder { +// +// @BindView(R.id.wenda_user_icon) +// public SimpleDraweeView userIcon; +// @BindView(R.id.wenda_user_name) +// public TextView userName; +// @BindView(R.id.wenda_request_control) +// public TextView requestControl; +// @BindView(R.id.wenda_comment_answer) +// public TextView commentAnswer; +// @BindView(R.id.wenda_game_icon) +// public SimpleDraweeView gameIcon; +// @BindView(R.id.wenda_content) +// public TextView wendaContent; +// @BindView(R.id.wenda_comment) +// public TextView wendaComment; +// @BindView(R.id.wenda_time) +// public TextView wendaTime; +// +// public WenDaViewHolder(View itemView) { +// super(itemView); +// } +//} diff --git a/app/src/main/java/com/gh/gamecenter/news/News1Fragment.java b/app/src/main/java/com/gh/gamecenter/news/News1Fragment.java index 1c6777c633..c11d07cec7 100644 --- a/app/src/main/java/com/gh/gamecenter/news/News1Fragment.java +++ b/app/src/main/java/com/gh/gamecenter/news/News1Fragment.java @@ -48,12 +48,15 @@ public class News1Fragment extends BaseFragment implements SwipeRefreshLayout.On } }; + @Override + protected int getLayoutId() { + return R.layout.fragment_news1; + } + @Override public void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); - init(R.layout.fragment_news1); - refreshLayout.setColorSchemeResources(R.color.theme); refreshLayout.setOnRefreshListener(this); diff --git a/app/src/main/java/com/gh/gamecenter/news/News1FragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/news/News1FragmentAdapter.java index 0214e6f544..e858856ce4 100644 --- a/app/src/main/java/com/gh/gamecenter/news/News1FragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/news/News1FragmentAdapter.java @@ -17,14 +17,14 @@ import com.gh.common.util.ImageUtils; import com.gh.common.util.NewsUtils; import com.gh.gamecenter.NewsDetailActivity; import com.gh.gamecenter.R; -import com.gh.gamecenter.adapter.BaseRecyclerAdapter; +import com.gh.base.BaseRecyclerAdapter; import com.gh.gamecenter.adapter.viewholder.FooterViewHolder; import com.gh.gamecenter.adapter.viewholder.NewsImage1ViewHolder; import com.gh.gamecenter.adapter.viewholder.NewsImage2ViewHolder; import com.gh.gamecenter.adapter.viewholder.NewsImage3ViewHolder; import com.gh.gamecenter.entity.NewsEntity; import com.gh.gamecenter.entity.ViewsEntity; -import com.gh.gamecenter.listener.OnCallBackListener; +import com.gh.listener.OnCallBackListener; import com.gh.gamecenter.manager.VisitManager; import com.gh.gamecenter.retrofit.JSONObjectResponse; import com.gh.gamecenter.retrofit.ObservableUtil; @@ -307,7 +307,7 @@ public class News1FragmentAdapter extends BaseRecyclerAdapter { if (response.size() != 0) { newsList.addAll(response); itemCount += response.size(); - if (!fragment.isHidden() && !fragment.isEverpause()) { + if (!fragment.isHidden() && !fragment.isEverPause()) { notifyItemRangeInserted(newsList.size() - response.size(), response.size()); } else { notifyDataSetChanged(); diff --git a/app/src/main/java/com/gh/gamecenter/news/News2Fragment.java b/app/src/main/java/com/gh/gamecenter/news/News2Fragment.java index e3be902b01..c86766ab03 100644 --- a/app/src/main/java/com/gh/gamecenter/news/News2Fragment.java +++ b/app/src/main/java/com/gh/gamecenter/news/News2Fragment.java @@ -89,12 +89,15 @@ public class News2Fragment extends BaseFragment implements SwipeRefreshLayout.On private Map concernMap; // 记录选择关注 private ConcernManager concernManager; + @Override + protected int getLayoutId() { + return R.layout.fragment_news2; + } + @Override public void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); - init(R.layout.fragment_news2); - recommendGameList = new ArrayList<>(); installGameList = new ArrayList<>(); concernManager = new ConcernManager(getActivity()); diff --git a/app/src/main/java/com/gh/gamecenter/news/News2FragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/news/News2FragmentAdapter.java index 3df1840f90..cafb51daf4 100644 --- a/app/src/main/java/com/gh/gamecenter/news/News2FragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/news/News2FragmentAdapter.java @@ -32,7 +32,7 @@ import com.gh.gamecenter.R; import com.gh.gamecenter.ShareCardActivity; import com.gh.gamecenter.ShareCardPicActivity; import com.gh.gamecenter.WebActivity; -import com.gh.gamecenter.adapter.BaseRecyclerAdapter; +import com.gh.base.BaseRecyclerAdapter; import com.gh.gamecenter.adapter.viewholder.FooterViewHolder; import com.gh.gamecenter.adapter.viewholder.NewsDigestViewHolder; import com.gh.gamecenter.db.LibaoDao; @@ -43,7 +43,7 @@ import com.gh.gamecenter.entity.ConcernEntity; import com.gh.gamecenter.entity.LibaoEntity; import com.gh.gamecenter.entity.LibaoStatusEntity; import com.gh.gamecenter.entity.ViewsEntity; -import com.gh.gamecenter.listener.OnCallBackListener; +import com.gh.listener.OnCallBackListener; import com.gh.gamecenter.manager.CommentManager; import com.gh.gamecenter.manager.ConcernManager; import com.gh.gamecenter.manager.VisitManager; @@ -197,7 +197,7 @@ public class News2FragmentAdapter extends BaseRecyclerAdapter { if (response.size() != 0) { concernList.addAll(response); itemCount += response.size(); - if (!fragment.isHidden() && !fragment.isEverpause()) { + if (!fragment.isHidden() && !fragment.isEverPause()) { notifyItemRangeInserted(concernList.size() - response.size(), response.size()); } else { notifyDataSetChanged(); @@ -416,7 +416,7 @@ public class News2FragmentAdapter extends BaseRecyclerAdapter { if (response.size() != 0) { concernList.addAll(response); itemCount += response.size(); - if (!fragment.isHidden() && !fragment.isEverpause()) { + if (!fragment.isHidden() && !fragment.isEverPause()) { notifyItemRangeInserted(concernList.size() - response.size(), response.size()); } else { notifyDataSetChanged(); diff --git a/app/src/main/java/com/gh/gamecenter/news/News3Fragment.java b/app/src/main/java/com/gh/gamecenter/news/News3Fragment.java index fcd8d1621b..f6cc71edd1 100644 --- a/app/src/main/java/com/gh/gamecenter/news/News3Fragment.java +++ b/app/src/main/java/com/gh/gamecenter/news/News3Fragment.java @@ -2,8 +2,6 @@ package com.gh.gamecenter.news; import android.app.Dialog; import android.content.Intent; -import android.os.Bundle; -import android.support.annotation.Nullable; import android.support.v4.widget.SwipeRefreshLayout; import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.RecyclerView; @@ -40,8 +38,8 @@ import rx.functions.Action1; * Created by khy on 2017/4/7. * 资讯-攻略界面 */ -public class News3Fragment extends BaseFragment implements News3FragmentDialogAdapter.OnStrategyDialogCallBackListener - , SwipeRefreshLayout.OnRefreshListener { +public class News3Fragment extends BaseFragment implements SwipeRefreshLayout.OnRefreshListener, + OnStrategyDialogCallBackListener { @BindView(R.id.strategy_game_name) TextView mGameName; @@ -74,9 +72,13 @@ public class News3Fragment extends BaseFragment implements News3FragmentDialogAd }; @Override - public void onCreate(@Nullable Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - init(R.layout.fragment_news3); + protected int getLayoutId() { + return R.layout.fragment_news3; + } + + @Override + protected void initView(View view) { + super.initView(view); mSwipeRefreshLayout.setColorSchemeResources(R.color.theme); mSwipeRefreshLayout.setOnRefreshListener(this); diff --git a/app/src/main/java/com/gh/gamecenter/news/News3FragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/news/News3FragmentAdapter.java index f572b1aabb..3c83552da9 100644 --- a/app/src/main/java/com/gh/gamecenter/news/News3FragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/news/News3FragmentAdapter.java @@ -11,11 +11,11 @@ import com.gh.common.util.DataUtils; import com.gh.common.util.NewsUtils; import com.gh.gamecenter.NewsDetailActivity; import com.gh.gamecenter.R; -import com.gh.gamecenter.adapter.BaseRecyclerAdapter; +import com.gh.base.BaseRecyclerAdapter; import com.gh.gamecenter.adapter.viewholder.NewsFooterViewHolder; import com.gh.gamecenter.adapter.viewholder.NewsTextViewHolder; import com.gh.gamecenter.entity.NewsEntity; -import com.gh.gamecenter.listener.OnCallBackListener; +import com.gh.listener.OnCallBackListener; import com.gh.gamecenter.manager.DataCollectionManager; import com.gh.gamecenter.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; diff --git a/app/src/main/java/com/gh/gamecenter/news/News3FragmentDialogAdapter.java b/app/src/main/java/com/gh/gamecenter/news/News3FragmentDialogAdapter.java index f8d7297ea4..4898e3a964 100644 --- a/app/src/main/java/com/gh/gamecenter/news/News3FragmentDialogAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/news/News3FragmentDialogAdapter.java @@ -7,7 +7,7 @@ import android.widget.LinearLayout; import com.gh.common.util.DisplayUtils; import com.gh.gamecenter.R; -import com.gh.gamecenter.adapter.BaseRecyclerAdapter; +import com.gh.base.BaseRecyclerAdapter; import com.gh.gamecenter.adapter.viewholder.StrategyDialogViewHolder; import com.gh.gamecenter.db.info.ConcernInfo; import com.gh.gamecenter.manager.ConcernManager; @@ -75,7 +75,5 @@ public class News3FragmentDialogAdapter extends BaseRecyclerAdapter { if (response.size() != 0) { newsList.addAll(response); itemCount += response.size(); - if (!fragment.isHidden() && !fragment.isEverpause()) { + if (!fragment.isHidden() && !fragment.isEverPause()) { notifyItemRangeInserted(newsList.size() - response.size(), response.size()); } else { notifyDataSetChanged(); diff --git a/app/src/main/java/com/gh/gamecenter/news/NewsFragment.java b/app/src/main/java/com/gh/gamecenter/news/NewsFragment.java index 1fbaf4c524..cc4688b376 100644 --- a/app/src/main/java/com/gh/gamecenter/news/NewsFragment.java +++ b/app/src/main/java/com/gh/gamecenter/news/NewsFragment.java @@ -10,13 +10,13 @@ import android.view.View; import android.widget.LinearLayout; import android.widget.TextView; -import com.gh.base.HomeFragment; import com.gh.common.util.DataCollectionUtils; import com.gh.common.util.DisplayUtils; import com.gh.gamecenter.MainActivity; import com.gh.gamecenter.R; import com.gh.gamecenter.adapter.FragmentAdapter; import com.gh.gamecenter.eventbus.EBUISwitch; +import com.gh.gamecenter.fragment.HomeFragment; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; @@ -25,6 +25,9 @@ import org.greenrobot.eventbus.ThreadMode; import java.util.ArrayList; import java.util.List; +import butterknife.BindView; +import butterknife.OnClick; + /** * Created by khy on 2016/6/29. @@ -36,17 +39,38 @@ public class NewsFragment extends HomeFragment implements View.OnClickListener, private View mNewsSlidebarLine; private ViewPager mNewsVP; private LinearLayout.LayoutParams lparams; - private TextView mNewsZixun; - private TextView mNewsGuanzhu; - private TextView mNewsGonglve; - private TextView mNewsYuanchuang; + + @BindView(R.id.news_zixun_tv) + TextView mNewsZixun; + + @BindView(R.id.news_guanzhu_tv) + TextView mNewsGuanzhu; + + @BindView(R.id.news_gonglve_tv) + TextView mNewsGonglve; + + @BindView(R.id.news_yuanchuang_tv) + TextView mNewsYuanchuang; + private int width; private int currentItem; + @Override + protected int getLayoutId() { + return R.layout.fragment_news; + } + + @Override + protected void initView(View view) { + super.initView(view); + mNewsSlidebarLine = view.findViewById(R.id.slidebar_line); + mNewsVP = (ViewPager) view.findViewById(R.id.page_vp_content); + mNewsZixun.setSelected(true); + } + @Override public void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); - initView(); List list = new ArrayList<>(); list.add(new News1Fragment()); @@ -85,37 +109,26 @@ public class NewsFragment extends HomeFragment implements View.OnClickListener, outState.putInt("currentItem", currentItem); } + @OnClick({R.id.news_zixun_tv, R.id.news_guanzhu_tv, R.id.news_yuanchuang_tv, R.id.news_gonglve_tv}) @Override public void onClick(View v) { - super.onClick(v); - if (v == mNewsZixun) { - mNewsVP.setCurrentItem(0); - } else if (v == mNewsGuanzhu) { - mNewsVP.setCurrentItem(1); - } else if (v == mNewsGonglve) { - mNewsVP.setCurrentItem(2); - } else if (v == mNewsYuanchuang) { - mNewsVP.setCurrentItem(3); +// super.onClick(v); + switch (v.getId()) { + case R.id.news_zixun_tv: + mNewsVP.setCurrentItem(0); + break; + case R.id.news_guanzhu_tv: + mNewsVP.setCurrentItem(1); + break; + case R.id.news_gonglve_tv: + mNewsVP.setCurrentItem(2); + break; + case R.id.news_yuanchuang_tv: + mNewsVP.setCurrentItem(3); + break; } } - private void initView() { - ((LinearLayout) view).addView(View.inflate(getActivity(), R.layout.fragment_news_slidebar, null)); - ((LinearLayout) view).addView(View.inflate(getActivity(), R.layout.fragment_page, null)); - - mNewsSlidebarLine = view.findViewById(R.id.slidebar_line); - mNewsVP = (ViewPager) view.findViewById(R.id.page_vp_content); - mNewsZixun = (TextView) view.findViewById(R.id.news_zixun_tv); - mNewsGuanzhu = (TextView) view.findViewById(R.id.news_guanzhu_tv); - mNewsGonglve = (TextView) view.findViewById(R.id.news_gonglve_tv); - mNewsYuanchuang = (TextView) view.findViewById(R.id.news_yuanchuang_tv); - mNewsZixun.setOnClickListener(this); - mNewsGuanzhu.setOnClickListener(this); - mNewsGonglve.setOnClickListener(this); - mNewsYuanchuang.setOnClickListener(this); - mNewsZixun.setSelected(true); - } - @Override public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) { if (positionOffset != 0) { diff --git a/app/src/main/java/com/gh/gamecenter/news/OnStrategyDialogCallBackListener.java b/app/src/main/java/com/gh/gamecenter/news/OnStrategyDialogCallBackListener.java new file mode 100644 index 0000000000..4064544380 --- /dev/null +++ b/app/src/main/java/com/gh/gamecenter/news/OnStrategyDialogCallBackListener.java @@ -0,0 +1,7 @@ +package com.gh.gamecenter.news; + +import com.gh.gamecenter.db.info.ConcernInfo; + +public interface OnStrategyDialogCallBackListener { + void selectPosition(int position, ConcernInfo concernInfo); +} \ No newline at end of file diff --git a/app/src/main/java/com/gh/gamecenter/newsdetail/NewsDetailAdapter.java b/app/src/main/java/com/gh/gamecenter/newsdetail/NewsDetailAdapter.java index edd8ba8e57..b3d2038e14 100644 --- a/app/src/main/java/com/gh/gamecenter/newsdetail/NewsDetailAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/newsdetail/NewsDetailAdapter.java @@ -45,7 +45,7 @@ import com.gh.gamecenter.R; import com.gh.gamecenter.SubjectActivity; import com.gh.gamecenter.ViewImageActivity; import com.gh.gamecenter.WebActivity; -import com.gh.gamecenter.adapter.BaseRecyclerAdapter; +import com.gh.base.BaseRecyclerAdapter; import com.gh.gamecenter.adapter.viewholder.NewsDetailCommentListViewHolder; import com.gh.gamecenter.db.VoteDao; import com.gh.gamecenter.db.info.VoteInfo; @@ -54,8 +54,8 @@ import com.gh.gamecenter.entity.CommentEntity; import com.gh.gamecenter.entity.GameEntity; import com.gh.gamecenter.entity.NewsDetailEntity; import com.gh.gamecenter.entity.NewsEntity; -import com.gh.gamecenter.gamedetail.GameDetailTopViewHolder; -import com.gh.gamecenter.listener.OnCallBackListener; +import com.gh.gamecenter.adapter.viewholder.GameDetailTopViewHolder; +import com.gh.listener.OnCallBackListener; import com.gh.gamecenter.manager.ConcernManager; import com.gh.gamecenter.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; diff --git a/app/src/main/java/com/gh/gamecenter/personal/ConcernFragment.java b/app/src/main/java/com/gh/gamecenter/personal/ConcernFragment.java index b6d2d9a863..ecd779a9cc 100644 --- a/app/src/main/java/com/gh/gamecenter/personal/ConcernFragment.java +++ b/app/src/main/java/com/gh/gamecenter/personal/ConcernFragment.java @@ -64,12 +64,15 @@ public class ConcernFragment extends BaseFragment { } }; + @Override + protected int getLayoutId() { + return R.layout.fm_concern; + } + @Override public void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); - init(R.layout.fm_concern); - reuse_nodata_skip.setVisibility(View.GONE); reuse_nodata_skip_tv_hint.setText("暂无关注"); reuse_nodata_skip_tv_btn.setText("查看精品推荐"); @@ -89,7 +92,7 @@ public class ConcernFragment extends BaseFragment { @Override public void onResume() { - if (isEverpause) { + if (isEverPause) { for (GameEntity entity : adapter.getGameList()) { entity.setEntryMap(DownloadManager.getInstance(getActivity()).getEntryMap(entity.getName())); } diff --git a/app/src/main/java/com/gh/gamecenter/personal/ConcernFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/personal/ConcernFragmentAdapter.java index 51380c16f4..cc44668b1c 100644 --- a/app/src/main/java/com/gh/gamecenter/personal/ConcernFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/personal/ConcernFragmentAdapter.java @@ -19,7 +19,7 @@ import com.gh.common.util.ImageUtils; import com.gh.download.DownloadManager; import com.gh.gamecenter.GameDetailActivity; import com.gh.gamecenter.R; -import com.gh.gamecenter.adapter.BaseRecyclerAdapter; +import com.gh.base.BaseRecyclerAdapter; import com.gh.gamecenter.adapter.viewholder.FooterViewHolder; import com.gh.gamecenter.adapter.viewholder.GameNormalViewHolder; import com.gh.gamecenter.db.info.ConcernInfo; diff --git a/app/src/main/java/com/gh/gamecenter/personal/InstallFragment.java b/app/src/main/java/com/gh/gamecenter/personal/InstallFragment.java index d09511e27f..e24e881765 100644 --- a/app/src/main/java/com/gh/gamecenter/personal/InstallFragment.java +++ b/app/src/main/java/com/gh/gamecenter/personal/InstallFragment.java @@ -77,12 +77,15 @@ public class InstallFragment extends BaseFragment implements InstallFragmentAdap } } + @Override + protected int getLayoutId() { + return R.layout.fm_install; + } + @Override public void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); - init(R.layout.fm_install); - reuse_nodata_skip.setVisibility(View.GONE); reuse_nodata_skip_tv_hint.setText("暂无游戏"); reuse_nodata_skip_tv_btn.setText("查看精品推荐"); @@ -102,7 +105,7 @@ public class InstallFragment extends BaseFragment implements InstallFragmentAdap @Override public void onResume() { - if (isEverpause) { + if (isEverPause) { for (GameEntity entity : adapter.getGameList()) { entity.setEntryMap(DownloadManager.getInstance(getActivity()).getEntryMap(entity.getName())); } diff --git a/app/src/main/java/com/gh/gamecenter/personal/InstallFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/personal/InstallFragmentAdapter.java index 770c02410b..cd54ed2ca9 100644 --- a/app/src/main/java/com/gh/gamecenter/personal/InstallFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/personal/InstallFragmentAdapter.java @@ -34,7 +34,7 @@ import com.gh.download.DownloadManager; import com.gh.gamecenter.ChooseReceiverActivity; import com.gh.gamecenter.GameDetailActivity; import com.gh.gamecenter.R; -import com.gh.gamecenter.adapter.BaseRecyclerAdapter; +import com.gh.base.BaseRecyclerAdapter; import com.gh.gamecenter.adapter.viewholder.FooterViewHolder; import com.gh.gamecenter.adapter.viewholder.GameNormalSwipeViewHolder; import com.gh.gamecenter.db.info.ConcernInfo; diff --git a/app/src/main/java/com/gh/gamecenter/personal/PersonalFragment.java b/app/src/main/java/com/gh/gamecenter/personal/PersonalFragment.java index e9e3970dae..375af455dd 100644 --- a/app/src/main/java/com/gh/gamecenter/personal/PersonalFragment.java +++ b/app/src/main/java/com/gh/gamecenter/personal/PersonalFragment.java @@ -95,12 +95,15 @@ public class PersonalFragment extends BaseFragment implements View.OnClickListen private boolean isLogin; private SharedPreferences sp; + @Override + protected int getLayoutId() { + return R.layout.fragment_personal; + } + @Override public void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); - init(R.layout.fragment_personal); - sp = getActivity().getSharedPreferences(Config.PREFERENCE, Context.MODE_PRIVATE); me_iv_top_icon.setOnClickListener(this); diff --git a/app/src/main/java/com/gh/gamecenter/search/SearchGameDetailFragment.java b/app/src/main/java/com/gh/gamecenter/search/SearchGameDetailFragment.java index 5817643d3e..d847451af7 100644 --- a/app/src/main/java/com/gh/gamecenter/search/SearchGameDetailFragment.java +++ b/app/src/main/java/com/gh/gamecenter/search/SearchGameDetailFragment.java @@ -24,7 +24,7 @@ import com.gh.gamecenter.R; import com.gh.gamecenter.SuggestionActivity; import com.gh.gamecenter.entity.GameEntity; import com.gh.gamecenter.eventbus.EBDownloadStatus; -import com.gh.gamecenter.listener.OnCallBackListener; +import com.gh.listener.OnCallBackListener; import org.greenrobot.eventbus.Subscribe; import org.greenrobot.eventbus.ThreadMode; @@ -66,13 +66,15 @@ public class SearchGameDetailFragment extends BaseFragment implements OnCallBack } }; + @Override + protected int getLayoutId() { + return R.layout.fm_search; + } @Override public void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); - init(R.layout.fm_search); - final LinearLayout reuse_none_data = (LinearLayout) view.findViewById(R.id.reuse_none_data); TextView skip_tv = new TextView(getContext()); LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(DisplayUtils.dip2px(getContext(), 140) diff --git a/app/src/main/java/com/gh/gamecenter/search/SearchGameDetailFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/search/SearchGameDetailFragmentAdapter.java index 6ef591191f..088114df8f 100644 --- a/app/src/main/java/com/gh/gamecenter/search/SearchGameDetailFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/search/SearchGameDetailFragmentAdapter.java @@ -19,12 +19,12 @@ import com.gh.common.util.StringUtils; import com.gh.common.view.DownloadDialog; import com.gh.gamecenter.GameDetailActivity; import com.gh.gamecenter.R; -import com.gh.gamecenter.adapter.BaseRecyclerAdapter; +import com.gh.base.BaseRecyclerAdapter; import com.gh.gamecenter.adapter.viewholder.GameNormalViewHolder; import com.gh.gamecenter.entity.ApkEntity; import com.gh.gamecenter.entity.GameEntity; import com.gh.gamecenter.eventbus.EBSearch; -import com.gh.gamecenter.listener.OnCallBackListener; +import com.gh.listener.OnCallBackListener; import com.gh.gamecenter.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; diff --git a/app/src/main/java/com/gh/gamecenter/search/SearchGameListFragment.java b/app/src/main/java/com/gh/gamecenter/search/SearchGameListFragment.java index e977bb71c0..f7265849a6 100644 --- a/app/src/main/java/com/gh/gamecenter/search/SearchGameListFragment.java +++ b/app/src/main/java/com/gh/gamecenter/search/SearchGameListFragment.java @@ -24,7 +24,7 @@ import com.gh.gamecenter.R; import com.gh.gamecenter.SuggestionActivity; import com.gh.gamecenter.entity.GameEntity; import com.gh.gamecenter.eventbus.EBDownloadStatus; -import com.gh.gamecenter.listener.OnCallBackListener; +import com.gh.listener.OnCallBackListener; import org.greenrobot.eventbus.Subscribe; import org.greenrobot.eventbus.ThreadMode; @@ -63,12 +63,15 @@ public class SearchGameListFragment extends BaseFragment implements OnCallBackLi } }; + @Override + protected int getLayoutId() { + return R.layout.fm_search; + } + @Override public void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); - init(R.layout.fm_search); - final LinearLayout reuse_none_data = (LinearLayout) view.findViewById(R.id.reuse_none_data); TextView skip_tv = new TextView(getContext()); LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(DisplayUtils.dip2px(getContext(), 140) diff --git a/app/src/main/java/com/gh/gamecenter/search/SearchGameListFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/search/SearchGameListFragmentAdapter.java index ae82f49894..50e98f80b9 100644 --- a/app/src/main/java/com/gh/gamecenter/search/SearchGameListFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/search/SearchGameListFragmentAdapter.java @@ -19,14 +19,14 @@ import com.gh.common.util.StringUtils; import com.gh.common.view.DownloadDialog; import com.gh.gamecenter.GameDetailActivity; import com.gh.gamecenter.R; -import com.gh.gamecenter.adapter.BaseRecyclerAdapter; +import com.gh.base.BaseRecyclerAdapter; import com.gh.gamecenter.adapter.viewholder.GameNormalViewHolder; import com.gh.gamecenter.adapter.viewholder.SearchHistoryViewHolder; import com.gh.gamecenter.db.SearchHistoryDao; import com.gh.gamecenter.entity.ApkEntity; import com.gh.gamecenter.entity.GameEntity; import com.gh.gamecenter.eventbus.EBSearch; -import com.gh.gamecenter.listener.OnCallBackListener; +import com.gh.listener.OnCallBackListener; import com.gh.gamecenter.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; diff --git a/app/src/main/java/com/gh/gamecenter/search/SearchHistoryFragment.java b/app/src/main/java/com/gh/gamecenter/search/SearchHistoryFragment.java index 16c1f95a2d..70cdc97b81 100644 --- a/app/src/main/java/com/gh/gamecenter/search/SearchHistoryFragment.java +++ b/app/src/main/java/com/gh/gamecenter/search/SearchHistoryFragment.java @@ -2,15 +2,14 @@ package com.gh.gamecenter.search; import android.os.Bundle; import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; import android.support.v7.widget.GridLayoutManager; import android.support.v7.widget.RecyclerView; -import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.RelativeLayout; import android.widget.TextView; +import com.gh.base.BaseFragment; import com.gh.common.util.DialogUtils; import com.gh.common.util.DisplayUtils; import com.gh.gamecenter.R; @@ -25,12 +24,11 @@ import java.util.ArrayList; import java.util.List; import butterknife.BindView; -import butterknife.ButterKnife; import butterknife.OnClick; import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class SearchHistoryFragment extends Fragment { +public class SearchHistoryFragment extends BaseFragment { @BindView(R.id.search_hot_tv) TextView mSearchHotTv; @@ -40,7 +38,6 @@ public class SearchHistoryFragment extends Fragment { RecyclerView mSearchHotRv; @BindView(R.id.search_history_rv) RecyclerView mSearchHistoryRv; - private View view; private SearchHistoryDao dao; private List mHistorylist; @@ -51,12 +48,14 @@ public class SearchHistoryFragment extends Fragment { private boolean isDestroy; + @Override + protected int getLayoutId() { + return R.layout.fm_search_history; + } @Override public void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); - view = View.inflate(getActivity(), R.layout.fm_search_history, null); - ButterKnife.bind(this, view); isDestroy = false; mHotlist = new ArrayList<>(); @@ -137,16 +136,6 @@ public class SearchHistoryFragment extends Fragment { }); } - @Nullable - @Override - public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, - @Nullable Bundle savedInstanceState) { - if (container != null) { - container.removeView(view); - } - return view; - } - @Override public void onDestroyView() { super.onDestroyView(); diff --git a/app/src/main/java/com/gh/gamecenter/search/SearchHistoryFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/search/SearchHistoryFragmentAdapter.java index 453b19a806..ab25a0712e 100644 --- a/app/src/main/java/com/gh/gamecenter/search/SearchHistoryFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/search/SearchHistoryFragmentAdapter.java @@ -15,7 +15,7 @@ import android.widget.TextView; import com.gh.common.util.DisplayUtils; import com.gh.gamecenter.R; -import com.gh.gamecenter.adapter.BaseRecyclerAdapter; +import com.gh.base.BaseRecyclerAdapter; import com.gh.gamecenter.db.SearchHistoryDao; import com.gh.gamecenter.eventbus.EBSearch; diff --git a/app/src/main/java/com/gh/gamecenter/subject/SubjectAdapter.java b/app/src/main/java/com/gh/gamecenter/subject/SubjectAdapter.java index d3d43260a9..0056a4e3e7 100644 --- a/app/src/main/java/com/gh/gamecenter/subject/SubjectAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/subject/SubjectAdapter.java @@ -26,14 +26,14 @@ import com.gh.gamecenter.GameDetailActivity; import com.gh.gamecenter.NewsDetailActivity; import com.gh.gamecenter.R; import com.gh.gamecenter.SubjectActivity; -import com.gh.gamecenter.adapter.BaseRecyclerAdapter; +import com.gh.base.BaseRecyclerAdapter; import com.gh.gamecenter.adapter.viewholder.FooterViewHolder; import com.gh.gamecenter.adapter.viewholder.GameImageViewHolder; import com.gh.gamecenter.adapter.viewholder.GameNormalViewHolder; import com.gh.gamecenter.adapter.viewholder.GameTestViewHolder; import com.gh.gamecenter.entity.ApkEntity; import com.gh.gamecenter.entity.GameEntity; -import com.gh.gamecenter.listener.OnCallBackListener; +import com.gh.listener.OnCallBackListener; import com.gh.gamecenter.manager.GameManager; import com.gh.gamecenter.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; diff --git a/app/src/main/java/com/gh/gamecenter/subject/SubjectFragment.java b/app/src/main/java/com/gh/gamecenter/subject/SubjectFragment.java index 8b655a3a8f..42644d190c 100644 --- a/app/src/main/java/com/gh/gamecenter/subject/SubjectFragment.java +++ b/app/src/main/java/com/gh/gamecenter/subject/SubjectFragment.java @@ -95,6 +95,11 @@ public class SubjectFragment extends BaseFragment { return fragment; } + @Override + protected int getLayoutId() { + return R.layout.fragment_subject; + } + @Override public void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -106,7 +111,6 @@ public class SubjectFragment extends BaseFragment { mOrder = arguments.getString("order"); mTagType = arguments.getString("tagType"); mEntrance = arguments.getString(EntranceUtils.KEY_ENTRANCE); - init(R.layout.fragment_subject); reuse_no_connection.setOnClickListener(new View.OnClickListener() { @Override @@ -178,19 +182,19 @@ public class SubjectFragment extends BaseFragment { @Override public void onResume() { super.onResume(); - if (isEverpause) { + if (isEverPause) { for (GameEntity entity : adapter.getSubjectList()) { entity.setEntryMap(DownloadManager.getInstance(getContext()).getEntryMap(entity.getName())); } } - isEverpause = false; + isEverPause = false; DownloadManager.getInstance(getContext()).addObserver(dataWatcher); } @Override public void onPause() { super.onPause(); - isEverpause = true; + isEverPause = true; DownloadManager.getInstance(getContext()).removeObserver(dataWatcher); } diff --git a/app/src/main/java/com/gh/gamecenter/subject/SubjectTileFragment.java b/app/src/main/java/com/gh/gamecenter/subject/SubjectTileFragment.java index ddacc145ae..2a5135d7f2 100644 --- a/app/src/main/java/com/gh/gamecenter/subject/SubjectTileFragment.java +++ b/app/src/main/java/com/gh/gamecenter/subject/SubjectTileFragment.java @@ -99,11 +99,14 @@ public class SubjectTileFragment extends BaseFragment implements SubjectTypeAdap } } + @Override + protected int getLayoutId() { + return R.layout.fragment_subject_tiled; + } @Override public void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); - init(R.layout.fragment_subject_tiled); Bundle arguments = getArguments(); mActionBarTitle = (TextView) getActivity().findViewById(R.id.actionbar_tv_title); diff --git a/app/src/main/java/com/gh/gamecenter/suggest/SuggestPicAdapter.java b/app/src/main/java/com/gh/gamecenter/suggest/SuggestPicAdapter.java index 390e338657..66103bbdac 100644 --- a/app/src/main/java/com/gh/gamecenter/suggest/SuggestPicAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/suggest/SuggestPicAdapter.java @@ -11,7 +11,7 @@ import android.view.ViewGroup; import com.gh.common.util.Utils; import com.gh.gamecenter.R; import com.gh.gamecenter.SuggestionActivity; -import com.gh.gamecenter.adapter.BaseRecyclerAdapter; +import com.gh.base.BaseRecyclerAdapter; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/gh/gamecenter/suggest/SuggestSelectGameAdapter.java b/app/src/main/java/com/gh/gamecenter/suggest/SuggestSelectGameAdapter.java index 3dc588eaaa..52ff5805f2 100644 --- a/app/src/main/java/com/gh/gamecenter/suggest/SuggestSelectGameAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/suggest/SuggestSelectGameAdapter.java @@ -11,9 +11,9 @@ import android.widget.ProgressBar; import com.gh.common.util.BitmapUtils; import com.gh.gamecenter.R; import com.gh.gamecenter.SuggestionActivity; -import com.gh.gamecenter.adapter.BaseRecyclerAdapter; +import com.gh.base.BaseRecyclerAdapter; import com.gh.gamecenter.entity.InstallGameEntity; -import com.gh.gamecenter.listener.OnCallBackListener; +import com.gh.listener.OnCallBackListener; import com.gh.gamecenter.retrofit.*; import java.io.File; diff --git a/app/src/main/java/com/gh/gamecenter/suggest/SuggestTypeAdapter.java b/app/src/main/java/com/gh/gamecenter/suggest/SuggestTypeAdapter.java index e4c4e4775c..2e5617cdf3 100644 --- a/app/src/main/java/com/gh/gamecenter/suggest/SuggestTypeAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/suggest/SuggestTypeAdapter.java @@ -9,7 +9,7 @@ import android.view.ViewGroup; import com.gh.gamecenter.R; import com.gh.gamecenter.SuggestionActivity; -import com.gh.gamecenter.adapter.BaseRecyclerAdapter; +import com.gh.base.BaseRecyclerAdapter; /** * Created by khy on 2017/3/31. diff --git a/app/src/main/java/com/gh/gamecenter/wenda/WenDaFragment.java b/app/src/main/java/com/gh/gamecenter/wenda/WenDaFragment.java index fbc62defb1..01d0913294 100644 --- a/app/src/main/java/com/gh/gamecenter/wenda/WenDaFragment.java +++ b/app/src/main/java/com/gh/gamecenter/wenda/WenDaFragment.java @@ -1,21 +1,27 @@ -package com.gh.gamecenter.wenda; - -import com.gh.base.BaseFragment; -import com.gh.gamecenter.eventbus.EBNetworkState; - -import org.greenrobot.eventbus.Subscribe; -import org.greenrobot.eventbus.ThreadMode; - -/** - * Created by khy on 2017/4/5. - */ -public class WenDaFragment extends BaseFragment { - - //连接上网络事件 - @Subscribe(threadMode = ThreadMode.MAIN) - public void onEventMainThread(EBNetworkState busNetworkState) { - if (busNetworkState.isNetworkConnected()) { - - } - } -} +//package com.gh.gamecenter.wenda; +// +//import com.gh.base.BaseFragment; +//import com.gh.gamecenter.eventbus.EBNetworkState; +// +//import org.greenrobot.eventbus.Subscribe; +//import org.greenrobot.eventbus.ThreadMode; +// +///** +// * Created by khy on 2017/4/5. +// */ +//public class WenDaFragment extends BaseFragment { +// +// //连接上网络事件 +// @Subscribe(threadMode = ThreadMode.MAIN) +// public void onEventMainThread(EBNetworkState busNetworkState) { +// if (busNetworkState.isNetworkConnected()) { +// +// } +// } +// +// @Override +// protected int getLayoutId() { +// return 0; +// } +// +//} diff --git a/app/src/main/java/com/gh/gamecenter/listener/OnCallBackListener.java b/app/src/main/java/com/gh/listener/OnCallBackListener.java similarity index 84% rename from app/src/main/java/com/gh/gamecenter/listener/OnCallBackListener.java rename to app/src/main/java/com/gh/listener/OnCallBackListener.java index 6f12c7291d..5ff6adeef5 100644 --- a/app/src/main/java/com/gh/gamecenter/listener/OnCallBackListener.java +++ b/app/src/main/java/com/gh/listener/OnCallBackListener.java @@ -1,4 +1,4 @@ -package com.gh.gamecenter.listener; +package com.gh.listener; /** * Created by Administrator on 2016/9/8. diff --git a/app/src/main/java/com/gh/gamecenter/listener/OnCollectionCallBackListener.java b/app/src/main/java/com/gh/listener/OnCollectionCallBackListener.java similarity index 87% rename from app/src/main/java/com/gh/gamecenter/listener/OnCollectionCallBackListener.java rename to app/src/main/java/com/gh/listener/OnCollectionCallBackListener.java index bbb64806aa..fbaeb11690 100644 --- a/app/src/main/java/com/gh/gamecenter/listener/OnCollectionCallBackListener.java +++ b/app/src/main/java/com/gh/listener/OnCollectionCallBackListener.java @@ -1,4 +1,4 @@ -package com.gh.gamecenter.listener; +package com.gh.listener; import com.gh.gamecenter.entity.GameCollectionEntity; diff --git a/app/src/main/res/layout/activity_subject.xml b/app/src/main/res/layout/activity_subject.xml index ff46926976..5fb2f92b2e 100644 --- a/app/src/main/res/layout/activity_subject.xml +++ b/app/src/main/res/layout/activity_subject.xml @@ -38,8 +38,7 @@ android:layout_height = "wrap_content" android:layout_centerInParent = "true" /> - - + diff --git a/app/src/main/res/layout/fragment_game.xml b/app/src/main/res/layout/fragment_game.xml index 19728dde75..84e177aa51 100644 --- a/app/src/main/res/layout/fragment_game.xml +++ b/app/src/main/res/layout/fragment_game.xml @@ -1,26 +1,36 @@ - + android:layout_height = "match_parent" + android:orientation = "vertical" > - + + - - + android:layout_height = "match_parent" > - + - + - \ No newline at end of file + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_news.xml similarity index 73% rename from app/src/main/res/layout/fragment_home.xml rename to app/src/main/res/layout/fragment_news.xml index 6ae4d3b258..b330b5d77e 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_news.xml @@ -6,4 +6,8 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_news_slidebar.xml b/app/src/main/res/layout/fragment_news_slidebar.xml index b5c3499321..af88ac8797 100644 --- a/app/src/main/res/layout/fragment_news_slidebar.xml +++ b/app/src/main/res/layout/fragment_news_slidebar.xml @@ -2,13 +2,13 @@ - \ No newline at end of file + + + + + + + + + \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index aad892d527..7c18cde3e4 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,5 +1,4 @@ include ':app' -include ':libraries:EventBus' include ':libraries:MiPush' include ':libraries:MTA' include ':libraries:QQShare'