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:
Pakin 2025-05-26 14:35:42 +07:00
commit dd301dd8d5
148 changed files with 152452 additions and 31568 deletions
Download patch file Download diff file Expand all files Collapse all files

30
xml/event/tricker.ev
View file

@ -167,12 +167,15 @@ If SystemDateDayOfWeek = "Wednesday" Then
EndIf
Var ToppingNewUINewSystem = 0
Var Catalog20BahtEnable = 0
If BoxID = 201193 Then
Var BoostEnergyPro = 1
STRCONTAIN "Catalog20" XMLProfile Catalog20Enable
If Catalog20Enable = "true" Then
Var Catalog20BahtEnable = 1
EndIf
Var ToppingNewUINewSystem = 0
If BoxID = 105005 Then
Var NewFlowPaymentCode = 1
Var New_Payment = 1
@ -189,27 +192,14 @@ EndIf
If BoxID = 201714 Then
EndIf
If BoxID = 201729 Then
Var KingdomThaiTeaPro = 1
Var SongkranSoundCampaign = 1
Var NewMatchaPremiumX3 = 1
EndIf
If BoxID = 173149 Then
Var MomCocoaPro = 0
Var MomCocoaProDiscountEnable = 0
Var RobinsonBeautyPro = 0
Var JemilaToppingFlag = 1
Var Catalog20BahtEnable = 1
EndIf
If BoxID = 123456 Then
Var ToppingNewUINewSystem = 0
Var BoostEnergyPro = 1
Var Catalog20BahtEnable = 1
Var AppleFarmFestivalPro = 1
Var HappyTriosPro = 1
EndIf
DEBUGVAR ConfigNumer

9
xml/menu_catalog_default_init.xml
View file

@ -116,6 +116,15 @@
If Catalog20BahtEnable = 1 Then
Var Menu61Selected = "Invisible"
Var Menu63Selected = "Enable"
Else
Var Menu61Selected = "Enable"
Var Menu63Selected = "Invisible"
EndIf

23
xml/menu_catalog_new.xml
View file

@ -391,6 +391,7 @@
</EventClick>
</Button>
<Button>
<Layout> "linear" </Layout>
<State> Menu62Selected </State>
@ -412,6 +413,28 @@
</EventClick>
</Button>
<Button>
<Layout> "linear" </Layout>
<State> Menu63Selected </State>
<Filename> Var( DirImageAlter + "/bn_20_baht.png") </Filename>
<FilenamePress> Var( DirImageAlter + "/bp_20_baht.png") </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
If EnableMultiInstance = "true" Then
TabMenuVisibleInst 7
Var OpenFileXML = CountryRootPath + "/xml/multi/page_instance2.xml"
OpenInst 2 OpenFileXML
Else
Open "ROOT/taobin_project/xml/page_catalog_group_20_baht.xml"
EndIf
</EventClick>
</Button>
<Button>
<Layout> "linear" </Layout>
<State> MenuVSelected2 </State>

4
xml/page_NewBrewing3.xml
View file

@ -6,6 +6,10 @@
<Volume> SoundVolume </Volume>
<EventOpen>
If CountryName = "Australia" Then
Open "ROOT/taobin_project/inter/aus/xml/page_NewBrewing3.lxml"
EndIf
RootLayoutVisible 3 "hide"
TRY "/mnt/sdcard/coffeevending/taobin_project/xml/process/payext_setup.ev"

4
xml/page_NewBrewing3Conti.xml
View file

@ -6,6 +6,10 @@
<Volume> SoundVolume </Volume>
<EventOpen>
If CountryName = "Australia" Then
Open "ROOT/taobin_project/inter/aus/xml/page_NewBrewing3Conti.lxml"
EndIf
Var ActionOKCase = 0
Var Seeker = "curr"

48
xml/page_board.xml
View file

@ -1143,6 +1143,10 @@
SetLanguage "MTC"
LanguageControl "UpdateList" "-"
If BoxID = 210699 Then
Var CatalogLayoutV3 = 1
EndIf
Var show_eng = "true"
Var img_press_main_page = "ROOT/taobin_project/image/main_page_en/bp_main_page_start.png"
@ -1387,10 +1391,14 @@
If BoxID = 123456 Then
Var SpiralOnline = "true"
Var SpiralOnline = "false"
Var InternationalShow = 0
EndIf
If BoxID = 201193 Then
Var InternationalShow = 1
EndIf
If BoxID = 210699 Then
Var SpiralOnline = "true"
@ -1398,11 +1406,13 @@
Var InternationalShow = 1
EndIf
If BoxID = 105005 Then
Var SpiralOnline = "true"
Var SpiralModeFrozenFruit = 1
Var InternationalShow = 1
EndIf
; test payment
Var New_Payment = 1
@ -1749,7 +1759,7 @@
EndIf
Var CountDownFailErrorHappendClear = 8
</EventOpen>
<EventActionOk>
@ -1932,6 +1942,17 @@ PRICE "Reset" "-"
OpenInst 0 "ROOT/taobin_project/xml/page_board.xml"
EndIf
DEBUGVAR FailErrorHappend
If FailErrorHappend = 1 Then
If CountDownFailErrorHappendClear > 0 Then
Var CountDownFailErrorHappendClear = CountDownFailErrorHappendClear - 1
If CountDownFailErrorHappendClear = 1 Then
__CMD "error-code-clear-all" "-" "-" "-"
EndIf
EndIf
EndIf
If IgnoreNetCore = "true" Then
Else
@ -2124,7 +2145,15 @@ PRICE "Reset" "-"
If CountDownPauseVideo = 1 Then
If EnablePepsiFullscreen = 0 Then
TapScreen 860 1004
If CountryName = "HongKong" Then
If CatalogLayoutV3 = 1 Then
;do-not-thing
Else
TapScreen 860 1004
EndIf
Else
TapScreen 860 1004
EndIf
EndIf
EndIf
@ -2162,6 +2191,11 @@ PRICE "Reset" "-"
Var BaseOnPageBoard = 0
TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/tricker.ev"
Machine DoorClose
TopView "show"
OpenInst 0 "/mnt/sdcard/coffeevending/taobin_project/xml/page_main_blank.xml"
If InternationalEnable = 1 Then
If CountryName = "Thailand" Then
SAVELOG " Thailand Thailand Thailand Thailand Pooon Pooon Pooon Pooon Pooon"
@ -2185,10 +2219,7 @@ PRICE "Reset" "-"
EndIf
EndIf
Machine DoorClose
TopView "show"
OpenInst 0 "/mnt/sdcard/coffeevending/taobin_project/xml/page_main_blank.xml"
EndIf
EndIf
EndIf
@ -2595,6 +2626,9 @@ PRICE "Reset" "-"
Var NextPage = "-"
Var BaseOnPageBoard = 0
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
;inter-xml-open BEGIN
If SpiralOnline = "true" Then
If InternationalEnable = 1 Then
If CountryName = "Thailand" Then
@ -2620,6 +2654,8 @@ PRICE "Reset" "-"
OpenInst 2 "/mnt/sdcard/coffeevending/termtem_project/xml/page_tt_catalog.xml"
EndIf
;inter-xml-open END
TopView "show"
Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_main_blank.xml"
</EventClick>

1
xml/page_catalog.lxml
View file

@ -7,6 +7,7 @@
<EventOpen>
; This file for redirect to folder of country / brand.
;inter-xml-open
If CountryName = "Australia" Then
TRY "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/open_page_catalog.ev"
EndIf

28
xml/page_catalog3.xml
View file

@ -255,6 +255,16 @@
Open "ROOT/taobin_project/inter/tha/xml/multi/page_catalog.lxml"
EndIf
DEBUGVAR Catalog20BahtEnable
If Catalog20BahtEnable = 1 Then
Var PepsiCatalogStage = "Invisible"
Var Menu20BahtStage = "Enable"
Else
Var PepsiCatalogStage = "Enable"
Var Menu20BahtStage = "Invisible"
EndIf
Var Price5Active = 0
</EventOpen>
@ -494,6 +504,7 @@
<Button>
<X> 48 </X>
<Y> 1532 </Y>
<State> PepsiCatalogStage </State>
<Filename> Var(DirImage + "/bn_Pepsi_7up.png") </Filename>
<FilenamePress> Var(DirImage + "/bp_Pepsi_7up.png") </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
@ -505,6 +516,23 @@
</EventClick>
</Button>
<Button>
<X> 48 </X>
<Y> 1532 </Y>
<State> Menu20BahtStage </State>
<Filename> Var(DirImage + "/bn_soda_20B.png") </Filename>
<FilenamePress> Var(DirImage + "/bp_soda_20B.png") </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
Open "ROOT/taobin_project/xml/page_catalog_group_20_baht.xml"
</EventClick>
</Button>
<Button>

2
xml/page_catalog_group_20_baht.skt
View file

@ -15,7 +15,7 @@
;include="ROOT/taobin_project/xml/menu_catalog_default_init.xml"
; soda and other
Var Menu62Selected = "PressForever"
Var Menu63Selected = "PressForever"
SAVELOG PreviseXMLFileName2

2
xml/page_catalog_group_20_baht.xml
View file

@ -12,7 +12,7 @@
;include="ROOT/taobin_project/xml/menu_catalog_default_init.xml"
; soda and other
Var Menu62Selected = "PressForever"
Var Menu63Selected = "PressForever"
SAVELOG PreviseXMLFileName2

4
xml/page_catalog_group_coffee.xml
View file

@ -550,7 +550,7 @@
<Align> center-vertical-horizontal </Align>
</Text>
</Block>
; ==================> Len = 15
; ==================> Len = 16
; 12-01-01-0088 12-01-02-0088 -
<Block>
<MarginLeft> 33 </MarginLeft>
@ -1057,7 +1057,7 @@
<Align> center-vertical-horizontal </Align>
</Text>
</Block>
; ==================> Len = 15
; ==================> Len = 16
; - 12-01-02-0091 -
<Block>
<MarginLeft> 33 </MarginLeft>

9
xml/page_catalog_group_pro_15THB.xml
View file

@ -126,6 +126,15 @@
If Catalog20BahtEnable = 1 Then
Var Menu61Selected = "Invisible"
Var Menu63Selected = "Enable"
Else
Var Menu61Selected = "Enable"
Var Menu63Selected = "Invisible"
EndIf

6126
xml/page_catalog_group_pro_apple_farm_festival.xml
View file

File diff suppressed because it is too large Load diff

9
xml/page_catalog_group_songkran.xml
View file

@ -126,6 +126,15 @@
If Catalog20BahtEnable = 1 Then
Var Menu61Selected = "Invisible"
Var Menu63Selected = "Enable"
Else
Var Menu61Selected = "Enable"
Var Menu63Selected = "Invisible"
EndIf

45
xml/page_thankyouConti.xml
View file

@ -167,7 +167,7 @@
Var buttonRemoveCup = "Invisible"
Var thankyouContiVersion = "TCV9 "
Var thankyouContiVersion = "TC12 "
SAVELOG "Thank you conti version " + thankyouContiVersion
SAVELOG "Support NextSmoothie and fix bug next"
SAVELOG "DirImage detele. use DirImage2"
@ -182,6 +182,13 @@
Var CupErrorCodeForNextOrder = 0
Var CountDownForShowMenuNextOrderToBrew = 4
Var CountDownFailErrorHappendClear = 30
Var ThankyouContiString = ""
DEBUGVAR FailErrorHappend
; setvarint FailErrorHappend 1
</EventOpen>
<Timeout> 1000 </Timeout>
<EventTimeout>
@ -189,14 +196,30 @@
DEBUGVAR MachineStage
DEBUGVAR HaveCup
DEBUGVAR CHECKCUP
DEBUGVAR CupChecking
DEBUGVAR MaybeHaveCup
DEBUGVAR DoorCupPosition
DEBUGVAR CountUpDoorCupOpen
DEBUGVAR Timeout
DEBUGVAR Timeout2
DEBUGVAR FailErrorHappend
DEBUGVAR CountDownFailErrorHappendClear
If FailErrorHappend = 1 Then
If CountDownFailErrorHappendClear > 0 Then
If CountDownFailErrorHappendClear = 29 Then
__CMD "CLI" "clear-ice-for-next-drink" "-" "-"
EndIf
If CountDownFailErrorHappendClear = 25 Then
__CMD "error-code-clear-all" "-" "-" "-"
EndIf
Var CountDownFailErrorHappendClear = CountDownFailErrorHappendClear - 1
EndIf
Var ThankyouContiString = "" + CountDownFailErrorHappendClear
EndIf
Var Timeout2 = Timeout2 + 1
@ -366,6 +389,10 @@
Var ShowCountDownBrewing = CountDownBrewing
Var MachineState_Result = 0
If FailErrorHappend = 1 Then
EndIf
If MenuReadyForCup = "YES" Then
@ -594,6 +621,18 @@
</Text>
<Text>
<X> 0 </X>
<Y> 1888 </Y>
<State> "Enable" </State>
<Font> KanitTTF </Font>
<Size> 22 </Size>
<Width> 1078 </Width>
<Align> end </Align>
<Color> 0xFF0000 </Color>
<Value> ThankyouContiString</Value>
</Text>
<EventUnitTest1>
Var Timeout2 = 0

16
xml/page_topping_select7.xml
View file

@ -698,11 +698,11 @@
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
Open "ROOT/taobin_project/xml/page_payment.xml"
EndIf
Else
Var MenuReason = "Door-Cup!"
EndIf
EndIf
; seeker
EndIf
@ -2537,6 +2537,8 @@
DEBUGVAR toppingID2price1
DEBUGVAR toppingID2price2
DEBUGVAR toppingID2price3
DEBUGVAR toppingID2price4
DEBUGVAR toppingID9price1
DEBUGVAR toppingID9price2
DEBUGVAR toppingID9price3
@ -6684,10 +6686,10 @@
Var topping2 = toppingID2index1
EndIf
If CustomCoffeeQuantityState[1] = "PressForever" Then
Var topping2 = toppingID2index2
Var topping2 = toppingID2index3
EndIf
If CustomCoffeeQuantityState[2] = "PressForever" Then
Var topping2 = toppingID2index3
Var topping2 = toppingID2index4
EndIf
Else
If toppingID2index3 = "" Then
@ -7315,10 +7317,10 @@
Var topping2 = toppingID2index1
EndIf
If CustomCoffeeQuantityState[1] = "PressForever" Then
Var topping2 = toppingID2index2
Var topping2 = toppingID2index3
EndIf
If CustomCoffeeQuantityState[2] = "PressForever" Then
Var topping2 = toppingID2index3
Var topping2 = toppingID2index4
EndIf
Else
If toppingID2index3 = "" Then

68
xml/page_topping_select8.xml
View file

@ -2789,6 +2789,14 @@
Var CustomMilkState[1] = "Disable"
Var CustomMilkState[2] = "Disable"
EndIf
If TOPPING2 = "shot coffee" Then
If showShotNormal = "Enable" Then
If showShotEnable = "Enable" Then
Var showShotNormal = "Press"
EndIf
EndIf
EndIf
;Var SelectToppingType = 0
@ -3515,6 +3523,10 @@
DEBUGVAR toppingID2price2Conv
Var text_shot_normal_add = toppingID2price2Conv + ")"
Var text_shot_normal_add = "(+" + text_shot_normal_add
If showShotNormal = "Enable" Then
Var showShotNormal = "Press"
EndIf
Refresh
EndIf
@ -3688,7 +3700,14 @@
Var showShotEnable = "Invisible"
Var ExtraTopping = "Enable"
Else
Var EnableLightRoast = "Enable"
If toppingID2index3 = 0 Then
Var EnableLightRoast = "Invisible"
Var ShotCoffeePremium = "Enable"
Var showShotEnable = "Invisible"
Var ExtraTopping = "Enable"
Else
Var EnableLightRoast = "Enable"
EndIf
EndIf
DEBUGVAR TOPPING2
@ -3746,16 +3765,16 @@
Var CustomCoffeeQuantityAdditionalPrice[0] = ""
EndIf
If toppingID2price2 > 0 Then
Var priceFormated !assigned StringFmt( toppingID2price2 , PriceCustomCoffeeFormat, PreScaleConvertShow)
If toppingID2price3 > 0 Then
Var priceFormated !assigned StringFmt( toppingID2price3 , PriceCustomCoffeeFormat, PreScaleConvertShow)
Var CustomCoffeeQuantityAdditionalPrice[1] = "(+" + priceFormated
Var CustomCoffeeQuantityAdditionalPrice[1] = CustomCoffeeQuantityAdditionalPrice[1] + ")"
Else
Var CustomCoffeeQuantityAdditionalPrice[1] = ""
EndIf
If toppingID2price3 > 0 Then
Var priceFormated !assigned StringFmt( toppingID2price3 , PriceCustomCoffeeFormat, PreScaleConvertShow)
If toppingID2price4 > 0 Then
Var priceFormated !assigned StringFmt( toppingID2price4 , PriceCustomCoffeeFormat, PreScaleConvertShow)
Var CustomCoffeeQuantityAdditionalPrice[2] = "(+" + priceFormated
Var CustomCoffeeQuantityAdditionalPrice[2] = CustomCoffeeQuantityAdditionalPrice[2] + ")"
Else
@ -3763,6 +3782,18 @@
EndIf
EndIf
If CustomCoffeeQuantityAdditionalPrice[1] = "" Then
Var CustomCoffeeQuantityTextX[1] = 809
Else
Var CustomCoffeeQuantityTextX[1] = 784
EndIf
If CustomCoffeeQuantityAdditionalPrice[2] = "" Then
Var CustomCoffeeQuantityTextX[2] = 922
Else
Var CustomCoffeeQuantityTextX[2] = 892
EndIf
;-END
@ -7915,8 +7946,8 @@
<EventClick>
Var showShotNormal = "Enable"
Var showShotEnable = "PressForever"
Var showShotNormal = "Press"
Var showShotEnable = "Enable"
SAVELOG "esp shot ignore"
Function 2
@ -7937,7 +7968,7 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var showShotEnable = "PressForever"
Var showShotEnable = "Press"
Var showShotNormal = "Enable"
SAVELOG "Espresso Shot add"
@ -9016,7 +9047,7 @@
</Button>
<Text>
<X> 694 </X>
<X> 699 </X>
<Y> CustomCoffeeTextY </Y>
<Font> KanitRegularTTF </Font>
<State> showCoffeeQuantity </State>
@ -9026,7 +9057,8 @@
</Text>
<Text>
<X> 784 </X>
<Refresh> "Enable" </Refresh>
<X> CustomCoffeeQuantityTextX[1] </X>
<Y> CustomCoffeeTextY </Y>
<Font> KanitRegularTTF </Font>
<State> showCoffeeQuantity </State>
@ -9036,7 +9068,8 @@
</Text>
<Text>
<X> 892 </X>
<Refresh> "Enable" </Refresh>
<X> CustomCoffeeQuantityTextX[2] </X>
<Y> CustomCoffeeTextY </Y>
<Font> KanitRegularTTF </Font>
<State> showCoffeeQuantity </State>
@ -11391,6 +11424,12 @@
EndIf
EndIf
If showShotEnable = "Disable" Then
If showShotNormal = "Enable" Then
Var showShotNormal = "Press"
EndIf
EndIf
If showCustomCoffee = "Enable" Then
If showCoffeeWater = "Enable" Then
@ -11442,10 +11481,10 @@
Var TOPPING_PRICE = TOPPING_PRICE + toppingID2price1
EndIf
If CustomCoffeeQuantityState[1] = "PressForever" Then
Var TOPPING_PRICE = TOPPING_PRICE + toppingID2price2
Var TOPPING_PRICE = TOPPING_PRICE + toppingID2price3
EndIf
If CustomCoffeeQuantityState[2] = "PressForever" Then
Var TOPPING_PRICE = TOPPING_PRICE + toppingID2price3
Var TOPPING_PRICE = TOPPING_PRICE + toppingID2price4
EndIf
If CustomCoffeeLevelState[0] = "PressForever" Then
@ -11588,9 +11627,6 @@
RefreshAll
;for test
;Var showShotEnable = "Invisible"
</Function2>

19
xml/topview2.xml
View file

@ -14,6 +14,7 @@
If CountryName = "UnitedArabEmirates Dubai" Then
TRY topview2_script
Else
;inter-lang
If CountryName = "Malaysia" Then
TRY topview2_script
EndIf
@ -67,7 +68,7 @@
Var langFileNameIcon = lang_icon_file_name[LanguageShowByIndex]
Var langfn = "ROOT/taobin_project/image/lang/" + langFileNameIcon
DEBUGVAR langfn
Var DirLanguageImage = "ROOT/taobin_project/image/lang/"
@ -75,7 +76,6 @@
Var ButtonLanguageListXPositionIcon = ButtonLanguageListXPosition + 27
Var ButtonLanguageListYPositionIcon = ButtonLanguageListYPosition + 14
Var ButtonLanguageListWidth = 70
l 86
Var ButtonLanguageListXPositionIconForFlag = ButtonLanguageListXPositionIcon - 10
@ -155,23 +155,29 @@
If PowderScheduleTimeOut = 0 Then
Var PowderScheduleTimeOut = 1
Var powder_sch_ev = "ROOT/taobin_project/inter/tha/" + "/hardware/powder_schedule_v2.ev"
EndIf
Var powder_sch_ev = "ROOT/taobin_project/inter/tha/" + "/hardware/powder_schedule_v2.ev"
TRY powder_sch_ev
EndIf
EndIf
DEBUGVAR exhaust_fan_schedule
TRY exhaust_fan_schedule
;include="ROOT/taobin_project/inc/language_toggle_mode.inc"
DEBUGVAR langfn
DEBUGVAR LanguageButtonEnable
DEBUGVAR LanguageShow
Var CheckDisableTimeout = 0
TRY "ROOT/taobin_project/xml/features/alert_sms/check_disable.ev"
</EventOpen>
<Timeout> 1000 </Timeout>
@ -226,7 +232,6 @@
Var ENABLE_MALAY = "Invisible"
Var ENABLE_MTC = "Invisible"
TRY "ROOT/taobin_project/inter/tha/xml/multi/control_and_lang_swith.ev"
EndIf
If CountryName = "HongKong" Then
@ -385,8 +390,6 @@
DEBUGVAR langfn
LanguageControl "ChangeNextLang" ""
;include="ROOT/taobin_project/inc/language_toggle_mode.inc"
If EnableMultiInstance = "true" Then
Var CountDownRefreshAllGroup = 1
EndIf