From ab99b4681f7ebeac2075b88918d8fd1c4760eb16 Mon Sep 17 00:00:00 2001 From: Kenta420 Date: Tue, 13 Aug 2024 17:14:54 +0700 Subject: [PATCH] AUS: Drink fail no more send problem & Added Test buy drink page --- inter/aus/xml/open_page_catalog.ev | 2 +- ...talog_westfield.lxml => page_catalog.lxml} | 30 + inter/aus/xml/page_catalog_cocktail.lxml | 19 + .../aus/xml/page_catalog_group_menu_test.lxml | 316 +++++++++ .../aus/xml/page_catalog_winter_warmers.lxml | 20 + inter/aus/xml/page_drinkfail_aus.lxml | 646 ++++++++++++++++++ inter/aus/xml/route_man_test.lxml | 61 ++ xml/page_back_to_main.xml | 8 +- xml/page_drinkfail2.xml | 4 + xml/vending_info.xml | 2 +- 10 files changed, 1104 insertions(+), 4 deletions(-) rename inter/aus/xml/{page_catalog_westfield.lxml => page_catalog.lxml} (97%) create mode 100644 inter/aus/xml/page_catalog_group_menu_test.lxml create mode 100644 inter/aus/xml/page_drinkfail_aus.lxml create mode 100644 inter/aus/xml/route_man_test.lxml diff --git a/inter/aus/xml/open_page_catalog.ev b/inter/aus/xml/open_page_catalog.ev index bb6529bb..d9d210f2 100644 --- a/inter/aus/xml/open_page_catalog.ev +++ b/inter/aus/xml/open_page_catalog.ev @@ -1,7 +1,7 @@ If WinterWarmersCatalogFlag = 1 Then Var catalogFile = CountryRootPath + "/xml/page_catalog_winter_warmers.lxml" Else - Var catalogFile = CountryRootPath + "/xml/page_catalog_westfield.lxml" + Var catalogFile = CountryRootPath + "/xml/page_catalog.lxml" EndIf diff --git a/inter/aus/xml/page_catalog_westfield.lxml b/inter/aus/xml/page_catalog.lxml similarity index 97% rename from inter/aus/xml/page_catalog_westfield.lxml rename to inter/aus/xml/page_catalog.lxml index 37038b5b..cd41764f 100644 --- a/inter/aus/xml/page_catalog_westfield.lxml +++ b/inter/aus/xml/page_catalog.lxml @@ -42,6 +42,8 @@ Var GetPayInfoFlag = 0 Var countDownRetrun = 300 + Var OpenRouteManTest = 0 + CoinVending OFF @@ -712,6 +714,34 @@ + + + + + + + 0 + 1820 + 100 + 100 + "/mnt/sdcard/coffeevending/wav/click.wav" + SoundVolume + + Var ClickCountMainTe = ClickCountMainTe + 1 + + DEBUGVAR ClickCountMainTe + + If ClickCountMainTe = 2 Then + Var OpenRouteManTest = 1 + Open "ROOT/taobin_project/xml/page_back_to_main.xml" + Var ClickCountMainTe = 0 + EndIf + + + + + + Var StrawGetMoreState = "Invisible" Var bg_lidProblem_ST = "Invisible" diff --git a/inter/aus/xml/page_catalog_cocktail.lxml b/inter/aus/xml/page_catalog_cocktail.lxml index a1a14472..936324d7 100644 --- a/inter/aus/xml/page_catalog_cocktail.lxml +++ b/inter/aus/xml/page_catalog_cocktail.lxml @@ -681,6 +681,25 @@ + + 0 + 1820 + 100 + 100 + "/mnt/sdcard/coffeevending/wav/click.wav" + SoundVolume + + Var ClickCountMainTe = ClickCountMainTe + 1 + + DEBUGVAR ClickCountMainTe + + If ClickCountMainTe = 2 Then + Var OpenRouteManTest = 1 + Open "ROOT/taobin_project/xml/page_back_to_main.xml" + Var ClickCountMainTe = 0 + EndIf + + + + 16 + 164 + 22 + 222 + "multi2" + KanitMediumTTF + 0x322B26 + + Test Drink + นม + Test Drink + นม + + นม + + + + 16 + 220 + 14 + 222 + KanitMediumTTF + 0x6F5F51 + + Milk + นม + Milk + นม + + นม + + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + "Invisible" + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + TextPriceMenuHotX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $51-99-99-9999.Button + + + 113 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $51-99-99-9999.Button + StringFmt( $51-99-99-9999.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + "Invisible" + + + TextPriceMenuBlendX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + If $Sum5199999999 = "Disable" Then + Var ice_tab_process_show = "Disable" + Else + Var ice_tab_process_show = "Enable" + EndIf + + Else + Var ice_tab_process_show = "Invisible" + EndIf + Var return = ice_tab_process_show + ) + + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" + + + 49 + 117 + + eval( + If $Sum5199999999 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $51-99-99-9999.TAG tag2_is_disable + STRCONTAIN "ERR" $##-##-##-####.TAG tag3_is_disable + Var return = "Invisible" + If tag1_is_disable = "true" Then + Var return = "Enable" + EndIf + If tag2_is_disable = "true" Then + Var return = "Enable" + EndIf + If tag3_is_disable = "true" Then + Var return = "Enable" + EndIf + Else + Var return = "Invisible" + EndIf + ) + + "ROOT/taobin_project/image//img_menu_err2.png" + + + 84 + 266 + 10 + OpunMediumTTF + 0xDE794E + ice_tab_process_show + ice_show_open + + + 48 + 116 + 32 + 128 + 64 + "disable-show" + $Sum5199999999 + + 000013 + + center-vertical-horizontal + + + + + + RefreshAll + + + + diff --git a/inter/aus/xml/page_catalog_winter_warmers.lxml b/inter/aus/xml/page_catalog_winter_warmers.lxml index a23b4b4a..2a1ba4e0 100644 --- a/inter/aus/xml/page_catalog_winter_warmers.lxml +++ b/inter/aus/xml/page_catalog_winter_warmers.lxml @@ -693,6 +693,26 @@ + + 0 + 1820 + 100 + 100 + "/mnt/sdcard/coffeevending/wav/click.wav" + SoundVolume + + Var ClickCountMainTe = ClickCountMainTe + 1 + + DEBUGVAR ClickCountMainTe + + If ClickCountMainTe = 2 Then + Var OpenRouteManTest = 1 + Open "ROOT/taobin_project/xml/page_back_to_main.xml" + Var ClickCountMainTe = 0 + EndIf + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +; +; xRefundChannelX +; 960 +; Var( DirImage + textRefundChannelX ) +; + + + 47 + 408 + Var( DirImage + text22 ) + + +; +; 410 +; 524 +; Var( DirImage + "/Businessman_sorry.png" ) +; + + + + + 262 + 1119 + Var( DirImage + "/img5.png" ) + + + + 400 + 1160 + ShowTextNumber +; "Enable" + Var( DirImage + "/text15.png" ) + + + + 293 + 1140 + ShowTextNumber +; "Enable" + Var( DirImage + "/Group.png" ) + + + + 0 + 1140 + 1080 + Center + 62 + RobotoBlack + 0x513C2F + + TelephoneNumberProblem + Telnum-mask-1 + + + + + + + 5 + 1868 + 24 + Center + 1080 + RobotoRegular + 0xDE794E + MachineErrorDetailAll + + + + + + \ No newline at end of file diff --git a/inter/aus/xml/route_man_test.lxml b/inter/aus/xml/route_man_test.lxml new file mode 100644 index 00000000..b3e3cb68 --- /dev/null +++ b/inter/aus/xml/route_man_test.lxml @@ -0,0 +1,61 @@ + + 1080 + 1312 + SoundVolume + "0xeae6e1" + + Var OpenRouteManTest = 0 + Var Timeout = 0 + + + 1000 + + Var Timeout = Timeout + 1 + DEBUGVAR Timeout + + If Timeout > 15 Then + Open "ROOT/taobin_project/xml/page_board.xml" + EndIf + + TimerReset + + + + + + 290 + 800 + "ROOT/taobin_project/image/tab_1.png" + + TopView "show" + OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml" + OpenInst 2 "ROOT/taobin_project/inter/aus/xml/page_catalog_group_menu_test.lxml" + + + + + 290 + 800 + 500 + 75 + 30 + fontType1 + 0x000000 + center-vertical-horizontal + "Test Buy Drink" + + + + + + \ No newline at end of file diff --git a/xml/page_back_to_main.xml b/xml/page_back_to_main.xml index c9575456..e5ffcf3f 100644 --- a/xml/page_back_to_main.xml +++ b/xml/page_back_to_main.xml @@ -7,8 +7,12 @@ ; Reset here Var CheckCupStateDoorCupClose = "" - - OpenInst 0 "/mnt/sdcard/coffeevending/taobin_project/xml/page_board.xml" + If OpenRouteManTest = 1 Then + Var routeManTest = CountryRootPath + "/xml/route_man_test.lxml" + OpenInst 0 routeManTest + Else + OpenInst 0 "/mnt/sdcard/coffeevending/taobin_project/xml/page_board.xml" + EndIf If showMultiAds = "true" Then OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/sold_cup_count.xml" diff --git a/xml/page_drinkfail2.xml b/xml/page_drinkfail2.xml index b81f6ecf..49e0160b 100644 --- a/xml/page_drinkfail2.xml +++ b/xml/page_drinkfail2.xml @@ -19,6 +19,10 @@ Open "ROOT/taobin_project/inter/sgp/xml/page_drinkfail_sg.lxml" EndIf + If CountryName = "Australia" Then + Open "ROOT/taobin_project/inter/aus/xml/page_drinkfail_aus.lxml" + EndIf + If TelephoneNumberProblem = "" Then diff --git a/xml/vending_info.xml b/xml/vending_info.xml index c13b95e1..ba2fef6d 100644 --- a/xml/vending_info.xml +++ b/xml/vending_info.xml @@ -3,7 +3,7 @@ 1080 1312 SoundVolume - "ROOT/image/BG1SLOT_TAB.bmp" + "0xeae6e1" ; On open Machine AndroidTemperatureUpdateNow