From acf9fe308c31bd81f61c8dce3bbb172998c53d60 Mon Sep 17 00:00:00 2001
From: kehaoyuan <kehaoyuan@ghzhushou.com>
Date: Wed, 23 Jan 2019 16:59:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=89=E7=8E=AF=E5=8A=A9=E6=89=8BV3.6.1?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=BB=9F=E8=AE=A1=E9=9C=80=E6=B1=82=EF=BC=88?=
 =?UTF-8?q?=E5=85=89=E7=8E=AF=E6=95=B0=E6=8D=AE=E5=90=8E=E5=8F=B0=EF=BC=89?=
 =?UTF-8?q?=20https://gitlab.ghzhushou.com/pm/halo-app-issues/issues/440?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/java/com/gh/common/util/LogUtils.java    |  5 +++++
 .../java/com/gh/gamecenter/PersonalHomeActivity.kt    |  3 ++-
 .../com/gh/gamecenter/qa/follow/AskFollowAdapter.kt   |  4 ++--
 .../qa/recommends/AskQuestionsRecommendsAdapter.java  |  2 +-
 .../qa/recommends/AskQuestionsRecommendsFragment.java | 11 ++++++-----
 .../qa/recommends/RecommendConcernAdapter.kt          |  3 ++-
 .../qa/recommends/newest/RecommendNewestAdapter.kt    |  2 +-
 .../gamecenter/qa/search/hottest/HottestFragment.kt   |  2 +-
 .../gh/gamecenter/qa/search/newest/NewestFragment.kt  |  2 +-
 .../gamecenter/qa/search/question/QuestionFragment.kt |  2 +-
 10 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/app/src/main/java/com/gh/common/util/LogUtils.java b/app/src/main/java/com/gh/common/util/LogUtils.java
index a2c6c3dfb0..b553ff0765 100644
--- a/app/src/main/java/com/gh/common/util/LogUtils.java
+++ b/app/src/main/java/com/gh/common/util/LogUtils.java
@@ -6,6 +6,7 @@ import android.os.Build;
 import android.provider.Settings;
 import android.text.TextUtils;
 
+import com.gh.gamecenter.BuildConfig;
 import com.gh.gamecenter.entity.CommunityEntity;
 import com.gh.gamecenter.manager.UserManager;
 import com.gh.gamecenter.qa.entity.Questions;
@@ -137,6 +138,10 @@ public class LogUtils {
     }
 
     private static void upload(JSONObject object) {
+        if (BuildConfig.DEBUG) {
+            Utils.log("LogUtils->" + object.toString());
+        }
+
         Context context = HaloApp.getInstance().getApplication();
         try {
             object.put("version", PackageUtils.getVersionName());
diff --git a/app/src/main/java/com/gh/gamecenter/PersonalHomeActivity.kt b/app/src/main/java/com/gh/gamecenter/PersonalHomeActivity.kt
index 2ecced99d1..086cec2553 100644
--- a/app/src/main/java/com/gh/gamecenter/PersonalHomeActivity.kt
+++ b/app/src/main/java/com/gh/gamecenter/PersonalHomeActivity.kt
@@ -7,6 +7,7 @@ import android.content.Intent
 import android.os.Bundle
 import android.support.v7.widget.RecyclerView
 import android.view.View
+import com.gh.base.BaseActivity
 import com.gh.common.util.DataUtils
 import com.gh.common.util.EntranceUtils
 import com.gh.common.util.StringUtils
@@ -144,7 +145,7 @@ class PersonalHomeActivity : ListActivity<PersonalHistoryEntity, PersonalHomeVie
                 val intent = Intent(context, PersonalHomeActivity::class.java)
                 intent.putExtra(EntranceUtils.KEY_USER_ID, userId)
                 intent.putExtra(EntranceUtils.KEY_PATH, path)
-                intent.putExtra(EntranceUtils.KEY_ENTRANCE, "$entrance+($path)")
+                intent.putExtra(EntranceUtils.KEY_ENTRANCE, BaseActivity.mergeEntranceAndPath(entrance, path))
                 context.startActivity(intent)
             }
         }
diff --git a/app/src/main/java/com/gh/gamecenter/qa/follow/AskFollowAdapter.kt b/app/src/main/java/com/gh/gamecenter/qa/follow/AskFollowAdapter.kt
index bf13c1104c..e571ac2a4b 100644
--- a/app/src/main/java/com/gh/gamecenter/qa/follow/AskFollowAdapter.kt
+++ b/app/src/main/java/com/gh/gamecenter/qa/follow/AskFollowAdapter.kt
@@ -22,7 +22,7 @@ import com.gh.gamecenter.qa.questions.detail.QuestionsDetailActivity
 class AskFollowAdapter(val context: Context, val viewModel: AskFollowViewModel)
     : ListAdapter<PersonalHistoryEntity>(context) {
 
-    private val mEntrance = "(问答关注)"
+    private val mEntrance = ""
 
     override fun getItemViewType(position: Int): Int {
         return when (position) {
@@ -98,7 +98,7 @@ class AskFollowAdapter(val context: Context, val viewModel: AskFollowViewModel)
                     }
 
                     userIcon.setOnClickListener {
-                        PersonalHomeActivity.startTargetActivity(mContext, historyEntity.user?.id, mEntrance, "(问答：关注)")
+                        PersonalHomeActivity.startTargetActivity(mContext, historyEntity.user?.id, mEntrance, path)
                     }
                     // 禁止click事件穿透
                     userCommand.setTextColor(mContext.resources.getColor(R.color.title))
diff --git a/app/src/main/java/com/gh/gamecenter/qa/recommends/AskQuestionsRecommendsAdapter.java b/app/src/main/java/com/gh/gamecenter/qa/recommends/AskQuestionsRecommendsAdapter.java
index 70efbe2144..ed54b9b0d3 100644
--- a/app/src/main/java/com/gh/gamecenter/qa/recommends/AskQuestionsRecommendsAdapter.java
+++ b/app/src/main/java/com/gh/gamecenter/qa/recommends/AskQuestionsRecommendsAdapter.java
@@ -90,7 +90,7 @@ public class AskQuestionsRecommendsAdapter extends ListAdapter<RecommendItemData
                     questions.setTitle(entity.getArticleTitle());
                     entity.setQuestions(questions);
                 }
-                ((AskQuestionsRecommendsViewHolder) holder).initQuestionsHotViewHolder(mContext, entity, "", "问答-精选");
+                ((AskQuestionsRecommendsViewHolder) holder).initQuestionsHotViewHolder(mContext, entity, "", AskQuestionsRecommendsFragment.QUESTION_RECOMMEND_PATH);
                 break;
             case ItemViewType.ITEM_FOOTER:
                 FooterViewHolder footerViewHolder = (FooterViewHolder) holder;
diff --git a/app/src/main/java/com/gh/gamecenter/qa/recommends/AskQuestionsRecommendsFragment.java b/app/src/main/java/com/gh/gamecenter/qa/recommends/AskQuestionsRecommendsFragment.java
index 2731b3d28c..1cc728c61c 100644
--- a/app/src/main/java/com/gh/gamecenter/qa/recommends/AskQuestionsRecommendsFragment.java
+++ b/app/src/main/java/com/gh/gamecenter/qa/recommends/AskQuestionsRecommendsFragment.java
@@ -54,6 +54,8 @@ public class AskQuestionsRecommendsFragment extends ListFragment<RecommendItemDa
 
     private final static int RECOMMENDS_REQUEST_CODE = 199;
 
+    public final static String QUESTION_RECOMMEND_PATH = "问答-推荐-按精选";
+
     private AskQuestionsRecommendsAdapter mAdapter;
     private CheckLoginUtils.OnLoginListener mOnLoginListener;
 
@@ -156,7 +158,6 @@ public class AskQuestionsRecommendsFragment extends ListFragment<RecommendItemDa
     @Override
     public void onListClick(View view, int position, Object data) {
         AnswerEntity answerEntity;
-        String path = "问答-精选";
         switch (view.getId()) {
             case R.id.footerview_item:
                 if (mAdapter.isNetworkError()) {
@@ -169,18 +170,18 @@ public class AskQuestionsRecommendsFragment extends ListFragment<RecommendItemDa
             case R.id.ask_item_title:
                 answerEntity = (AnswerEntity) data;
                 if ("community_article".equals(answerEntity.getType())) {
-                    startActivityForResult(ArticleDetailActivity.getRecommendsIntent(getContext(), UserManager.getInstance().getCommunity(), answerEntity.getId(), "", path), RECOMMENDS_REQUEST_CODE);
+                    startActivityForResult(ArticleDetailActivity.getRecommendsIntent(getContext(), UserManager.getInstance().getCommunity(), answerEntity.getId(), "", QUESTION_RECOMMEND_PATH), RECOMMENDS_REQUEST_CODE);
                 } else {
                     Questions questions = answerEntity.getQuestions();
-                    startActivity(QuestionsDetailActivity.getIntent(getContext(), questions.getId(), "", path));
+                    startActivity(QuestionsDetailActivity.getIntent(getContext(), questions.getId(), "", QUESTION_RECOMMEND_PATH));
                 }
                 break;
             case R.id.ask_item_constraintlayout:
                 answerEntity = (AnswerEntity) data;
                 if ("community_article".equals(answerEntity.getType())) {
-                    startActivityForResult(ArticleDetailActivity.getRecommendsIntent(getContext(), UserManager.getInstance().getCommunity(), answerEntity.getId(), "", path), RECOMMENDS_REQUEST_CODE);
+                    startActivityForResult(ArticleDetailActivity.getRecommendsIntent(getContext(), UserManager.getInstance().getCommunity(), answerEntity.getId(), "", QUESTION_RECOMMEND_PATH), RECOMMENDS_REQUEST_CODE);
                 } else {
-                    startActivityForResult(AnswerDetailActivity.getRecommendsIntent(getContext(), answerEntity.getId(), "", path), RECOMMENDS_REQUEST_CODE);
+                    startActivityForResult(AnswerDetailActivity.getRecommendsIntent(getContext(), answerEntity.getId(), "", QUESTION_RECOMMEND_PATH), RECOMMENDS_REQUEST_CODE);
                 }
                 break;
             case R.id.ask_recommends_item_refresh:
diff --git a/app/src/main/java/com/gh/gamecenter/qa/recommends/RecommendConcernAdapter.kt b/app/src/main/java/com/gh/gamecenter/qa/recommends/RecommendConcernAdapter.kt
index de6118ab54..8be3da5bde 100644
--- a/app/src/main/java/com/gh/gamecenter/qa/recommends/RecommendConcernAdapter.kt
+++ b/app/src/main/java/com/gh/gamecenter/qa/recommends/RecommendConcernAdapter.kt
@@ -62,7 +62,8 @@ class RecommendConcernAdapter(context: Context,
     }
 
     private fun skipPersonalHome(entity: SuggestedFollowEntity) {
-        PersonalHomeActivity.startTargetActivity(mContext, entity.id, "", "问答-精选-推荐关注")
+        PersonalHomeActivity.startTargetActivity(mContext, entity.id, "",
+                AskQuestionsRecommendsFragment.QUESTION_RECOMMEND_PATH + "-推荐关注")
     }
 
     fun updateData(list: List<SuggestedFollowEntity>) {
diff --git a/app/src/main/java/com/gh/gamecenter/qa/recommends/newest/RecommendNewestAdapter.kt b/app/src/main/java/com/gh/gamecenter/qa/recommends/newest/RecommendNewestAdapter.kt
index d41f2bf6b4..a3d6ede63d 100644
--- a/app/src/main/java/com/gh/gamecenter/qa/recommends/newest/RecommendNewestAdapter.kt
+++ b/app/src/main/java/com/gh/gamecenter/qa/recommends/newest/RecommendNewestAdapter.kt
@@ -55,7 +55,7 @@ class RecommendNewestAdapter(context: Context) : ListAdapter<AnswerEntity>(conte
                     questions.title = answerEntity.articleTitle
                     answerEntity.questions = questions
                 }
-                val path = "问答-精选(时间)"
+                val path = "问答-推荐-按时间"
                 viewHolder.initQuestionsHotViewHolder(mContext, answerEntity, "", path)
                 viewHolder.mAskTitle.setOnClickListener {
                     if ("community_article" == answerEntity.type) {
diff --git a/app/src/main/java/com/gh/gamecenter/qa/search/hottest/HottestFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/search/hottest/HottestFragment.kt
index 3b0e1dc8c5..62e34ca216 100644
--- a/app/src/main/java/com/gh/gamecenter/qa/search/hottest/HottestFragment.kt
+++ b/app/src/main/java/com/gh/gamecenter/qa/search/hottest/HottestFragment.kt
@@ -23,7 +23,7 @@ class HottestFragment : BaseAskSearchFragment<AskSearchEntity, NormalListViewMod
             } else if (!columnId.isNullOrEmpty()) {
                 "专栏搜索-最热答案"
             } else {
-                "搜索-最热答案"
+                "问答-搜索-最热答案"
             }
             mAdapter = HottestAdapter(context!!, mEntrance, path)
         }
diff --git a/app/src/main/java/com/gh/gamecenter/qa/search/newest/NewestFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/search/newest/NewestFragment.kt
index 3c9614b0ef..9d6bb3f073 100644
--- a/app/src/main/java/com/gh/gamecenter/qa/search/newest/NewestFragment.kt
+++ b/app/src/main/java/com/gh/gamecenter/qa/search/newest/NewestFragment.kt
@@ -23,7 +23,7 @@ class NewestFragment : BaseAskSearchFragment<AskSearchEntity, NormalListViewMode
             } else if (!columnId.isNullOrEmpty()) {
                 "专栏搜索-最新答案"
             } else {
-                "搜索-最新答案"
+                "问答-搜索-最新答案"
             }
             mAdapter = NewestAdapter(context!!, mEntrance, path)
         }
diff --git a/app/src/main/java/com/gh/gamecenter/qa/search/question/QuestionFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/search/question/QuestionFragment.kt
index 6c1d79013c..08086497f2 100644
--- a/app/src/main/java/com/gh/gamecenter/qa/search/question/QuestionFragment.kt
+++ b/app/src/main/java/com/gh/gamecenter/qa/search/question/QuestionFragment.kt
@@ -23,7 +23,7 @@ class QuestionFragment : BaseAskSearchFragment<AskSearchEntity, NormalListViewMo
             } else if (!columnId.isNullOrEmpty()) {
                 "专栏搜索-只看问题"
             } else {
-                "搜索-只看问题"
+                "问答-搜索-只看问题"
             }
             mAdapter = QuestionAdapter(context!!, mEntrance, path)
         }