From 8cff41defa3c31eebc3d3addaaadf752d59bc6f6 Mon Sep 17 00:00:00 2001 From: chenjuntao Date: Mon, 6 Jan 2020 16:25:01 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E6=96=B0=E5=A2=9E=E6=B8=B8?= =?UTF-8?q?=E6=88=8F=E6=97=B6=E9=95=BF=E5=8A=9F=E8=83=BD=2020200106?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=20(2,3,6)=20https://gitlab.ghzs.com/pm/halo-?= =?UTF-8?q?app-issues/issues/722?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/gh/common/constant/Constants.java | 6 ++++-- .../com/gh/gamecenter/mygame/MyPlayedGameAdapter.kt | 5 +++-- .../com/halo/assistant/fragment/SettingsFragment.java | 11 ++++++----- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/com/gh/common/constant/Constants.java b/app/src/main/java/com/gh/common/constant/Constants.java index c34da4e4b4..9f078e6dc0 100644 --- a/app/src/main/java/com/gh/common/constant/Constants.java +++ b/app/src/main/java/com/gh/common/constant/Constants.java @@ -1,5 +1,7 @@ package com.gh.common.constant; +import com.gh.common.util.PackageUtils; + public class Constants { public static final int SEND_NEWS_FEEDBACK = 0x126; @@ -42,8 +44,8 @@ public class Constants { public static final String SP_SHOWED_NOTIFICATION_NEW_VERSION = "show_notification_new_version"; // 今天是否已经触发了 “通知管理” 引导弹窗 public static final String SP_IS_SHOWED_NOTIFICATION_TODAY = "show_is_notification_today"; - //标记安装的游戏为已玩过弹窗，最多取消2次 - public static final String SP_MARK_INSTALLED_GAME = "mark_installed_game"; + // 标记安装的游戏为已玩过弹窗，最多取消2次 (https://gitlab.ghzs.com/pm/halo-app-issues/issues/722 调整为版本相关) (不是常量了也放这里好像有点奇怪) + public static final String SP_MARK_INSTALLED_GAME = "mark_installed_game" + PackageUtils.getVersionName(); //视频详情滑动引导 public static final String SP_SHOW_SLIDE_GUIDE = "show_slide_guide"; //视频详情点击引导 diff --git a/app/src/main/java/com/gh/gamecenter/mygame/MyPlayedGameAdapter.kt b/app/src/main/java/com/gh/gamecenter/mygame/MyPlayedGameAdapter.kt index 3937dc1b84..9ab4cf5eed 100644 --- a/app/src/main/java/com/gh/gamecenter/mygame/MyPlayedGameAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/mygame/MyPlayedGameAdapter.kt @@ -14,6 +14,7 @@ import android.view.View import android.view.ViewGroup import android.widget.LinearLayout import android.widget.TextView +import androidx.core.content.ContextCompat import androidx.recyclerview.widget.RecyclerView import com.gh.common.constant.ItemViewType import com.gh.common.util.* @@ -139,11 +140,11 @@ class MyPlayedGameAdapter(context: Context, private val mViewModel: PlayedGameVi } private fun createHeaderView(): View { - val content = SpannableStringBuilder("游戏统计时长为关闭状态，点我去开启") + val content = SpannableStringBuilder("游戏时长统计为关闭状态，点我去开启") content.setSpan(object : ClickableSpan() { override fun updateDrawState(ds: TextPaint) { super.updateDrawState(ds) - ds.color = mContext.resources.getColor(R.color.theme) + ds.color = ContextCompat.getColor(mContext, R.color.theme) ds.isUnderlineText = false } diff --git a/app/src/main/java/com/halo/assistant/fragment/SettingsFragment.java b/app/src/main/java/com/halo/assistant/fragment/SettingsFragment.java index a70739afd2..e8bff158ce 100644 --- a/app/src/main/java/com/halo/assistant/fragment/SettingsFragment.java +++ b/app/src/main/java/com/halo/assistant/fragment/SettingsFragment.java @@ -160,8 +160,9 @@ public class SettingsFragment extends NormalFragment { mSettingAutoinstallSb.setCheckedImmediately(sp.getBoolean(AUTO_INSTALL_SP_KEY, true)); mSettingConcerngameSb.setCheckedImmediately(sp.getBoolean(CONCERN_GAME_SP_KEY, true)); mSettingTrafficSb.setCheckedImmediately(sp.getBoolean(getTrafficDownloadHintKey(), true)); - mSettingTrafficSb.setOnCheckedChangeListener((buttonView, isChecked) -> - MtaHelper.onEvent("我的光环_设置", "流量下载提醒", isChecked ? "打开" : "关闭")); + mSettingTrafficSb.setOnCheckedChangeListener((buttonView, isChecked) -> { + MtaHelper.onEvent("我的光环_设置", "流量下载提醒", isChecked ? "打开" : "关闭"); + }); checkSizeIndex = sp.getInt(FONT_SIZE_SP_KEY, 1); if (checkSizeIndex == 0) { @@ -191,9 +192,9 @@ public class SettingsFragment extends NormalFragment { DialogUtils.showUsageStatsDialog(getContext(), () -> { UsageStatsHelper.skipToUsageStats(requireContext(), UsageStatsHelper.USAGE_STATUS_REQUEST_CODE); - mSettingUsageStatsSb.setChecked(false); + mSettingUsageStatsSb.setCheckedNoEvent(false); }, - () -> mSettingUsageStatsSb.setChecked(false)); + () -> mSettingUsageStatsSb.setCheckedNoEvent(false)); } } else { DialogUtils.showAlertDialog(getContext(), @@ -202,7 +203,7 @@ public class SettingsFragment extends NormalFragment { "确定关闭", "暂不关闭", () -> sp.edit().putBoolean(UsageStatsHelper.USAGE_STATUS_SP_KEY, false).apply(), - () -> mSettingUsageStatsSb.setChecked(true) + () -> mSettingUsageStatsSb.setCheckedNoEvent(true) ); } });