Merge branch 'Branch_S550_Fast_Emmc' of gitlab.sifar.tech:linux-em-group/s530-ntk into Branch_S550_Fast_Emmc

This commit is contained in:
payton 2024-01-26 18:39:16 +08:00
commit 4b93f31f08
8 changed files with 176 additions and 61 deletions

View File

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
#用于gitlab-ci.yml编译使用 #用于gitlab-ci.yml编译使用
#make app_clean make app_clean
echo "Start compile." echo "Start compile."
export ROOT_PATH=$PWD export ROOT_PATH=$PWD
@ -9,7 +9,7 @@ export ROOT_PATH=$PWD
cd rtos cd rtos
source build/envsetup.sh source build/envsetup.sh
lunch rtos cfg_565_HUNTING_EVB_LINUX_4G_S550 gcc-6.5-newlib-2.4-2019.11-arm-ca9-eabihf lunch rtos cfg_565_HUNTING_EVB_LINUX_4G_S550 gcc-6.5-newlib-2.4-2019.11-arm-ca9-eabihf
#make clean make clean
bear make all > /dev/null bear make all > /dev/null
cp output/application.bin ../ cp output/application.bin ../
cp output/rtos-main.bin ../ cp output/rtos-main.bin ../
@ -18,7 +18,7 @@ cp output/rtos-main.bin ../
cd $ROOT_PATH cd $ROOT_PATH
source build/envsetup.sh source build/envsetup.sh
lunch Linux cfg_565_HUNTING_EVB_LINUX_4G_S550 arm-ca9-linux-uclibcgnueabihf-8.4.01 lunch Linux cfg_565_HUNTING_EVB_LINUX_4G_S550 arm-ca9-linux-uclibcgnueabihf-8.4.01
#make clean make clean
bear make all > /dev/null bear make all > /dev/null
cd $ROOT_PATH cd $ROOT_PATH

View File

@ -48,14 +48,13 @@ void Strg_CB(UINT32 event, UINT32 param1, UINT32 param2);
void Strg_CB(UINT32 event, UINT32 param1, UINT32 param2) void Strg_CB(UINT32 event, UINT32 param1, UINT32 param2)
{ {
printf("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n");
UINT32 status; UINT32 status;
#if HUNTING_CAMERA_MCU == ENABLE #if HUNTING_CAMERA_MCU == ENABLE
SF_MESSAGE_BUF_S stMessageBuf = {0}; SF_MESSAGE_BUF_S stMessageBuf = {0};
#endif #endif
printf("Strg_CB: strg_id = %d, status = %d\n", param1, param2); printf("[%s:%d]Strg_CB:event = %d, strg_id = %d, status = %d\n", __FUNCTION__, __LINE__, event, param1, param2);
switch (event) { switch (event) {
// part-1 // part-1
case SYSTEM_CB_CONFIG: case SYSTEM_CB_CONFIG:

View File

@ -421,7 +421,11 @@ void show_Sensitivity_page(lv_obj_t* obj)
STYLE_COLOR_PROP(0x23, 0x0f, 0x0f, 0x10) ; lv_style_set_bg_color(&SensitivityContainerStyle, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x23, 0x0f, 0x0f, 0x10) ; lv_style_set_bg_color(&SensitivityContainerStyle, LV_STATE_DEFAULT, color);
STYLE_COLOR_PROP(0x23, 0x0f, 0x0f, 0x10) ; lv_style_set_bg_grad_color(&SensitivityContainerStyle, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x23, 0x0f, 0x0f, 0x10) ; lv_style_set_bg_grad_color(&SensitivityContainerStyle, LV_STATE_DEFAULT, color);
STYLE_COLOR_PROP(0x22, 0x95, 0xc9, 0x3d) ; lv_style_set_border_color(&SensitivityContainerStyle, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x22, 0x95, 0xc9, 0x3d) ; lv_style_set_border_color(&SensitivityContainerStyle, LV_STATE_DEFAULT, color);
SensitivityContainer = lv_cont_create(obj, NULL); if (NULL == SensitivityContainer)
{
SensitivityContainer = lv_cont_create(obj, NULL);
}
lv_obj_set_hidden(SensitivityContainer, false); lv_obj_set_hidden(SensitivityContainer, false);
lv_obj_set_click(SensitivityContainer, true); lv_obj_set_click(SensitivityContainer, true);
lv_obj_set_drag(SensitivityContainer, false); lv_obj_set_drag(SensitivityContainer, false);
@ -429,8 +433,11 @@ void show_Sensitivity_page(lv_obj_t* obj)
lv_obj_set_size(SensitivityContainer, 30, 30); lv_obj_set_size(SensitivityContainer, 30, 30);
lv_obj_add_style(SensitivityContainer, 0, &SensitivityContainerStyle); lv_obj_add_style(SensitivityContainer, 0, &SensitivityContainerStyle);
if (NULL == SensitivityTitleLabel)
SensitivityTitleLabel = lv_label_create(obj, NULL); {
SensitivityTitleLabel = lv_label_create(obj, NULL);
}
lv_obj_set_pos(SensitivityTitleLabel, 10, 50); lv_obj_set_pos(SensitivityTitleLabel, 10, 50);
lv_obj_set_size(SensitivityTitleLabel, 200, 24); lv_obj_set_size(SensitivityTitleLabel, 200, 24);
lv_obj_add_style(SensitivityTitleLabel, 0, &gStyleLabel0); lv_obj_add_style(SensitivityTitleLabel, 0, &gStyleLabel0);
@ -438,7 +445,10 @@ void show_Sensitivity_page(lv_obj_t* obj)
lv_label_set_text(SensitivityTitleLabel, "Sensitivity"); lv_label_set_text(SensitivityTitleLabel, "Sensitivity");
sprintf(result, "%d", gPirSensitivity); sprintf(result, "%d", gPirSensitivity);
SensitivityValueLabel = lv_label_create(obj, NULL); if (NULL == SensitivityValueLabel)
{
SensitivityValueLabel = lv_label_create(obj, NULL);
}
lv_obj_set_pos(SensitivityValueLabel, 288, 49); lv_obj_set_pos(SensitivityValueLabel, 288, 49);
lv_obj_set_size(SensitivityValueLabel, 30, 30); lv_obj_set_size(SensitivityValueLabel, 30, 30);
lv_obj_add_style(SensitivityValueLabel, 0, &gStyleLabel0); lv_obj_add_style(SensitivityValueLabel, 0, &gStyleLabel0);
@ -561,7 +571,10 @@ void show_Delay_page(lv_obj_t* obj)
snprintf(DelayMMBuf, 3, "%02d", puiPara->PirDelayTime.Min); snprintf(DelayMMBuf, 3, "%02d", puiPara->PirDelayTime.Min);
snprintf(DelaySSBuf, 3, "%02d", puiPara->PirDelayTime.Sec); snprintf(DelaySSBuf, 3, "%02d", puiPara->PirDelayTime.Sec);
DelayMatrixObj = lv_btnmatrix_create(obj, NULL); if (NULL == DelayMatrixObj)
{
DelayMatrixObj = lv_btnmatrix_create(obj, NULL);
}
lv_obj_set_hidden(DelayMatrixObj, false); lv_obj_set_hidden(DelayMatrixObj, false);
lv_obj_set_click(DelayMatrixObj, true); lv_obj_set_click(DelayMatrixObj, true);
lv_obj_set_drag(DelayMatrixObj, false); lv_obj_set_drag(DelayMatrixObj, false);
@ -578,7 +591,11 @@ void show_Delay_page(lv_obj_t* obj)
lv_obj_add_style(DelayMatrixObj, 0, &gMatrixStylebg); lv_obj_add_style(DelayMatrixObj, 0, &gMatrixStylebg);
lv_obj_add_style(DelayMatrixObj, 1, &gMatrixStylebtn); lv_obj_add_style(DelayMatrixObj, 1, &gMatrixStylebtn);
DelayImage = lv_img_create(obj, NULL); if (NULL == DelayImage)
{
DelayImage = lv_img_create(obj, NULL);
}
lv_obj_set_hidden(DelayImage, false); lv_obj_set_hidden(DelayImage, false);
lv_obj_set_click(DelayImage, false); lv_obj_set_click(DelayImage, false);
lv_obj_set_drag(DelayImage, false); lv_obj_set_drag(DelayImage, false);
@ -586,7 +603,10 @@ void show_Delay_page(lv_obj_t* obj)
lv_obj_set_size(DelayImage, 32, 88); lv_obj_set_size(DelayImage, 32, 88);
lv_img_set_src(DelayImage, &sf_pwd_down_up); lv_img_set_src(DelayImage, &sf_pwd_down_up);
DelayLabel = lv_label_create(obj, NULL); if (NULL == DelayLabel)
{
DelayLabel = lv_label_create(obj, NULL);
}
lv_label_set_text(DelayLabel, "HH : MM : SS"); lv_label_set_text(DelayLabel, "HH : MM : SS");
lv_label_set_align(DelayLabel, LV_LABEL_ALIGN_CENTER); lv_label_set_align(DelayLabel, LV_LABEL_ALIGN_CENTER);
lv_obj_set_pos(DelayLabel, 100, 155); lv_obj_set_pos(DelayLabel, 100, 155);
@ -829,7 +849,10 @@ void show_Operating_Time_page(lv_obj_t* obj)
snprintf(OperatingTimeHHBuf2, 3, "%02d", puiPara->WorkTime[0].StopTime.Hour); snprintf(OperatingTimeHHBuf2, 3, "%02d", puiPara->WorkTime[0].StopTime.Hour);
snprintf(OperatingTimeMMBuf2, 3, "%02d", puiPara->WorkTime[0].StopTime.Min); snprintf(OperatingTimeMMBuf2, 3, "%02d", puiPara->WorkTime[0].StopTime.Min);
OperatingTimeMatrixObj = lv_btnmatrix_create(obj, NULL); if (NULL == OperatingTimeMatrixObj)
{
OperatingTimeMatrixObj = lv_btnmatrix_create(obj, NULL);
}
lv_obj_set_hidden(OperatingTimeMatrixObj, false); lv_obj_set_hidden(OperatingTimeMatrixObj, false);
lv_obj_set_click(OperatingTimeMatrixObj, true); lv_obj_set_click(OperatingTimeMatrixObj, true);
lv_obj_set_drag(OperatingTimeMatrixObj, false); lv_obj_set_drag(OperatingTimeMatrixObj, false);
@ -847,7 +870,10 @@ void show_Operating_Time_page(lv_obj_t* obj)
lv_obj_add_style(OperatingTimeMatrixObj, 0, &gMatrixStylebg); lv_obj_add_style(OperatingTimeMatrixObj, 0, &gMatrixStylebg);
lv_obj_add_style(OperatingTimeMatrixObj, 1, &gMatrixStylebtn); lv_obj_add_style(OperatingTimeMatrixObj, 1, &gMatrixStylebtn);
OperatingTimeImage = lv_img_create(obj, NULL); if (NULL == OperatingTimeImage)
{
OperatingTimeImage = lv_img_create(obj, NULL);
}
lv_obj_set_hidden(OperatingTimeImage, false); lv_obj_set_hidden(OperatingTimeImage, false);
lv_obj_set_click(OperatingTimeImage, false); lv_obj_set_click(OperatingTimeImage, false);
lv_obj_set_drag(OperatingTimeImage, false); lv_obj_set_drag(OperatingTimeImage, false);
@ -855,7 +881,10 @@ void show_Operating_Time_page(lv_obj_t* obj)
lv_obj_set_size(OperatingTimeImage, 32, 88); lv_obj_set_size(OperatingTimeImage, 32, 88);
lv_img_set_src(OperatingTimeImage, &sf_pwd_down_up); lv_img_set_src(OperatingTimeImage, &sf_pwd_down_up);
OperatingTimeLabel = lv_label_create(obj, NULL); if (NULL == OperatingTimeLabel)
{
OperatingTimeLabel = lv_label_create(obj, NULL);
}
lv_label_set_text(OperatingTimeLabel, "HH : MM HH : MM"); lv_label_set_text(OperatingTimeLabel, "HH : MM HH : MM");
lv_label_set_align(OperatingTimeLabel, LV_LABEL_ALIGN_CENTER); lv_label_set_align(OperatingTimeLabel, LV_LABEL_ALIGN_CENTER);
lv_obj_set_pos(OperatingTimeLabel, 76, 155); lv_obj_set_pos(OperatingTimeLabel, 76, 155);
@ -1189,8 +1218,10 @@ void show_DateTime_page(lv_obj_t* obj, int defaultTime)
snprintf(DateTimeMIBuf, 3, "%02d", gDateTime.Min); snprintf(DateTimeMIBuf, 3, "%02d", gDateTime.Min);
snprintf(DateTimeSSBuf, 3, "%02d", gDateTime.Sec); snprintf(DateTimeSSBuf, 3, "%02d", gDateTime.Sec);
if (NULL == DateTimeMatrixObj)
DateTimeMatrixObj = lv_btnmatrix_create(obj, NULL); {
DateTimeMatrixObj = lv_btnmatrix_create(obj, NULL);
}
lv_obj_set_hidden(DateTimeMatrixObj, false); lv_obj_set_hidden(DateTimeMatrixObj, false);
lv_obj_set_click(DateTimeMatrixObj, true); lv_obj_set_click(DateTimeMatrixObj, true);
lv_obj_set_drag(DateTimeMatrixObj, false); lv_obj_set_drag(DateTimeMatrixObj, false);
@ -1211,7 +1242,10 @@ void show_DateTime_page(lv_obj_t* obj, int defaultTime)
lv_obj_add_style(DateTimeMatrixObj, 0, &gMatrixStylebg); lv_obj_add_style(DateTimeMatrixObj, 0, &gMatrixStylebg);
lv_obj_add_style(DateTimeMatrixObj, 1, &gMatrixStylebtn); lv_obj_add_style(DateTimeMatrixObj, 1, &gMatrixStylebtn);
DateTimeImage = lv_img_create(obj, NULL); if (NULL == DateTimeImage)
{
DateTimeImage = lv_img_create(obj, NULL);
}
lv_obj_set_hidden(DateTimeImage, false); lv_obj_set_hidden(DateTimeImage, false);
lv_obj_set_click(DateTimeImage, false); lv_obj_set_click(DateTimeImage, false);
lv_obj_set_drag(DateTimeImage, false); lv_obj_set_drag(DateTimeImage, false);
@ -1223,13 +1257,19 @@ void show_DateTime_page(lv_obj_t* obj, int defaultTime)
lv_style_init(&LabelStyle); lv_style_init(&LabelStyle);
lv_style_copy(&LabelStyle, &gStyleLabel0); lv_style_copy(&LabelStyle, &gStyleLabel0);
lv_style_set_text_font(&LabelStyle,LV_STATE_DEFAULT,&sf_ui_text_bold_20_1bpp); lv_style_set_text_font(&LabelStyle,LV_STATE_DEFAULT,&sf_ui_text_bold_20_1bpp);
DateTimeLabel1 = lv_label_create(obj, NULL); if (NULL == DateTimeLabel1)
{
DateTimeLabel1 = lv_label_create(obj, NULL);
}
lv_label_set_text(DateTimeLabel1, "Date Time"); lv_label_set_text(DateTimeLabel1, "Date Time");
lv_obj_set_pos(DateTimeLabel1, 56, 60); lv_obj_set_pos(DateTimeLabel1, 56, 60);
lv_obj_set_size(DateTimeLabel1, 200, 24); lv_obj_set_size(DateTimeLabel1, 200, 24);
lv_obj_add_style(DateTimeLabel1, 0, &LabelStyle); lv_obj_add_style(DateTimeLabel1, 0, &LabelStyle);
DateTimeLabel2 = lv_label_create(obj, NULL); if (NULL == DateTimeLabel2)
{
DateTimeLabel2 = lv_label_create(obj, NULL);
}
lv_label_set_text(DateTimeLabel2, "MM:DD:YYYY MM:DD:SS"); lv_label_set_text(DateTimeLabel2, "MM:DD:YYYY MM:DD:SS");
lv_label_set_align(DateTimeLabel2, LV_LABEL_ALIGN_CENTER); lv_label_set_align(DateTimeLabel2, LV_LABEL_ALIGN_CENTER);
lv_obj_set_pos(DateTimeLabel2, 28, 155); lv_obj_set_pos(DateTimeLabel2, 28, 155);

View File

@ -824,7 +824,10 @@ void show_qr_picture_page(lv_obj_t* obj)
// const char *data = "https://github.com/topics/littlevgl"; // const char *data = "https://github.com/topics/littlevgl";
//text qr page //text qr page
label = lv_label_create(obj, NULL); if (NULL == label)
{
label = lv_label_create(obj, NULL);
}
lv_label_set_long_mode(label, LV_LABEL_LONG_BREAK); lv_label_set_long_mode(label, LV_LABEL_LONG_BREAK);
lv_label_set_text(label, ""); lv_label_set_text(label, "");
lv_obj_set_pos(label, 180, 70); lv_obj_set_pos(label, 180, 70);
@ -839,9 +842,16 @@ void show_qr_picture_page(lv_obj_t* obj)
lv_obj_add_style(label, 0, &labelStyle); lv_obj_add_style(label, 0, &labelStyle);
//text qr msgbox //text qr msgbox
qr_info_msgbox = lv_btn_create(obj, button_msg_bg_scr_uiflowwrnmsg); if (NULL == qr_info_msgbox)
{
qr_info_msgbox = lv_btn_create(obj, button_msg_bg_scr_uiflowwrnmsg);
}
lv_obj_set_hidden(qr_info_msgbox, false); lv_obj_set_hidden(qr_info_msgbox, false);
labelInit = lv_label_create(qr_info_msgbox, label_msg_scr_uiflowwrnmsg); if (NULL == labelInit)
{
labelInit = lv_label_create(qr_info_msgbox, label_msg_scr_uiflowwrnmsg);
}
lv_obj_add_style(labelInit, 0, &gStyleLabel0); lv_obj_add_style(labelInit, 0, &gStyleLabel0);
//lv_obj_add_style(labelInit, 0, &gMatrixStylebtn); //lv_obj_add_style(labelInit, 0, &gMatrixStylebtn);
//lv_label_set_align(labelInit, LV_LABEL_ALIGN_CENTER); //lv_label_set_align(labelInit, LV_LABEL_ALIGN_CENTER);
@ -866,7 +876,11 @@ void show_qr_picture_page(lv_obj_t* obj)
//icon //icon
QRImage = lv_img_create(obj, NULL); if (NULL == QRImage)
{
QRImage = lv_img_create(obj, NULL);
}
lv_obj_set_hidden(QRImage, true); lv_obj_set_hidden(QRImage, true);
lv_obj_set_click(QRImage, false); lv_obj_set_click(QRImage, false);
lv_obj_set_drag(QRImage, false); lv_obj_set_drag(QRImage, false);
@ -1027,7 +1041,11 @@ void show_Password_page(lv_obj_t* obj)
snprintf(PasswordBuf5, 2, "%c", puiPara->PwdStr[4]); snprintf(PasswordBuf5, 2, "%c", puiPara->PwdStr[4]);
snprintf(PasswordBuf6, 2, "%c", puiPara->PwdStr[5]); snprintf(PasswordBuf6, 2, "%c", puiPara->PwdStr[5]);
PasswordMatrixObj = lv_btnmatrix_create(obj, NULL); if (NULL == PasswordMatrixObj)
{
PasswordMatrixObj = lv_btnmatrix_create(obj, NULL);
}
lv_obj_set_hidden(PasswordMatrixObj, false); lv_obj_set_hidden(PasswordMatrixObj, false);
lv_obj_set_click(PasswordMatrixObj, true); lv_obj_set_click(PasswordMatrixObj, true);
lv_obj_set_drag(PasswordMatrixObj, false); lv_obj_set_drag(PasswordMatrixObj, false);
@ -1041,7 +1059,11 @@ void show_Password_page(lv_obj_t* obj)
lv_obj_add_style(PasswordMatrixObj, 0, &gMatrixStylebg); lv_obj_add_style(PasswordMatrixObj, 0, &gMatrixStylebg);
lv_obj_add_style(PasswordMatrixObj, 1, &gMatrixStylebtn); lv_obj_add_style(PasswordMatrixObj, 1, &gMatrixStylebtn);
PasswordImage = lv_img_create(obj, NULL); if (NULL == PasswordImage)
{
PasswordImage = lv_img_create(obj, NULL);
}
lv_obj_set_hidden(PasswordImage, false); lv_obj_set_hidden(PasswordImage, false);
lv_obj_set_click(PasswordImage, false); lv_obj_set_click(PasswordImage, false);
lv_obj_set_drag(PasswordImage, false); lv_obj_set_drag(PasswordImage, false);
@ -1279,7 +1301,10 @@ void show_Camera_Info_page(lv_obj_t* obj)
init_Matrix_style(); init_Matrix_style();
btnm = lv_btnmatrix_create(obj, NULL); if (NULL == btnm)
{
btnm = lv_btnmatrix_create(obj, NULL);
}
lv_btnmatrix_set_map(btnm, map); lv_btnmatrix_set_map(btnm, map);
lv_obj_add_style(btnm, 0, &gMatrixStylebg); lv_obj_add_style(btnm, 0, &gMatrixStylebg);
lv_obj_add_style(btnm, 1, &gMatrixStylebtn); lv_obj_add_style(btnm, 1, &gMatrixStylebtn);
@ -1288,7 +1313,10 @@ void show_Camera_Info_page(lv_obj_t* obj)
lv_btnmatrix_set_btn_ctrl_all(btnm, LV_BTNMATRIX_CTRL_CHECKABLE); lv_btnmatrix_set_btn_ctrl_all(btnm, LV_BTNMATRIX_CTRL_CHECKABLE);
lv_btnmatrix_set_focused_btn(btnm, 0); lv_btnmatrix_set_focused_btn(btnm, 0);
CameraInfoImage = lv_img_create(obj, NULL); if (NULL == CameraInfoImage)
{
CameraInfoImage = lv_img_create(obj, NULL);
}
lv_obj_set_hidden(CameraInfoImage, false); lv_obj_set_hidden(CameraInfoImage, false);
lv_obj_set_click(CameraInfoImage, false); lv_obj_set_click(CameraInfoImage, false);
lv_obj_set_drag(CameraInfoImage, false); lv_obj_set_drag(CameraInfoImage, false);
@ -1300,7 +1328,11 @@ void show_Camera_Info_page(lv_obj_t* obj)
lv_style_init(&LabelStyle); lv_style_init(&LabelStyle);
lv_style_copy(&LabelStyle, &gStyleLabel0); lv_style_copy(&LabelStyle, &gStyleLabel0);
lv_style_set_text_line_space(&LabelStyle, LV_STATE_DEFAULT, -2); lv_style_set_text_line_space(&LabelStyle, LV_STATE_DEFAULT, -2);
CameraInfolabel = lv_label_create(obj, NULL);
if (NULL == CameraInfolabel)
{
CameraInfolabel = lv_label_create(obj, NULL);
}
lv_label_set_text(CameraInfolabel, ""); lv_label_set_text(CameraInfolabel, "");
lv_obj_set_pos(CameraInfolabel, 10, 45); lv_obj_set_pos(CameraInfolabel, 10, 45);
lv_obj_set_width(CameraInfolabel, 300); lv_obj_set_width(CameraInfolabel, 300);
@ -1485,7 +1517,10 @@ void show_Camera_Name_page(lv_obj_t* obj)
snprintf(CameraNameBuf3, 2, "%c", puiPara->CamNameStr[2]); snprintf(CameraNameBuf3, 2, "%c", puiPara->CamNameStr[2]);
snprintf(CameraNameBuf4, 2, "%c", puiPara->CamNameStr[3]); snprintf(CameraNameBuf4, 2, "%c", puiPara->CamNameStr[3]);
CameraNameMatrixObj = lv_btnmatrix_create(obj, NULL); if (NULL == CameraNameMatrixObj)
{
CameraNameMatrixObj = lv_btnmatrix_create(obj, NULL);
}
lv_obj_set_hidden(CameraNameMatrixObj, false); lv_obj_set_hidden(CameraNameMatrixObj, false);
lv_obj_set_click(CameraNameMatrixObj, true); lv_obj_set_click(CameraNameMatrixObj, true);
lv_obj_set_drag(CameraNameMatrixObj, false); lv_obj_set_drag(CameraNameMatrixObj, false);
@ -1499,7 +1534,10 @@ void show_Camera_Name_page(lv_obj_t* obj)
lv_obj_add_style(CameraNameMatrixObj, 0, &gMatrixStylebg); lv_obj_add_style(CameraNameMatrixObj, 0, &gMatrixStylebg);
lv_obj_add_style(CameraNameMatrixObj, 1, &gMatrixStylebtn); lv_obj_add_style(CameraNameMatrixObj, 1, &gMatrixStylebtn);
CameraNameImage = lv_img_create(obj, NULL); if (NULL == CameraNameImage)
{
CameraNameImage = lv_img_create(obj, NULL);
}
lv_obj_set_hidden(CameraNameImage, false); lv_obj_set_hidden(CameraNameImage, false);
lv_obj_set_click(CameraNameImage, false); lv_obj_set_click(CameraNameImage, false);
lv_obj_set_drag(CameraNameImage, false); lv_obj_set_drag(CameraNameImage, false);

View File

@ -329,29 +329,40 @@ void show_MaxNum_page(lv_obj_t* obj)
{ {
puiPara->SendMaxNum = 1; puiPara->SendMaxNum = 1;
} }
if (NULL == MaxNumTitleLabel)
MaxNumTitleLabel = lv_label_create(obj, NULL); {
lv_obj_set_pos(MaxNumTitleLabel, 133, 159); MaxNumTitleLabel = lv_label_create(obj, NULL);
lv_obj_set_size(MaxNumTitleLabel, 54, 24); lv_obj_set_pos(MaxNumTitleLabel, 133, 159);
lv_obj_add_style(MaxNumTitleLabel, 0, &gMatrixStylebtn); lv_obj_set_size(MaxNumTitleLabel, 54, 24);
lv_obj_set_state(MaxNumTitleLabel, LV_STATE_DEFAULT); lv_obj_add_style(MaxNumTitleLabel, 0, &gMatrixStylebtn);
lv_label_set_text(MaxNumTitleLabel, "01-99"); lv_obj_set_state(MaxNumTitleLabel, LV_STATE_DEFAULT);
lv_label_set_text(MaxNumTitleLabel, "01-99");
}
char result[3]; char result[3];
sprintf(result, "%02d", puiPara->SendMaxNum); sprintf(result, "%02d", puiPara->SendMaxNum);
MaxNumValueLabel = lv_label_create(obj, NULL);
lv_obj_set_pos(MaxNumValueLabel, 145, 93); if (NULL == MaxNumValueLabel)
lv_obj_set_size(MaxNumValueLabel, 32, 24); {
lv_obj_add_style(MaxNumValueLabel, 0, &gMatrixStylebtn); MaxNumValueLabel = lv_label_create(obj, NULL);
lv_obj_set_state(MaxNumValueLabel, LV_STATE_FOCUSED); lv_obj_set_pos(MaxNumValueLabel, 145, 93);
lv_label_set_text(MaxNumValueLabel, result); lv_obj_set_size(MaxNumValueLabel, 32, 24);
SelectedImage = lv_img_create(obj, NULL); lv_obj_add_style(MaxNumValueLabel, 0, &gMatrixStylebtn);
lv_obj_set_hidden(SelectedImage, false); lv_obj_set_state(MaxNumValueLabel, LV_STATE_FOCUSED);
lv_obj_set_click(SelectedImage, false); lv_label_set_text(MaxNumValueLabel, result);
lv_obj_set_drag(SelectedImage, false); }
lv_obj_set_size(SelectedImage, 32, 88); if (NULL == SelectedImage)
lv_img_set_src(SelectedImage, &sf_pwd_down_up); {
lv_obj_set_pos(SelectedImage, 144, 80); SelectedImage = lv_img_create(obj, NULL);
lv_obj_set_hidden(SelectedImage, false);
lv_obj_set_click(SelectedImage, false);
lv_obj_set_drag(SelectedImage, false);
lv_obj_set_size(SelectedImage, 32, 88);
lv_img_set_src(SelectedImage, &sf_pwd_down_up);
lv_obj_set_pos(SelectedImage, 144, 80);
}
} }
void hidde_MaxNum_page(void) void hidde_MaxNum_page(void)
@ -554,7 +565,10 @@ void show_send_time_page(lv_obj_t* obj, const int sendType)
// int i = 0; // int i = 0;
if(ONCE_DAY != gSendType) if(ONCE_DAY != gSendType)
{ {
SendTimeMatrixObj_0 = lv_btnmatrix_create(obj, NULL); if (NULL == SendTimeMatrixObj_0)
{
SendTimeMatrixObj_0 = lv_btnmatrix_create(obj, NULL);
}
lv_obj_set_hidden(SendTimeMatrixObj_0, false); lv_obj_set_hidden(SendTimeMatrixObj_0, false);
lv_obj_set_click(SendTimeMatrixObj_0, true); lv_obj_set_click(SendTimeMatrixObj_0, true);
lv_obj_set_drag(SendTimeMatrixObj_0, false); lv_obj_set_drag(SendTimeMatrixObj_0, false);
@ -567,7 +581,8 @@ void show_send_time_page(lv_obj_t* obj, const int sendType)
lv_btnmatrix_set_one_check(SendTimeMatrixObj_0, false); lv_btnmatrix_set_one_check(SendTimeMatrixObj_0, false);
lv_obj_add_style(SendTimeMatrixObj_0, 0, &gMatrixStylebg); lv_obj_add_style(SendTimeMatrixObj_0, 0, &gMatrixStylebg);
lv_obj_add_style(SendTimeMatrixObj_0, 1, &gMatrixStylebtn); lv_obj_add_style(SendTimeMatrixObj_0, 1, &gMatrixStylebtn);
lv_btnmatrix_set_btn_width(SendTimeMatrixObj_0, 3, 2); lv_btnmatrix_set_btn_width(SendTimeMatrixObj_0, 3, 2);
// for (i = 0; i < 8; i++) // for (i = 0; i < 8; i++)
// { // {
// lv_btnmatrix_set_btn_width(SendTimeMatrixObj_0, i, 1); // lv_btnmatrix_set_btn_width(SendTimeMatrixObj_0, i, 1);
@ -577,7 +592,11 @@ void show_send_time_page(lv_obj_t* obj, const int sendType)
} }
else else
{ {
SendTimeMatrixObj_1 = lv_btnmatrix_create(obj, NULL); if (NULL == SendTimeMatrixObj_1)
{
SendTimeMatrixObj_1 = lv_btnmatrix_create(obj, NULL);
}
lv_obj_set_hidden(SendTimeMatrixObj_1, false); lv_obj_set_hidden(SendTimeMatrixObj_1, false);
lv_obj_set_click(SendTimeMatrixObj_1, true); lv_obj_set_click(SendTimeMatrixObj_1, true);
lv_obj_set_drag(SendTimeMatrixObj_1, false); lv_obj_set_drag(SendTimeMatrixObj_1, false);
@ -597,7 +616,11 @@ void show_send_time_page(lv_obj_t* obj, const int sendType)
lv_obj_set_hidden(container_send_time_0_scr_uiflowmenucommonoption, false); lv_obj_set_hidden(container_send_time_0_scr_uiflowmenucommonoption, false);
} }
SelectedImage = lv_img_create(obj, NULL); if (NULL == SelectedImage)
{
SelectedImage = lv_img_create(obj, NULL);
}
lv_obj_set_hidden(SelectedImage, false); lv_obj_set_hidden(SelectedImage, false);
lv_obj_set_click(SelectedImage, false); lv_obj_set_click(SelectedImage, false);
lv_obj_set_drag(SelectedImage, false); lv_obj_set_drag(SelectedImage, false);
@ -614,7 +637,10 @@ void show_send_time_page(lv_obj_t* obj, const int sendType)
if(FOUR_TIME_DAY == gSendType) if(FOUR_TIME_DAY == gSendType)
{ {
btnm = lv_btnmatrix_create(lv_scr_act(), NULL); if (NULL == btnm)
{
btnm = lv_btnmatrix_create(lv_scr_act(), NULL);
}
lv_btnmatrix_set_map(btnm, map); lv_btnmatrix_set_map(btnm, map);
lv_obj_add_style(btnm, 0, &gMatrixStylebg); lv_obj_add_style(btnm, 0, &gMatrixStylebg);
lv_obj_add_style(btnm, 1, &gMatrixStylebtn); lv_obj_add_style(btnm, 1, &gMatrixStylebtn);
@ -623,7 +649,10 @@ void show_send_time_page(lv_obj_t* obj, const int sendType)
lv_btnmatrix_set_btn_ctrl_all(btnm, LV_BTNMATRIX_CTRL_CHECKABLE); lv_btnmatrix_set_btn_ctrl_all(btnm, LV_BTNMATRIX_CTRL_CHECKABLE);
lv_btnmatrix_set_focused_btn(btnm, 0); lv_btnmatrix_set_focused_btn(btnm, 0);
SendTypeImage = lv_img_create(lv_scr_act(), NULL); if (NULL == SendTypeImage)
{
SendTypeImage = lv_img_create(lv_scr_act(), NULL);
}
lv_obj_set_hidden(SendTypeImage, false); lv_obj_set_hidden(SendTypeImage, false);
lv_obj_set_click(SendTypeImage, false); lv_obj_set_click(SendTypeImage, false);
lv_obj_set_drag(SendTypeImage, false); lv_obj_set_drag(SendTypeImage, false);

View File

@ -918,7 +918,7 @@ static void UIFlowMovie_OnExeRecord(lv_obj_t* obj)
if (GxStrg_GetDeviceCtrl(0, CARD_READONLY)) { // card lock if (GxStrg_GetDeviceCtrl(0, CARD_READONLY)) { // card lock
UIFlowWrnMsgAPI_Open_StringID(LV_PLUGIN_STRING_ID_STRID_CARD_LOCKED, warn_msgbox_auto_close_ms); UIFlowWrnMsgAPI_Open_StringID(LV_PLUGIN_STRING_ID_STRID_CARD_LOCKED, warn_msgbox_auto_close_ms);
return; //return;
} }

View File

@ -162,7 +162,10 @@ static void init_Matrix_style(void)
static void UIFlowPassword_ScrOpen(lv_obj_t* obj) static void UIFlowPassword_ScrOpen(lv_obj_t* obj)
{ {
init_Matrix_style(); init_Matrix_style();
SendTimeMatrixObj_0 = lv_btnmatrix_create(obj, NULL); if (NULL == SendTimeMatrixObj_0)
{
SendTimeMatrixObj_0 = lv_btnmatrix_create(obj, NULL);
}
lv_obj_set_hidden(SendTimeMatrixObj_0, false); lv_obj_set_hidden(SendTimeMatrixObj_0, false);
lv_obj_set_click(SendTimeMatrixObj_0, true); lv_obj_set_click(SendTimeMatrixObj_0, true);
lv_obj_set_drag(SendTimeMatrixObj_0, false); lv_obj_set_drag(SendTimeMatrixObj_0, false);
@ -175,7 +178,10 @@ static void UIFlowPassword_ScrOpen(lv_obj_t* obj)
lv_btnmatrix_set_one_check(SendTimeMatrixObj_0, false); lv_btnmatrix_set_one_check(SendTimeMatrixObj_0, false);
lv_obj_add_style(SendTimeMatrixObj_0, 0, &gMatrixStylebg); lv_obj_add_style(SendTimeMatrixObj_0, 0, &gMatrixStylebg);
lv_obj_add_style(SendTimeMatrixObj_0, 1, &gMatrixStylebtn); lv_obj_add_style(SendTimeMatrixObj_0, 1, &gMatrixStylebtn);
SelectedImage = lv_img_create(obj, NULL); if (NULL == SelectedImage)
{
SelectedImage = lv_img_create(obj, NULL);
}
lv_obj_set_hidden(SelectedImage, false); lv_obj_set_hidden(SelectedImage, false);
lv_obj_set_click(SelectedImage, false); lv_obj_set_click(SelectedImage, false);
lv_obj_set_drag(SelectedImage, false); lv_obj_set_drag(SelectedImage, false);

View File

@ -1339,7 +1339,10 @@ static void UIFlowPlay_ScrOpen(lv_obj_t* obj)
no_file_msgbox = lv_btn_create(obj, button_msg_bg_scr_uiflowwrnmsg); no_file_msgbox = lv_btn_create(obj, button_msg_bg_scr_uiflowwrnmsg);
lv_obj_set_hidden(no_file_msgbox, true); lv_obj_set_hidden(no_file_msgbox, true);
is_no_file = 0; is_no_file = 0;
label_msgbox = lv_label_create(no_file_msgbox, label_msg_scr_uiflowwrnmsg); if (NULL == label_msgbox)
{
label_msgbox = lv_label_create(no_file_msgbox, label_msg_scr_uiflowwrnmsg);
}
lv_obj_align(label_msgbox, no_file_msgbox, 0, 0, 0); lv_obj_align(label_msgbox, no_file_msgbox, 0, 0, 0);
lv_label_set_align(label_msgbox, LV_LABEL_ALIGN_CENTER); lv_label_set_align(label_msgbox, LV_LABEL_ALIGN_CENTER);
lv_label_set_text(label_msgbox, "No File"); lv_label_set_text(label_msgbox, "No File");