diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuQR.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuQR.c index 279755a2d..c3c443552 100644 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuQR.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuQR.c @@ -380,7 +380,7 @@ static void network_scan_task_cb(lv_task_t* task) int fd = -1; int BuffLen; unsigned char Buff[1024] = { 0 }; - + //lv_label_set_text(plabel, "\n\nSearching..."); lv_obj_t* obj = (lv_obj_t*)task->user_data; if(Countdown) @@ -552,11 +552,10 @@ void show_Network_Selection_page(lv_obj_t* obj, lv_obj_t* menu_obj) plabel = lv_label_create(obj, NULL); lv_label_set_long_mode(plabel, LV_LABEL_LONG_BREAK); // lv_label_set_align(plabel, LV_LABEL_ALIGN_CENTER); - //lv_label_set_text(plabel, "Searching..."); - lv_obj_set_pos(plabel, 32, 60); + + lv_obj_set_pos(plabel, 32, 63); lv_obj_set_width(plabel, 256); lv_obj_add_style(plabel, 0, &gMatrixStylebtn); - if(network_scan_task == NULL){ Countdown = 0; network_scan_task = lv_task_create(network_scan_task_cb, 1000, LV_TASK_PRIO_MID, (void*)obj); diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonOption/UIFlowMenuCommonOptionEventCallback.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonOption/UIFlowMenuCommonOptionEventCallback.c index aba6e9f62..0b1b8eacd 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonOption/UIFlowMenuCommonOptionEventCallback.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonOption/UIFlowMenuCommonOptionEventCallback.c @@ -360,93 +360,235 @@ static void LV_MenuCommonOption_UpdateContent(TM_MENU *pMenu) 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", s_SelOption); + printf("s_SelOption: %d\n", s_SelOption); //first init page add select icon - if (s_SelOption == 100 && enableIndex[i+(Selindex * OPTION_PAGE_NUM)] == SelOption) - { - s_SelOption = i + (Selindex * OPTION_PAGE_NUM); - if (i == 1) + if (s_SelOption == 100){ + if (enableIndex[i+(Selindex * OPTION_PAGE_NUM)] == SelOption) { - printf("first init and is on\n"); - itemIconId = LV_PLUGIN_IMG_ID_SF_LIST_SELECTED_NEXT2;//black > √ - } - else{ - itemIconId = LV_PLUGIN_IMG_ID_SF_LIST_SELECTED;//√ - } - ui_hidden = false; - - } - else if(s_SelOption == 100 && enableIndex[i+(Selindex * OPTION_PAGE_NUM)] != SelOption && i == 1){ - printf("first init and is off\n"); - switch (pItem->ItemId) { - case IDM_DELAY:{} - case IDM_OPERATING_TIME:{} - case IDM_DATE_AND_TIME:{} - case IDM_MAX_NUM_DAY:{} - case IDM_PASSWORD:{} - case IDM_CAMERA_NAME: - { - itemIconId = LV_PLUGIN_IMG_ID_SF_NEXT1;//white > + s_SelOption = i + (Selindex * OPTION_PAGE_NUM); + switch (pItem->ItemId) { + case IDM_DELAY:{} + case IDM_OPERATING_TIME:{} + case IDM_DATE_AND_TIME:{} + case IDM_MAX_NUM_DAY:{} + case IDM_PASSWORD:{} + case IDM_CAMERA_NAME: + { + if (i == 1) + { + printf("first init black > √\n"); + itemIconId = LV_PLUGIN_IMG_ID_SF_LIST_SELECTED_NEXT2;//black > √ + lv_obj_set_pos(image_option2_scr_uiflowmenucommonoption, 260, 0); + } + else{ + printf("first init √\n"); + itemIconId = LV_PLUGIN_IMG_ID_SF_LIST_SELECTED;//√ + lv_obj_set_pos(image_option2_scr_uiflowmenucommonoption, 272, 0); + } + break; + } + case IDM_SEND_TYPE:{ + if(i == 1) + { + printf("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, 260, 0); + } + else if (i == 2) + { + printf("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, 260, 0); + } + else if (i == 3) + { + printf("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, 260, 0); + } + break; + } + default: + { + itemIconId = LV_PLUGIN_IMG_ID_SF_LIST_SELECTED;//√ + lv_obj_set_pos(image_option2_scr_uiflowmenucommonoption, 272, 0); + break; + } + } ui_hidden = false; } - } - - } + else if (enableIndex[i+(Selindex * OPTION_PAGE_NUM)] != SelOption && i == 1) + { + printf("first init white >\n"); + switch (pItem->ItemId) { + case IDM_DELAY:{} + case IDM_OPERATING_TIME:{} + case IDM_DATE_AND_TIME:{} + case IDM_MAX_NUM_DAY:{} + case IDM_PASSWORD:{} + case IDM_SEND_TYPE:{} + case IDM_CAMERA_NAME: + { + itemIconId = LV_PLUGIN_IMG_ID_SF_NEXT1;//white > + lv_obj_set_pos(image_option2_scr_uiflowmenucommonoption, 288, 0); + ui_hidden = false; + break; + } + } - if (i == s_SelOption && i != 1){ - lv_obj_set_pos(image_option2_scr_uiflowmenucommonoption, 272, 0); - itemIconId = LV_PLUGIN_IMG_ID_SF_LIST_SELECTED;//√ - ui_hidden = false; - } - else if (i == 1 && s_SelOption < 100) - { - //printf("[LV_MenuCommonOption_UpdateContent] add > icon\n"); - switch (pItem->ItemId) { - case IDM_DELAY:{} - case IDM_OPERATING_TIME:{} - case IDM_DATE_AND_TIME:{} - case IDM_MAX_NUM_DAY:{} - case IDM_PASSWORD:{} - case IDM_CAMERA_NAME: - { - - if (s_SelOption == 0 && enableIndex[i+(Selindex * OPTION_PAGE_NUM)] == SelOption){ - printf("[LV_MenuCommonOption_UpdateContent] add black > \n"); - itemIconId = LV_PLUGIN_IMG_ID_SF_NEXT2;//black > - lv_obj_set_pos(image_option2_scr_uiflowmenucommonoption, 288, 0); - } - else if (s_SelOption == 0 && enableIndex[i+(Selindex * OPTION_PAGE_NUM)] != SelOption){ - printf("[LV_MenuCommonOption_UpdateContent] add white > \n"); - itemIconId = LV_PLUGIN_IMG_ID_SF_NEXT1;//white > - lv_obj_set_pos(image_option2_scr_uiflowmenucommonoption, 288, 0); - } - else if (s_SelOption == 1 && enableIndex[i+(Selindex * OPTION_PAGE_NUM)] == SelOption){ - printf("[LV_MenuCommonOption_UpdateContent] add black √ > \n"); - itemIconId = LV_PLUGIN_IMG_ID_SF_LIST_SELECTED_NEXT2;//*black > √ - lv_obj_set_pos(image_option2_scr_uiflowmenucommonoption, 262, 0); - } - else{ - printf("[LV_MenuCommonOption_UpdateContent] add white √ > \n"); - itemIconId = LV_PLUGIN_IMG_ID_SF_LIST_SELECTED_NEXT1;//*white > √ - lv_obj_set_pos(image_option2_scr_uiflowmenucommonoption, 262, 0); - } - ui_hidden = false; - break; } - default: + else if(enableIndex[i+(Selindex * OPTION_PAGE_NUM)] != SelOption && i > 1) { - printf("[LV_MenuCommonOption_UpdateContent] add √ \n"); - itemIconId = LV_PLUGIN_IMG_ID_SF_LIST_SELECTED;//√ - lv_obj_set_pos(image_option2_scr_uiflowmenucommonoption, 272, 0); - if (s_SelOption == 1) + if(pItem->ItemId == IDM_SEND_TYPE) { + printf("first init IDM_SEND_TYPE white >\n"); + itemIconId = LV_PLUGIN_IMG_ID_SF_NEXT1;//white > + if (i == 2) + { + lv_obj_set_pos(image_option3_scr_uiflowmenucommonoption, 288, 0); + } + else if (i == 3) + { + lv_obj_set_pos(image_option4_scr_uiflowmenucommonoption, 288, 0); + } ui_hidden = false; } - break; } - } - } + else{ + if (pItem->ItemId == IDM_SEND_TYPE){ + if (i == s_SelOption) + { + switch(i) + { + case 1: + { + lv_obj_set_pos(image_option2_scr_uiflowmenucommonoption, 260, 0); + break; + } + case 2: + { + lv_obj_set_pos(image_option3_scr_uiflowmenucommonoption, 260, 0); + break; + } + case 3: + { + lv_obj_set_pos(image_option4_scr_uiflowmenucommonoption, 260, 0); + break; + } + default: + { + break; + } + } + + if (i >= 1 && enableIndex[i+(Selindex * OPTION_PAGE_NUM)] == SelOption) + { + printf("[LV_MenuCommonOption_UpdateContent]IDM_SEND_TYPE add black √ > \n"); + itemIconId = LV_PLUGIN_IMG_ID_SF_LIST_SELECTED_NEXT2;//black > √ + } + else if (i >= 1 && enableIndex[i+(Selindex * OPTION_PAGE_NUM)] != SelOption) + { + printf("[LV_MenuCommonOption_UpdateContent]IDM_SEND_TYPE add white √ > \n"); + itemIconId = LV_PLUGIN_IMG_ID_SF_LIST_SELECTED_NEXT1;//white > √ + } + ui_hidden = false; + } + else{ + switch(i) + { + case 1: + { + printf("[LV_MenuCommonOption_UpdateContent]set 1 option \n"); + lv_obj_set_pos(image_option2_scr_uiflowmenucommonoption, 288, 0); + break; + } + case 2: + { + printf("[LV_MenuCommonOption_UpdateContent]set 2 option \n"); + lv_obj_set_pos(image_option3_scr_uiflowmenucommonoption, 288, 0); + break; + } + case 3: + { + printf("[LV_MenuCommonOption_UpdateContent]set 3 option \n"); + lv_obj_set_pos(image_option4_scr_uiflowmenucommonoption, 288, 0); + break; + } + default: + { + break; + } + } + if (i >= 1 && enableIndex[i+(Selindex * OPTION_PAGE_NUM)] == SelOption) + { + printf("[LV_MenuCommonOption_UpdateContent]IDM_SEND_TYPE add black > \n"); + itemIconId = LV_PLUGIN_IMG_ID_SF_NEXT2;//black > + ui_hidden = false; + } + else if (i >= 1 && enableIndex[i+(Selindex * OPTION_PAGE_NUM)] != SelOption) + { + printf("[LV_MenuCommonOption_UpdateContent]IDM_SEND_TYPE add white > \n"); + itemIconId = LV_PLUGIN_IMG_ID_SF_NEXT1;//white > + ui_hidden = false; + } + } + } + else if (i == 1) + { + //printf("[LV_MenuCommonOption_UpdateContent] add > icon\n"); + switch (pItem->ItemId) { + case IDM_DELAY:{} + case IDM_OPERATING_TIME:{} + case IDM_DATE_AND_TIME:{} + case IDM_MAX_NUM_DAY:{} + case IDM_PASSWORD:{} + case IDM_CAMERA_NAME: + { + if (s_SelOption == 0 && enableIndex[i+(Selindex * OPTION_PAGE_NUM)] == SelOption){ + printf("[LV_MenuCommonOption_UpdateContent] add black > \n"); + itemIconId = LV_PLUGIN_IMG_ID_SF_NEXT2;//black > + lv_obj_set_pos(image_option2_scr_uiflowmenucommonoption, 288, 0); + } + else if (s_SelOption == 0 && enableIndex[i+(Selindex * OPTION_PAGE_NUM)] != SelOption){ + printf("[LV_MenuCommonOption_UpdateContent] add white > \n"); + itemIconId = LV_PLUGIN_IMG_ID_SF_NEXT1;//white > + lv_obj_set_pos(image_option2_scr_uiflowmenucommonoption, 288, 0); + } + else if (s_SelOption == 1 && enableIndex[i+(Selindex * OPTION_PAGE_NUM)] == SelOption){ + printf("[LV_MenuCommonOption_UpdateContent] add black √ > \n"); + itemIconId = LV_PLUGIN_IMG_ID_SF_LIST_SELECTED_NEXT2;//black > √ + lv_obj_set_pos(image_option2_scr_uiflowmenucommonoption, 262, 0); + } + else{ + printf("[LV_MenuCommonOption_UpdateContent] add white √ > \n"); + itemIconId = LV_PLUGIN_IMG_ID_SF_LIST_SELECTED_NEXT1;//white > √ + lv_obj_set_pos(image_option2_scr_uiflowmenucommonoption, 260, 0); + } + ui_hidden = false; + break; + } + default: + { + printf("[LV_MenuCommonOption_UpdateContent] add √ \n"); + itemIconId = LV_PLUGIN_IMG_ID_SF_LIST_SELECTED;//√ + lv_obj_set_pos(image_option2_scr_uiflowmenucommonoption, 272, 0); + if (s_SelOption == 1) + { + ui_hidden = false; + } + break; + } + } + + } + else if (i == s_SelOption){ + itemIconId = LV_PLUGIN_IMG_ID_SF_LIST_SELECTED;//√ + lv_obj_set_pos(image_option2_scr_uiflowmenucommonoption, 272, 0); + ui_hidden = false; + } + } + lv_plugin_menu_set_item_img_id(menu_option, i, LV_PLUGIN_MENU_ITEM_VISIBLE_STATE_NUM, itemIconId); lv_plugin_menu_set_item_hidden(menu_option, i, false); @@ -736,8 +878,8 @@ static void LV_MenuOption_OnSelected(lv_obj_t* obj) show_MaxNum_page(obj); break; case IDM_SEND_TYPE: - show_send_time_page(obj, SelOption); - break; + show_send_time_page(obj, SelOption); + break; default: break; } @@ -899,7 +1041,7 @@ static void CommondOptionCloseSencondPage(lv_obj_t* obj, uint32_t* key) pPage = &pMenu->pPages[pMenu->SelPage]; pItem = &pPage->pItems[pPage->SelItem]; UINT16 itemID = pItem->ItemId; - printf("\033[33m[UIFlowMenuCommonOptionEventCallback]LV_USER_EVENT_KEY_RELEASE key:%d\033[0m\n", *key); + printf("\033[33m[CommondOptionCloseSencondPage]LV_USER_EVENT_KEY_RELEASE key:%d\033[0m\n", *key); /* handle key event */ switch(itemID) { diff --git a/code/application/source/cardv/SrcCode/UIWnd/s530-ntk/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuQR.c b/code/application/source/cardv/SrcCode/UIWnd/s530-ntk/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuQR.c index 279755a2d..c3c443552 100644 --- a/code/application/source/cardv/SrcCode/UIWnd/s530-ntk/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuQR.c +++ b/code/application/source/cardv/SrcCode/UIWnd/s530-ntk/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuQR.c @@ -380,7 +380,7 @@ static void network_scan_task_cb(lv_task_t* task) int fd = -1; int BuffLen; unsigned char Buff[1024] = { 0 }; - + //lv_label_set_text(plabel, "\n\nSearching..."); lv_obj_t* obj = (lv_obj_t*)task->user_data; if(Countdown) @@ -552,11 +552,10 @@ void show_Network_Selection_page(lv_obj_t* obj, lv_obj_t* menu_obj) plabel = lv_label_create(obj, NULL); lv_label_set_long_mode(plabel, LV_LABEL_LONG_BREAK); // lv_label_set_align(plabel, LV_LABEL_ALIGN_CENTER); - //lv_label_set_text(plabel, "Searching..."); - lv_obj_set_pos(plabel, 32, 60); + + lv_obj_set_pos(plabel, 32, 63); lv_obj_set_width(plabel, 256); lv_obj_add_style(plabel, 0, &gMatrixStylebtn); - if(network_scan_task == NULL){ Countdown = 0; network_scan_task = lv_task_create(network_scan_task_cb, 1000, LV_TASK_PRIO_MID, (void*)obj); diff --git a/code/application/source/cardv/SrcCode/UIWnd/s530-ntk/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonOption/UIFlowMenuCommonOptionEventCallback.c b/code/application/source/cardv/SrcCode/UIWnd/s530-ntk/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonOption/UIFlowMenuCommonOptionEventCallback.c index aba6e9f62..0b1b8eacd 100644 --- a/code/application/source/cardv/SrcCode/UIWnd/s530-ntk/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonOption/UIFlowMenuCommonOptionEventCallback.c +++ b/code/application/source/cardv/SrcCode/UIWnd/s530-ntk/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonOption/UIFlowMenuCommonOptionEventCallback.c @@ -360,93 +360,235 @@ static void LV_MenuCommonOption_UpdateContent(TM_MENU *pMenu) 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", s_SelOption); + printf("s_SelOption: %d\n", s_SelOption); //first init page add select icon - if (s_SelOption == 100 && enableIndex[i+(Selindex * OPTION_PAGE_NUM)] == SelOption) - { - s_SelOption = i + (Selindex * OPTION_PAGE_NUM); - if (i == 1) + if (s_SelOption == 100){ + if (enableIndex[i+(Selindex * OPTION_PAGE_NUM)] == SelOption) { - printf("first init and is on\n"); - itemIconId = LV_PLUGIN_IMG_ID_SF_LIST_SELECTED_NEXT2;//black > √ - } - else{ - itemIconId = LV_PLUGIN_IMG_ID_SF_LIST_SELECTED;//√ - } - ui_hidden = false; - - } - else if(s_SelOption == 100 && enableIndex[i+(Selindex * OPTION_PAGE_NUM)] != SelOption && i == 1){ - printf("first init and is off\n"); - switch (pItem->ItemId) { - case IDM_DELAY:{} - case IDM_OPERATING_TIME:{} - case IDM_DATE_AND_TIME:{} - case IDM_MAX_NUM_DAY:{} - case IDM_PASSWORD:{} - case IDM_CAMERA_NAME: - { - itemIconId = LV_PLUGIN_IMG_ID_SF_NEXT1;//white > + s_SelOption = i + (Selindex * OPTION_PAGE_NUM); + switch (pItem->ItemId) { + case IDM_DELAY:{} + case IDM_OPERATING_TIME:{} + case IDM_DATE_AND_TIME:{} + case IDM_MAX_NUM_DAY:{} + case IDM_PASSWORD:{} + case IDM_CAMERA_NAME: + { + if (i == 1) + { + printf("first init black > √\n"); + itemIconId = LV_PLUGIN_IMG_ID_SF_LIST_SELECTED_NEXT2;//black > √ + lv_obj_set_pos(image_option2_scr_uiflowmenucommonoption, 260, 0); + } + else{ + printf("first init √\n"); + itemIconId = LV_PLUGIN_IMG_ID_SF_LIST_SELECTED;//√ + lv_obj_set_pos(image_option2_scr_uiflowmenucommonoption, 272, 0); + } + break; + } + case IDM_SEND_TYPE:{ + if(i == 1) + { + printf("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, 260, 0); + } + else if (i == 2) + { + printf("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, 260, 0); + } + else if (i == 3) + { + printf("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, 260, 0); + } + break; + } + default: + { + itemIconId = LV_PLUGIN_IMG_ID_SF_LIST_SELECTED;//√ + lv_obj_set_pos(image_option2_scr_uiflowmenucommonoption, 272, 0); + break; + } + } ui_hidden = false; } - } - - } + else if (enableIndex[i+(Selindex * OPTION_PAGE_NUM)] != SelOption && i == 1) + { + printf("first init white >\n"); + switch (pItem->ItemId) { + case IDM_DELAY:{} + case IDM_OPERATING_TIME:{} + case IDM_DATE_AND_TIME:{} + case IDM_MAX_NUM_DAY:{} + case IDM_PASSWORD:{} + case IDM_SEND_TYPE:{} + case IDM_CAMERA_NAME: + { + itemIconId = LV_PLUGIN_IMG_ID_SF_NEXT1;//white > + lv_obj_set_pos(image_option2_scr_uiflowmenucommonoption, 288, 0); + ui_hidden = false; + break; + } + } - if (i == s_SelOption && i != 1){ - lv_obj_set_pos(image_option2_scr_uiflowmenucommonoption, 272, 0); - itemIconId = LV_PLUGIN_IMG_ID_SF_LIST_SELECTED;//√ - ui_hidden = false; - } - else if (i == 1 && s_SelOption < 100) - { - //printf("[LV_MenuCommonOption_UpdateContent] add > icon\n"); - switch (pItem->ItemId) { - case IDM_DELAY:{} - case IDM_OPERATING_TIME:{} - case IDM_DATE_AND_TIME:{} - case IDM_MAX_NUM_DAY:{} - case IDM_PASSWORD:{} - case IDM_CAMERA_NAME: - { - - if (s_SelOption == 0 && enableIndex[i+(Selindex * OPTION_PAGE_NUM)] == SelOption){ - printf("[LV_MenuCommonOption_UpdateContent] add black > \n"); - itemIconId = LV_PLUGIN_IMG_ID_SF_NEXT2;//black > - lv_obj_set_pos(image_option2_scr_uiflowmenucommonoption, 288, 0); - } - else if (s_SelOption == 0 && enableIndex[i+(Selindex * OPTION_PAGE_NUM)] != SelOption){ - printf("[LV_MenuCommonOption_UpdateContent] add white > \n"); - itemIconId = LV_PLUGIN_IMG_ID_SF_NEXT1;//white > - lv_obj_set_pos(image_option2_scr_uiflowmenucommonoption, 288, 0); - } - else if (s_SelOption == 1 && enableIndex[i+(Selindex * OPTION_PAGE_NUM)] == SelOption){ - printf("[LV_MenuCommonOption_UpdateContent] add black √ > \n"); - itemIconId = LV_PLUGIN_IMG_ID_SF_LIST_SELECTED_NEXT2;//*black > √ - lv_obj_set_pos(image_option2_scr_uiflowmenucommonoption, 262, 0); - } - else{ - printf("[LV_MenuCommonOption_UpdateContent] add white √ > \n"); - itemIconId = LV_PLUGIN_IMG_ID_SF_LIST_SELECTED_NEXT1;//*white > √ - lv_obj_set_pos(image_option2_scr_uiflowmenucommonoption, 262, 0); - } - ui_hidden = false; - break; } - default: + else if(enableIndex[i+(Selindex * OPTION_PAGE_NUM)] != SelOption && i > 1) { - printf("[LV_MenuCommonOption_UpdateContent] add √ \n"); - itemIconId = LV_PLUGIN_IMG_ID_SF_LIST_SELECTED;//√ - lv_obj_set_pos(image_option2_scr_uiflowmenucommonoption, 272, 0); - if (s_SelOption == 1) + if(pItem->ItemId == IDM_SEND_TYPE) { + printf("first init IDM_SEND_TYPE white >\n"); + itemIconId = LV_PLUGIN_IMG_ID_SF_NEXT1;//white > + if (i == 2) + { + lv_obj_set_pos(image_option3_scr_uiflowmenucommonoption, 288, 0); + } + else if (i == 3) + { + lv_obj_set_pos(image_option4_scr_uiflowmenucommonoption, 288, 0); + } ui_hidden = false; } - break; } - } - } + else{ + if (pItem->ItemId == IDM_SEND_TYPE){ + if (i == s_SelOption) + { + switch(i) + { + case 1: + { + lv_obj_set_pos(image_option2_scr_uiflowmenucommonoption, 260, 0); + break; + } + case 2: + { + lv_obj_set_pos(image_option3_scr_uiflowmenucommonoption, 260, 0); + break; + } + case 3: + { + lv_obj_set_pos(image_option4_scr_uiflowmenucommonoption, 260, 0); + break; + } + default: + { + break; + } + } + + if (i >= 1 && enableIndex[i+(Selindex * OPTION_PAGE_NUM)] == SelOption) + { + printf("[LV_MenuCommonOption_UpdateContent]IDM_SEND_TYPE add black √ > \n"); + itemIconId = LV_PLUGIN_IMG_ID_SF_LIST_SELECTED_NEXT2;//black > √ + } + else if (i >= 1 && enableIndex[i+(Selindex * OPTION_PAGE_NUM)] != SelOption) + { + printf("[LV_MenuCommonOption_UpdateContent]IDM_SEND_TYPE add white √ > \n"); + itemIconId = LV_PLUGIN_IMG_ID_SF_LIST_SELECTED_NEXT1;//white > √ + } + ui_hidden = false; + } + else{ + switch(i) + { + case 1: + { + printf("[LV_MenuCommonOption_UpdateContent]set 1 option \n"); + lv_obj_set_pos(image_option2_scr_uiflowmenucommonoption, 288, 0); + break; + } + case 2: + { + printf("[LV_MenuCommonOption_UpdateContent]set 2 option \n"); + lv_obj_set_pos(image_option3_scr_uiflowmenucommonoption, 288, 0); + break; + } + case 3: + { + printf("[LV_MenuCommonOption_UpdateContent]set 3 option \n"); + lv_obj_set_pos(image_option4_scr_uiflowmenucommonoption, 288, 0); + break; + } + default: + { + break; + } + } + if (i >= 1 && enableIndex[i+(Selindex * OPTION_PAGE_NUM)] == SelOption) + { + printf("[LV_MenuCommonOption_UpdateContent]IDM_SEND_TYPE add black > \n"); + itemIconId = LV_PLUGIN_IMG_ID_SF_NEXT2;//black > + ui_hidden = false; + } + else if (i >= 1 && enableIndex[i+(Selindex * OPTION_PAGE_NUM)] != SelOption) + { + printf("[LV_MenuCommonOption_UpdateContent]IDM_SEND_TYPE add white > \n"); + itemIconId = LV_PLUGIN_IMG_ID_SF_NEXT1;//white > + ui_hidden = false; + } + } + } + else if (i == 1) + { + //printf("[LV_MenuCommonOption_UpdateContent] add > icon\n"); + switch (pItem->ItemId) { + case IDM_DELAY:{} + case IDM_OPERATING_TIME:{} + case IDM_DATE_AND_TIME:{} + case IDM_MAX_NUM_DAY:{} + case IDM_PASSWORD:{} + case IDM_CAMERA_NAME: + { + if (s_SelOption == 0 && enableIndex[i+(Selindex * OPTION_PAGE_NUM)] == SelOption){ + printf("[LV_MenuCommonOption_UpdateContent] add black > \n"); + itemIconId = LV_PLUGIN_IMG_ID_SF_NEXT2;//black > + lv_obj_set_pos(image_option2_scr_uiflowmenucommonoption, 288, 0); + } + else if (s_SelOption == 0 && enableIndex[i+(Selindex * OPTION_PAGE_NUM)] != SelOption){ + printf("[LV_MenuCommonOption_UpdateContent] add white > \n"); + itemIconId = LV_PLUGIN_IMG_ID_SF_NEXT1;//white > + lv_obj_set_pos(image_option2_scr_uiflowmenucommonoption, 288, 0); + } + else if (s_SelOption == 1 && enableIndex[i+(Selindex * OPTION_PAGE_NUM)] == SelOption){ + printf("[LV_MenuCommonOption_UpdateContent] add black √ > \n"); + itemIconId = LV_PLUGIN_IMG_ID_SF_LIST_SELECTED_NEXT2;//black > √ + lv_obj_set_pos(image_option2_scr_uiflowmenucommonoption, 262, 0); + } + else{ + printf("[LV_MenuCommonOption_UpdateContent] add white √ > \n"); + itemIconId = LV_PLUGIN_IMG_ID_SF_LIST_SELECTED_NEXT1;//white > √ + lv_obj_set_pos(image_option2_scr_uiflowmenucommonoption, 260, 0); + } + ui_hidden = false; + break; + } + default: + { + printf("[LV_MenuCommonOption_UpdateContent] add √ \n"); + itemIconId = LV_PLUGIN_IMG_ID_SF_LIST_SELECTED;//√ + lv_obj_set_pos(image_option2_scr_uiflowmenucommonoption, 272, 0); + if (s_SelOption == 1) + { + ui_hidden = false; + } + break; + } + } + + } + else if (i == s_SelOption){ + itemIconId = LV_PLUGIN_IMG_ID_SF_LIST_SELECTED;//√ + lv_obj_set_pos(image_option2_scr_uiflowmenucommonoption, 272, 0); + ui_hidden = false; + } + } + lv_plugin_menu_set_item_img_id(menu_option, i, LV_PLUGIN_MENU_ITEM_VISIBLE_STATE_NUM, itemIconId); lv_plugin_menu_set_item_hidden(menu_option, i, false); @@ -736,8 +878,8 @@ static void LV_MenuOption_OnSelected(lv_obj_t* obj) show_MaxNum_page(obj); break; case IDM_SEND_TYPE: - show_send_time_page(obj, SelOption); - break; + show_send_time_page(obj, SelOption); + break; default: break; } @@ -899,7 +1041,7 @@ static void CommondOptionCloseSencondPage(lv_obj_t* obj, uint32_t* key) pPage = &pMenu->pPages[pMenu->SelPage]; pItem = &pPage->pItems[pPage->SelItem]; UINT16 itemID = pItem->ItemId; - printf("\033[33m[UIFlowMenuCommonOptionEventCallback]LV_USER_EVENT_KEY_RELEASE key:%d\033[0m\n", *key); + printf("\033[33m[CommondOptionCloseSencondPage]LV_USER_EVENT_KEY_RELEASE key:%d\033[0m\n", *key); /* handle key event */ switch(itemID) {