payton/nt9856x
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'branch_s550_gui' into branch_s550_fast

Browse Source
This commit is contained in:
xiaojiazhu 2023-11-29 11:39:51 +08:00
commit 6c3a10fe9d
11 changed files with 67 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Languages/Language_EN.c
View File

@ -155,8 +155,8 @@ lv_plugin_string_t lv_plugin_EN_string_table[] = {
{ "Русский", 14 }, /* LV_PLUGIN_STRING_ID_STRID_LANG_RU */ { "Русский", 14 }, /* LV_PLUGIN_STRING_ID_STRID_LANG_RU */
{ "USB", 3 }, /* LV_PLUGIN_STRING_ID_STRID_USB */ { "USB", 3 }, /* LV_PLUGIN_STRING_ID_STRID_USB */
{ "PC Mode", 7 }, /* LV_PLUGIN_STRING_ID_STRID_PC_MODE */ { "PC Mode", 7 }, /* LV_PLUGIN_STRING_ID_STRID_PC_MODE */
{ "PC-ACM", 6 }, /* LV_PLUGIN_STRING_ID_STRID_MSDC */ { "MSDC", 4 }, /* LV_PLUGIN_STRING_ID_STRID_MSDC */
{ "PC Camera", 9 }, /* LV_PLUGIN_STRING_ID_STRID_PCC */ { "PC-ACM", 6 }, /* LV_PLUGIN_STRING_ID_STRID_PCC */
{ "Pictbridge", 10 }, /* LV_PLUGIN_STRING_ID_STRID_PICTBRIDGE */ { "Pictbridge", 10 }, /* LV_PLUGIN_STRING_ID_STRID_PICTBRIDGE */
{ "Power Charging", 14 }, /* LV_PLUGIN_STRING_ID_STRID_USBCHARGE */ { "Power Charging", 14 }, /* LV_PLUGIN_STRING_ID_STRID_USBCHARGE */
{ "TV Mode", 7 }, /* LV_PLUGIN_STRING_ID_STRID_TV_MODE */ { "TV Mode", 7 }, /* LV_PLUGIN_STRING_ID_STRID_TV_MODE */

2
code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL.UIFlowUSB.lvglscr
View File

@ -60,7 +60,7 @@
"state": 6 "state": 6
} }
], ],
"text": "PC-ACM", "text": "MSDC",
"widget": "Label" "widget": "Label"
}, },
{ {

2
code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL.lvgllang
View File

@ -422,8 +422,8 @@
"Русский", "Русский",
"USB", "USB",
"PC Mode", "PC Mode",
"MSDC",
"PC-ACM", "PC-ACM",
"PC Camera",
"Pictbridge", "Pictbridge",
"Power Charging", "Power Charging",
"TV Mode", "TV Mode",

26
code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonConfirm/UIFlowMenuCommonConfirmEventCallback.c
View File

@ -30,6 +30,15 @@ static void set_indev_keypad_group(lv_obj_t* obj)
lv_indev_t* indev = lv_plugin_find_indev_by_type(LV_INDEV_TYPE_KEYPAD); lv_indev_t* indev = lv_plugin_find_indev_by_type(LV_INDEV_TYPE_KEYPAD);
lv_indev_set_group(indev, gp); lv_indev_set_group(indev, gp);
} }
static lv_obj_t *Confirm_label = NULL;
static void set_msbox_hidden(bool hidden)
{
lv_obj_set_hidden(msgbox, hidden);
if (Confirm_label)
{
lv_obj_set_hidden(Confirm_label, hidden);
}
}
// -------------------------------------------------------------------------- // --------------------------------------------------------------------------
// Common Function // Common Function
// -------------------------------------------------------------------------- // --------------------------------------------------------------------------
@ -189,7 +198,6 @@ static void init_style(void)
static lv_obj_t *Confirm_label = NULL;
void UIFlowMenuCommonConfirmAPI_Open(uint32_t itemID) void UIFlowMenuCommonConfirmAPI_Open(uint32_t itemID)
{ {
@ -213,7 +221,7 @@ void UIFlowMenuCommonConfirmAPI_Open(uint32_t itemID)
msgbox = lv_msgbox_create(UIFlowMenuCommonConfirm, message_box_1_scr_uiflowmenucommonconfirm); msgbox = lv_msgbox_create(UIFlowMenuCommonConfirm, message_box_1_scr_uiflowmenucommonconfirm);
/* remember to set duplicate obj visible */ /* remember to set duplicate obj visible */
lv_obj_set_hidden(msgbox, false); set_msbox_hidden(false);
/* anim time won't be copied by lvgl, config it manually */ /* anim time won't be copied by lvgl, config it manually */
uint16_t anim_time = lv_msgbox_get_anim_time(message_box_1_scr_uiflowmenucommonconfirm); uint16_t anim_time = lv_msgbox_get_anim_time(message_box_1_scr_uiflowmenucommonconfirm);
@ -483,41 +491,41 @@ static void UIFlowMenuCommonConfirm_MessageBox_ValueChanged(lv_obj_t* obj, uint3
} else if (gBKGEvt == NVTEVT_BKW_FORMAT_CARD) { } else if (gBKGEvt == NVTEVT_BKW_FORMAT_CARD) {
if(sf_in_card_exist() == TRUE) if(sf_in_card_exist() == TRUE)
{ {
lv_obj_set_hidden(msgbox, true); set_msbox_hidden( true);
UIFlowWrnMsgAPI_Open_StringID(LV_PLUGIN_STRING_ID_STRING_FORMATING, 20000); UIFlowWrnMsgAPI_Open_StringID(LV_PLUGIN_STRING_ID_STRING_FORMATING, 20000);
BKG_PostEvent(NVTEVT_BKW_FORMAT_CARD); BKG_PostEvent(NVTEVT_BKW_FORMAT_CARD);
} }
else else
{ {
lv_obj_set_hidden(msgbox, true); set_msbox_hidden( true);
UIFlowWrnMsgAPI_Open_StringID(LV_PLUGIN_STRING_ID_STRING_NO_SD, 3000); UIFlowWrnMsgAPI_Open_StringID(LV_PLUGIN_STRING_ID_STRING_NO_SD, 3000);
} }
} else if (gBKGEvt == NVTEVT_BKW_CAMERA_FW_UPGRADE) { } else if (gBKGEvt == NVTEVT_BKW_CAMERA_FW_UPGRADE) {
if(sf_cardv_battery_value_get() < 40) if(sf_cardv_battery_value_get() < 40)
{ {
lv_obj_set_hidden(msgbox, true); set_msbox_hidden( true);
UIFlowWrnMsgAPI_Open_StringID(LV_PLUGIN_STRING_ID_STRING_UPGRADE_ERR, 3000); UIFlowWrnMsgAPI_Open_StringID(LV_PLUGIN_STRING_ID_STRING_UPGRADE_ERR, 3000);
} }
else else
{ {
lv_obj_set_hidden(msgbox, true); set_msbox_hidden( true);
UIFlowWrnMsgAPI_Open_StringID(LV_PLUGIN_STRING_ID_STRING_UPGRADING, 60000); UIFlowWrnMsgAPI_Open_StringID(LV_PLUGIN_STRING_ID_STRING_UPGRADING, 60000);
BKG_PostEvent(gBKGEvt); BKG_PostEvent(gBKGEvt);
} }
} else if (gBKGEvt == NVTEVT_BKW_MODULE_FW_UPGRADE) { } else if (gBKGEvt == NVTEVT_BKW_MODULE_FW_UPGRADE) {
if(sf_cardv_battery_value_get() < 40) if(sf_cardv_battery_value_get() < 40)
{ {
lv_obj_set_hidden(msgbox, true); set_msbox_hidden( true);
UIFlowWrnMsgAPI_Open_StringID(LV_PLUGIN_STRING_ID_STRING_UPGRADE_LOWBAT, 3000); UIFlowWrnMsgAPI_Open_StringID(LV_PLUGIN_STRING_ID_STRING_UPGRADE_LOWBAT, 3000);
} }
else else
{ {
lv_obj_set_hidden(msgbox, true); set_msbox_hidden( true);
UIFlowWrnMsgAPI_Open_StringID(LV_PLUGIN_STRING_ID_STRING_UPGRADING, 60000); UIFlowWrnMsgAPI_Open_StringID(LV_PLUGIN_STRING_ID_STRING_UPGRADING, 60000);
BKG_PostEvent(gBKGEvt); BKG_PostEvent(gBKGEvt);
} }
} else if (gBKGEvt == NVTEVT_BKW_RESET) { } else if (gBKGEvt == NVTEVT_BKW_RESET) {
lv_obj_set_hidden(msgbox, true); set_msbox_hidden( true);
UIFlowWrnMsgAPI_Open_StringID(LV_PLUGIN_STRING_ID_STRING_COMPLETED, 10000); UIFlowWrnMsgAPI_Open_StringID(LV_PLUGIN_STRING_ID_STRING_COMPLETED, 10000);
BKG_PostEvent(gBKGEvt); BKG_PostEvent(gBKGEvt);
} else if (gBKGEvt == NVTEVT_BKW_ENTER_WORK_MODE) } else if (gBKGEvt == NVTEVT_BKW_ENTER_WORK_MODE)

2
code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuSend.c
View File

@ -118,7 +118,7 @@ int Send_MenuCallback(UINT32 uiMessage, UINT32 uiParam)
case IDM_GPS: case IDM_GPS:
{ {
#define GPRS_OFF_OPTION 0 #define GPRS_OFF_OPTION 0
puiPara->GprsSwitch = GPRS_OFF_OPTION == uwOption ? SF_OFF : SF_ON; puiPara->GprsSwitch = (GPRS_OFF_OPTION == uwOption ? SF_OFF : SF_ON);
printf("\033[33m[Send_MenuCallback]GprsSwitch:%d\033[0m\n", puiPara->GprsSwitch); printf("\033[33m[Send_MenuCallback]GprsSwitch:%d\033[0m\n", puiPara->GprsSwitch);
break; break;
} }

4
code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/UIFlowMenuCommonItemEventCallback.c
View File

@ -176,7 +176,7 @@ static void load_info_from_sf(void)
SysSetFlag(IDF_SETTINGS_CHECK, puiPara->GprsMode); SysSetFlag(IDF_SETTINGS_CHECK, puiPara->GprsMode);
SysSetFlag(IDF_SEND_TYPE, puiPara->SendType); SysSetFlag(IDF_SEND_TYPE, puiPara->SendType);
SysSetFlag(IDF_CHECK_IN_PHOTO, puiPara->PicUpDailyReport); SysSetFlag(IDF_CHECK_IN_PHOTO, puiPara->PicUpDailyReport);
SysSetFlag(IDF_GPS, puiPara->GpsSendFlag); SysSetFlag(IDF_GPS, puiPara->GprsSwitch);
SysSetFlag(IDF_BATTERY_TYPE, puiPara->BatteryType); SysSetFlag(IDF_BATTERY_TYPE, puiPara->BatteryType);
SysSetFlag(IDF_SD_LOOP, puiPara->SdLoopSwitch); SysSetFlag(IDF_SD_LOOP, puiPara->SdLoopSwitch);
} }
@ -867,6 +867,7 @@ static void LV_MenuCommonItem_UpdateContent(TM_MENU *pMenu)
static void UIFlowMenuCommonItem_ScrOpen(lv_obj_t* obj) static void UIFlowMenuCommonItem_ScrOpen(lv_obj_t* obj)
{ {
DBG_DUMP("UIFlowMenuCommonItem_ScrOpen\r\n"); DBG_DUMP("UIFlowMenuCommonItem_ScrOpen\r\n");
sf_set_keep_alive_time(MENU_SCREEN_GO_TO_WORK_MODE_TIME_S);
gBattery = sf_cardv_battery_value_get(); gBattery = sf_cardv_battery_value_get();
/*********************************************************************************** /***********************************************************************************
@ -990,6 +991,7 @@ static void UIFlowMenuCommonItem_Key(lv_obj_t* obj, uint32_t key)
static void UIFlowMenuCommonItem_ScrClose(lv_obj_t* obj) static void UIFlowMenuCommonItem_ScrClose(lv_obj_t* obj)
{ {
DBG_DUMP("%s\r\n", __func__); DBG_DUMP("%s\r\n", __func__);
sf_set_keep_alive_time(DEFAULT_GO_TO_WORK_MODE_TIME_S);
Save_MenuInfo(); Save_MenuInfo();
LV_MenuItem_OnClose(obj); LV_MenuItem_OnClose(obj);
gMenuLuck = MENU_CLOSED; gMenuLuck = MENU_CLOSED;

38
code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPhoto/UIFlowPhotoEventCallback.c
View File

@ -47,8 +47,9 @@ static CHAR g_cSelftimerCntStr[8] = {0};
static lv_group_t* gp = NULL; static lv_group_t* gp = NULL;
static lv_task_t* task_selftimer = NULL; static lv_task_t* task_selftimer = NULL;
static lv_task_t* update_icons_timer = NULL; static lv_task_t* update_icons_timer = NULL;
#define GO_TO_WORK_MODE_TIME 157 #define GO_TO_WORK_MODE_TIME 57
#define PASSWORD_GO_TO_WORK_MODE_TIME_S 62 #define PASSWORD_GO_TO_WORK_MODE_TIME_S 62
#define MENU_GO_TO_WORK_MODE_TIME_S 27
static unsigned int ShutDownTime = GO_TO_WORK_MODE_TIME; static unsigned int ShutDownTime = GO_TO_WORK_MODE_TIME;
static lv_task_t* task_qview = NULL; static lv_task_t* task_qview = NULL;
@ -1565,7 +1566,7 @@ static void task_update_icons_timer_cb(lv_task_t* task)
if (autoOffTime >= ShutDownTime && autoOffTime < ShutDownTime + 3) if (autoOffTime >= ShutDownTime && autoOffTime < ShutDownTime + 3)
{ {
// unsigned int autoCloseTime_s = ShutDownTime == GO_TO_WORK_MODE_TIME ? 30 : 3; // unsigned int autoCloseTime_s = ShutDownTime == GO_TO_WORK_MODE_TIME ? 30 : 3;
if (GO_TO_WORK_MODE_TIME == ShutDownTime) if (GO_TO_WORK_MODE_TIME == ShutDownTime || MENU_GO_TO_WORK_MODE_TIME_S == ShutDownTime)
{ {
UIFlowWrnMsgAPI_Open_StringID(LV_PLUGIN_STRING_ID_STRING_ENTER_WORK, 1000 * 30); UIFlowWrnMsgAPI_Open_StringID(LV_PLUGIN_STRING_ID_STRING_ENTER_WORK, 1000 * 30);
} }
@ -1769,6 +1770,23 @@ static void UIFlowPhoto_NVTMSG(lv_obj_t* obj, const LV_USER_EVENT_NVTMSG_DATA* m
} }
} }
static void UIFlowPhoto_Key_down(lv_obj_t* obj, uint32_t key)
{
switch(key)
{
case LV_USER_KEY_DOWN:
case LV_USER_KEY_NEXT:
{
g_preview_info_ishidden = false;
lv_obj_set_hidden(g_preview_info_msgbox, g_preview_info_ishidden);
break;
}
default:
{
break;
}
}
}
static void UIFlowPhoto_Key(lv_obj_t* obj, uint32_t key) static void UIFlowPhoto_Key(lv_obj_t* obj, uint32_t key)
{ {
printf("\r\n[%s] line:%d %d\n", __FUNCTION__, __LINE__,key); printf("\r\n[%s] line:%d %d\n", __FUNCTION__, __LINE__,key);
@ -1805,6 +1823,7 @@ static void UIFlowPhoto_Key(lv_obj_t* obj, uint32_t key)
case LV_USER_KEY_ZOOMIN: case LV_USER_KEY_ZOOMIN:
{ {
g_preview_info_ishidden = true; g_preview_info_ishidden = true;
lv_obj_set_hidden(g_preview_info_msgbox, g_preview_info_ishidden);
KeyDownPressingTimeMs = 0; KeyDownPressingTimeMs = 0;
break; break;
CHKPNT; CHKPNT;
@ -1828,6 +1847,7 @@ static void UIFlowPhoto_Key(lv_obj_t* obj, uint32_t key)
case LV_USER_KEY_RIGHT: case LV_USER_KEY_RIGHT:
{ {
SF_WIFI_STATUS_E status = sf_get_wifi_status(); SF_WIFI_STATUS_E status = sf_get_wifi_status();
ShutDownTime = MENU_GO_TO_WORK_MODE_TIME_S;
if (SF_WIFI_CON != status) if (SF_WIFI_CON != status)
{ {
UIFlowPhoto_OnKeyMenu(obj); UIFlowPhoto_OnKeyMenu(obj);
@ -1900,7 +1920,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; // g_preview_info_ishidden = false;
KeyDownPressingTimeMs += LONG_PRESS_INTERVAL; KeyDownPressingTimeMs += LONG_PRESS_INTERVAL;
if (5 * 1000 <= KeyDownPressingTimeMs) if (5 * 1000 <= KeyDownPressingTimeMs)
{ {
@ -1942,6 +1962,9 @@ void UIFlowPhotoEventCallback(lv_obj_t* obj, lv_event_t event)
passwordOpened = PASSWORD_OPENED; passwordOpened = PASSWORD_OPENED;
OpenPasswordScreen(); OpenPasswordScreen();
ShutDownTime = PASSWORD_GO_TO_WORK_MODE_TIME_S; ShutDownTime = PASSWORD_GO_TO_WORK_MODE_TIME_S;
} else if (PASSWORD_SWITCH_ON != puiPara->PwdSwitch)
{
passwordOpened = PASSWORD_OPENED;
} }
// #if HUNTING_CAMERA_MCU == ENABLE // #if HUNTING_CAMERA_MCU == ENABLE
// UIMenuStoreInfo *puiPara = sf_ui_para_get(); // UIMenuStoreInfo *puiPara = sf_ui_para_get();
@ -1966,7 +1989,14 @@ void UIFlowPhotoEventCallback(lv_obj_t* obj, lv_event_t event)
UIFlowPhoto_OnKeyMenu(obj); UIFlowPhoto_OnKeyMenu(obj);
break; break;
// case LV_EVENT_KEY: case LV_EVENT_KEY:
{
uint32_t* key = (uint32_t*)lv_event_get_data();
UIFlowPhoto_Key_down(obj, *key);
if(*key != LV_KEY_ENTER)
lv_indev_wait_release(lv_indev_get_act());
break;
}
case LV_USER_EVENT_KEY_RELEASE: case LV_USER_EVENT_KEY_RELEASE:
{ {
uint32_t* key = (uint32_t*)lv_event_get_data(); uint32_t* key = (uint32_t*)lv_event_get_data();

2
code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowUSB/UIFlowUSB.c
View File

@ -115,7 +115,7 @@ lv_obj_t* UIFlowUSB_create(){
lv_obj_set_drag(label_usbmode, false); lv_obj_set_drag(label_usbmode, false);
lv_plugin_label_allocate_ext_attr(label_usbmode); lv_plugin_label_allocate_ext_attr(label_usbmode);
lv_plugin_label_set_text(label_usbmode, LV_PLUGIN_STRING_ID_STRID_MSDC); lv_plugin_label_set_text(label_usbmode, LV_PLUGIN_STRING_ID_STRID_MSDC);
lv_label_set_text(label_usbmode,"PC-ACM"); lv_label_set_text(label_usbmode,"MSDC");
lv_plugin_label_allocate_ext_attr(label_usbmode); lv_plugin_label_allocate_ext_attr(label_usbmode);
lv_plugin_label_set_font_type(label_usbmode, LV_PLUGIN_LANGUAGE_FONT_TYPE_0); lv_plugin_label_set_font_type(label_usbmode, LV_PLUGIN_LANGUAGE_FONT_TYPE_0);
lv_label_set_align(label_usbmode, LV_LABEL_ALIGN_CENTER); lv_label_set_align(label_usbmode, LV_LABEL_ALIGN_CENTER);

2
code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowUSB/UIFlowUSBEventCallback.c
View File

@ -22,7 +22,7 @@ static void UIFlowUsb_Key(lv_obj_t* obj, uint32_t key)
switch(key) switch(key)
{ {
case LV_USER_KEY_SHUTTER2: case LV_KEY_ENTER:
if((System_GetState(SYS_STATE_CURRMODE) != PRIMARY_MODE_USBMSDC)){ if((System_GetState(SYS_STATE_CURRMODE) != PRIMARY_MODE_USBMSDC)){
Ux_SendEvent(0, NVTEVT_SYSTEM_MODE, 1, PRIMARY_MODE_USBMSDC); Ux_SendEvent(0, NVTEVT_SYSTEM_MODE, 1, PRIMARY_MODE_USBMSDC);
} }

5
code/lib/source/sifar/code/include/sf_common.h
View File

@ -30,8 +30,9 @@ typedef enum{
FILE_SENDING_GUI_SEND_FAILED, FILE_SENDING_GUI_SEND_FAILED,
FILE_SENDING_GUI_END FILE_SENDING_GUI_END
} FILE_SENDING_GUI_E; } FILE_SENDING_GUI_E;
#define DEFAULT_GO_TO_WORK_MODE_TIME_S 185 #define DEFAULT_GO_TO_WORK_MODE_TIME_S 85
#define PASSWORD_SCREEN_GO_TO_WORK_MODE_TIME_S 60 #define PASSWORD_SCREEN_GO_TO_WORK_MODE_TIME_S 61
#define MENU_SCREEN_GO_TO_WORK_MODE_TIME_S 60
void sf_mode_detect(void); void sf_mode_detect(void);
int sf_pir_statu_read(void); int sf_pir_statu_read(void);
void sf_set_pir_power_off_flag(BOOL flag); void sf_set_pir_power_off_flag(BOOL flag);

4
code/lib/source/sifar/code/source/common/sf_common.c
View File

@ -311,7 +311,9 @@ void sf_mode_detect(void)
//countDownOffFlg = 0; //countDownOffFlg = 0;
} }
if(puiPara->AutoOffSwitch == 0 || SF_BLE_CON == sf_get_ble_status() || (0x04 == NetWorkFlag/*SF_4G_SENDING*/) || (0x05 == NetWorkFlag/*SF_4G_SEARCHING*/) || (sf_get_fw_update()) || (sf_get_module_update()) || (sf_get_mcu_update_flag())/*|| (appActiveStateGet() == APP_STATE_CUSTOMER_TRANSFER)*/) if(puiPara->AutoOffSwitch == 0 || SF_BLE_CON == sf_get_ble_status() || (0x04 == NetWorkFlag/*SF_4G_SENDING*/) ||
(0x05 == NetWorkFlag/*SF_4G_SEARCHING*/) || (sf_get_fw_update()) || (sf_get_module_update()) ||
(sf_get_mcu_update_flag()) || ( System_GetState(SYS_STATE_CURRMODE) == PRIMARY_MODE_PLAYBACK)/*|| (appActiveStateGet() == APP_STATE_CUSTOMER_TRANSFER)*/)
{ {
AutoOfftime=0; AutoOfftime=0;
} }