diff --git a/image/page_doing/txt_2.png b/image/page_doing/txt_2.png index 1aa9a631..20069a36 100644 Binary files a/image/page_doing/txt_2.png and b/image/page_doing/txt_2.png differ diff --git a/image/page_doing/txt_2_en.png b/image/page_doing/txt_2_en.png index 9f9d2ec9..5842adfd 100644 Binary files a/image/page_doing/txt_2_en.png and b/image/page_doing/txt_2_en.png differ diff --git a/xml/page_catalog_choose_drink1.xml b/xml/page_catalog_choose_drink1.xml index 3841426d..b4b534ff 100644 --- a/xml/page_catalog_choose_drink1.xml +++ b/xml/page_catalog_choose_drink1.xml @@ -1,270 +1,259 @@ - - - - - - "Enable" - 1080 - 1920 - "0xeae6e1" - SoundVolume - - ; On open - - If show_eng = "true" Then - Var showthaiText = "Invisible" - Var showengText = "Enable" - Var DirImage = "ROOT/taobin_project/image/page3_en" - Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png" - Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png" - - Else - Var showengText = "Invisible" - Var showthaiText = "Enable" - - Var DirImage = "ROOT/taobin_project/image/page3" - Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png" - Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png" - EndIf - - Var Menu1Selected = "PressForever" - Var Menu2Selected = "Enable" - Var Menu3Selected = "Enable" - Var Menu4Selected = "Enable" - Var Menu5Selected = "Invisible" - Var Menu6Selected = "Enable" - Var Menu7Selected = "Enable" - Var Menu8Selected = "Invisible" - - If CocktailShow = "true" Then - Var Menu7Selected = "Invisible" - Var Menu8Selected = "Enable" - EndIf - - SAVELOG PreviseXMLFileName2 - - Var Timeout = 0 - - If NetworkStatus = "ACTIVATE" Then - Var ShowNetworkProblem = "Invisible" - Var ShowNetworkProblemText = "" - - Else - Var ShowNetworkProblem = "Enable" - Var ShowButtonClick2 = "Invisible" - Var ShowNetworkProblemText = "การสื่อสารขัดข้อง ชำระเงินได้เฉพาะเงินสด" - EndIf - - - - - - 1000 - - If NextPage = "-" Then - - Else - If Timeout > 30 Then - Open NextPage - EndIf - EndIf - - If Timeout > 60 Then - Open "ROOT/taobin_project/xml/page_back_to_main.xml" - EndIf - - If BrewCommand = "RefreshAll" Then - Var BrewCommand = "-" - Open CurrentXMLFileName2 - EndIf - - Var Timeout = Timeout + 1 - TimerReset - - - -; -; 0 -; 0 -; "ROOT/taobin_project/image/ad_medium_2.png" -; - - - -; under line - - 0 - 494 - "ROOT/taobin_project/image/page3/tab_line_bottom.png" - - - -; under line - - 0 - 358 - "ROOT/taobin_project/image/page3/bg1.png" - - - -; back - - - - -; - - - - - - - - - - - - - - -; obselete -; - - - - - + + + + + + "Enable" + 1080 + 1920 + "0xeae6e1" + SoundVolume + + ; On open + + If show_eng = "true" Then + Var showthaiText = "Invisible" + Var showengText = "Enable" + Var DirImage = "ROOT/taobin_project/image/page3_en" + Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png" + Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png" + + Else + Var showengText = "Invisible" + Var showthaiText = "Enable" + + Var DirImage = "ROOT/taobin_project/image/page3" + Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png" + Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png" + EndIf + + Var Menu1Selected = "PressForever" + Var Menu2Selected = "Enable" + Var Menu3Selected = "Enable" + Var Menu4Selected = "Enable" + Var Menu5Selected = "Invisible" + Var Menu6Selected = "Enable" + Var Menu7Selected = "Enable" + Var Menu8Selected = "Invisible" + + If CocktailShow = "true" Then + Var Menu7Selected = "Invisible" + Var Menu8Selected = "Enable" + EndIf + + SAVELOG PreviseXMLFileName2 + + Var Timeout = 0 + + + + + 1000 + + If NextPage = "-" Then + + Else + If Timeout > 30 Then + Open NextPage + EndIf + EndIf + + If Timeout > 60 Then + Open "ROOT/taobin_project/xml/page_back_to_main.xml" + EndIf + + If BrewCommand = "RefreshAll" Then + Var BrewCommand = "-" + Open CurrentXMLFileName2 + EndIf + + Var Timeout = Timeout + 1 + TimerReset + + + +; +; 0 +; 0 +; "ROOT/taobin_project/image/ad_medium_2.png" +; + + + +; under line + + 0 + 494 + "ROOT/taobin_project/image/page3/tab_line_bottom.png" + + + +; under line + + 0 + 358 + "ROOT/taobin_project/image/page3/bg1.png" + + + +; back + + + + +; + + + + + + + + + + + + + + +; obselete +; + + + + + 10 497 @@ -1761,29 +1750,10 @@ - - - - - - 5 - 1880 - 24 - Center - 1080 - RobotoRegular - 0xFFFFFF - ShowNetworkProblemText - - - - - - + + + + + + +