This commit is contained in:
miggaze 2020-12-04 13:36:51 +07:00
commit c35ccc6f90
142 changed files with 2306 additions and 567 deletions

View file

@ -66,6 +66,8 @@
Var QRErrorState = "Invisible"
SAVELOG SelectDrink
SAVELOG QRChannel
SAVELOG QRCODE99
@ -321,6 +323,11 @@
EndIf
EndIf
Var stringLog = "Timeout " + Timeout
Var stringLog = stringLog + " PayOK"
Var stringLog = stringLog + PayOK
If Timeout > 60 Then
If PayOK = 1 Then
@ -489,13 +496,20 @@
</EventVDCancle>
<Image>
;<Image>
;<X> 0 </X>
;<Y> 0 </Y>
;<Filename> "ROOT/taobin_project/image/ad_medium_2.png" </Filename>
;</Image>
<Video>
<X> 0 </X>
<Y> 0 </Y>
<Filename> "ROOT/taobin_project/image/ad_medium_2.png" </Filename>
</Image>
<Width> 1080</Width>
<Height> 380 </Height>
<Loop> "true" </Loop>
<Filename> "ROOT/taobin_project/video/taobin_adv2.mp4" </Filename>
</Video>
<Image>
<X> 199 </X>
@ -795,16 +809,16 @@
Open "/media/bt/xml/security_alarm.xml"
</EventSecurity>
<Text>
<X> 0 </X>
<Y> 1880 </Y>
<Size> 14 </Size>
<Align> "Left" </Align>
<Width> 1080 </Width>
<Font> KanitThinTTF </Font>
<Color> 0x513C2F </Color>
<Value> SelectDrink </Value>
</Text>
;<Text>
;<X> 0 </X>
;<Y> 1880 </Y>
;<Size> 14 </Size>
;<Align> "Left" </Align>
;<Width> 1080 </Width>
;<Font> KanitThinTTF </Font>
;<Color> 0x513C2F </Color>
;<Value> SelectDrink </Value>
;</Text>
<Button>
@ -824,12 +838,14 @@
Var MachineStage = "make-drink"
; make drink
;MakeDrinkV1 SelectDrink SelectSugarID
MakeDrinkV1 SelectDrink ExtendData
Open "ROOT/taobin_project/xml/page_thankyou.xml"
;Var UnitTestType = "1"
Var UnitTestType = "2"
Open "ROOT/taobin_project/xml/page_show_consent2.xml"
;Open "ROOT/taobin_project/xml/page_show_consent2.xml"
;Open "ROOT/taobin_project/xml/page_payment_code.xml"
@ -851,15 +867,15 @@
</EventClick>
</Button>
<Text>
<X> 0 </X>
<Y> 1886 </Y>
<Size> 20 </Size>
<Width> 1080</Width>
<Align> end </Align>
<Font> RobotoBlack </Font>
<Color> 0x513C2F </Color>
<Value> countClick2 </Value>
</Text>
;<Text>
;<X> 0 </X>
;<Y> 1886 </Y>
;<Size> 20 </Size>
;<Width> 1080</Width>
;<Align> end </Align>
;<Font> RobotoBlack </Font>
;<Color> 0x513C2F </Color>
;<Value> countClick2 </Value>
;</Text>
</Popup>