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 2024-10-02 20:09:56 +07:00
commit e8148c2786
834 changed files with 34929 additions and 12935 deletions
Download patch file Download diff file Expand all files Collapse all files

8
xml/open_page_collect_point.ev
View file

@ -2,12 +2,8 @@
; default
Var PageCollectPoint1 = "ROOT/taobin_project/xml/page_collect_point_1.xml"
If CountryName = "Australia" Then
Var PageCollectPoint1 = "ROOT/taobin_project/inter/aus/xml/page_collect_point_1.lxml"
EndIf
If CountryName = "Malaysia" Then
Var PageCollectPoint1 = "ROOT/taobin_project/inter/mys/xml/page_collect_point_1.lxml"
If InternationalEnable = 1 Then
Var PageCollectPoint1 = CountryRootPath + "/xml/page_collect_point_1.lxml"
EndIf
If CountryName = "Singapore" Then

8
xml/page_back_to_error.xml
View file

@ -10,9 +10,13 @@
If InternationalEnable = 1 Then
If CountryName = "Australia" Then
OpenInst 0 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_show_error.lxml"
Else
OpenInst 0 "/mnt/sdcard/coffeevending/taobin_project/xml/page_show_error.lxml"
EndIf
If CountryName = "Singapore" Then
OpenInst 0 "ROOT/taobin_project/inter/sgp/xml/page_show_error.lxml"
EndIf
OpenInst 0 "/mnt/sdcard/coffeevending/taobin_project/xml/page_show_error.lxml"
Else
OpenInst 0 "/mnt/sdcard/coffeevending/taobin_project/xml/page_show_error.xml"
EndIf

25
xml/page_board.xml
View file

@ -925,11 +925,10 @@
DEBUGVAR ShowButtonClick2
Var UsePepsiTheme = 0
Var UsePepsiTheme = 1
Var TargetThemeNum = 2
;Var VideoAdvert = "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
; Var = "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/sold_cup_count.xml"
@ -995,6 +994,9 @@
Var MinPhoneNumber = 9
Var MaxPhoneNumber = 9
Var UsePepsiTheme = 1
Var TargetThemeNum = 2
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/sold_cup_count.xml"
EndIf
@ -1256,9 +1258,15 @@
Var MainStartPepsiThemeDir = MainStartPepsiThemeDir + "/image/main_page/"
;Var img_rest_main_page = MainStartPepsiThemeDir + "bn_main_page_start.png"
Var img_press_main_page = MainStartPepsiThemeDir + "bp_main_page_start.png"
Var img_press_main_page = ""
Var VideoMainPage = "ROOT/taobin_project/inter/whatthecup/common/video/video_main_wtc.mp4"
Var ShowButtonClickFull = "Enable"
; root-path
Var CountryWTCRootPath = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
EndIf
Else
; default-theme
@ -1580,6 +1588,11 @@ PRICE "Reset" "-"
If CountDownShowButton = 31 Then
Var ShowButtonClickFull = "Enable"
Var ShowButtonClick = "Invisible"
If UsePepsiTheme = 1 Then
Var ShowButtonClickFull = "Enable"
EndIf
Refresh
EndIf
@ -1587,6 +1600,11 @@ PRICE "Reset" "-"
Var ShowButtonClick = "Enable"
Var ShowButtonClickFull = "Invisible"
If UsePepsiTheme = 1 Then
Var ShowButtonClickFull = "Enable"
EndIf
Refresh
EndIf
@ -1618,7 +1636,6 @@ PRICE "Reset" "-"
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
Var OpenFromPageBoard = 1

17
xml/page_catalog.lxml
View file

@ -210,6 +210,19 @@
DEBUGVAR $51-03-01-0035.Price
Var PromotionIDCurrentOrder = 0
RootLayoutVisible 3 "show"
; reset-if-empty
DEBUGVAR buttonRemoveCup
If buttonRemoveCup = "Invisible" Then
Else
If buttonRemoveCup = "Enable" Then
Else
Var buttonRemoveCup = "Invisible"
EndIf
EndIf
</EventOpen>
<Timeout> 1000 </Timeout>
<EventTimeout>
@ -232,6 +245,8 @@
; zone cup on arm
DEBUGVAR CheckCupStateDoorCupClose
DEBUGVAR CupOnArm
If CupOnArm = "true" Then
If CheckCupStateDoorCupClose = "" Then
@ -246,6 +261,8 @@
Var buttonRemoveCup = "Invisible"
EndIf
EndIf
DEBUGVAR MachineStage
DEBUGVAR buttonRemoveCup
Refresh

2760
xml/page_catalog_group_health.xml
View file

File diff suppressed because it is too large Load diff

6
xml/page_drink_stuck.xml
View file

@ -256,7 +256,11 @@
Var Timeout2 = Timeout2 + 1
If Timeout2 > 15 Then
Play "/mnt/sdcard/coffeevending/taobin_project/sound_thai/remove_cup.mp3"
If InternationalEnable = 1 Then
Else
Play "/mnt/sdcard/coffeevending/taobin_project/sound_thai/remove_cup.mp3"
EndIf
Var Timeout2 = 0
EndIf

12
xml/page_drinkok.xml
View file

@ -325,7 +325,11 @@
Var Timeout2 = Timeout2 + 1
If Timeout2 > 15 Then
Play "/mnt/sdcard/coffeevending/taobin_project/sound_thai/remove_cup.mp3"
If InternationalEnable = 1 Then
Else
Play "/mnt/sdcard/coffeevending/taobin_project/sound_thai/remove_cup.mp3"
EndIf
Var Timeout2 = 0
EndIf
@ -339,7 +343,11 @@
Var Timeout2 = Timeout2 + 1
If Timeout2 > 15 Then
Play "/mnt/sdcard/coffeevending/taobin_project/sound_thai/remove_cup.mp3"
If InternationalEnable = 1 Then
Else
Play "/mnt/sdcard/coffeevending/taobin_project/sound_thai/remove_cup.mp3"
EndIf
Var Timeout2 = 0
EndIf

19
xml/page_lid_straw.xml
View file

@ -150,7 +150,16 @@
EndIf
Else
Open "ROOT/taobin_project/xml/page_get_yourchange.xml"
If UsePepsiTheme = 1 Then
If CountryName = "Singapore" Then
Open "ROOT/taobin_project/inter/whatthecup/sgp/xml/page_get_yourchange-SGP_blue.xml"
EndIf
Else
Open "ROOT/taobin_project/xml/page_get_yourchange.xml"
EndIf
EndIf
Else
@ -180,7 +189,13 @@
Open "ROOT/taobin_project/xml/page_brewing3.xml"
EndIf
Else
Open "ROOT/taobin_project/xml/page_get_yourchange.xml"
If UsePepsiTheme = 1 Then
If CountryName = "Singapore" Then
Open "ROOT/taobin_project/inter/whatthecup/sgp/xml/page_get_yourchange-SGP_blue.xml"
EndIf
Else
Open "ROOT/taobin_project/xml/page_get_yourchange.xml"
EndIf
EndIf
EndIf

2
xml/page_payment_cash-SGP.xml
View file

@ -489,6 +489,8 @@
Var CancelContinue = 0
Var QR_POPUP = CountryRootPath + "/image/page_payment/img_tap_card_5_sec.png"
Var NotEnoughCoinPopup = DirImage2 + "/img_popup12_NotEnoughCoin.png"
</EventOpen>
<EventActionOk>

35
xml/page_payment_cash-UAE.xml
View file

@ -7,6 +7,10 @@
<Sound> PlaySoundLag </Sound>
<EventOpen>
If UsePepsiTheme = 1 Then
Open "ROOT/taobin_project/inter/whatthecup/uae_dubai/xml/page_payment_cash-UAE_blue.xml"
EndIf
Var cash_disable = "0"
READ_FILE "/mnt/sdcard/coffeevending/cash_disable" cash_disable
DEBUGVAR cash_disable
@ -497,6 +501,7 @@
EndIf
DEBUGVAR DirImage2
Var CancelContinue = 0
</EventOpen>
<EventActionOk>
@ -911,9 +916,22 @@
;Var Timeout = 0
EndIf
If Seeker = "curr" Then
DEBUGVAR CancelContinue
Var UserChoosePayment = ""
If CancelContinue = 2 Then
Open "ROOT/taobin_project/xml/page_payment.xml"
EndIf
Open "ROOT/taobin_project/xml/page_catalog.xml"
Else
If CancelContinue = 2 Then
Open "ROOT/taobin_project/xml/page_payment.xml"
EndIf
Var brewing3ContiInter = CountryRootPath + "/xml/page_brewing3Conti.lxml"
DEBUGVAR brewing3ContiInter
Open brewing3ContiInter
@ -1036,6 +1054,10 @@
Var ActionOKCase = 1
Var PayInfoCFlag = 1
EndIf
If CancelContinue = 1 Then
Var CancelContinue = 2
EndIf
EndIf
VendingQR OFF
@ -1427,6 +1449,8 @@
CashlessReq FAIL
EndIf
Var CancelContinue = 0
EndIf
EndIf
@ -1749,6 +1773,8 @@
CashlessReq FAIL
EndIf
Var CancelContinue = 1
Refresh
</EventClick>
</Button>
@ -1928,6 +1954,9 @@
EndIf
Var alphaState2 = "Invisible"
Var CancelContinue = 1
Refresh
@ -1990,6 +2019,9 @@
CoinVending BILLREJECT
Var alphaState3 = "Invisible"
Var CancelContinue = 0
Refresh
</EventClick>
</Button>
@ -2020,6 +2052,9 @@
CoinVending BILLREJECT
Var alphaState3_offline = "Invisible"
Var CancelContinue = 1
Refresh
</EventClick>
</Button>

22
xml/page_pickup_cup_from_error.xml
View file

@ -64,15 +64,21 @@
Else
If HaveCup = "true" Then
If Timeout = 4 Then
Play "/mnt/sdcard/coffeevending/taobin_project/sound_thai/remove_cup.mp3"
EndIf
If Timeout = 54 Then
Play "/mnt/sdcard/coffeevending/taobin_project/sound_thai/remove_cup.mp3"
EndIf
If Timeout = 90 Then
Play "/mnt/sdcard/coffeevending/taobin_project/sound_thai/remove_cup.mp3"
If InternationalEnable = 1 Then
Else
If Timeout = 4 Then
Play "/mnt/sdcard/coffeevending/taobin_project/sound_thai/remove_cup.mp3"
EndIf
If Timeout = 54 Then
Play "/mnt/sdcard/coffeevending/taobin_project/sound_thai/remove_cup.mp3"
EndIf
If Timeout = 90 Then
Play "/mnt/sdcard/coffeevending/taobin_project/sound_thai/remove_cup.mp3"
EndIf
EndIf
EndIf
EndIf

4
xml/page_remove_cup.xml
View file

@ -54,6 +54,10 @@
Var MachineErrorDetailAll = MachineErrorDetail + " / "
Var MachineErrorDetailAll = MachineErrorDetailAll + MachineErrorDetailEng
If InternationalEnable = 1 Then
Var MachineErrorDetailAll = MachineErrorDetailEng
EndIf
;DEBUGVAR HaveCup
;DEBUGVAR CupOnArm

25
xml/sold_cup_count.xml
View file

@ -3,6 +3,7 @@
<Scale> "ALL" </Scale>
<Width> HeadScreenWidth </Width>
<Height> HeadScreenHeight </Height>
<Background> BackgroundColor </Background>
<EventOpen>
SAVELOG "Sold Cup Count inst 1"
DEBUGVAR CurrentTotalCup
@ -171,7 +172,7 @@
<Height> 126 </Height>
<Font> KanitMediumTTF </Font>
<Size> 128 </Size>
<Color> 0x523D30 </Color>
<Color> HeadlineColor </Color>
<Delay> 1300 </Delay>
<Duration> 1500 </Duration>
<Align> center-vertical-horizontal </Align>
@ -192,7 +193,7 @@
<Height> 126 </Height>
<Font> KanitMediumTTF </Font>
<Size> 128 </Size>
<Color> 0x523D30 </Color>
<Color> HeadlineColor </Color>
<Delay> 1150 </Delay>
<Duration> 1500 </Duration>
<Align> center-vertical-horizontal </Align>
@ -213,7 +214,7 @@
<Height> 126 </Height>
<Font> KanitMediumTTF </Font>
<Size> 128 </Size>
<Color> 0x523D30 </Color>
<Color> HeadlineColor </Color>
<Delay> 1000 </Delay>
<Duration> 1500 </Duration>
<Align> center-vertical-horizontal </Align>
@ -234,7 +235,7 @@
<Height> 126 </Height>
<Font> KanitMediumTTF </Font>
<Size> 128 </Size>
<Color> 0x523D30 </Color>
<Color> HeadlineColor </Color>
<Delay> 850 </Delay>
<Duration> 1500 </Duration>
<Align> center-vertical-horizontal </Align>
@ -255,7 +256,7 @@
<Height> 126 </Height>
<Font> KanitMediumTTF </Font>
<Size> 128 </Size>
<Color> 0x523D30 </Color>
<Color> HeadlineColor </Color>
<Delay> 700 </Delay>
<Duration> 1500 </Duration>
<Align> center-vertical-horizontal </Align>
@ -276,7 +277,7 @@
<Height> 126 </Height>
<Font> KanitMediumTTF </Font>
<Size> 128 </Size>
<Color> 0x523D30 </Color>
<Color> HeadlineColor </Color>
<Delay> 550 </Delay>
<Duration> 1500 </Duration>
<Align> center-vertical-horizontal </Align>
@ -297,7 +298,7 @@
<Height> 126 </Height>
<Font> KanitMediumTTF </Font>
<Size> 128 </Size>
<Color> 0x523D30 </Color>
<Color> HeadlineColor </Color>
<Delay> 400 </Delay>
<Duration> 1500 </Duration>
<Align> center-vertical-horizontal </Align>
@ -318,7 +319,7 @@
<Height> 126 </Height>
<Font> KanitMediumTTF </Font>
<Size> 128 </Size>
<Color> 0x523D30 </Color>
<Color> HeadlineColor </Color>
<Delay> 250 </Delay>
<Duration> 1500 </Duration>
<Align> center-vertical-horizontal </Align>
@ -339,7 +340,7 @@
<Height> 126 </Height>
<Font> KanitMediumTTF </Font>
<Size> 128 </Size>
<Color> 0x523D30 </Color>
<Color> HeadlineColor </Color>
<Delay> 100 </Delay>
<Duration> 1500 </Duration>
<Align> center-vertical-horizontal </Align>
@ -359,7 +360,7 @@
<Size> 25 </Size>
<Width>400</Width>
<Font> KanitMediumTTF </Font>
<Color> 0x523D30 </Color>
<Color> HeadlineColor </Color>
<Value> cups_sold_text </Value>
<State> eval(
If CountryName = "Singapore" Then
@ -377,7 +378,7 @@
<Width>50</Width>
<Height>220</Height>
<Font> KanitMediumTTF </Font>
<Color> 0x523D30 </Color>
<Color> HeadlineColor </Color>
<Value> "," </Value>
<State> eval(
If CountryName = "Singapore" Then
@ -395,7 +396,7 @@
<Width>50</Width>
<Height>220</Height>
<Font> KanitMediumTTF </Font>
<Color> 0x523D30 </Color>
<Color> HeadlineColor </Color>
<Value> "," </Value>
<State> eval(
If CountryName = "Singapore" Then

2
xml/vending_info2.xml
View file

@ -1063,6 +1063,8 @@
Var WaitPasswordCheck = 0
Var PasswordOK = 0
__CMD "cancel-pw-newui" "-" "-" "-"
Open "ROOT/taobin_project/xml/page_board.xml"
</EventClick>
</Button>