From ddfb651d6ab3347a648e8871ea4ca4281068c4ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E7=8E=89=E4=B9=85?= <1484288157@qq.com>
Date: Wed, 18 Dec 2019 11:34:20 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=91=E7=9A=84=E5=85=89=E7=8E=AF=E7=BC=93?=
=?UTF-8?q?=E5=AD=98=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../com/gh/common/constant/Constants.java | 4 +-
.../com/gh/common/util/TimestampUtils.java | 6 +-
.../personal/PersonalFunctionGroupAdapter.kt | 6 +-
app/src/main/res/layout/fragment_setting.xml | 72 +++++++++----------
4 files changed, 47 insertions(+), 41 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 3ef05cec5d..b65bc64c75 100644
--- a/app/src/main/java/com/gh/common/constant/Constants.java
+++ b/app/src/main/java/com/gh/common/constant/Constants.java
@@ -24,7 +24,7 @@ public class Constants {
public static final String GAME_DETAIL_COME_IN = "game_detail_come_in"; // 从游戏详情进入
public static final String XPOSED_INSTALLER_PACKAGE_NAME = "de.robv.android.xposed.installer";
-
+
public static final String EB_QUIT_LOGIN = "quit_login";
// 最近显示的弹窗信息
@@ -76,6 +76,8 @@ public class Constants {
public static final int SEARCH_CD = 5 * 60 * 1000;
//评论 cd间隔
public static final int COMMENT_CD = 60 * 1000;
+ //我的光环功能分组 cd间隔
+ public static final int ADDONS_CD = 10 * 60 * 1000;
public static final String[] REPORT_LIST = new String[]{"垃圾广告营销", "恶意攻击谩骂", "淫秽色情信息", "违法有害信息", "其它"};
diff --git a/app/src/main/java/com/gh/common/util/TimestampUtils.java b/app/src/main/java/com/gh/common/util/TimestampUtils.java
index 66794482b2..1d22aaf7fd 100644
--- a/app/src/main/java/com/gh/common/util/TimestampUtils.java
+++ b/app/src/main/java/com/gh/common/util/TimestampUtils.java
@@ -1,7 +1,5 @@
package com.gh.common.util;
-import androidx.collection.ArrayMap;
-
import android.text.TextUtils;
import com.gh.common.constant.Constants;
@@ -10,6 +8,8 @@ import com.halo.assistant.HaloApp;
import java.util.regex.Pattern;
+import androidx.collection.ArrayMap;
+
public class TimestampUtils {
// 基准时间
@@ -29,6 +29,7 @@ public class TimestampUtils {
intervalMap.put(".*columns.*", 10);
intervalMap.put(".*games.*", 15);
intervalMap.put(".*articles.*", 20);
+ intervalMap.put(".*halo_addons.*", 10);
}
private static void initCDMap() {
@@ -37,6 +38,7 @@ public class TimestampUtils {
cdMap.put(".*columns.*", Constants.GAME_CD);
cdMap.put(".*games.*", Constants.GAME_CD);
cdMap.put(".*articles.*", Constants.NEWS_CD);
+ cdMap.put(".*halo_addons.*", Constants.ADDONS_CD);
}
/*
diff --git a/app/src/main/java/com/gh/gamecenter/personal/PersonalFunctionGroupAdapter.kt b/app/src/main/java/com/gh/gamecenter/personal/PersonalFunctionGroupAdapter.kt
index bf68ca3299..8c91329a52 100644
--- a/app/src/main/java/com/gh/gamecenter/personal/PersonalFunctionGroupAdapter.kt
+++ b/app/src/main/java/com/gh/gamecenter/personal/PersonalFunctionGroupAdapter.kt
@@ -34,10 +34,12 @@ class PersonalFunctionGroupAdapter(val context: Context) : BaseRecyclerAdapter
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-