From 6eb1aefb1cca1f45c3688db56f7a47e5d01abd8a Mon Sep 17 00:00:00 2001 From: kehaoyuan Date: Thu, 28 Sep 2017 15:25:06 +0800 Subject: [PATCH] =?UTF-8?q?V3.0=2009-27=20Tab=E6=8C=87=E9=92=88=E5=B1=85?= =?UTF-8?q?=E4=B8=AD=E9=97=AE=E9=A2=98=E6=9C=AA=E8=A7=A3=E5=86=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/gh/common/util/DialogUtils.java | 24 +++++------ .../com/gh/gamecenter/ConcernActivity.java | 23 +++++++++- .../com/gh/gamecenter/SettingActivity.java | 10 ++--- .../gh/gamecenter/adapter/ConcernAdapter.java | 13 +++--- .../adapter/ConcernRecommendAdapter.java | 18 ++++---- .../gamecenter/collection/ArticleAdapter.java | 6 +-- .../gamecenter/collection/ToolsAdapter.java | 4 +- .../gh/gamecenter/libao/Libao2Fragment.java | 14 ++++++ .../libao/Libao2FragmentAdapter.java | 6 +++ .../gh/gamecenter/libao/Libao3Fragment.java | 14 ++++++ .../libao/Libao3FragmentAdapter.java | 40 ++++++++++-------- .../collection_default_icon.png | Bin 0 -> 7128 bytes app/src/main/res/layout/activity_concern.xml | 1 + app/src/main/res/layout/activity_libao.xml | 18 ++------ .../main/res/layout/fragment_collection.xml | 6 --- app/src/main/res/layout/fragment_libao.xml | 6 --- app/src/main/res/layout/fragment_news.xml | 6 --- app/src/main/res/values/strings.xml | 3 +- app/src/main/res/values/styles.xml | 10 ++--- 19 files changed, 126 insertions(+), 96 deletions(-) create mode 100644 app/src/main/res/drawable-xxhdpi/collection_default_icon.png diff --git a/app/src/main/java/com/gh/common/util/DialogUtils.java b/app/src/main/java/com/gh/common/util/DialogUtils.java index 6b334e4824..85a29464f0 100644 --- a/app/src/main/java/com/gh/common/util/DialogUtils.java +++ b/app/src/main/java/com/gh/common/util/DialogUtils.java @@ -432,13 +432,13 @@ public class DialogUtils { Button positiveBtn = alertDialog.getButton(android.app.AlertDialog.BUTTON_POSITIVE); Button negativeBtn = alertDialog.getButton(android.app.AlertDialog.BUTTON_NEGATIVE); - positiveBtn.setTextSize(13); + positiveBtn.setTextSize(14); positiveBtn.setTextColor(ContextCompat.getColor(context, R.color.theme)); - negativeBtn.setTextSize(13); + negativeBtn.setTextSize(14); negativeBtn.setTextColor(ContextCompat.getColor(context, R.color.theme)); if (mesage != null) { - mesage.setTextSize(13); - mesage.setTextColor(ContextCompat.getColor(context, R.color.title)); + mesage.setTextSize(14); + mesage.setTextColor(ContextCompat.getColor(context, R.color.system_bar)); mesage.setLineSpacing(1.0f, 1.3f); } @@ -477,13 +477,13 @@ public class DialogUtils { Button positiveBtn = alertDialog.getButton(android.app.AlertDialog.BUTTON_POSITIVE); Button negativeBtn = alertDialog.getButton(android.app.AlertDialog.BUTTON_NEGATIVE); - positiveBtn.setTextSize(13); + positiveBtn.setTextSize(14); positiveBtn.setTextColor(ContextCompat.getColor(context, R.color.theme)); - negativeBtn.setTextSize(13); + negativeBtn.setTextSize(14); negativeBtn.setTextColor(ContextCompat.getColor(context, R.color.hint)); if (mesage != null) { - mesage.setTextSize(13); - mesage.setTextColor(ContextCompat.getColor(context, R.color.title)); + mesage.setTextSize(14); + mesage.setTextColor(ContextCompat.getColor(context, R.color.system_bar)); mesage.setLineSpacing(1.0f, 1.3f); } @@ -528,13 +528,13 @@ public class DialogUtils { Button positiveBtn = alertDialog.getButton(android.app.AlertDialog.BUTTON_POSITIVE); Button negativeBtn = alertDialog.getButton(android.app.AlertDialog.BUTTON_NEGATIVE); - positiveBtn.setTextSize(13); + positiveBtn.setTextSize(14); positiveBtn.setTextColor(ContextCompat.getColor(context, R.color.theme)); - negativeBtn.setTextSize(13); + negativeBtn.setTextSize(14); negativeBtn.setTextColor(ContextCompat.getColor(context, R.color.hint)); if (mesage != null) { - mesage.setTextSize(13); - mesage.setTextColor(ContextCompat.getColor(context, R.color.title)); + mesage.setTextSize(14); + mesage.setTextColor(ContextCompat.getColor(context, R.color.system_bar)); mesage.setLineSpacing(1.0f, 1.3f); } diff --git a/app/src/main/java/com/gh/gamecenter/ConcernActivity.java b/app/src/main/java/com/gh/gamecenter/ConcernActivity.java index f8b27b55fd..ded84f9938 100644 --- a/app/src/main/java/com/gh/gamecenter/ConcernActivity.java +++ b/app/src/main/java/com/gh/gamecenter/ConcernActivity.java @@ -4,12 +4,14 @@ import android.content.Context; import android.content.Intent; import android.os.Bundle; import android.support.annotation.NonNull; +import android.support.v4.content.ContextCompat; import android.support.v7.widget.GridLayoutManager; import android.support.v7.widget.RecyclerView; import android.view.View; import android.view.View.OnClickListener; import android.widget.LinearLayout; import android.widget.RelativeLayout; +import android.widget.TextView; import com.gh.base.BaseActivity; import com.gh.base.OnRequestCallBackListener; @@ -37,6 +39,10 @@ public class ConcernActivity extends BaseActivity implements OnClickListener, On RelativeLayout mConcernTitleRl; @BindView(R.id.reuse_none_data) LinearLayout mNoneData; + @BindView(R.id.reuse_tv_none_data) + TextView mNoDataTv; + @BindView(R.id.reuse_no_connection) + LinearLayout mNoConn; private ConcernAdapter concernAdapter; private ConcernRecommendAdapter concernRecommendAdapter; @@ -74,7 +80,7 @@ public class ConcernActivity extends BaseActivity implements OnClickListener, On } @Override - public void loadDone() { + public void loadDone() { // 关注推荐 回调 mConcernTitleRl.setVisibility(View.VISIBLE); mConcernRecommendRv.setVisibility(View.VISIBLE); int size = concernRecommendAdapter.getRecommendGameList().size(); @@ -85,13 +91,24 @@ public class ConcernActivity extends BaseActivity implements OnClickListener, On // 关注的游戏加载完成 再加载热门推荐(根据已关注的游戏过滤) @Override public void loadDone(Object obj) { + mNoConn.setVisibility(View.GONE); + mNoneData.setVisibility(View.GONE); + concernRecommendAdapter = new ConcernRecommendAdapter(this, this, (List)obj, mEntrance); mConcernRecommendRv.setAdapter(concernRecommendAdapter); + + if (obj == null) { // 未登录状态 + mNoneData.setVisibility(View.VISIBLE); + mConcernRv.setVisibility(View.GONE); + mNoDataTv.setText(R.string.login_hint); + mNoDataTv.setTextColor(ContextCompat.getColor(ConcernActivity.this, R.color.theme)); + } } @Override public void loadError() { - + mNoConn.setVisibility(View.VISIBLE); + mNoneData.setVisibility(View.GONE); } @Override @@ -100,6 +117,8 @@ public class ConcernActivity extends BaseActivity implements OnClickListener, On || concernAdapter.getConcernGameList().isEmpty()) { mNoneData.setVisibility(View.VISIBLE); mConcernRv.setVisibility(View.GONE); + mNoDataTv.setText(R.string.game_empty); + mNoDataTv.setTextColor(ContextCompat.getColor(ConcernActivity.this, R.color.c7c7c7)); } if (concernRecommendAdapter.getRecommendGameList() == null || concernRecommendAdapter.getRecommendGameList().isEmpty()) { diff --git a/app/src/main/java/com/gh/gamecenter/SettingActivity.java b/app/src/main/java/com/gh/gamecenter/SettingActivity.java index 2524ee465a..1c2b15c094 100644 --- a/app/src/main/java/com/gh/gamecenter/SettingActivity.java +++ b/app/src/main/java/com/gh/gamecenter/SettingActivity.java @@ -306,7 +306,7 @@ public class SettingActivity extends BaseActivity implements OnClickListener { View inflate = View.inflate(this, R.layout.dialog_font_size, null); final RadioGroup radioGroup = (RadioGroup) inflate.findViewById(R.id.font_size_radiogroup); ((RadioButton) (radioGroup.getChildAt(checkSizeIndex - 1))).setChecked(true); - AlertDialog alertDialog = new AlertDialog.Builder(this, R.style.FontSizeAlertDialog) + AlertDialog alertDialog = new AlertDialog.Builder(this, R.style.GhAlertDialog) .setTitle(getString(R.string.font_primary)) .setPositiveButton("取消", new DialogInterface.OnClickListener() { @Override @@ -335,13 +335,13 @@ public class SettingActivity extends BaseActivity implements OnClickListener { Button positiveBtn = alertDialog.getButton(android.app.AlertDialog.BUTTON_POSITIVE); Button negativeBtn = alertDialog.getButton(android.app.AlertDialog.BUTTON_NEGATIVE); - positiveBtn.setTextSize(13); + positiveBtn.setTextSize(14); positiveBtn.setTextColor(ContextCompat.getColor(this, R.color.theme)); - negativeBtn.setTextSize(13); + negativeBtn.setTextSize(14); negativeBtn.setTextColor(ContextCompat.getColor(this, R.color.theme)); if (mesage != null) { - mesage.setTextSize(13); - mesage.setTextColor(ContextCompat.getColor(this, R.color.title)); + mesage.setTextSize(14); + mesage.setTextColor(ContextCompat.getColor(this, R.color.system_bar)); } diff --git a/app/src/main/java/com/gh/gamecenter/adapter/ConcernAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/ConcernAdapter.java index abb710613d..9d8ad64bc6 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/ConcernAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/ConcernAdapter.java @@ -1,5 +1,6 @@ package com.gh.gamecenter.adapter; +import android.text.TextUtils; import android.view.View; import android.view.ViewGroup; import android.widget.Toast; @@ -10,6 +11,7 @@ import com.gh.common.util.ConcernUtils; import com.gh.common.util.DataCollectionUtils; import com.gh.common.util.DataUtils; import com.gh.common.util.DialogUtils; +import com.gh.common.util.LoginUtils; import com.gh.common.util.StringUtils; import com.gh.gamecenter.ConcernActivity; import com.gh.gamecenter.GameDetailActivity; @@ -43,16 +45,17 @@ public class ConcernAdapter extends BaseRecyclerAdapter { public ConcernAdapter(ConcernActivity context, OnRequestCallBackListener listener, String entrance) { super(context); mListener = listener; - mEntrance = entrance; - mConcernGameList = new ArrayList<>(); + initConcernGame(); } - private void initConcernGame() { - - // TODO 按时间排序 + public void initConcernGame() { + if (TextUtils.isEmpty(LoginUtils.getToken(mContext))) { + mListener.loadDone(null); + return; + } RetrofitManager.getInstance(mContext).getApi() .getConcern() .subscribeOn(Schedulers.io()) diff --git a/app/src/main/java/com/gh/gamecenter/adapter/ConcernRecommendAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/ConcernRecommendAdapter.java index 441ff5d329..e9f7df9cc5 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/ConcernRecommendAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/ConcernRecommendAdapter.java @@ -103,14 +103,16 @@ public class ConcernRecommendAdapter extends BaseRecyclerAdapter { // 加载数据 public void addList(final int offset) { + if (TextUtils.isEmpty(LoginUtils.getToken(mContext))) { + mCallBackListener.loadDone(null); + return; + } + if (isLoading) { return; } 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 2de377e67c..64b1c152ac 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/Libao3Fragment.java +++ b/app/src/main/java/com/gh/gamecenter/libao/Libao3Fragment.java @@ -2,11 +2,13 @@ package com.gh.gamecenter.libao; import android.os.Bundle; import android.support.annotation.Nullable; +import android.support.v4.content.ContextCompat; import android.support.v4.widget.SwipeRefreshLayout; import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.RecyclerView; import android.view.View; import android.widget.LinearLayout; +import android.widget.TextView; import com.gc.materialdesign.views.ProgressBarCircularIndeterminate; import com.gh.base.fragment.BaseFragment; @@ -37,6 +39,8 @@ public class Libao3Fragment extends BaseFragment implements SwipeRefreshLayout.O LinearLayout mEmptyLayout; @BindView(R.id.reuse_no_connection) LinearLayout mNoConn; + @BindView(R.id.reuse_tv_none_data) + TextView mNoDataTv; private LinearLayoutManager mLayoutManager; private Libao3FragmentAdapter adapter; @@ -107,6 +111,16 @@ public class Libao3Fragment extends BaseFragment implements SwipeRefreshLayout.O mNoConn.setVisibility(View.VISIBLE); } + @Override + public void loadDone(Object obj) { + super.loadDone(obj); + mRefreshLayout.setRefreshing(false); + mLoadingLayout.setVisibility(View.GONE); + mEmptyLayout.setVisibility(View.VISIBLE); + mNoDataTv.setText(R.string.login_hint); + mNoDataTv.setTextColor(ContextCompat.getColor(getContext(), R.color.theme)); + } + @OnClick(R.id.reuse_no_connection) public void reconnection() { // 重新连接 mRefreshLayout.setRefreshing(true); diff --git a/app/src/main/java/com/gh/gamecenter/libao/Libao3FragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/libao/Libao3FragmentAdapter.java index 208e9d212e..2149d8fc07 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/Libao3FragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/libao/Libao3FragmentAdapter.java @@ -12,6 +12,7 @@ import com.gh.base.OnRequestCallBackListener; import com.gh.common.util.DialogUtils; import com.gh.common.util.ImageUtils; import com.gh.common.util.LibaoUtils; +import com.gh.common.util.LoginUtils; import com.gh.common.util.PlatformUtils; import com.gh.common.util.StringUtils; import com.gh.gamecenter.LibaoDetailActivity; @@ -56,24 +57,12 @@ class Libao3FragmentAdapter extends BaseRecyclerAdapter mLibaoList = new ArrayList<>(); } - private void initData() { - for (int i = 0; i < mLibaoList.size(); i++) { - LibaoEntity libaoEntity = mLibaoList.get(i); - if (!libaoEntity.isActive()) { - mLibaoList.remove(i); - i--; - } - } - - if (mLibaoList.size() == 0) { - mCallBackListener.loadEmpty(); - } else { - mCallBackListener.loadDone(); - } - notifyDataSetChanged(); - } - void loadData(int offset) { + if (TextUtils.isEmpty(LoginUtils.getToken(mContext))) { + mCallBackListener.loadDone(null); + return; + } + if (offset == 0) { mLibaoList.clear(); } @@ -125,6 +114,23 @@ class Libao3FragmentAdapter extends BaseRecyclerAdapter }); } + private void initData() { + for (int i = 0; i < mLibaoList.size(); i++) { + LibaoEntity libaoEntity = mLibaoList.get(i); + if (!libaoEntity.isActive()) { + mLibaoList.remove(i); + i--; + } + } + + if (mLibaoList.size() == 0) { + mCallBackListener.loadEmpty(); + } else { + mCallBackListener.loadDone(); + } + notifyDataSetChanged(); + } + //获取礼包状态 private void getLibaoStatus(List response) { StringBuilder builder = new StringBuilder(); diff --git a/app/src/main/res/drawable-xxhdpi/collection_default_icon.png b/app/src/main/res/drawable-xxhdpi/collection_default_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..d98f126a081aa75b62f6770320e865eaa636886f GIT binary patch literal 7128 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 literal 0 HcmV?d00001 diff --git a/app/src/main/res/layout/activity_concern.xml b/app/src/main/res/layout/activity_concern.xml index 951f5b8c69..ae2956c293 100644 --- a/app/src/main/res/layout/activity_concern.xml +++ b/app/src/main/res/layout/activity_concern.xml @@ -17,6 +17,7 @@ android:layout_height = "match_parent" /> + - + android:layout_height = "match_parent" + android:overScrollMode = "never" /> - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_collection.xml b/app/src/main/res/layout/fragment_collection.xml index 5f12f795bb..675cc26a40 100644 --- a/app/src/main/res/layout/fragment_collection.xml +++ b/app/src/main/res/layout/fragment_collection.xml @@ -53,10 +53,4 @@ android:layout_below = "@+id/collection_tabbar" android:overScrollMode = "never" /> - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_libao.xml b/app/src/main/res/layout/fragment_libao.xml index d51a5f4f26..5f465a7844 100644 --- a/app/src/main/res/layout/fragment_libao.xml +++ b/app/src/main/res/layout/fragment_libao.xml @@ -71,10 +71,4 @@ android:layout_below = "@id/vp_tab" android:overScrollMode = "never" /> - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_news.xml b/app/src/main/res/layout/fragment_news.xml index 6fa046fd98..dc5e674fb7 100644 --- a/app/src/main/res/layout/fragment_news.xml +++ b/app/src/main/res/layout/fragment_news.xml @@ -91,10 +91,4 @@ android:layout_below = "@+id/news_tabbar" android:overScrollMode = "never" /> - - \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 9d8fca0c65..b288c59e78 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -44,7 +44,7 @@ 右划发给好友\n免流量安装 放手发给好友\n免流量安装 加载失败，点击重试 - 客服信息 + 福利信息 我要咨询 我要加入 大家都在玩 @@ -287,5 +287,6 @@ 精品 手机登录 插件 + 请先登录 diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 950eaae9cf..0d2ea4aa6c 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -88,12 +88,8 @@ - - \ No newline at end of file