diff --git a/image/main_page/bn_main_page_member.png b/image/main_page/bn_main_page_member.png index 2d77a6c0..b4919eb8 100644 Binary files a/image/main_page/bn_main_page_member.png and b/image/main_page/bn_main_page_member.png differ diff --git a/image/main_page/bp_main_page_member.png b/image/main_page/bp_main_page_member.png index 0eff720e..7aebf59f 100644 Binary files a/image/main_page/bp_main_page_member.png and b/image/main_page/bp_main_page_member.png differ diff --git a/image/page_drink_disable_n2/bn_iced_7up.png b/image/page_drink_disable_n2/bn_iced_7up.png index 0ad18ebd..a5d8e7be 100644 Binary files a/image/page_drink_disable_n2/bn_iced_7up.png and b/image/page_drink_disable_n2/bn_iced_7up.png differ diff --git a/image/page_drink_disable_n2/bn_iced_7up_Energy_LIME.png b/image/page_drink_disable_n2/bn_iced_7up_Energy_LIME.png index dc30c1c8..2c0ec9cf 100644 Binary files a/image/page_drink_disable_n2/bn_iced_7up_Energy_LIME.png and b/image/page_drink_disable_n2/bn_iced_7up_Energy_LIME.png differ diff --git a/image/page_drink_disable_n2/bn_iced_7up_Energy_PLUM.png b/image/page_drink_disable_n2/bn_iced_7up_Energy_PLUM.png index 31cf9534..f0e44a5f 100644 Binary files a/image/page_drink_disable_n2/bn_iced_7up_Energy_PLUM.png and b/image/page_drink_disable_n2/bn_iced_7up_Energy_PLUM.png differ diff --git a/image/page_drink_disable_n2/bn_iced_7up_Lychee_LIME.png b/image/page_drink_disable_n2/bn_iced_7up_Lychee_LIME.png index 038d2f3c..39eacb30 100644 Binary files a/image/page_drink_disable_n2/bn_iced_7up_Lychee_LIME.png and b/image/page_drink_disable_n2/bn_iced_7up_Lychee_LIME.png differ diff --git a/image/page_drink_disable_n2/bn_iced_7up_MINT_LIME.png b/image/page_drink_disable_n2/bn_iced_7up_MINT_LIME.png index e5a23745..55953e75 100644 Binary files a/image/page_drink_disable_n2/bn_iced_7up_MINT_LIME.png and b/image/page_drink_disable_n2/bn_iced_7up_MINT_LIME.png differ diff --git a/image/page_drink_disable_n2/bn_iced_7up_PLUM_COFFEE.png b/image/page_drink_disable_n2/bn_iced_7up_PLUM_COFFEE.png index e6eb48c4..eff1d840 100644 Binary files a/image/page_drink_disable_n2/bn_iced_7up_PLUM_COFFEE.png and b/image/page_drink_disable_n2/bn_iced_7up_PLUM_COFFEE.png differ diff --git a/image/page_drink_disable_n2/bn_iced_7up_PLUM_Strawberry.png b/image/page_drink_disable_n2/bn_iced_7up_PLUM_Strawberry.png index dba120cc..634b621c 100644 Binary files a/image/page_drink_disable_n2/bn_iced_7up_PLUM_Strawberry.png and b/image/page_drink_disable_n2/bn_iced_7up_PLUM_Strawberry.png differ diff --git a/image/page_drink_disable_n2/bn_iced_7up_YUZU_LIME.png b/image/page_drink_disable_n2/bn_iced_7up_YUZU_LIME.png index 247989b9..598fb186 100644 Binary files a/image/page_drink_disable_n2/bn_iced_7up_YUZU_LIME.png and b/image/page_drink_disable_n2/bn_iced_7up_YUZU_LIME.png differ diff --git a/image/page_drink_disable_n2/bn_iced_7up_coconut.png b/image/page_drink_disable_n2/bn_iced_7up_coconut.png index 160cf184..d46d2eff 100644 Binary files a/image/page_drink_disable_n2/bn_iced_7up_coconut.png and b/image/page_drink_disable_n2/bn_iced_7up_coconut.png differ diff --git a/image/page_drink_disable_n2/bn_iced_7up_plum_lime.png b/image/page_drink_disable_n2/bn_iced_7up_plum_lime.png index ac5ce159..e92ea54c 100644 Binary files a/image/page_drink_disable_n2/bn_iced_7up_plum_lime.png and b/image/page_drink_disable_n2/bn_iced_7up_plum_lime.png differ diff --git a/image/page_drink_disable_n2/bn_iced_7up_sala_COFFEE.png b/image/page_drink_disable_n2/bn_iced_7up_sala_COFFEE.png index 64756a50..108ecc4a 100644 Binary files a/image/page_drink_disable_n2/bn_iced_7up_sala_COFFEE.png and b/image/page_drink_disable_n2/bn_iced_7up_sala_COFFEE.png differ diff --git a/image/page_drink_disable_n2/bn_iced_7up_sala_LIME.png b/image/page_drink_disable_n2/bn_iced_7up_sala_LIME.png index 45a6ee10..4e1ec356 100644 Binary files a/image/page_drink_disable_n2/bn_iced_7up_sala_LIME.png and b/image/page_drink_disable_n2/bn_iced_7up_sala_LIME.png differ diff --git a/image/page_drink_n/bn_iced_7up.png b/image/page_drink_n/bn_iced_7up.png index 44266f9f..8c17d14f 100644 Binary files a/image/page_drink_n/bn_iced_7up.png and b/image/page_drink_n/bn_iced_7up.png differ diff --git a/image/page_drink_n/bn_iced_7up_Energy_LIME.png b/image/page_drink_n/bn_iced_7up_Energy_LIME.png index 97120187..bb7bdf5e 100644 Binary files a/image/page_drink_n/bn_iced_7up_Energy_LIME.png and b/image/page_drink_n/bn_iced_7up_Energy_LIME.png differ diff --git a/image/page_drink_n/bn_iced_7up_Energy_PLUM.png b/image/page_drink_n/bn_iced_7up_Energy_PLUM.png index feb81457..30b4841f 100644 Binary files a/image/page_drink_n/bn_iced_7up_Energy_PLUM.png and b/image/page_drink_n/bn_iced_7up_Energy_PLUM.png differ diff --git a/image/page_drink_n/bn_iced_7up_Lychee_LIME.png b/image/page_drink_n/bn_iced_7up_Lychee_LIME.png index 683c983f..85ac5118 100644 Binary files a/image/page_drink_n/bn_iced_7up_Lychee_LIME.png and b/image/page_drink_n/bn_iced_7up_Lychee_LIME.png differ diff --git a/image/page_drink_n/bn_iced_7up_MINT_LIME.png b/image/page_drink_n/bn_iced_7up_MINT_LIME.png index 7282c333..68d0b2a5 100644 Binary files a/image/page_drink_n/bn_iced_7up_MINT_LIME.png and b/image/page_drink_n/bn_iced_7up_MINT_LIME.png differ diff --git a/image/page_drink_n/bn_iced_7up_PLUM_COFFEE.png b/image/page_drink_n/bn_iced_7up_PLUM_COFFEE.png index 05dfe952..bef97f3f 100644 Binary files a/image/page_drink_n/bn_iced_7up_PLUM_COFFEE.png and b/image/page_drink_n/bn_iced_7up_PLUM_COFFEE.png differ diff --git a/image/page_drink_n/bn_iced_7up_PLUM_Strawberry.png b/image/page_drink_n/bn_iced_7up_PLUM_Strawberry.png index ad567ae4..2a6a7deb 100644 Binary files a/image/page_drink_n/bn_iced_7up_PLUM_Strawberry.png and b/image/page_drink_n/bn_iced_7up_PLUM_Strawberry.png differ diff --git a/image/page_drink_n/bn_iced_7up_YUZU_LIME.png b/image/page_drink_n/bn_iced_7up_YUZU_LIME.png index cbdba5ad..7b6a82db 100644 Binary files a/image/page_drink_n/bn_iced_7up_YUZU_LIME.png and b/image/page_drink_n/bn_iced_7up_YUZU_LIME.png differ diff --git a/image/page_drink_n/bn_iced_7up_coconut.png b/image/page_drink_n/bn_iced_7up_coconut.png index 67a57ade..6bf064b5 100644 Binary files a/image/page_drink_n/bn_iced_7up_coconut.png and b/image/page_drink_n/bn_iced_7up_coconut.png differ diff --git a/image/page_drink_n/bn_iced_7up_plum_lime.png b/image/page_drink_n/bn_iced_7up_plum_lime.png index 3bdf89ab..675f7ce9 100644 Binary files a/image/page_drink_n/bn_iced_7up_plum_lime.png and b/image/page_drink_n/bn_iced_7up_plum_lime.png differ diff --git a/image/page_drink_n/bn_iced_7up_sala_COFFEE.png b/image/page_drink_n/bn_iced_7up_sala_COFFEE.png index 4b6e5176..1c2c8cb9 100644 Binary files a/image/page_drink_n/bn_iced_7up_sala_COFFEE.png and b/image/page_drink_n/bn_iced_7up_sala_COFFEE.png differ diff --git a/image/page_drink_n/bn_iced_7up_sala_LIME.png b/image/page_drink_n/bn_iced_7up_sala_LIME.png index cf8c3e11..63759c76 100644 Binary files a/image/page_drink_n/bn_iced_7up_sala_LIME.png and b/image/page_drink_n/bn_iced_7up_sala_LIME.png differ diff --git a/image/page_drink_picture2_n/bn_iced_7up.png b/image/page_drink_picture2_n/bn_iced_7up.png index 3c886c9c..d9f91d13 100644 Binary files a/image/page_drink_picture2_n/bn_iced_7up.png and b/image/page_drink_picture2_n/bn_iced_7up.png differ diff --git a/image/page_drink_picture2_n/bn_iced_7up_Energy_LIME.png b/image/page_drink_picture2_n/bn_iced_7up_Energy_LIME.png index 8c211b36..2182bf8c 100644 Binary files a/image/page_drink_picture2_n/bn_iced_7up_Energy_LIME.png and b/image/page_drink_picture2_n/bn_iced_7up_Energy_LIME.png differ diff --git a/image/page_drink_picture2_n/bn_iced_7up_Energy_PLUM.png b/image/page_drink_picture2_n/bn_iced_7up_Energy_PLUM.png index 13281a07..b7108852 100644 Binary files a/image/page_drink_picture2_n/bn_iced_7up_Energy_PLUM.png and b/image/page_drink_picture2_n/bn_iced_7up_Energy_PLUM.png differ diff --git a/image/page_drink_picture2_n/bn_iced_7up_Lychee_LIME.png b/image/page_drink_picture2_n/bn_iced_7up_Lychee_LIME.png index b2ec3c7e..4c31de0c 100644 Binary files a/image/page_drink_picture2_n/bn_iced_7up_Lychee_LIME.png and b/image/page_drink_picture2_n/bn_iced_7up_Lychee_LIME.png differ diff --git a/image/page_drink_picture2_n/bn_iced_7up_MINT_LIME.png b/image/page_drink_picture2_n/bn_iced_7up_MINT_LIME.png index d9fcafaa..382de29c 100644 Binary files a/image/page_drink_picture2_n/bn_iced_7up_MINT_LIME.png and b/image/page_drink_picture2_n/bn_iced_7up_MINT_LIME.png differ diff --git a/image/page_drink_picture2_n/bn_iced_7up_PLUM_COFFEE.png b/image/page_drink_picture2_n/bn_iced_7up_PLUM_COFFEE.png index c82bd3e6..305b441e 100644 Binary files a/image/page_drink_picture2_n/bn_iced_7up_PLUM_COFFEE.png and b/image/page_drink_picture2_n/bn_iced_7up_PLUM_COFFEE.png differ diff --git a/image/page_drink_picture2_n/bn_iced_7up_PLUM_Strawberry.png b/image/page_drink_picture2_n/bn_iced_7up_PLUM_Strawberry.png index 2076e997..45e64cde 100644 Binary files a/image/page_drink_picture2_n/bn_iced_7up_PLUM_Strawberry.png and b/image/page_drink_picture2_n/bn_iced_7up_PLUM_Strawberry.png differ diff --git a/image/page_drink_picture2_n/bn_iced_7up_YUZU_LIME.png b/image/page_drink_picture2_n/bn_iced_7up_YUZU_LIME.png index 253eba03..80997242 100644 Binary files a/image/page_drink_picture2_n/bn_iced_7up_YUZU_LIME.png and b/image/page_drink_picture2_n/bn_iced_7up_YUZU_LIME.png differ diff --git a/image/page_drink_picture2_n/bn_iced_7up_coconut.png b/image/page_drink_picture2_n/bn_iced_7up_coconut.png index 52471419..c5a5ac98 100644 Binary files a/image/page_drink_picture2_n/bn_iced_7up_coconut.png and b/image/page_drink_picture2_n/bn_iced_7up_coconut.png differ diff --git a/image/page_drink_picture2_n/bn_iced_7up_plum_lime.png b/image/page_drink_picture2_n/bn_iced_7up_plum_lime.png index b034cf72..66cc03f3 100644 Binary files a/image/page_drink_picture2_n/bn_iced_7up_plum_lime.png and b/image/page_drink_picture2_n/bn_iced_7up_plum_lime.png differ diff --git a/image/page_drink_picture2_n/bn_iced_7up_sala_COFFEE.png b/image/page_drink_picture2_n/bn_iced_7up_sala_COFFEE.png index 95ce82d3..6b010b48 100644 Binary files a/image/page_drink_picture2_n/bn_iced_7up_sala_COFFEE.png and b/image/page_drink_picture2_n/bn_iced_7up_sala_COFFEE.png differ diff --git a/image/page_drink_picture2_n/bn_iced_7up_sala_LIME.png b/image/page_drink_picture2_n/bn_iced_7up_sala_LIME.png index 53b9d529..2cac50b5 100644 Binary files a/image/page_drink_picture2_n/bn_iced_7up_sala_LIME.png and b/image/page_drink_picture2_n/bn_iced_7up_sala_LIME.png differ diff --git a/image/page_drink_press_n/bn_iced_7up.png b/image/page_drink_press_n/bn_iced_7up.png index 4612efc7..20ba2e6d 100644 Binary files a/image/page_drink_press_n/bn_iced_7up.png and b/image/page_drink_press_n/bn_iced_7up.png differ diff --git a/image/page_drink_press_n/bn_iced_7up_Energy_LIME.png b/image/page_drink_press_n/bn_iced_7up_Energy_LIME.png index 8993ad81..2f3b1358 100644 Binary files a/image/page_drink_press_n/bn_iced_7up_Energy_LIME.png and b/image/page_drink_press_n/bn_iced_7up_Energy_LIME.png differ diff --git a/image/page_drink_press_n/bn_iced_7up_Energy_PLUM.png b/image/page_drink_press_n/bn_iced_7up_Energy_PLUM.png index ed9d66bf..05e317e4 100644 Binary files a/image/page_drink_press_n/bn_iced_7up_Energy_PLUM.png and b/image/page_drink_press_n/bn_iced_7up_Energy_PLUM.png differ diff --git a/image/page_drink_press_n/bn_iced_7up_Lychee_LIME.png b/image/page_drink_press_n/bn_iced_7up_Lychee_LIME.png index a35cb764..f1b38313 100644 Binary files a/image/page_drink_press_n/bn_iced_7up_Lychee_LIME.png and b/image/page_drink_press_n/bn_iced_7up_Lychee_LIME.png differ diff --git a/image/page_drink_press_n/bn_iced_7up_MINT_LIME.png b/image/page_drink_press_n/bn_iced_7up_MINT_LIME.png index ecd8dc71..ea489254 100644 Binary files a/image/page_drink_press_n/bn_iced_7up_MINT_LIME.png and b/image/page_drink_press_n/bn_iced_7up_MINT_LIME.png differ diff --git a/image/page_drink_press_n/bn_iced_7up_PLUM_COFFEE.png b/image/page_drink_press_n/bn_iced_7up_PLUM_COFFEE.png index f612fe6f..15d89233 100644 Binary files a/image/page_drink_press_n/bn_iced_7up_PLUM_COFFEE.png and b/image/page_drink_press_n/bn_iced_7up_PLUM_COFFEE.png differ diff --git a/image/page_drink_press_n/bn_iced_7up_PLUM_Strawberry.png b/image/page_drink_press_n/bn_iced_7up_PLUM_Strawberry.png index 7cb8b5f7..a399bcd0 100644 Binary files a/image/page_drink_press_n/bn_iced_7up_PLUM_Strawberry.png and b/image/page_drink_press_n/bn_iced_7up_PLUM_Strawberry.png differ diff --git a/image/page_drink_press_n/bn_iced_7up_YUZU_LIME.png b/image/page_drink_press_n/bn_iced_7up_YUZU_LIME.png index 8ccd6373..44b58ee0 100644 Binary files a/image/page_drink_press_n/bn_iced_7up_YUZU_LIME.png and b/image/page_drink_press_n/bn_iced_7up_YUZU_LIME.png differ diff --git a/image/page_drink_press_n/bn_iced_7up_coconut.png b/image/page_drink_press_n/bn_iced_7up_coconut.png index 069883e0..0d63ace0 100644 Binary files a/image/page_drink_press_n/bn_iced_7up_coconut.png and b/image/page_drink_press_n/bn_iced_7up_coconut.png differ diff --git a/image/page_drink_press_n/bn_iced_7up_plum_lime.png b/image/page_drink_press_n/bn_iced_7up_plum_lime.png index 609bd7a4..cbdc81d8 100644 Binary files a/image/page_drink_press_n/bn_iced_7up_plum_lime.png and b/image/page_drink_press_n/bn_iced_7up_plum_lime.png differ diff --git a/image/page_drink_press_n/bn_iced_7up_sala_COFFEE.png b/image/page_drink_press_n/bn_iced_7up_sala_COFFEE.png index f0a04dd3..14a9024a 100644 Binary files a/image/page_drink_press_n/bn_iced_7up_sala_COFFEE.png and b/image/page_drink_press_n/bn_iced_7up_sala_COFFEE.png differ diff --git a/image/page_drink_press_n/bn_iced_7up_sala_LIME.png b/image/page_drink_press_n/bn_iced_7up_sala_LIME.png index 9ec74fa7..96ee5bce 100644 Binary files a/image/page_drink_press_n/bn_iced_7up_sala_LIME.png and b/image/page_drink_press_n/bn_iced_7up_sala_LIME.png differ diff --git a/xml/page_drink_stuck.xml b/xml/page_drink_stuck.xml index f2d9886c..46fa07db 100644 --- a/xml/page_drink_stuck.xml +++ b/xml/page_drink_stuck.xml @@ -109,6 +109,7 @@ EndIf EndIf + Var CoundUpDelayCertainStage = 0 @@ -189,11 +190,8 @@ EndIf - If DoorCupPosition = "bottom" Then - Var buttonRemoveCup = "Enable" - Var txtDrinkOKState = "Enable" - EndIf + ; away If NextOrder = "true" Then @@ -232,7 +230,7 @@ TransferVar "next" "curr" Var Seeker = "curr" - SAVELOG "Make next order by take-cup" + SAVELOG "Make next order by take-cup pagedrinkstuct" Open "ROOT/taobin_project/xml/page_thankyouConti.xml" ; END @@ -249,26 +247,11 @@ ; If MachineStage = "remove-cup" Then - If CART_COUNT = 0 Then - If NextOrder = "false" Then - Open "ROOT/taobin_project/xml/page_back_to_remove_cup.xml" - Else - Var buttonRemoveCup = "Enable" - Var txtDrinkOKState = "Enable" - - Var Timeout2 = Timeout2 + 1 - - If Timeout2 > 15 Then - Play "/mnt/sdcard/coffeevending/taobin_project/sound_thai/remove_cup.mp3" - Var Timeout2 = 0 - EndIf - - EndIf - Else - - Var buttonRemoveCup = "Enable" - Var txtDrinkOKState = "Enable" + If NextOrder = "false" Then + Open "ROOT/taobin_project/xml/page_back_to_remove_cup.xml" + Else + Var txtDrinkOKState = "Enable" Var Timeout2 = Timeout2 + 1 @@ -280,6 +263,7 @@ EndIf EndIf + If Timeout = 5 Then If show_eng = "true" Then @@ -293,18 +277,6 @@ Else Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/drinkfinish.mp3" - ; Play Sound #zone - If SoundBackToSchoolEnable = 1 Then - - If SoundBackToSchoolType = 1 Then - Var RootPathSoundBackToSchool = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/boy/" - EndIf - If SoundBackToSchoolType = 2 Then - Var RootPathSoundBackToSchool = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/girl/" - EndIf - Var PlaySoundLag = RootPathSoundBackToSchool + "drinkfinish.wav" - EndIf - Play PlaySoundLag EndIf EndIf @@ -327,6 +299,26 @@ EndIf EndIf + If DoorCupPosition = "bottom" Then + + Else + Var buttonRemoveCup = "Invisible" + Var CoundUpDelayCertainStage = 0 + EndIf + + + If HaveCup = "true" Then + If DoorCupPosition = "bottom" Then + If buttonRemoveCup = "Invisible" Then + Var CoundUpDelayCertainStage = CoundUpDelayCertainStage + 1 + If CoundUpDelayCertainStage > 8 Then + Var buttonRemoveCup = "Enable" + EndIf + EndIf + EndIf + EndIf + + If txtDrinkOKState = "Enable" Then Var TextBottomShow = "Invisible" @@ -347,6 +339,7 @@ EndIf +;include=ROOT/taobin_project/inc/remove_cup_tag_event.inc ;include="ROOT/taobin_project/inc/video.inc" @@ -452,9 +445,7 @@ Var( DirImage + "/bn_open_door.png" ) Var( DirImage + "/bp_open_door.png" ) - ;Var buttonRemoveCup = "Invisible" - Machine RemoveCup - Machine DoorLidOpen + ;include=ROOT/taobin_project/inc/remove_cup_button.inc Refresh diff --git a/xml/page_topping_select7.xml b/xml/page_topping_select7.xml index 06352f60..3a0bdce4 100644 --- a/xml/page_topping_select7.xml +++ b/xml/page_topping_select7.xml @@ -6349,240 +6349,6 @@ -; liveness + camera + IDcard - - - - ; next + + + ; energy drink 1 bath