diff --git a/inter/uae_dubai/xml/page_brewing3Conti.xml b/inter/uae_dubai/xml/page_brewing3Conti.lxml similarity index 100% rename from inter/uae_dubai/xml/page_brewing3Conti.xml rename to inter/uae_dubai/xml/page_brewing3Conti.lxml diff --git a/inter/uae_dubai/xml/page_brewing3Conti_blue.lxml b/inter/uae_dubai/xml/page_brewing3Conti_blue.lxml index 71b2ebc0..b4fff0a2 100644 --- a/inter/uae_dubai/xml/page_brewing3Conti_blue.lxml +++ b/inter/uae_dubai/xml/page_brewing3Conti_blue.lxml @@ -376,6 +376,27 @@ ; percent If ShowCountDownAsPercent = 1 Then + + DEBUGVAR InitCNT + If InitCNT = "" Then + Var InitCNT = BREW_CNT + DEBUGVAR "InitCNT Empty" + Else + If InitCNT = 0 Then + + If BREW_CNT > 0 Then + Var InitCNT = BREW_CNT + DEBUGVAR "BREW_CNT Slow set" + Else + Var InitCNT = ShowCountDownBrewing + DEBUGVAR "BREW_CNT Still not set" + DEBUGVAR BREW_CNT + DEBUGVAR ShowCountDownBrewing + EndIf + EndIf + EndIf + + Var XPercent = InitCNT - ShowCountDownBrewing If ShowCountDownBrewing <= 5 Then Var XPercent = 95 @@ -390,7 +411,7 @@ DEBUGVAR XPercent EndIf - + If Timeout > 540 Then SAVELOG "back_to_main from line > 217." diff --git a/inter/uae_dubai/xml/page_brewing3_blue.lxml b/inter/uae_dubai/xml/page_brewing3_blue.lxml index 4d3ab08b..923634d2 100644 --- a/inter/uae_dubai/xml/page_brewing3_blue.lxml +++ b/inter/uae_dubai/xml/page_brewing3_blue.lxml @@ -717,6 +717,25 @@ ; percent If ShowCountDownAsPercent = 1 Then + DEBUGVAR InitCNT + If InitCNT = "" Then + Var InitCNT = BREW_CNT + DEBUGVAR "InitCNT Empty" + Else + If InitCNT = 0 Then + + If BREW_CNT > 0 Then + Var InitCNT = BREW_CNT + DEBUGVAR "BREW_CNT Slow set" + Else + Var InitCNT = ShowCountDownBrewing + DEBUGVAR "BREW_CNT Still not set" + DEBUGVAR BREW_CNT + DEBUGVAR ShowCountDownBrewing + EndIf + EndIf + EndIf + Var XPercent = InitCNT - ShowCountDownBrewing If ShowCountDownBrewing <= 5 Then Var XPercent = 95 diff --git a/xml/page_lid_straw.xml b/xml/page_lid_straw.xml index 81124ea2..7add871f 100644 --- a/xml/page_lid_straw.xml +++ b/xml/page_lid_straw.xml @@ -216,7 +216,7 @@ EndIf If CountryName = "UnitedArabEmirates Dubai" Then - Var brewing3ContiInter = CountryRootPath + "/xml/page_brewing3Conti.lxml" + Var brewing3ContiInter = CountryRootPath + "/xml/page_brewing3Conti.xml" Open brewing3ContiInter Else @@ -264,7 +264,7 @@ If New_Payment = 1 Then TRY "/mnt/sdcard/coffeevending/taobin_project/xml/process/payment.ev" EndIf - + Open "ROOT/taobin_project/xml/page_brewing3.xml" Else Var Brew3Inter = CountryRootPath + "/xml/page_brewing3.lxml" @@ -302,11 +302,11 @@ Var LidState = "Invisible" EndIf - + DEBUGVAR CountryName DEBUGVAR InternationalEnable - + Var UserPressButton = "false" SAVELOG "page_lid_straw.xml"