From a87f64247370b2f3afa5df1035507ef03e03558c Mon Sep 17 00:00:00 2001 From: chenjuntao Date: Sat, 20 Jul 2019 17:16:12 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=85=89=E7=8E=AF=E5=8A=A9?= =?UTF-8?q?=E6=89=8BV3.6.6=E6=95=B0=E6=8D=AE=E7=BB=9F=E8=AE=A1=E9=9C=80?= =?UTF-8?q?=E6=B1=82(MTA)=E8=A1=A5=E5=85=85=E9=83=A8=E5=88=86=20https://gi?= =?UTF-8?q?tlab.ghzs.com/pm/halo-app-issues/issues/579?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/gh/common/util/DirectUtils.kt | 17 +++++++++-------- .../java/com/gh/gamecenter/SkipActivity.java | 4 ++-- .../gamecenter/message/KeFuFragmentAdapter.java | 5 +++-- .../newsdetail/NewsDetailAdapter.java | 9 +++++---- .../qa/article/SimpleArticleListAdapter.kt | 6 +++++- .../qa/article/detail/ArticleDetailActivity.kt | 6 ++++++ .../qa/search/artilce/ArticleAdapter.kt | 6 +++--- .../gamecenter/receiver/UmengMessageReceiver.kt | 2 +- 8 files changed, 34 insertions(+), 21 deletions(-) diff --git a/app/src/main/java/com/gh/common/util/DirectUtils.kt b/app/src/main/java/com/gh/common/util/DirectUtils.kt index 2504233df3..e41525dec9 100644 --- a/app/src/main/java/com/gh/common/util/DirectUtils.kt +++ b/app/src/main/java/com/gh/common/util/DirectUtils.kt @@ -222,7 +222,7 @@ object DirectUtils { fun directToWebView(context: Context, url: String, entrance: String? = null) { val bundle = Bundle() bundle.putString(KEY_ENTRANCE, entrance ?: ENTRANCE_BROWSER) - bundle.putString(EntranceUtils.KEY_TO, WebActivity::class.java.simpleName) + bundle.putString(KEY_TO, WebActivity::class.java.simpleName) bundle.putString(EntranceUtils.KEY_URL, url) EntranceUtils.jumpActivity(context, bundle) } @@ -232,7 +232,7 @@ object DirectUtils { fun directToOfficialNotification(context: Context, entrance: String? = null) { val bundle = Bundle() bundle.putString(EntranceUtils.KEY_ENTRANCE, entrance ?: ENTRANCE_BROWSER) - bundle.putString(EntranceUtils.KEY_TO, MessageKeFuActivity::class.java.simpleName) + bundle.putString(KEY_TO, MessageKeFuActivity::class.java.simpleName) EntranceUtils.jumpActivity(context, bundle) } @@ -289,7 +289,7 @@ object DirectUtils { fun directToGiftDetail(context: Context, giftId: String, entrance: String? = null) { val bundle = Bundle() bundle.putString(KEY_ENTRANCE, entrance ?: ENTRANCE_BROWSER) - bundle.putString(EntranceUtils.KEY_TO, LibaoDetailActivity::class.java.simpleName) + bundle.putString(KEY_TO, LibaoDetailActivity::class.java.simpleName) bundle.putString(EntranceUtils.KEY_ID, giftId) EntranceUtils.jumpActivity(context, bundle) } @@ -314,12 +314,13 @@ object DirectUtils { } @JvmStatic - fun directToCommunityArticle(context: Context, articleId: String?, communityId: String?, entrance: String?) { + fun directToCommunityArticle(context: Context, articleId: String?, communityId: String?, entrance: String?, path: String?) { val bundle = Bundle() bundle.putString(KEY_ENTRANCE, entrance ?: ENTRANCE_BROWSER) - bundle.putString(EntranceUtils.KEY_TO, ArticleDetailActivity::class.java.name) - bundle.putString(EntranceUtils.KEY_COMMUNITY_ARTICLE_ID, articleId) - bundle.putParcelable(EntranceUtils.KEY_COMMUNITY_DATA, CommunityEntity(id = communityId!!)) - EntranceUtils.jumpActivity(context, bundle) + bundle.putString(KEY_PATH, path) + bundle.putString(KEY_TO, ArticleDetailActivity::class.java.name) + bundle.putString(KEY_COMMUNITY_ARTICLE_ID, articleId) + bundle.putParcelable(KEY_COMMUNITY_DATA, CommunityEntity(id = communityId!!)) + jumpActivity(context, bundle) } } \ No newline at end of file diff --git a/app/src/main/java/com/gh/gamecenter/SkipActivity.java b/app/src/main/java/com/gh/gamecenter/SkipActivity.java index 35b5320a59..afb379bf55 100644 --- a/app/src/main/java/com/gh/gamecenter/SkipActivity.java +++ b/app/src/main/java/com/gh/gamecenter/SkipActivity.java @@ -104,7 +104,7 @@ public class SkipActivity extends BaseActivity { break; // 社区文章格式一 case "community.article": - DirectUtils.directToCommunityArticle(this, uri.getQueryParameter("articleId"), uri.getQueryParameter("communityId"), ENTRANCE_BROWSER); + DirectUtils.directToCommunityArticle(this, uri.getQueryParameter("articleId"), uri.getQueryParameter("communityId"), ENTRANCE_BROWSER, "浏览器"); break; // 社区文章格式二 case "communities": @@ -126,7 +126,7 @@ public class SkipActivity extends BaseActivity { } } if ("articles".equals(type)) { - DirectUtils.directToCommunityArticle(this, typeId, communityId, ENTRANCE_BROWSER); + DirectUtils.directToCommunityArticle(this, typeId, communityId, ENTRANCE_BROWSER, "浏览器"); break; } break; diff --git a/app/src/main/java/com/gh/gamecenter/message/KeFuFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/message/KeFuFragmentAdapter.java index aa49f99ce2..6293720fb4 100644 --- a/app/src/main/java/com/gh/gamecenter/message/KeFuFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/message/KeFuFragmentAdapter.java @@ -3,7 +3,6 @@ package com.gh.gamecenter.message; import android.app.Activity; import android.content.Context; import android.content.Intent; -import androidx.recyclerview.widget.RecyclerView; import android.text.Html; import android.text.TextUtils; import android.view.View; @@ -11,6 +10,8 @@ import android.view.ViewGroup; import android.widget.LinearLayout; import android.widget.TextView; +import androidx.recyclerview.widget.RecyclerView; + import com.gh.base.OnListClickListener; import com.gh.common.constant.ItemViewType; import com.gh.common.im.ImManager; @@ -252,7 +253,7 @@ public class KeFuFragmentAdapter extends ListAdapter { break; case "社区文章": if (!TextUtils.isEmpty(data.getId()) && data.getCommunity() != null) { - DirectUtils.directToCommunityArticle(mContext, data.getId(), data.getCommunity().getId(), mEntrance); + DirectUtils.directToCommunityArticle(mContext, data.getId(), data.getCommunity().getId(), mEntrance, "(消息-客服)"); } break; default: 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 36381e1f36..0b2e664bd7 100644 --- a/app/src/main/java/com/gh/gamecenter/newsdetail/NewsDetailAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/newsdetail/NewsDetailAdapter.java @@ -7,9 +7,6 @@ import android.content.SharedPreferences; import android.graphics.Color; import android.net.Uri; import android.preference.PreferenceManager; -import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.RecyclerView; -import androidx.recyclerview.widget.RecyclerView.ViewHolder; import android.text.Layout; import android.text.TextUtils; import android.view.Gravity; @@ -22,6 +19,10 @@ import android.widget.LinearLayout; import android.widget.RelativeLayout; import android.widget.TextView; +import androidx.core.content.ContextCompat; +import androidx.recyclerview.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView.ViewHolder; + import com.gh.base.OnRequestCallBackListener; import com.gh.common.constant.Config; import com.gh.common.history.HistoryHelper; @@ -334,7 +335,7 @@ public class NewsDetailAdapter extends BaseRecyclerAdapter { if ("articles".equals(type)) { DirectUtils.directToCommunityArticle( mContext, typeId, communityId, - StringUtils.buildString(mEntrance, "+(新闻详情[", mNewsDetailEntity.getTitle(), "])")); + StringUtils.buildString(mEntrance, "+(新闻详情[", mNewsDetailEntity.getTitle(), "])"), "文章链接"); break; } default: diff --git a/app/src/main/java/com/gh/gamecenter/qa/article/SimpleArticleListAdapter.kt b/app/src/main/java/com/gh/gamecenter/qa/article/SimpleArticleListAdapter.kt index 77d0059a82..dbdc9cb8a1 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/article/SimpleArticleListAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/article/SimpleArticleListAdapter.kt @@ -68,7 +68,11 @@ class SimpleArticleListAdapter(context: Context) : ListAdapter(co } fun getPath(): String { - return "全部-文章" + return if (mContext is SimpleArticleListActivity) { + "推荐入口-列表" + } else { + "全部-文章" + } } } \ No newline at end of file diff --git a/app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailActivity.kt b/app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailActivity.kt index 4ae851ea96..1f8781a6a6 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailActivity.kt @@ -752,6 +752,12 @@ class ArticleDetailActivity : BaseActivity() { UserManager.getInstance().community.name, intent.extras.getString(EntranceUtils.KEY_PATH)) + MtaHelper.onEventWithTime( + "文章阅读量_按位置", + mElapsedHelper?.elapsedTime!!, + intent.extras.getString(EntranceUtils.KEY_PATH), + StringUtils.combineTwoString(mViewModel.detailEntity?.title, mViewModel.detailEntity?.id)) + LogUtils.uploadCommunityArticle(mEntrance, mViewModel.articleId, mViewModel.detailEntity?.title, diff --git a/app/src/main/java/com/gh/gamecenter/qa/search/artilce/ArticleAdapter.kt b/app/src/main/java/com/gh/gamecenter/qa/search/artilce/ArticleAdapter.kt index 826fd7cecd..98bccc2fb3 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/search/artilce/ArticleAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/search/artilce/ArticleAdapter.kt @@ -1,10 +1,10 @@ package com.gh.gamecenter.qa.search.artilce import android.content.Context -import androidx.recyclerview.widget.RecyclerView import android.text.Html import android.view.View import android.view.ViewGroup +import androidx.recyclerview.widget.RecyclerView import com.gh.common.util.ImageUtils import com.gh.common.util.NumberUtils import com.gh.gamecenter.R @@ -19,12 +19,12 @@ class ArticleAdapter(context: Context, viewModel: NormalListViewModel) : BaseAskSearchAdapter(context, entrance, path, viewModel) { - override fun onCreateBodyViewHolder(parent: ViewGroup, viewType: Int): androidx.recyclerview.widget.RecyclerView.ViewHolder { + override fun onCreateBodyViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder { val view = mLayoutInflater.inflate(R.layout.ask_search_item, parent, false) return AskSearchNormalItemViewHolder(view) } - override fun onBindBodyViewHolder(holder: androidx.recyclerview.widget.RecyclerView.ViewHolder, position: Int) { + override fun onBindBodyViewHolder(holder: RecyclerView.ViewHolder, position: Int) { if (holder is AskSearchNormalItemViewHolder) { val entity = mEntityList[position] if (entity.images.isNotEmpty()) { diff --git a/app/src/main/java/com/gh/gamecenter/receiver/UmengMessageReceiver.kt b/app/src/main/java/com/gh/gamecenter/receiver/UmengMessageReceiver.kt index 80be751f0b..287364170c 100644 --- a/app/src/main/java/com/gh/gamecenter/receiver/UmengMessageReceiver.kt +++ b/app/src/main/java/com/gh/gamecenter/receiver/UmengMessageReceiver.kt @@ -115,7 +115,7 @@ class UmengMessageReceiver : BroadcastReceiver() { } EntranceUtils.HOST_COMMUNITY_ARTICLE -> { DirectUtils.directToCommunityArticle(context, link.target!!, link.community?.id - ?: "", EntranceUtils.ENTRANCE_UMENG) + ?: "", EntranceUtils.ENTRANCE_UMENG, "推送通知") } } }