From 332f63e823dc894e3890533439ce72aeda16a072 Mon Sep 17 00:00:00 2001 From: chenjuntao Date: Tue, 15 Oct 2019 18:25:15 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=96=87=E6=A1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/gh/common/util/DialogUtils.java | 13 +++++-------- .../com/gh/gamecenter/personalhome/HomeFragment.kt | 2 +- .../res/layout/layout_menu_question_and_answer.xml | 2 +- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/com/gh/common/util/DialogUtils.java b/app/src/main/java/com/gh/common/util/DialogUtils.java index 621983d6de..bce9d78363 100644 --- a/app/src/main/java/com/gh/common/util/DialogUtils.java +++ b/app/src/main/java/com/gh/common/util/DialogUtils.java @@ -795,12 +795,10 @@ public class DialogUtils { String privacyPolicyContent; String privacyPolicyTitle = (TextUtils.isEmpty(title)) ? "个人信息保护指引" : title; if (TextUtils.isEmpty(content)) { - privacyPolicyContent = "你的个人信息安全对我们来说至关重要。一直以来，光环助手都致力于为每位用户提供更安全的互联网环境" + - "。我们将依据《中华人民共和国网络安全法》、《信息安全技术个人信息安全规范》（GB/T 35273-2017）" + - "以及其他相关法律法规和技术规范来收集和使用你的个人信息，以帮助我们向你提供更优质的产品和服务。" + - "
1.为帮助你浏览内容、互动交流、注册认证等，我们会收集部分必要的信息" + - "
2.为提供上述服务，我们可能需要获取 IMEI号码、IMSI号码 等信息的读取权限" + - "
3.以上获取个人信息的权限均不会默认开启，只有在运行相关功能或服务时才会明确提示授权，光环助手不会在未经你同意的情况下收集相关信息"; + privacyPolicyContent = "光环助手致力于为每位用户提供更安全的互联网环境，我们将依据相关法律法规和技术规范来收集和使用你的个人信息。" + + "
1.为帮助你浏览内容、互动交流、注册认证等，我们需要获取一些必要的信息，以实现完整的功能；" + + "
2.日常使用中，我们可能需要开启 IMEI号码、IMSI号码、定位、相册 等信息的读取权限；" + + "
3.以上信息的读取权限均不会默认开启，只有在运行相关功能或服务时才会明确提示授权，光环助手不会在未经你同意的情况下收集相关信息。"; } else { privacyPolicyContent = content; } @@ -813,9 +811,8 @@ public class DialogUtils { TextView positiveTv = contentView.findViewById(R.id.dialog_positive); TextView skipTv = contentView.findViewById(R.id.dialog_skip); - SpannableStringBuilder skipText = new SpannableStringBuilder("查看完整版的 隐私政策"); + SpannableStringBuilder skipText = new SpannableStringBuilder("你可以查看完整版的 隐藏政策"); skipText.setSpan(new ClickableSpan() { - @Override public void updateDrawState(@NonNull TextPaint ds) { super.updateDrawState(ds); diff --git a/app/src/main/java/com/gh/gamecenter/personalhome/HomeFragment.kt b/app/src/main/java/com/gh/gamecenter/personalhome/HomeFragment.kt index 2ebceecbf7..761c1cbebd 100644 --- a/app/src/main/java/com/gh/gamecenter/personalhome/HomeFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/personalhome/HomeFragment.kt @@ -146,7 +146,7 @@ class HomeFragment : NormalFragment() { val videoFragment = UserVideoHistoryFragment.getInstance(mHomeViewModel.userId, count) val fragmentList = listOf(commentFragment, qaFragment, videoFragment) - val titleList = listOf("评论", "问答", "视频") + val titleList = listOf("游戏评论", "问答", "视频") viewpager.offscreenPageLimit = fragmentList.size viewpager.adapter = FragmentAdapter(fragmentManager, fragmentList, titleList) diff --git a/app/src/main/res/layout/layout_menu_question_and_answer.xml b/app/src/main/res/layout/layout_menu_question_and_answer.xml index 72c6848ae2..37d1d07f10 100644 --- a/app/src/main/res/layout/layout_menu_question_and_answer.xml +++ b/app/src/main/res/layout/layout_menu_question_and_answer.xml @@ -14,6 +14,6 @@ android:paddingLeft="10dp" android:paddingRight="10dp" android:background="@drawable/button_border_1383eb_oval" - android:text = "问答" /> + android:text = "进入问答" />