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

Fixed bug number 9517.

Browse Source
This commit is contained in:
xiaojiazhu 2023-11-06 15:22:01 +08:00
parent d22539c5a3
commit aa2e833ea3
8 changed files with 78 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
code/application/source/cardv/SrcCode/PrjCfg_HUNTING_S550.h
View File

@ -922,7 +922,7 @@
#define HUNTING_MCU_UART ENABLE
#define HUNTING_IR_LED_940 ENABLE
#define SF_EXIF_MN_BUF_SIZE 256
#define SF_BASE_VERSION "8MA4RCwDA01"
#define SF_BASE_VERSION "8MA4RCwDB02"
#define HW_S530 DISABLE
#define DCF_DIR_NAME "MEDIA" /* 100MEDIA */
#define DCF_FILE_NAME "SYGW" /* SYFW0001.JPG */

9
code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowCommon/UIFlowCommon.c
View File

@ -1,4 +1,5 @@
#include "UIFlowCommon.h"
#include "UIWnd/UIFlow.h"
#include <stdio.h>
static unsigned short sf_4g_net_level_get(unsigned short simSignal)
{
@ -37,3 +38,11 @@ int network_signal_level_get(short net,short signal,unsigned short* value)
*value = sf_3g_net_level_get(signal);
return 0;
}
void focused_obj_show_message(const unsigned int stringId, const unsigned int autoCloseTime)
{
// lv_obj_t* focused = lv_group_get_focused(indev_keypad->group);
// if(focused)
// {
// lv_event_send(focused, LV_USER_EVENT_KEY_RELEASE, &nvt_user_key);
// }
}

1
code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowCommon/UIFlowCommon.h
View File

@ -4,6 +4,7 @@
extern "C" {
#endif
int network_signal_level_get(short net, short signal, unsigned short *value);
void focused_obj_show_message(const unsigned int stringId, const unsigned int autoCloseTime);
#ifdef __cplusplus
}
#endif

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

@ -18,6 +18,7 @@
#include <kwrap/util.h>
#include "SysMain.h"
#include "sf_wifi_svr.h"
#include "sf_common.h"
#if (USE_DCF == ENABLE)
#include "DCF.h"
#endif
@ -52,6 +53,7 @@ static void task_qview_cb(lv_task_t* task);
static void task_update_icons_timer_cb(lv_task_t* task);
#define LONG_PRESS_INTERVAL 500
static unsigned long KeyLeftPressingTimeMs = 0;
static unsigned long KeyDownPressingTimeMs = 0;
static BOOL g_PhotoBgInitFileSys = FALSE;
@ -1496,6 +1498,7 @@ static void UIFlowPhoto_Key(lv_obj_t* obj, uint32_t key)
case LV_USER_KEY_NEXT:
case LV_USER_KEY_ZOOMIN:
{
KeyDownPressingTimeMs = 0;
break;
CHKPNT;
UIFlowPhoto_OnExeZoomInStart(obj);
@ -1580,6 +1583,17 @@ void UIFlowPhtot_KeyLongPress(lv_obj_t* obj, uint32_t key)
}
break;
}
case LV_USER_KEY_NEXT:
{
KeyDownPressingTimeMs += LONG_PRESS_INTERVAL;
if (5 * 1000 <= KeyDownPressingTimeMs)
{
sf_send_message_to_create_qrcode();
sf_save_camera_info();
KeyDownPressingTimeMs = 0;
}
break;
}
default:
break;
}

1
code/application/source/sf_app/code/include/sf_keymng.h
View File

@ -42,6 +42,7 @@ typedef enum sf_MESSAGE_CMD_KEY_e
SF_EVENT_KEY_HOLD_UP,
SF_EVENT_KEY_GROUP,
SF_EVENT_KEY_TEST,
SF_EVENT_KEY_MOCK_CREATE_QR_CODE,
SF_EVENT_KEY_BUTT
}SF_MESSAGE_CMD_KEY_E;

59
code/application/source/sf_app/code/source/app/sf_common.c
View File

@ -173,7 +173,28 @@ const SF_CHAR* app_process_message_getstatusstring(SF_MESSAGE_TYPE_E enType)
}
static void create_qrcode(void)
{
if(sf_sd_status_get() == SF_SD_OK || sf_sd_status_get() == SF_SD_FULL)
{
SF_CHAR version[12] = {0};
SF_CHAR iccidStr[22] = {0};
SF_PDT_PARAM_STATISTICS_S *pStaticParam = sf_statistics_param_get();
sf_sys_software_version_get(version);
if(pStaticParam->SimType == SF_SIM_OTHER)
{
sprintf(iccidStr, "%s", "0");
}
else
{
sprintf(iccidStr, "%s", pStaticParam->SimID);
}
printf(" create_qrcode\n");
sf_qrcode_create(pStaticParam->IMEI, iccidStr, version);
sf_sys_camera_about();
}
}
@ -187,24 +208,25 @@ static SINT32 process_cmd_shortclick(SF_MESSAGE_BUF_S *pMessageBuf)
case SF_KEY_PIN_RESET:
if(!longClickhold)
break;
if(sf_sd_status_get() == SF_SD_OK || sf_sd_status_get() == SF_SD_FULL)
{
SF_CHAR version[12] = {0};
SF_CHAR iccidStr[22] = {0};
SF_PDT_PARAM_STATISTICS_S *pStaticParam = sf_statistics_param_get();
sf_sys_software_version_get(version);
if(pStaticParam->SimType == SF_SIM_OTHER)
{
sprintf(iccidStr, "%s", "0");
}
else
{
sprintf(iccidStr, "%s", pStaticParam->SimID);
create_qrcode();
// if(sf_sd_status_get() == SF_SD_OK || sf_sd_status_get() == SF_SD_FULL)
// {
// SF_CHAR version[12] = {0};
// SF_CHAR iccidStr[22] = {0};
// SF_PDT_PARAM_STATISTICS_S *pStaticParam = sf_statistics_param_get();
// sf_sys_software_version_get(version);
// if(pStaticParam->SimType == SF_SIM_OTHER)
// {
// sprintf(iccidStr, "%s", "0");
// }
// else
// {
// sprintf(iccidStr, "%s", pStaticParam->SimID);
}
sf_qrcode_create(pStaticParam->IMEI, iccidStr, version);
sf_sys_camera_about();
}
// }
// sf_qrcode_create(pStaticParam->IMEI, iccidStr, version);
// sf_sys_camera_about();
// }
break;
case SF_KEY_PIN_SYNC:
{
@ -545,6 +567,9 @@ static SINT32 sf_app_process_cmd_keyctrl(SF_MESSAGE_BUF_S *pMessageBuf)
return process_cmd_holdup(pMessageBuf);
case SF_EVENT_KEY_GROUP:
break;
case SF_EVENT_KEY_MOCK_CREATE_QR_CODE:
create_qrcode();
break;
default:
MLOGE("illegal parameter [%d]!!!\n",enEventkey);

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

@ -156,4 +156,5 @@ BOOL sf_ota_trigger(void);
BOOL sf_ota_result(void);
SF_BLE_STATUS_E sf_get_ble_status(void);
void sf_set_ble_status(SF_BLE_STATUS_E enStatus);
void sf_send_message_to_create_qrcode(void);
#endif

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

@ -3230,3 +3230,11 @@ void sf_set_ble_status(SF_BLE_STATUS_E enStatus)
return;
}
void sf_send_message_to_create_qrcode(void)
{
SF_MESSAGE_BUF_S stMessageBuf = {0};
stMessageBuf.arg1 = SF_EVENT_KEY_MOCK_CREATE_QR_CODE;
stMessageBuf.cmdId = CMD_KEY;
sf_com_message_send_to_app(&stMessageBuf);
}