Fixed bug number 9517.
This commit is contained in:
parent
d22539c5a3
commit
aa2e833ea3
|
@ -922,7 +922,7 @@
|
||||||
#define HUNTING_MCU_UART ENABLE
|
#define HUNTING_MCU_UART ENABLE
|
||||||
#define HUNTING_IR_LED_940 ENABLE
|
#define HUNTING_IR_LED_940 ENABLE
|
||||||
#define SF_EXIF_MN_BUF_SIZE 256
|
#define SF_EXIF_MN_BUF_SIZE 256
|
||||||
#define SF_BASE_VERSION "8MA4RCwDA01"
|
#define SF_BASE_VERSION "8MA4RCwDB02"
|
||||||
#define HW_S530 DISABLE
|
#define HW_S530 DISABLE
|
||||||
#define DCF_DIR_NAME "MEDIA" /* 100MEDIA */
|
#define DCF_DIR_NAME "MEDIA" /* 100MEDIA */
|
||||||
#define DCF_FILE_NAME "SYGW" /* SYFW0001.JPG */
|
#define DCF_FILE_NAME "SYGW" /* SYFW0001.JPG */
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
#include "UIFlowCommon.h"
|
#include "UIFlowCommon.h"
|
||||||
|
#include "UIWnd/UIFlow.h"
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
static unsigned short sf_4g_net_level_get(unsigned short simSignal)
|
static unsigned short sf_4g_net_level_get(unsigned short simSignal)
|
||||||
{
|
{
|
||||||
|
@ -36,4 +37,12 @@ int network_signal_level_get(short net,short signal,unsigned short* value)
|
||||||
else
|
else
|
||||||
*value = sf_3g_net_level_get(signal);
|
*value = sf_3g_net_level_get(signal);
|
||||||
return 0;
|
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);
|
||||||
|
// }
|
||||||
}
|
}
|
|
@ -4,6 +4,7 @@
|
||||||
extern "C" {
|
extern "C" {
|
||||||
#endif
|
#endif
|
||||||
int network_signal_level_get(short net, short signal, unsigned short *value);
|
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
|
#ifdef __cplusplus
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -18,6 +18,7 @@
|
||||||
#include <kwrap/util.h>
|
#include <kwrap/util.h>
|
||||||
#include "SysMain.h"
|
#include "SysMain.h"
|
||||||
#include "sf_wifi_svr.h"
|
#include "sf_wifi_svr.h"
|
||||||
|
#include "sf_common.h"
|
||||||
#if (USE_DCF == ENABLE)
|
#if (USE_DCF == ENABLE)
|
||||||
#include "DCF.h"
|
#include "DCF.h"
|
||||||
#endif
|
#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);
|
static void task_update_icons_timer_cb(lv_task_t* task);
|
||||||
#define LONG_PRESS_INTERVAL 500
|
#define LONG_PRESS_INTERVAL 500
|
||||||
static unsigned long KeyLeftPressingTimeMs = 0;
|
static unsigned long KeyLeftPressingTimeMs = 0;
|
||||||
|
static unsigned long KeyDownPressingTimeMs = 0;
|
||||||
|
|
||||||
static BOOL g_PhotoBgInitFileSys = FALSE;
|
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_NEXT:
|
||||||
case LV_USER_KEY_ZOOMIN:
|
case LV_USER_KEY_ZOOMIN:
|
||||||
{
|
{
|
||||||
|
KeyDownPressingTimeMs = 0;
|
||||||
break;
|
break;
|
||||||
CHKPNT;
|
CHKPNT;
|
||||||
UIFlowPhoto_OnExeZoomInStart(obj);
|
UIFlowPhoto_OnExeZoomInStart(obj);
|
||||||
|
@ -1580,6 +1583,17 @@ void UIFlowPhtot_KeyLongPress(lv_obj_t* obj, uint32_t key)
|
||||||
}
|
}
|
||||||
break;
|
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:
|
default:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
|
@ -42,6 +42,7 @@ typedef enum sf_MESSAGE_CMD_KEY_e
|
||||||
SF_EVENT_KEY_HOLD_UP,
|
SF_EVENT_KEY_HOLD_UP,
|
||||||
SF_EVENT_KEY_GROUP,
|
SF_EVENT_KEY_GROUP,
|
||||||
SF_EVENT_KEY_TEST,
|
SF_EVENT_KEY_TEST,
|
||||||
|
SF_EVENT_KEY_MOCK_CREATE_QR_CODE,
|
||||||
SF_EVENT_KEY_BUTT
|
SF_EVENT_KEY_BUTT
|
||||||
}SF_MESSAGE_CMD_KEY_E;
|
}SF_MESSAGE_CMD_KEY_E;
|
||||||
|
|
||||||
|
|
|
@ -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:
|
case SF_KEY_PIN_RESET:
|
||||||
if(!longClickhold)
|
if(!longClickhold)
|
||||||
break;
|
break;
|
||||||
if(sf_sd_status_get() == SF_SD_OK || sf_sd_status_get() == SF_SD_FULL)
|
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_CHAR version[12] = {0};
|
||||||
SF_PDT_PARAM_STATISTICS_S *pStaticParam = sf_statistics_param_get();
|
// SF_CHAR iccidStr[22] = {0};
|
||||||
sf_sys_software_version_get(version);
|
// SF_PDT_PARAM_STATISTICS_S *pStaticParam = sf_statistics_param_get();
|
||||||
if(pStaticParam->SimType == SF_SIM_OTHER)
|
// sf_sys_software_version_get(version);
|
||||||
{
|
// if(pStaticParam->SimType == SF_SIM_OTHER)
|
||||||
sprintf(iccidStr, "%s", "0");
|
// {
|
||||||
}
|
// sprintf(iccidStr, "%s", "0");
|
||||||
else
|
// }
|
||||||
{
|
// else
|
||||||
sprintf(iccidStr, "%s", pStaticParam->SimID);
|
// {
|
||||||
|
// sprintf(iccidStr, "%s", pStaticParam->SimID);
|
||||||
|
|
||||||
}
|
// }
|
||||||
sf_qrcode_create(pStaticParam->IMEI, iccidStr, version);
|
// sf_qrcode_create(pStaticParam->IMEI, iccidStr, version);
|
||||||
sf_sys_camera_about();
|
// sf_sys_camera_about();
|
||||||
}
|
// }
|
||||||
break;
|
break;
|
||||||
case SF_KEY_PIN_SYNC:
|
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);
|
return process_cmd_holdup(pMessageBuf);
|
||||||
case SF_EVENT_KEY_GROUP:
|
case SF_EVENT_KEY_GROUP:
|
||||||
|
|
||||||
|
break;
|
||||||
|
case SF_EVENT_KEY_MOCK_CREATE_QR_CODE:
|
||||||
|
create_qrcode();
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
MLOGE("illegal parameter [%d]!!!\n",enEventkey);
|
MLOGE("illegal parameter [%d]!!!\n",enEventkey);
|
||||||
|
|
|
@ -156,4 +156,5 @@ BOOL sf_ota_trigger(void);
|
||||||
BOOL sf_ota_result(void);
|
BOOL sf_ota_result(void);
|
||||||
SF_BLE_STATUS_E sf_get_ble_status(void);
|
SF_BLE_STATUS_E sf_get_ble_status(void);
|
||||||
void sf_set_ble_status(SF_BLE_STATUS_E enStatus);
|
void sf_set_ble_status(SF_BLE_STATUS_E enStatus);
|
||||||
|
void sf_send_message_to_create_qrcode(void);
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -3229,4 +3229,12 @@ void sf_set_ble_status(SF_BLE_STATUS_E enStatus)
|
||||||
SLOGE("Type format error\n");
|
SLOGE("Type format error\n");
|
||||||
return;
|
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);
|
||||||
}
|
}
|
Loading…
Reference in New Issue
Block a user