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

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

Browse source
This commit is contained in:
wanlop run 2025-04-23 14:33:26 +07:00
commit 044c9ac605
14 changed files with 5212 additions and 431 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
inter/mys/image/collectiing/text11_if_credit.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 56 KiB

BIN
inter/mys/image/page_doing/txt_15_en.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 21 KiB

After

Width:  |  Height:  |  Size: 21 KiB

Before After
Before After

133
inter/mys/xml/event/event_profile.ev
View file

@ -1,132 +1 @@
TRY "/mnt/sdcard/coffeevending/taobin_project/inter/mys/xml/event/tricker.ev"
Var XMLProfilePreEvent = XMLProfile
DEBUGVAR XMLProfile
STRCONTAIN "PromoYuzu250" XMLProfile HasProYuzu250Concat
STRCONTAIN "PromoReduced" XMLProfile IsProfileReduce
STRCONTAIN "PromoMelon" XMLProfile HasProMelonConcat
Var refresh_str = "-RefreshProf"
STRCONTAIN refresh_str XMLProfile HasRefreshProf
DEBUGVAR HasRefreshProf
DEBUGVAR NeedRefreshProfile
; refresh-profile-after-promo-end
If NeedRefreshProfile = 1 Then
READ_FILE "/mnt/sdcard/coffeevending/profile/price/profile_MYS_slot_3.json" ProfileSlot3MYS
READ_FILE "/mnt/sdcard/coffeevending/profile/price/profile_MYS_slot_4.json" ProfileSlot4MYS
STRCONTAIN "Drop" ProfileSlot3MYS PromoYuzuDrop
STRCONTAIN "Drop" ProfileSlot4MYS PromoMelonDrop
DEBUGVAR PromoYuzuDrop
DEBUGVAR PromoMelonDrop
If HasRefreshProf = "true" Then
DEBUGVAR "case already refresh"
; restore-profile
CacheVarStr "get" XMLProfilePreEvent
Var XMLProfile = XMLProfilePreEvent
Var NeedRefreshProfile = 0
Else
; save-current-as-pre
CacheVarStr "get" XMLProfilePreEvent
Var XMLProfile = XMLProfilePreEvent
If PromoMelonDrop = "true" Then
SAVELOG "case melon drop --> refresh"
Var XMLProfile = XMLProfile + refresh_str
EndIf
EndIf
Else
DEBUGVAR HasProYuzu250Concat
DEBUGVAR ProReducedPriceEnable
DEBUGVAR HasProMelonConcat
DEBUGVAR IgnoreProfileFromRunEV
If ProReducedPriceEnable = 1 Then
Else
DEBUGVAR "Case pro reduce end"
; case-pro-reduce-end
If IgnoreProfileFromRunEV = 1 Then
DEBUGVAR "Pro melon ongoing"
; concat-profile
If HasProMelonConcat = "true" Then
DEBUGVAR "Pro melon concat"
Else
If IsProfileReduce = "true" Then
DEBUGVAR "Pro reduce was set but disabled from trick"
CacheVarStr "get" XMLProfilePreEvent
If XMLProfilePreEvent = "" Then
DEBUGVAR "Get PreEvent Empty"
Var XMLProfile = "General"
Else
DEBUGVAR "Restore profile by pre-event, also concat Melon"
DEBUGVAR XMLProfilePreEvent
Var XMLProfile = XMLProfilePreEvent + "-"
Var XMLProfile = XMLProfile + "PromoMelon250"
EndIf
Else
DEBUGVAR "No pro reduce, concat pro melon"
CacheVarStr "put" XMLProfilePreEvent
Var XMLProfile = XMLProfile + "-"
Var XMLProfile = XMLProfile + "PromoMelon250"
EndIf
EndIf
Else
If IsProfileReduce = "true" Then
DEBUGVAR "No melon but set pro reduce"
CacheVarStr "get" XMLProfilePreEvent
If XMLProfilePreEvent = "" Then
DEBUGVAR "PreEvent empty, set General"
Var XMLProfile = "General"
Else
DEBUGVAR "Restore profile by pre-event"
Var XMLProfile = XMLProfilePreEvent
EndIf
Else
If HasProMelonConcat = "true" Then
CacheVarStr "get" XMLProfilePreEvent
Var XMLProfile = XMLProfilePreEvent
EndIf
DEBUGVAR "Store profile pre event"
DEBUGVAR XMLProfilePreEvent
CacheVarStr "put" XMLProfilePreEvent
EndIf
EndIf
EndIf
If IgnoreProfileFromRunEV = 1 Then
Var ToggleAfterEventProfileOff = 1
If ProMelonEnable = 1 Then
Var IgnoreProfileFromRunEV = 0
SAVELOG "Allow exec cmd brew from event_profile"
EndIf
EndIf
EndIf
DEBUGVAR "v966 removed"

48
inter/mys/xml/event/tricker.ev
View file

@ -51,58 +51,14 @@ Var UseSlideShowVideo = 0
Var NoTrickPriceProfile = 0
If SystemDateMonthInt = 3 Then
If SystemDateDayInt >= 10 Then
Var ProMelonEnable = 1
Else
Var ProMelonEnable = 0
EndIf
EndIf
If SystemDateMonthInt = 4 Then
If SystemDateDayInt <= 20 Then
Var ProMelonEnable = 1
Else
Var ProMelonEnable = 0
READ_FILE "/mnt/sdcard/coffeevending/profile/price/profile_MYS_slot_4.json" ProfileSlot4MYS
STRCONTAIN "Drop" ProfileSlot4MYS PromoMelonDrop
If PromoMelonDrop = "true" Then
SAVELOG "Promotion <Melon> already dropped !!!"
Else
; zone-self-refresh
SAVELOG "Promotion <Melon> End, Self Refresh !!!"
WRITE_FILE "/mnt/sdcard/coffeevending/profile/price/profile_MYS_slot_4.json" "Drop"
WRITE_FILE "/mnt/sdcard/coffeevending/profile/profile_MYS_5.json" "Drop"
WRITE_FILE "/mnt/sdcard/coffeevending/profile/profile_MYS_new_5.json" "Drop"
WRITE_FILE "/mnt/sdcard/coffeevending/need_refresh_file" "1"
EndIf
EndIf
EndIf
; zone-refresh-once
WRITE_FILE "/mnt/sdcard/coffeevending/need_refresh_file" "0"
READ_FILE "/mnt/sdcard/coffeevending/need_refresh_file" NeedRefreshStr
STRCONTAIN "1" NeedRefreshStr need_refresh
DEBUGVAR need_refresh
If need_refresh = "true" Then
Var NeedRefreshProfile = 1
WRITE_FILE "/mnt/sdcard/coffeevending/need_refresh_file" "0"
SAVELOG "Set SelfRefresh := True"
Else
Var NeedRefreshProfile = 0
EndIf
If BoxID = 177746 Then
@ -112,7 +68,7 @@ If BoxID = 177746 Then
;Var ProMelonEnable = 0
Var EnablePayLaterMode = 1
;Var EnablePayLaterMode = 1
;Var AdvertiseProfile = "00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00"

0
inter/uae_dubai/xml/page_brewing3Conti.xml → inter/uae_dubai/xml/page_brewing3Conti.lxml
View file

21
inter/uae_dubai/xml/page_brewing3Conti_blue.lxml
View file

@ -376,6 +376,27 @@
; percent
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
If ShowCountDownBrewing <= 5 Then
Var XPercent = 95

19
inter/uae_dubai/xml/page_brewing3_blue.lxml
View file

@ -717,6 +717,25 @@
; percent
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
If ShowCountDownBrewing <= 5 Then
Var XPercent = 95

2
xml/page_board.xml
View file

@ -2229,7 +2229,7 @@ PRICE "Reset" "-"
Var refresh_str = "-RefreshProf"
STRCONTAIN refresh_str XMLProfile HasRefreshProf
If HasRefreshProf = "true" Then
RebootWithCause "RefreshProf_ProMelon"
EndIf
EndIf

4
xml/page_drinkfail2.xml
View file

@ -38,6 +38,10 @@
Open "ROOT/taobin_project/inter/aus/xml/page_drinkfail_gbr.lxml"
EndIf
If CountryName = "Malaysia" Then
Open "ROOT/taobin_project/xml/page_drinkfail5.xml"
EndIf
If TelephoneNumberProblem = "" Then

16
xml/page_drinkfail5.xml
View file

@ -16,6 +16,16 @@
Var MachineErrorDetailAll = MachineErrorDetailEng
DEBUGVAR Seeker.CreditCard
Var SorryUnexpectedTxt11 = DirImage + "/text11.png"
Var SorryFullState = "Enable"
If Seeker.CreditCard = 1 Then
DEBUGVAR "Fail5::CreditCard"
Var SorryUnexpectedTxt11 = DirImage + "/text11_if_credit.png"
Var Timeout = 21
Var SorryFullState = "Invisible"
EndIf
DEBUGVAR SorryUnexpectedTxt11
DEBUGVAR TelephoneNumberProblem
@ -94,20 +104,22 @@
<Image>
<X> 43 </X>
<X> 0 </X>
<Y> 428 </Y>
<Filename> Var( DirImage + "/text11.png" ) </Filename>
<Filename> SorryUnexpectedTxt11 </Filename>
</Image>
<Image>
<X> 429 </X>
<Y> 1351 </Y>
<State> SorryFullState </State>
<Filename> Var( DirImage + "/QR_contract.png" ) </Filename>
</Image>
<Image>
<X> 190 </X>
<Y> 1598 </Y>
<State> SorryFullState </State>
<Filename> Var( DirImage + "/text13.png" ) </Filename>
</Image>

2
xml/page_lid_straw.xml
View file

@ -216,7 +216,7 @@
EndIf
If CountryName = "UnitedArabEmirates Dubai" Then
Var brewing3ContiInter = CountryRootPath + "/xml/page_brewing3Conti.lxml"
Var brewing3ContiInter = CountryRootPath + "/xml/page_brewing3Conti.xml"
Open brewing3ContiInter
Else

30
xml/page_payment_cash-MYR.xml
View file

@ -477,7 +477,7 @@
DEBUGVAR PayState5
;Open "ROOT/taobin_project/xml/page_page_camera.xml"
;Var PayState4 = "Invisible"
Var PayState4 = "Invisible"
Var TOP_ROW = 1266
Var BOT_ROW = 1488
@ -503,6 +503,18 @@
Var X_PS6 = 652
EndIf
If PayState4 = "Invisible" Then
Var X_PS3 = 324
Var X_PS4 = 554
DEBUGVAR "Turn off TaoCredit"
EndIf
DEBUGVAR VendingCashless
Var VendingCashless = "-"
DEBUGVAR VendingCashless
@ -2338,10 +2350,26 @@ EndIf
Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif"
Var MachineStage = "make-drink"
Var BrewingTextThai = "เตรียมแก้ว"
Var Seeker.CreditCard = 0
MakeDrinkV1 SelectDrink SelectSugarID
Open "ROOT/taobin_project/xml/page_thankyou.xml"
</EventUnitTest4>
<EventUnitTest5>
Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif"
Var MachineStage = "make-drink"
Var BrewingTextThai = "เตรียมแก้ว"
Var Seeker.CreditCard = 1
MakeDrinkV1 SelectDrink SelectSugarID
Open "ROOT/taobin_project/xml/page_thankyou.xml"
</EventUnitTest5>
</Popup>

2436
xmlprofile/y18IDCardCaffeine.json
View file

File diff suppressed because it is too large Load diff

2436
xmlprofile/y18IDCardSoda.json
View file

File diff suppressed because it is too large Load diff