回放界面重叠问题, loop异常, 拍照0还能拍照问题
This commit is contained in:
parent
718af0e9ea
commit
f85b8ebec1
|
@ -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
|
||||||
|
|
|
@ -774,6 +774,10 @@ UINT32 PhotoExe_GetFreePicNum(void)
|
||||||
freeImgNum = 0;
|
freeImgNum = 0;
|
||||||
} else {
|
} else {
|
||||||
freeImgNum = (uiFreeSpace - reserveSize) / CaptureSize;
|
freeImgNum = (uiFreeSpace - reserveSize) / CaptureSize;
|
||||||
|
if(freeImgNum == 0)
|
||||||
|
{
|
||||||
|
freeImgNum = 1;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
//DBG_IND("[cap]Free ImgNum = %d\r\n", freeImgNum);
|
//DBG_IND("[cap]Free ImgNum = %d\r\n", freeImgNum);
|
||||||
|
|
Binary file not shown.
|
@ -783,6 +783,9 @@ LV_PLUG_RET lv_plugin_scr_close(lv_obj_t* scr, const void * data)
|
||||||
if(_lv_plugin_scr_is_attached(scr) == false)
|
if(_lv_plugin_scr_is_attached(scr) == false)
|
||||||
return LV_PLUG_SUCCESS;
|
return LV_PLUG_SUCCESS;
|
||||||
|
|
||||||
|
/* avoid recursively close */
|
||||||
|
if(lv_plugin_scr_is_ready_to_be_closed(scr))
|
||||||
|
return LV_PLUG_SUCCESS;
|
||||||
|
|
||||||
/* add all screens ready to be closed LV_STATE_DISABLED */
|
/* add all screens ready to be closed LV_STATE_DISABLED */
|
||||||
child = NULL;
|
child = NULL;
|
||||||
|
@ -793,7 +796,7 @@ LV_PLUG_RET lv_plugin_scr_close(lv_obj_t* scr, const void * data)
|
||||||
do
|
do
|
||||||
{
|
{
|
||||||
next_child = lv_obj_get_child(inter_param->root_scr, child);
|
next_child = lv_obj_get_child(inter_param->root_scr, child);
|
||||||
lv_obj_add_state(scr, LV_STATE_DISABLED);
|
lv_obj_add_state(child, LV_STATE_DISABLED);
|
||||||
|
|
||||||
if(NULL == next_child)
|
if(NULL == next_child)
|
||||||
break;
|
break;
|
||||||
|
|
|
@ -8,6 +8,9 @@ extern "C" {
|
||||||
|
|
||||||
#include "lvgl/lvgl.h"
|
#include "lvgl/lvgl.h"
|
||||||
|
|
||||||
|
#define LV_PLUGIN_VERSION_MAJOR 1
|
||||||
|
#define LV_PLUGIN_VERSION_MINOR 1
|
||||||
|
#define LV_PLUGIN_VERSION_PATCH 0
|
||||||
|
|
||||||
#define LV_PLUGIN_RES_ID_NONE 0
|
#define LV_PLUGIN_RES_ID_NONE 0
|
||||||
#define LV_PLUGIN_RES_ID_MAX (UINT16_MAX)
|
#define LV_PLUGIN_RES_ID_MAX (UINT16_MAX)
|
||||||
|
@ -74,6 +77,257 @@ typedef enum {
|
||||||
LV_PLUGIN_LANGUAGE_FONT_TYPE_2,
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_2,
|
||||||
LV_PLUGIN_LANGUAGE_FONT_TYPE_3,
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_3,
|
||||||
LV_PLUGIN_LANGUAGE_FONT_TYPE_4,
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_4,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_5,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_6,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_7,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_8,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_9,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_10,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_11,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_12,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_13,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_14,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_15,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_16,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_17,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_18,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_19,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_20,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_21,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_22,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_23,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_24,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_25,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_26,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_27,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_28,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_29,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_30,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_31,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_32,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_33,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_34,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_35,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_36,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_37,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_38,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_39,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_40,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_41,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_42,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_43,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_44,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_45,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_46,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_47,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_48,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_49,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_50,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_51,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_52,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_53,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_54,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_55,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_56,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_57,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_58,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_59,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_60,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_61,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_62,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_63,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_64,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_65,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_66,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_67,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_68,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_69,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_70,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_71,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_72,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_73,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_74,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_75,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_76,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_77,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_78,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_79,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_80,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_81,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_82,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_83,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_84,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_85,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_86,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_87,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_88,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_89,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_90,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_91,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_92,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_93,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_94,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_95,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_96,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_97,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_98,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_99,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_100,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_101,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_102,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_103,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_104,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_105,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_106,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_107,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_108,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_109,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_110,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_111,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_112,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_113,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_114,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_115,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_116,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_117,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_118,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_119,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_120,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_121,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_122,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_123,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_124,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_125,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_126,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_127,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_128,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_129,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_130,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_131,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_132,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_133,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_134,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_135,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_136,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_137,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_138,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_139,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_140,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_141,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_142,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_143,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_144,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_145,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_146,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_147,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_148,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_149,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_150,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_151,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_152,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_153,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_154,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_155,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_156,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_157,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_158,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_159,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_160,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_161,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_162,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_163,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_164,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_165,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_166,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_167,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_168,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_169,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_170,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_171,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_172,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_173,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_174,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_175,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_176,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_177,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_178,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_179,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_180,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_181,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_182,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_183,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_184,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_185,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_186,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_187,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_188,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_189,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_190,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_191,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_192,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_193,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_194,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_195,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_196,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_197,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_198,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_199,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_200,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_201,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_202,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_203,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_204,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_205,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_206,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_207,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_208,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_209,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_210,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_211,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_212,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_213,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_214,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_215,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_216,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_217,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_218,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_219,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_220,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_221,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_222,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_223,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_224,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_225,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_226,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_227,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_228,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_229,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_230,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_231,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_232,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_233,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_234,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_235,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_236,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_237,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_238,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_239,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_240,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_241,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_242,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_243,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_244,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_245,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_246,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_247,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_248,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_249,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_250,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_251,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_252,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_253,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_254,
|
||||||
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_255,
|
||||||
LV_PLUGIN_LANGUAGE_FONT_TYPE_NUM
|
LV_PLUGIN_LANGUAGE_FONT_TYPE_NUM
|
||||||
} LV_PLUGIN_LANGUAGE_FONT_TYPE;
|
} LV_PLUGIN_LANGUAGE_FONT_TYPE;
|
||||||
|
|
||||||
|
|
|
@ -7137,6 +7137,7 @@
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
|
"max font type": 5,
|
||||||
"string id": [
|
"string id": [
|
||||||
"STRID_NULL_",
|
"STRID_NULL_",
|
||||||
"STRID_MODE",
|
"STRID_MODE",
|
||||||
|
|
|
@ -5076,7 +5076,7 @@
|
||||||
"language table": "UIFlowLVGL.lvgllang",
|
"language table": "UIFlowLVGL.lvgllang",
|
||||||
"project": {
|
"project": {
|
||||||
"name": "UIFlowLVGL",
|
"name": "UIFlowLVGL",
|
||||||
"version": "1.10.4"
|
"version": "1.12.4"
|
||||||
},
|
},
|
||||||
"screens": [
|
"screens": [
|
||||||
"UIFlowLVGL.UIFlowMovie.lvglscr",
|
"UIFlowLVGL.UIFlowMovie.lvglscr",
|
||||||
|
|
|
@ -1373,9 +1373,6 @@ static void UIFlowPlay_ScrOpen(lv_obj_t* obj)
|
||||||
/* open all files */
|
/* open all files */
|
||||||
UIFlowPlay_OpenFile(obj);
|
UIFlowPlay_OpenFile(obj);
|
||||||
|
|
||||||
#if HUNTING_CAMERA_MCU == ENABLE
|
|
||||||
sf_set_menu_open(TRUE);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -2698,6 +2698,7 @@ SINT32 sf_power_off_check_sd(void)
|
||||||
{
|
{
|
||||||
if((storeattrs.SDStatus == 0) & (storeattrs.SDFree < SDLOOP_REMAIN_SPACE) && (SDstoreattrs.SDFree < 30))
|
if((storeattrs.SDStatus == 0) & (storeattrs.SDFree < SDLOOP_REMAIN_SPACE) && (SDstoreattrs.SDFree < 30))
|
||||||
{
|
{
|
||||||
|
printf("[%s:%d]loop start\n", __FUNCTION__, __LINE__);
|
||||||
// sf_sd_loopremove(SF_DCIM_DIR);
|
// sf_sd_loopremove(SF_DCIM_DIR);
|
||||||
sf_app_sd_loop();
|
sf_app_sd_loop();
|
||||||
/*check disk free size*/
|
/*check disk free size*/
|
||||||
|
|
|
@ -704,6 +704,16 @@ SINT32 sf_dcf_is_file_name(const char fileName[])
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//S550
|
||||||
|
if((fileName[0]!='S')
|
||||||
|
|| (fileName[1]!='Y')
|
||||||
|
|| (fileName[2]!='B')
|
||||||
|
|| (fileName[3]!='X')
|
||||||
|
)
|
||||||
|
{
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
for(; index < 8; index++)
|
for(; index < 8; index++)
|
||||||
{
|
{
|
||||||
if(!isdigit(fileName[index]))
|
if(!isdigit(fileName[index]))
|
||||||
|
|
Loading…
Reference in New Issue
Block a user