Skip to content

Commit 7cea352

Browse files
SundoggyNewSundoggyNew
committed
【ID868776255】App数据隐私合规整改--注册只能选择一次出生日期。
http://tapd.oa.com/NEW_IOT/prong/stories/view/1020393192868776255 Change-Id: I905505ee8be97947e9d07dc828661e4eb95bf9f5
1 parent 0f12e59 commit 7cea352

File tree

5 files changed

+72
-29
lines changed

5 files changed

+72
-29
lines changed

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

Lines changed: 68 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ class ChooseCountryActivity : PActivity(), ChooseCountryView, View.OnClickListen
3535
tv_title.text = getString(R.string.country_or_place)
3636
presenter = ChooseCountryPresenter(this)
3737
loadLastCountryInfo()
38-
showBirthDayDlg()
3938
}
4039

4140
override fun setListener() {
@@ -50,6 +49,51 @@ class ChooseCountryActivity : PActivity(), ChooseCountryView, View.OnClickListen
5049
startActivityForResult(Intent(this, RegionActivity::class.java), 100)
5150
}
5251
btn_bind_get_code -> {
52+
53+
if (tv_register_to_country.text == resources.getString(R.string.please_choose)) {
54+
T.show(resources.getString(R.string.please_choose) + resources.getString(R.string.country_or_place))
55+
return
56+
}
57+
val countryCode = presenter.getCountryCode()
58+
var lastTimeJson: String?
59+
if (countryCode == "1") {
60+
lastTimeJson = Utils.getStringValueFromXml(this@ChooseCountryActivity, CommonField.USA_USER_REG_TIME_INFO, CommonField.USA_USER_REG_TIME_INFO)
61+
} else if (countryCode == "86") {
62+
lastTimeJson = Utils.getStringValueFromXml(this@ChooseCountryActivity, CommonField.CHINA_MAINLAND_USER_REG_TIME_INFO, CommonField.CHINA_MAINLAND_USER_REG_TIME_INFO)
63+
} else {
64+
return
65+
}
66+
67+
// 不存在上一次的注册信息
68+
if (TextUtils.isEmpty(lastTimeJson) || lastTimeJson == "{}") {
69+
T.show(resources.getString(R.string.please_choose) + resources.getString(R.string.country_or_place))
70+
return
71+
}
72+
var json = JSONObject.parseObject(lastTimeJson)
73+
74+
var tagYear = 0
75+
var tagMonth = 0
76+
var tagDay = 0
77+
if (countryCode == "1") {
78+
tagYear = json.getIntValue(CommonField.USA_USER_REG_TIME_INFO_YEAR)
79+
tagMonth = json.getIntValue(CommonField.USA_USER_REG_TIME_INFO_MONTH)
80+
tagDay = json.getIntValue(CommonField.USA_USER_REG_TIME_INFO_DAY)
81+
} else if (countryCode == "86") {
82+
tagYear = json.getIntValue(CommonField.CHINA_MAINLAND_USER_REG_TIME_INFO_YEAR)
83+
tagMonth = json.getIntValue(CommonField.CHINA_MAINLAND_USER_REG_TIME_INFO_MONTH)
84+
tagDay = json.getIntValue(CommonField.CHINA_MAINLAND_USER_REG_TIME_INFO_DAY)
85+
}
86+
87+
// 是否满age周岁
88+
if (!ifOverAge(countryCode, tagYear, tagMonth, tagDay)) {
89+
if (countryCode == "1") {
90+
T.show(resources.getString(R.string.usa_too_young_to_use))
91+
} else if (countryCode == "86") {
92+
T.show(resources.getString(R.string.mainland_too_young_to_use))
93+
}
94+
return
95+
}
96+
5397
Intent(this, RegisterActivity::class.java).run {
5498
startActivity(this)
5599
}
@@ -75,10 +119,6 @@ class ChooseCountryActivity : PActivity(), ChooseCountryView, View.OnClickListen
75119
if (TextUtils.isEmpty(lastTimeJson) || lastTimeJson == "{}") return true
76120

77121
var json = JSONObject.parseObject(lastTimeJson)
78-
var currentDate = Date()
79-
var currentYear = currentDate.year + 1900
80-
var currentMonth = currentDate.month + 1
81-
var currentDay = currentDate.day
82122
var tagYear = 0
83123
var tagMonth = 0
84124
var tagDay = 0
@@ -91,10 +131,14 @@ class ChooseCountryActivity : PActivity(), ChooseCountryView, View.OnClickListen
91131
tagMonth = json.getIntValue(CommonField.CHINA_MAINLAND_USER_REG_TIME_INFO_MONTH)
92132
tagDay = json.getIntValue(CommonField.CHINA_MAINLAND_USER_REG_TIME_INFO_DAY)
93133
}
94-
if (currentYear - tagYear > 0 && currentMonth - tagMonth == 0 && currentDay - tagDay == 0) { // 满周年
95-
return true
96-
}
97134

135+
if (!ifOverAge(countryCode, tagYear, tagMonth, tagDay)) {
136+
if (countryCode == "1") {
137+
T.show(resources.getString(R.string.usa_too_young_to_use))
138+
} else if (countryCode == "86") {
139+
T.show(resources.getString(R.string.mainland_too_young_to_use))
140+
}
141+
}
98142
return false
99143
}
100144

@@ -118,42 +162,30 @@ class ChooseCountryActivity : PActivity(), ChooseCountryView, View.OnClickListen
118162
dlg.show()
119163
dlg.setOnDismissListener(object: InputBirthdayDialog.OnDismisListener {
120164
override fun onOkClicked(year: Int, month: Int, day: Int) {
121-
var age = 0
122-
if (countryCode == "1") {
123-
age = 13
124-
} else if (countryCode == "86") {
125-
age = 18
126-
}
127165

128166
// 是否满age周岁
129-
if (!ifOverAge(age, year, month, day)) {
167+
if (!ifOverAge(countryCode, year, month, day)) {
130168
if (countryCode == "1") {
131169
T.show(resources.getString(R.string.usa_too_young_to_use))
132170
} else if (countryCode == "86") {
133171
T.show(resources.getString(R.string.mainland_too_young_to_use))
134172
}
135-
finish()
136-
return
137173
}
138174

139175
var timeJson = JSONObject()
140-
var currentDate = Date()
141-
var currentYear = currentDate.year + 1900
142-
var currentMonth = currentDate.month + 1
143-
var currentDay = currentDate.day
144176

145177
if (countryCode == "1") {
146178
// 记录本次使用的日期
147-
timeJson.put(CommonField.USA_USER_REG_TIME_INFO_YEAR, currentYear)
148-
timeJson.put(CommonField.USA_USER_REG_TIME_INFO_MONTH, currentMonth)
149-
timeJson.put(CommonField.USA_USER_REG_TIME_INFO_DAY, currentDay)
179+
timeJson.put(CommonField.USA_USER_REG_TIME_INFO_YEAR, year)
180+
timeJson.put(CommonField.USA_USER_REG_TIME_INFO_MONTH, month)
181+
timeJson.put(CommonField.USA_USER_REG_TIME_INFO_DAY, day)
150182
Utils.setXmlStringValue(T.getContext(), CommonField.USA_USER_REG_TIME_INFO,
151183
CommonField.USA_USER_REG_TIME_INFO, timeJson.toJSONString())
152184
} else if (countryCode == "86") {
153185
// 记录本次使用的日期
154-
timeJson.put(CommonField.CHINA_MAINLAND_USER_REG_TIME_INFO_YEAR, currentYear)
155-
timeJson.put(CommonField.CHINA_MAINLAND_USER_REG_TIME_INFO_MONTH, currentMonth)
156-
timeJson.put(CommonField.CHINA_MAINLAND_USER_REG_TIME_INFO_DAY, currentDay)
186+
timeJson.put(CommonField.CHINA_MAINLAND_USER_REG_TIME_INFO_YEAR, year)
187+
timeJson.put(CommonField.CHINA_MAINLAND_USER_REG_TIME_INFO_MONTH, month)
188+
timeJson.put(CommonField.CHINA_MAINLAND_USER_REG_TIME_INFO_DAY, day)
157189
Utils.setXmlStringValue(T.getContext(), CommonField.CHINA_MAINLAND_USER_REG_TIME_INFO,
158190
CommonField.CHINA_MAINLAND_USER_REG_TIME_INFO, timeJson.toJSONString())
159191
}
@@ -164,7 +196,15 @@ class ChooseCountryActivity : PActivity(), ChooseCountryView, View.OnClickListen
164196
}
165197
}
166198

167-
private fun ifOverAge(age: Int,year: Int, month: Int, day: Int): Boolean {
199+
private fun ifOverAge(countryCode: String, year: Int, month: Int, day: Int): Boolean {
200+
201+
var age = 0
202+
if (countryCode == "1") {
203+
age = 13
204+
} else if (countryCode == "86") {
205+
age = 18
206+
}
207+
168208
var currentDate = Date()
169209
var currentYear = currentDate.year + 1900
170210
var currentMonth = currentDate.month + 1

‎app/src/main/res/layout/activity_choose_country.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
android:layout_width="0dp"
5555
android:layout_height="48dp"
5656
android:layout_marginStart="24dp"
57-
android:text="@string/default_country"
57+
android:text="@string/please_choose"
5858
android:gravity="center_vertical"
5959
android:textColor="@color/gray_6C7078"
6060
android:textSize="@dimen/ts_14"

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,7 @@
146146
<string name="please_enter_pwd">Please enter your password</string>
147147
<string name="get_code">Get code</string>
148148
<string name="conutry_code_num">&#160;(+%s)</string>
149+
<string name="please_choose">Please choose</string>
149150

150151
<!--登陆注册-->
151152
<string name="wechat_login">Login with WeChat</string>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,7 @@
146146
<string name="please_enter_pwd">请输入密码</string>
147147
<string name="get_code">获取验证码</string>
148148
<string name="conutry_code_num">&#160;(+%s)</string>
149+
<string name="please_choose">请选择</string>
149150

150151
<!--登陆注册-->
151152
<string name="wechat_login">微信登录</string>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,7 @@
146146
<string name="please_enter_pwd">请输入密码</string>
147147
<string name="get_code">获取验证码</string>
148148
<string name="conutry_code_num">&#160;(+%s)</string>
149+
<string name="please_choose">请选择</string>
149150

150151
<!--登陆注册-->
151152
<string name="wechat_login">微信登录</string>

0 commit comments

Comments
 (0)