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

bug:9796 电池界面锂电池跳转其他选项变灰

Browse Source
This commit is contained in:
xiehongyan 2023-12-22 19:24:13 +08:00
parent b1d2650475
commit 6d386153ab
11 changed files with 296 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build_all.sh
View File

@ -1,7 +1,7 @@
#!/bin/bash
#用于gitlab-ci.yml编译使用
#make app_clean
make app_clean
echo "Start compile."
export ROOT_PATH=$PWD
@ -9,7 +9,7 @@ export ROOT_PATH=$PWD
cd rtos
source build/envsetup.sh
lunch rtos cfg_565_HUNTING_EVB_LINUX_4G_S550 gcc-6.5-newlib-2.4-2019.11-arm-ca9-eabihf
#make clean
make clean
make all > /dev/null
cp output/application.bin ../
cp output/rtos-main.bin ../
@ -18,7 +18,7 @@ cp output/rtos-main.bin ../
cd $ROOT_PATH
source build/envsetup.sh
lunch Linux cfg_565_HUNTING_EVB_LINUX_4G_S550 arm-ca9-linux-uclibcgnueabihf-8.4.01
#make clean
make clean
make all > /dev/null
cd $ROOT_PATH

2
code/application/source/cardv/SrcCode/System/SysMain.c
View File

@ -599,12 +599,14 @@ void UserMainProc(void)
switch((uint32_t)lv_user_keymap_find(evt)){
case LV_KEY_DOWN:
case LV_KEY_NEXT:
case 134:
{
printf("[Key]>>>DOWN\n");
break;
}
case LV_KEY_UP:
case LV_KEY_PREV:
case 133:
{
printf("[Key]>>>UP\n");
break;

BIN
code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM.rar Normal file
View File

Binary file not shown.

45
code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL.UIFlowMenuCommonOption.lvglscr
View File

@ -20,7 +20,7 @@
"font type": "Font_Type1",
"geometry": {
"height": 22,
"width": 81,
"width": 0,
"x": 10,
"y": 10
},
@ -29,7 +29,7 @@
"long mode": "Expand",
"name": "label_option1",
"recolor": false,
"string id": "None",
"string id": "STRID_NULL_",
"styles": [
{
"Text": {
@ -68,11 +68,14 @@
"state": 5
},
{
"Text": {
"text_color": "0x575757"
},
"part": 0,
"state": 6
}
],
"text": "1080P30",
"text": "",
"widget": "Label"
},
{
@ -199,7 +202,7 @@
"font type": "Font_Type1",
"geometry": {
"height": 22,
"width": 81,
"width": 0,
"x": 10,
"y": 10
},
@ -208,7 +211,7 @@
"long mode": "Expand",
"name": "label_option2",
"recolor": false,
"string id": "None",
"string id": "STRID_NULL_",
"styles": [
{
"Text": {
@ -244,11 +247,14 @@
"state": 5
},
{
"Text": {
"text_color": "0x575757"
},
"part": 0,
"state": 6
}
],
"text": "1080P30",
"text": "",
"widget": "Label"
},
{
@ -375,7 +381,7 @@
"font type": "Font_Type1",
"geometry": {
"height": 22,
"width": 81,
"width": 0,
"x": 10,
"y": 10
},
@ -384,7 +390,7 @@
"long mode": "Expand",
"name": "label_option3",
"recolor": false,
"string id": "None",
"string id": "STRID_NULL_",
"styles": [
{
"Text": {
@ -420,11 +426,14 @@
"state": 5
},
{
"Text": {
"text_color": "0x575757"
},
"part": 0,
"state": 6
}
],
"text": "1080P30",
"text": "",
"widget": "Label"
},
{
@ -551,7 +560,7 @@
"font type": "Font_Type1",
"geometry": {
"height": 22,
"width": 81,
"width": 0,
"x": 10,
"y": 10
},
@ -560,7 +569,7 @@
"long mode": "Expand",
"name": "label_option4",
"recolor": false,
"string id": "None",
"string id": "STRID_NULL_",
"styles": [
{
"Text": {
@ -596,11 +605,14 @@
"state": 5
},
{
"Text": {
"text_color": "0x575757"
},
"part": 0,
"state": 6
}
],
"text": "1080P30",
"text": "",
"widget": "Label"
},
{
@ -727,7 +739,7 @@
"font type": "Font_Type1",
"geometry": {
"height": 22,
"width": 81,
"width": 0,
"x": 10,
"y": 10
},
@ -736,7 +748,7 @@
"long mode": "Expand",
"name": "label_option5",
"recolor": false,
"string id": "None",
"string id": "STRID_NULL_",
"styles": [
{
"Text": {
@ -772,11 +784,14 @@
"state": 5
},
{
"Text": {
"text_color": "0x575757"
},
"part": 0,
"state": 6
}
],
"text": "1080P30",
"text": "",
"widget": "Label"
},
{

30
code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonOption/UIFlowMenuCommonOption.c
View File

@ -256,7 +256,7 @@ lv_obj_t* UIFlowMenuCommonOption_create(){
STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_option1_s0, LV_STATE_DISABLED, color);
STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_option1_s0, LV_STATE_DISABLED, color);
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_option1_s0, LV_STATE_DISABLED, color);
STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_option1_s0, LV_STATE_DISABLED, color);
STYLE_COLOR_PROP(0xd5, 0x57, 0x57, 0x57) ; lv_style_set_text_color(&label_option1_s0, LV_STATE_DISABLED, color);
STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_option1_s0, LV_STATE_DISABLED, color);
STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_option1_s0, LV_STATE_DISABLED, color);
lv_obj_t *label_option1 = lv_label_create(image_button_option_1, NULL);
@ -264,11 +264,11 @@ lv_obj_t* UIFlowMenuCommonOption_create(){
lv_obj_set_click(label_option1, false);
lv_obj_set_drag(label_option1, false);
lv_plugin_label_allocate_ext_attr(label_option1);
lv_label_set_text(label_option1,"1080P30");
lv_plugin_label_set_text(label_option1, LV_PLUGIN_STRING_ID_STRID_NULL_);
lv_plugin_label_allocate_ext_attr(label_option1);
lv_plugin_label_set_font_type(label_option1, LV_PLUGIN_LANGUAGE_FONT_TYPE_1);
lv_obj_set_pos(label_option1, 10, 10);
lv_obj_set_size(label_option1, 81, 22);
lv_obj_set_size(label_option1, 0, 22);
lv_obj_add_style(label_option1, 0, &label_option1_s0);
label_option1_scr_uiflowmenucommonoption = label_option1;
@ -419,7 +419,7 @@ lv_obj_t* UIFlowMenuCommonOption_create(){
STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_option2_s0, LV_STATE_DISABLED, color);
STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_option2_s0, LV_STATE_DISABLED, color);
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_option2_s0, LV_STATE_DISABLED, color);
STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_option2_s0, LV_STATE_DISABLED, color);
STYLE_COLOR_PROP(0xd5, 0x57, 0x57, 0x57) ; lv_style_set_text_color(&label_option2_s0, LV_STATE_DISABLED, color);
STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_option2_s0, LV_STATE_DISABLED, color);
STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_option2_s0, LV_STATE_DISABLED, color);
lv_obj_t *label_option2 = lv_label_create(image_button_option_2, NULL);
@ -427,11 +427,11 @@ lv_obj_t* UIFlowMenuCommonOption_create(){
lv_obj_set_click(label_option2, false);
lv_obj_set_drag(label_option2, false);
lv_plugin_label_allocate_ext_attr(label_option2);
lv_label_set_text(label_option2,"1080P30");
lv_plugin_label_set_text(label_option2, LV_PLUGIN_STRING_ID_STRID_NULL_);
lv_plugin_label_allocate_ext_attr(label_option2);
lv_plugin_label_set_font_type(label_option2, LV_PLUGIN_LANGUAGE_FONT_TYPE_1);
lv_obj_set_pos(label_option2, 10, 10);
lv_obj_set_size(label_option2, 81, 22);
lv_obj_set_size(label_option2, 0, 22);
lv_obj_add_style(label_option2, 0, &label_option2_s0);
label_option2_scr_uiflowmenucommonoption = label_option2;
@ -582,7 +582,7 @@ lv_obj_t* UIFlowMenuCommonOption_create(){
STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_option3_s0, LV_STATE_DISABLED, color);
STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_option3_s0, LV_STATE_DISABLED, color);
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_option3_s0, LV_STATE_DISABLED, color);
STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_option3_s0, LV_STATE_DISABLED, color);
STYLE_COLOR_PROP(0xd5, 0x57, 0x57, 0x57) ; lv_style_set_text_color(&label_option3_s0, LV_STATE_DISABLED, color);
STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_option3_s0, LV_STATE_DISABLED, color);
STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_option3_s0, LV_STATE_DISABLED, color);
lv_obj_t *label_option3 = lv_label_create(image_button_option_3, NULL);
@ -590,11 +590,11 @@ lv_obj_t* UIFlowMenuCommonOption_create(){
lv_obj_set_click(label_option3, false);
lv_obj_set_drag(label_option3, false);
lv_plugin_label_allocate_ext_attr(label_option3);
lv_label_set_text(label_option3,"1080P30");
lv_plugin_label_set_text(label_option3, LV_PLUGIN_STRING_ID_STRID_NULL_);
lv_plugin_label_allocate_ext_attr(label_option3);
lv_plugin_label_set_font_type(label_option3, LV_PLUGIN_LANGUAGE_FONT_TYPE_1);
lv_obj_set_pos(label_option3, 10, 10);
lv_obj_set_size(label_option3, 81, 22);
lv_obj_set_size(label_option3, 0, 22);
lv_obj_add_style(label_option3, 0, &label_option3_s0);
label_option3_scr_uiflowmenucommonoption = label_option3;
@ -745,7 +745,7 @@ lv_obj_t* UIFlowMenuCommonOption_create(){
STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_option4_s0, LV_STATE_DISABLED, color);
STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_option4_s0, LV_STATE_DISABLED, color);
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_option4_s0, LV_STATE_DISABLED, color);
STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_option4_s0, LV_STATE_DISABLED, color);
STYLE_COLOR_PROP(0xd5, 0x57, 0x57, 0x57) ; lv_style_set_text_color(&label_option4_s0, LV_STATE_DISABLED, color);
STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_option4_s0, LV_STATE_DISABLED, color);
STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_option4_s0, LV_STATE_DISABLED, color);
lv_obj_t *label_option4 = lv_label_create(image_button_option_4, NULL);
@ -753,11 +753,11 @@ lv_obj_t* UIFlowMenuCommonOption_create(){
lv_obj_set_click(label_option4, false);
lv_obj_set_drag(label_option4, false);
lv_plugin_label_allocate_ext_attr(label_option4);
lv_label_set_text(label_option4,"1080P30");
lv_plugin_label_set_text(label_option4, LV_PLUGIN_STRING_ID_STRID_NULL_);
lv_plugin_label_allocate_ext_attr(label_option4);
lv_plugin_label_set_font_type(label_option4, LV_PLUGIN_LANGUAGE_FONT_TYPE_1);
lv_obj_set_pos(label_option4, 10, 10);
lv_obj_set_size(label_option4, 81, 22);
lv_obj_set_size(label_option4, 0, 22);
lv_obj_add_style(label_option4, 0, &label_option4_s0);
label_option4_scr_uiflowmenucommonoption = label_option4;
@ -908,7 +908,7 @@ lv_obj_t* UIFlowMenuCommonOption_create(){
STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_option5_s0, LV_STATE_DISABLED, color);
STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_option5_s0, LV_STATE_DISABLED, color);
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_option5_s0, LV_STATE_DISABLED, color);
STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_option5_s0, LV_STATE_DISABLED, color);
STYLE_COLOR_PROP(0xd5, 0x57, 0x57, 0x57) ; lv_style_set_text_color(&label_option5_s0, LV_STATE_DISABLED, color);
STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_option5_s0, LV_STATE_DISABLED, color);
STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_option5_s0, LV_STATE_DISABLED, color);
lv_obj_t *label_option5 = lv_label_create(image_button_option_5, NULL);
@ -916,11 +916,11 @@ lv_obj_t* UIFlowMenuCommonOption_create(){
lv_obj_set_click(label_option5, false);
lv_obj_set_drag(label_option5, false);
lv_plugin_label_allocate_ext_attr(label_option5);
lv_label_set_text(label_option5,"1080P30");
lv_plugin_label_set_text(label_option5, LV_PLUGIN_STRING_ID_STRID_NULL_);
lv_plugin_label_allocate_ext_attr(label_option5);
lv_plugin_label_set_font_type(label_option5, LV_PLUGIN_LANGUAGE_FONT_TYPE_1);
lv_obj_set_pos(label_option5, 10, 10);
lv_obj_set_size(label_option5, 81, 22);
lv_obj_set_size(label_option5, 0, 22);
lv_obj_add_style(label_option5, 0, &label_option5_s0);
label_option5_scr_uiflowmenucommonoption = label_option5;

230
code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonOption/UIFlowMenuCommonOptionEventCallback.c
View File

@ -222,7 +222,7 @@ static void LV_MenuCommonOption_UpdateContent(TM_MENU *pMenu)
UINT32 Selindex = 0;
BOOL ui_hidden = true;
#endif
UIMenuStoreInfo *puiPara = sf_ui_para_get();
pPage = &pMenu->pPages[pMenu->SelPage];
pItem = &pPage->pItems[pPage->SelItem];
#if 0
@ -359,8 +359,8 @@ static void LV_MenuCommonOption_UpdateContent(TM_MENU *pMenu)
ui_hidden = true;
printf("\033[33m[LV_MenuCommonOption_UpdateContent] 3 \033[0m\n");
lv_plugin_menu_set_item_string_id(menu_option, i, LV_PLUGIN_MENU_ITEM_VISIBLE_STATE_NUM, pOption->TextId);
printf("s_SelOption: %d\n", s_SelOption);
printf("[LV_MenuCommonOption_UpdateContent]s_SelOption: %d\n", s_SelOption);
//first init page add select icon
if (s_SelOption == 100){
if (enableIndex[i+(Selindex * OPTION_PAGE_NUM)] == SelOption)
@ -376,12 +376,12 @@ static void LV_MenuCommonOption_UpdateContent(TM_MENU *pMenu)
{
if (i == 1)
{
printf("first init black > √\n");
printf("[LV_MenuCommonOption_UpdateContent]first init black > √\n");
itemIconId = LV_PLUGIN_IMG_ID_SF_LIST_SELECTED_NEXT2;//black > √
lv_obj_set_pos(image_option2_scr_uiflowmenucommonoption, 259, 0);
}
else{
printf("first init √\n");
printf("[LV_MenuCommonOption_UpdateContent]first init √\n");
itemIconId = LV_PLUGIN_IMG_ID_SF_LIST_SELECTED;//√
lv_obj_set_pos(image_option2_scr_uiflowmenucommonoption, 272, 0);
}
@ -390,19 +390,19 @@ static void LV_MenuCommonOption_UpdateContent(TM_MENU *pMenu)
case IDM_SEND_TYPE:{
if(i == 1)
{
printf("first init IDM_SEND_TYPE black > √\n");
printf("[LV_MenuCommonOption_UpdateContent]first init IDM_SEND_TYPE black > √\n");
itemIconId = LV_PLUGIN_IMG_ID_SF_LIST_SELECTED_NEXT2;//black > √
lv_obj_set_pos(image_option2_scr_uiflowmenucommonoption, 259, 0);
}
else if (i == 2)
{
printf("first init IDM_SEND_TYPE black > √\n");
printf("[LV_MenuCommonOption_UpdateContent]first init IDM_SEND_TYPE black > √\n");
itemIconId = LV_PLUGIN_IMG_ID_SF_LIST_SELECTED_NEXT2;//black > √
lv_obj_set_pos(image_option3_scr_uiflowmenucommonoption, 259, 0);
}
else if (i == 3)
{
printf("first init IDM_SEND_TYPE black > √\n");
printf("[LV_MenuCommonOption_UpdateContent]first init IDM_SEND_TYPE black > √\n");
itemIconId = LV_PLUGIN_IMG_ID_SF_LIST_SELECTED_NEXT2;//black > √
lv_obj_set_pos(image_option4_scr_uiflowmenucommonoption, 259, 0);
}
@ -431,7 +431,7 @@ static void LV_MenuCommonOption_UpdateContent(TM_MENU *pMenu)
}
else if (enableIndex[i+(Selindex * OPTION_PAGE_NUM)] != SelOption && i == 1)
{
printf("first init white >\n");
printf("[LV_MenuCommonOption_UpdateContent]first init white >\n");
switch (pItem->ItemId) {
case IDM_DELAY:{}
case IDM_OPERATING_TIME:{}
@ -451,9 +451,9 @@ static void LV_MenuCommonOption_UpdateContent(TM_MENU *pMenu)
}
else if(enableIndex[i+(Selindex * OPTION_PAGE_NUM)] != SelOption && i > 1)
{
if(pItem->ItemId == IDM_SEND_TYPE)
if (pItem->ItemId == IDM_SEND_TYPE)
{
printf("first init IDM_SEND_TYPE white >\n");
printf("[LV_MenuCommonOption_UpdateContent]first init IDM_SEND_TYPE white >\n");
itemIconId = LV_PLUGIN_IMG_ID_SF_NEXT1;//white >
if (i == 2)
{
@ -466,6 +466,69 @@ static void LV_MenuCommonOption_UpdateContent(TM_MENU *pMenu)
ui_hidden = false;
}
}
if (pItem->ItemId == IDM_BATTERY_TYPE && s_SelOption < 3)
{
if (puiPara->BatteryType == SF_BATT_LI_PACK){
printf("[LV_MenuCommonOption_UpdateContent]first init change battery to lith\n");
if (i < 1)
{
lv_plugin_menu_set_item_state(menu_option, 0, LV_PLUGIN_MENU_ITEM_STATE_DISABLED);
}
if (i < 2)
{
lv_plugin_menu_set_item_state(menu_option, 1, LV_PLUGIN_MENU_ITEM_STATE_DISABLED);
}
if (i < 3)
{
lv_plugin_menu_set_item_state(menu_option, 2, LV_PLUGIN_MENU_ITEM_STATE_DISABLED);
}
lv_obj_set_state(label_option4_scr_uiflowmenucommonoption, LV_STATE_DEFAULT);
ui_hidden = true;
lv_plugin_menu_select_item(menu_option, 3);
s_SelOption = 3;
SelOption = 3;
SysSetFlag(pItem->SysFlag,3);
}
else
{
printf("[LV_MenuCommonOption_UpdateContent]first init is not lith\n");
lv_plugin_menu_set_item_state(menu_option, 3, LV_PLUGIN_MENU_ITEM_STATE_DISABLED);
}
}
else if (pItem->ItemId == IDM_BATTERY_TYPE && s_SelOption == 3)
{
if (puiPara->BatteryType == SF_BATT_LI_PACK)
{
printf("[LV_MenuCommonOption_UpdateContent]first init and is lith\n");
if (i < 1)
{
lv_plugin_menu_set_item_state(menu_option, 0, LV_PLUGIN_MENU_ITEM_STATE_DISABLED);
}
if (i < 2)
{
lv_plugin_menu_set_item_state(menu_option, 1, LV_PLUGIN_MENU_ITEM_STATE_DISABLED);
}
if (i < 3)
{
lv_plugin_menu_set_item_state(menu_option, 2, LV_PLUGIN_MENU_ITEM_STATE_DISABLED);
}
lv_obj_set_state(label_option4_scr_uiflowmenucommonoption, LV_STATE_DEFAULT);
}
else
{
printf("[LV_MenuCommonOption_UpdateContent]first init change battery\n");
lv_plugin_menu_set_item_state(menu_option, 3, LV_PLUGIN_MENU_ITEM_STATE_DISABLED);
ui_hidden = true;
lv_plugin_menu_select_item(menu_option, 0);
s_SelOption = 0;
SelOption = 0;
SysSetFlag(pItem->SysFlag,0);
lv_obj_set_hidden(image_option1_scr_uiflowmenucommonoption, true);
}
}
}
else{
if (pItem->ItemId == IDM_SEND_TYPE){
@ -594,7 +657,8 @@ static void LV_MenuCommonOption_UpdateContent(TM_MENU *pMenu)
}
}
else if (i == s_SelOption){
else if (i == s_SelOption)
{
itemIconId = LV_PLUGIN_IMG_ID_SF_LIST_SELECTED;//√
if (i == 2)
{
@ -606,6 +670,71 @@ static void LV_MenuCommonOption_UpdateContent(TM_MENU *pMenu)
}
ui_hidden = false;
}
if (pItem->ItemId == IDM_BATTERY_TYPE && s_SelOption < 3)
{
if (puiPara->BatteryType == SF_BATT_LI_PACK){
if (i < 1)
{
lv_plugin_menu_set_item_state(menu_option, 0, LV_PLUGIN_MENU_ITEM_STATE_DISABLED);
}
if (i < 2)
{
lv_plugin_menu_set_item_state(menu_option, 1, LV_PLUGIN_MENU_ITEM_STATE_DISABLED);
}
if (i < 3)
{
lv_plugin_menu_set_item_state(menu_option, 2, LV_PLUGIN_MENU_ITEM_STATE_DISABLED);
}
lv_obj_set_state(label_option4_scr_uiflowmenucommonoption, LV_STATE_DEFAULT);
ui_hidden = true;
lv_plugin_menu_select_item(menu_option, 3);
s_SelOption = 3;
SelOption = 3;
SysSetFlag(pItem->SysFlag,3);
}
else
{
printf("[LV_MenuCommonOption_UpdateContent]is not lith\n");
lv_plugin_menu_set_item_state(menu_option, 3, LV_PLUGIN_MENU_ITEM_STATE_DISABLED);
}
}
else if (pItem->ItemId == IDM_BATTERY_TYPE && s_SelOption == 3)
{
if (puiPara->BatteryType == SF_BATT_LI_PACK)
{
printf("[LV_MenuCommonOption_UpdateContent]is lith\n");
if (i < 1)
{
lv_plugin_menu_set_item_state(menu_option, 0, LV_PLUGIN_MENU_ITEM_STATE_DISABLED);
}
if (i < 2)
{
lv_plugin_menu_set_item_state(menu_option, 1, LV_PLUGIN_MENU_ITEM_STATE_DISABLED);
}
if (i < 3)
{
lv_plugin_menu_set_item_state(menu_option, 2, LV_PLUGIN_MENU_ITEM_STATE_DISABLED);
}
lv_obj_set_state(label_option4_scr_uiflowmenucommonoption, LV_STATE_DEFAULT);
lv_plugin_menu_select_item(menu_option, 3);
}
else
{
printf("[LV_MenuCommonOption_UpdateContent]change battery\n");
lv_plugin_menu_set_item_state(menu_option, 3, LV_PLUGIN_MENU_ITEM_STATE_DISABLED);
ui_hidden = true;
lv_plugin_menu_select_item(menu_option, 0);
s_SelOption = 0;
SelOption = 0;
SysSetFlag(pItem->SysFlag,0);
lv_obj_set_hidden(image_option1_scr_uiflowmenucommonoption, true);
}
}
}
@ -687,6 +816,7 @@ static void LV_MenuOption_OnOpen(lv_obj_t* obj, TM_MENU *data)
TM_ITEM* pItem;
//TM_OPTION *pOption;
UINT16 SelOption = 0;
UIMenuStoreInfo *puiPara = sf_ui_para_get();
pPage = &pMenu->pPages[pMenu->SelPage];
// pPage->SelItem = 0;
@ -721,7 +851,18 @@ static void LV_MenuOption_OnOpen(lv_obj_t* obj, TM_MENU *data)
// lv_obj_set_hidden(container_main_menu_scr_uiflowmenucommonoption, true);
// }
LV_MenuCommonOption_UpdateContent(pMenu);
if (pItem->ItemId == IDM_BATTERY_TYPE)
{
if(puiPara->BatteryType == SF_BATT_LI_PACK)
{
lv_plugin_menu_set_item_state(menu_option, 0, LV_PLUGIN_MENU_ITEM_STATE_DISABLED);
lv_plugin_menu_set_item_state(menu_option, 1, LV_PLUGIN_MENU_ITEM_STATE_DISABLED);
lv_plugin_menu_set_item_state(menu_option, 2, LV_PLUGIN_MENU_ITEM_STATE_DISABLED);
}
else{
lv_plugin_menu_set_item_state(menu_option, 3, LV_PLUGIN_MENU_ITEM_STATE_DISABLED);
}
}
lv_plugin_menu_select_item(menu_option, SelOption);
}
@ -732,6 +873,7 @@ static void LV_MenuOption_OnNext(lv_obj_t* obj)
TM_PAGE *pPage;
TM_ITEM *pItem;
UINT16 SelOption = 0;
UIMenuStoreInfo *puiPara = sf_ui_para_get();
pPage = &pMenu->pPages[pMenu->SelPage];
pItem = &pPage->pItems[pPage->SelItem];
@ -741,20 +883,39 @@ static void LV_MenuOption_OnNext(lv_obj_t* obj)
// DBG_DUMP("%s Count=%d\r\n", __func__,pItem->Count);
// DBG_DUMP("%s SelOption=%d\r\n", __func__,SelOption);
SelOption++;
SelOption++;
if (pItem->ItemId == IDM_BATTERY_TYPE)
{
if(puiPara->BatteryType == SF_BATT_LI_PACK)
{
SelOption = 3;
SysSetFlag(pItem->SysFlag, SelOption);
lv_plugin_menu_set_item_state(menu_option, 0, LV_PLUGIN_MENU_ITEM_STATE_DISABLED);
lv_plugin_menu_set_item_state(menu_option, 1, LV_PLUGIN_MENU_ITEM_STATE_DISABLED);
lv_plugin_menu_set_item_state(menu_option, 2, LV_PLUGIN_MENU_ITEM_STATE_DISABLED);
}
else{
if (SelOption >= 3)
{
SelOption = 0;
}
SysSetFlag(pItem->SysFlag, SelOption);
LV_MenuCommonOption_UpdateContent(pMenu);
lv_plugin_menu_set_item_state(menu_option, 3, LV_PLUGIN_MENU_ITEM_STATE_DISABLED);
}
return;
}
if (SelOption >= pItem->Count){
// Close current UI Window now
//SysSetFlag(pItem->SysFlag, PrevOption);
//lv_plugin_scr_close(obj, NULL);
SelOption = 0;
SysSetFlag(pItem->SysFlag, SelOption);
LV_MenuCommonOption_UpdateContent(pMenu);
// lv_plugin_menu_select_item(menu_option, SelOption);
}else{
SysSetFlag(pItem->SysFlag, SelOption);
LV_MenuCommonOption_UpdateContent(pMenu);
// lv_plugin_menu_select_next_item(menu_option);
}
SysSetFlag(pItem->SysFlag, SelOption);
LV_MenuCommonOption_UpdateContent(pMenu);
// DBG_DUMP("%s flag=%d\r\n", __func__,SysGetFlag(pItem->SysFlag));
}
@ -764,25 +925,50 @@ static void LV_MenuOption_OnPrev(lv_obj_t* obj)
TM_PAGE *pPage;
TM_ITEM *pItem;
UINT16 SelOption = 0;
UIMenuStoreInfo *puiPara = sf_ui_para_get();
pPage = &pMenu->pPages[pMenu->SelPage];
pItem = &pPage->pItems[pPage->SelItem];
SelOption = SysGetFlag(pItem->SysFlag);
if (pItem->ItemId == IDM_BATTERY_TYPE)
{
if(puiPara->BatteryType == SF_BATT_LI_PACK)
{
SelOption = 3;
SysSetFlag(pItem->SysFlag, SelOption);
lv_plugin_menu_set_item_state(menu_option, 0, LV_PLUGIN_MENU_ITEM_STATE_DISABLED);
lv_plugin_menu_set_item_state(menu_option, 1, LV_PLUGIN_MENU_ITEM_STATE_DISABLED);
lv_plugin_menu_set_item_state(menu_option, 2, LV_PLUGIN_MENU_ITEM_STATE_DISABLED);
}
else{
if (SelOption == 0)
{
SelOption = (pItem->Count - 2);
}
else
{
SelOption--;
}
SysSetFlag(pItem->SysFlag, SelOption);
LV_MenuCommonOption_UpdateContent(pMenu);
lv_plugin_menu_set_item_state(menu_option, 3, LV_PLUGIN_MENU_ITEM_STATE_DISABLED);
}
return;
}
if (SelOption == 0) {
// Close current UI Window now
//SysSetFlag(pItem->SysFlag, PrevOption);
//lv_plugin_scr_close(obj, NULL);
SelOption = (pItem->Count - 1);
SysSetFlag(pItem->SysFlag, SelOption);
LV_MenuCommonOption_UpdateContent(pMenu);
// lv_plugin_menu_select_item(menu_option, SelOption);
} else {
SelOption--;
SysSetFlag(pItem->SysFlag, SelOption);
LV_MenuCommonOption_UpdateContent(pMenu);
// lv_plugin_menu_select_prev_item(menu_option);
}
SysSetFlag(pItem->SysFlag, SelOption);
LV_MenuCommonOption_UpdateContent(pMenu);
// DBG_DUMP("%s flag=%d\r\n", __func__,SysGetFlag(pItem->SysFlag));
}

4
code/application/source/sf_app/code/source/app/sf_app.c
View File

@ -157,6 +157,8 @@ int main(int argc, char *argv[])
if((!isUsb) && (SF_MCU_STARTUP_NORMAL != startup) && (SF_MCU_STARTUP_OFF != startup)/*&& (0 == isUpdate)*/)
{
printf("[sf_app]battery thread start\n");
sf_app_battery_start();
#if SF_IQ_TEST != ENABLE
if(SF_MCU_STARTUP_ONKEY == startup)
{
@ -175,7 +177,7 @@ int main(int argc, char *argv[])
app_RegisterNet_start();
}
#endif
sf_app_battery_start();
sf_sys_status_led_set(SF_LED_SYS_STATE_PIR_NOT_DETECT);
sf_sys_status_led_set(SF_LED_SYS_STATE_NORMAL);
}

1
code/application/source/sf_app/code/source/app/sf_system.c
View File

@ -1071,6 +1071,7 @@ SINT32 sf_app_battery_start(void)
return SF_FAILURE;
}
sf_adc_init();
printf("[sf_app_battery_start]thread start\n");
ret = pthread_create(&BatteryTskCfg.TskId, NULL, sf_battery_check_thread, NULL);
if(ret != SF_SUCCESS)
{

28
code/application/source/sf_app/code/source/battery/sf_battery.c
View File

@ -67,6 +67,7 @@ UINT32 batTempLevel = 0xff;
static UINT32 TemperAdc = 0;
static INT16 fTemper = 0;
static INT16 cTemper = 0;
INT16 first_init = 5; //firt init check battery 5 time
#define SF_READ_BAT_MAX 10
#define SF_DC_IN_VOLATAGE 70
#define SF_LI_IN_VOLATAGE 99
@ -349,7 +350,7 @@ UINT32 sf_battery_adc_value_get_once(void)
UINT32 liPolymerVoltageVal = 0;
UINT32 batVoltageVal = 0;
static UINT8 getBatAdcFlg = 0;
// UIMenuStoreInfo *puiPara = sf_app_ui_para_get();
UIMenuStoreInfo *puiPara = sf_app_ui_para_get();
if(getBatAdcFlg)
return SUCCESS;
@ -402,6 +403,26 @@ UINT32 sf_battery_adc_value_get_once(void)
_LiPolymerVoltageVal = 0;
_BatVoltageVal = batVoltageVal;
}
if (first_init > 0){
if(_LiPolymerVoltageVal)
{
printf("[sf_battery_level_polling]is lith battery\n");
if(SF_BATT_LI_PACK != puiPara->BatteryType)
{
puiPara->BatteryType = SF_BATT_LI_PACK;
}
first_init = 0;
}
else
{ first_init--;
puiPara->BatteryType = SF_BATT_ALKALINE;
}
}
getBatAdcFlg = 0;
@ -929,11 +950,16 @@ void sf_battery_level_polling(void)
sf_temper_update();
if(LiPolymerVoltageVal)
{
printf("[sf_battery_level_polling]is lith battery\n");
if(SF_BATT_LI_PACK != puiPara->BatteryType)
{
puiPara->BatteryType = SF_BATT_LI_PACK;
}
}
else{
puiPara->BatteryType = SF_BATT_ALKALINE;
}
//ret = sf_check_low_battery();
if(puiPara->BatteryLogSwitch)

12
code/lib/source/lvgl/lvgl/src/lv_core/lv_obj.c
View File

@ -2003,31 +2003,33 @@ const void * lv_event_get_data(void)
case LV_KEY_DOWN:
case LV_KEY_NEXT:
case 134:
{
printf("Key]>>>DOWN\n");
printf("[lv_event_get_data]>>>DOWN\n");
break;
}
case LV_KEY_UP:
case LV_KEY_PREV:
case 133:
{
printf("[Key]>>>UP\n");
printf("[lv_event_get_data]>>>UP\n");
break;
}
case LV_KEY_LEFT:
{
printf("[Key]>>>LEFT\n");
printf("[lv_event_get_data]>>>LEFT\n");
break;
}
case LV_KEY_RIGHT:
{
printf("[Key]>>>RIGHT\n");
printf("[lv_event_get_data]>>>RIGHT\n");
break;
}
case LV_KEY_ENTER:
{
printf("[Key]>>>ENTER\n");
printf("[lv_event_get_data]>>>ENTER\n");
break;
}
}

0
loader/Project/Model/tmp_awk1 Normal file
View File