From d6d49ac7ad781948cd00c839fb0a7a60120607e6 Mon Sep 17 00:00:00 2001 From: kehaoyuan Date: Wed, 20 Sep 2017 20:01:07 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E7=90=86Activity=E5=85=A5=E5=8F=A3(?= =?UTF-8?q?=E8=BF=98=E6=9C=89=E9=83=A8=E5=88=86=E6=9C=AA=E6=A3=80=E6=9F=A5?= =?UTF-8?q?)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/gh/base/AppUncaughtHandler.java | 1 - .../main/java/com/gh/base/BaseActivity.java | 8 +-- .../gamecenter/DownloadManagerActivity.java | 2 + .../gh/gamecenter/FileReceiverActivity.java | 7 +- .../com/gh/gamecenter/GameDetailActivity.java | 9 ++- .../java/com/gh/gamecenter/LoginActivity.java | 7 +- .../java/com/gh/gamecenter/MainActivity.java | 64 +------------------ .../gh/gamecenter/MessageDetailActivity.java | 25 +++++++- .../com/gh/gamecenter/NewsDetailActivity.java | 7 +- .../java/com/gh/gamecenter/WebActivity.java | 6 +- .../gh/gamecenter/adapter/VoteAdapter.java | 9 +-- .../gh/gamecenter/fragment/MainFragment.java | 21 ++++++ .../gamecenter/gamedetail/FuliFragment.java | 2 +- .../message/CommentFragmentAdapter.java | 3 +- .../gamecenter/news/News2FragmentAdapter.java | 6 +- .../newsdetail/NewsDetailAdapter.java | 5 +- .../gamecenter/personal/PersonalFragment.java | 15 ++--- .../res/layout/activity_userinfo_edit.xml | 3 +- app/src/main/res/layout/fragment_main.xml | 25 ++++++-- 19 files changed, 104 insertions(+), 121 deletions(-) diff --git a/app/src/main/java/com/gh/base/AppUncaughtHandler.java b/app/src/main/java/com/gh/base/AppUncaughtHandler.java index db7156f6f4..6e99679010 100644 --- a/app/src/main/java/com/gh/base/AppUncaughtHandler.java +++ b/app/src/main/java/com/gh/base/AppUncaughtHandler.java @@ -60,7 +60,6 @@ public class AppUncaughtHandler implements UncaughtExceptionHandler { sp.edit().putLong("last_restart_time", curTime).apply(); Intent intent = new Intent(context, SplashScreenActivity.class); intent.setAction(Intent.ACTION_MAIN); -// intent.putExtra("exceptionReStart", true); intent.addCategory(Intent.CATEGORY_LAUNCHER); PendingIntent restartIntent = PendingIntent.getActivity(context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT); diff --git a/app/src/main/java/com/gh/base/BaseActivity.java b/app/src/main/java/com/gh/base/BaseActivity.java index 273a27f504..8916c6a694 100644 --- a/app/src/main/java/com/gh/base/BaseActivity.java +++ b/app/src/main/java/com/gh/base/BaseActivity.java @@ -14,10 +14,9 @@ import com.gh.common.util.PackageUtils; import com.gh.common.util.RunningUtils; import com.gh.common.util.ShareUtils; import com.gh.common.util.StringUtils; -import com.gh.gamecenter.MainActivity; +import com.gh.gamecenter.LoginActivity; import com.gh.gamecenter.R; import com.gh.gamecenter.eventbus.EBShowDialog; -import com.gh.gamecenter.eventbus.EBSkip; import com.lightgame.download.FileUtils; import com.lightgame.utils.AppManager; import com.readystatesoftware.systembartint.SystemBarTintManager.SystemBarConfig; @@ -144,10 +143,7 @@ public abstract class BaseActivity extends BaseAppCompatToolBarActivity implemen , null, new DialogUtils.CancelListener() { @Override public void onCancel() { - EventBus.getDefault().post(new EBSkip(MainActivity.EB_SKIP_GAMEFRAGMENT, 2)); - if (!MainActivity.class.getName().equals(RunningUtils.getTopActivity(BaseActivity.this))) { - finish(); - } + startActivity(LoginActivity.getIntent(BaseActivity.this, false)); } }); } catch (JSONException e) { diff --git a/app/src/main/java/com/gh/gamecenter/DownloadManagerActivity.java b/app/src/main/java/com/gh/gamecenter/DownloadManagerActivity.java index bc99c0cf3f..91f3b8329d 100644 --- a/app/src/main/java/com/gh/gamecenter/DownloadManagerActivity.java +++ b/app/src/main/java/com/gh/gamecenter/DownloadManagerActivity.java @@ -21,6 +21,8 @@ public class DownloadManagerActivity extends BaseActivity { public static final String TAG = "DownloadManagerActivity"; + + // TODO: 20/09/17 增加currentItem 入口 插件更新可能需要 public static Intent getDownloadMangerIntent(Context context, String url, String entrance) { Intent intent = new Intent(context, DownloadManagerActivity.class); intent.putExtra("url", url); diff --git a/app/src/main/java/com/gh/gamecenter/FileReceiverActivity.java b/app/src/main/java/com/gh/gamecenter/FileReceiverActivity.java index 88fdbc69e7..21eca58e80 100644 --- a/app/src/main/java/com/gh/gamecenter/FileReceiverActivity.java +++ b/app/src/main/java/com/gh/gamecenter/FileReceiverActivity.java @@ -1,7 +1,6 @@ package com.gh.gamecenter; import android.Manifest; -import android.content.Intent; import android.content.SharedPreferences; import android.content.pm.PackageManager; import android.os.Bundle; @@ -22,13 +21,11 @@ import android.widget.RelativeLayout; import android.widget.TextView; import com.facebook.drawee.view.SimpleDraweeView; -import com.halo.assistant.HaloApp; import com.gh.base.BaseActivity; import com.gh.common.util.DialogUtils; import com.gh.common.util.PackageUtils; import com.gh.common.util.StringUtils; import com.gh.common.util.UserIconUtils; -import com.lightgame.utils.Utils; import com.gh.gamecenter.adapter.FileReceiverAdapter; import com.gh.gamecenter.adapter.FileReceiverAdapter.OnReceiverCancelListener; import com.gh.gamecenter.eventbus.EBDownloadChanged; @@ -43,9 +40,11 @@ import com.gh.gamecenter.kuaichuan.IpPortInfo; import com.gh.gamecenter.kuaichuan.KuaichuanNotification; import com.gh.gamecenter.kuaichuan.WifiMgr; import com.gh.gamecenter.manager.DataCollectionManager; +import com.halo.assistant.HaloApp; import com.lightgame.download.DownloadDao; import com.lightgame.download.DownloadEntity; import com.lightgame.download.DownloadStatus; +import com.lightgame.utils.Utils; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; @@ -508,7 +507,7 @@ public class FileReceiverActivity extends BaseActivity implements OnReceiverCanc mKeepReceiverTv.setBackgroundResource(R.drawable.game_item_btn_pause_style); Utils.toast(FileReceiverActivity.this, "无需操作，请让对方继续发送即可"); } else { // 跳转安装包清理 - startActivity(new Intent(this, CleanApkActivity.class)); + startActivity(CleanApkActivity.getIntent(this)); } break; diff --git a/app/src/main/java/com/gh/gamecenter/GameDetailActivity.java b/app/src/main/java/com/gh/gamecenter/GameDetailActivity.java index 7333bfb961..dc109bce6f 100644 --- a/app/src/main/java/com/gh/gamecenter/GameDetailActivity.java +++ b/app/src/main/java/com/gh/gamecenter/GameDetailActivity.java @@ -76,6 +76,7 @@ public class GameDetailActivity extends BaseActivity { public static final String SKIP_XINXI = "skipXinxi"; public static final String SKIP_FULI = "skipFuli"; public static final String OPEN_APPBAR = "openappbar"; + public static final String SCROLL_TO_KAIFU = "scrollToKaiFu"; @BindView(R.id.gamedetail_vp) NoScrollableViewPager mViewPager; @@ -117,6 +118,7 @@ public class GameDetailActivity extends BaseActivity { private String shareCode; private boolean mIsTouchScreen = false; private boolean mIsShowKaifuHint; + private boolean mIsScrollToKaiFu; private int mCurVpPosition; private DataWatcher dataWatcher = new DataWatcher() { @@ -260,6 +262,11 @@ public class GameDetailActivity extends BaseActivity { } else { mTitle.setVisibility(View.GONE); } + + if (Math.abs(verticalOffset) == total && mIsScrollToKaiFu) { + mIsScrollToKaiFu = false; + EventBus.getDefault().post(new EBReuse("scrollToKaiFu")); + } } }); @@ -589,7 +596,7 @@ public class GameDetailActivity extends BaseActivity { break; case R.id.gamedetail_kaifu_hint: mAppBarLayout.setExpanded(false, true); - EventBus.getDefault().post(new EBReuse("scrollToKaiFu")); + mIsScrollToKaiFu = true; break; } } diff --git a/app/src/main/java/com/gh/gamecenter/LoginActivity.java b/app/src/main/java/com/gh/gamecenter/LoginActivity.java index 9d650d396f..44ea5997a0 100644 --- a/app/src/main/java/com/gh/gamecenter/LoginActivity.java +++ b/app/src/main/java/com/gh/gamecenter/LoginActivity.java @@ -27,9 +27,6 @@ import java.util.List; public class LoginActivity extends BaseActivity { - private LoginFragment mLoginFragment; - private LoginOldUserFragment mOldUserFragment; - ImageView mOldUserIcon; private boolean mIsOlderUser; @@ -122,11 +119,11 @@ public class LoginActivity extends BaseActivity { FragmentTransaction transaction = getSupportFragmentManager().beginTransaction(); hideFragments(transaction); if (mIsOlderUser) { - mOldUserFragment = alterFragment(transaction, LoginOldUserFragment.class); + alterFragment(transaction, LoginOldUserFragment.class); initTitle("老用户登录"); // mOldUserIcon.setVisibility(View.GONE); } else { - mLoginFragment = alterFragment(transaction, LoginFragment.class); + alterFragment(transaction, LoginFragment.class); initTitle("登录光环助手"); // mOldUserIcon.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/gh/gamecenter/MainActivity.java b/app/src/main/java/com/gh/gamecenter/MainActivity.java index ba693cf565..22acc853f4 100644 --- a/app/src/main/java/com/gh/gamecenter/MainActivity.java +++ b/app/src/main/java/com/gh/gamecenter/MainActivity.java @@ -44,7 +44,6 @@ import com.gh.gamecenter.eventbus.EBDownloadStatus; import com.gh.gamecenter.eventbus.EBPackage; import com.gh.gamecenter.eventbus.EBShowDialog; import com.gh.gamecenter.eventbus.EBSkip; -import com.gh.gamecenter.eventbus.EBUISwitch; import com.gh.gamecenter.fragment.MainFragment; import com.gh.gamecenter.manager.ConcernManager; import com.gh.gamecenter.manager.DataCollectionManager; @@ -639,12 +638,8 @@ public class MainActivity extends BaseActivity { isSkipped = false; -// initViews(); if (savedInstanceState != null) { -// currentTab = savedInstanceState.getInt("currentTab"); isSkipped = savedInstanceState.getBoolean("isSkipped"); -// } else { -// currentTab = 0; } replaceFragment(new MainFragment()); @@ -671,30 +666,6 @@ public class MainActivity extends BaseActivity { // 检查是否有权限读取应用列表 checkPermission(); -// if (isNewFirstLaunch || TokenUtils.getDeviceId(this) == null) { -// HaloApp.MAIN_EXECUTOR.execute(new Runnable() { -// @Override -// public void run() { - // 注册设备 -// TokenUtils.register(MainActivity.this.getApplicationContext()); -// TokenUtils.getToken(MainActivity.this.getApplicationContext(), false) // TODO 是否移除 -// .subscribeOn(Schedulers.io()) -// .observeOn(AndroidSchedulers.mainThread()) -// .subscribe(new Response() { -// @Override -// public void onResponse(String token) { -// TokenUtils.checkDeviceInfo(MainActivity.this.getApplicationContext(), token); -// } -// }); -// updateUserGhzs(); - -// initConcern(); // 初始化关注 移到登录成功后调用 -// } -// }); -// } else { -// updateUserGhzs(); -// } - // 执行跳转事件 handler.postDelayed(skipRun, 500); @@ -704,8 +675,8 @@ public class MainActivity extends BaseActivity { if (LoginUtils.getUserInfo(this) != null && !TextUtils.isEmpty(message)) { Config.setExceptionMsg(this, null); AppUncaughtHandler.reportException(this, new Throwable(message)); - DialogUtils.showWarningDialog(this, "发生闪退", "光环助手刚刚发生了闪退，反馈一下（只需简单描述你刚才的操作）以帮忙我们更好地修复问题？" - , "暂不", " 反馈一下", new DialogUtils.ConfirmListener() { + DialogUtils.showWarningDialog(this, "发生闪退", "光环助手刚刚发生了闪退，马上反馈以帮助我们更好地修复问题？（只需简单描述你刚才的操作）" + , "暂不", "马上反馈", new DialogUtils.ConfirmListener() { @Override public void onConfirm() { SuggestionActivity.startSuggestionActivity(MainActivity.this, 3, null, null); @@ -794,35 +765,6 @@ public class MainActivity extends BaseActivity { } - private void getConcernDigest(final List arrGameId) { - final ArrayList concernDigest = new ArrayList<>(); - - if (arrGameId.size() == 0) { - EventBus.getDefault().post(new EBUISwitch("NewsWrapperFragment", -2)); // 没有关注 - } - - List> list = new ArrayList<>(); - for (String gameId : arrGameId) { - list.add(RetrofitManager.getInstance(this).getApi().getGameDigest(gameId)); - } - Observable.merge(list) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .subscribe(new Response() { - @Override - public void onCompleted() { - concernManager.addByList(concernDigest); - } - - @Override - public void onNext(GameEntity response) { - concernDigest.add(response); - } - - - }); - } - private void checkPermission() { List installedList = getPackageManager().getInstalledPackages(0); if (installedList.isEmpty()) { @@ -857,7 +799,7 @@ public class MainActivity extends BaseActivity { while (entries.hasMoreElements()) { ZipEntry entry = ((ZipEntry) entries.nextElement()); String entryName = entry.getName(); - if (entryName.contains("gh_assist")) { + if (entryName.contains("gh_assist")) { // TODO: 20/09/17 统一入口 String packageName = entryName.substring(entryName.lastIndexOf("_") + 1); Intent intent = new Intent(MainActivity.this, DownloadManagerActivity.class); intent.putExtra("currentItem", 1); diff --git a/app/src/main/java/com/gh/gamecenter/MessageDetailActivity.java b/app/src/main/java/com/gh/gamecenter/MessageDetailActivity.java index a9ac25e759..9e70952eef 100644 --- a/app/src/main/java/com/gh/gamecenter/MessageDetailActivity.java +++ b/app/src/main/java/com/gh/gamecenter/MessageDetailActivity.java @@ -23,6 +23,7 @@ import com.gh.base.BaseActivity; import com.gh.common.constant.Config; import com.gh.common.util.CheckLoginUtils; import com.gh.common.util.DialogUtils; +import com.gh.common.util.EntranceUtils; import com.gh.common.util.ImageUtils; import com.gh.common.util.LoginUtils; import com.gh.common.util.PostCommentUtils; @@ -136,15 +137,33 @@ public class MessageDetailActivity extends BaseActivity implements OnCommentCall } }; + // 评论回复 public static Intent getMessageDetailIntent(Context context, CommentEntity entity, String newsId) { - Intent intent = new Intent(context, MessageDetailActivity.class); HaloApp.put("CommentEntity", entity); + Intent intent = new Intent(context, MessageDetailActivity.class); intent.putExtra("commentNum", -1); intent.putExtra("newsId", newsId); intent.putExtra("openSoftInput", true); return intent; } + public static Intent getIntentByEntity(Context context, ConcernEntity concernEntity, String entrance) { + HaloApp.put("ConcernEntity", concernEntity); + Intent intent = new Intent(context, MessageDetailActivity.class); + intent.putExtra(EntranceUtils.KEY_ENTRANCE, entrance); + return intent; + } + + public static Intent getIntentById(Context context, String newsId, Integer commentNum, Boolean openSoftInput, String entrance) { + Intent intent = new Intent(context, MessageDetailActivity.class); + intent.putExtra("newsId", newsId); + intent.putExtra(EntranceUtils.KEY_ENTRANCE, entrance); + intent.putExtra("commentNum", commentNum); + intent.putExtra("openSoftInput", openSoftInput); + return intent; + } + + @Override protected void onSaveInstanceState(Bundle outState) { super.onSaveInstanceState(outState); @@ -166,7 +185,7 @@ public class MessageDetailActivity extends BaseActivity implements OnCommentCall Intent intent = getIntent(); newsId = intent.getExtras().getString("newsId"); - commentNum = intent.getExtras().getInt("commentNum"); + commentNum = intent.getExtras().getInt("commentNum", -1); //复用问题 mConcernEntity对应的文章有可能和跳转之前的文章不一致 if (mConcernEntity != null && newsId != null && !newsId.equals(mConcernEntity.getId())) { @@ -209,7 +228,7 @@ public class MessageDetailActivity extends BaseActivity implements OnCommentCall getConcernDigest(); } - if (intent.getExtras().getBoolean("openSoftInput")) {//新闻详情的发表评论 + if (intent.getExtras().getBoolean("openSoftInput", false)) {//新闻详情的发表评论 setSoftInput(true); } diff --git a/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java b/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java index ed495eb008..d3f825e91e 100644 --- a/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java +++ b/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java @@ -547,11 +547,8 @@ public class NewsDetailActivity extends BaseActivity implements OnClickListener, CheckLoginUtils.checkLogin(this, new CheckLoginUtils.OnLoggenInListener() { @Override public void onLoggedIn() { - Intent intent = new Intent(NewsDetailActivity.this, MessageDetailActivity.class); - intent.putExtra("commentNum", -1); - intent.putExtra("newsId", adapter.getNewsDetailEntity().getId()); - intent.putExtra("openSoftInput", true); - intent.putExtra(EntranceUtils.KEY_ENTRANCE, mEntrance + "(新闻详情[" + adapter.getTitle() + "])"); + Intent intent = MessageDetailActivity.getIntentById(NewsDetailActivity.this, adapter.getNewsDetailEntity().getId(), null, true + , mEntrance + "(新闻详情[" + adapter.getTitle() + "])"); startActivity(intent); } }); diff --git a/app/src/main/java/com/gh/gamecenter/WebActivity.java b/app/src/main/java/com/gh/gamecenter/WebActivity.java index b6901d1860..7fd3cd126b 100644 --- a/app/src/main/java/com/gh/gamecenter/WebActivity.java +++ b/app/src/main/java/com/gh/gamecenter/WebActivity.java @@ -22,7 +22,6 @@ import com.gh.base.BaseActivity; import com.gh.common.util.CheckLoginUtils; import com.gh.common.util.CollectionUtils; import com.gh.common.util.DisplayUtils; -import com.gh.common.util.EntranceUtils; import com.gh.common.util.ShareUtils; import com.gh.gamecenter.entity.CommentnumEntity; import com.gh.gamecenter.entity.ToolBoxEntity; @@ -284,10 +283,7 @@ public class WebActivity extends BaseActivity { @OnClick({R.id.web_comment, R.id.web_collection}) public void onClick(View v) { if (v == webComment) { - Intent intent = new Intent(this, MessageDetailActivity.class); - intent.putExtra("newsId", newsId); - intent.putExtra("commentNum", commentNum); - intent.putExtra(EntranceUtils.KEY_ENTRANCE, mEntrance + "+(光环浏览器)"); + Intent intent = MessageDetailActivity.getIntentById(this, newsId, commentNum, null, mEntrance + "+(光环浏览器)"); startActivityForResult(intent, 1001); } else if (v == mCollectionIv) { CheckLoginUtils.checkLogin(this, new CheckLoginUtils.OnLoggenInListener() { diff --git a/app/src/main/java/com/gh/gamecenter/adapter/VoteAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/VoteAdapter.java index 4ce019ed6b..e8b7fd86fe 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/VoteAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/VoteAdapter.java @@ -76,10 +76,6 @@ public class VoteAdapter extends BaseRecyclerAdapter { public void onResponse(List response) { super.onResponse(response); if (response.size() > 0) { - if (response.size() < 20) { - isRemove = true; - } - if (offset == 0) { mCallBackListener.loadDone(); } @@ -87,6 +83,11 @@ public class VoteAdapter extends BaseRecyclerAdapter { mVoteList.addAll(response); notifyItemRangeInserted(mVoteList.size() - response.size(), response.size()); + + if (response.size() < 20) { + isRemove = true; + notifyItemChanged(getItemCount() - 1); + } } else { isRemove = true; if (mVoteList.size() == 0) { 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 70b5ff2a80..b11dd81530 100644 --- a/app/src/main/java/com/gh/gamecenter/fragment/MainFragment.java +++ b/app/src/main/java/com/gh/gamecenter/fragment/MainFragment.java @@ -11,8 +11,10 @@ import com.gh.base.SearchBarHint; import com.gh.base.fragment.BaseFragment_ViewPager_Checkable; import com.gh.gamecenter.MainActivity; import com.gh.gamecenter.R; +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; @@ -27,6 +29,7 @@ import org.greenrobot.eventbus.ThreadMode; import java.util.ArrayList; import java.util.List; +import butterknife.BindView; import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; @@ -41,6 +44,10 @@ import static com.gh.gamecenter.MainActivity.EB_SKIP_GAMEFRAGMENT; public class MainFragment extends BaseFragment_ViewPager_Checkable { + + @BindView(R.id.main_iv_message_hint) + View mMessageHintIv; + public static final int INDEX_GAME = 0; public static final int INDEX_NEWS = 1; public static final int INDEX_PERSONAL = 2; @@ -134,4 +141,18 @@ public class MainFragment extends BaseFragment_ViewPager_Checkable { } }); } + + // 控制 我的光环消息未读红点 + @Subscribe(threadMode = ThreadMode.MAIN) + public void onEventMainThread(EBReuse reuse) { + if (MessageFragment.MESSAGE_READ_OVER.equals(reuse.getType())) { // 消息阅读完成 + if (mMessageHintIv != null) { + mMessageHintIv.setVisibility(View.GONE); + } + } else if (PersonalFragment.MESSAGE_UNREAD_TAG.equals(reuse.getType())) { + if (mMessageHintIv != null) { + mMessageHintIv.setVisibility(View.VISIBLE); + } + } + } } 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 bf041937bb..950f954394 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/FuliFragment.java +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/FuliFragment.java @@ -112,7 +112,7 @@ public class FuliFragment extends BaseFragment { } else if ("canShowKaifuHint".equals(reuse.getType())) { isCanShowKaiFuHint = true; EventBus.getDefault().post(new EBReuse("showKaifuHint")); - } else if ("scrollToKaiFu".equals(reuse.getType()) && layoutManager != null) { + } else if (GameDetailActivity.SCROLL_TO_KAIFU.equals(reuse.getType()) && layoutManager != null) { int position = layoutManager.getItemCount() - 2; if (position > 0) layoutManager.smoothScrollToPosition(mRecyclerView, null, position); diff --git a/app/src/main/java/com/gh/gamecenter/message/CommentFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/message/CommentFragmentAdapter.java index f1723d3798..b2683e5e3d 100644 --- a/app/src/main/java/com/gh/gamecenter/message/CommentFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/message/CommentFragmentAdapter.java @@ -214,8 +214,7 @@ public class CommentFragmentAdapter extends BaseRecyclerAdapter { viewHolder.itemView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - Intent intent = new Intent(mContext, MessageDetailActivity.class); - intent.putExtra("newsId", commentEntity.getArticleId()); + Intent intent = MessageDetailActivity.getIntentById(mContext, commentEntity.getArticleId(), null, null, "收藏-评论"); mContext.startActivity(intent); EventBus.getDefault().post(new EBUISwitch("commentMarkRead", 0)); } 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 550db2aad9..94e7fa8907 100644 --- a/app/src/main/java/com/gh/gamecenter/news/News2FragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/news/News2FragmentAdapter.java @@ -498,9 +498,9 @@ public class News2FragmentAdapter extends BaseRecyclerAdapter { public void onClick(View v) { skipPosition = viewHolder.getAdapterPosition(); concernEntity.setItemHeight(viewHolder.itemView.getHeight()); - HaloApp.put("ConcernEntity", concernEntity); - Intent intent = new Intent(mContext, MessageDetailActivity.class); - intent.putExtra(EntranceUtils.KEY_ENTRANCE, StringUtils.buildString("(资讯:关注[" + viewHolder.getAdapterPosition() + "])")); + + Intent intent = MessageDetailActivity.getIntentByEntity(mContext, concernEntity, + StringUtils.buildString("(资讯:关注[" + viewHolder.getAdapterPosition() + "])")); fragment.startActivityForResult(intent, 0x125); } }); diff --git a/app/src/main/java/com/gh/gamecenter/newsdetail/NewsDetailAdapter.java b/app/src/main/java/com/gh/gamecenter/newsdetail/NewsDetailAdapter.java index 7268a9b8c3..9665fe7d96 100644 --- a/app/src/main/java/com/gh/gamecenter/newsdetail/NewsDetailAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/newsdetail/NewsDetailAdapter.java @@ -555,10 +555,7 @@ public class NewsDetailAdapter extends BaseRecyclerAdapter { linearLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - Intent intent = new Intent(mContext, MessageDetailActivity.class); - intent.putExtra("newsId", mId); - intent.putExtra("commentNum", -1); - intent.putExtra(EntranceUtils.KEY_ENTRANCE, mEntrance + "+(新闻详情[" + mTitle + "])"); + Intent intent = MessageDetailActivity.getIntentById(mContext, mId, null, null, mEntrance + "+(新闻详情[" + mTitle + "])"); mContext.startActivity(intent); } }); 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 ea7837f40b..5930f7f9d5 100644 --- a/app/src/main/java/com/gh/gamecenter/personal/PersonalFragment.java +++ b/app/src/main/java/com/gh/gamecenter/personal/PersonalFragment.java @@ -29,7 +29,6 @@ import com.gh.gamecenter.ShareGhActivity; import com.gh.gamecenter.SuggestSelectActivity; import com.gh.gamecenter.SuggestionActivity; import com.gh.gamecenter.UserInfoActivity; -import com.gh.gamecenter.db.KeFuMarkReadDao; import com.gh.gamecenter.entity.AppEntity; import com.gh.gamecenter.entity.MessageUnreadEntity; import com.gh.gamecenter.entity.UserInfoEntity; @@ -109,6 +108,7 @@ public class PersonalFragment extends BaseFragment implements GetLoginDataUtils. public final static String LOGIN_TAG = "login_tag"; //登入标识 public final static String LOGOUT_TAG = "logout_tag"; // 登出标识 + public final static String MESSAGE_UNREAD_TAG = "message_unread_tag"; private UserInfoEntity mUserInfoEntity; @@ -251,23 +251,18 @@ public class PersonalFragment extends BaseFragment implements GetLoginDataUtils. 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) { mLoginMessgeHint.setVisibility(View.VISIBLE); } - } if (response != null && response.getComment() > 0) { mLoginMessgeHint.setVisibility(View.VISIBLE); } + + if (mLoginMessgeHint.getVisibility() == View.VISIBLE) { + EventBus.getDefault().post(new EBReuse(MESSAGE_UNREAD_TAG)); + } } @Override diff --git a/app/src/main/res/layout/activity_userinfo_edit.xml b/app/src/main/res/layout/activity_userinfo_edit.xml index e3b0df08c5..fcff965b20 100644 --- a/app/src/main/res/layout/activity_userinfo_edit.xml +++ b/app/src/main/res/layout/activity_userinfo_edit.xml @@ -86,7 +86,7 @@ android:background = "@null" android:hint = "@string/nickname_hint" android:maxLength = "12" - android:maxLines = "1" + android:singleLine="true" android:textColor = "@color/title" android:textCursorDrawable = "@drawable/cursor_color" android:textSize = "15sp" /> @@ -124,6 +124,7 @@ android:hint = "输入你的常用QQ或者邮箱" android:textColor = "@color/title" android:textCursorDrawable = "@drawable/cursor_color" + android:singleLine="true" android:textSize = "15sp" /> - + + + + + +