提交 0e2ed42f 编写于 作者: L liqiang

fix time_picker set selected value invalid bug

Change-Id: I0304d9d587dc8d2894e3ce7805e5c7eec5c0996a
Signed-off-by: Nliqiang <liqiang121@huawei.com>
上级 88f74c50
...@@ -168,6 +168,10 @@ void UITimePicker::TimeSelectedCallback() ...@@ -168,6 +168,10 @@ void UITimePicker::TimeSelectedCallback()
GetValueByIndex(selectedHour_, BUF_SIZE, hourSelect, TIME_START, HOUR_END); GetValueByIndex(selectedHour_, BUF_SIZE, hourSelect, TIME_START, HOUR_END);
GetValueByIndex(selectedMinute_, BUF_SIZE, minSelect, TIME_START, MIN_END); GetValueByIndex(selectedMinute_, BUF_SIZE, minSelect, TIME_START, MIN_END);
if (memset_s(selectedValue_, SELECTED_VALUE_SIZE, 0, SELECTED_VALUE_SIZE) != EOK) {
return;
}
if (secVisible_) { if (secVisible_) {
uint16_t secSelect = secondPicker_->GetSelected(); uint16_t secSelect = secondPicker_->GetSelected();
GetValueByIndex(selectedSecond_, BUF_SIZE, secSelect, TIME_START, SEC_END); GetValueByIndex(selectedSecond_, BUF_SIZE, secSelect, TIME_START, SEC_END);
...@@ -197,6 +201,14 @@ void UITimePicker::GetValueByIndex(char* value, uint8_t len, uint16_t index, int ...@@ -197,6 +201,14 @@ void UITimePicker::GetValueByIndex(char* value, uint8_t len, uint16_t index, int
bool UITimePicker::SetSelected(const char* value) bool UITimePicker::SetSelected(const char* value)
{ {
if (value == nullptr) {
return false;
}
if (memset_s(selectedValue_, SELECTED_VALUE_SIZE, 0, SELECTED_VALUE_SIZE) != EOK) {
return false;
}
if (strcpy_s(selectedValue_, SELECTED_VALUE_SIZE, value) != EOK) { if (strcpy_s(selectedValue_, SELECTED_VALUE_SIZE, value) != EOK) {
return false; return false;
} }
...@@ -206,12 +218,12 @@ bool UITimePicker::SetSelected(const char* value) ...@@ -206,12 +218,12 @@ bool UITimePicker::SetSelected(const char* value)
return false; return false;
} }
} else { } else {
if (sscanf_s(value, "[^:]%*c%[^\n]", selectedHour_, BUF_SIZE, if (sscanf_s(value, "%[^:]%*c%[^\n]", selectedHour_, BUF_SIZE,
selectedMinute_, BUF_SIZE) < 2) { // 2: two variables selectedMinute_, BUF_SIZE) < 2) { // 2: two variables
return false; return false;
} }
} }
return RefreshSelected(value); return RefreshSelected(selectedValue_);
} }
bool UITimePicker::RefreshSelected(const char* value) bool UITimePicker::RefreshSelected(const char* value)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册