diff --git a/app/build.gradle b/app/build.gradle
index 3e1a0dff7f..38ebbd488a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -188,6 +188,7 @@ dependencies {
compile libs.eventbus
apt libs.eventbusApt
+ compile project(':libraries:LGLibrary')
compile project(':libraries:MiPush')
compile project(':libraries:MTA')
compile project(':libraries:QQShare')
diff --git a/app/src/main/java/com/gh/base/BaseAppCompatToolBarActivity.java b/app/src/main/java/com/gh/base/BaseAppCompatToolBarActivity.java
index b9cc082191..7eafe7edbf 100644
--- a/app/src/main/java/com/gh/base/BaseAppCompatToolBarActivity.java
+++ b/app/src/main/java/com/gh/base/BaseAppCompatToolBarActivity.java
@@ -23,7 +23,7 @@ public abstract class BaseAppCompatToolBarActivity extends BaseAppCompatActivity
private SystemBarTintManager mTintManager;
// TODO 获取沉浸栏管理，要进行版本判断或者判断是否为空
- protected SystemBarTintManager getTintManager() {
+ public SystemBarTintManager getTintManager() {
return mTintManager;
}
diff --git a/app/src/main/java/com/gh/base/BaseFragment.java b/app/src/main/java/com/gh/base/fragment/BaseFragment.java
similarity index 85%
rename from app/src/main/java/com/gh/base/BaseFragment.java
rename to app/src/main/java/com/gh/base/fragment/BaseFragment.java
index 99d1f5f07b..9002fff95a 100644
--- a/app/src/main/java/com/gh/base/BaseFragment.java
+++ b/app/src/main/java/com/gh/base/fragment/BaseFragment.java
@@ -1,6 +1,7 @@
-package com.gh.base;
+package com.gh.base.fragment;
import android.os.Bundle;
+import android.support.annotation.LayoutRes;
import android.support.annotation.Nullable;
import android.support.v4.app.Fragment;
import android.view.LayoutInflater;
@@ -8,6 +9,7 @@ import android.view.View;
import android.view.ViewGroup;
import android.widget.Toast;
+import com.gh.base.OnRequestCallBackListener;
import com.gh.common.util.EntranceUtils;
import com.gh.common.util.RuntimeUtils;
import com.gh.gamecenter.eventbus.EBMiPush;
@@ -22,7 +24,7 @@ import butterknife.ButterKnife;
* Created by LGT on 2016/9/4.
* Fragment 基类
*/
-public abstract class BaseFragment extends Fragment implements OnRequestCallBackListener {
+public abstract class BaseFragment extends Fragment implements OnRequestCallBackListener, View.OnClickListener {
// TODO private view
protected View view;
@@ -31,8 +33,23 @@ public abstract class BaseFragment extends Fragment implements OnRequestCallBack
protected String mEntrance;
+ @LayoutRes
protected abstract int getLayoutId();
+ /**
+ * 责任链，谁处理了就返回true，否则返回super.handleOnClick(View view)
+ *
+ * @return
+ */
+ protected boolean handleOnClick(View view) {
+ return true;
+ }
+
+ @Override
+ public void onClick(View v) {
+ handleOnClick(v);
+ }
+
protected void initView(View view) {
}
diff --git a/app/src/main/java/com/gh/base/fragment/BaseFragment_ViewPager.java b/app/src/main/java/com/gh/base/fragment/BaseFragment_ViewPager.java
new file mode 100755
index 0000000000..3417aa45b3
--- /dev/null
+++ b/app/src/main/java/com/gh/base/fragment/BaseFragment_ViewPager.java
@@ -0,0 +1,109 @@
+/**
+ * project: OPlay
+ *
+ *
+ * ========================================================================
+ * amend date amend user amend reason
+ * 2013-3-6 CsHeng
+ */
+
+package com.gh.base.fragment;
+
+import android.os.Bundle;
+import android.support.annotation.IdRes;
+import android.support.annotation.LayoutRes;
+import android.support.annotation.Nullable;
+import android.support.v4.app.Fragment;
+import android.support.v4.view.PagerAdapter;
+import android.support.v4.view.ViewPager;
+import android.view.View;
+
+import com.lightgame.adapter.BaseFragmentPagerAdapter;
+import com.lightgame.view.DoubleTapTextView;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * ViewPager 配合RadioGroup实现双切换
+ * 记得自己控制onCreateView返回和radioGroup里面radiobutton个数,Viewpager的布局
+ *
+ * @author CsHeng
+ * @date 2013-3-6
+ */
+public abstract class BaseFragment_ViewPager extends BaseFragment implements DoubleTapTextView.OnDoubleTapListener {
+
+ private static final String ARGS_INDEX = "index";
+ protected int mCheckedIndex = 0;
+ protected PagerAdapter mAdapter;
+ protected List mFragmentsList;
+ protected ViewPager mViewPager;
+
+ @LayoutRes
+ protected abstract int getLayoutId();
+
+ @IdRes
+ protected abstract int getViewPagerId();
+
+ protected abstract void initFragmentList(List fragments);
+
+ @Override
+ public void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ mFragmentsList = new ArrayList<>();
+ initFragmentList(mFragmentsList);
+ mAdapter = BaseFragmentPagerAdapter.newInstance(getChildFragmentManager(), mFragmentsList);
+ final Bundle args = getArguments();
+ if (args != null) {
+ mCheckedIndex = args.getInt(ARGS_INDEX);
+ }
+ }
+
+ @Override
+ public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+ super.onViewCreated(view, savedInstanceState);
+ mViewPager = (ViewPager) view.findViewById(getViewPagerId());
+ mViewPager.setOffscreenPageLimit(mFragmentsList.size());
+ mViewPager.setAdapter(mAdapter);
+ }
+
+ @Override
+ public void onActivityCreated(Bundle savedInstanceState) {
+ super.onActivityCreated(savedInstanceState);
+ if (mCheckedIndex < mFragmentsList.size()) {
+ mViewPager.setCurrentItem(mCheckedIndex, false);
+ }
+ }
+
+ @Override
+ public void onSaveInstanceState(Bundle outState) {
+ super.onSaveInstanceState(outState);
+ if (getArguments() != null) {
+ getArguments().putInt(ARGS_INDEX, mCheckedIndex);
+ }
+ }
+
+ @Override
+ public void onDestroyView() {
+ super.onDestroyView();
+ if (mViewPager != null) {
+ mViewPager.setAdapter(null);
+ }
+ }
+
+ @Override
+ public void onDestroy() {
+ super.onDestroy();
+ if (mFragmentsList != null) {
+ mFragmentsList.clear();
+ }
+ }
+
+ @Override
+ public boolean onDoubleTap() {
+ final Fragment fragment = mFragmentsList.get(mViewPager.getCurrentItem());
+ return fragment instanceof DoubleTapTextView.OnDoubleTapListener && ((DoubleTapTextView.OnDoubleTapListener)
+ fragment).onDoubleTap();
+ }
+
+}
diff --git a/app/src/main/java/com/gh/base/fragment/BaseFragment_ViewPager_Checkable.java b/app/src/main/java/com/gh/base/fragment/BaseFragment_ViewPager_Checkable.java
new file mode 100755
index 0000000000..8e0be2c8b7
--- /dev/null
+++ b/app/src/main/java/com/gh/base/fragment/BaseFragment_ViewPager_Checkable.java
@@ -0,0 +1,105 @@
+/**
+ * project: OPlay
+ *
+ *
+ * ========================================================================
+ * amend date amend user amend reason
+ * 2013-3-6 CsHeng
+ */
+
+package com.gh.base.fragment;
+
+import android.os.Bundle;
+import android.support.annotation.IdRes;
+import android.support.annotation.Nullable;
+import android.support.v4.view.ViewPager;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Checkable;
+
+
+/**
+ * ViewPager 配合ViewGroup Checkable实现双切换
+ * 记得自己控制onCreateView返回和ViewGroup里面Checkable个数,ViewPager的布局
+ *
+ * @author CsHeng
+ * @date 2013-3-6
+ * @update 2014-09-29
+ */
+public abstract class BaseFragment_ViewPager_Checkable extends BaseFragment_ViewPager implements
+ ViewPager.OnPageChangeListener {
+
+ protected ViewGroup mCheckableGroup;
+
+ @IdRes
+ protected abstract int getCheckableGroupId();
+
+ @Override
+ public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+ super.onViewCreated(view, savedInstanceState);
+ mCheckableGroup = (ViewGroup) view.findViewById(getCheckableGroupId());
+ for (int i = 0, size = mCheckableGroup.getChildCount(); i < size; i++) {
+ mCheckableGroup.getChildAt(i).setOnClickListener(this);
+ }
+ mViewPager.addOnPageChangeListener(this);
+ }
+
+ @Override
+ public void onDestroyView() {
+ super.onDestroyView();
+ mViewPager.removeOnPageChangeListener(this);
+ }
+
+ @Override
+ public void onActivityCreated(Bundle savedInstanceState) {
+ super.onActivityCreated(savedInstanceState);
+ checkIndex(mCheckedIndex);
+ }
+
+ @Override
+ public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
+
+ }
+
+ @Override
+ public void onPageSelected(int index) {
+ onPageChanged(index);
+ }
+
+ @Override
+ public void onPageScrollStateChanged(int state) {
+
+ }
+
+ @Override
+ protected boolean handleOnClick(View view) {
+ final int toCheck = mCheckableGroup.indexOfChild(view);
+ if (toCheck != -1) {
+ mViewPager.setCurrentItem(toCheck, false);
+ return true;
+ }
+ return super.handleOnClick(view);
+ }
+
+ protected void checkIndex(int index) {
+ final int childCount = mCheckableGroup.getChildCount();
+ if (index < childCount && mCheckedIndex < childCount) {
+ final View toChecked = mCheckableGroup.getChildAt(index);
+ if (toChecked instanceof Checkable) {
+ ((Checkable) toChecked).setChecked(true);
+ }
+ if (index != mCheckedIndex) {
+ final View checkedChild = mCheckableGroup.getChildAt(mCheckedIndex);
+ if (checkedChild instanceof Checkable) {
+ ((Checkable) checkedChild).setChecked(false);
+ }
+ }
+ mCheckedIndex = index;
+ }
+ }
+
+ protected void onPageChanged(int index) {
+ checkIndex(index);
+ }
+
+}
diff --git a/app/src/main/java/com/gh/common/util/PackageUtils.java b/app/src/main/java/com/gh/common/util/PackageUtils.java
index aca1629360..73dc01c5f5 100644
--- a/app/src/main/java/com/gh/common/util/PackageUtils.java
+++ b/app/src/main/java/com/gh/common/util/PackageUtils.java
@@ -91,12 +91,10 @@ public class PackageUtils {
private static String[] parseSignature(byte[] signature) {
String[] ret = null;
try {
- CertificateFactory certFactory = CertificateFactory
- .getInstance("X.509");
- X509Certificate cert = (X509Certificate) certFactory
- .generateCertificate(new ByteArrayInputStream(signature));
- ret = new String[]{cert.getPublicKey().toString(),
- cert.getSerialNumber().toString()};
+ CertificateFactory certFactory = CertificateFactory.getInstance("X.509");
+ X509Certificate cert = (X509Certificate) certFactory.generateCertificate(
+ new ByteArrayInputStream(signature));
+ ret = new String[]{cert.getPublicKey().toString(), cert.getSerialNumber().toString()};
} catch (CertificateException e) {
e.printStackTrace();
}
@@ -159,8 +157,8 @@ public class PackageUtils {
*/
public static Intent getUninstallIntent(Context context, String path) {
Intent uninstallIntent = new Intent();
- uninstallIntent.setAction("android.intent.action.DELETE");
- uninstallIntent.addCategory("android.intent.category.DEFAULT");
+ uninstallIntent.setAction(Intent.ACTION_DELETE);
+ uninstallIntent.addCategory(Intent.CATEGORY_DEFAULT);
String packageName = getPackageNameByPath(context, path);
uninstallIntent.setData(Uri.parse("package:" + packageName));
InstallUtils.getInstance(context).addUninstall(packageName);
@@ -172,8 +170,7 @@ public class PackageUtils {
*/
public static String getPackageNameByPath(Context context, String path) {
PackageManager packageManager = context.getApplicationContext().getPackageManager();
- PackageInfo info = packageManager.getPackageArchiveInfo(path,
- PackageManager.GET_ACTIVITIES);
+ PackageInfo info = packageManager.getPackageArchiveInfo(path, PackageManager.GET_ACTIVITIES);
if (info != null) {
ApplicationInfo appInfo = info.applicationInfo;
return appInfo.packageName;
diff --git a/app/src/main/java/com/gh/common/view/ScaleAutoScrollViewPager.java b/app/src/main/java/com/gh/common/view/ScaleAutoScrollViewPager.java
new file mode 100644
index 0000000000..bb934f13d5
--- /dev/null
+++ b/app/src/main/java/com/gh/common/view/ScaleAutoScrollViewPager.java
@@ -0,0 +1,49 @@
+package com.gh.common.view;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.util.AttributeSet;
+
+import com.gh.gamecenter.R;
+
+import cn.trinea.android.view.autoscrollviewpager.AutoScrollViewPager;
+
+/**
+ * @author CsHeng
+ * @Date 17/06/2017
+ * @Time 12:24 PM
+ */
+
+public class ScaleAutoScrollViewPager extends AutoScrollViewPager {
+
+ private boolean mMeasureByHeight = false; // default width
+ private float mScale = 1f;// default square
+
+ public ScaleAutoScrollViewPager(Context context) {
+ super(context);
+ }
+
+ public ScaleAutoScrollViewPager(Context context, AttributeSet set) {
+ super(context, set);
+ TypedArray a = context.obtainStyledAttributes(set, R.styleable.ScaleView);
+ int enumV = a.getInt(R.styleable.ScaleView_measureBy, 0);
+ mScale = a.getFloat(R.styleable.ScaleView_fractionValue, mScale);
+ if (enumV != 0) {
+ mMeasureByHeight = true;
+ }
+ a.recycle();
+ }
+
+ @Override
+ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+ super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+ int width = MeasureSpec.getSize(widthMeasureSpec);
+ int height = MeasureSpec.getSize(heightMeasureSpec);
+ if (mMeasureByHeight) {
+ setMeasuredDimension((int) (height * mScale), height);
+ } else {
+ setMeasuredDimension(width, (int) (width * mScale));
+ }
+
+ }
+}
diff --git a/app/src/main/java/com/gh/common/view/ScaleSimpleDraweeView.java b/app/src/main/java/com/gh/common/view/ScaleSimpleDraweeView.java
new file mode 100644
index 0000000000..569dfd766f
--- /dev/null
+++ b/app/src/main/java/com/gh/common/view/ScaleSimpleDraweeView.java
@@ -0,0 +1,63 @@
+package com.gh.common.view;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.util.AttributeSet;
+
+import com.facebook.drawee.view.SimpleDraweeView;
+import com.gh.gamecenter.R;
+
+/**
+ * @author CsHeng
+ * @Date 17/06/2017
+ * @Time 2:46 PM
+ */
+
+public class ScaleSimpleDraweeView extends SimpleDraweeView {
+
+ private boolean mMeasureByHeight = false; // default width
+
+ private float mFraction = 1f;// default square
+
+ public ScaleSimpleDraweeView(Context context) {
+ super(context);
+ }
+
+ public ScaleSimpleDraweeView(Context context, AttributeSet attrs) {
+ super(context, attrs);
+ init(context, attrs);
+ }
+
+ public ScaleSimpleDraweeView(Context context, AttributeSet attrs, int defStyle) {
+ super(context, attrs, defStyle);
+ init(context, attrs);
+ }
+
+ public ScaleSimpleDraweeView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+ super(context, attrs, defStyleAttr, defStyleRes);
+ init(context, attrs);
+ }
+
+ public void init(Context context, AttributeSet attrs) {
+ TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.ScaleView);
+ int enumV = a.getInt(R.styleable.ScaleView_measureBy, 0);
+ mFraction = a.getFloat(R.styleable.ScaleView_fractionValue, mFraction);
+ if (enumV != 0) {
+ mMeasureByHeight = true;
+ }
+ a.recycle();
+ }
+
+ @Override
+ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+ int width = MeasureSpec.getSize(widthMeasureSpec);
+ int height = MeasureSpec.getSize(heightMeasureSpec);
+ if (mMeasureByHeight) {
+ setMeasuredDimension((int) (height * mFraction), height);
+ } else {
+ setMeasuredDimension(width, (int) (width * mFraction));
+ }
+ }
+
+
+}
diff --git a/app/src/main/java/com/gh/gamecenter/GameDetailActivity.java b/app/src/main/java/com/gh/gamecenter/GameDetailActivity.java
index e975db4e0f..6a5b336dbe 100644
--- a/app/src/main/java/com/gh/gamecenter/GameDetailActivity.java
+++ b/app/src/main/java/com/gh/gamecenter/GameDetailActivity.java
@@ -37,7 +37,7 @@ import com.gh.common.util.PackageUtils;
import com.gh.common.util.ShareUtils;
import com.gh.common.util.Utils;
import com.gh.common.view.DownloadDialog;
-import com.gh.common.view.NoScrollableViewPager;
+import com.lightgame.view.NoScrollableViewPager;
import com.gh.download.DataWatcher;
import com.gh.download.DownloadEntity;
import com.gh.download.DownloadManager;
diff --git a/app/src/main/java/com/gh/gamecenter/LibaoActivity.java b/app/src/main/java/com/gh/gamecenter/LibaoActivity.java
index 8392e676ef..d62e3dc6c7 100644
--- a/app/src/main/java/com/gh/gamecenter/LibaoActivity.java
+++ b/app/src/main/java/com/gh/gamecenter/LibaoActivity.java
@@ -11,7 +11,7 @@ import android.widget.TextView;
import com.gh.base.BaseActivity;
import com.gh.common.util.DisplayUtils;
-import com.gh.common.view.NoScrollableViewPager;
+import com.lightgame.view.NoScrollableViewPager;
import com.gh.base.adapter.FragmentAdapter;
import com.gh.gamecenter.eventbus.EBReuse;
import com.gh.gamecenter.eventbus.EBUISwitch;
diff --git a/app/src/main/java/com/gh/gamecenter/MainActivity.java b/app/src/main/java/com/gh/gamecenter/MainActivity.java
index b7e1c65fa8..b425eb8b44 100644
--- a/app/src/main/java/com/gh/gamecenter/MainActivity.java
+++ b/app/src/main/java/com/gh/gamecenter/MainActivity.java
@@ -5,29 +5,20 @@ import android.content.Intent;
import android.content.SharedPreferences;
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageInfo;
-import android.graphics.Color;
import android.net.Uri;
-import android.os.Build;
import android.os.Bundle;
import android.os.Handler;
import android.os.SystemClock;
import android.provider.Settings;
import android.support.annotation.NonNull;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentTransaction;
import android.support.v4.util.ArrayMap;
import android.text.Html;
import android.text.Spanned;
import android.text.TextUtils;
import android.view.KeyEvent;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.widget.CheckedTextView;
-import android.widget.ImageView;
import com.gh.base.AppController;
import com.gh.base.BaseActivity;
-import com.gh.base.SearchBarHint;
import com.gh.common.constant.Config;
import com.gh.common.util.ClassUtils;
import com.gh.common.util.DataCollectionUtils;
@@ -47,37 +38,27 @@ import com.gh.download.DataWatcher;
import com.gh.download.DownloadEntity;
import com.gh.download.DownloadManager;
import com.gh.download.DownloadStatus;
-import com.gh.gamecenter.db.KeFuMarkReadDao;
-import com.gh.gamecenter.db.MessageMarkReadDao;
import com.gh.gamecenter.db.info.ConcernInfo;
import com.gh.gamecenter.db.info.GameInfo;
-import com.gh.gamecenter.db.info.MessageMarkReadInfo;
import com.gh.gamecenter.entity.ApkEntity;
import com.gh.gamecenter.entity.GameDigestEntity;
import com.gh.gamecenter.entity.GameEntity;
import com.gh.gamecenter.entity.GameUpdateEntity;
-import com.gh.gamecenter.entity.MessageUnreadEntity;
import com.gh.gamecenter.eventbus.EBDownloadStatus;
import com.gh.gamecenter.eventbus.EBPackage;
-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.fragment.GameFragment;
+import com.gh.gamecenter.fragment.MainFragment;
import com.gh.gamecenter.manager.ConcernManager;
import com.gh.gamecenter.manager.DataCollectionManager;
import com.gh.gamecenter.manager.FilterManager;
import com.gh.gamecenter.manager.GameManager;
import com.gh.gamecenter.manager.PackageManager;
import com.gh.gamecenter.manager.UpdateManager;
-import com.gh.gamecenter.message.MessageFragment;
-import com.gh.gamecenter.news.NewsFragment;
-import com.gh.gamecenter.personal.PersonalFragment;
import com.gh.gamecenter.retrofit.JSONObjectResponse;
import com.gh.gamecenter.retrofit.ObservableUtil;
import com.gh.gamecenter.retrofit.Response;
import com.gh.gamecenter.retrofit.RetrofitManager;
-import com.readystatesoftware.systembartint.SystemBarTintManager;
import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
@@ -95,7 +76,6 @@ import java.util.concurrent.CountDownLatch;
import java.util.zip.ZipEntry;
import java.util.zip.ZipFile;
-import butterknife.BindView;
import okhttp3.MediaType;
import okhttp3.RequestBody;
import okhttp3.ResponseBody;
@@ -109,40 +89,13 @@ import rx.schedulers.Schedulers;
/**
* 项目的主Activity，3个Fragment都嵌入在这里。
*/
-public class MainActivity extends BaseActivity implements OnClickListener {
+public class MainActivity extends BaseActivity {
- public static final int INDEX_GAME = 0;
- public static final int INDEX_NEWS = 1;
- public static final int INDEX_MESSAGE = 2;
- public static final int INDEX_PERSONAL = 3;
public final static String EB_MAINACTIVITY_TAG = "MainActivity";
public final static String EB_SKIP_GAMEFRAGMENT = "GameFragment";
- @BindView(R.id.main_iv_game)
- ImageView ivGame;
- @BindView(R.id.main_iv_news)
- ImageView ivNews;
- @BindView(R.id.main_iv_message)
- ImageView ivMessage;
- @BindView(R.id.main_iv_personal)
- ImageView ivPersonal;
- @BindView(R.id.main_tv_game)
- CheckedTextView tvGame;
- @BindView(R.id.main_tv_news)
- CheckedTextView tvNews;
- @BindView(R.id.main_tv_message)
- CheckedTextView tvMessage;
- @BindView(R.id.main_tv_personal)
- CheckedTextView tvPersonal;
- @BindView(R.id.main_iv_message_hint)
- View mMessageHint;
- private NewsFragment newsFragment;
- private MessageFragment messageFragment;
- private PersonalFragment personalFragment;
- private GameFragment gameFragment;
private SharedPreferences sp;
private ConcernManager concernManager;
- private ArrayList mSearchHintLint;
- private int currentTab;
+
private boolean isSkipped;
Runnable skipRun = new Runnable() {
@Override
@@ -374,13 +327,12 @@ public class MainActivity extends BaseActivity implements OnClickListener {
@Override
protected void onSaveInstanceState(Bundle outState) {
super.onSaveInstanceState(outState);
- outState.putInt("currentTab", currentTab);
outState.putBoolean("isSkipped", isSkipped);
}
@Override
protected int getLayoutId() {
- return R.layout.activity_main;
+ return R.layout.layout_wrapper_activity;
}
@Override
@@ -681,19 +633,18 @@ public class MainActivity extends BaseActivity implements OnClickListener {
isSkipped = false;
- initViews();
+// initViews();
if (savedInstanceState != null) {
- currentTab = savedInstanceState.getInt("currentTab");
+// currentTab = savedInstanceState.getInt("currentTab");
isSkipped = savedInstanceState.getBoolean("isSkipped");
- } else {
- currentTab = 0;
+// } else {
+// currentTab = 0;
}
- setTabSelection(currentTab);
+
+ replaceFragment(new MainFragment());
concernManager = new ConcernManager(getApplicationContext());
- getSearchHints();
-
if (!isNewFirstLaunch && sp.getBoolean("autoupdate", true)) {
// 检查助手更新
UpdateManager.getInstance(this).checkUpdate(true, null);
@@ -745,9 +696,6 @@ public class MainActivity extends BaseActivity implements OnClickListener {
getSuggestionType();
- checkMarkRead(); // 检查是否有记录已读消息
-
- checkMessageUnread(true); // 检查是否有未读消息
}
@Override
@@ -762,123 +710,6 @@ public class MainActivity extends BaseActivity implements OnClickListener {
handler.removeCallbacksAndMessages(null);
}
- private void checkMessageUnread(boolean isCheck) {
- TokenUtils.getToken(this, isCheck)
- .flatMap(new Func1>() {
- @Override
- public Observable call(String token) {
- return RetrofitManager.getMessage().getMessageUnread(token);
- }
- })
- .subscribeOn(Schedulers.io())
- .observeOn(AndroidSchedulers.mainThread())
- .subscribe(new Response() {
- @Override
- public void onResponse(MessageUnreadEntity response) {
- super.onResponse(response);
- if (response != null && response.getKefuList() != null && response.getKefuList().size() > 0) {
- KeFuMarkReadDao dao = new KeFuMarkReadDao(MainActivity.this);
- for (int i = 0; i < response.getKefuList().size(); i++) {
- if (dao.isMarkRead(response.getKefuList().get(i))) {
- response.getKefuList().remove(i);
- i--;
- }
- }
-
- if (response.getKefuList() != null && response.getKefuList().size() > 0) {
- mMessageHint.setVisibility(View.VISIBLE);
- }
-
- }
-
- if (response != null && response.getComment() > 0) {
- mMessageHint.setVisibility(View.VISIBLE);
- }
- }
-
- @Override
- public void onFailure(HttpException e) {
- if (e != null && e.code() == 401) {
- checkMessageUnread(false);
- }
- }
- });
- }
-
- private void checkMarkRead() {
- MessageMarkReadDao readDao = new MessageMarkReadDao(MainActivity.this);
- List readInfos = readDao.getAll();
- if (readInfos == null || readInfos.size() == 0) {
- return;
- }
-
- MessageMarkReadInfo readInfo = readInfos.get(0);
- HashMap kefuIds = readInfo.getKefuIds();
- HashMap noticeIds = readInfo.getNoticeIds();
-
- if (kefuIds != null && kefuIds.size() > 0) {
- Utils.log("======提交已读客服消息");
- JSONArray array = new JSONArray();
- for (String s : kefuIds.keySet()) {
- array.put(s);
- }
- Utils.log("======客服id::" + array.toString());
- RequestBody body = RequestBody.create(MediaType.parse("application/json"), array.toString());
- postMarkRead("kefu", true, body, readDao);
- }
-
- if (noticeIds != null && noticeIds.size() > 0) {
- Utils.log("======提交已读公告消息");
- JSONArray array = new JSONArray();
- for (String s : noticeIds.keySet()) {
- array.put(s);
- }
- Utils.log("======客服id::" + array.toString());
- RequestBody body = RequestBody.create(MediaType.parse("application/json"), array.toString());
- postMarkRead("notice", true, body, readDao);
- }
-
- }
-
- private void postMarkRead(final String type, boolean isCkeck, final RequestBody body, final MessageMarkReadDao readDao) {
- TokenUtils
- .getToken(MainActivity.this, isCkeck)
- .flatMap(new Func1>() {
- @Override
- public Observable call(String token) {
- if ("kefu".equals(type)) {
- return RetrofitManager.getMessage().postMarkKeFuRead(body, token);
- } else {
- return RetrofitManager.getMessage().postMarkNoticeRead(body, token);
- }
- }
- })
- .subscribeOn(Schedulers.io())
- .observeOn(AndroidSchedulers.mainThread())
- .subscribe(new Response() {
- @Override
- public void onResponse(ResponseBody response) {
- super.onResponse(response);
- Utils.log("=========postMarkRead::" + type);
- if ("kefu".equals(type)) {
- readDao.cleanKeFu();
- } else {
- readDao.cleanNotice();
- }
-
- }
-
- @Override
- public void onFailure(HttpException e) {
- super.onFailure(e);
- if (e != null && e.code() == 401) {
- postMarkRead(type, false, body, readDao);
- }
- }
- });
-
- }
-
private void getSuggestionType() {
RetrofitManager
.getApi()
@@ -996,7 +827,7 @@ public class MainActivity extends BaseActivity implements OnClickListener {
final ArrayList concernDigest = new ArrayList<>();
if (arrGameId.size() == 0) {
- EventBus.getDefault().post(new EBUISwitch("NewsFragment", -2)); // 没有关注
+ EventBus.getDefault().post(new EBUISwitch("NewsWrapperFragment", -2)); // 没有关注
}
List> list = new ArrayList<>();
@@ -1019,13 +850,6 @@ public class MainActivity extends BaseActivity implements OnClickListener {
});
}
- private void initViews() {
- findViewById(R.id.main_ll_game).setOnClickListener(this);
- findViewById(R.id.main_ll_news).setOnClickListener(this);
- findViewById(R.id.main_ll_message).setOnClickListener(this);
- findViewById(R.id.main_ll_personal).setOnClickListener(this);
- }
-
private void checkPermission() {
List installedList = getPackageManager().getInstalledPackages(0);
if (installedList.isEmpty()) {
@@ -1049,32 +873,6 @@ public class MainActivity extends BaseActivity implements OnClickListener {
}
}
- private void getSearchHints() {
- RetrofitManager.getApi().getSearchHints()
- .subscribeOn(Schedulers.io())
- .observeOn(AndroidSchedulers.mainThread())
- .subscribe(new Response>() {
- @Override
- public void onResponse(ArrayList response) {
- if (response.size() != 0) {
-// if (response.size() == 1) {
-// mSearchHintLint = response.get(0);
-// } else {
-// mSearchHintLint = response.get(RandomUtils.nextInt(response.size()));
-// }
-
- mSearchHintLint = response;
- if (gameFragment != null) {
- gameFragment.setHint(mSearchHintLint);
- }
- if (newsFragment != null) {
- newsFragment.setHint(mSearchHintLint);
- }
- }
- }
- });
- }
-
// 获取META-INF中的plugin_update 文件，判断是否从游戏插件中下载的app，是则获取游戏id，启动游戏更新，下载该游戏
private void getPluginUpdate() {
ApplicationInfo appinfo = getApplicationInfo();
@@ -1109,133 +907,6 @@ public class MainActivity extends BaseActivity implements OnClickListener {
}
}
- @Override
- public void onClick(View v) {
- final int id = v.getId();
- switch (v.getId()) {
- case R.id.main_ll_game:
- EventBus.getDefault().post(new EBUISwitch(EB_MAINACTIVITY_TAG, INDEX_GAME));
- setTabSelection(INDEX_GAME);
- break;
- case R.id.main_ll_news:
- EventBus.getDefault().post(new EBUISwitch(EB_MAINACTIVITY_TAG, INDEX_NEWS));
- setTabSelection(INDEX_NEWS);
- break;
- case R.id.main_ll_message:
- EventBus.getDefault().post(new EBUISwitch(EB_MAINACTIVITY_TAG, INDEX_MESSAGE));
- setTabSelection(INDEX_MESSAGE);
- break;
- case R.id.main_ll_personal:
- EventBus.getDefault().post(new EBUISwitch(EB_MAINACTIVITY_TAG, INDEX_PERSONAL));
- setTabSelection(INDEX_PERSONAL);
- break;
- default:
- break;
- }
-
- SystemBarTintManager tintManager = getTintManager();
- if (tintManager != null && Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
- if (id == R.id.main_ll_personal) {
- tintManager.setStatusBarTintResource(R.color.theme);
- } else if (Build.MANUFACTURER.equals("Meizu") || Build.MANUFACTURER.equals("Xiaomi")) {
- tintManager.setStatusBarTintColor(Color.WHITE);
- } else {
- tintManager.setStatusBarTintColor(Color.BLACK);
- }
- }
- }
-
- private void setTabSelection(int index) {
- clearSelection();
- FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
- hideFragments(transaction);
- switch (index) {
- case INDEX_GAME:
- ivGame.setImageResource(R.drawable.ic_game_select);
- tvGame.setChecked(true);
- gameFragment = alterFragment(transaction, GameFragment.class);
- break;
- case INDEX_NEWS:
- ivNews.setImageResource(R.drawable.ic_news_select);
- tvNews.setChecked(true);
- newsFragment = alterFragment(transaction, NewsFragment.class);
- break;
- case INDEX_MESSAGE:
- ivMessage.setImageResource(R.drawable.ic_message_select);
- tvMessage.setChecked(true);
- messageFragment = alterFragment(transaction, MessageFragment.class);
- break;
- case INDEX_PERSONAL:
- ivPersonal.setImageResource(R.drawable.ic_user_select);
- tvPersonal.setChecked(true);
- personalFragment = alterFragment(transaction, PersonalFragment.class);
- break;
- default:
- break;
- }
- currentTab = index;
- transaction.commit();
- }
-
- // 清除掉所有的选中状态。
- private void clearSelection() {
- ivGame.setImageResource(R.drawable.ic_game_unselect);
- ivNews.setImageResource(R.drawable.ic_news_unselect);
- ivMessage.setImageResource(R.drawable.ic_message_unselect);
- ivPersonal.setImageResource(R.drawable.ic_user_unselect);
-
- tvGame.setChecked(false);
- tvNews.setChecked(false);
- tvMessage.setChecked(false);
- tvPersonal.setChecked(false);
- }
-
- // 将所有的Fragment都置为隐藏状态。
- private void hideFragments(FragmentTransaction transaction) {
- List list = getSupportFragmentManager().getFragments();
- if (list != null) {
- for (Fragment fragment : list) {
- transaction.hide(fragment);
- }
- }
- }
-
- // private T alterFragment(Class cls) {
- private T alterFragment(FragmentTransaction transaction, Class cls) {
- T fragmentByTag = (T) getSupportFragmentManager().findFragmentByTag(cls.getSimpleName());
- try {
- if (fragmentByTag != null) {
- transaction.show(fragmentByTag);
- } else {
- fragmentByTag = cls.newInstance();
- transaction.add(R.id.main_content, fragmentByTag, cls.getSimpleName());
- if (fragmentByTag instanceof SearchBarHint && mSearchHintLint != null && mSearchHintLint.size() > 0) {
- ((SearchBarHint) fragmentByTag).setHint(mSearchHintLint);
- }
- }
- } catch (Exception e) {
- e.printStackTrace();
- }
- return fragmentByTag;
- }
-
- @Subscribe(threadMode = ThreadMode.MAIN)
- public void onEventMainThread(EBSkip skip) {
- if (EB_SKIP_GAMEFRAGMENT.equals(skip.getType())) {
- EventBus.getDefault().post(new EBUISwitch(EB_MAINACTIVITY_TAG, INDEX_GAME));
- setTabSelection(INDEX_GAME);
- EventBus.getDefault().post(new EBSkip(EB_MAINACTIVITY_TAG, skip.getCurrentItem()));
- }
- }
-
- @Subscribe(threadMode = ThreadMode.MAIN)
- public void onEventMainThread(EBReuse reuse) {
- if (MessageFragment.MESSAGE_READ_OVER.equals(reuse.getType())) {
- Utils.log("======= over??");
- mMessageHint.setVisibility(View.GONE);
- }
- }
-
@Subscribe(threadMode = ThreadMode.MAIN)
public void onEventMainThread(EBPackage busFour) {
final String packageName = busFour.getPackageName();
diff --git a/app/src/main/java/com/gh/gamecenter/SkipActivity.java b/app/src/main/java/com/gh/gamecenter/SkipActivity.java
index 2974e5fd42..cc97b12c43 100644
--- a/app/src/main/java/com/gh/gamecenter/SkipActivity.java
+++ b/app/src/main/java/com/gh/gamecenter/SkipActivity.java
@@ -38,7 +38,7 @@ public class SkipActivity extends BaseActivity {
@Override
protected int getLayoutId() {
//TODO 暂时无意义设置，避免崩溃罢了，修改完主题和Toolbar相关内容会干掉这个
- return R.layout.activity_main;
+ return R.layout.fragment_main;
}
@Override
diff --git a/app/src/main/java/com/gh/gamecenter/adapter/ImagePagerAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/ImagePagerAdapter.java
index 9a10c42c60..e75347b229 100644
--- a/app/src/main/java/com/gh/gamecenter/adapter/ImagePagerAdapter.java
+++ b/app/src/main/java/com/gh/gamecenter/adapter/ImagePagerAdapter.java
@@ -70,6 +70,7 @@ public class ImagePagerAdapter extends RecyclingPagerAdapter {
ImageUtils.getInstance().display(mContext.getResources(), (SimpleDraweeView) view,
slideEntity.getImage(), R.drawable.preload);
+
// indicator.setPosition(mSlideEntityList.mSize(), getPosition(position));
view.setOnClickListener(new View.OnClickListener() {
diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameViewPagerViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameViewPagerViewHolder.java
index 027209efb0..e4f5b76ff6 100644
--- a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameViewPagerViewHolder.java
+++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameViewPagerViewHolder.java
@@ -1,8 +1,9 @@
package com.gh.gamecenter.adapter.viewholder;
import android.view.View;
+import android.view.ViewGroup;
+import android.widget.FrameLayout;
import android.widget.LinearLayout;
-import android.widget.RelativeLayout;
import android.widget.TextView;
import com.gh.base.BaseRecyclerViewHolder;
@@ -23,15 +24,18 @@ public class GameViewPagerViewHolder extends BaseRecyclerViewHolder {
public LinearLayout viewpager_ll_hint;
@BindView(R.id.viewpager_tv_failure)
public TextView viewpager_tv_failure;
- @BindView(R.id.home_subject_rl)
- public RelativeLayout subjectRl;
@BindView(R.id.home_subject_failure)
public TextView subjectFailure;
@BindView(R.id.home_subject_ll)
public LinearLayout subjectLl;
- public GameViewPagerViewHolder(View itemView) {
+ public GameViewPagerViewHolder(View itemView, int width) {
super(itemView);
+ // 傻逼viewpager拿不到高度，一定要自己算下，妈的，先不管了
+ FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(
+ ViewGroup.LayoutParams.MATCH_PARENT, (int) (width / 16f * 7f));
+ viewPager.setLayoutParams(params);
+
}
}
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 db930a33d1..a5724f9943 100644
--- a/app/src/main/java/com/gh/gamecenter/download/FileSendFragment.java
+++ b/app/src/main/java/com/gh/gamecenter/download/FileSendFragment.java
@@ -6,7 +6,7 @@ import android.text.Html;
import android.view.View;
import android.widget.TextView;
-import com.gh.base.BaseFragment;
+import com.gh.base.fragment.BaseFragment;
import com.gh.common.util.DialogUtils;
import com.gh.common.util.StringUtils;
import com.gh.gamecenter.CleanApkActivity;
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 0639feb55a..52a438c1ac 100644
--- a/app/src/main/java/com/gh/gamecenter/download/GameDownloadFragment.java
+++ b/app/src/main/java/com/gh/gamecenter/download/GameDownloadFragment.java
@@ -15,7 +15,7 @@ import android.widget.LinearLayout;
import android.widget.RelativeLayout;
import android.widget.TextView;
-import com.gh.base.BaseFragment;
+import com.gh.base.fragment.BaseFragment;
import com.gh.common.constant.Constants;
import com.gh.common.util.DialogUtils;
import com.gh.common.util.NetworkUtils;
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 ff40f55e54..f36aa86354 100644
--- a/app/src/main/java/com/gh/gamecenter/download/GameUpdateFragment.java
+++ b/app/src/main/java/com/gh/gamecenter/download/GameUpdateFragment.java
@@ -7,7 +7,7 @@ import android.view.View;
import android.widget.LinearLayout;
import android.widget.TextView;
-import com.gh.base.BaseFragment;
+import com.gh.base.fragment.BaseFragment;
import com.gh.common.util.EntranceUtils;
import com.gh.gamecenter.MainActivity;
import com.gh.gamecenter.R;
diff --git a/app/src/main/java/com/gh/gamecenter/fragment/GameFragment.java b/app/src/main/java/com/gh/gamecenter/fragment/GameFragment.java
index 5ce40754a5..9eeeef4aff 100644
--- a/app/src/main/java/com/gh/gamecenter/fragment/GameFragment.java
+++ b/app/src/main/java/com/gh/gamecenter/fragment/GameFragment.java
@@ -37,7 +37,7 @@ import java.util.List;
* Created by khy on 2016/12/6.
* 新主界面
*/
-public class GameFragment extends HomeFragment implements SwipeRefreshLayout.OnRefreshListener, OnRequestCallBackListener {
+public class GameFragment extends SearchToolbarFragment implements SwipeRefreshLayout.OnRefreshListener, OnRequestCallBackListener {
private SwipeRefreshLayout fm_game_swipe_refresh;
private RecyclerView fm_game_rv_list;
@@ -91,8 +91,7 @@ public class GameFragment extends HomeFragment implements SwipeRefreshLayout.OnR
@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);
@@ -115,7 +114,7 @@ public class GameFragment extends HomeFragment implements SwipeRefreshLayout.OnR
((DefaultItemAnimator) fm_game_rv_list.getItemAnimator()).setSupportsChangeAnimations(false);
fm_game_rv_list.setHasFixedSize(true);
fm_game_rv_list.setLayoutManager(new LinearLayoutManager(getActivity()));
- adapter = new GameFragmentAdapter(GameFragment.this, fm_game_swipe_refresh);
+ adapter = new GameFragmentAdapter(this, fm_game_swipe_refresh);
fm_game_rv_list.setAdapter(adapter);
fm_game_rv_list.addOnScrollListener(new RecyclerView.OnScrollListener() {
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 ba241ecb20..1af3438a05 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,295 @@
-//package com.gh.gamecenter.fragment;
-//
-///**
-// * @author CsHeng
-// * @Date 05/05/2017
-// * @Time 3:26 PM
-// */
-//
-//public class MainFragment {
-//}
+package com.gh.gamecenter.fragment;
+
+import android.content.Context;
+import android.graphics.Color;
+import android.os.Build;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v4.app.Fragment;
+import android.view.View;
+
+import com.gh.base.SearchBarHint;
+import com.gh.base.fragment.BaseFragment_ViewPager_Checkable;
+import com.gh.common.util.TokenUtils;
+import com.gh.common.util.Utils;
+import com.gh.gamecenter.MainActivity;
+import com.gh.gamecenter.R;
+import com.gh.gamecenter.db.KeFuMarkReadDao;
+import com.gh.gamecenter.db.MessageMarkReadDao;
+import com.gh.gamecenter.db.info.MessageMarkReadInfo;
+import com.gh.gamecenter.entity.MessageUnreadEntity;
+import com.gh.gamecenter.eventbus.EBReuse;
+import com.gh.gamecenter.eventbus.EBSkip;
+import com.gh.gamecenter.eventbus.EBUISwitch;
+import com.gh.gamecenter.message.MessageFragment;
+import com.gh.gamecenter.news.NewsWrapperFragment;
+import com.gh.gamecenter.personal.PersonalFragment;
+import com.gh.gamecenter.retrofit.Response;
+import com.gh.gamecenter.retrofit.RetrofitManager;
+import com.lightgame.view.NoScrollableViewPager;
+import com.readystatesoftware.systembartint.SystemBarTintManager;
+
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
+import org.json.JSONArray;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
+import butterknife.BindView;
+import okhttp3.MediaType;
+import okhttp3.RequestBody;
+import okhttp3.ResponseBody;
+import retrofit2.HttpException;
+import rx.Observable;
+import rx.android.schedulers.AndroidSchedulers;
+import rx.functions.Func1;
+import rx.schedulers.Schedulers;
+
+import static com.gh.gamecenter.MainActivity.EB_MAINACTIVITY_TAG;
+import static com.gh.gamecenter.MainActivity.EB_SKIP_GAMEFRAGMENT;
+
+/**
+ * @author CsHeng
+ * @Date 05/05/2017
+ * @Time 3:26 PM
+ */
+
+public class MainFragment extends BaseFragment_ViewPager_Checkable {
+
+ public static final int INDEX_GAME = 0;
+ public static final int INDEX_NEWS = 1;
+ public static final int INDEX_MESSAGE = 2;
+ public static final int INDEX_PERSONAL = 3;
+ private ArrayList mSearchHintLint;
+ @BindView(R.id.main_iv_message_hint)
+ View mMessageHint;
+
+ @Override
+ protected int getLayoutId() {
+ return R.layout.fragment_main;
+ }
+
+ @Override
+ protected int getCheckableGroupId() {
+ return R.id.lightgame_tab_container;
+ }
+
+ @Override
+ protected int getViewPagerId() {
+ return R.id.lightgame_tab_viewpager;
+ }
+
+ @Override
+ protected void initFragmentList(List fragments) {
+ fragments.add(new GameFragment());
+ fragments.add(new NewsWrapperFragment());
+ fragments.add(new MessageFragment());
+ fragments.add(new PersonalFragment());
+ }
+
+ @Override
+ public void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+
+ checkMarkRead(getContext()); // 检查是否有记录已读消息
+ checkMessageUnread(getContext(), true); // 检查是否有未读消息
+ }
+
+ @Override
+ public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+ super.onViewCreated(view, savedInstanceState);
+ if (mViewPager instanceof NoScrollableViewPager) {
+ ((NoScrollableViewPager) mViewPager).setScrollable(false);
+ }
+ getSearchHints();
+ }
+
+ @Override
+ protected boolean handleOnClick(View view) {
+ boolean res = super.handleOnClick(view);
+ EventBus.getDefault().post(new EBUISwitch(EB_MAINACTIVITY_TAG, mCheckedIndex));
+ return res;
+ }
+
+ @Override
+ protected void onPageChanged(int index) {
+ super.onPageChanged(index);
+
+ Fragment fragment = mFragmentsList.get(index);
+ if (fragment instanceof SearchBarHint && mSearchHintLint != null && !mSearchHintLint.isEmpty()) {
+ ((SearchBarHint) fragment).setHint(mSearchHintLint);
+ }
+
+ if (getActivity() instanceof MainActivity) {
+ SystemBarTintManager tintManager = ((MainActivity) getActivity()).getTintManager();
+ if (tintManager != null && Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+ if (index == INDEX_PERSONAL) {
+ tintManager.setStatusBarTintResource(R.color.theme);
+ } else if (Build.MANUFACTURER.equals("Meizu") || Build.MANUFACTURER.equals("Xiaomi")) {
+ tintManager.setStatusBarTintColor(Color.WHITE);
+ } else {
+ tintManager.setStatusBarTintColor(Color.BLACK);
+ }
+ }
+ }
+ }
+
+ @Subscribe(threadMode = ThreadMode.MAIN)
+ public void onEventMainThread(EBSkip skip) {
+ if (EB_SKIP_GAMEFRAGMENT.equals(skip.getType())) {
+ EventBus.getDefault().post(new EBUISwitch(EB_MAINACTIVITY_TAG, INDEX_GAME));
+ checkIndex(INDEX_GAME);
+ EventBus.getDefault().post(new EBSkip(EB_MAINACTIVITY_TAG, skip.getCurrentItem()));
+ }
+ }
+
+ @Subscribe(threadMode = ThreadMode.MAIN)
+ public void onEventMainThread(EBReuse reuse) {
+ if (MessageFragment.MESSAGE_READ_OVER.equals(reuse.getType())) {
+ if (mMessageHint != null) {
+ mMessageHint.setVisibility(View.GONE);
+ }
+ }
+ }
+
+ private void getSearchHints() {
+ RetrofitManager.getApi().getSearchHints()
+ .subscribeOn(Schedulers.io())
+ .observeOn(AndroidSchedulers.mainThread())
+ .subscribe(new Response>() {
+ @Override
+ public void onResponse(ArrayList response) {
+ if (response.size() != 0) {
+ mSearchHintLint = response;
+
+ for (Fragment fragment : mFragmentsList) {
+ if (fragment instanceof SearchBarHint) {
+ ((SearchBarHint) fragment).setHint(mSearchHintLint);
+ }
+ }
+ }
+ }
+ });
+ }
+
+ private void checkMessageUnread(final Context context, boolean isCheck) {
+ TokenUtils.getToken(context, isCheck)
+ .flatMap(new Func1>() {
+ @Override
+ public Observable call(String token) {
+ return RetrofitManager.getMessage().getMessageUnread(token);
+ }
+ })
+ .subscribeOn(Schedulers.io())
+ .observeOn(AndroidSchedulers.mainThread())
+ .subscribe(new Response() {
+ @Override
+ public void onResponse(MessageUnreadEntity response) {
+ super.onResponse(response);
+ if (response != null && response.getKefuList() != null && response.getKefuList().size() > 0) {
+ KeFuMarkReadDao dao = new KeFuMarkReadDao(context);
+ for (int i = 0; i < response.getKefuList().size(); i++) {
+ if (dao.isMarkRead(response.getKefuList().get(i))) {
+ response.getKefuList().remove(i);
+ i--;
+ }
+ }
+
+ if (response.getKefuList() != null && response.getKefuList().size() > 0) {
+ mMessageHint.setVisibility(View.VISIBLE);
+ }
+
+ }
+
+ if (response != null && response.getComment() > 0) {
+ mMessageHint.setVisibility(View.VISIBLE);
+ }
+ }
+
+ @Override
+ public void onFailure(HttpException e) {
+ if (e != null && e.code() == 401) {
+ checkMessageUnread(getContext(), false);
+ }
+ }
+ });
+ }
+
+ private void checkMarkRead(Context context) {
+ MessageMarkReadDao readDao = new MessageMarkReadDao(context);
+ List readInfos = readDao.getAll();
+ if (readInfos == null || readInfos.size() == 0) {
+ return;
+ }
+
+ MessageMarkReadInfo readInfo = readInfos.get(0);
+ HashMap kefuIds = readInfo.getKefuIds();
+ HashMap noticeIds = readInfo.getNoticeIds();
+
+ if (kefuIds != null && kefuIds.size() > 0) {
+ Utils.log("======提交已读客服消息");
+ JSONArray array = new JSONArray();
+ for (String s : kefuIds.keySet()) {
+ array.put(s);
+ }
+ Utils.log("======客服id::" + array.toString());
+ RequestBody body = RequestBody.create(MediaType.parse("application/json"), array.toString());
+ postMarkRead(context, "kefu", true, body, readDao);
+ }
+
+ if (noticeIds != null && noticeIds.size() > 0) {
+ Utils.log("======提交已读公告消息");
+ JSONArray array = new JSONArray();
+ for (String s : noticeIds.keySet()) {
+ array.put(s);
+ }
+ Utils.log("======客服id::" + array.toString());
+ RequestBody body = RequestBody.create(MediaType.parse("application/json"), array.toString());
+ postMarkRead(context, "notice", true, body, readDao);
+ }
+
+ }
+
+ private void postMarkRead(final Context context, final String type, boolean isCkeck, final RequestBody body,
+ final MessageMarkReadDao readDao) {
+ TokenUtils.getToken(context, isCkeck)
+ .flatMap(new Func1>() {
+ @Override
+ public Observable call(String token) {
+ if ("kefu".equals(type)) {
+ return RetrofitManager.getMessage().postMarkKeFuRead(body, token);
+ } else {
+ return RetrofitManager.getMessage().postMarkNoticeRead(body, token);
+ }
+ }
+ })
+ .subscribeOn(Schedulers.io())
+ .observeOn(AndroidSchedulers.mainThread())
+ .subscribe(new Response() {
+ @Override
+ public void onResponse(ResponseBody response) {
+ super.onResponse(response);
+ Utils.log("=========postMarkRead::" + type);
+ if ("kefu".equals(type)) {
+ readDao.cleanKeFu();
+ } else {
+ readDao.cleanNotice();
+ }
+
+ }
+
+ @Override
+ public void onFailure(HttpException e) {
+ super.onFailure(e);
+ if (e != null && e.code() == 401) {
+ postMarkRead(context, type, false, body, readDao);
+ }
+ }
+ });
+
+ }
+
+}
diff --git a/app/src/main/java/com/gh/gamecenter/fragment/NewsFragment.java b/app/src/main/java/com/gh/gamecenter/fragment/NewsFragment.java
new file mode 100644
index 0000000000..636ff5a57d
--- /dev/null
+++ b/app/src/main/java/com/gh/gamecenter/fragment/NewsFragment.java
@@ -0,0 +1,129 @@
+package com.gh.gamecenter.fragment;
+
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v4.app.Fragment;
+import android.util.DisplayMetrics;
+import android.view.View;
+import android.widget.LinearLayout;
+
+import com.gh.base.fragment.BaseFragment_ViewPager_Checkable;
+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.eventbus.EBUISwitch;
+import com.gh.gamecenter.news.News1Fragment;
+import com.gh.gamecenter.news.News2Fragment;
+import com.gh.gamecenter.news.News3Fragment;
+import com.gh.gamecenter.news.News4Fragment;
+
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
+
+import java.util.List;
+
+import butterknife.BindView;
+
+import static com.gh.gamecenter.news.NewsWrapperFragment.EB_NEWSFRAGMENT_TAG;
+
+/**
+ * @author CsHeng
+ * @Date 17/06/2017
+ * @Time 10:30 AM
+ */
+
+public class NewsFragment extends BaseFragment_ViewPager_Checkable {
+
+ @BindView(R.id.slidebar_line)
+ View mNewsSlidebarLine;
+ private LinearLayout.LayoutParams mLayoutParams;
+ private int mWidth;
+
+ @Override
+ protected int getLayoutId() {
+ return R.layout.fragment_news;
+ }
+
+ @Override
+ protected int getCheckableGroupId() {
+ return R.id.lightgame_tab_container;
+ }
+
+ @Override
+ protected int getViewPagerId() {
+ return R.id.lightgame_tab_viewpager;
+ }
+
+ @Override
+ protected void initFragmentList(List fragments) {
+ fragments.add(new News1Fragment());
+ fragments.add(new News2Fragment());
+ fragments.add(new News3Fragment());
+ fragments.add(new News4Fragment());
+ }
+
+ @Override
+ public void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ DisplayMetrics outMetrics = new DisplayMetrics();
+ getActivity().getWindowManager().getDefaultDisplay().getMetrics(outMetrics);
+ mWidth = outMetrics.widthPixels / 4;
+ mLayoutParams = new LinearLayout.LayoutParams(mWidth / 2, DisplayUtils.dip2px(getActivity(), 2));
+ }
+
+ @Override
+ public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+ super.onViewCreated(view, savedInstanceState);
+
+ mLayoutParams.leftMargin = (int) (mWidth * (mCheckedIndex + 0.25f));
+ mNewsSlidebarLine.setLayoutParams(mLayoutParams);
+
+ view.postDelayed(new Runnable() {
+ @Override
+ public void run() {
+ EventBus.getDefault().post(new EBUISwitch(EB_NEWSFRAGMENT_TAG, mCheckedIndex));
+ }
+ }, 100);
+ }
+
+ @Override
+ public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
+ super.onPageScrolled(position, positionOffset, positionOffsetPixels);
+ if (positionOffset != 0) {
+ mLayoutParams.leftMargin = (int) (mWidth * (position + positionOffset + 0.25f));
+ mNewsSlidebarLine.setLayoutParams(mLayoutParams);
+// } else {
+// if (currentItem != mNewsVP.getCurrentItem()) {
+// currentItem = mNewsVP.getCurrentItem();
+// EventBus.getDefault().post(new EBUISwitch(EB_NEWSFRAGMENT_TAG, currentItem));
+// }
+ }
+ }
+
+ @Override
+ protected void onPageChanged(int index) {
+ super.onPageChanged(index);
+ if (index == 0) {
+ DataCollectionUtils.uploadPosition(getActivity(), "资讯", "1", "资讯");
+ } else if (index == 1) {
+ DataCollectionUtils.uploadPosition(getActivity(), "资讯", "2", "攻略");
+ } else if (index == 2) {
+ DataCollectionUtils.uploadPosition(getActivity(), "资讯", "3", "原创");
+ } else if (index == 3) {
+ DataCollectionUtils.uploadPosition(getActivity(), "资讯", "4", "关注");
+ }
+ }
+
+ @Subscribe(threadMode = ThreadMode.MAIN)
+ public void onEventMainThread(EBUISwitch busNine) {
+ if (MainActivity.EB_MAINACTIVITY_TAG.equals(busNine.getFrom())) {
+ if (busNine.getPosition() == 1) {
+ EventBus.getDefault().post(new EBUISwitch(EB_NEWSFRAGMENT_TAG, mCheckedIndex));
+ }
+ }
+ }
+
+
+}
diff --git a/app/src/main/java/com/gh/gamecenter/fragment/HomeFragment.java b/app/src/main/java/com/gh/gamecenter/fragment/SearchToolbarFragment.java
similarity index 64%
rename from app/src/main/java/com/gh/gamecenter/fragment/HomeFragment.java
rename to app/src/main/java/com/gh/gamecenter/fragment/SearchToolbarFragment.java
index 5c9404e453..b27fe10d93 100644
--- a/app/src/main/java/com/gh/gamecenter/fragment/HomeFragment.java
+++ b/app/src/main/java/com/gh/gamecenter/fragment/SearchToolbarFragment.java
@@ -7,15 +7,13 @@ import android.view.View;
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.base.fragment.BaseFragment;
import com.gh.common.constant.Config;
import com.gh.common.util.DataCollectionUtils;
import com.gh.common.util.DataUtils;
-import com.gh.common.util.DisplayUtils;
import com.gh.common.util.EntranceUtils;
import com.gh.download.DownloadManager;
import com.gh.gamecenter.ConcernActivity;
@@ -38,39 +36,35 @@ import butterknife.BindView;
* Created by LGT on 2016/9/9.
* 工具栏 搜索控制
*/
-public abstract class HomeFragment extends BaseFragment implements View.OnClickListener, SearchBarHint {
+public class SearchToolbarFragment extends BaseFragment implements View.OnClickListener, SearchBarHint {
- private TextView downloadHint;
- private TextView searchHint;
+ @BindView(R.id.action_tip)
+ TextView mDownloadHintTv;
+
+ @BindView(R.id.actionbar_search_input)
+ TextView mSearchHintTv;
+
+ @BindView(R.id.actionbar_rl_download)
+ View mDownloadView;
private AlphaAnimation mAlphaAnimation;
- private ArrayList hintList;
- private int hintIndex;
+ private ArrayList mHintList;
+ private int mHintIndex;
- @BindView(R.id.actionbar_rl_download)
- View mActionBarDownloadView;
+ @Override
+ protected int getLayoutId() {
+ return R.layout.fragment_toolbar;
+ }
@Override
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);
- LinearLayout.LayoutParams lparams = new LinearLayout.LayoutParams(
- LinearLayout.LayoutParams.MATCH_PARENT, DisplayUtils.dip2px(getActivity(), 55));
-
-// if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
-// int top = DisplayUtils.getStatusBarHeight(getResources());
-// home_actionbar.setPadding(0, top, 0, 0);
-// lparams.height += top;
-// }
- home_actionbar.setLayoutParams(lparams);
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);
+ 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);
scaleAnimation.setDuration(500);
mAlphaAnimation = new AlphaAnimation(1f, 0.2f);
@@ -86,7 +80,7 @@ public abstract class HomeFragment extends BaseFragment implements View.OnClickL
@Override
public void onAnimationEnd(Animation animation) {
if (mAlphaAnimation != null) {
- searchHint.setAnimation(mAlphaAnimation);
+ mSearchHintTv.setAnimation(mAlphaAnimation);
mAlphaAnimation.start();
}
}
@@ -106,14 +100,14 @@ public abstract class HomeFragment extends BaseFragment implements View.OnClickL
@Override
public void onAnimationEnd(Animation animation) {
// 切换数据
- if (hintIndex > hintList.size() - 1) {
- hintIndex = 0;
+ if (mHintIndex > mHintList.size() - 1) {
+ mHintIndex = 0;
}
- searchHint.setHint(hintList.get(hintIndex));
- hintIndex++;
+ mSearchHintTv.setHint(mHintList.get(mHintIndex));
+ mHintIndex++;
if (scaleAnimation != null) {
- searchHint.setAnimation(scaleAnimation);
+ mSearchHintTv.setAnimation(scaleAnimation);
scaleAnimation.start();
}
}
@@ -124,12 +118,12 @@ public abstract class HomeFragment extends BaseFragment implements View.OnClickL
}
});
- if (hintList != null && hintList.size() > 0) {
- if (hintList.size() > 1) {
- searchHint.setAnimation(mAlphaAnimation);
+ if (mHintList != null && mHintList.size() > 0) {
+ if (mHintList.size() > 1) {
+ mSearchHintTv.setAnimation(mAlphaAnimation);
} else {
- String hint = hintList.get(0);
- searchHint.setHint(hint);
+ String hint = mHintList.get(0);
+ mSearchHintTv.setHint(hint);
}
}
@@ -140,49 +134,47 @@ public abstract class HomeFragment extends BaseFragment implements View.OnClickL
super.onCreate(savedInstanceState);
if (savedInstanceState != null) {
- hintList = savedInstanceState.getStringArrayList("hint");
+ mHintList = savedInstanceState.getStringArrayList("hint");
}
- hintIndex = 0;
+ mHintIndex = 0;
}
@Override
public void onSaveInstanceState(Bundle outState) {
super.onSaveInstanceState(outState);
- if (hintList != null && !hintList.isEmpty()) {
- outState.putStringArrayList("hint", hintList);
+ if (mHintList != null && !mHintList.isEmpty()) {
+ outState.putStringArrayList("hint", mHintList);
}
}
private void initActionBar(View view) {
- mActionBarDownloadView.setOnClickListener(this);
+ mDownloadView.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())) {
- mActionBarDownloadView.setVisibility(View.VISIBLE);
+ mDownloadView.setVisibility(View.VISIBLE);
} else {
- mActionBarDownloadView.setVisibility(View.GONE);
+ mDownloadView.setVisibility(View.GONE);
}
- downloadHint = (TextView) view.findViewById(R.id.action_tip);
int updateSize = PackageManager.getUpdateListSize();
int downloadSize = DownloadManager.getInstance(getActivity()).getAll().size();
if (downloadSize != 0) {
- downloadHint.setVisibility(View.VISIBLE);
- downloadHint.setText(String.valueOf(downloadSize));
+ mDownloadHintTv.setVisibility(View.VISIBLE);
+ mDownloadHintTv.setText(String.valueOf(downloadSize));
} else if (updateSize != 0) {
- downloadHint.setVisibility(View.VISIBLE);
- downloadHint.setText(String.valueOf(updateSize));
+ mDownloadHintTv.setVisibility(View.VISIBLE);
+ mDownloadHintTv.setText(String.valueOf(updateSize));
} else {
- downloadHint.setVisibility(View.GONE);
+ mDownloadHintTv.setVisibility(View.GONE);
}
- searchHint = (TextView) view.findViewById(R.id.actionbar_search_input);
- searchHint.setOnClickListener(this);
+ mSearchHintTv.setOnClickListener(this);
}
@Override
@@ -199,7 +191,7 @@ public abstract class HomeFragment extends BaseFragment implements View.OnClickL
Intent intent = new Intent(getActivity(), SearchActivity.class);
intent.putExtra("clicked", true);
- intent.putExtra("hint", searchHint.getHint().toString());
+ intent.putExtra("hint", mSearchHintTv.getHint().toString());
intent.putExtra(EntranceUtils.KEY_ENTRANCE, "(工具栏)");
startActivity(intent);
} else if (id == R.id.actionbar_search_input || id == R.id.actionbar_search_rl) {
@@ -208,7 +200,7 @@ public abstract class HomeFragment extends BaseFragment implements View.OnClickL
Intent intent = new Intent(getActivity(), SearchActivity.class);
intent.putExtra("clicked", false);
- intent.putExtra("hint", searchHint.getHint().toString());
+ intent.putExtra("hint", mSearchHintTv.getHint().toString());
intent.putExtra(EntranceUtils.KEY_ENTRANCE, "(工具栏)");
startActivity(intent);
} else if (id == R.id.actionbar_notification) {
@@ -226,9 +218,9 @@ public abstract class HomeFragment extends BaseFragment implements View.OnClickL
public void onEventMainThread(EBReuse reuse) {
if ("Refresh".equals(reuse.getType())) {
if (Config.isShow(getActivity())) {
- mActionBarDownloadView.setVisibility(View.VISIBLE);
+ mDownloadView.setVisibility(View.VISIBLE);
} else {
- mActionBarDownloadView.setVisibility(View.GONE);
+ mDownloadView.setVisibility(View.GONE);
}
}
}
@@ -238,24 +230,24 @@ public abstract class HomeFragment extends BaseFragment implements View.OnClickL
int updateSize = PackageManager.getUpdateListSize();
int downloadSize = DownloadManager.getInstance(getActivity()).getAll().size();
if (downloadSize != 0) {
- downloadHint.setVisibility(View.VISIBLE);
- downloadHint.setText(String.valueOf(downloadSize));
+ mDownloadHintTv.setVisibility(View.VISIBLE);
+ mDownloadHintTv.setText(String.valueOf(downloadSize));
} else if (updateSize != 0) {
- downloadHint.setVisibility(View.VISIBLE);
- downloadHint.setText(String.valueOf(updateSize));
+ mDownloadHintTv.setVisibility(View.VISIBLE);
+ mDownloadHintTv.setText(String.valueOf(updateSize));
} else {
- downloadHint.setVisibility(View.GONE);
+ mDownloadHintTv.setVisibility(View.GONE);
}
}
@Override
public void setHint(ArrayList hint) {
if (hint != null && hint.size() > 0) {
- hintList = hint;
- if (hint.size() == 1 && searchHint != null) {
- searchHint.setHint(hintList.get(0));
- } else if (mAlphaAnimation != null && searchHint != null) {
- searchHint.setAnimation(mAlphaAnimation);
+ mHintList = hint;
+ if (hint.size() == 1 && mSearchHintTv != null) {
+ mSearchHintTv.setHint(mHintList.get(0));
+ } else if (mAlphaAnimation != null && mSearchHintTv != null) {
+ mSearchHintTv.setAnimation(mAlphaAnimation);
}
}
}
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 3e2472a771..a01fa78a0c 100644
--- a/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.java
+++ b/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.java
@@ -11,18 +11,18 @@ import android.support.v7.widget.RecyclerView;
import android.support.v7.widget.RecyclerView.ViewHolder;
import android.text.TextUtils;
import android.util.DisplayMetrics;
-import android.view.LayoutInflater;
import android.view.View;
import android.view.View.OnClickListener;
import android.view.ViewGroup;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.ProgressBar;
-import android.widget.RelativeLayout;
import android.widget.TextView;
import android.widget.Toast;
import com.facebook.drawee.view.SimpleDraweeView;
+import com.gh.base.OnRequestCallBackListener;
+import com.gh.base.adapter.BaseRecyclerAdapter;
import com.gh.common.constant.ItemViewType;
import com.gh.common.util.ApkActiveUtils;
import com.gh.common.util.DataCollectionUtils;
@@ -46,7 +46,6 @@ import com.gh.gamecenter.PluginActivity;
import com.gh.gamecenter.R;
import com.gh.gamecenter.SubjectActivity;
import com.gh.gamecenter.ToolBoxActivity;
-import com.gh.base.adapter.BaseRecyclerAdapter;
import com.gh.gamecenter.adapter.ImagePagerAdapter;
import com.gh.gamecenter.adapter.viewholder.FooterViewHolder;
import com.gh.gamecenter.adapter.viewholder.GameHeadViewHolder;
@@ -62,7 +61,6 @@ import com.gh.gamecenter.entity.SlideEntity;
import com.gh.gamecenter.entity.SubjectDigestEntity;
import com.gh.gamecenter.entity.SubjectEntity;
import com.gh.gamecenter.fragment.GameFragment;
-import com.gh.base.OnRequestCallBackListener;
import com.gh.gamecenter.manager.GameManager;
import com.gh.gamecenter.manager.PackageManager;
import com.gh.gamecenter.retrofit.Response;
@@ -74,7 +72,6 @@ import java.util.List;
import java.util.Locale;
import java.util.Map;
-import cn.trinea.android.view.autoscrollviewpager.AutoScrollViewPager;
import retrofit2.HttpException;
import rx.android.schedulers.AndroidSchedulers;
import rx.functions.Func1;
@@ -108,7 +105,6 @@ public class GameFragmentAdapter extends BaseRecyclerAdapter {
private boolean mIsOver;
private boolean mIsInitPlugin;
private boolean mIsAutoScroll;
- private int mTopHeight;
public GameFragmentAdapter(GameFragment gameFragment, SwipeRefreshLayout refreshLayout) {
super(gameFragment.getContext());
@@ -137,11 +133,6 @@ public class GameFragmentAdapter extends BaseRecyclerAdapter {
mIsInitPlugin = false;
mIsAutoScroll = false;
- DisplayMetrics outMetrics = new DisplayMetrics();
- gameFragment.getActivity().getWindowManager().getDefaultDisplay().getMetrics(outMetrics);
-
- mTopHeight = (int) (outMetrics.widthPixels / 16f * 10.5f);
-
initSubjectDigest(true);
}
@@ -461,52 +452,20 @@ public class GameFragmentAdapter extends BaseRecyclerAdapter {
@Override
public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
if (viewType == ItemViewType.GAME_SLIDE) {
- View view = mLayoutInflater.inflate(R.layout.game_viewpager_item, parent, false);
DisplayMetrics outMetrics = new DisplayMetrics();
mGameFragment.getActivity().getWindowManager().getDefaultDisplay().getMetrics(outMetrics);
- LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(
- LinearLayout.LayoutParams.MATCH_PARENT, mTopHeight); //整个头部大小16:10 viewpager大小16:7
- view.setLayoutParams(params);
-
- AutoScrollViewPager viewPager = (AutoScrollViewPager) view.findViewById(R.id.view_pager);
- RelativeLayout.LayoutParams vpParams = new RelativeLayout.LayoutParams(
- ViewGroup.LayoutParams.MATCH_PARENT, (int) (outMetrics.widthPixels / 16f * 7f));
- viewPager.setLayoutParams(vpParams);
-
- RelativeLayout subjectRl = (RelativeLayout) view.findViewById(R.id.home_subject_rl);
- RelativeLayout.LayoutParams subjectParams = new RelativeLayout.LayoutParams(
- ViewGroup.LayoutParams.MATCH_PARENT, (int) (outMetrics.widthPixels / 16f * 3.5f));
- subjectParams.addRule(RelativeLayout.ALIGN_PARENT_BOTTOM);
- subjectRl.setLayoutParams(subjectParams);
-
- LinearLayout hint = (LinearLayout) view.findViewById(R.id.viewpager_ll_hint);
- RelativeLayout.LayoutParams hintParams = new RelativeLayout.LayoutParams(
- ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
- hintParams.setMargins(0, (int) (outMetrics.widthPixels / 16f * 6.5f), DisplayUtils.dip2px(mContext, 10), 0);
- hintParams.addRule(RelativeLayout.ALIGN_PARENT_RIGHT);
- hint.setLayoutParams(hintParams);
-
- return new GameViewPagerViewHolder(view);
+ return new GameViewPagerViewHolder(mLayoutInflater.inflate(R.layout.game_viewpager_item, parent, false),
+ outMetrics.widthPixels);
} else if (viewType == ItemViewType.COLUMN_HEADER) {
- View view = LayoutInflater.from(parent.getContext()).inflate(
- R.layout.game_head_item, parent, false);
- return new GameHeadViewHolder(view);
+ return new GameHeadViewHolder(mLayoutInflater.inflate(R.layout.game_head_item, parent, false));
} else if (viewType == ItemViewType.GAME_NORMAL) {
- View view = LayoutInflater.from(parent.getContext()).inflate(
- R.layout.game_normal_item, parent, false);
- return new GameNormalViewHolder(view);
+ return new GameNormalViewHolder(mLayoutInflater.inflate(R.layout.game_normal_item, parent, false));
} else if (viewType == ItemViewType.GAME_TEST) {
- View view = LayoutInflater.from(parent.getContext()).inflate(
- R.layout.game_test_item, parent, false);
- return new GameTestViewHolder(view);
+ return new GameTestViewHolder(mLayoutInflater.inflate(R.layout.game_test_item, parent, false));
} else if (viewType == ItemViewType.GAME_IMAGE) {
- View view = LayoutInflater.from(parent.getContext()).inflate(
- R.layout.game_image_item, parent, false);
- return new GameImageViewHolder(view);
+ return new GameImageViewHolder(mLayoutInflater.inflate(R.layout.game_image_item, parent, false));
} else if (viewType == ItemViewType.LOADING) {
- View view = LayoutInflater.from(parent.getContext()).inflate(
- R.layout.refresh_footerview, parent, false);
- return new FooterViewHolder(view);
+ return new FooterViewHolder(mLayoutInflater.inflate(R.layout.refresh_footerview, parent, false));
}
return null;
}
@@ -604,18 +563,18 @@ public class GameFragmentAdapter extends BaseRecyclerAdapter {
if (mSlideList.size() != 0 && viewHolder.viewPager.getAdapter() == null) {
viewHolder.viewpager_ll_hint.removeAllViews();
+ int margin = DisplayUtils.dip2px(mContext, 6);
for (int i = 0, size = mSlideList.size(); i < size; i++) {
ImageView imageView = new ImageView(mContext);
- LinearLayout.LayoutParams lparams = new LinearLayout.LayoutParams(
- DisplayUtils.dip2px(mContext, 6), DisplayUtils.dip2px(mContext, 6));
- lparams.bottomMargin = DisplayUtils.dip2px(mContext, 6);
+ LinearLayout.LayoutParams lparams = new LinearLayout.LayoutParams(margin, margin);
+// lparams.bottomMargin = DisplayUtils.dip2px(mContext, 6);
if (i == 0) {
imageView.setImageResource(R.drawable.oval_hint_up);
} else {
imageView.setImageResource(R.drawable.oval_hint_dn);
}
if (i != 0) {
- lparams.leftMargin = DisplayUtils.dip2px(mContext, 6);
+ lparams.leftMargin = margin;
}
imageView.setLayoutParams(lparams);
viewHolder.viewpager_ll_hint.addView(imageView);
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 e40be171e5..0729d73060 100644
--- a/app/src/main/java/com/gh/gamecenter/gamedetail/FuliFragment.java
+++ b/app/src/main/java/com/gh/gamecenter/gamedetail/FuliFragment.java
@@ -5,7 +5,7 @@ import android.support.annotation.Nullable;
import android.support.v7.widget.RecyclerView;
import android.view.View;
-import com.gh.base.BaseFragment;
+import com.gh.base.fragment.BaseFragment;
import com.gh.common.view.MeasureLinearLayoutManager;
import com.gh.common.view.VerticalItemDecoration;
import com.gh.gamecenter.GameDetailActivity;
diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/XinXiFragment.java b/app/src/main/java/com/gh/gamecenter/gamedetail/XinXiFragment.java
index b3a76e3c4b..b84e1eed6e 100644
--- a/app/src/main/java/com/gh/gamecenter/gamedetail/XinXiFragment.java
+++ b/app/src/main/java/com/gh/gamecenter/gamedetail/XinXiFragment.java
@@ -5,7 +5,7 @@ import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import android.view.View;
-import com.gh.base.BaseFragment;
+import com.gh.base.fragment.BaseFragment;
import com.gh.common.util.DownloadItemUtils;
import com.gh.download.DataWatcher;
import com.gh.download.DownloadEntity;
diff --git a/app/src/main/java/com/gh/gamecenter/libao/Libao1Fragment.java b/app/src/main/java/com/gh/gamecenter/libao/Libao1Fragment.java
index 2339f6d070..d840ff36ee 100644
--- a/app/src/main/java/com/gh/gamecenter/libao/Libao1Fragment.java
+++ b/app/src/main/java/com/gh/gamecenter/libao/Libao1Fragment.java
@@ -11,7 +11,7 @@ import android.widget.LinearLayout;
import android.widget.TextView;
import com.gc.materialdesign.views.ProgressBarCircularIndeterminate;
-import com.gh.base.BaseFragment;
+import com.gh.base.fragment.BaseFragment;
import com.gh.common.util.EntranceUtils;
import com.gh.common.view.SwipeLayout;
import com.gh.common.view.VerticalItemDecoration;
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 232b53ee31..50a9fe81f0 100644
--- a/app/src/main/java/com/gh/gamecenter/libao/Libao2Fragment.java
+++ b/app/src/main/java/com/gh/gamecenter/libao/Libao2Fragment.java
@@ -10,7 +10,7 @@ import android.view.View;
import android.widget.LinearLayout;
import com.gc.materialdesign.views.ProgressBarCircularIndeterminate;
-import com.gh.base.BaseFragment;
+import com.gh.base.fragment.BaseFragment;
import com.gh.common.view.VerticalItemDecoration;
import com.gh.gamecenter.LibaoActivity;
import com.gh.gamecenter.R;
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 cf1e8802a4..71af321214 100644
--- a/app/src/main/java/com/gh/gamecenter/libao/Libao3Fragment.java
+++ b/app/src/main/java/com/gh/gamecenter/libao/Libao3Fragment.java
@@ -9,7 +9,7 @@ import android.view.View;
import android.widget.LinearLayout;
import com.gc.materialdesign.views.ProgressBarCircularIndeterminate;
-import com.gh.base.BaseFragment;
+import com.gh.base.fragment.BaseFragment;
import com.gh.common.view.VerticalItemDecoration;
import com.gh.gamecenter.R;
import com.gh.gamecenter.eventbus.EBReuse;
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 eeb1191701..2808189945 100644
--- a/app/src/main/java/com/gh/gamecenter/message/CommentFragment.java
+++ b/app/src/main/java/com/gh/gamecenter/message/CommentFragment.java
@@ -11,7 +11,7 @@ import android.widget.LinearLayout;
import android.widget.TextView;
import com.gc.materialdesign.views.ProgressBarCircularIndeterminate;
-import com.gh.base.BaseFragment;
+import com.gh.base.fragment.BaseFragment;
import com.gh.common.view.VerticalItemDecoration;
import com.gh.gamecenter.R;
import com.gh.gamecenter.eventbus.EBUISwitch;
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 c83fbfdfc2..5d326a1584 100644
--- a/app/src/main/java/com/gh/gamecenter/message/KeFuFragment.java
+++ b/app/src/main/java/com/gh/gamecenter/message/KeFuFragment.java
@@ -10,7 +10,7 @@ import android.widget.LinearLayout;
import android.widget.TextView;
import com.gc.materialdesign.views.ProgressBarCircularIndeterminate;
-import com.gh.base.BaseFragment;
+import com.gh.base.fragment.BaseFragment;
import com.gh.common.view.VerticalItemDecoration;
import com.gh.gamecenter.R;
import com.gh.gamecenter.eventbus.EBUISwitch;
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 5ff6c3a6bc..9c3e4f25ad 100644
--- a/app/src/main/java/com/gh/gamecenter/message/MessageFragment.java
+++ b/app/src/main/java/com/gh/gamecenter/message/MessageFragment.java
@@ -1,21 +1,19 @@
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;
import android.util.DisplayMetrics;
import android.view.View;
import android.widget.LinearLayout;
-import android.widget.RelativeLayout;
import android.widget.TextView;
-import com.gh.base.BaseFragment;
+import com.gh.base.fragment.BaseFragment_ViewPager_Checkable;
import com.gh.common.util.DisplayUtils;
import com.gh.common.util.TokenUtils;
import com.gh.common.util.Utils;
import com.gh.gamecenter.R;
-import com.gh.base.adapter.FragmentAdapter;
import com.gh.gamecenter.db.KeFuMarkReadDao;
import com.gh.gamecenter.entity.MessageUnreadEntity;
import com.gh.gamecenter.eventbus.EBReuse;
@@ -27,11 +25,9 @@ import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
import org.greenrobot.eventbus.ThreadMode;
-import java.util.ArrayList;
import java.util.List;
import butterknife.BindView;
-import butterknife.OnClick;
import okhttp3.ResponseBody;
import retrofit2.HttpException;
import rx.Observable;
@@ -43,28 +39,22 @@ import rx.schedulers.Schedulers;
* Created by khy on 2017/4/5.
* 首页-消息
*/
-public class MessageFragment extends BaseFragment implements ViewPager.OnPageChangeListener {
+public class MessageFragment extends BaseFragment_ViewPager_Checkable {
public static final String MESSAGE_READ_OVER = "messageReadOver";
public static final String EB_MESSAGEFRAGMENT_TAG = "MessageFragment";
- @BindView(R.id.message_comment_tv)
- TextView mMessageCommentTv;
+
@BindView(R.id.message_comment_hint)
TextView mMessageCommentHint;
- @BindView(R.id.message_comment_ll)
- LinearLayout mMessageCommentLl;
- @BindView(R.id.message_kefu_tv)
- TextView mMessageKefuTv;
+
@BindView(R.id.message_kefu_hint)
View mMessageKefuHint;
- @BindView(R.id.message_kefu_rl)
- RelativeLayout mMessageKefuRl;
+
@BindView(R.id.message_slide_line)
View mMessageSlideLine;
- @BindView(R.id.meaasge_viewPager)
- ViewPager mMeaasgeViewPager;
- private LinearLayout.LayoutParams lparams;
- private int width;
+
+ private LinearLayout.LayoutParams mLayoutParams;
+ private int mWidth;
private int mKeFuUnreadCount;
@Override
@@ -72,45 +62,49 @@ public class MessageFragment extends BaseFragment implements ViewPager.OnPageCha
return R.layout.fragment_message;
}
+ @Override
+ protected int getCheckableGroupId() {
+ return R.id.lightgame_tab_container;
+ }
+
+ @Override
+ protected int getViewPagerId() {
+ return R.id.lightgame_tab_viewpager;
+ }
+
+ @Override
+ protected void initFragmentList(List fragments) {
+ fragments.add(new CommentFragment());
+ fragments.add(new KeFuFragment());
+ }
+
@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));
-
- title.setLayoutParams(tparams);
-
DisplayMetrics outMetrics = new DisplayMetrics();
getActivity().getWindowManager().getDefaultDisplay().getMetrics(outMetrics);
- width = outMetrics.widthPixels / 2;
- lparams = new LinearLayout.LayoutParams((int) (width * 0.6),
- DisplayUtils.dip2px(getContext(), 2));
- lparams.leftMargin = (int) (width * (0 + 0.2f));
- mMessageSlideLine.setLayoutParams(lparams);
+ mWidth = outMetrics.widthPixels / 2;
+ mLayoutParams = new LinearLayout.LayoutParams((int) (mWidth * 0.6), DisplayUtils.dip2px(getContext(), 2));
+ mLayoutParams.leftMargin = (int) (mWidth * (0 + 0.2f));
+ mMessageSlideLine.setLayoutParams(mLayoutParams);
- mMessageCommentTv.setSelected(true);
+ initMessageUnread(getContext(), true);
- List list = new ArrayList<>();
- list.add(new CommentFragment());
- list.add(new KeFuFragment());
- mMeaasgeViewPager.setAdapter(new FragmentAdapter(getChildFragmentManager(), list));
- mMeaasgeViewPager.addOnPageChangeListener(this);
- mMeaasgeViewPager.setCurrentItem(0);
+ }
- initMessageUnread(true);
+ @Override
+ public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+ super.onViewCreated(view, savedInstanceState);
view.postDelayed(new Runnable() {
@Override
public void run() {
- EventBus.getDefault().post(new EBUISwitch(EB_MESSAGEFRAGMENT_TAG, mMeaasgeViewPager.getCurrentItem()));
+ EventBus.getDefault().post(new EBUISwitch(EB_MESSAGEFRAGMENT_TAG, mCheckedIndex));
}
}, 100);
}
- private void initMessageUnread(boolean isCheck) {
- Context context = getContext();
- if (context == null) return;
+ private void initMessageUnread(final Context context, boolean isCheck) {
TokenUtils.getToken(context, isCheck)
.flatMap(new Func1>() {
@Override
@@ -130,7 +124,7 @@ public class MessageFragment extends BaseFragment implements ViewPager.OnPageCha
}
if (response.getKefuList() != null && response.getKefuList().size() > 0) {
- KeFuMarkReadDao dao = new KeFuMarkReadDao(getContext());
+ KeFuMarkReadDao dao = new KeFuMarkReadDao(context);
for (int i = 0; i < response.getKefuList().size(); i++) {
if (dao.isMarkRead(response.getKefuList().get(i))) {
response.getKefuList().remove(i);
@@ -148,7 +142,7 @@ public class MessageFragment extends BaseFragment implements ViewPager.OnPageCha
@Override
public void onFailure(HttpException e) {
if (e != null && e.code() == 401) {
- initMessageUnread(false);
+ initMessageUnread(context, false);
}
}
});
@@ -157,27 +151,23 @@ public class MessageFragment extends BaseFragment implements ViewPager.OnPageCha
// 隐藏未读提示
@Subscribe(threadMode = ThreadMode.MAIN)
public void onEventMainThread(EBUISwitch reuse) {
- if ("kefuMarkReadCount".equals(reuse.getFrom())
- && reuse.getPosition() == mKeFuUnreadCount) {
+ if ("kefuMarkReadCount".equals(reuse.getFrom()) && reuse.getPosition() == mKeFuUnreadCount) {
mMessageKefuHint.setVisibility(View.GONE);
- if (mMessageKefuHint.getVisibility() == View.GONE
- && mMessageCommentHint.getVisibility() == View.GONE) {
+ if (mMessageKefuHint.getVisibility() == View.GONE && mMessageCommentHint.getVisibility() == View.GONE) {
EventBus.getDefault().post(new EBReuse(MESSAGE_READ_OVER));
}
- } else if ("commentMarkRead".equals(reuse.getFrom())
- && mMessageCommentHint.getVisibility() == View.VISIBLE) {
+ } else if ("commentMarkRead".equals(reuse.getFrom()) && mMessageCommentHint.getVisibility() == View.VISIBLE) {
mMessageCommentHint.setVisibility(View.GONE);
- postMarkCommentRead(true);
- if (mMessageKefuHint.getVisibility() == View.GONE
- && mMessageCommentHint.getVisibility() == View.GONE) {
+ postMarkCommentRead(getContext(), true);
+ if (mMessageKefuHint.getVisibility() == View.GONE && mMessageCommentHint.getVisibility() == View.GONE) {
EventBus.getDefault().post(new EBReuse(MESSAGE_READ_OVER));
}
}
}
- private void postMarkCommentRead(boolean isCheck) {
+ private void postMarkCommentRead(final Context context, boolean isCheck) {
TokenUtils
- .getToken(getContext(), isCheck)
+ .getToken(context, isCheck)
.flatMap(new Func1>() {
@Override
public Observable call(String token) {
@@ -197,67 +187,25 @@ public class MessageFragment extends BaseFragment implements ViewPager.OnPageCha
public void onFailure(HttpException e) {
super.onFailure(e);
if (e != null && e.code() == 401) {
- postMarkCommentRead(false);
+ postMarkCommentRead(context, false);
}
}
});
}
-
- @OnClick({R.id.message_comment_ll, R.id.message_kefu_rl})
- public void onViewClicked(View view) {
- switch (view.getId()) {
- case R.id.message_comment_ll:
- mMeaasgeViewPager.setCurrentItem(0);
- break;
- case R.id.message_kefu_rl:
- mMeaasgeViewPager.setCurrentItem(1);
- break;
- }
- }
-
@Override
public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
+ super.onPageScrolled(position, positionOffset, positionOffsetPixels);
if (positionOffset != 0) {
- lparams.leftMargin = (int) (width * (position + positionOffset + 0.2f));
- mMessageSlideLine.setLayoutParams(lparams);
+ mLayoutParams.leftMargin = (int) (mWidth * (position + positionOffset + 0.2f));
+ mMessageSlideLine.setLayoutParams(mLayoutParams);
}
}
@Override
- public void onPageSelected(int position) {
- if (position == 0) {
- EventBus.getDefault().post(new EBUISwitch(EB_MESSAGEFRAGMENT_TAG, 0));
- mMessageCommentTv.setSelected(true);
- mMessageKefuTv.setSelected(false);
- } else if (position == 1) {
- EventBus.getDefault().post(new EBUISwitch(EB_MESSAGEFRAGMENT_TAG, 1));
- mMessageCommentTv.setSelected(false);
- mMessageKefuTv.setSelected(true);
- }
+ protected void onPageChanged(int index) {
+ super.onPageChanged(index);
+ EventBus.getDefault().post(new EBUISwitch(EB_MESSAGEFRAGMENT_TAG, index));
}
- @Override
- public void onPageScrollStateChanged(int state) {
-
- }
-
- @Override
- public void onHiddenChanged(boolean hidden) {
- super.onHiddenChanged(hidden);
- FragmentTransaction transaction = getChildFragmentManager().beginTransaction();
- List list = getChildFragmentManager().getFragments();
- if (list != null) {
- if (hidden) {
- for (Fragment fragment : getChildFragmentManager().getFragments()) {
- transaction.hide(fragment);
- }
- } else {
- for (Fragment fragment : getChildFragmentManager().getFragments()) {
- transaction.show(fragment);
- }
- }
- }
- transaction.commit();
- }
}
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 dc633ea79a..0737b98149 100644
--- a/app/src/main/java/com/gh/gamecenter/message/NoticeFragment.java
+++ b/app/src/main/java/com/gh/gamecenter/message/NoticeFragment.java
@@ -10,7 +10,7 @@ import android.widget.LinearLayout;
import android.widget.TextView;
import com.gc.materialdesign.views.ProgressBarCircularIndeterminate;
-import com.gh.base.BaseFragment;
+import com.gh.base.fragment.BaseFragment;
import com.gh.common.view.VerticalItemDecoration;
import com.gh.gamecenter.R;
import com.gh.gamecenter.eventbus.EBUISwitch;
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 c11d07cec7..99d49b8249 100644
--- a/app/src/main/java/com/gh/gamecenter/news/News1Fragment.java
+++ b/app/src/main/java/com/gh/gamecenter/news/News1Fragment.java
@@ -9,7 +9,7 @@ import android.view.View;
import android.widget.LinearLayout;
import com.gc.materialdesign.views.ProgressBarCircularIndeterminate;
-import com.gh.base.BaseFragment;
+import com.gh.base.fragment.BaseFragment;
import com.gh.common.view.VerticalItemDecoration;
import com.gh.gamecenter.R;
import com.gh.gamecenter.eventbus.EBNetworkState;
@@ -119,7 +119,7 @@ public class News1Fragment extends BaseFragment implements SwipeRefreshLayout.On
// 资讯Fragment界面切换事件
@Subscribe(threadMode = ThreadMode.MAIN)
public void onEventMainThread(EBUISwitch busNine) {
- if (NewsFragment.EB_NEWSFRAGMENT_TAG.equals(busNine.getFrom())) {
+ if (NewsWrapperFragment.EB_NEWSFRAGMENT_TAG.equals(busNine.getFrom())) {
if (busNine.getPosition() == 0) {
if (loadingLayout.getVisibility() == View.VISIBLE) {
adapter.addList(0);
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 c86766ab03..0c1dc9f714 100644
--- a/app/src/main/java/com/gh/gamecenter/news/News2Fragment.java
+++ b/app/src/main/java/com/gh/gamecenter/news/News2Fragment.java
@@ -16,7 +16,7 @@ import android.widget.TextView;
import com.facebook.drawee.view.SimpleDraweeView;
import com.gc.materialdesign.views.ProgressBarCircularIndeterminate;
-import com.gh.base.BaseFragment;
+import com.gh.base.fragment.BaseFragment;
import com.gh.common.util.ApkActiveUtils;
import com.gh.common.util.ImageUtils;
import com.gh.common.util.PackageUtils;
@@ -436,7 +436,7 @@ public class News2Fragment extends BaseFragment implements SwipeRefreshLayout.On
// Fragment界面切换事件
@Subscribe(threadMode = ThreadMode.MAIN)
public void onEventMainThread(EBUISwitch swith) {
- if (NewsFragment.EB_NEWSFRAGMENT_TAG.equals(swith.getFrom())) {
+ if (NewsWrapperFragment.EB_NEWSFRAGMENT_TAG.equals(swith.getFrom())) {
if (swith.getPosition() == 1) {
if (loadingLayout.getVisibility() == View.VISIBLE) {
adapter.addList(0);
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 f6cc71edd1..fe33d9f7b4 100644
--- a/app/src/main/java/com/gh/gamecenter/news/News3Fragment.java
+++ b/app/src/main/java/com/gh/gamecenter/news/News3Fragment.java
@@ -13,7 +13,7 @@ import android.widget.RelativeLayout;
import android.widget.TextView;
import com.gc.materialdesign.views.ProgressBarCircularIndeterminate;
-import com.gh.base.BaseFragment;
+import com.gh.base.fragment.BaseFragment;
import com.gh.common.util.DisplayUtils;
import com.gh.common.util.EntranceUtils;
import com.gh.gamecenter.ConcernActivity;
@@ -220,7 +220,7 @@ public class News3Fragment extends BaseFragment implements SwipeRefreshLayout.On
// 资讯Fragment界面切换事件
@Subscribe(threadMode = ThreadMode.MAIN)
public void onEventMainThread(EBUISwitch busNine) {
- if (NewsFragment.EB_NEWSFRAGMENT_TAG.equals(busNine.getFrom())) {
+ if (NewsWrapperFragment.EB_NEWSFRAGMENT_TAG.equals(busNine.getFrom())) {
if (busNine.getPosition() == 2 && mLoading.getVisibility() == View.VISIBLE) {
mStrategyAdapter.addList(0);
}
diff --git a/app/src/main/java/com/gh/gamecenter/news/News4Fragment.java b/app/src/main/java/com/gh/gamecenter/news/News4Fragment.java
index fa8a828059..37e95a3645 100644
--- a/app/src/main/java/com/gh/gamecenter/news/News4Fragment.java
+++ b/app/src/main/java/com/gh/gamecenter/news/News4Fragment.java
@@ -9,7 +9,7 @@ import android.view.View;
import android.widget.LinearLayout;
import com.gc.materialdesign.views.ProgressBarCircularIndeterminate;
-import com.gh.base.BaseFragment;
+import com.gh.base.fragment.BaseFragment;
import com.gh.common.view.VerticalItemDecoration;
import com.gh.gamecenter.R;
import com.gh.gamecenter.eventbus.EBNetworkState;
@@ -119,7 +119,7 @@ public class News4Fragment extends BaseFragment implements SwipeRefreshLayout.On
// 资讯Fragment界面切换事件
@Subscribe(threadMode = ThreadMode.MAIN)
public void onEventMainThread(EBUISwitch busNine) {
- if (NewsFragment.EB_NEWSFRAGMENT_TAG.equals(busNine.getFrom())) {
+ if (NewsWrapperFragment.EB_NEWSFRAGMENT_TAG.equals(busNine.getFrom())) {
if (busNine.getPosition() == 3) {
if (loadingLayout.getVisibility() == View.VISIBLE) {
adapter.addList(0);
diff --git a/app/src/main/java/com/gh/gamecenter/news/NewsFragment.java b/app/src/main/java/com/gh/gamecenter/news/NewsFragment.java
deleted file mode 100644
index 80d5c41aea..0000000000
--- a/app/src/main/java/com/gh/gamecenter/news/NewsFragment.java
+++ /dev/null
@@ -1,212 +0,0 @@
-package com.gh.gamecenter.news;
-
-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;
-import android.util.DisplayMetrics;
-import android.view.View;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-
-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.base.adapter.FragmentAdapter;
-import com.gh.gamecenter.eventbus.EBUISwitch;
-import com.gh.gamecenter.fragment.HomeFragment;
-
-import org.greenrobot.eventbus.EventBus;
-import org.greenrobot.eventbus.Subscribe;
-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.
- * 资讯Fragment
- */
-public class NewsFragment extends HomeFragment implements View.OnClickListener, ViewPager.OnPageChangeListener {
-
- public final static String EB_NEWSFRAGMENT_TAG = "NewsFragment";
- private View mNewsSlidebarLine;
- private ViewPager mNewsVP;
- private LinearLayout.LayoutParams lparams;
-
- @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);
-
- List list = new ArrayList<>();
- list.add(new News1Fragment());
- list.add(new News2Fragment());
- list.add(new News3Fragment());
- list.add(new News4Fragment());
- mNewsVP.setAdapter(new FragmentAdapter(getChildFragmentManager(), list));
- mNewsVP.addOnPageChangeListener(this);
-
- currentItem = 0;
- if (savedInstanceState != null) {
- currentItem = savedInstanceState.getInt("currentItem");
- }
-
- mNewsVP.setCurrentItem(currentItem);
-
- DisplayMetrics outMetrics = new DisplayMetrics();
- getActivity().getWindowManager().getDefaultDisplay().getMetrics(outMetrics);
- width = outMetrics.widthPixels / 4;
- lparams = new LinearLayout.LayoutParams(width / 2,
- DisplayUtils.dip2px(getActivity(), 2));
- lparams.leftMargin = (int) (width * (currentItem + 0.25f));
- mNewsSlidebarLine.setLayoutParams(lparams);
-
- view.postDelayed(new Runnable() {
- @Override
- public void run() {
- EventBus.getDefault().post(new EBUISwitch(EB_NEWSFRAGMENT_TAG, mNewsVP.getCurrentItem()));
- }
- }, 100);
- }
-
- @Override
- public void onSaveInstanceState(Bundle outState) {
- super.onSaveInstanceState(outState);
- 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);
- 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;
- }
- }
-
- @Override
- public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
- if (positionOffset != 0) {
- lparams.leftMargin = (int) (width * (position + positionOffset + 0.25f));
- mNewsSlidebarLine.setLayoutParams(lparams);
- } else {
- if (currentItem != mNewsVP.getCurrentItem()) {
- currentItem = mNewsVP.getCurrentItem();
- EventBus.getDefault().post(new EBUISwitch(EB_NEWSFRAGMENT_TAG, currentItem));
- }
- }
- }
-
- @Override
- public void onPageSelected(int position) {
- if (position == 0) {
- mNewsZixun.setSelected(true);
- mNewsGuanzhu.setSelected(false);
- mNewsGonglve.setSelected(false);
- mNewsYuanchuang.setSelected(false);
-
- DataCollectionUtils.uploadPosition(getActivity(), "资讯", "1", "资讯");
- } else if (position == 1) {
- mNewsZixun.setSelected(false);
- mNewsGuanzhu.setSelected(true);
- mNewsGonglve.setSelected(false);
- mNewsYuanchuang.setSelected(false);
-
- DataCollectionUtils.uploadPosition(getActivity(), "资讯", "2", "攻略");
- } else if (position == 2) {
- mNewsZixun.setSelected(false);
- mNewsGuanzhu.setSelected(false);
- mNewsGonglve.setSelected(true);
- mNewsYuanchuang.setSelected(false);
-
- DataCollectionUtils.uploadPosition(getActivity(), "资讯", "3", "原创");
- } else if (position == 3) {
- mNewsZixun.setSelected(false);
- mNewsGuanzhu.setSelected(false);
- mNewsGonglve.setSelected(false);
- mNewsYuanchuang.setSelected(true);
-
- DataCollectionUtils.uploadPosition(getActivity(), "资讯", "4", "关注");
- }
- }
-
- @Override
- public void onPageScrollStateChanged(int i) {
-
- }
-
- @Subscribe(threadMode = ThreadMode.MAIN)
- public void onEventMainThread(EBUISwitch busNine) {
- if (MainActivity.EB_MAINACTIVITY_TAG.equals(busNine.getFrom())) {
- if (busNine.getPosition() == 1) {
- EventBus.getDefault().post(new EBUISwitch(EB_NEWSFRAGMENT_TAG, mNewsVP.getCurrentItem()));
- }
- }
- }
-
- @Override
- public void onHiddenChanged(boolean hidden) {
- super.onHiddenChanged(hidden);
- FragmentTransaction transaction = getChildFragmentManager().beginTransaction();
- List list = getChildFragmentManager().getFragments();
- if (list != null) {
- if (hidden) {
- for (Fragment fragment : getChildFragmentManager().getFragments()) {
- transaction.hide(fragment);
- }
- } else {
- for (Fragment fragment : getChildFragmentManager().getFragments()) {
- transaction.show(fragment);
- }
- }
- }
- transaction.commit();
- }
-
-}
-
diff --git a/app/src/main/java/com/gh/gamecenter/news/NewsWrapperFragment.java b/app/src/main/java/com/gh/gamecenter/news/NewsWrapperFragment.java
new file mode 100644
index 0000000000..4466d0956d
--- /dev/null
+++ b/app/src/main/java/com/gh/gamecenter/news/NewsWrapperFragment.java
@@ -0,0 +1,53 @@
+package com.gh.gamecenter.news;
+
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.view.View;
+
+import com.gh.base.SearchBarHint;
+import com.gh.base.fragment.BaseFragment;
+import com.gh.gamecenter.R;
+import com.gh.gamecenter.fragment.NewsFragment;
+import com.gh.gamecenter.fragment.SearchToolbarFragment;
+
+import java.util.ArrayList;
+
+
+/**
+ * Created by khy on 2016/6/29.
+ * 资讯Fragment
+ */
+public class NewsWrapperFragment extends BaseFragment implements SearchBarHint {
+
+ public final static String EB_NEWSFRAGMENT_TAG = "NewsWrapperFragment";
+
+ private SearchToolbarFragment mSearchToolbarFragment;
+
+ @Override
+ public void onCreate(@Nullable Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ mSearchToolbarFragment = new SearchToolbarFragment();
+ }
+
+ @Override
+ protected int getLayoutId() {
+ return R.layout.fragment_wrapper_toolbar;
+ }
+
+ @Override
+ public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+ super.onViewCreated(view, savedInstanceState);
+ getChildFragmentManager().beginTransaction()
+ .replace(R.id.wrapper_toolbar, mSearchToolbarFragment)
+ .replace(R.id.wrapper_main_content, new NewsFragment()).commitAllowingStateLoss();
+ }
+
+ @Override
+ public void setHint(ArrayList hintList) {
+ if (mSearchToolbarFragment != null) {
+ mSearchToolbarFragment.setHint(hintList);
+ }
+ }
+
+}
+
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 ecd779a9cc..312ed76d2a 100644
--- a/app/src/main/java/com/gh/gamecenter/personal/ConcernFragment.java
+++ b/app/src/main/java/com/gh/gamecenter/personal/ConcernFragment.java
@@ -8,7 +8,7 @@ import android.view.View;
import android.widget.LinearLayout;
import android.widget.TextView;
-import com.gh.base.BaseFragment;
+import com.gh.base.fragment.BaseFragment;
import com.gh.common.util.DownloadItemUtils;
import com.gh.common.view.VerticalItemDecoration;
import com.gh.download.DataWatcher;
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 e24e881765..6c2b577dcb 100644
--- a/app/src/main/java/com/gh/gamecenter/personal/InstallFragment.java
+++ b/app/src/main/java/com/gh/gamecenter/personal/InstallFragment.java
@@ -10,7 +10,7 @@ import android.view.View;
import android.widget.LinearLayout;
import android.widget.TextView;
-import com.gh.base.BaseFragment;
+import com.gh.base.fragment.BaseFragment;
import com.gh.common.util.DialogUtils;
import com.gh.common.util.DownloadItemUtils;
import com.gh.common.view.SwipeLayout;
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 375af455dd..a4930ee705 100644
--- a/app/src/main/java/com/gh/gamecenter/personal/PersonalFragment.java
+++ b/app/src/main/java/com/gh/gamecenter/personal/PersonalFragment.java
@@ -26,7 +26,7 @@ import android.widget.TextView;
import android.widget.Toast;
import com.facebook.drawee.view.SimpleDraweeView;
-import com.gh.base.BaseFragment;
+import com.gh.base.fragment.BaseFragment;
import com.gh.common.constant.Config;
import com.gh.common.util.DataCollectionUtils;
import com.gh.common.util.DataUtils;
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 e79cc8a236..be6191004f 100644
--- a/app/src/main/java/com/gh/gamecenter/search/SearchGameDetailFragment.java
+++ b/app/src/main/java/com/gh/gamecenter/search/SearchGameDetailFragment.java
@@ -13,7 +13,7 @@ import android.view.ViewTreeObserver;
import android.widget.LinearLayout;
import android.widget.TextView;
-import com.gh.base.BaseFragment;
+import com.gh.base.fragment.BaseFragment;
import com.gh.common.util.DisplayUtils;
import com.gh.common.util.DownloadItemUtils;
import com.gh.common.view.VerticalItemDecoration;
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 f9f1de6d34..69224520ff 100644
--- a/app/src/main/java/com/gh/gamecenter/search/SearchGameListFragment.java
+++ b/app/src/main/java/com/gh/gamecenter/search/SearchGameListFragment.java
@@ -13,7 +13,7 @@ import android.view.ViewTreeObserver;
import android.widget.LinearLayout;
import android.widget.TextView;
-import com.gh.base.BaseFragment;
+import com.gh.base.fragment.BaseFragment;
import com.gh.common.util.DisplayUtils;
import com.gh.common.util.DownloadItemUtils;
import com.gh.common.view.VerticalItemDecoration;
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 70cdc97b81..90ec0114a0 100644
--- a/app/src/main/java/com/gh/gamecenter/search/SearchHistoryFragment.java
+++ b/app/src/main/java/com/gh/gamecenter/search/SearchHistoryFragment.java
@@ -9,7 +9,7 @@ import android.view.ViewGroup;
import android.widget.RelativeLayout;
import android.widget.TextView;
-import com.gh.base.BaseFragment;
+import com.gh.base.fragment.BaseFragment;
import com.gh.common.util.DialogUtils;
import com.gh.common.util.DisplayUtils;
import com.gh.gamecenter.R;
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 42644d190c..6c773311c4 100644
--- a/app/src/main/java/com/gh/gamecenter/subject/SubjectFragment.java
+++ b/app/src/main/java/com/gh/gamecenter/subject/SubjectFragment.java
@@ -10,7 +10,7 @@ import android.view.View;
import android.widget.LinearLayout;
import com.gc.materialdesign.views.ProgressBarCircularIndeterminate;
-import com.gh.base.BaseFragment;
+import com.gh.base.fragment.BaseFragment;
import com.gh.common.util.ApkActiveUtils;
import com.gh.common.util.DownloadItemUtils;
import com.gh.common.util.EntranceUtils;
@@ -26,7 +26,7 @@ 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.news.NewsFragment;
+import com.gh.gamecenter.news.NewsWrapperFragment;
import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
@@ -108,6 +108,7 @@ public class SubjectFragment extends BaseFragment {
mName = arguments.getString("name");
mIsOrder = arguments.getBoolean("order");
mType = arguments.getString("type");
+ //TODO ????? order 是 boolean
mOrder = arguments.getString("order");
mTagType = arguments.getString("tagType");
mEntrance = arguments.getString(EntranceUtils.KEY_ENTRANCE);
@@ -287,7 +288,7 @@ public class SubjectFragment extends BaseFragment {
// 资讯Fragment界面切换事件
@Subscribe(threadMode = ThreadMode.MAIN)
public void onEventMainThread(EBUISwitch busNine) {
- if (NewsFragment.EB_NEWSFRAGMENT_TAG.equals(busNine.getFrom())) {
+ if (NewsWrapperFragment.EB_NEWSFRAGMENT_TAG.equals(busNine.getFrom())) {
if (busNine.getPosition() == 0) {
if (subject_pb_loading.getVisibility() == View.VISIBLE) {
adapter.initList(1);
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 2a5135d7f2..5cbf1817f7 100644
--- a/app/src/main/java/com/gh/gamecenter/subject/SubjectTileFragment.java
+++ b/app/src/main/java/com/gh/gamecenter/subject/SubjectTileFragment.java
@@ -17,7 +17,7 @@ import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;
-import com.gh.base.BaseFragment;
+import com.gh.base.fragment.BaseFragment;
import com.gh.common.util.DisplayUtils;
import com.gh.common.util.StringUtils;
import com.gh.gamecenter.R;
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 01d0913294..cba995b85d 100644
--- a/app/src/main/java/com/gh/gamecenter/wenda/WenDaFragment.java
+++ b/app/src/main/java/com/gh/gamecenter/wenda/WenDaFragment.java
@@ -1,6 +1,6 @@
//package com.gh.gamecenter.wenda;
//
-//import com.gh.base.BaseFragment;
+//import com.gh.base.fragment.BaseFragment;
//import com.gh.gamecenter.eventbus.EBNetworkState;
//
//import org.greenrobot.eventbus.Subscribe;
diff --git a/app/src/main/res/drawable/selector_ic_game.xml b/app/src/main/res/drawable/selector_ic_game.xml
new file mode 100644
index 0000000000..66ed99c36d
--- /dev/null
+++ b/app/src/main/res/drawable/selector_ic_game.xml
@@ -0,0 +1,8 @@
+
+
+
+