Skip to content

Commit 8eaca2e

Browse files
author
archurtan
committed
【ID869532311】App数据隐私合规检测风险问题修复-用户协议弹框内添加隐私摘要链接
http://tapd.oa.com/NEW_IOT/prong/stories/view/1020393192869532311 Change-Id: I78697c217572312bd942d9f40f3b6dba0acf35f6
1 parent df6fff5 commit 8eaca2e

File tree

6 files changed

+42
-10
lines changed

6 files changed

+42
-10
lines changed

‎app/src/main/java/com/tencent/iot/explorer/link/customview/dialog/UserAgreeDialog.kt‎

Lines changed: 26 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -52,25 +52,38 @@ class UserAgreeDialog(context: Context) : IosCenterStyleDialog(context, R.layout
5252
val agreeContentStrPrefix = context.getString(R.string.rule_content_prefix)
5353
val partStr1 = "《${context.getString(R.string.register_agree_2)}》"
5454
val partStr2 = context.getString(R.string.register_agree_3)
55-
val partStr3 = "《${context.getString(R.string.register_agree_4)}》"
55+
56+
val partStr3 = "《${context.getString(R.string.summary_of_privacy_policy)}》"
57+
val partStr4 = context.getString(R.string.pause_mark)
58+
59+
val partStr5 = "《${context.getString(R.string.register_agree_4)}》"
5660
val agreeContentStrMiddle = context.getString(R.string.rule_content_middle)
57-
val partStr4 = "《${context.getString(R.string.app_logo_name)}App${context.getString(R.string.personal_information_list)}》"
61+
val partStr6 = "《${context.getString(R.string.app_logo_name)}App${context.getString(R.string.personal_information_list)}》"
5862
val agreeContentStrMiddle2 = context.getString(R.string.rule_content_middle2)
59-
val partStr5 = "《${context.getString(R.string.rule_content_list)}》"
63+
val partStr7 = "《${context.getString(R.string.rule_content_list)}》"
6064
val agreeContentStrSuffix = context.getString(R.string.rule_content_suffix)
61-
var agreeContentStr = agreeContentStrPrefix + partStr1 + partStr2 + partStr3 + agreeContentStrMiddle + partStr4 + agreeContentStrMiddle2 + partStr5 + agreeContentStrSuffix
65+
var agreeContentStr = agreeContentStrPrefix + partStr1 + partStr2 + partStr3 + partStr4 + partStr5 + agreeContentStrMiddle + partStr6 + agreeContentStrMiddle2 + partStr7 + agreeContentStrSuffix
6266
var agreeContentSpannable = SpannableStringBuilder(agreeContentStr)
67+
6368
agreeContentSpannable.setSpan(IndexClickableSpan(context, 1),
6469
agreeContentStrPrefix.length, agreeContentStrPrefix.length + partStr1.length, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
70+
6571
val start1 = agreeContentStrPrefix.length + partStr1.length + partStr2.length
6672
agreeContentSpannable.setSpan(IndexClickableSpan(context, 2),
6773
start1, start1 + partStr3.length, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
68-
val start2 = agreeContentStrPrefix.length + partStr1.length + partStr2.length + partStr3.length + agreeContentStrMiddle.length
74+
75+
val start2 = agreeContentStrPrefix.length + partStr1.length + partStr2.length + partStr3.length + partStr4.length
6976
agreeContentSpannable.setSpan(IndexClickableSpan(context, 3),
70-
start2, start2 + partStr4.length, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
71-
val start3 = agreeContentStrPrefix.length + partStr1.length + partStr2.length + partStr3.length + agreeContentStrMiddle.length + partStr4.length + agreeContentStrMiddle2.length
77+
start2, start2 + partStr5.length, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
78+
79+
val start3 = agreeContentStrPrefix.length + partStr1.length + partStr2.length + partStr3.length + partStr4.length + partStr5.length + agreeContentStrMiddle.length
7280
agreeContentSpannable.setSpan(IndexClickableSpan(context, 4),
73-
start3, start3 + partStr5.length, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
81+
start3, start3 + partStr6.length, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
82+
83+
val start4 = agreeContentStrPrefix.length + partStr1.length + partStr2.length + partStr3.length + partStr4.length + partStr5.length + agreeContentStrMiddle.length + partStr6.length + agreeContentStrMiddle2.length
84+
agreeContentSpannable.setSpan(IndexClickableSpan(context, 5),
85+
start4, start4 + partStr7.length, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
86+
7487
tv_tip_content?.movementMethod = LinkMovementMethod.getInstance()
7588
tv_tip_content?.text = agreeContentSpannable
7689

@@ -109,6 +122,7 @@ class UserAgreeDialog(context: Context) : IosCenterStyleDialog(context, R.layout
109122
fun onOkClickedPrivacyPolicy()
110123
fun onOkClickedPersonalInfoList()
111124
fun onOkClickedThirdSDKList()
125+
fun onClickedPrivacyPolicySummary()
112126
}
113127

114128
fun setOnDismisListener(onDismisListener: OnDismisListener?) {
@@ -133,10 +147,12 @@ class UserAgreeDialog(context: Context) : IosCenterStyleDialog(context, R.layout
133147
if (index == 1) {
134148
onDismisListener?.onOkClickedUserAgreement()
135149
} else if (index == 2) {
136-
onDismisListener?.onOkClickedPrivacyPolicy()
150+
onDismisListener?.onClickedPrivacyPolicySummary()
137151
} else if (index == 3) {
138-
onDismisListener?.onOkClickedPersonalInfoList()
152+
onDismisListener?.onOkClickedPrivacyPolicy()
139153
} else if (index == 4) {
154+
onDismisListener?.onOkClickedPersonalInfoList()
155+
} else if (index == 5) {
140156
onDismisListener?.onOkClickedThirdSDKList()
141157
}
142158
}

‎app/src/main/java/com/tencent/iot/explorer/link/kitlink/activity/PrivicyDialogActivity.kt‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,14 @@ class PrivicyDialogActivity : BaseActivity() {
8585
OpensourceLicenseActivity.startWebWithExtra(this@PrivicyDialogActivity, getString(R.string.rule_content_list), CommonField.THIRD_SDK_URL_US_EN)
8686
}
8787
}
88+
89+
override fun onClickedPrivacyPolicySummary() {
90+
val intent = Intent(this@PrivicyDialogActivity, WebActivity::class.java)
91+
intent.putExtra(CommonField.EXTRA_TITLE, getString(R.string.summary_of_privacy_policy))
92+
var url = CommonField.PRIVACY_POLICY_SUMMARY_URL_CN_ZH
93+
intent.putExtra(CommonField.EXTRA_TEXT, url)
94+
startActivity(intent)
95+
}
8896
})
8997
}
9098

‎app/src/main/java/com/tencent/iot/explorer/link/kitlink/consts/CommonField.kt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,8 @@ object CommonField {
140140
const val THIRD_SDK_URL_US_EN = "http://qzonestyle.gtimg.cn/qzone/qzactStatics/qcloud/data/42/config13.js"
141141
const val PERSONAL_INFO_URL_US_ZH = "https://privacy.qq.com/document/preview/278bbbbbdd5748999fce491cfa6dd424"
142142
const val PERSONAL_INFO_URL_US_EN = "http://qzonestyle.gtimg.cn/qzone/qzactStatics/qcloud/data/42/config15.js"
143+
const val PRIVACY_POLICY_SUMMARY_URL_CN_ZH = "https://privacy.qq.com/document/preview/4f262b760a4543a7a26409064d1391c2"
144+
const val PRIVACY_POLICY_SUMMARY_URL_CN_EN = "https://privacy.qq.com/document/preview/4f262b760a4543a7a26409064d1391c2"
143145

144146
/************返回结果通用字段*************/
145147
const val RESPONSE = "Response"

‎app/src/main/res/values-en-rUS/strings.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,8 @@
164164
<string name="register_agree_3">&#160;and&#160;</string>
165165
<string name="register_agree_4">Privacy Policy</string>
166166
<string name="register_agree_4_low">privacy policy</string>
167+
<string name="summary_of_privacy_policy">Summary of Privacy Policy</string>
168+
<string name="pause_mark">、</string>
167169
<string name="register_agree_5">Open-Source Software Info</string>
168170
<string name="register_get_code">Send</string>
169171
<string name="get_mobile_code_sent">The verification code has been sent to your phone:</string>

‎app/src/main/res/values-zh-rCN/strings.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,8 @@
164164
<string name="register_agree_3">及</string>
165165
<string name="register_agree_4">隐私政策</string>
166166
<string name="register_agree_4_low">隐私政策</string>
167+
<string name="summary_of_privacy_policy">隐私政策摘要</string>
168+
<string name="pause_mark">、</string>
167169
<string name="register_agree_5">开源软件信息</string>
168170
<string name="register_get_code">获取验证码</string>
169171
<string name="get_mobile_code_sent">验证码已经发送到您的手机:</string>

‎app/src/main/res/values/strings.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,8 @@
164164
<string name="register_agree_3">及</string>
165165
<string name="register_agree_4">隐私政策</string>
166166
<string name="register_agree_4_low">隐私政策</string>
167+
<string name="summary_of_privacy_policy">隐私政策摘要</string>
168+
<string name="pause_mark">、</string>
167169
<string name="register_agree_5">开源软件信息</string>
168170
<string name="register_get_code">获取验证码</string>
169171
<string name="get_mobile_code_sent">验证码已经发送到您的手机:</string>

0 commit comments

Comments
 (0)