From 89746203feab4acd5085e2a5ac01a7fbb8169574 Mon Sep 17 00:00:00 2001 From: kehaoyuan Date: Mon, 9 Oct 2017 11:47:25 +0800 Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E5=AE=8C=E6=88=90=E5=90=8E?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=88=B7=E6=96=B0=E9=A1=B5=E9=9D=A2(?= =?UTF-8?q?=E6=88=91=E7=9A=84=E5=85=B3=E6=B3=A8,=E5=AD=98=E5=8F=B7?= =?UTF-8?q?=E7=AE=B1,=E7=A4=BC=E5=8C=85-=E5=85=B3=E6=B3=A8),=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E8=B5=84=E8=AE=AF-=E5=85=B3=E6=B3=A8=E7=A4=BC?= =?UTF-8?q?=E5=8C=85=E5=90=8C=E6=AD=A5=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/gh/gamecenter/ConcernActivity.java | 36 ++++++++++++---- .../gh/gamecenter/LibaoDetailActivity.java | 3 +- .../com/gh/gamecenter/SettingActivity.java | 42 ++++++++++--------- .../gh/gamecenter/libao/Libao2Fragment.java | 35 ++++++++++++---- .../gh/gamecenter/libao/Libao3Fragment.java | 30 +++++++++---- .../com/gh/gamecenter/news/News2Fragment.java | 1 + .../gamecenter/news/News2FragmentAdapter.java | 3 +- app/src/main/res/layout/dialog_alert.xml | 16 +++++-- 8 files changed, 117 insertions(+), 49 deletions(-) diff --git a/app/src/main/java/com/gh/gamecenter/ConcernActivity.java b/app/src/main/java/com/gh/gamecenter/ConcernActivity.java index ded84f9938..b0b336f58d 100644 --- a/app/src/main/java/com/gh/gamecenter/ConcernActivity.java +++ b/app/src/main/java/com/gh/gamecenter/ConcernActivity.java @@ -21,6 +21,7 @@ import com.gh.gamecenter.adapter.ConcernAdapter; import com.gh.gamecenter.adapter.ConcernRecommendAdapter; import com.gh.gamecenter.entity.GameEntity; import com.gh.gamecenter.eventbus.EBConcernChanged; +import com.gh.gamecenter.eventbus.EBReuse; import org.greenrobot.eventbus.Subscribe; import org.greenrobot.eventbus.ThreadMode; @@ -28,6 +29,9 @@ import org.greenrobot.eventbus.ThreadMode; import java.util.List; import butterknife.BindView; +import butterknife.OnClick; + +import static com.gh.gamecenter.personal.PersonalFragment.LOGIN_TAG; public class ConcernActivity extends BaseActivity implements OnClickListener, OnRequestCallBackListener { @@ -132,17 +136,23 @@ public class ConcernActivity extends BaseActivity implements OnClickListener, On } } - @Override + @OnClick({R.id.concern_rl_title, R.id.reuse_tv_none_data}) public void onClick(View v) { - if (v == mConcernTitleRl) { - if (mConcernRecommendRv.getVisibility() == View.VISIBLE) { - ((Concern_LinearLayout) mContentView).hideRecyclerView(); - } else { - ((Concern_LinearLayout) mContentView).showRecyclerView(); - } + switch (v.getId()) { + case R.id.concern_rl_title: + if (mConcernRecommendRv.getVisibility() == View.VISIBLE) { + ((Concern_LinearLayout) mContentView).hideRecyclerView(); + } else { + ((Concern_LinearLayout) mContentView).showRecyclerView(); + } + break; + case R.id.reuse_tv_none_data: + String hint = getString(R.string.login_hint); + if (hint.equals(mNoDataTv.getText().toString())) + startActivity(LoginActivity.getIntent(this, false)); + break; } } - // 关注事件 @Subscribe(threadMode = ThreadMode.MAIN) public void onEventMainThread(EBConcernChanged changed) { @@ -189,4 +199,14 @@ public class ConcernActivity extends BaseActivity implements OnClickListener, On } } } + + // 登录事件 + @Subscribe(threadMode = ThreadMode.MAIN) + public void onEventMainThread(EBReuse reuse) { + if (reuse.getType().equals(LOGIN_TAG)) { // 登入 + concernAdapter = new ConcernAdapter(this, this, mEntrance); + mConcernRv.setAdapter(concernAdapter); + mConcernRv.setVisibility(View.VISIBLE); + } + } } diff --git a/app/src/main/java/com/gh/gamecenter/LibaoDetailActivity.java b/app/src/main/java/com/gh/gamecenter/LibaoDetailActivity.java index 52a9d88785..5b2320a373 100644 --- a/app/src/main/java/com/gh/gamecenter/LibaoDetailActivity.java +++ b/app/src/main/java/com/gh/gamecenter/LibaoDetailActivity.java @@ -54,6 +54,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; import static com.gh.gamecenter.R.id.reuse_tv_none_data; +import static com.gh.gamecenter.news.News2Fragment.NEWS2_LIBAO_REQUEST; /** * Created by khy on 2016/12/13. @@ -382,7 +383,7 @@ public class LibaoDetailActivity extends BaseActivity implements LibaoDetailAdap if (obj != null) { Intent data = new Intent(); data.putExtra("UserDataLibaoEntity", (UserDataLibaoEntity) obj); - setResult(0x122, data); + setResult(NEWS2_LIBAO_REQUEST, data); } } diff --git a/app/src/main/java/com/gh/gamecenter/SettingActivity.java b/app/src/main/java/com/gh/gamecenter/SettingActivity.java index 1c2b15c094..e67df548a0 100644 --- a/app/src/main/java/com/gh/gamecenter/SettingActivity.java +++ b/app/src/main/java/com/gh/gamecenter/SettingActivity.java @@ -126,27 +126,29 @@ public class SettingActivity extends BaseActivity implements OnClickListener { private void initLoginStatus() { LoginResponseEntity loginToken = LoginUtils.getLoginToken(this); - if (loginToken != null && !TextUtils.isEmpty(loginToken.getLoginType())) { - String loginType = loginToken.getLoginType().trim(); - switch (loginType) { - case "qq": - loginType = "QQ"; - break; - case "wechat": - loginType = "微信"; - break; - case "weibo": - loginType = "新浪微博"; - break; - default: - if (loginType.length() == 11) { - String sub1 = loginType.substring(0, 3); - String sub2 = loginType.substring(9, 11); - loginType = StringUtils.buildString(sub1, "******", sub2); - } - break; + if (loginToken != null) { + if (!TextUtils.isEmpty(loginToken.getLoginType())) { + String loginType = loginToken.getLoginType().trim(); + switch (loginType) { + case "qq": + loginType = "QQ"; + break; + case "wechat": + loginType = "微信"; + break; + case "weibo": + loginType = "新浪微博"; + break; + default: + if (loginType.length() == 11) { + String sub1 = loginType.substring(0, 3); + String sub2 = loginType.substring(9, 11); + loginType = StringUtils.buildString(sub1, "******", sub2); + } + break; + } + mSettingLoginType.setText(loginType); } - mSettingLoginType.setText(loginType); mSettingLoginRl.setVisibility(View.VISIBLE); } else { mSettingLoginRl.setVisibility(View.GONE); 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 f7cb7a21c2..611c230562 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/Libao2Fragment.java +++ b/app/src/main/java/com/gh/gamecenter/libao/Libao2Fragment.java @@ -17,9 +17,11 @@ import com.gh.common.view.VerticalItemDecoration; import com.gh.gamecenter.ConcernActivity; import com.gh.gamecenter.LibaoActivity; import com.gh.gamecenter.LibaoDetailActivity; +import com.gh.gamecenter.LoginActivity; import com.gh.gamecenter.R; import com.gh.gamecenter.entity.LibaoEntity; import com.gh.gamecenter.eventbus.EBConcernChanged; +import com.gh.gamecenter.eventbus.EBReuse; import com.gh.gamecenter.eventbus.EBUISwitch; import org.greenrobot.eventbus.Subscribe; @@ -31,6 +33,7 @@ import butterknife.BindView; import butterknife.OnClick; import static com.gh.common.constant.Constants.LIST_HEAD_ITEM; +import static com.gh.gamecenter.personal.PersonalFragment.LOGIN_TAG; /** * Created by khy on 2016/12/12. @@ -154,6 +157,7 @@ public class Libao2Fragment extends BaseFragment implements SwipeRefreshLayout.O mRecyclerView.setVisibility(View.VISIBLE); mLoadingLayout.setVisibility(View.VISIBLE); postDelayedRunnable(runnable, 1000); + isConcernChanged = false; } } @@ -162,13 +166,22 @@ public class Libao2Fragment extends BaseFragment implements SwipeRefreshLayout.O postDelayedRunnable(runnable, 1000); } - @OnClick(R.id.reuse_no_connection) - public void reconnection() { // 重新连接 - mRefreshLayout.setRefreshing(true); - mRecyclerView.setVisibility(View.VISIBLE); - mLoadingLayout.setVisibility(View.VISIBLE); - mNoConnectionLayout.setVisibility(View.GONE); - postDelayedRunnable(runnable, 1000); + @OnClick({R.id.reuse_no_connection, R.id.reuse_tv_none_data}) + public void onClick(View v) { // 重新连接 + switch (v.getId()) { + case R.id.reuse_no_connection: + mRefreshLayout.setRefreshing(true); + mRecyclerView.setVisibility(View.VISIBLE); + mLoadingLayout.setVisibility(View.VISIBLE); + mNoConnectionLayout.setVisibility(View.GONE); + postDelayedRunnable(runnable, 1000); + break; + case R.id.reuse_tv_none_data: + String hint = getString(R.string.login_hint); + if (hint.equals(mNoDataTv.getText().toString())) + startActivity(LoginActivity.getIntent(getContext(), false)); + break; + } } // 资讯Fragment界面切换事件 @@ -207,4 +220,12 @@ public class Libao2Fragment extends BaseFragment implements SwipeRefreshLayout.O break; } } + + // 登录事件 + @Subscribe(threadMode = ThreadMode.MAIN) + public void onEventMainThread(EBReuse reuse) { + if (reuse.getType().equals(LOGIN_TAG)) { // 登入 + postRunnable(runnable); + } + } } 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 64b1c152ac..51f3f3ec07 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/Libao3Fragment.java +++ b/app/src/main/java/com/gh/gamecenter/libao/Libao3Fragment.java @@ -14,6 +14,7 @@ import com.gc.materialdesign.views.ProgressBarCircularIndeterminate; import com.gh.base.fragment.BaseFragment; import com.gh.common.view.VerticalItemDecoration; import com.gh.gamecenter.LibaoActivity; +import com.gh.gamecenter.LoginActivity; import com.gh.gamecenter.R; import com.gh.gamecenter.eventbus.EBReuse; import com.gh.gamecenter.eventbus.EBUISwitch; @@ -24,6 +25,8 @@ import org.greenrobot.eventbus.ThreadMode; import butterknife.BindView; import butterknife.OnClick; +import static com.gh.gamecenter.personal.PersonalFragment.LOGIN_TAG; + /** * Created by khy on 2016/12/12. */ @@ -121,13 +124,22 @@ public class Libao3Fragment extends BaseFragment implements SwipeRefreshLayout.O mNoDataTv.setTextColor(ContextCompat.getColor(getContext(), R.color.theme)); } - @OnClick(R.id.reuse_no_connection) - public void reconnection() { // 重新连接 - mRefreshLayout.setRefreshing(true); - mRecyclerView.setVisibility(View.VISIBLE); - mLoadingLayout.setVisibility(View.VISIBLE); - mNoConn.setVisibility(View.GONE); - postDelayedRunnable(runnable, 1000); + @OnClick({R.id.reuse_no_connection, R.id.reuse_tv_none_data}) + public void onClick(View v) { // 重新连接 + switch (v.getId()) { + case R.id.reuse_no_connection: + mRefreshLayout.setRefreshing(true); + mRecyclerView.setVisibility(View.VISIBLE); + mLoadingLayout.setVisibility(View.VISIBLE); + mNoConn.setVisibility(View.GONE); + postDelayedRunnable(runnable, 1000); + break; + case R.id.reuse_tv_none_data: + String hint = getString(R.string.login_hint); + if (hint.equals(mNoDataTv.getText().toString())) + startActivity(LoginActivity.getIntent(getContext(), false)); + break; + } } @Override @@ -147,11 +159,13 @@ public class Libao3Fragment extends BaseFragment implements SwipeRefreshLayout.O } } - // 礼包数据库数量改变事件 + // 礼包数据库数量改变事件/登录事件 @Subscribe(threadMode = ThreadMode.MAIN) public void onEventMainThread(EBReuse changed) { if ("libaoChanged".equals(changed.getType())) { adapter.loadData(0); + } else if (changed.getType().equals(LOGIN_TAG)) { // 登入 + postRunnable(runnable); } } } 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 7c634fc3b3..6cc2bd1a23 100644 --- a/app/src/main/java/com/gh/gamecenter/news/News2Fragment.java +++ b/app/src/main/java/com/gh/gamecenter/news/News2Fragment.java @@ -425,6 +425,7 @@ public class News2Fragment extends BaseFragment implements SwipeRefreshLayout.On userData.getUserDataLibaoList().add(resultUserLibaoData); } } + skipEntity.setUserData(userData); // 要重新设回去 不然没效果 0.0 } adapter.notifyItemChanged(adapter.getSkipPosition()); adapter.setSkipPosition(-1); diff --git a/app/src/main/java/com/gh/gamecenter/news/News2FragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/news/News2FragmentAdapter.java index f2665594ec..94f1024314 100644 --- a/app/src/main/java/com/gh/gamecenter/news/News2FragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/news/News2FragmentAdapter.java @@ -382,7 +382,6 @@ public class News2FragmentAdapter extends BaseRecyclerAdapter { } if (libaoStatusEntity.getId().equals(concernEntity.getId())) { - if ("finish".equals(libaoStatusEntity.getStatus())) { viewHolder.read.setText("已结束"); } else { @@ -393,7 +392,7 @@ public class News2FragmentAdapter extends BaseRecyclerAdapter { List userDataLibaoList = userData.getUserDataLibaoList(); UserDataLibaoEntity userDataLibaoEntity = userDataLibaoList.get(userDataLibaoList.size() - 1); libaoStatusEntity.setBeforeStatus(libaoStatusEntity.getStatus()); - if (userDataLibaoEntity.getType().equals("ling")) { // 拿最后一次领取的状态判断 + if ("ling".equals(userDataLibaoEntity.getType())) { // 拿最后一次领取的状态判断 libaoStatusEntity.setStatus("linged"); viewHolder.read.setText("已领取"); } else { diff --git a/app/src/main/res/layout/dialog_alert.xml b/app/src/main/res/layout/dialog_alert.xml index 130970f291..d9a9f1ce6d 100644 --- a/app/src/main/res/layout/dialog_alert.xml +++ b/app/src/main/res/layout/dialog_alert.xml @@ -4,7 +4,7 @@ android:layout_height = "wrap_content" android:background = "@android:color/white" android:orientation = "vertical" - android:paddingBottom = "20dp" + android:paddingBottom = "15dp" android:paddingLeft = "25dp" android:paddingRight = "25dp" android:paddingTop = "25dp" > @@ -29,13 +29,18 @@ + android:layout_marginTop = "30dp" > @@ -43,8 +48,13 @@ android:id = "@+id/dialog_negative" android:layout_width = "wrap_content" android:layout_height = "wrap_content" - android:layout_marginRight = "40dp" + android:layout_marginRight = "28dp" android:layout_toLeftOf = "@id/dialog_positive" + android:background = "@drawable/reuse_listview_item_style" + android:paddingBottom = "4dp" + android:paddingLeft = "6dp" + android:paddingRight = "6dp" + android:paddingTop = "4dp" android:textColor = "@color/theme" android:textSize = "14sp" />