pakin/taobin_project
1
0
Fork 0
Code Issues Pull requests Projects 1 Releases 1 Packages Wiki Activity Actions

Merge branch 'masterpiece' of ssh://forthrd.ddns.net:2222/1TBHDD/ikong/taobin_project into masterpiece

Browse source
This commit is contained in:
wanlop run 2024-01-03 21:36:57 +07:00
commit f540218c5b
53 changed files with 1635 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

3
xml/event/tricker.ev
View file

@ -53,6 +53,8 @@ Var From15THBPro = 0
Var MyMintEnable = 0
Var FromMyMintPro = 0
Var NewCollectPoint = 1;
If SystemDateMonthInt = 10 Then
@ -123,6 +125,7 @@ If ConfigNumer = 1581 Then
EndIf
If BoxID = 105005 Then
Var NewCollectPoint = 1
Var MyMintEnable = 1
Var pro15THBEnable = 0
EndIf

20
xml/page_brewing3.xml
View file

@ -1119,6 +1119,17 @@
If AddData = 1 Then
Var Cid = 26
DEBUGVAR "Brewing3"
DEBUGVAR Seeker
DEBUGVAR Seeker.UseGet15Discount
If NewCollectPoint = 1 Then
If Seeker.UseGet15Discount = 1 Then
Var Cid = 39
Else
Var Cid = 40
EndIf
EndIf
AddData Cid Seeker.TNumberTaobinMember Seeker.PointTaobinStr PointCrm GetScore
EndIf
@ -1223,6 +1234,15 @@
If AddData = 1 Then
Var Cid = 26
If NewCollectPoint = 1 Then
If Seeker.UseGet15Discount = 1 Then
Var Cid = 39
Else
Var Cid = 40
EndIf
EndIf
AddData Cid Seeker.TNumberTaobinMember Seeker.PointTaobinStr PointCrm GetScore
EndIf

20
xml/page_brewing3Conti.xml
View file

@ -594,6 +594,17 @@
If AddData = 1 Then
Var Cid = 26
DEBUGVAR "Brewing3Conti"
DEBUGVAR Seeker
DEBUGVAR Seeker.UseGet15Discount
If NewCollectPoint = 1 Then
If Seeker.UseGet15Discount = 1 Then
Var Cid = 39
Else
Var Cid = 40
EndIf
EndIf
AddData Cid Seeker.TNumberTaobinMember Seeker.PointTaobinStr PointCrm GetScore
EndIf
@ -704,6 +715,15 @@
If AddData = 1 Then
Var Cid = 26
If NewCollectPoint = 1 Then
If Seeker.UseGet15Discount = 1 Then
Var Cid = 39
Else
Var Cid = 40
EndIf
EndIf
AddData Cid Seeker.TNumberTaobinMember Seeker.PointTaobinStr PointCrm GetScore
EndIf

7
xml/page_collect_point_2.xml
View file

@ -207,7 +207,12 @@
EndIf
Open "ROOT/taobin_project/xml/page_collect_point_3.xml"
If NewCollectPoint = 1 Then
Open "ROOT/taobin_project/xml/page_collect_point_3_28.xml"
Else
Open "ROOT/taobin_project/xml/page_collect_point_3.xml"
EndIf
Else

1212
xml/page_collect_point_3_28.xml Normal file
View file

File diff suppressed because it is too large Load diff

159
xml/page_display_get_15_discount.xml Normal file
View file

@ -0,0 +1,159 @@
<Popup>
<Cache> "Enable" </Cache>
<Width> 1080 </Width>
<Height> 1920 </Height>
<Background> "0xeae6e1" </Background>
<Volume> SoundVolume </Volume>
<EventOpen>
; On open
Var Timeout = 0
If show_eng = "true" Then
Var DirImage = "ROOT/taobin_project/image/display_get_discount_en"
Else
Var DirImage = "ROOT/taobin_project/image/display_get_discount"
EndIf
DEBUGVAR Discount15Timeout
Var PopUpState1 = "Enable"
Var PopUpState2 = "Invisible"
Var PopUpErrorState = "Invisible"
If Discount15Timeout = 1 Then
Var PopUpState2 = "Enable"
Var PopUpState1 = "Invisible"
EndIf
If PayOfflineMode = 1 Then
Var PopUpErrorState = "Enable"
Var PopUpState1 = "Invisible"
Var PopUpState2 = "Invisible
EndIf
</EventOpen>
<Timeout> 1000 </Timeout>
<EventTimeout>
Var Timeout = Timeout + 1
If Timeout > 5 Then
; goto lid straw
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
TimerReset
Refresh
</EventTimeout>
<EventSecurity>
Open "/media/bt/xml/security_alarm.xml"
</EventSecurity>
<EventActionOk>
;
</EventActionOk>
<EventMachine>
If MachineStage = "drink-success" Then
Var MachineState_Result = 1
EndIf
If MachineStage = "drink-failed" Then
Var MachineState_Result = 2
EndIf
</EventMachine>
<Video>
<X> 0 </X>
<Y> 0 </Y>
<Width> 1080</Width>
<Height> 380 </Height>
<Loop> "true" </Loop>
<Filename> video_menu_0 </Filename>
</Video>
<Image>
<X> 0 </X>
<Y> 380 </Y>
<Filename> Var( DirImage + "/alpha.png" ) </Filename>
</Image>
<Image>
<X> 158 </X>
<Y> 665 </Y>
<State> PopUpState1 </State>
<Filename> Var( DirImage + "/img_popup1.png" )</Filename>
</Image>
<Image>
<X> 158 </X>
<Y> 665 </Y>
<State> PopUpState2 </State>
<Filename> Var( DirImage + "/img_popup2.png" )</Filename>
</Image>
<Image>
<X> 158 </X>
<Y> 665 </Y>
<State> PopUpErrorState </State>
<Filename> Var( DirImage + "/img_popup_15discount_error.png" )</Filename>
</Image>
<Button>
<X> 220 </X>
<Y> 1680 </Y>
<State>PopUpState2</State>
<Filename> Var( DirImage + "/bn_get15discount.png" )</Filename>
<FilenamePress> Var( DirImage + "/bp_get15discount.png" )</FilenamePress>
<FilenameDisable> Var( DirImage + "/bp_get15discount.png" )</FilenameDisable>
<FilenameDisable2> Var( DirImage + "/disable2_get15discount.png" )</FilenameDisable2>
<EventClick>
; goto lid straw
Var Seeker.UseGet15Discount = 1
Var PreviousSeeker.UseGet15Discount = 1
Var Discount15Timeout = 0
Open "ROOT/taobin_project/xml/page_display_get_15_discount.xml"
</EventClick>
</Button>
<Button>
<X> 560 </X>
<Y> 1680 </Y>
<State>PopUpState2</State>
<Filename> Var( DirImage + "/bn_keep.png" )</Filename>
<FilenamePress> Var( DirImage + "/bp_keep.png" )</FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
</EventClick>
</Button>
<Button>
<X> 397 </X>
<Y> 1680 </Y>
<State>PopUpState1</State>
<Filename> Var( DirImage + "/bn_accept.png" ) </Filename>
<FilenamePress> Var( DirImage + "/bp_accept.png" )</FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
; goto lid straw
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
</EventClick>
</Button>
</Popup>

144
xml/page_display_get_drink_5_baht.xml Normal file
View file

@ -0,0 +1,144 @@
<Popup>
<Cache> "Enable" </Cache>
<Width> 1080 </Width>
<Height> 1920 </Height>
<Background> "0xeae6e1" </Background>
<Volume> SoundVolume </Volume>
<EventOpen>
; On open
Var Timeout = 0
If show_eng = "true" Then
Var DirImage = "ROOT/taobin_project/image/display_get_discount_en"
Else
Var DirImage = "ROOT/taobin_project/image/display_get_discount"
EndIf
Var PopUpState1 = "Enable"
Var PopUpState2 = "Invisible"
Var PopUpErrorState = "Invisible"
If PayOfflineMode = 1 Then
Var PopUpErrorState = "Enable"
Var PopUpState1 = "Invisible"
Var PopUpState2 = "Invisible
EndIf
</EventOpen>
<Timeout> 1000 </Timeout>
<EventTimeout>
Var Timeout = Timeout + 1
If Timeout > 5 Then
; goto lid straw
If PopUpState1 = "Enable" Then
Var Timeout = 0
Var PopUpState1 = "Invisible"
Var PopUpState2 = "Enable"
If PayOfflineMode = 1 Then
Var PopUpErrorState = "Enable"
Var PopUpState1 = "Invisible"
Var PopUpState2 = "Invisible
EndIf
Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
EndIf
TimerReset
Refresh
</EventTimeout>
<EventSecurity>
Open "/media/bt/xml/security_alarm.xml"
</EventSecurity>
<EventActionOk>
;
</EventActionOk>
<EventMachine>
If MachineStage = "drink-success" Then
Var MachineState_Result = 1
EndIf
If MachineStage = "drink-failed" Then
Var MachineState_Result = 2
EndIf
</EventMachine>
<Video>
<X> 0 </X>
<Y> 0 </Y>
<Width> 1080</Width>
<Height> 380 </Height>
<Loop> "true" </Loop>
<Filename> video_menu_0 </Filename>
</Video>
<Image>
<X> 0 </X>
<Y> 380 </Y>
<Filename> Var( DirImage + "/alpha.png" ) </Filename>
</Image>
<Image>
<X> 158 </X>
<Y> 665 </Y>
<State> PopUpState1 </State>
<Filename> Var( DirImage + "/img_popup3.png" )</Filename>
</Image>
<Image>
<X> 158 </X>
<Y> 665 </Y>
<State> PopUpState2 </State>
<Filename> Var( DirImage + "/img_popup4.png" )</Filename>
</Image>
<Image>
<X> 158 </X>
<Y> 665 </Y>
<State> PopUpErrorState </State>
<Filename> Var( DirImage + "/img_popup_drink5baht_error.png" )</Filename>
</Image>
<Button>
<X> 397 </X>
<Y> 1680 </Y>
<Filename> Var( DirImage + "/bn_accept.png" ) </Filename>
<FilenamePress> Var( DirImage + "/bp_accept.png" )</FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
; goto lid straw
If PopUpState1 = "Enable" Then
Var Timeout = 0
Var PopUpState1 = "Invisible"
Var PopUpState2 = "Enable"
If PayOfflineMode = 1 Then
Var PopUpErrorState = "Enable"
Var PopUpState1 = "Invisible"
Var PopUpState2 = "Invisible
EndIf
Refresh
Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
</EventClick>
</Button>
</Popup>

29
xml/page_drinkok.xml
View file

@ -8,6 +8,8 @@
<EventOpen>
DEBUGVAR StarwState
DEBUGVAR LidState
DEBUGVAR Seeker.PictureDrink
DEBUGVAR Seeker.showname
WRITE_FILE "/mnt/sdcard/coffeevending/log/drink-success" "0"
@ -567,6 +569,33 @@
<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>

48
xml/page_payment_cash-MYR.xml
View file

@ -456,6 +456,30 @@
;Var PayState4 = "Invisible"
Var TOP_ROW = 1266
Var BOT_ROW = 1488
Var X_PS2 = 324
;duit
Var X_PS3 = 199
;ali
Var X_PS4 = 434
Var X_PS5 = 669
Var X_PS6 = 554
If EnableCash = "true" Then
Var PayState1 = "Enable"
Var TOP_ROW = 1276
Var BOT_ROW = 1488
Var X_PS2 = 434
Var X_PS3 = 434
Var X_PS4 = 652
Var X_PS5 = X_CASH
Var X_PS6 = 652
EndIf
</EventOpen>
<EventActionOk>
@ -1309,8 +1333,8 @@
<Button>
<X> X_CASH </X>
<Y> 1276 </Y>
<State> PayState1</State>
<Y> TOP_ROW </Y>
<State> PayState1 </State>
<Filename> FilenameShowbuttonCashBN </Filename>
<FilenamePress> FilenameShowbuttonCashBP </FilenamePress>
<FilenameDisable> FilenameShowbuttonCashBP </FilenameDisable>
@ -1344,8 +1368,8 @@
</Button>
<Button>
<X> 324 </X>
<Y> 1488</Y>
<X> X_PS2 </X>
<Y> BOT_ROW</Y>
<State> PayState2</State>
<Filename> Var( DirImage + "/bn_pay_with_code.png") </Filename>
<FilenamePress> Var( DirImage + "/bp_pay_with_code.png") </FilenamePress>
@ -1370,8 +1394,8 @@
<Button>
<X> 199 </X>
<Y> 1266 </Y>
<X> X_PS3 </X>
<Y> TOP_ROW </Y>
<State> PayState3</State>
<Filename> Var( DirImage + "/bn_qrcode.png") </Filename>
<FilenamePress> Var( DirImage + "/bp_qrcode.png") </FilenamePress>
@ -1484,8 +1508,8 @@
</Button>
<Button>
<X> 434 </X>
<Y> 1266 </Y>
<X> X_PS4 </X>
<Y> TOP_ROW </Y>
<State> PayState3</State>
<Filename> Var( DirImage + "/bn_alipay.png") </Filename>
<FilenamePress> Var( DirImage + "/bp_alipay.png") </FilenamePress>
@ -1581,8 +1605,8 @@
</Button>
<Button>
<X> 554 </X>
<Y> 1488 </Y>
<X> X_PS6 </X>
<Y> BOT_ROW </Y>
<State> PayState5 </State>
<Filename> Var( DirImage + "/bn_pay_with_ccard.png") </Filename>
<FilenamePress> Var( DirImage + "/bp_pay_with_ccard.png") </FilenamePress>
@ -1609,8 +1633,8 @@ EndIf
<Button>
<X> 669 </X>
<Y> 1266 </Y>
<X> X_PS5 </X>
<Y> BOT_ROW </Y>
<State> PayState4</State>
<Filename> Var( DirImage + "/bn_pay_with_credit.png") </Filename>
<FilenamePress> Var( DirImage + "/bp_pay_with_credit.png") </FilenamePress>

2
xml/sometime/RoadShow.ev Normal file
View file

@ -0,0 +1,2 @@
;
Var EnableCash = "true"