DUBAI: fix percent negative
This commit is contained in:
parent
776aa8df4a
commit
2801a06668
4 changed files with 45 additions and 5 deletions
|
|
@ -376,6 +376,27 @@
|
||||||
|
|
||||||
; percent
|
; percent
|
||||||
If ShowCountDownAsPercent = 1 Then
|
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
|
Var XPercent = InitCNT - ShowCountDownBrewing
|
||||||
If ShowCountDownBrewing <= 5 Then
|
If ShowCountDownBrewing <= 5 Then
|
||||||
Var XPercent = 95
|
Var XPercent = 95
|
||||||
|
|
@ -390,7 +411,7 @@
|
||||||
|
|
||||||
DEBUGVAR XPercent
|
DEBUGVAR XPercent
|
||||||
EndIf
|
EndIf
|
||||||
|
|
||||||
|
|
||||||
If Timeout > 540 Then
|
If Timeout > 540 Then
|
||||||
SAVELOG "back_to_main from line > 217."
|
SAVELOG "back_to_main from line > 217."
|
||||||
|
|
|
||||||
|
|
@ -717,6 +717,25 @@
|
||||||
|
|
||||||
; percent
|
; percent
|
||||||
If ShowCountDownAsPercent = 1 Then
|
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
|
Var XPercent = InitCNT - ShowCountDownBrewing
|
||||||
If ShowCountDownBrewing <= 5 Then
|
If ShowCountDownBrewing <= 5 Then
|
||||||
Var XPercent = 95
|
Var XPercent = 95
|
||||||
|
|
|
||||||
|
|
@ -216,7 +216,7 @@
|
||||||
EndIf
|
EndIf
|
||||||
|
|
||||||
If CountryName = "UnitedArabEmirates Dubai" Then
|
If CountryName = "UnitedArabEmirates Dubai" Then
|
||||||
Var brewing3ContiInter = CountryRootPath + "/xml/page_brewing3Conti.lxml"
|
Var brewing3ContiInter = CountryRootPath + "/xml/page_brewing3Conti.xml"
|
||||||
|
|
||||||
Open brewing3ContiInter
|
Open brewing3ContiInter
|
||||||
Else
|
Else
|
||||||
|
|
@ -264,7 +264,7 @@
|
||||||
If New_Payment = 1 Then
|
If New_Payment = 1 Then
|
||||||
TRY "/mnt/sdcard/coffeevending/taobin_project/xml/process/payment.ev"
|
TRY "/mnt/sdcard/coffeevending/taobin_project/xml/process/payment.ev"
|
||||||
EndIf
|
EndIf
|
||||||
|
|
||||||
Open "ROOT/taobin_project/xml/page_brewing3.xml"
|
Open "ROOT/taobin_project/xml/page_brewing3.xml"
|
||||||
Else
|
Else
|
||||||
Var Brew3Inter = CountryRootPath + "/xml/page_brewing3.lxml"
|
Var Brew3Inter = CountryRootPath + "/xml/page_brewing3.lxml"
|
||||||
|
|
@ -302,11 +302,11 @@
|
||||||
Var LidState = "Invisible"
|
Var LidState = "Invisible"
|
||||||
EndIf
|
EndIf
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
DEBUGVAR CountryName
|
DEBUGVAR CountryName
|
||||||
DEBUGVAR InternationalEnable
|
DEBUGVAR InternationalEnable
|
||||||
|
|
||||||
Var UserPressButton = "false"
|
Var UserPressButton = "false"
|
||||||
|
|
||||||
SAVELOG "page_lid_straw.xml"
|
SAVELOG "page_lid_straw.xml"
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue