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(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) { 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(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