Skip to content

Commit

Permalink
【ID868776255】App数据隐私合规整改--注册只能选择一次出生日期。
Browse files Browse the repository at this point in the history 
http://tapd.oa.com/NEW_IOT/prong/stories/view/1020393192868776255

Change-Id: I905505ee8be97947e9d07dc828661e4eb95bf9f5
  • Loading branch information
@SundoggyNew
SundoggyNew committed Nov 2, 2021
1 parent 0f12e59 commit 7cea352
Show file tree
Hide file tree
Showing 5 changed files with 72 additions and 29 deletions.
96 changes: 68 additions & 28 deletions app/src/main/java/com/tencent/iot/explorer/link/kitlink/activity/ChooseCountryActivity.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ class ChooseCountryActivity : PActivity(), ChooseCountryView, View.OnClickListen
tv_title.text = getString(R.string.country_or_place)
presenter = ChooseCountryPresenter(this)
loadLastCountryInfo()
showBirthDayDlg()
}

override fun setListener() {
Expand All @@ -50,6 +49,51 @@ class ChooseCountryActivity : PActivity(), ChooseCountryView, View.OnClickListen
startActivityForResult(Intent(this, RegionActivity::class.java), 100)
}
btn_bind_get_code -> {

if (tv_register_to_country.text == resources.getString(R.string.please_choose)) {
T.show(resources.getString(R.string.please_choose) + resources.getString(R.string.country_or_place))
return
}
val countryCode = presenter.getCountryCode()
var lastTimeJson: String?
if (countryCode == "1") {
lastTimeJson = Utils.getStringValueFromXml(this@ChooseCountryActivity, CommonField.USA_USER_REG_TIME_INFO, CommonField.USA_USER_REG_TIME_INFO)
} else if (countryCode == "86") {
lastTimeJson = Utils.getStringValueFromXml(this@ChooseCountryActivity, CommonField.CHINA_MAINLAND_USER_REG_TIME_INFO, CommonField.CHINA_MAINLAND_USER_REG_TIME_INFO)
} else {
return
}

// 不存在上一次的注册信息
if (TextUtils.isEmpty(lastTimeJson) || lastTimeJson == "{}") {
T.show(resources.getString(R.string.please_choose) + resources.getString(R.string.country_or_place))
return
}
var json = JSONObject.parseObject(lastTimeJson)

var tagYear = 0
var tagMonth = 0
var tagDay = 0
if (countryCode == "1") {
tagYear = json.getIntValue(CommonField.USA_USER_REG_TIME_INFO_YEAR)
tagMonth = json.getIntValue(CommonField.USA_USER_REG_TIME_INFO_MONTH)
tagDay = json.getIntValue(CommonField.USA_USER_REG_TIME_INFO_DAY)
} else if (countryCode == "86") {
tagYear = json.getIntValue(CommonField.CHINA_MAINLAND_USER_REG_TIME_INFO_YEAR)
tagMonth = json.getIntValue(CommonField.CHINA_MAINLAND_USER_REG_TIME_INFO_MONTH)
tagDay = json.getIntValue(CommonField.CHINA_MAINLAND_USER_REG_TIME_INFO_DAY)
}

// 是否满age周岁
if (!ifOverAge(countryCode, tagYear, tagMonth, tagDay)) {
if (countryCode == "1") {
T.show(resources.getString(R.string.usa_too_young_to_use))
} else if (countryCode == "86") {
T.show(resources.getString(R.string.mainland_too_young_to_use))
}
return
}

Intent(this, RegisterActivity::class.java).run {
startActivity(this)
}
Expand All @@ -75,10 +119,6 @@ class ChooseCountryActivity : PActivity(), ChooseCountryView, View.OnClickListen
if (TextUtils.isEmpty(lastTimeJson) || lastTimeJson == "{}") return true

var json = JSONObject.parseObject(lastTimeJson)
var currentDate = Date()
var currentYear = currentDate.year + 1900
var currentMonth = currentDate.month + 1
var currentDay = currentDate.day
var tagYear = 0
var tagMonth = 0
var tagDay = 0
Expand All @@ -91,10 +131,14 @@ class ChooseCountryActivity : PActivity(), ChooseCountryView, View.OnClickListen
tagMonth = json.getIntValue(CommonField.CHINA_MAINLAND_USER_REG_TIME_INFO_MONTH)
tagDay = json.getIntValue(CommonField.CHINA_MAINLAND_USER_REG_TIME_INFO_DAY)
}
if (currentYear - tagYear > 0 && currentMonth - tagMonth == 0 && currentDay - tagDay == 0) { // 满周年
return true
}

if (!ifOverAge(countryCode, tagYear, tagMonth, tagDay)) {
if (countryCode == "1") {
T.show(resources.getString(R.string.usa_too_young_to_use))
} else if (countryCode == "86") {
T.show(resources.getString(R.string.mainland_too_young_to_use))
}
}
return false
}

Expand All @@ -118,42 +162,30 @@ class ChooseCountryActivity : PActivity(), ChooseCountryView, View.OnClickListen
dlg.show()
dlg.setOnDismissListener(object: InputBirthdayDialog.OnDismisListener {
override fun onOkClicked(year: Int, month: Int, day: Int) {
var age = 0
if (countryCode == "1") {
age = 13
} else if (countryCode == "86") {
age = 18
}

// 是否满age周岁
if (!ifOverAge(age, year, month, day)) {
if (!ifOverAge(countryCode, year, month, day)) {
if (countryCode == "1") {
T.show(resources.getString(R.string.usa_too_young_to_use))
} else if (countryCode == "86") {
T.show(resources.getString(R.string.mainland_too_young_to_use))
}
finish()
return
}

var timeJson = JSONObject()
var currentDate = Date()
var currentYear = currentDate.year + 1900
var currentMonth = currentDate.month + 1
var currentDay = currentDate.day

if (countryCode == "1") {
// 记录本次使用的日期
timeJson.put(CommonField.USA_USER_REG_TIME_INFO_YEAR, currentYear)
timeJson.put(CommonField.USA_USER_REG_TIME_INFO_MONTH, currentMonth)
timeJson.put(CommonField.USA_USER_REG_TIME_INFO_DAY, currentDay)
timeJson.put(CommonField.USA_USER_REG_TIME_INFO_YEAR, year)
timeJson.put(CommonField.USA_USER_REG_TIME_INFO_MONTH, month)
timeJson.put(CommonField.USA_USER_REG_TIME_INFO_DAY, day)
Utils.setXmlStringValue(T.getContext(), CommonField.USA_USER_REG_TIME_INFO,
CommonField.USA_USER_REG_TIME_INFO, timeJson.toJSONString())
} else if (countryCode == "86") {
// 记录本次使用的日期
timeJson.put(CommonField.CHINA_MAINLAND_USER_REG_TIME_INFO_YEAR, currentYear)
timeJson.put(CommonField.CHINA_MAINLAND_USER_REG_TIME_INFO_MONTH, currentMonth)
timeJson.put(CommonField.CHINA_MAINLAND_USER_REG_TIME_INFO_DAY, currentDay)
timeJson.put(CommonField.CHINA_MAINLAND_USER_REG_TIME_INFO_YEAR, year)
timeJson.put(CommonField.CHINA_MAINLAND_USER_REG_TIME_INFO_MONTH, month)
timeJson.put(CommonField.CHINA_MAINLAND_USER_REG_TIME_INFO_DAY, day)
Utils.setXmlStringValue(T.getContext(), CommonField.CHINA_MAINLAND_USER_REG_TIME_INFO,
CommonField.CHINA_MAINLAND_USER_REG_TIME_INFO, timeJson.toJSONString())
}
Expand All @@ -164,7 +196,15 @@ class ChooseCountryActivity : PActivity(), ChooseCountryView, View.OnClickListen
}
}

private fun ifOverAge(age: Int,year: Int, month: Int, day: Int): Boolean {
private fun ifOverAge(countryCode: String, year: Int, month: Int, day: Int): Boolean {

var age = 0
if (countryCode == "1") {
age = 13
} else if (countryCode == "86") {
age = 18
}

var currentDate = Date()
var currentYear = currentDate.year + 1900
var currentMonth = currentDate.month + 1
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/activity_choose_country.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
android:layout_width="0dp"
android:layout_height="48dp"
android:layout_marginStart="24dp"
android:text="@string/default_country"
android:text="@string/please_choose"
android:gravity="center_vertical"
android:textColor="@color/gray_6C7078"
android:textSize="@dimen/ts_14"
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values-en-rUS/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,7 @@
<string name="please_enter_pwd">Please enter your password</string>
<string name="get_code">Get code</string>
<string name="conutry_code_num">&#160;(+%s)</string>
<string name="please_choose">Please choose</string>

<!--登陆注册-->
<string name="wechat_login">Login with WeChat</string>
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values-zh-rCN/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,7 @@
<string name="please_enter_pwd">请输入密码</string>
<string name="get_code">获取验证码</string>
<string name="conutry_code_num">&#160;(+%s)</string>
<string name="please_choose">请选择</string>

<!--登陆注册-->
<string name="wechat_login">微信登录</string>
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,7 @@
<string name="please_enter_pwd">请输入密码</string>
<string name="get_code">获取验证码</string>
<string name="conutry_code_num">&#160;(+%s)</string>
<string name="please_choose">请选择</string>

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

0 comments on commit 7cea352

Please sign in to comment.