Merge branch 'Branch_S550_GUI' of gitlab.sifar.tech:linux-em-group/s530-ntk into branch_s550_gui
This commit is contained in:
commit
602408f817
|
@ -69,6 +69,68 @@ static BOOL g_PhotoBgInitFileSys = FALSE;
|
||||||
static BOOL g_SysStrg_Chg = FALSE;
|
static BOOL g_SysStrg_Chg = FALSE;
|
||||||
//#NT#2023/11/21#Eric - end
|
//#NT#2023/11/21#Eric - end
|
||||||
|
|
||||||
|
static lv_obj_t *g_preview_info_msgbox = NULL;
|
||||||
|
static lv_obj_t *g_preview_info_label = NULL;
|
||||||
|
static int g_preview_info_ishidden = true;
|
||||||
|
static lv_task_t* preview_info_task = NULL;
|
||||||
|
static void preview_info_task_cb(lv_task_t* task)
|
||||||
|
{
|
||||||
|
static int count = 0;
|
||||||
|
char CamInfoStr[256] = {0};
|
||||||
|
char tmpStr[64] = {0};
|
||||||
|
|
||||||
|
lv_obj_set_hidden(g_preview_info_msgbox, g_preview_info_ishidden);
|
||||||
|
|
||||||
|
if(count % 10 == 0)
|
||||||
|
{
|
||||||
|
count = 0;
|
||||||
|
|
||||||
|
UIMenuStoreInfo *puiPara = sf_ui_para_get();
|
||||||
|
|
||||||
|
struct tm DayTime = hwclock_get_time(TIME_ID_CURRENT);
|
||||||
|
|
||||||
|
for(int i=0;i<4;i++)
|
||||||
|
{
|
||||||
|
memset(tmpStr, 0, sizeof(tmpStr));
|
||||||
|
switch(i)
|
||||||
|
{
|
||||||
|
case 0:
|
||||||
|
sprintf(tmpStr, "%02ld:%02ld:%04ld %02ld:%02ld:%02ld\n",
|
||||||
|
DayTime.tm_mon, DayTime.tm_mday, DayTime.tm_year, DayTime.tm_hour, DayTime.tm_min, DayTime.tm_sec);
|
||||||
|
strcat(CamInfoStr, tmpStr);
|
||||||
|
break;
|
||||||
|
case 1:
|
||||||
|
sprintf(tmpStr, "%s\n", puiPara->ServiceProvider);
|
||||||
|
strcat(CamInfoStr, tmpStr);
|
||||||
|
break;
|
||||||
|
case 2:
|
||||||
|
if(strlen(puiPara->Longitude) == 0)
|
||||||
|
strcat(CamInfoStr, "\n");
|
||||||
|
else
|
||||||
|
{
|
||||||
|
sprintf(tmpStr, "LON %s\n", puiPara->Longitude);
|
||||||
|
strcat(CamInfoStr, tmpStr);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case 3:
|
||||||
|
if(strlen(puiPara->Latitude) == 0)
|
||||||
|
strcat(CamInfoStr, "\n");
|
||||||
|
else
|
||||||
|
{
|
||||||
|
sprintf(tmpStr, "LAT %s\n", puiPara->Latitude);
|
||||||
|
strcat(CamInfoStr, tmpStr);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
lv_label_set_text_fmt(g_preview_info_label, CamInfoStr);
|
||||||
|
}
|
||||||
|
|
||||||
|
count++;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
typedef struct _UIFlowInfoTypePhoto {
|
typedef struct _UIFlowInfoTypePhoto {
|
||||||
|
@ -1580,7 +1642,6 @@ static void UIFlowPhoto_NVTMSG(lv_obj_t* obj, const LV_USER_EVENT_NVTMSG_DATA* m
|
||||||
sf_show_send_text(obj, msg->paramArray[0]);
|
sf_show_send_text(obj, msg->paramArray[0]);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
@ -1622,6 +1683,7 @@ static void UIFlowPhoto_Key(lv_obj_t* obj, uint32_t key)
|
||||||
case LV_USER_KEY_NEXT:
|
case LV_USER_KEY_NEXT:
|
||||||
case LV_USER_KEY_ZOOMIN:
|
case LV_USER_KEY_ZOOMIN:
|
||||||
{
|
{
|
||||||
|
g_preview_info_ishidden = true;
|
||||||
KeyDownPressingTimeMs = 0;
|
KeyDownPressingTimeMs = 0;
|
||||||
break;
|
break;
|
||||||
CHKPNT;
|
CHKPNT;
|
||||||
|
@ -1714,6 +1776,7 @@ void UIFlowPhtot_KeyLongPress(lv_obj_t* obj, uint32_t key)
|
||||||
}
|
}
|
||||||
case LV_USER_KEY_NEXT:
|
case LV_USER_KEY_NEXT:
|
||||||
{
|
{
|
||||||
|
g_preview_info_ishidden = false;
|
||||||
KeyDownPressingTimeMs += LONG_PRESS_INTERVAL;
|
KeyDownPressingTimeMs += LONG_PRESS_INTERVAL;
|
||||||
if (5 * 1000 <= KeyDownPressingTimeMs)
|
if (5 * 1000 <= KeyDownPressingTimeMs)
|
||||||
{
|
{
|
||||||
|
@ -1735,7 +1798,18 @@ void UIFlowPhotoEventCallback(lv_obj_t* obj, lv_event_t event)
|
||||||
switch(event)
|
switch(event)
|
||||||
{
|
{
|
||||||
case LV_PLUGIN_EVENT_SCR_OPEN:
|
case LV_PLUGIN_EVENT_SCR_OPEN:
|
||||||
UIFlowPhoto_ScrOpen(obj);
|
UIFlowPhoto_ScrOpen(obj);//LV_ALIGN_IN_RIGHT_MID
|
||||||
|
|
||||||
|
if(preview_info_task == NULL && g_preview_info_msgbox == NULL && g_preview_info_label == NULL){
|
||||||
|
g_preview_info_msgbox = lv_btn_create(obj, button_msg_bg_scr_uiflowwrnmsg);
|
||||||
|
g_preview_info_ishidden = true;
|
||||||
|
lv_obj_set_hidden(g_preview_info_msgbox, g_preview_info_ishidden);
|
||||||
|
g_preview_info_label = lv_label_create(g_preview_info_msgbox, label_msg_scr_uiflowwrnmsg);
|
||||||
|
lv_obj_align(g_preview_info_label, g_preview_info_msgbox, LV_ALIGN_CENTER, 0, -30);
|
||||||
|
lv_label_set_align(g_preview_info_label, LV_LABEL_ALIGN_CENTER);
|
||||||
|
preview_info_task = lv_task_create(preview_info_task_cb, 100, LV_TASK_PRIO_MID, NULL);
|
||||||
|
}
|
||||||
|
|
||||||
#define PASSWORD_OPENED 1
|
#define PASSWORD_OPENED 1
|
||||||
#define PASSWORD_NOT_OPENED 0
|
#define PASSWORD_NOT_OPENED 0
|
||||||
static int passwordOpened = PASSWORD_NOT_OPENED;
|
static int passwordOpened = PASSWORD_NOT_OPENED;
|
||||||
|
|
Loading…
Reference in New Issue
Block a user