From 705d68cfcd66ccbc857c30569d9b5ef859629d05 Mon Sep 17 00:00:00 2001 From: kong Date: Fri, 2 Dec 2022 23:09:23 +0700 Subject: [PATCH] DO 6.79 --- image/page_doing/bn_send_report_lid.png | Bin 0 -> 4448 bytes image/page_doing/bn_send_report_lid_en.png | Bin 0 -> 6315 bytes image/page_doing/bp_send_report_lid.png | Bin 0 -> 4361 bytes image/page_doing/bp_send_report_lid_en.png | Bin 0 -> 6267 bytes video/script1.ev | 6 ++ xml/menu_new_layout_gen.py | 5 +- xml/page_board.xml | 4 +- xml/page_brewing3.xml | 31 +++++++++- xml/page_catalog_group_appfast.xml | 5 ++ xml/page_catalog_group_cocktail.xml | 12 ++++ xml/page_catalog_group_coffee.xml | 63 +++++++++++++++++++++ xml/page_catalog_group_forkid.xml | 13 +++++ xml/page_catalog_group_health.xml | 21 +++++++ xml/page_catalog_group_milk.xml | 13 +++++ xml/page_catalog_group_other.xml | 35 ++++++++++++ xml/page_catalog_group_recommend.xml | 39 +++++++++++++ xml/page_catalog_group_tea.xml | 26 +++++++++ xml/page_catalog_group_whey.xml | 15 +++++ xml/page_topping_select6.xml | 4 ++ 19 files changed, 288 insertions(+), 4 deletions(-) create mode 100644 image/page_doing/bn_send_report_lid.png create mode 100644 image/page_doing/bn_send_report_lid_en.png create mode 100644 image/page_doing/bp_send_report_lid.png create mode 100644 image/page_doing/bp_send_report_lid_en.png diff --git a/image/page_doing/bn_send_report_lid.png b/image/page_doing/bn_send_report_lid.png new file mode 100644 index 0000000000000000000000000000000000000000..ba87525bb89fb22b592b36f5fff5f16b194f9a76 GIT binary patch literal 4448 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 literal 0 HcmV?d00001 diff --git a/image/page_doing/bp_send_report_lid.png b/image/page_doing/bp_send_report_lid.png new file mode 100644 index 0000000000000000000000000000000000000000..a3d775df78c595dee433baa25ccdf5719b19f59c GIT binary patch literal 4361 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 literal 0 HcmV?d00001 diff --git a/video/script1.ev b/video/script1.ev index 3d07d447..815f0275 100644 --- a/video/script1.ev +++ b/video/script1.ev @@ -2,22 +2,28 @@ Var MainfileSize = 0 GetFileSizeK "taobin_project/video/main_page_event.mp4" MainfileSize DEBUGVAR MainfileSize If MainfileSize = 10598934 Then + If SystemDateMonthInt = 11 Then Var EventTurnOn = 1 EndIf + If SystemDateMonthInt = 12 Then + Var EventTurnOn = 1 ;DEBUGVAR SystemTimeHourInt ;DEBUGVAR SystemDateDayInt + If SystemDateDayInt > 7 Then Var EventTurnOn = 0 EndIf + If SystemDateDayInt = 6 Then If SystemTimeHourInt > 9 Then Var EventTurnOn = 0 EndIf EndIf EndIf + If EventTurnOn = 1 Then Var CountDownShowButton = 0 Var ShowButtonClickFull = "Invisible" diff --git a/xml/menu_new_layout_gen.py b/xml/menu_new_layout_gen.py index 441ad212..77b8f8c9 100644 --- a/xml/menu_new_layout_gen.py +++ b/xml/menu_new_layout_gen.py @@ -223,6 +223,8 @@ out_xml( '\t\tDEBUGVAR PD_STAGE_1\r\n') out_xml( '\t\tDEBUGVAR PD_STAGE_2\r\n') out_xml( '\t\tDEBUGVAR PD_STAGE_3\r\n') + out_xml( '\t\tVar SelectDrinkType = 0\r\n') + out_xml( '\t\t\r\n') out_xml( '\t\t\r\n') @@ -666,7 +668,8 @@ out_xml( '\t\tDEBUGVAR PD_STAGE_1\r\n') out_xml( '\t\tDEBUGVAR PD_STAGE_2\r\n') out_xml( '\t\tDEBUGVAR PD_STAGE_3\r\n') - + out_xml( '\t\tVar SelectDrinkType = 0\r\n') + out_xml( '\t\t\r\n') out_xml( '\t\t\r\n') if "inter" in param: diff --git a/xml/page_board.xml b/xml/page_board.xml index 127f24d5..8daafe06 100644 --- a/xml/page_board.xml +++ b/xml/page_board.xml @@ -597,7 +597,7 @@ DEBUGVAR CountryName DEBUGVAR LanguageShow DEBUGVAR DisplayFormat - DEBUGVAR PreScaleConvert + DEBUGVAR ScaleValueForCalculation DEBUGVAR PreScaleConvertShow DEBUGVAR UnitPostDisplay @@ -613,7 +613,7 @@ EndIf If CountryName = "Indonesia" Then - Var TextPriceMenuSize = 12 + Var TextPriceMenuSize = 14 EndIf Machine __arm_toggle diff --git a/xml/page_brewing3.xml b/xml/page_brewing3.xml index 878857e5..84fa79f7 100644 --- a/xml/page_brewing3.xml +++ b/xml/page_brewing3.xml @@ -58,6 +58,9 @@ Var bnStrawProblemReport = "ROOT/taobin_project/image/page_doing/bn_send_report_straw_en.png" Var bpStrawProblemReport = "ROOT/taobin_project/image/page_doing/bp_send_report_straw_en.png" + Var bnLidProblemReport = "ROOT/taobin_project/image/page_doing/bn_send_report_lid_en.png" + Var bpLidProblemReport = "ROOT/taobin_project/image/page_doing/bp_send_report_lid_en.png" + Var CampaingFilename = "ROOT/taobin_project/image/page_campaign_en" Var XStraw = 336 @@ -74,6 +77,9 @@ Var bnStrawProblemReport = "ROOT/taobin_project/image/page_doing/bn_send_report_straw.png" Var bpStrawProblemReport = "ROOT/taobin_project/image/page_doing/bp_send_report_straw.png" + Var bnLidProblemReport = "ROOT/taobin_project/image/page_doing/bn_send_report_lid.png" + Var bpLidProblemReport = "ROOT/taobin_project/image/page_doing/bp_send_report_lid.png" + Var CampaingFilename = "ROOT/taobin_project/image/page_campaign" Var XStraw = 382 @@ -292,7 +298,11 @@ Else Var CampaignEnable = 0 EndIf - + + + DEBUGVAR bg_lidProblem_ST + + @@ -1304,6 +1314,25 @@ + + +