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-08-23 17:53:29 +07:00
commit 937b700659
32 changed files with 3338 additions and 3034 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
image/event/robinson_beauty/bn_random.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 4.2 KiB

BIN
image/event/robinson_beauty/random_fortune_cookie.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 37 KiB

BIN
image/event/robinson_beauty/random_select.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 552 KiB

BIN
image/event/robinson_beauty/random_select_bg.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 524 KiB

BIN
image/event/robinson_beauty/reward_bg_no_line.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 377 KiB

BIN
image/event/robinson_beauty/reward_discount.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 56 KiB

BIN
image/event/robinson_beauty/reward_discount_name.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 7.4 KiB

BIN
image/event/robinson_beauty/robinson_beauty_th.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 251 KiB

After

Width:  |  Height:  |  Size: 249 KiB

Before After
Before After

BIN
image/new_vending_info/alpha.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 8.3 KiB

BIN
image/new_vending_info/bn_close_white.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
image/new_vending_info/popup_incorrect.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 25 KiB

BIN
image/new_vending_info/popup_timeout.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 24 KiB

BIN
image/new_vending_info/popup_wait.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 27 KiB

12
inc/video.inc
View file

@ -39,6 +39,9 @@
If PromotionOreoToppingFreeEnable = 1 Then If PromotionOreoToppingFreeEnable = 1 Then
Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_21.mp4" Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_21.mp4"
EndIf EndIf
If UseSlideShowVideo = 1 Then
Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_22.mp4"
EndIf
EndIf EndIf
@ -49,6 +52,15 @@
EndIf EndIf
DEBUGVAR DisplayAds DEBUGVAR DisplayAds
If CountryName = "Malaysia" Then
If PromotionOreoToppingFreeEnable = 1 Then
Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_21.mp4"
EndIf
If UseSlideShowVideo = 1 Then
Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_22.mp4"
EndIf
EndIf
</EventOpen> </EventOpen>
<Filename> DisplayAds </Filename> <Filename> DisplayAds </Filename>
</Video> </Video>

BIN
inter/mys/adv/taobin_adv_menu_22.mp4 Normal file
View file

Binary file not shown.

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

@ -28,6 +28,9 @@ Var PromotionOreoToppingFreeEnable = 0
; Pay later mode ; Pay later mode
Var EnablePayLaterMode = 0 Var EnablePayLaterMode = 0
; Slide show Video
Var UseSlideShowVideo = 0
If SystemDateMonthInt = 6 Then If SystemDateMonthInt = 6 Then
If SystemDateDayInt >= 15 Then If SystemDateDayInt >= 15 Then
Var ProThaiTeaEnable = 1 Var ProThaiTeaEnable = 1
@ -75,6 +78,16 @@ If BoxID = 177746 Then
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" ;Var AdvertiseProfile = "00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00"
Var UseSlideShowVideo = 1
EndIf
If BoxID = 210037 Then
Var UseSlideShowVideo = 1
EndIf
If BoxID = 200002 Then
Var UseSlideShowVideo = 1
EndIf EndIf
;If BoxID = Something Then ;If BoxID = Something Then

4
inter/mys/xml/page_catalog_group_recommend.lxml
View file

@ -646,8 +646,8 @@
<Scroll> "Vertical" </Scroll> <Scroll> "Vertical" </Scroll>
<Column> 4 </Column> <Column> 4 </Column>
<Script> <Script>
Var block_index_override = 4 Var block_index_override = 0
Var block_index_move = 1 Var block_index_move = 0
</Script> </Script>
;dummy_layout.inc ;dummy_layout.inc
; menu_new_list 42 ; menu_new_list 42

51
inter/sgp/menu/lang.tsv
View file

@ -1,14 +1,13 @@
TextID Note English Thai TextID Note English Thai
Font=Montserrat,Type=Bold,Size=48,Color=0x0025FF,Align=Center Font=Kanit,Type=Light,Size=48,Color=0xEE8C62,Align=Center Font=Montserrat,Type=Bold,Size=48,Color=0xEE8C62,Align=Center Font=Kanit,Type=Light,Size=48,Color=0xEE8C62,Align=Center
000001 Page catalog head Welcome ยินดีต้อนรับ 000001 Page catalog head Welcome ยินดีต้อนรับ
Font=Montserrat,Type=Bold,Size=64,Color=0x0025FF,Align=Center Font=Kanit,Type=Light,Size=64,Color=0x513C2F,Align=Center Font=Montserrat,Type=Bold,Size=64,Color=0x513C2F,Align=Center Font=Kanit,Type=Light,Size=64,Color=0x513C2F,Align=Center
000002 Please Select Drink Type กรุณาเลือกประเภทเครื่องดื่ม 000002 Please Select Drink Type กรุณาเลือกประเภทเครื่องดื่ม
Page catalog body
Font=Kanit,Type=Medium,Size=32,Color=0x0025FF,PressColor=0xFFFFFF,Align=Center,LineHeight=30 Font=Kanit,Type=Medium,Size=32,Color=0x513C2F,Align=Center,LineHeight=30 Font=Kanit,Type=Medium,Size=32,Color=0x513C2F,Align=Center,LineHeight=30 Font=Kanit,Type=Medium,Size=32,Color=0x513C2F,Align=Center,LineHeight=30
Font=Kanit,Type=Medium,Size=32,Color=0xFFFFFF,Align=Center,LineHeight=30 Font=Kanit,Type=Medium,Size=32,Color=0x513C2F,Align=Center,LineHeight=30 000003 Page catalog body Best Sellers เมนูแนะนำ
000003 Best Sellers เมนูแนะนำ
000004 Vending\nMachine ตู้สินค้า 000004 Vending\nMachine ตู้สินค้า
000005 Coffee กาแฟ 000005 Coffee กาแฟ
000006 Tea ชา 000006 Tea ชา
@ -24,8 +23,8 @@ TextID Note English Thai
000013 UNAVAILABLE หมด 000013 UNAVAILABLE หมด
Font=Montserrat,Type=Regular,Size=20,Color=0x0025FF,Align=Center-All Font=Montserrat,Type=Regular,Size=24,Color=0x746253,Align=Center-All Font=Montserrat,Type=Regular,Size=20,Color=0x746253,Align=Center-All Font=Montserrat,Type=Regular,Size=24,Color=0x746253,Align=Center-All
Font=Montserrat,Type=Bold,Size=20,Color=0x0025FF,Align=Center-All Font=Montserrat,Type=Bold,Size=24,Color=0x746253,Align=Center-All Font=Montserrat,Type=Bold,Size=20,Color=0x746253,Align=Center-All Font=Montserrat,Type=Bold,Size=24,Color=0x746253,Align=Center-All
000014 our specialty เมนูแนะนำ 000014 our specialty เมนูแนะนำ
000015 Coffee กาแฟ 000015 Coffee กาแฟ
000016 Tea ชา 000016 Tea ชา
@ -43,7 +42,7 @@ TextID Note English Thai
Font=Kanit,Type=Regular,Size=22,Color=0x513C2F,Align=Center Font=Kanit,Type=Regular,Size=24,Color=0x513C2F,Align=Center Font=Kanit,Type=Regular,Size=22,Color=0x513C2F,Align=Center Font=Kanit,Type=Regular,Size=24,Color=0x513C2F,Align=Center
Font=Kanit,Type=Medium,Size=22,Color=0x513C2F,Align=Center Font=Kanit,Type=Medium,Size=24,Color=0x513C2F,Align=Center Font=Kanit,Type=Medium,Size=22,Color=0x513C2F,Align=Center Font=Kanit,Type=Medium,Size=24,Color=0x513C2F,Align=Center
Font=Kanit,Type=Regular,Size=22,Color=0xCFCFCF,Align=Center Font=Kanit,Type=Regular,Size=24,Color=0xCFCFCF,Align=Center Font=Kanit,Type=Regular,Size=22,Color=0xCFCFCF,Align=Center Font=Kanit,Type=Regular,Size=24,Color=0xCFCFCF,Align=Center
Not sweet ไม่หวาน 000040 Not sweet ไม่หวาน
000041 Little หวานจุบจิบ 000041 Little หวานจุบจิบ
000042 Less หวานน้อย 000042 Less หวานน้อย
000043 Perfect หวานพอดี 000043 Perfect หวานพอดี
@ -77,8 +76,8 @@ TextID Note English Thai
000061 =+ SUGAR 2 g (8 cal) =+ น้ำตาล 2 g (8 cal) 000061 =+ SUGAR 2 g (8 cal) =+ น้ำตาล 2 g (8 cal)
000062 =+ SUGAR 5 g (19 cal) =+ น้ำตาล 5 g (19 cal) 000062 =+ SUGAR 5 g (19 cal) =+ น้ำตาล 5 g (19 cal)
000063 =+ SUGAR 7 g (26 cal) =+ น้ำตาล 7 g (26 cal) 000063 =+ SUGAR 7 g (26 cal) =+ น้ำตาล 7 g (26 cal)
Text
Font=Kanit,Type=Medium,Size=36,Color=0x0025FF Font=Kanit,Type=Medium,Size=36,Color=0xDE794E
000064 Extra topping เพิ่มส่วนผสมพิเศษ 000064 Extra topping เพิ่มส่วนผสมพิเศษ
000065 Sweetness level ระดับความหวาน 000065 Sweetness level ระดับความหวาน
000066 Straw and Lid หลอด และ ฝา 000066 Straw and Lid หลอด และ ฝา
@ -86,33 +85,31 @@ TextID Note English Thai
000103 Vegan substitution นมทางเลือก 000103 Vegan substitution นมทางเลือก
Text Text
Font=Kanit,Type=Regular,Size=36,Color=0x0025FF Font=Kanit,Type=Regular,Size=36,Color=0x513C2F
000070 I want a straw รับหลอด 000070 I want a straw รับหลอด
000071 I want a lid รับฝา 000071 I want a lid รับฝา
Text
Font=Opun,Type=Medium,Size=10,Color=0x8092FF Font=Opun,Type=Medium,Size=10,Color=0xDE794E
000072 Ice will be ready at น้ำแข็งจะพร้อมเวลา 000072 Ice will be ready at น้ำแข็งจะพร้อมเวลา
Text
Font=Kanit,Type=Regular,Size=36,Color=0xFFFFFF Font=Kanit,Type=Regular,Size=36,Color=0xFFFFFF
Font=Kanit,Type=Regular,Size=36,Color=0x746253 Font=Kanit,Type=Regular,Size=36,Color=0x746253
000073 Pay now ซื้อเลย 000073 Pay now ซื้อเลย
Text Font=Kanit,Type=Regular,Size=36,Color=0x746253
Font=Kanit,Type=Regular,Size=36,Color=0x0025FF,PressColor=0xFFFFFF
Font=Kanit,Type=Regular,Size=36,Color=0xFFFFFF Font=Kanit,Type=Regular,Size=36,Color=0xFFFFFF
000074 Cancel ยกเลิก 000074 Cancel ยกเลิก
Text Font=Kanit,Type=Light,Size=36,Color=0xFF0000
Font=Kanit,Type=Light,Size=36,Color=0x0025FF
000075 Please choose drink type โปรดเลือกประเภทเครื่องดื่ม 000075 Please choose drink type โปรดเลือกประเภทเครื่องดื่ม
Text
Font=Kanit,Type=Regular,Size=28,Color=0x0025FF,PressColor=0xFFFFFF Font=Kanit,Type=Regular,Size=28,Color=0x513C2F
Font=Kanit,Type=Medium,Size=28,Color=0xFFFFFF Font=Kanit,Type=Medium,Size=28,Color=0x513C2F
Font=Kanit,Type=Regular,Size=28,Color=0xA6B2FF Font=Kanit,Type=Regular,Size=28,Color=0x9D9D9D
Font=Kanit,Type=Regular,Size=28,Color=0x8092FF Font=Kanit,Type=Regular,Size=28,Color=0xCFCFCF
000081 Hot ร้อน 000081 Hot ร้อน
000082 Iced เย็น 000082 Iced เย็น
000083 Blend ปั่น 000083 Blend ปั่น
Font=Kanit,Type=Regular,Size=24,Color=0x0025FF,PressColor=0xFFFFFF Font=Kanit,Type=Regular,Size=24,Color=0x513C2F
000084 Normal ปกติ 000084 Normal ปกติ
@ -120,7 +117,7 @@ TextID Note English Thai
Left of check box Left of check box
Font=Kanit,Type=Light,Size=29,Color=0xA6B2FF,Align=end-center-vertical,LineHeight=30 Font=Kanit,Type=Light,Size=29,Color=0x9D9D9D,Align=end-center-vertical,LineHeight=30
000090 Out of straw หลอดหมด 000090 Out of straw หลอดหมด
000091 Out of lid ฝาหมด 000091 Out of lid ฝาหมด
000092 Only smoothie\n avalible สำหรับเมนูปั่น 000092 Only smoothie\n avalible สำหรับเมนูปั่น
@ -128,7 +125,7 @@ TextID Note English Thai
Text topping extra Text topping extra
Font=Kanit,Type=Regular,Size=36,Color=0x0025FF,LineHeight=46 Font=Kanit,Type=Regular,Size=36,Color=0x513C2F,LineHeight=46
000100 1 Shot of Espresso\n[1 minutes will be added to the process.###Font=KanitLight,Size=15] เอสเพรสโซ่ 1 ช็อต\n[ใช้เวลาชงนานขึ้น 1 นาที###Font=KanitLight,Size=15] 000100 1 Shot of Espresso\n[1 minutes will be added to the process.###Font=KanitLight,Size=15] เอสเพรสโซ่ 1 ช็อต\n[ใช้เวลาชงนานขึ้น 1 นาที###Font=KanitLight,Size=15]
000101 Add extra Oreo crunchy เพิ่มท็อปปิ้งโอริโอภูเขาไฟ 000101 Add extra Oreo crunchy เพิ่มท็อปปิ้งโอริโอภูเขาไฟ
000102 1 Shot of Single Origin Espresso\n[1 minutes will be added to the process.###Font=KanitLight,Size=15] เอสเพรสโซ Single Origin 1 ช็อต\n[ใช้เวลาชงนานขึ้น 1 นาที###Font=KanitLight,Size=15] 000102 1 Shot of Single Origin Espresso\n[1 minutes will be added to the process.###Font=KanitLight,Size=15] เอสเพรสโซ Single Origin 1 ช็อต\n[ใช้เวลาชงนานขึ้น 1 นาที###Font=KanitLight,Size=15]

Can't render this file because it has a wrong number of fields in line 8.

4
inter/uae_dubai/video/script_video.ev
View file

@ -3,11 +3,10 @@ Var EventTurnOn = 0
<<<<<<< HEAD
DEBUGVAR EventTurnOn DEBUGVAR EventTurnOn
Var VideoMainPage = "ROOT/taobin_project/inter/common/video/video_main.mp4" Var VideoMainPage = "ROOT/taobin_project/inter/common/video/video_main.mp4"
=======
DEBUGVAR MainfileSize DEBUGVAR MainfileSize
If SystemDateMonthInt = 12 Then If SystemDateMonthInt = 12 Then
GetFileSizeK "taobin_project/inter/common/video/video_main_event.mp4" MainfileSize GetFileSizeK "taobin_project/inter/common/video/video_main_event.mp4" MainfileSize
@ -40,4 +39,3 @@ Else
Var ShowButtonClickFull = "Invisible" Var ShowButtonClickFull = "Invisible"
Var VideoMainPage = "ROOT/taobin_project/inter/common/video/video_main.mp4" Var VideoMainPage = "ROOT/taobin_project/inter/common/video/video_main.mp4"
EndIf EndIf
>>>>>>> a57ecc08db5486e3f26fe455f2d0e34aa480dd30

27
xml/event/robinson_beauty/page_collect_point_robinson_beauty_3.xml
View file

@ -140,7 +140,7 @@
EndIf EndIf
EndIf EndIf
Var PointDiff = 10 - PointCount Var PointDiff = 9 - PointCount
If show_eng = "true" Then If show_eng = "true" Then
Var MemberText = "YOUR GORGEOUS STATUS" Var MemberText = "YOUR GORGEOUS STATUS"
@ -167,6 +167,10 @@
EndIf EndIf
If PointCount = 9 Then
Var CloseBtnImg = PointRootDir + "/bn_random.png"
EndIf
Var CurrentPointSlot = newPointIndex + 1 Var CurrentPointSlot = newPointIndex + 1
Var UpdatePoint = 0 Var UpdatePoint = 0
@ -181,7 +185,7 @@
Var Timeout = Timeout + 1 ;Var Timeout = Timeout + 1
If Timeout > 10 Then If Timeout > 10 Then
Var CurrentPointCheck = "check" Var CurrentPointCheck = "check"
Var val3 = "X" Var val3 = "X"
@ -416,11 +420,22 @@
<Volume> SoundVolume </Volume> <Volume> SoundVolume </Volume>
<EventClick> <EventClick>
; goto lid straw ; goto lid straw
If PointCount = 9 Then
If SELLONLINE = 1 Then
Var CurrentPointCheck = ""
Else
Var CurrentPointCheck = "check"
EndIf
Var val3 = "X"
AddData 37 TelephoneNumber CurrentPointSlot CurrentPointCheck val3
Var CurrentPointCheck = "check" Open "ROOT/taobin_project/xml/event/nam_hom_coconut/page_nam_hom_coconut_random.xml"
Var val3 = "X" Else
AddData 37 TelephoneNumber CurrentPointSlot CurrentPointCheck val3 Var CurrentPointCheck = "check"
Var UpdatePoint = 1 Var val3 = "X"
AddData 37 TelephoneNumber CurrentPointSlot CurrentPointCheck val3
Var UpdatePoint = 1
EndIf
</EventClick> </EventClick>
</Button> </Button>

2
xml/event/robinson_beauty/page_collect_point_robinson_beauty_error.xml
View file

@ -103,7 +103,7 @@
Var ShowCountDownBrewing = CountDownBrewing Var ShowCountDownBrewing = CountDownBrewing
Var Timeout = Timeout + 1 ;Var Timeout = Timeout + 1
If Timeout > 5 Then If Timeout > 5 Then
Open "ROOT/taobin_project/xml/page_lid_straw.xml" Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf EndIf

243
xml/event/robinson_beauty/page_robinson_beauty_random.xml
View file

@ -12,6 +12,8 @@
Var MaxRandomIndex = 0 Var MaxRandomIndex = 0
Var SelectNumber = 0 Var SelectNumber = 0
Var ShakeCount = 0
Var SelectingState = "Enable" Var SelectingState = "Enable"
Var SelectedState = "Invisible" Var SelectedState = "Invisible"
@ -259,13 +261,13 @@
EndIf EndIf
If SelectedState = "Enable" Then If SelectedState = "Enable" Then
If Timeout > 5 Then If Timeout > 4 Then
Open "ROOT/taobin_project/xml/event/robinson_beauty/page_robinson_beauty_random_result.xml" Open "ROOT/taobin_project/xml/event/robinson_beauty/page_robinson_beauty_random_result.xml"
EndIf EndIf
EndIf EndIf
Var Timeout = Timeout + 1 ;Var Timeout = Timeout + 1
TimerReset TimerReset
Refresh Refresh
@ -280,7 +282,28 @@
<X> 0 </X> <X> 0 </X>
<Y> 380 </Y> <Y> 380 </Y>
<State> SelectingState </State> <State> SelectingState </State>
<Filename> Var( DirImage + "/random_select.png") </Filename> <Filename> Var( DirImage + "/random_select_bg.png") </Filename>
</Image>
; Fotune cookie
<Image>
<X> 412 </X>
<Y> 798 </Y>
<State> SelectingState </State>
<Filename> Var( DirImage + "/random_fotune_cookie.png") </Filename>
<EventClick>
If ShakeCount <= 5 Then
Var ShakeCount = ShakeCount + 1
Else
Random2 1 9 SelectNumber
Function 2
EndIf
Refresh
</EventClick>
<Animation>
<Style> "shake-image" </Style>
<OnChangeValue> ShakeCount </OnChangeValue>
</Animation>
</Image> </Image>
<Image> <Image>
@ -296,104 +319,104 @@
<Filename> Var( DirImage + "/random_text.png") </Filename> <Filename> Var( DirImage + "/random_text.png") </Filename>
</Image> </Image>
<Image> ; <Image>
<X> 573 </X> ; <X> 573 </X>
<Y> 932 </Y> ; <Y> 932 </Y>
<Width> 40 </Width> ; <Width> 40 </Width>
<Height> 72 </Height> ; <Height> 72 </Height>
<EventClick> ; <EventClick>
Var SelectNumber = 1 ; Var SelectNumber = 1
Function 2 ; Function 2
</EventClick> ; </EventClick>
</Image> ; </Image>
;
<Image> ; <Image>
<X> 460 </X> ; <X> 460 </X>
<Y> 944 </Y> ; <Y> 944 </Y>
<Width> 37 </Width> ; <Width> 37 </Width>
<Height> 41 </Height> ; <Height> 41 </Height>
<EventClick> ; <EventClick>
Var SelectNumber = 2 ; Var SelectNumber = 2
Function 2 ; Function 2
</EventClick> ; </EventClick>
</Image> ; </Image>
;
<Image> ; <Image>
<X> 593 </X> ; <X> 593 </X>
<Y> 1056 </Y> ; <Y> 1056 </Y>
<Width> 37 </Width> ; <Width> 37 </Width>
<Height> 68 </Height> ; <Height> 68 </Height>
<EventClick> ; <EventClick>
Var SelectNumber = 3 ; Var SelectNumber = 3
Function 2 ; Function 2
</EventClick> ; </EventClick>
</Image> ; </Image>
;
<Image> ; <Image>
<X> 525 </X> ; <X> 525 </X>
<Y> 979 </Y> ; <Y> 979 </Y>
<Width> 39 </Width> ; <Width> 39 </Width>
<Height> 68 </Height> ; <Height> 68 </Height>
<EventClick> ; <EventClick>
Var SelectNumber = 4 ; Var SelectNumber = 4
Function 2 ; Function 2
</EventClick> ; </EventClick>
</Image> ; </Image>
;
<Image> ; <Image>
<X> 445 </X> ; <X> 445 </X>
<Y> 1101 </Y> ; <Y> 1101 </Y>
<Width> 40 </Width> ; <Width> 40 </Width>
<Height> 68 </Height> ; <Height> 68 </Height>
<EventClick> ; <EventClick>
Var SelectNumber = 5 ; Var SelectNumber = 5
Function 2 ; Function 2
</EventClick> ; </EventClick>
</Image> ; </Image>
;
<Image> ; <Image>
<X> 634 </X> ; <X> 634 </X>
<Y> 989 </Y> ; <Y> 989 </Y>
<Width> 38 </Width> ; <Width> 38 </Width>
<Height> 72 </Height> ; <Height> 72 </Height>
<EventClick> ; <EventClick>
Var SelectNumber = 6 ; Var SelectNumber = 6
Function 2 ; Function 2
</EventClick> ; </EventClick>
</Image> ; </Image>
;
<Image> ; <Image>
<X> 495 </X> ; <X> 495 </X>
<Y> 1051 </Y> ; <Y> 1051 </Y>
<Width> 40 </Width> ; <Width> 40 </Width>
<Height> 67 </Height> ; <Height> 67 </Height>
<EventClick> ; <EventClick>
Var SelectNumber = 7 ; Var SelectNumber = 7
Function 2 ; Function 2
</EventClick> ; </EventClick>
</Image> ; </Image>
;
<Image> ; <Image>
<X> 506 </X> ; <X> 506 </X>
<Y> 907 </Y> ; <Y> 907 </Y>
<Width> 38 </Width> ; <Width> 38 </Width>
<Height> 65 </Height> ; <Height> 65 </Height>
<EventClick> ; <EventClick>
Var SelectNumber = 8 ; Var SelectNumber = 8
Function 2 ; Function 2
</EventClick> ; </EventClick>
</Image> ; </Image>
;
<Image> ; <Image>
<X> 412 </X> ; <X> 412 </X>
<Y> 993 </Y> ; <Y> 993 </Y>
<Width> 41 </Width> ; <Width> 41 </Width>
<Height> 70 </Height> ; <Height> 70 </Height>
<EventClick> ; <EventClick>
Var SelectNumber = 9 ; Var SelectNumber = 9
Function 2 ; Function 2
</EventClick> ; </EventClick>
</Image> ; </Image>
<Function2> <Function2>
; Random coupon ; Random coupon
@ -410,39 +433,39 @@
If randResultStr = "set_a_plus" Then If randResultStr = "set_a_plus" Then
Var CodeType = "" Var CodeType = "144"
EndIf EndIf
if randResultStr = "set_a" Then if randResultStr = "set_a" Then
Var CodeType = "" Var CodeType = "143"
EndIf EndIf
If randResultStr = "lustrous" Then If randResultStr = "lustrous" Then
Var CodeType = "" Var CodeType = "137"
EndIf EndIf
If randResultStr = "lip_tint_oil" Then If randResultStr = "lip_tint_oil" Then
Var CodeType = "" Var CodeType = "138"
EndIf EndIf
If randResultStr = "blush_and_lip" Then If randResultStr = "blush_and_lip" Then
Var CodeType = "" Var CodeType = "139"
EndIf EndIf
If randResultStr = "random" Then If randResultStr = "random" Then
Var CodeType = "" Var CodeType = "140"
EndIf EndIf
If randResultStr = "double_serum" Then If randResultStr = "double_serum" Then
Var CodeType = "" Var CodeType = "141"
EndIf EndIf
If randResultStr = "calvin_klein" Then If randResultStr = "calvin_klein" Then
Var CodeType = "" Var CodeType = "142"
EndIf EndIf
If randResultStr = "discount_50" Then If randResultStr = "discount_50" Then
Var CodeType = "" Var CodeType = "145"
EndIf EndIf

123
xml/event/robinson_beauty/page_robinson_beauty_random_result.xml
View file

@ -10,67 +10,88 @@
Var DirImage = "ROOT/taobin_project/image/event/robinson_beauty" Var DirImage = "ROOT/taobin_project/image/event/robinson_beauty"
If CodeType = "" Then Var RewardBg = DirImage + "/bg_reward.png"
Var RewardText = DirImage + "/super_set_reward_text.png"
Var RewardImage = DirImage + "/super_set_reward.png" If CodeType = "137" Then
Var RewardImage_X = 27 Var RewardText = DirImage + "/reward_lustrous_lipstick_name.png"
Var RewardImage_Y = 876 Var RewardImage = DirImage + "/reward_lustrous_lipstick.png"
Var RewardText_X = 88
Var RewardText_Y = 546
Var RewardImage_X = 424
Var RewardImage_Y = 883
EndIf EndIf
If CodeType = "" Then If CodeType = "138" Then
Var RewardText = DirImage + "/balance_essence_toner_reward_text.png" Var RewardText = DirImage + "/reward_lip_tint_oil_name.png"
Var RewardImage = DirImage + "/balance_essence_toner_reward.png" Var RewardImage = DirImage + "/reward_lip_tint_oil.png"
Var RewardImage_X = 328 Var RewardText_X = 18
Var RewardImage_Y = 843 Var RewardText_Y = 923
Var RewardImage_X = 169
Var RewardImage_Y = 578
EndIf EndIf
If CodeType = "" Then If CodeType = "139" Then
Var RewardText = DirImage + "/cleansing_gel_reward_text.png" Var RewardText = DirImage + "/reward_blush_and_linp_name.png"
Var RewardImage = DirImage + "/cleansing_gel_reward.png" Var RewardImage = DirImage + "/reward_blush_and_linp.png"
Var RewardImage_X = 270 Var RewardText_X = 170
Var RewardImage_Y = 833 Var RewardText_Y = 541
Var RewardImage_X = 114
Var RewardImage_Y = 892
EndIf EndIf
If CodeType = "" Then If CodeType = "140" Then
Var RewardText = DirImage + "/tumble_bottle_reward_text.png" Var RewardText = DirImage + "/reward_random_name.png"
Var RewardImage = DirImage + "/tumble_bottle_reward.png" Var RewardImage = DirImage + "/reward_random.png"
Var RewardImage_X = 148 Var RewardText_X = 307
Var RewardImage_Y = 608 Var RewardText_Y = 573
Var RewardImage_X = 156
Var RewardImage_Y = 839
EndIf EndIf
If CodeType = "" Then If CodeType = "141" Then
Var RewardText = DirImage + "/clear_gel_reward_text.png" Var RewardText = DirImage + "/reward_double_serum_name.png"
Var RewardImage = DirImage + "/clear_gel_reward.png" Var RewardImage = DirImage + "/reward_double_serum.png"
Var RewardImage_X = 445 Var RewardText_X = 160
Var RewardImage_Y = 864 Var RewardText_Y = 623
Var RewardImage_X = 127
Var RewardImage_Y = 848
EndIf EndIf
If CodeType = "" Then If CodeType = "142" Then
Var RewardText = DirImage + "/e_gift_card_100_bath_reward_text.png" Var RewardText = DirImage + "/reward_calvin_klein_name.png"
Var RewardImage = DirImage + "/e_gift_card_100_bath_reward.png" Var RewardImage = DirImage + "/reward_calvin_klein.png"
Var RewardImage_X = 254 Var RewardText_X = 117
Var RewardImage_Y = 805 Var RewardText_Y = 541
Var RewardImage_X = 178
Var RewardImage_Y = 787
EndIf EndIf
If CodeType = "" Then If CodeType = "143" Then
Var RewardText = DirImage + "/clear_gel_4_ml_reward_text.png" Var RewardText = DirImage + "/reward_set_a_name.png"
Var RewardImage = DirImage + "/clear_gel_4_ml_reward.png" Var RewardImage = DirImage + "/reward_set_a.png"
Var RewardImage_X = 267 Var RewardText_X = 283
Var RewardImage_Y = 808 Var RewardText_Y = 545
Var RewardImage_X = 114
Var RewardImage_Y = 819
EndIf EndIf
If CodeType = "" Then If CodeType = "144" Then
Var RewardText = DirImage + "/clear_gel_4_ml_reward_text.png" Var RewardText = DirImage + "/reward_set_a_plus_name.png"
Var RewardImage = DirImage + "/clear_gel_4_ml_reward.png" Var RewardImage = DirImage + "/reward_set_a_plus.png"
Var RewardImage_X = 267 Var RewardText_X = 255
Var RewardImage_Y = 808 Var RewardText_Y = 545
Var RewardImage_X = 134
Var RewardImage_Y = 863
EndIf EndIf
If CodeType = "" Then If CodeType = "145" Then
Var RewardText = DirImage + "/clear_gel_4_ml_reward_text.png" Var RewardText = DirImage + "/reward_discount_name.png"
Var RewardImage = DirImage + "/clear_gel_4_ml_reward.png" Var RewardImage = DirImage + "/reward_discount.png"
Var RewardImage_X = 267 Var RewardText_X = 361
Var RewardImage_Y = 808 Var RewardText_Y = 725
Var RewardImage_X = 137
Var RewardImage_Y = 748
Var RewardBg = DirImage + "/bg_reward_no_line.png"
EndIf EndIf
Var CodeReward = CodeType Var CodeReward = CodeType
@ -117,7 +138,7 @@
<Image> <Image>
<X> 0 </X> <X> 0 </X>
<Y> 380 </Y> <Y> 380 </Y>
<Filename> Var( DirImage + "/bg_reward.png") </Filename> <Filename> RewardBg </Filename>
</Image> </Image>
<Image> <Image>
@ -127,17 +148,11 @@
</Image> </Image>
<Image> <Image>
<X> 126 </X> <X> RewardText_X </X>
<Y> 595 </Y> <Y> RewardText_Y </Y>
<Filename> RewardText </Filename> <Filename> RewardText </Filename>
</Image> </Image>
<Image>
<X> 229 </X>
<Y> 1662 </Y>
<Filename> Var( DirImage + "/reward_result_line_register_text.png") </Filename>
</Image>
; ;
<Image> <Image>
<X> 751 </X> <X> 751 </X>

11
xml/page_board.xml
View file

@ -690,6 +690,15 @@
Var cups_sold_text = "Cups Sold Worldwide" Var cups_sold_text = "Cups Sold Worldwide"
Var UseSlideShowVideo = 0
If BoxID = 210037 Then
Var UseSlideShowVideo = 1
EndIf
If BoxID = 200002 Then
Var UseSlideShowVideo = 1
EndIf
EndIf EndIf
;inter-page-board ;inter-page-board
@ -892,7 +901,7 @@
DEBUGVAR ShowButtonClick2 DEBUGVAR ShowButtonClick2
Var UsePepsiTheme = 1 Var UsePepsiTheme = 0
Var TargetThemeNum = 2 Var TargetThemeNum = 2

3
xml/page_catalog_group_pro_robinson_beauty.skt
View file

@ -14,10 +14,7 @@
Var Timeout = 0 Var Timeout = 0
<<<<<<< HEAD
=======
Var FromRobinsonBeautyPro = 0 Var FromRobinsonBeautyPro = 0
>>>>>>> d60c9e3869794302ccb03e1d7b65f6e600a7b226
;include="ROOT/taobin_project/xml/menu_catalog_new_menu.xml" ;include="ROOT/taobin_project/xml/menu_catalog_new_menu.xml"

5587
xml/page_catalog_group_pro_robinson_beauty.xml
View file

File diff suppressed because it is too large Load diff

14
xml/page_collect_point_1.xml
View file

@ -264,6 +264,20 @@
EndIf EndIf
EndIf EndIf
If RobinsonBeautyPro = 1 Then
If FromRobinsonBeautyPro = 1 Then
If Seeker.CodeChannel = 1 Then
If Seeker.CollectPointPromotion = 1 Then
GETACCEXT TelephoneNumber 32
Open "ROOT/taobin_project/xml/event/robinson_beauty/page_collect_point_robinson_beauty_2.xml"
EndIf
Else
GETACCEXT TelephoneNumber 32
Open "ROOT/taobin_project/xml/event/robinson_beauty/page_collect_point_robinson_beauty_2.xml"
EndIf
EndIf
EndIf
GETACCEXT Param1 23 GETACCEXT Param1 23
Open "ROOT/taobin_project/xml/page_collect_point_2.xml" Open "ROOT/taobin_project/xml/page_collect_point_2.xml"

3
xml/page_pickup_cup_from_error.xml
View file

@ -36,8 +36,7 @@
DEBUGVAR topping9 DEBUGVAR topping9
DEBUGVAR topping10 DEBUGVAR topping10
Var PayCredit = 1
</EventOpen> </EventOpen>
<Timeout> 1000 </Timeout> <Timeout> 1000 </Timeout>

49
xml/vending_info.xml
View file

@ -157,6 +157,19 @@
SAVELOG " EventOpen EventOpen EventOpen EventOpen EventOpen EventOpen EventOpen EventOpen EventOpen EventOpen EventOpen EventOpen " SAVELOG " EventOpen EventOpen EventOpen EventOpen EventOpen EventOpen EventOpen EventOpen EventOpen EventOpen EventOpen EventOpen "
Var MainMenuBlockCount = 2 Var MainMenuBlockCount = 2
READ_FILE "/mnt/sdcard/coffeevending/enable_new_machine_test_ui" enable_new_ui
STRCONTAIN "1" enable_new_ui show_newui_mode
If show_newui_mode = "true" Then
Var EnableNewBrewUI = "true"
Else
Var EnableNewBrewUI = "false"
EndIf
</EventOpen> </EventOpen>
<Timeout> 1000 </Timeout> <Timeout> 1000 </Timeout>
<EventTimeout> <EventTimeout>
@ -258,6 +271,8 @@
EndIf EndIf
EndIf EndIf
DEBUGVAR EnableNewBrewUI
Refresh Refresh
TimerReset TimerReset
@ -870,6 +885,40 @@
<Value> "Enable CreditCard" </Value> <Value> "Enable CreditCard" </Value>
</Text> </Text>
;EnableNewBrewUI
<Image>
<X> info2_startX </X>
<Y> info_13Y </Y>
<Filename> "ROOT/taobin_project/image/tab_1.png" </Filename>
<State> eval(
If EnableNewBrewUI = "true" Then
Var return = "Enable"
Else
Var return = "Invisible"
EndIf
) </State>
<EventClick>
Open "/mnt/sdcard/coffeevending/taobin_project/xml/vending_info2.xml"
</EventClick>
</Image>
<Text>
<X> info2_text_startX </X>
<Y> info_text_13Y </Y>
<Size> 30 </Size>
<Font> fontType1 </Font>
<Color> 0x000000 </Color>
<State> eval(
If EnableNewBrewUI = "true" Then
Var return = "Enable"
Else
Var return = "Invisible"
EndIf
) </State>
<Value> "Access setting (V2)" </Value>
</Text>
;<QRCode> ;<QRCode>
;<X> 930 </X> ;<X> 930 </X>

210
xml/vending_info2.xml
View file

@ -159,6 +159,7 @@
Var MainMenuBlockCount = 2 Var MainMenuBlockCount = 2
Var PassPhrase = "" Var PassPhrase = ""
Var HiddenPassPhrase = ""
Var showStatusText = "" Var showStatusText = ""
Var alphaPasswordPrompt = "Invisible" Var alphaPasswordPrompt = "Invisible"
@ -168,14 +169,33 @@
Var PermissionLevel = "" Var PermissionLevel = ""
Var tmpPassPhrase = "" Var tmpPassPhrase = ""
Var WaitPasswordCheck = 0
Var WaitPopup = "Invisible"
Var WhileRetryCounter = 0
Var FailPopup = "Invisible"
; define-case
Var FailCasePic = ""
Var FailCaseDir = "ROOT/taobin_project/image/new_vending_info/"
Var FailCaseIncorrect = "popup_incorrect.png"
Var FailCaseTimeout = "popup_timeout.png"
</EventOpen> </EventOpen>
<Timeout> 1000 </Timeout> <Timeout> 1000 </Timeout>
<EventTimeout> <EventTimeout>
DEBUGVAR Timeout
DEBUGVAR WhileRetryCounter
Var Timeout = Timeout + 1 If alphaPasswordPromptWithKeyboard = "Enable" Then
If Timeout > 15 Then Var Timeout = 0
Else
Var Timeout = Timeout + 1
EndIf
If Timeout > 30 Then
Open "ROOT/taobin_project/xml/page_board.xml" Open "ROOT/taobin_project/xml/page_board.xml"
EndIf EndIf
@ -186,14 +206,18 @@
Var Timeout = 20 Var Timeout = 20
Var PasswordOK = 0 Var PasswordOK = 0
Var WaitPopup = "Invisible"
Var FailPopup = "Invisible"
Var alphaPasswordPromptWithKeyboard = "Invisible" Var alphaPasswordPromptWithKeyboard = "Invisible"
Var alphaPasswordPrompt = "Invisible" Var alphaPasswordPrompt = "Invisible"
Var PassPhrase = "" Var PassPhrase = ""
Var HiddenPassPhrase = ""
If ClickOn = "GetAccess" Then If ClickOn = "GetAccess" Then
;MainMenu MainMenu2
Open "ROOT/taobin_project/xml/vending_tasks_pre_main.xml" ;Open "ROOT/taobin_project/xml/vending_tasks_pre_main.xml"
EndIf EndIf
If ClickOn = "QuickTest" Then If ClickOn = "QuickTest" Then
@ -205,16 +229,72 @@
If WaitPasswordCheck = 1 Then If WaitPasswordCheck = 1 Then
If PasswordOK = 1 Then If PasswordOK = 1 Then
Var Timeout = 20
Var PasswordOK = 0
Else Var WaitPopup = "Invisible"
Var FailPopup = "Invisible"
__CMD "check-password-wait" "-" "-" "-" Var alphaPasswordPromptWithKeyboard = "Invisible"
Var alphaPasswordPrompt = "Invisible"
EndIf Var PassPhrase = ""
Var HiddenPassPhrase = ""
If ClickOn = "GetAccess" Then
MainMenu2
;Open "ROOT/taobin_project/xml/vending_tasks_pre_main.xml"
EndIf
If ClickOn = "QuickTest" Then
;open
EndIf
Else
If WhileRetryCounter < 10 Then
DEBUGVAR "WaitPasswordCheck"
__CMD "check-password-wait" "-" "-" "-"
Var Timeout = 0
Var WaitPopup = "Enable"
Var FailPopup = "Invisible"
Var WhileRetryCounter = WhileRetryCounter + 1
Else
DEBUGVAR "WaitPasswordCheck.MaxTimeout"
Var WhileRetryCounter = 0
Var WaitPopup = "Invisible"
Var FailPopup = "Enable"
Var alphaPasswordPromptWithKeyboard = "Invisible"
Var FailCasePic = FailCaseDir + FailCaseIncorrect
; auto-turnoff
DEBUGVAR "auto-turnoff"
Var WaitPasswordCheck = 0
EndIf
EndIf
Else
If PasswordOK = 0 Then
If WaitPopup = "Enable" Then
Var WhileRetryCounter = WhileRetryCounter + 1
EndIf
EndIf
EndIf EndIf
; case-unable-to-fetch-pw
If WhileRetryCounter > 10 Then
If WaitPopup = "Enable" Then
Var WaitPopup = "Invisible"
Var alphaPasswordPromptWithKeyboard = "Invisible"
Var WhileRetryCounter = 0
Var FailPopup = "Enable"
Var FailCasePic = FailCaseDir + FailCaseTimeout
EndIf
EndIf
@ -422,8 +502,8 @@
DEBUGVAR ShowVersionAll DEBUGVAR ShowVersionAll
If alphaPasswordPrompt = "Invisible" Then If alphaPasswordPromptWithKeyboard = "Invisible" Then
Var alphaPasswordPrompt = "Enable" Var alphaPasswordPromptWithKeyboard = "Enable"
Var ClickOn = "QuickTest" Var ClickOn = "QuickTest"
EndIf EndIf
@ -440,27 +520,14 @@
<EventClick> <EventClick>
DEBUGVAR ShowVersionAll DEBUGVAR ShowVersionAll
If alphaPasswordPrompt = "Invisible" Then If alphaPasswordPromptWithKeyboard = "Invisible" Then
Var alphaPasswordPrompt = "Enable" Var alphaPasswordPromptWithKeyboard = "Enable"
Var ClickOn = "GetAccess" Var ClickOn = "GetAccess"
EndIf EndIf
</EventClick> </EventClick>
</Button> </Button>
<Button>
<X> 50 </X>
<Y> info_cancel_y </Y>
<Filename> "ROOT/taobin_project/image/new_vending_info/exit_button.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/new_vending_info/exit_button.png" </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
Open "ROOT/taobin_project/xml/page_board.xml"
</EventClick>
</Button>
<EventIDCard> <EventIDCard>
Var IDCardState = "Enable" Var IDCardState = "Enable"
@ -516,6 +583,7 @@
<EventClick> <EventClick>
Var Timeout = 0 Var Timeout = 0
Var PassPhrase = PassPhrase + "1" Var PassPhrase = PassPhrase + "1"
Var HiddenPassPhrase = HiddenPassPhrase + "*"
Var ShowTextNumber = "Invisible" Var ShowTextNumber = "Invisible"
Trim PassPhrase MaxPhoneNumber Trim PassPhrase MaxPhoneNumber
@ -544,6 +612,7 @@
<EventClick> <EventClick>
Var Timeout = 0 Var Timeout = 0
Var PassPhrase = PassPhrase + "2" Var PassPhrase = PassPhrase + "2"
Var HiddenPassPhrase = HiddenPassPhrase + "*"
Var ShowTextNumber = "Invisible" Var ShowTextNumber = "Invisible"
Trim PassPhrase MaxPhoneNumber Trim PassPhrase MaxPhoneNumber
TimerReset TimerReset
@ -574,6 +643,7 @@
<EventClick> <EventClick>
Var Timeout = 0 Var Timeout = 0
Var PassPhrase = PassPhrase + "3" Var PassPhrase = PassPhrase + "3"
Var HiddenPassPhrase = HiddenPassPhrase + "*""
Var ShowTextNumber = "Invisible" Var ShowTextNumber = "Invisible"
Trim PassPhrase MaxPhoneNumber Trim PassPhrase MaxPhoneNumber
TimerReset TimerReset
@ -603,6 +673,7 @@
<EventClick> <EventClick>
Var Timeout = 0 Var Timeout = 0
Var PassPhrase = PassPhrase + "4" Var PassPhrase = PassPhrase + "4"
Var HiddenPassPhrase = HiddenPassPhrase + "*"
Var ShowTextNumber = "Invisible" Var ShowTextNumber = "Invisible"
Trim PassPhrase MaxPhoneNumber Trim PassPhrase MaxPhoneNumber
TimerReset TimerReset
@ -633,6 +704,7 @@
<EventClick> <EventClick>
Var Timeout = 0 Var Timeout = 0
Var PassPhrase = PassPhrase + "5" Var PassPhrase = PassPhrase + "5"
Var HiddenPassPhrase = HiddenPassPhrase + "*"
Var ShowTextNumber = "Invisible" Var ShowTextNumber = "Invisible"
Trim PassPhrase MaxPhoneNumber Trim PassPhrase MaxPhoneNumber
TimerReset TimerReset
@ -663,6 +735,7 @@
<EventClick> <EventClick>
Var Timeout = 0 Var Timeout = 0
Var PassPhrase = PassPhrase + "6" Var PassPhrase = PassPhrase + "6"
Var HiddenPassPhrase = HiddenPassPhrase + "*"
Var ShowTextNumber = "Invisible" Var ShowTextNumber = "Invisible"
Trim PassPhrase MaxPhoneNumber Trim PassPhrase MaxPhoneNumber
TimerReset TimerReset
@ -693,6 +766,7 @@
<EventClick> <EventClick>
Var Timeout = 0 Var Timeout = 0
Var PassPhrase = PassPhrase + "7" Var PassPhrase = PassPhrase + "7"
Var HiddenPassPhrase = HiddenPassPhrase + "*"
Var ShowTextNumber = "Invisible" Var ShowTextNumber = "Invisible"
Trim PassPhrase MaxPhoneNumber Trim PassPhrase MaxPhoneNumber
TimerReset TimerReset
@ -723,6 +797,7 @@
<EventClick> <EventClick>
Var Timeout = 0 Var Timeout = 0
Var PassPhrase = PassPhrase + "8" Var PassPhrase = PassPhrase + "8"
Var HiddenPassPhrase = HiddenPassPhrase + "*"
Var ShowTextNumber = "Invisible" Var ShowTextNumber = "Invisible"
Trim PassPhrase MaxPhoneNumber Trim PassPhrase MaxPhoneNumber
TimerReset TimerReset
@ -752,6 +827,7 @@
<EventClick> <EventClick>
Var Timeout = 0 Var Timeout = 0
Var PassPhrase = PassPhrase + "9" Var PassPhrase = PassPhrase + "9"
Var HiddenPassPhrase = HiddenPassPhrase + "*"
Var ShowTextNumber = "Invisible" Var ShowTextNumber = "Invisible"
Trim PassPhrase MaxPhoneNumber Trim PassPhrase MaxPhoneNumber
TimerReset TimerReset
@ -781,6 +857,7 @@
<EventClick> <EventClick>
Var Timeout = 0 Var Timeout = 0
Var PassPhrase = PassPhrase + "0" Var PassPhrase = PassPhrase + "0"
Var HiddenPassPhrase = HiddenPassPhrase + "*"
Trim PassPhrase MaxPhoneNumber Trim PassPhrase MaxPhoneNumber
StrLen PassPhrase TelNumLen StrLen PassPhrase TelNumLen
If TelNumLen >= MinPhoneNumber Then If TelNumLen >= MinPhoneNumber Then
@ -813,6 +890,7 @@
<EventClick> <EventClick>
Var Timeout = 0 Var Timeout = 0
Trim PassPhrase -1 Trim PassPhrase -1
Trim HiddenPassPhrase -1
StrLen PassPhrase TelNumLen StrLen PassPhrase TelNumLen
@ -875,6 +953,8 @@
Var tmpPassPhrase = PassPhrase Var tmpPassPhrase = PassPhrase
Var PassPhrase = "" Var PassPhrase = ""
Var HiddenPassPhrase = ""
Var WaitPopup = "Enable"
</EventClick> </EventClick>
</Button> </Button>
@ -890,6 +970,7 @@
<EventClick> <EventClick>
Var PassPhrase = "" Var PassPhrase = ""
Var HiddenPassPhrase = ""
Var alphaPasswordPromptWithKeyboard = "Invisible" Var alphaPasswordPromptWithKeyboard = "Invisible"
Var alphaPasswordPrompt = "Invisible" Var alphaPasswordPrompt = "Invisible"
@ -907,7 +988,84 @@
<Font> RobotoBlack </Font> <Font> RobotoBlack </Font>
<Color> 0xE2E2E2 </Color> <Color> 0xE2E2E2 </Color>
<Refresh> "Enable" </Refresh> <Refresh> "Enable" </Refresh>
<Value> PassPhrase </Value> <Value> HiddenPassPhrase </Value>
</Text> </Text>
; waitPopup-with-alpha
<Image>
<X> 0 </X>
<Y> 0 </Y>
<State> eval(
If WaitPopup = "Enable" Then
Var return = "Enable"
Else
If FailPopup = "Enable" Then
Var return = "Enable"
Else
Var return = "Invisible"
EndIf
EndIf
) </State>
<Filename> "ROOT/taobin_project/image/new_vending_info/alpha.png" </Filename>
</Image>
<Image>
<X> 240 </X>
<Y> 300 </Y>
<State> WaitPopup </State>
<Filename> "ROOT/taobin_project/image/new_vending_info/popup_wait.png" </Filename>
</Image>
<Image>
<X> 240 </X>
<Y> 300 </Y>
<State> FailPopup </State>
<Filename> FailCasePic </Filename>
</Image>
<Button>
<X> 375 </X>
<Y> 500 </Y>
<Refresh> "Enable" </Refresh>
<State> FailPopup </State>
<Filename> "ROOT/taobin_project/image/new_vending_info/bn_close_white.png" </Filename>
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
Var PassPhrase = ""
Var HiddenPassPhrase = ""
Var alphaPasswordPromptWithKeyboard = "Invisible"
Var alphaPasswordPrompt = "Invisible"
Var WaitPopup = "Invisible"
Var FailPopup = "Invisible"
</EventClick>
</Button>
<Button>
<X> 50 </X>
<Y> info_cancel_y </Y>
<Filename> "ROOT/taobin_project/image/new_vending_info/exit_button.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/new_vending_info/exit_button.png" </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
Var PassPhrase = ""
Var HiddenPassPhrase = ""
Var alphaPasswordPromptWithKeyboard = "Invisible"
Var alphaPasswordPrompt = "Invisible"
Var WaitPopup = "Invisible"
Var FailPopup = "Invisible"
Var WaitPasswordCheck = 0
Var PasswordOK = 0
Open "ROOT/taobin_project/xml/page_board.xml"
</EventClick>
</Button>
</Page> </Page>

8
xml/vending_tasks_pre_main.xml
View file

@ -115,7 +115,7 @@
<Button> <Button>
<Filename> "ROOT/taobin_project/image/new_vending_info/test_sys_only.png" </Filename> <Filename> "ROOT/taobin_project/image/new_vending_info/test_sys_only.png" </Filename>
<EventOnClick> <EventOnClick>
MainMenu MainMenu2
</EventOnClick> </EventOnClick>
</Button> </Button>
@ -130,7 +130,7 @@
<Button> <Button>
<Filename> "ROOT/taobin_project/image/new_vending_info/service_ops.png" </Filename> <Filename> "ROOT/taobin_project/image/new_vending_info/service_ops.png" </Filename>
<EventOnClick> <EventOnClick>
MainMenu MainMenu2
</EventOnClick> </EventOnClick>
</Button> </Button>
@ -145,7 +145,7 @@
<Button> <Button>
<Filename> "ROOT/taobin_project/image/new_vending_info/maintenance_repair.png" </Filename> <Filename> "ROOT/taobin_project/image/new_vending_info/maintenance_repair.png" </Filename>
<EventOnClick> <EventOnClick>
MainMenu MainMenu2
</EventOnClick> </EventOnClick>
</Button> </Button>
@ -160,7 +160,7 @@
<Button> <Button>
<Filename> "ROOT/taobin_project/image/new_vending_info/configure_machine.png" </Filename> <Filename> "ROOT/taobin_project/image/new_vending_info/configure_machine.png" </Filename>
<EventOnClick> <EventOnClick>
MainMenu MainMenu2
</EventOnClick> </EventOnClick>
</Button> </Button>

8
xml/video_loop2.xml
View file

@ -11,6 +11,14 @@
;DEBUGVAR HeadVideoFilename ;DEBUGVAR HeadVideoFilename
Var ClickCountMainTe = 0 Var ClickCountMainTe = 0
;Open "ROOT/taobin_project/xml/sold_cup_count.xml" ;Open "ROOT/taobin_project/xml/sold_cup_count.xml"
If CountryName = "Malaysia" Then
If BoxID = 200002 Then
Open "ROOT/taobin_project/xml/sold_cup_count.xml"
EndIf
If BoxID = 210037 Then
Open "ROOT/taobin_project/xml/sold_cup_count.xml"
EndIf
EndIf
</EventOpen> </EventOpen>
<Timeout> 33000 </Timeout> <Timeout> 33000 </Timeout>