This commit is contained in:
kong 2020-10-20 15:48:39 +07:00
parent f7903cce0f
commit 575dfefcab
13 changed files with 111 additions and 163 deletions

View file

@ -51,7 +51,7 @@
out_xml( '\t<Size> 27 </Size>\r\n')
out_xml( '\t<Font> KanitTTF </Font>\r\n')
out_xml( '\t<Color> 0xB78F24 </Color>\r\n')
out_xml( '\t<Value> "Free" </Value>\r\n')
out_xml( '\t<Value> "Free!" </Value>\r\n')
out_xml( '\t</Text>\r\n')
out_xml( '\t<Text>\r\n')
else:

View file

@ -394,7 +394,7 @@
<Size> 27 </Size>
<Font> KanitTTF </Font>
<Color> 0xB78F24 </Color>
<Value> "Free" </Value>
<Value> "Free!" </Value>
</Text>
<Text>
<Text>
@ -423,7 +423,7 @@
<Size> 27 </Size>
<Font> KanitTTF </Font>
<Color> 0xB78F24 </Color>
<Value> "Free" </Value>
<Value> "Free!" </Value>
</Text>
<Text>
<Text>
@ -452,7 +452,7 @@
<Size> 27 </Size>
<Font> KanitTTF </Font>
<Color> 0xB78F24 </Color>
<Value> "Free" </Value>
<Value> "Free!" </Value>
</Text>
<Text>
<Text>
@ -481,7 +481,7 @@
<Size> 27 </Size>
<Font> KanitTTF </Font>
<Color> 0xB78F24 </Color>
<Value> "Free" </Value>
<Value> "Free!" </Value>
</Text>
<Text>
<Text>
@ -510,7 +510,7 @@
<Size> 27 </Size>
<Font> KanitTTF </Font>
<Color> 0xB78F24 </Color>
<Value> "Free" </Value>
<Value> "Free!" </Value>
</Text>
<Text>
<Text>
@ -539,7 +539,7 @@
<Size> 27 </Size>
<Font> KanitTTF </Font>
<Color> 0xB78F24 </Color>
<Value> "Free" </Value>
<Value> "Free!" </Value>
</Text>
<Text>
<Text>
@ -568,7 +568,7 @@
<Size> 27 </Size>
<Font> KanitTTF </Font>
<Color> 0xB78F24 </Color>
<Value> "Free" </Value>
<Value> "Free!" </Value>
</Text>
<Text>
<Text>
@ -597,7 +597,7 @@
<Size> 27 </Size>
<Font> KanitTTF </Font>
<Color> 0xB78F24 </Color>
<Value> "Free" </Value>
<Value> "Free!" </Value>
</Text>
<Text>
<Text>
@ -626,7 +626,7 @@
<Size> 27 </Size>
<Font> KanitTTF </Font>
<Color> 0xB78F24 </Color>
<Value> "Free" </Value>
<Value> "Free!" </Value>
</Text>
<Text>
<Text>
@ -655,7 +655,7 @@
<Size> 27 </Size>
<Font> KanitTTF </Font>
<Color> 0xB78F24 </Color>
<Value> "Free" </Value>
<Value> "Free!" </Value>
</Text>
<Text>
<Text>

View file

@ -484,7 +484,7 @@
<Size> 27 </Size>
<Font> KanitTTF </Font>
<Color> 0xB78F24 </Color>
<Value> "Free" </Value>
<Value> "Free!" </Value>
</Text>
<Text>
<Text>
@ -513,7 +513,7 @@
<Size> 27 </Size>
<Font> KanitTTF </Font>
<Color> 0xB78F24 </Color>
<Value> "Free" </Value>
<Value> "Free!" </Value>
</Text>
<Text>
<Text>
@ -542,7 +542,7 @@
<Size> 27 </Size>
<Font> KanitTTF </Font>
<Color> 0xB78F24 </Color>
<Value> "Free" </Value>
<Value> "Free!" </Value>
</Text>
<Text>
<Text>
@ -571,7 +571,7 @@
<Size> 27 </Size>
<Font> KanitTTF </Font>
<Color> 0xB78F24 </Color>
<Value> "Free" </Value>
<Value> "Free!" </Value>
</Text>
<Text>
<Text>
@ -600,7 +600,7 @@
<Size> 27 </Size>
<Font> KanitTTF </Font>
<Color> 0xB78F24 </Color>
<Value> "Free" </Value>
<Value> "Free!" </Value>
</Text>
<Text>
<Text>
@ -629,7 +629,7 @@
<Size> 27 </Size>
<Font> KanitTTF </Font>
<Color> 0xB78F24 </Color>
<Value> "Free" </Value>
<Value> "Free!" </Value>
</Text>
<Text>
<Text>
@ -658,7 +658,7 @@
<Size> 27 </Size>
<Font> KanitTTF </Font>
<Color> 0xB78F24 </Color>
<Value> "Free" </Value>
<Value> "Free!" </Value>
</Text>
<Text>
<Text>
@ -687,7 +687,7 @@
<Size> 27 </Size>
<Font> KanitTTF </Font>
<Color> 0xB78F24 </Color>
<Value> "Free" </Value>
<Value> "Free!" </Value>
</Text>
<Text>
<Text>
@ -716,7 +716,7 @@
<Size> 27 </Size>
<Font> KanitTTF </Font>
<Color> 0xB78F24 </Color>
<Value> "Free" </Value>
<Value> "Free!" </Value>
</Text>
<Text>
<Text>
@ -745,7 +745,7 @@
<Size> 27 </Size>
<Font> KanitTTF </Font>
<Color> 0xB78F24 </Color>
<Value> "Free" </Value>
<Value> "Free!" </Value>
</Text>
<Text>
<Text>
@ -774,7 +774,7 @@
<Size> 27 </Size>
<Font> KanitTTF </Font>
<Color> 0xB78F24 </Color>
<Value> "Free" </Value>
<Value> "Free!" </Value>
</Text>
<Text>
<Text>
@ -803,7 +803,7 @@
<Size> 27 </Size>
<Font> KanitTTF </Font>
<Color> 0xB78F24 </Color>
<Value> "Free" </Value>
<Value> "Free!" </Value>
</Text>
<Text>
<Text>
@ -832,7 +832,7 @@
<Size> 27 </Size>
<Font> KanitTTF </Font>
<Color> 0xB78F24 </Color>
<Value> "Free" </Value>
<Value> "Free!" </Value>
</Text>
<Text>
<Text>
@ -861,7 +861,7 @@
<Size> 27 </Size>
<Font> KanitTTF </Font>
<Color> 0xB78F24 </Color>
<Value> "Free" </Value>
<Value> "Free!" </Value>
</Text>
<Text>
<Text>

View file

@ -577,7 +577,7 @@
<Size> 27 </Size>
<Font> KanitTTF </Font>
<Color> 0xB78F24 </Color>
<Value> "Free" </Value>
<Value> "Free!" </Value>
</Text>
<Text>
<Text>
@ -606,7 +606,7 @@
<Size> 27 </Size>
<Font> KanitTTF </Font>
<Color> 0xB78F24 </Color>
<Value> "Free" </Value>
<Value> "Free!" </Value>
</Text>
<Text>
<Text>
@ -635,7 +635,7 @@
<Size> 27 </Size>
<Font> KanitTTF </Font>
<Color> 0xB78F24 </Color>
<Value> "Free" </Value>
<Value> "Free!" </Value>
</Text>
<Text>
<Text>
@ -664,7 +664,7 @@
<Size> 27 </Size>
<Font> KanitTTF </Font>
<Color> 0xB78F24 </Color>
<Value> "Free" </Value>
<Value> "Free!" </Value>
</Text>
<Text>
<Text>
@ -693,7 +693,7 @@
<Size> 27 </Size>
<Font> KanitTTF </Font>
<Color> 0xB78F24 </Color>
<Value> "Free" </Value>
<Value> "Free!" </Value>
</Text>
<Text>
<Text>
@ -722,7 +722,7 @@
<Size> 27 </Size>
<Font> KanitTTF </Font>
<Color> 0xB78F24 </Color>
<Value> "Free" </Value>
<Value> "Free!" </Value>
</Text>
<Text>
<Text>
@ -751,7 +751,7 @@
<Size> 27 </Size>
<Font> KanitTTF </Font>
<Color> 0xB78F24 </Color>
<Value> "Free" </Value>
<Value> "Free!" </Value>
</Text>
<Text>
<Text>
@ -780,7 +780,7 @@
<Size> 27 </Size>
<Font> KanitTTF </Font>
<Color> 0xB78F24 </Color>
<Value> "Free" </Value>
<Value> "Free!" </Value>
</Text>
<Text>
<Text>
@ -809,7 +809,7 @@
<Size> 27 </Size>
<Font> KanitTTF </Font>
<Color> 0xB78F24 </Color>
<Value> "Free" </Value>
<Value> "Free!" </Value>
</Text>
<Text>
<Text>
@ -838,7 +838,7 @@
<Size> 27 </Size>
<Font> KanitTTF </Font>
<Color> 0xB78F24 </Color>
<Value> "Free" </Value>
<Value> "Free!" </Value>
</Text>
<Text>
<Text>
@ -867,7 +867,7 @@
<Size> 27 </Size>
<Font> KanitTTF </Font>
<Color> 0xB78F24 </Color>
<Value> "Free" </Value>
<Value> "Free!" </Value>
</Text>
<Text>
<Text>
@ -896,7 +896,7 @@
<Size> 27 </Size>
<Font> KanitTTF </Font>
<Color> 0xB78F24 </Color>
<Value> "Free" </Value>
<Value> "Free!" </Value>
</Text>
<Text>
<Text>
@ -925,7 +925,7 @@
<Size> 27 </Size>
<Font> KanitTTF </Font>
<Color> 0xB78F24 </Color>
<Value> "Free" </Value>
<Value> "Free!" </Value>
</Text>
<Text>
<Text>
@ -954,7 +954,7 @@
<Size> 27 </Size>
<Font> KanitTTF </Font>
<Color> 0xB78F24 </Color>
<Value> "Free" </Value>
<Value> "Free!" </Value>
</Text>
<Text>
<Text>
@ -983,7 +983,7 @@
<Size> 27 </Size>
<Font> KanitTTF </Font>
<Color> 0xB78F24 </Color>
<Value> "Free" </Value>
<Value> "Free!" </Value>
</Text>
<Text>
<Text>
@ -1012,7 +1012,7 @@
<Size> 27 </Size>
<Font> KanitTTF </Font>
<Color> 0xB78F24 </Color>
<Value> "Free" </Value>
<Value> "Free!" </Value>
</Text>
<Text>
<Text>
@ -1041,7 +1041,7 @@
<Size> 27 </Size>
<Font> KanitTTF </Font>
<Color> 0xB78F24 </Color>
<Value> "Free" </Value>
<Value> "Free!" </Value>
</Text>
<Text>
<Text>
@ -1070,7 +1070,7 @@
<Size> 27 </Size>
<Font> KanitTTF </Font>
<Color> 0xB78F24 </Color>
<Value> "Free" </Value>
<Value> "Free!" </Value>
</Text>
<Text>
<Text>

View file

@ -302,7 +302,7 @@
<Size> 27 </Size>
<Font> KanitTTF </Font>
<Color> 0xB78F24 </Color>
<Value> "Free" </Value>
<Value> "Free!" </Value>
</Text>
<Text>
<Text>
@ -331,7 +331,7 @@
<Size> 27 </Size>
<Font> KanitTTF </Font>
<Color> 0xB78F24 </Color>
<Value> "Free" </Value>
<Value> "Free!" </Value>
</Text>
<Text>
<Text>
@ -360,7 +360,7 @@
<Size> 27 </Size>
<Font> KanitTTF </Font>
<Color> 0xB78F24 </Color>
<Value> "Free" </Value>
<Value> "Free!" </Value>
</Text>
<Text>
<Text>
@ -389,7 +389,7 @@
<Size> 27 </Size>
<Font> KanitTTF </Font>
<Color> 0xB78F24 </Color>
<Value> "Free" </Value>
<Value> "Free!" </Value>
</Text>
<Text>
<Text>
@ -418,7 +418,7 @@
<Size> 27 </Size>
<Font> KanitTTF </Font>
<Color> 0xB78F24 </Color>
<Value> "Free" </Value>
<Value> "Free!" </Value>
</Text>
<Text>
<Text>
@ -447,7 +447,7 @@
<Size> 27 </Size>
<Font> KanitTTF </Font>
<Color> 0xB78F24 </Color>
<Value> "Free" </Value>
<Value> "Free!" </Value>
</Text>
<Text>
<Text>

View file

@ -258,7 +258,7 @@
<Size> 27 </Size>
<Font> KanitTTF </Font>
<Color> 0xB78F24 </Color>
<Value> "Free" </Value>
<Value> "Free!" </Value>
</Text>
<Text>
<Text>
@ -287,7 +287,7 @@
<Size> 27 </Size>
<Font> KanitTTF </Font>
<Color> 0xB78F24 </Color>
<Value> "Free" </Value>
<Value> "Free!" </Value>
</Text>
<Text>
<Text>
@ -316,7 +316,7 @@
<Size> 27 </Size>
<Font> KanitTTF </Font>
<Color> 0xB78F24 </Color>
<Value> "Free" </Value>
<Value> "Free!" </Value>
</Text>
<Text>
<Text>
@ -345,7 +345,7 @@
<Size> 27 </Size>
<Font> KanitTTF </Font>
<Color> 0xB78F24 </Color>
<Value> "Free" </Value>
<Value> "Free!" </Value>
</Text>
<Text>
<Text>

View file

@ -350,7 +350,7 @@
<Size> 27 </Size>
<Font> KanitTTF </Font>
<Color> 0xB78F24 </Color>
<Value> "Free" </Value>
<Value> "Free!" </Value>
</Text>
<Text>
<Text>
@ -379,7 +379,7 @@
<Size> 27 </Size>
<Font> KanitTTF </Font>
<Color> 0xB78F24 </Color>
<Value> "Free" </Value>
<Value> "Free!" </Value>
</Text>
<Text>
<Text>
@ -408,7 +408,7 @@
<Size> 27 </Size>
<Font> KanitTTF </Font>
<Color> 0xB78F24 </Color>
<Value> "Free" </Value>
<Value> "Free!" </Value>
</Text>
<Text>
<Text>
@ -437,7 +437,7 @@
<Size> 27 </Size>
<Font> KanitTTF </Font>
<Color> 0xB78F24 </Color>
<Value> "Free" </Value>
<Value> "Free!" </Value>
</Text>
<Text>
<Text>
@ -466,7 +466,7 @@
<Size> 27 </Size>
<Font> KanitTTF </Font>
<Color> 0xB78F24 </Color>
<Value> "Free" </Value>
<Value> "Free!" </Value>
</Text>
<Text>
<Text>
@ -495,7 +495,7 @@
<Size> 27 </Size>
<Font> KanitTTF </Font>
<Color> 0xB78F24 </Color>
<Value> "Free" </Value>
<Value> "Free!" </Value>
</Text>
<Text>
<Text>
@ -524,7 +524,7 @@
<Size> 27 </Size>
<Font> KanitTTF </Font>
<Color> 0xB78F24 </Color>
<Value> "Free" </Value>
<Value> "Free!" </Value>
</Text>
<Text>
<Text>
@ -553,7 +553,7 @@
<Size> 27 </Size>
<Font> KanitTTF </Font>
<Color> 0xB78F24 </Color>
<Value> "Free" </Value>
<Value> "Free!" </Value>
</Text>
<Text>
<Text>

View file

@ -304,7 +304,7 @@
<Size> 27 </Size>
<Font> KanitTTF </Font>
<Color> 0xB78F24 </Color>
<Value> "Free" </Value>
<Value> "Free!" </Value>
</Text>
<Text>
<Text>
@ -333,7 +333,7 @@
<Size> 27 </Size>
<Font> KanitTTF </Font>
<Color> 0xB78F24 </Color>
<Value> "Free" </Value>
<Value> "Free!" </Value>
</Text>
<Text>
<Text>
@ -362,7 +362,7 @@
<Size> 27 </Size>
<Font> KanitTTF </Font>
<Color> 0xB78F24 </Color>
<Value> "Free" </Value>
<Value> "Free!" </Value>
</Text>
<Text>
<Text>
@ -391,7 +391,7 @@
<Size> 27 </Size>
<Font> KanitTTF </Font>
<Color> 0xB78F24 </Color>
<Value> "Free" </Value>
<Value> "Free!" </Value>
</Text>
<Text>
<Text>
@ -420,7 +420,7 @@
<Size> 27 </Size>
<Font> KanitTTF </Font>
<Color> 0xB78F24 </Color>
<Value> "Free" </Value>
<Value> "Free!" </Value>
</Text>
<Text>
<Text>
@ -449,7 +449,7 @@
<Size> 27 </Size>
<Font> KanitTTF </Font>
<Color> 0xB78F24 </Color>
<Value> "Free" </Value>
<Value> "Free!" </Value>
</Text>
<Text>
<Text>

View file

@ -317,52 +317,52 @@
Else
If GetPayInfoFlag = 0 Then
If GetPayInfoFlag = 0 Then
VendingQR OFF
VendingQR OFF
Var CodeNumber = TelephoneNumber
Var RemainAmount = 0
PrepareDrink SelectDrink SelectSugarID
Var CodeNumber = TelephoneNumber
Var RemainAmount = 0
PrepareDrink SelectDrink SelectSugarID
Var SessionID2 = SelectSlot + ":"
Var SessionID2 = SessionID2 + sugarID
Var SessionID2 = SessionID2 + "000"
Var SessionID2 = SelectSlot + ":"
Var SessionID2 = SessionID2 + sugarID
Var SessionID2 = SessionID2 + "000"
Var CreditAmount1 = ""
Var ServiceAmountFlow = ""
Var TelephoneNumber = "0899999999"
Var ServiceType = "coffee"
Var ECommerce = ""
Var ECommerce = ECommerce + PriceDrink
Var ECommerce = ECommerce + "/"
Var ECommerce = ECommerce + DiscountDrink
Var ECommerce = ECommerce + "/"
Var ECommerce = ECommerce + SessionID2
Var ECommerce = ECommerce + "/"
Var ECommerce = ECommerce + SelectDrink
Var ECommerce = ECommerce + "/"
Var ECommerce = ECommerce + "C00"
Var ECommerce = ECommerce + "/"
Var ECommerce = ECommerce + CodeNumber
Var ServiceParameter = "max"
Var ServiceCharge = 0
Var AccountType = "new"
Var testservice = "kbank"
Var tc = ""
Var GetScore = ""
Var OperatorName = ""
Var SessionID = ""
Var CreditAmount1 = ""
Var ServiceAmountFlow = ""
Var TelephoneNumber = "0899999999"
Var ServiceType = "coffee"
Var ECommerce = ""
Var ECommerce = ECommerce + PriceDrink
Var ECommerce = ECommerce + "/"
Var ECommerce = ECommerce + DiscountDrink
Var ECommerce = ECommerce + "/"
Var ECommerce = ECommerce + SessionID2
Var ECommerce = ECommerce + "/"
Var ECommerce = ECommerce + SelectDrink
Var ECommerce = ECommerce + "/"
Var ECommerce = ECommerce + "C00"
Var ECommerce = ECommerce + "/"
Var ECommerce = ECommerce + CodeNumber
Var ServiceParameter = "max"
Var ServiceCharge = 0
Var AccountType = "new"
Var testservice = "kbank"
Var tc = ""
Var GetScore = ""
Var OperatorName = ""
Var SessionID = ""
GetPayInfo TelephoneNumber ECommerce ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc
Var Timeout = 0
Var GetPayInfoFlag = 1
Var TelephoneNumber = CodeNumber
Var CodeChannel = 1
Open "/media/bt/xml/page_page4-CodeWaiting.xml"
EndIf
GetPayInfo TelephoneNumber ECommerce ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc
Var Timeout = 0
Var GetPayInfoFlag = 1
Var TelephoneNumber = CodeNumber
Var CodeChannel = 1
Open "ROOT/taobin_project/xml/page_show_point.xml"
EndIf
EndIf

0
xml/page_show_point.xml Normal file
View file

View file

@ -57,8 +57,8 @@
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
Open PreviseXMLFileName2
;Open "ROOT/taobin_project/xml/page_catalog.xml"
;Open PreviseXMLFileName2
Open "ROOT/taobin_project/xml/page_catalog.xml"
</EventClick>
</Button>

View file

@ -144,8 +144,8 @@
<Volume> SoundVolume </Volume>
<EventClick>
SAVELOG PreviseOfPreviseXMLFileName2
Open PreviseOfPreviseXMLFileName2
;Open "ROOT/taobin_project/xml/page_catalog.xml"
;Open PreviseOfPreviseXMLFileName2
Open "ROOT/taobin_project/xml/page_catalog.xml"
</EventClick>
</Button>

View file

@ -1,52 +0,0 @@
<Page>
<Width> 1080 </Width>
<Height> 1312 </Height>
<Background> pUpgradeBG </Background>
<Volume> SoundVolume </Volume>
<EventOpen>
Var Timeout = 0
TopView "hide"
</EventOpen>
<Timeout> 1000 </Timeout>
<EventTimeout>
Var Timeout = Timeout + 1
If MachineStage = "mcu-upgrade" Then
Else
Open "ROOT/xml/page_board.xml"
EndIf
If Timeout > 300 Then
Open "ROOT/xml/page_board.xml"
EndIf
Refresh
TimerReset
</EventTimeout>
<GIF>
<X> 183 </X>
<Y> 350 </Y>
<Filename> pUpgradeGIF </Filename>
</GIF>
<Text>
<X> 395 </X>
<Y> 250 </Y>
<Width>300</Width>
<Align> Center </Align>
<Size> 30 </Size>
<Font> fontType1 </Font>
<Color> 0x000000 </Color>
<Value> "กำลังอัพเกรดMCU" </Value>
</Text>
</Page>