Merge branch 'masterpiece' of ssh://192.168.10.159:/1TBHDD/ikong/taobin_project into masterpiece

This commit is contained in:
Pakin 2024-01-26 09:20:28 +07:00
commit 1ee4114ec1
1559 changed files with 10589 additions and 3785 deletions

View file

@ -0,0 +1,47 @@
<?hurr
#include=menu_head.py
?>
<Popup>
<Cache> "Enable" </Cache>
<Width> 1080 </Width>
<Height> 1920 </Height>
;<Background> "0xeae6e1" </Background>
<Volume> SoundVolume </Volume>
<EventOpen>
; On open
<?hurr
#include=menu_catalog_default_init.py
?>
Var Timeout = 0
Var RerunProCode = ""
Var FromRerunPro = 0
<?hurr
#include=menu_catalog_new_menu.py
?>
</EventOpen>
<?hurr
#include=menu_catalog_new.py
?>
<?hurr
#include=menu_new_layout_gen_v2.py
?>
<?hurr
#include=menu_new_layout_gen.py
?>
</Popup>

File diff suppressed because it is too large Load diff

View file

@ -13,7 +13,7 @@
Var img_press_main_page = "ROOT/taobin_project/image/main_page/bp_main_page_start.png"
Var CNTDOWN_PROTECT_SCREEN_BLANK = 180
Var CNTDOWN_PROTECT_SCREEN_BLANK = 120
DEBUGVAR SoundVolume
Var credit_card_enable = ""
@ -1134,13 +1134,21 @@
EndIf
If NoWaitMachineEnable = 1 Then
If RecoveryRunning = "true" Then
If InternationalEnable = 1 Then
Open "ROOT/taobin_project/xml/page_show_error.lxml"
Else
Open "ROOT/taobin_project/xml/page_show_error.xml"
EndIf
EndIf
If stop_now = "true" Then
If InternationalEnable = 1 Then
Open "ROOT/taobin_project/xml/page_show_error.lxml"
Else
Open "ROOT/taobin_project/xml/page_show_error.xml"
EndIf
EndIf
EndIf
Else
If MachineStage = "close-maintenance" Then
If InternationalEnable = 1 Then
@ -1216,7 +1224,7 @@
If MachineStage = "drink-failed" Then
If InternationalEnable = 1 Then
Open "ROOT/taobin_project/xml/page_show_error.lxml"
Open "ROOT/taobin_project/xml/page_show_error.lxml"
Else
Open "ROOT/taobin_project/xml/page_show_error.xml"
EndIf
@ -1228,6 +1236,33 @@
EndIf
If BrewTimeoutExtend = 1 Then
DEBUGVAR BrewTimeoutExtend
DEBUGVAR DoorLidPosition
If DoorLidPosition = "bottom" Then
SAVELOG "BrewTimeoutExtend = 0 Clear Error Flag"
Var BrewTimeoutExtend = 0
; clear stage
Else
Var stop_now = "true"
Var stop_now_from_door_cup = 1
If InternationalEnable = 1 Then
Open "ROOT/taobin_project/xml/page_show_error.lxml"
Else
Open "ROOT/taobin_project/xml/page_show_error.xml"
EndIf
EndIf
Else
If DoorLidPosition = "Bottom" Then
Var BrewTimeoutExtend = 0
Else
Var BrewTimeoutExtend = 0
EndIf
EndIf
If NeedUpgrade = "true" Then

File diff suppressed because it is too large Load diff

474
xml/page_drink_stuck.xml Normal file
View file

@ -0,0 +1,474 @@
<Popup>
<Cache> "Enable" </Cache>
<Width> 1080 </Width>
<Height> 1920 </Height>
<Background> "0xeae6e1" </Background>
<Volume> SoundVolume </Volume>
<Sound> "ROOT/sounds/Ding-dong.wav" </Sound>
<EventOpen>
DEBUGVAR StarwState
DEBUGVAR LidState
DEBUGVAR Seeker.PictureDrink
DEBUGVAR Seeker.showname
Var buttonRemoveCup = "Invisible"
Var TextBottomShow = "Enable"
If show_eng = "true" Then
Var DirImage2 = "ROOT/taobin_project/image/topping2_en"
Else
Var DirImage2 = "ROOT/taobin_project/image/topping2"
EndIf
Var bg_strawlid_ST = "Enable"
Var bg_strawProblem_ST = "Invisible"
;Var bg_strawProblem_Y = 1470
Var bg_strawProblem = DirImage2 + "/bg_strawProblem.png"
Var straw_problem_flag = 0
If Seeker.strawAction = 1 Then
Machine Straw
;Var bg_strawlid = DirImage2 + "/bg_strawProblem.png"
Var bg_strawProblem_ST = "Enable"
If Seeker.lidAction = 0 Then
Else
;Var bg_strawProblem_Y = 1680
Var bg_strawlid_ST = "Invisible"
Var LidStateX = "Invisible"
Var StrawStateX = "Invisible"
EndIf
EndIf
If Seeker.lidAction = 1 Then
Machine Lid
EndIf
Var ExtendData = Seeker.ExtendData
; On open
Var LidState = "Enable"
Var StarwState = "Enable"
Var videoEnd = 0
If show_eng = "true" Then
Var DirImage = "ROOT/taobin_project/image/complete_en/"
Else
Var DirImage = "ROOT/taobin_project/image/complete/"
EndIf
Var VideoPlayFile = VideoPath
Var VideoPlayFile = VideoPlayFile + VideoFileBegin
Var VideoPlayFile = VideoPlayFile + "24"
Var VideoPlayFile = VideoPlayFile + VideoFileEnd
Var Timeout = 0
Var Timeout2 = 0
StopLongPlay
;Var show_eng = "false"
Var sendPayMultiFlag = 0
Var next_pic = ""
Var next_name = ""
Var nextCount = ""
Var next_pic_bg = ""
Var BlinkImg = 0
Var txtDrinkOKState = "Invisible"
Var MultiGo = 1
Var sendPayMultiFlag = 1
Var bg_strawlid_ST = "Invisible"
Var bg_strawProblem_ST = "Invisible"
Var StrawStateX = "Invisible"
Var LidStateX = "Invisible"
LED LedDoorCup 1 255 255 255 255
Var DelayButton = 0
DEBUGVAR GetMoreStrawCount
If GetMoreStrawCount <= 0 Then
If StrawProblemStatus = 1 Then
Var bg_strawProblem_ST = "Enable"
EndIf
EndIf
</EventOpen>
<Timeout> 500 </Timeout>
<EventTimeout>
DEBUGVAR LastMakeDrinkResult
DEBUGVAR MachineStage
DEBUGVAR CupOnArm
DEBUGVAR buttonRemoveCup
DEBUGVAR CART_COUNT
DEBUGVAR HaveCup
DEBUGVAR CHECKCUP
DEBUGVAR CupChecking
DEBUGVAR MaybeHaveCup
DEBUGVAR NextOrder
DEBUGVAR DoorCupPosition
Var Timeout = Timeout + 1
If BrewTimeoutExtend = 1 Then
DEBUGVAR BrewTimeoutExtend
EndIf
If Timeout > 840 Then
SAVELOG "Longer Time out"
If NextOrder = "true" Then
Var NextOrder = "false"
TransferVar "next" "curr"
Var Seeker = "curr"
SAVELOG "Make next order by take-cup with close-maintenance"
Var error_code_stop_now = 1221
If DoorCupPosition = "bottom" Then
Else
Var error_code_stop_now = 1296
__CMD "error-code-1296" 0 "-" "-"
EndIf
Open "ROOT/taobin_project/xml/page_cannotConti.xml"
Else
Open "ROOT/taobin_project/xml/page_back_to_main.xml"
EndIf
EndIf
If Timeout > 30 Then
Var MultiGo = 1
EndIf
If BlinkImg = 1 Then
Var next_pic_bg = DirImage + "/Preparing.png"
Var BlinkImg = 2
Else
If BlinkImg = 2 Then
Var next_pic_bg = DirImage + "/Preparing.png"
Var BlinkImg = 1
EndIf
EndIf
; Do not change
;
If MachineStage = "show-menu" Then
EndIf
If DoorCupPosition = "bottom" Then
Var buttonRemoveCup = "Enable"
Var txtDrinkOKState = "Enable"
EndIf
; away
If NextOrder = "true" Then
; Fast-forward to page_cannotConti
If RejectOrder = "true" Then
; BEGIN
Var NextOrder = "false"
TransferVar "next" "curr"
Var Seeker = "curr"
SAVELOG "Make next order by RejectOrder"
Open "ROOT/taobin_project/xml/page_cannotConti.xml"
; END
EndIf
; next order set. Havecup and checkup value must false. Certain cup not on any arm.
If PaySuccessWithDaemonTask = 1 Then
Var NextOrder = "false"
SAVELOG "Make next order by pass"
Open "ROOT/taobin_project/xml/page_thankyouConti.xml"
Else
If HaveCup = "false" Then
If MaybeHaveCup = "true" Then
Else
If CupChecking = "true" Then
Else
If CupOnArm = "false" Then
If DoorCupPosition = "bottom" Then
; BEGIN
Var NextOrder = "false"
TransferVar "next" "curr"
Var Seeker = "curr"
SAVELOG "Make next order by take-cup"
Open "ROOT/taobin_project/xml/page_thankyouConti.xml"
; END
Else
Machine DoorClose
EndIf
EndIf
EndIf
EndIf
EndIf
EndIf
EndIf
;
If MachineStage = "remove-cup" Then
If CART_COUNT = 0 Then
If NextOrder = "false" Then
Open "ROOT/taobin_project/xml/page_back_to_remove_cup.xml"
Else
Var buttonRemoveCup = "Enable"
Var txtDrinkOKState = "Enable"
Var Timeout2 = Timeout2 + 1
If Timeout2 > 15 Then
Play "/mnt/sdcard/coffeevending/taobin_project/sound_thai/remove_cup.mp3"
Var Timeout2 = 0
EndIf
EndIf
Else
Var buttonRemoveCup = "Enable"
Var txtDrinkOKState = "Enable"
Var Timeout2 = Timeout2 + 1
If Timeout2 > 15 Then
Play "/mnt/sdcard/coffeevending/taobin_project/sound_thai/remove_cup.mp3"
Var Timeout2 = 0
EndIf
EndIf
EndIf
If Timeout = 5 Then
If show_eng = "true" Then
Play "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Straw.mp3"
Else
Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/drinkfinish.mp3"
; Play Sound #zone
If SoundBackToSchoolEnable = 1 Then
If SoundBackToSchoolType = 1 Then
Var RootPathSoundBackToSchool = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/boy/"
EndIf
If SoundBackToSchoolType = 2 Then
Var RootPathSoundBackToSchool = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/girl/"
EndIf
Var PlaySoundLag = RootPathSoundBackToSchool + "drinkfinish.wav"
EndIf
Play PlaySoundLag
EndIf
EndIf
If MachineStage = "close-maintenance" Then
If stop_now = "true" Then
If NextOrder = "true" Then
Var NextOrder = "false"
TransferVar "next" "curr"
Var Seeker = "curr"
SAVELOG "Make next order by take-cup with close-maintenance"
Open "ROOT/taobin_project/xml/page_cannotConti.xml"
Else
Open "ROOT/taobin_project/xml/page_back_to_main.xml"
EndIf
EndIf
EndIf
If txtDrinkOKState = "Enable" Then
Var TextBottomShow = "Invisible"
Else
Var TextBottomShow = "Enable"
EndIf
TimerReset
Refresh
</EventTimeout>
<EventChangeStatus>
If ChangeStatus = "payout-end" Then
Var MultiGo = 1
EndIf
</EventChangeStatus>
;<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>
<Width> 1080</Width>
<Height> 380 </Height>
<Loop> "true" </Loop>
<Filename> video_menu_0 </Filename>
</Video>
<Video>
<X> 0 </X>
<Y> 380 </Y>
<Refresh> "Reload" </Refresh>
<Loop> "true" </Loop>
<Filename> VideoPlayFile </Filename>
</Video>
<Image>
<X> 757 </X>
<Y> 424 </Y>
<Filename> next_pic_bg </Filename>
</Image>
<Image>
<X> 125 </X>
<Y> 1700 </Y>
<Height> 300 </Height>
<Width> 320 </Width>
<Filename> Seeker.PictureDrink </Filename>
</Image>
<Text>
<X> 300 </X>
<Y> 1750 </Y>
<Width> 1080 </Width>
<Align> Center </Align>
<Size> 48 </Size>
<Color> 0x513C2F </Color>
<Value>
eval(
STRCONTAIN "size" Seeker.showname SizeFromSheet
If SizeFromSheet = "true" Then
SPLIT Seeker.showname "###" 1 PureName
Var return = PureName
Else
Var return = Seeker.showname
EndIf
)
</Value>
</Text>
<Image>
<X> 0 </X>
<Y> 1418 </Y>
<State> TextBottomShow </State>
<Filename> Var( DirImage + "text_bottom.png") </Filename>
</Image>
<Text>
<X> 757 </X>
<Y> 448 </Y>
<Size> 20 </Size>
<Width> 280</Width>
<Align> Center </Align>
<Font> RobotoBlack </Font>
<Color> 0x513C2F </Color>
<Value> nextCount </Value>
</Text>
<Text>
<X> 757 </X>
<Y> 538 </Y>
<Size> 20 </Size>
<Width> 280</Width>
<Align> Center </Align>
<Font> RobotoBlack </Font>
<Color> 0x513C2F </Color>
<Value> next_name </Value>
</Text>
<Image>
<X> 823 </X>
<Y> 600 </Y>
<Width> 148 </Width>
<Height> 200 </Height>
<Filename> next_pic </Filename>
</Image>
<Image>
<X> 77 </X>
<Y> 1378 </Y>
<State> txtDrinkOKState </State>
<Filename> Var( DirImage + "/txtDrinkOK.png" ) </Filename>
</Image>
<Button>
<X> 160 </X>
<Y> 1673 </Y>
<State> buttonRemoveCup </State>
;<Color> "0x00BDFF" </Color>
<Interval> 500 </Interval>
<Filename> Var( DirImage + "/bn_open_door.png" ) </Filename>
<FilenamePress> Var( DirImage + "/bp_open_door.png" ) </FilenamePress>
<EventClick>
;Var buttonRemoveCup = "Invisible"
Machine RemoveCup
Machine DoorLidOpen
Refresh
</EventClick>
</Button>
<EventUnitTest1>
Var MachineStage = "show-menu"
</EventUnitTest1>
</Popup>

View file

@ -184,7 +184,7 @@
EndIf
Var TimeDelayDefault = 1200
</EventOpen>
<Timeout> 500 </Timeout>
@ -208,9 +208,23 @@
Var Timeout = Timeout + 1
; Timeout 10*60*2
If Timeout > 900 Then
SAVELOG "Timeout 900"
If BrewTimeoutExtend = 1 Then
DEBUGVAR BrewTimeoutExtend
EndIf
; 420 sec
If Timeout > 840 Then
Var CountForRetryStuck = 1
Open "ROOT/taobin_project/xml/page_drink_stuck.xml"
EndIf
; obsolete
If Timeout > TimeDelayDefault Then
SAVELOG "Longer Time out"
DEBUGVAR TimeDelayDefault
If NextOrder = "true" Then
Var NextOrder = "false"

View file

@ -244,6 +244,7 @@
Var NOCashFlag = 0
DEBUGVAR SELLSTATUS
If SELLSTATUS = "SELLNOCASH" Then
Var NOCashFlag = 1
EndIf

View file

@ -328,11 +328,11 @@
EndIf
If CoinInFlag = 0 Then
If CancelFlag = 0 Then
Coin CARD
EndIf
EndIf
;If CoinInFlag = 0 Then
; If CancelFlag = 0 Then
; Coin CARD
; EndIf
;EndIf
If show_eng = "true" Then
Var DirImage = "ROOT/taobin_project/image/page_payment_en/page_payment"
@ -1497,6 +1497,44 @@ EndIf
</EventClick>
</Button>
; cash Singapore
<Button>
<X> 439 </X>
<Y> 1499 </Y>
<State> PayState1</State>
<Filename> FilenameShowbuttonCashBN </Filename>
<FilenamePress> FilenameShowbuttonCashBP </FilenamePress>
<FilenameDisable> FilenameShowbuttonCashBP </FilenameDisable>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
If alphaState = "Invisible" Then
If EnoughChange = "yes" Then
Var alphaState2 = "Enable"
Var alphaState2t = alphaState2
If RoadShow = "true" Then
Var MachineStage = "make-drink"
Var BrewingTextThai = "เตรียมแก้ว"
MakeDrinkV1 SelectDrink SelectSugarID
Open "ROOT/taobin_project/xml/page_thankyou.xml"
;Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
EndIf
Else
Var alphaState3 = "Enable"
Refresh
EndIf
EndIf
</EventClick>
</Button>
<Button>
<X> 360 </X>
<Y> 1781 </Y>
@ -1643,7 +1681,7 @@ EndIf
<X> 182 </X>
<Y> 748 </Y>
<State> alphaState2 </State>
<Filename> Var( DirImage2 + "/img_popup11-MYR.png" )</Filename>
<Filename> Var( DirImage2 + "/img_popup11-SGP.png" )</Filename>
</Image>

View file

@ -924,6 +924,92 @@
Var ReqPayInfoFlag = 8
EndIf
If web_payment = "ALIPAY" Then
Var QR_POPUP = "/img_popup20.png"
Var LOADING_STATE = "Enable"
Var FlagQROpened = 1
Var alphaState = "Enable"
;CoinVending OFF
VendingQR ON
Var SessionID2 = SelectSlot + ":"
Var SessionID2 = SessionID2 + Seeker.ExtendData
Var CreditAmount1 = ""
Var ServiceAmountFlow = ""
Var TelephoneNumberQR = "0899999999"
Var ServiceType = "coffee"
Var ECommerceQR = ""
Var ECommerceQR = ECommerceQR + PriceDrink
Var ECommerceQR = ECommerceQR + "/"
Var ECommerceQR = ECommerceQR + DiscountDrink
Var ECommerceQR = ECommerceQR + "/"
Var ECommerceQR = ECommerceQR + SessionID2
Var ECommerceQR = ECommerceQR + "/"
Var ECommerceQR = ECommerceQR + SelectDrink
Var ECommerceQR = ECommerceQR + "/"
Var ECommerceQR = ECommerceQR + "ALP:2/"
Var ServiceParameter = "max"
Var ServiceCharge = 0
Var AccountType = "new"
Var testservice = "kbank"
Var tc = ""
Var GetScore = ""
Var OperatorName = ""
Var SessionID = ""
GetPayInfo TelephoneNumberQR ECommerceQR ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc
Var ReqPayInfoFlag = 9
EndIf
If web_payment = "UNIONPAY" Then
Var QR_POPUP = "/img_popup21.png"
Var LOADING_STATE = "Enable"
Var FlagQROpened = 1
Var alphaState = "Enable"
;CoinVending OFF
VendingQR ON
Var SessionID2 = SelectSlot + ":"
Var SessionID2 = SessionID2 + Seeker.ExtendData
Var CreditAmount1 = ""
Var ServiceAmountFlow = ""
Var TelephoneNumberQR = "0899999999"
Var ServiceType = "coffee"
Var ECommerceQR = ""
Var ECommerceQR = ECommerceQR + PriceDrink
Var ECommerceQR = ECommerceQR + "/"
Var ECommerceQR = ECommerceQR + DiscountDrink
Var ECommerceQR = ECommerceQR + "/"
Var ECommerceQR = ECommerceQR + SessionID2
Var ECommerceQR = ECommerceQR + "/"
Var ECommerceQR = ECommerceQR + SelectDrink
Var ECommerceQR = ECommerceQR + "/"
Var ECommerceQR = ECommerceQR + "UNP:2/"
Var ServiceParameter = "max"
Var ServiceCharge = 0
Var AccountType = "new"
Var testservice = "kbank"
Var tc = ""
Var GetScore = ""
Var OperatorName = ""
Var SessionID = ""
GetPayInfo TelephoneNumberQR ECommerceQR ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc
Var ReqPayInfoFlag = 10
EndIf
@ -1014,6 +1100,12 @@
If ReqPayInfoFlag2 = 8 Then
Var Seeker.CampaignPayChanel = "wechat"
EndIf
If ReqPayInfoFlag2 = 9 Then
Var Seeker.CampaignPayChanel = "alipay"
EndIf
If ReqPayInfoFlag2 = 10 Then
Var Seeker.CampaignPayChanel = "unionpay"
EndIf
@ -1410,6 +1502,93 @@
EndIf
EndIf
If ReqPayInfoFlag = 9 Then
If VendingQRTypeResult = "ALP:2" Then
Var CashTextWarning = ""
Var QRErrorState = "Invisible"
Var QRCODE99Shoppy = ""
Var QRCODE99Shoppy = QRCODE99Shoppy + SessionID
Var QRCODE99Shoppy = QRCODE99Shoppy + Ext1a
SAVELOG Ext1a
SAVELOG QRCODE99Shoppy
Var QRCODE99Shoppy = QRCODE99Shoppy + Ext21
Var ReqPayInfoFlag = 0
Var ReqPayInfoFlag2 = 9
SAVELOG QRCODE99Shoppy
SAVELOG Ext21
DEBUGVAR QRCODE99Shoppy
Var QRCODE99 = QRCODE99Shoppy
Var LOADING_STATE = "Invisible"
If show_eng = "true" Then
PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Please_scan_to_pay_via_e-wallet.mp3"
Else
Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/Please_scan_to_pay_via_e-wallet.mp3"
; Play Sound #zone
If SoundBackToSchoolEnable = 1 Then
If SoundBackToSchoolType = 1 Then
Var RootPathSoundBackToSchool = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/boy/"
EndIf
If SoundBackToSchoolType = 2 Then
Var RootPathSoundBackToSchool = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/girl/"
EndIf
Var PlaySoundLag = RootPathSoundBackToSchool + "Please_scan_to_pay_via_e-wallet.wav"
EndIf
Play PlaySoundLag
EndIf
EndIf
EndIf
If ReqPayInfoFlag = 10 Then
If VendingQRTypeResult = "UNP:2" Then
Var CashTextWarning = ""
Var QRErrorState = "Invisible"
Var QRCODE99Shoppy = ""
Var QRCODE99Shoppy = QRCODE99Shoppy + SessionID
Var QRCODE99Shoppy = QRCODE99Shoppy + Ext1a
SAVELOG Ext1a
SAVELOG QRCODE99Shoppy
Var QRCODE99Shoppy = QRCODE99Shoppy + Ext21
Var ReqPayInfoFlag = 0
Var ReqPayInfoFlag2 = 10
SAVELOG QRCODE99Shoppy
SAVELOG Ext21
DEBUGVAR QRCODE99Shoppy
Var QRCODE99 = QRCODE99Shoppy
Var LOADING_STATE = "Invisible"
If show_eng = "true" Then
PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Please_scan_to_pay_via_e-wallet.mp3"
Else
Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/Please_scan_to_pay_via_e-wallet.mp3"
; Play Sound #zone
If SoundBackToSchoolEnable = 1 Then
If SoundBackToSchoolType = 1 Then
Var RootPathSoundBackToSchool = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/boy/"
EndIf
If SoundBackToSchoolType = 2 Then
Var RootPathSoundBackToSchool = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/girl/"
EndIf
Var PlaySoundLag = RootPathSoundBackToSchool + "Please_scan_to_pay_via_e-wallet.wav"
EndIf
Play PlaySoundLag
EndIf
EndIf
EndIf
Else
Var PayInfoCFlag = 1
EndIf

View file

@ -161,7 +161,7 @@
<Image>
<X> 158 </X>
<Y> 567 </Y>
<Filename> Var( DirImage + "/img_popup17.png") </Filename>
<Filename> Var( DirImage + "/img_popup16.png") </Filename>
</Image>
@ -732,14 +732,63 @@
<X> 675 </X>
<Y> 1189 </Y>
<State> "Enable" </State>
<Filename> "ROOT/taobin_project/image/collectiing/bn_pay_with_codeXXX.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/collectiing/bn_pay_with_codeXXX.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/image/collectiing/bn_pay_with_codeXXX.png" </FilenameDisable>
<Filename> "ROOT/taobin_project/image/collectiing/bn_pay_with_cashAli.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_pay_with_cashAli.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/image/collectiing/bd_pay_with_cashAli.png" </FilenameDisable>
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
Var QR_POPUP = "/img_popup20.png"
Var LOADING_STATE = "Enable"
Var QRCODE99 = ""
Var FlagQROpened = 1
Var alphaState = "Enable"
;CoinVending OFF
VendingQR ON
Var SessionID2 = SelectSlot + ":"
Var SessionID2 = SessionID2 + Seeker.ExtendData
Var CreditAmount1 = ""
Var ServiceAmountFlow = ""
Var TelephoneNumberQR = "0899999999"
Var ServiceType = "coffee"
Var ECommerceQR = ""
Var ECommerceQR = ECommerceQR + PriceDrink
Var ECommerceQR = ECommerceQR + "/"
Var ECommerceQR = ECommerceQR + DiscountDrink
Var ECommerceQR = ECommerceQR + "/"
Var ECommerceQR = ECommerceQR + SessionID2
Var ECommerceQR = ECommerceQR + "/"
Var ECommerceQR = ECommerceQR + SelectDrink
Var ECommerceQR = ECommerceQR + "/"
Var ECommerceQR = ECommerceQR + "ALP:2/"
;If IntVendingCampaign > 0 Then
; Var ECommerceQR = ECommerceQR + Seeker.VendingCode
; Var ECommerceQR = ECommerceQR + ":"
; Var ECommerceQR = ECommerceQR + Seeker.CodeNumber
; Var ECommerceQR = ECommerceQR + ":"
; Var ECommerceQR = ECommerceQR + Seeker.VendingCampaignRI3
;EndIf
Var ServiceParameter = "max"
Var ServiceCharge = 0
Var AccountType = "new"
Var testservice = "kbank"
Var tc = ""
Var GetScore = ""
Var OperatorName = ""
Var SessionID = ""
GetPayInfo TelephoneNumberQR ECommerceQR ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc
Var ReqPayInfoFlag = 9
Var ReqPayInfoFromCashOther = 1
Open "ROOT/taobin_project/xml/page_payment_cash.xml"
</EventClick>
</Button>
@ -767,9 +816,91 @@
</Button>
<Button>
<X> 673 </X>
<Y> 1112 </Y>
<State> "Invisible" </State>
<X> 208 </X>
<Y> 1413 </Y>
<State> WalletEnable </State>
<Filename> "ROOT/taobin_project/image/collectiing/bn_pay_with_cashUnion.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_pay_with_cashUnion.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/image/collectiing/bd_pay_with_cashUnion.png" </FilenameDisable>
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
Var QR_POPUP = "/img_popup21.png"
Var LOADING_STATE = "Enable"
Var QRCODE99 = ""
Var FlagQROpened = 1
Var alphaState = "Enable"
;CoinVending OFF
VendingQR ON
Var SessionID2 = SelectSlot + ":"
Var SessionID2 = SessionID2 + Seeker.ExtendData
Var CreditAmount1 = ""
Var ServiceAmountFlow = ""
Var TelephoneNumberQR = "0899999999"
Var ServiceType = "coffee"
Var ECommerceQR = ""
Var ECommerceQR = ECommerceQR + PriceDrink
Var ECommerceQR = ECommerceQR + "/"
Var ECommerceQR = ECommerceQR + DiscountDrink
Var ECommerceQR = ECommerceQR + "/"
Var ECommerceQR = ECommerceQR + SessionID2
Var ECommerceQR = ECommerceQR + "/"
Var ECommerceQR = ECommerceQR + SelectDrink
Var ECommerceQR = ECommerceQR + "/"
Var ECommerceQR = ECommerceQR + "UNP:2/"
;If IntVendingCampaign > 0 Then
; Var ECommerceQR = ECommerceQR + Seeker.VendingCode
; Var ECommerceQR = ECommerceQR + ":"
; Var ECommerceQR = ECommerceQR + Seeker.CodeNumber
; Var ECommerceQR = ECommerceQR + ":"
; Var ECommerceQR = ECommerceQR + Seeker.VendingCampaignRI3
;EndIf
Var ServiceParameter = "max"
Var ServiceCharge = 0
Var AccountType = "new"
Var testservice = "kbank"
Var tc = ""
Var GetScore = ""
Var OperatorName = ""
Var SessionID = ""
GetPayInfo TelephoneNumberQR ECommerceQR ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc
Var ReqPayInfoFlag = 10
Var ReqPayInfoFromCashOther = 1
Open "ROOT/taobin_project/xml/page_payment_cash.xml"
</EventClick>
</Button>
<Button>
<X> 440 </X>
<Y> 1413 </Y>
<State> "Enable" </State>
<Filename> "ROOT/taobin_project/image/collectiing/bn_pay_with_codeXXX.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/collectiing/bn_pay_with_codeXXX.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/image/collectiing/bn_pay_with_codeXXX.png" </FilenameDisable>
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
</EventClick>
</Button>
<Button>
<X> 675 </X>
<Y> 1413 </Y>
<State> "Enable" </State>
<Filename> "ROOT/taobin_project/image/collectiing/bn_pay_with_codeXXX.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/collectiing/bn_pay_with_codeXXX.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/image/collectiing/bn_pay_with_codeXXX.png" </FilenameDisable>
@ -786,7 +917,7 @@
<Button>
<X> 397 </X>
<Y> 1440 </Y>
<Y> 1670 </Y>
<Filename> Var( DirImage + "/bn_cancel2.png") </Filename>
<FilenamePress> Var( DirImage + "/bn_cancel2.png") </FilenamePress>
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>

View file

@ -109,6 +109,12 @@
Var stop_now_from_netcore_event = 0
EndIf
If stop_now_from_door_cup = 1 Then
Var stop_now = "false"
SAVELOG "stop_now_from_door_cup is set"
Var stop_now_from_door_cup = 0
EndIf
If MachineStage = "" Then
Var LEDSet = "false"
@ -157,7 +163,7 @@
DEBUGVAR show_error_normal
DEBUGVAR show_error_sp1
DEBUGVAR TimeOut
Var TimeOut = TimeOut + 1
If TimeOut > 30 Then
Var TimeOut = 0

View file

@ -216,6 +216,7 @@
Var MachineErrorDetailAll = NETCORE_LOST_COUNT_UP_STR + " #"
EndIf
Else
; zone all ok
If stop_now_from_netcore_event = 1 Then
Var stop_now = "false"
@ -223,6 +224,14 @@
Var stop_now_from_netcore_event = 0
EndIf
If stop_now_from_door_cup = 1 Then
Var stop_now = "false"
SAVELOG "stop_now_from_door_cup is set"
Var stop_now_from_door_cup = 0
Var MachineErrorDetailAll = " --- "
EndIf
If MachineStage = "" Then
Var LEDSet = "false"

View file

@ -488,6 +488,7 @@
READ_FILE "/mnt/sdcard/coffeevending/menu_blend_free" menu_blend_free
DEBUGVAR menu_blend_free
DEBUGVAR blend_button_state
DEBUGVAR DoorCupPosition
If menu_blend_free = "true" Then
If blend_button_state = "PressForever" Then
@ -505,9 +506,10 @@
EndIf
Else
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml"
Open "ROOT/taobin_project/xml/page_payment.xml"
If DoorCupPosition = "bottom" Then
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml"
Open "ROOT/taobin_project/xml/page_payment.xml"
EndIf
EndIf

View file

@ -145,10 +145,20 @@
Var Text2_9 = Text2_9 + ","
Var Text2_9 = Text2_9 + android_text3_2
Var strCountryName = " " + CountryName
DEBUGVAR AndroidTouchScreenHeartBeat
Var CanResetTouch = 0
Var strTouchScreen = " Reset Touch : disable."
</EventOpen>
<Timeout> 1000 </Timeout>
<EventTimeout>
Var Timeout = Timeout + 1
If Timeout > 15 Then
Open "ROOT/taobin_project/xml/page_board.xml"
@ -229,6 +239,12 @@
Var Text2_9 = Text2_9 + android_text3_2
If AndroidTouchScreenHeartBeat = "-" Then
Var strTouchScreen = " Reset Touch : Disable."
Else
Var strTouchScreen = " Reset Touch : " + AndroidTouchScreenHeartBeat
Var CanResetTouch = 1
EndIf
Refresh
TimerReset
@ -296,7 +312,17 @@
<EventClick>
READ_FILE "/mnt/sdcard/coffeevending/sim_on" str_sim_on
DEBUGVAR str_sim_on
If str_sim_on = "1" Then
If str_sim_on = "1" Then
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog.xml"
TopView "show"
Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_main_blank.xml"
EndIf
If CountTouchButton = 7 Then
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog.xml"
@ -723,6 +749,52 @@
</Text>
<Image>
<X> info1_startX </X>
<Y> info_11Y </Y>
<Filename> "ROOT/taobin_project/image/tab_1.png" </Filename>
<EventClick>
</EventClick>
</Image>
<Text>
<X> info1_text_startX </X>
<Y> info_text_11Y </Y>
<Size> 30 </Size>
<Font> fontType1 </Font>
<Color> 0x000000 </Color>
<Value> strCountryName </Value>
</Text>
<Image>
<X> info1_startX </X>
<Y> info_12Y </Y>
<Filename> "ROOT/taobin_project/image/tab_1.png" </Filename>
<EventClick>
If CanResetTouch = 1 Then
ResetTouch
EndIf
</EventClick>
</Image>
<Text>
<X> info1_text_startX </X>
<Y> info_text_12Y </Y>
<Size> 30 </Size>
<Font> fontType1 </Font>
<Color> 0x000000 </Color>
<Value> strTouchScreen </Value>
</Text>
;<QRCode>
;<X> 930 </X>
;<Y> info_cancel_y </Y>