add file and new advestise

This commit is contained in:
kong 2021-03-12 15:39:02 +07:00
parent 0a6cc72644
commit 1e71e7300c
52 changed files with 131 additions and 59 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 329 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 346 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 179 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 181 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 375 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 273 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 242 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 276 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 321 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 248 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 98 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 335 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 198 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 318 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 245 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 90 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 266 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 227 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 166 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 62 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 176 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 249 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 178 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 188 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 179 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 177 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 179 KiB

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
video/taobin_adv2_1.mp4 Normal file

Binary file not shown.

BIN
video/taobin_adv3.mp4 Normal file

Binary file not shown.

View file

@ -35,7 +35,7 @@
<Width> 1080</Width> <Width> 1080</Width>
<Height> 380 </Height> <Height> 380 </Height>
<Loop> "true" </Loop> <Loop> "true" </Loop>
<Filename> "ROOT/taobin_project/video/taobin_adv2.mp4" </Filename> <Filename> "ROOT/taobin_project/video/taobin_adv2_1.mp4" </Filename>
</Video> </Video>
; under line ; under line

View file

@ -11,7 +11,7 @@
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/topview_button_back_main.xml" OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/topview_button_back_main.xml"
Var FileNumber = 1 Var FileNumber = 1
Var taobin_version = "1.26" Var taobin_version = "1.28"
; 1.00 is ; 1.00 is
; On open ; On open
@ -113,6 +113,8 @@
; TODO: remove when release ; TODO: remove when release
;Var IgnoreNetCore = "true" ;Var IgnoreNetCore = "true"
Var buttonRemoveCup = "Invisible"
</EventOpen> </EventOpen>
<Timeout> 1000 </Timeout> <Timeout> 1000 </Timeout>
@ -200,7 +202,7 @@
DEBUGVAR CountUpReloadAll DEBUGVAR CountUpReloadAll
If CountUpReloadAll > 24 Then If CountUpReloadAll > 120 Then
Var StartUpExt = "-" Var StartUpExt = "-"
Var CountUpReloadAll = 0 Var CountUpReloadAll = 0
@ -210,7 +212,11 @@
EndIf EndIf
If CupOnArm = "true" Then
Var buttonRemoveCup = "Enable"
Else
Var buttonRemoveCup = "Invisible"
EndIf
TimerReset TimerReset
</EventTimeout> </EventTimeout>
@ -219,8 +225,8 @@
;SAVELOG ShowButtonClick ;SAVELOG ShowButtonClick
Var CountDownShowButton = 35 Var CountDownShowButton = 35
Var CountDownPauseVideo = 6 Var CountDownPauseVideo = 6
Open CurrentXMLFileName0
TouchTapClose TouchTapClose
Open CurrentXMLFileName0
Refresh Refresh
</EventEnd> </EventEnd>
@ -340,9 +346,22 @@
TopView "show" TopView "show"
Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_main_blank.xml" Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_main_blank.xml"
</EventClick>
</Button> </Button>
<Button>
<X> 868 </X>
<Y> 634 </Y>
<State> buttonRemoveCup </State>
;<Color> "0x00BDFF" </Color>
<Interval> 300 </Interval>
<Filename> "ROOT/taobin_project/image/main_page/bn_remove_cup.png" </Filename>
<Filename> "ROOT/taobin_project/image/main_page/bp_remove_cup.png" </Filename>
<EventClick>
Machine RemoveCup
</EventClick>
</Button>
</Page> </Page>

View file

@ -7,7 +7,7 @@
<EventOpen> <EventOpen>
; On open move from page_brewing3.xml ; On open move from page_brewing3.xml
Var LidState = "Enable" ;Var LidState = "Enable"
Var StarwState = "Enable" Var StarwState = "Enable"
Var countClick2 = 0 Var countClick2 = 0
@ -155,7 +155,9 @@
Var Timeout = Timeout + 1 Var Timeout = Timeout + 1
Var CountDownBrewing = CountDownBrewing - 1 If CountDownBrewing > 0 Then
Var CountDownBrewing = CountDownBrewing - 1
EndIf
If Simulation = "true" Then If Simulation = "true" Then
If CountDownBrewing = 0 Then If CountDownBrewing = 0 Then

View file

@ -84,7 +84,7 @@
<Width> 1080</Width> <Width> 1080</Width>
<Height> 380 </Height> <Height> 380 </Height>
<Loop> "true" </Loop> <Loop> "true" </Loop>
<Filename> "ROOT/taobin_project/video/taobin_adv2.mp4" </Filename> <Filename> "ROOT/taobin_project/video/taobin_adv2_1.mp4" </Filename>
</Video> </Video>
; under line ; under line

View file

@ -84,7 +84,7 @@
<Width> 1080</Width> <Width> 1080</Width>
<Height> 380 </Height> <Height> 380 </Height>
<Loop> "true" </Loop> <Loop> "true" </Loop>
<Filename> "ROOT/taobin_project/video/taobin_adv2.mp4" </Filename> <Filename> "ROOT/taobin_project/video/taobin_adv2_1.mp4" </Filename>
</Video> </Video>
; under line ; under line

View file

@ -84,7 +84,7 @@
<Width> 1080</Width> <Width> 1080</Width>
<Height> 380 </Height> <Height> 380 </Height>
<Loop> "true" </Loop> <Loop> "true" </Loop>
<Filename> "ROOT/taobin_project/video/taobin_adv2.mp4" </Filename> <Filename> "ROOT/taobin_project/video/taobin_adv2_1.mp4" </Filename>
</Video> </Video>
; under line ; under line

View file

@ -83,7 +83,7 @@
<Width> 1080</Width> <Width> 1080</Width>
<Height> 380 </Height> <Height> 380 </Height>
<Loop> "true" </Loop> <Loop> "true" </Loop>
<Filename> "ROOT/taobin_project/video/taobin_adv2.mp4" </Filename> <Filename> "ROOT/taobin_project/video/taobin_adv2_1.mp4" </Filename>
</Video> </Video>
; under line ; under line

View file

@ -83,7 +83,7 @@
<Width> 1080</Width> <Width> 1080</Width>
<Height> 380 </Height> <Height> 380 </Height>
<Loop> "true" </Loop> <Loop> "true" </Loop>
<Filename> "ROOT/taobin_project/video/taobin_adv2.mp4" </Filename> <Filename> "ROOT/taobin_project/video/taobin_adv2_1.mp4" </Filename>
</Video> </Video>
; under line ; under line

View file

@ -83,7 +83,7 @@
<Width> 1080</Width> <Width> 1080</Width>
<Height> 380 </Height> <Height> 380 </Height>
<Loop> "true" </Loop> <Loop> "true" </Loop>
<Filename> "ROOT/taobin_project/video/taobin_adv2.mp4" </Filename> <Filename> "ROOT/taobin_project/video/taobin_adv2_1.mp4" </Filename>
</Video> </Video>
; under line ; under line

View file

@ -82,7 +82,7 @@
<Width> 1080</Width> <Width> 1080</Width>
<Height> 380 </Height> <Height> 380 </Height>
<Loop> "true" </Loop> <Loop> "true" </Loop>
<Filename> "ROOT/taobin_project/video/taobin_adv2.mp4" </Filename> <Filename> "ROOT/taobin_project/video/taobin_adv2_1.mp4" </Filename>
</Video> </Video>
; under line ; under line

View file

@ -81,7 +81,7 @@
<Width> 1080</Width> <Width> 1080</Width>
<Height> 380 </Height> <Height> 380 </Height>
<Loop> "true" </Loop> <Loop> "true" </Loop>
<Filename> "ROOT/taobin_project/video/taobin_adv2.mp4" </Filename> <Filename> "ROOT/taobin_project/video/taobin_adv2_1.mp4" </Filename>
</Video> </Video>
; under line ; under line

View file

@ -82,7 +82,7 @@
<Width> 1080</Width> <Width> 1080</Width>
<Height> 380 </Height> <Height> 380 </Height>
<Loop> "true" </Loop> <Loop> "true" </Loop>
<Filename> "ROOT/taobin_project/video/taobin_adv2.mp4" </Filename> <Filename> "ROOT/taobin_project/video/taobin_adv2_1.mp4" </Filename>
</Video> </Video>
; under line ; under line

View file

@ -6,7 +6,7 @@
<Volume> SoundVolume </Volume> <Volume> SoundVolume </Volume>
<EventOpen> <EventOpen>
; On open ; On open
;Var LidState = "Invisible" Var LidState = Lid1Status
;Lid1Status ;Lid1Status
Var StarwState = "Enable" Var StarwState = "Enable"
Var LidStrawCountDown = 15 Var LidStrawCountDown = 15
@ -84,7 +84,7 @@
EndIf EndIf
DEBUGVAR StrawAutoRelease1 DEBUGVAR StrawAutoRelease1
Var UserPressButton = "false"
</EventOpen> </EventOpen>
@ -181,6 +181,7 @@
EndIf EndIf
If StrawAutoRelease1 = "true" Then If StrawAutoRelease1 = "true" Then
Var StrawAutoRelease1 = "false"
Var StarwState = "Press" Var StarwState = "Press"
EndIf EndIf

View file

@ -60,7 +60,7 @@
If ReadyForBrew = "false" Then If ReadyForBrew = "false" Then
Open "ROOT/taobin_project/xml/page_back_to_main.xml" Open "ROOT/taobin_project/xml/page_back_to_main.xml"
Var ReadyForBrew = "false"
EndIf EndIf
If MachineStage = "remove-cup" Then If MachineStage = "remove-cup" Then

View file

@ -93,26 +93,26 @@
</EventClick> </EventClick>
</Button> </Button>
<Text> ;<Text>
<X> 0 </X> ;<X> 0 </X>
<Y> 1860 </Y> ;<Y> 1860 </Y>
<Size> 20 </Size> ;<Size> 20 </Size>
<Width> 1080</Width> ;<Width> 1080</Width>
<Align> Start </Align> ;<Align> Start </Align>
<Font> RobotoBlack </Font> ;<Font> RobotoBlack </Font>
<Color> 0x513C2F </Color> ;<Color> 0x513C2F </Color>
<Value> countClick </Value> ;<Value> countClick </Value>
</Text> ;</Text>
<Text> ;<Text>
<X> 0 </X> ;<X> 0 </X>
<Y> 1876 </Y> ;<Y> 1876 </Y>
<Size> 20 </Size> ;<Size> 20 </Size>
<Width> 1080</Width> ;<Width> 1080</Width>
<Align> end </Align> ;<Align> end </Align>
<Font> RobotoBlack </Font> ;<Font> RobotoBlack </Font>
<Color> 0x513C2F </Color> ;<Color> 0x513C2F </Color>
<Value> countClick2 </Value> ;<Value> countClick2 </Value>
</Text> ;</Text>
<Text> <Text>

View file

@ -3,30 +3,28 @@
<Scale> "ALL" </Scale> <Scale> "ALL" </Scale>
<Width> HeadScreenWidth </Width> <Width> HeadScreenWidth </Width>
<Height> HeadScreenHeight </Height> <Height> HeadScreenHeight </Height>
<Video>
;<Volume> 0 </Volume>
<Filename> "/mnt/sdcard/coffeevending/taobin_project/video/taobin_adv1.mp4" </Filename>
</Video>
<EventOpen> <EventOpen>
Int VideoAdvIndex
Var VideoAdvIndex = VideoAdvIndex + 1
If VideoAdvIndex = 1 Then
Var HeadVideoFilename = "/mnt/sdcard/coffeevending/taobin_project/video/taobin_adv1.mp4"
EndIf
If VideoAdvIndex = 2 Then
Var HeadVideoFilename = "/mnt/sdcard/coffeevending/taobin_project/video/taobin_adv3.mp4"
EndIf
DEBUGVAR VideoAdvIndex
If VideoAdvIndex > 1 Then
Var VideoAdvIndex = 0
EndIf
Open "ROOT/taobin_project/xml/video_loop2.xml"
</EventOpen> </EventOpen>
<Timeout> 14000 </Timeout> <Timeout> 5000 </Timeout>
<EventTimeout>
Var AdvImageFile = "/mnt/sdcard/coffeevending/taobin_project/image/adv_img_"
Var AdvImageFile = AdvImageFile + FileNumber
Var AdvImageFile = AdvImageFile + ".png"
Var AdvImageTimeout = 8000
Open "/mnt/sdcard/coffeevending/taobin_project/xml/adv_play.xml"
</EventTimeout>
<EventEnd>
Var AdvImageFile = "/mnt/sdcard/coffeevending/taobin_project/image/adv_img_"
Var AdvImageFile = AdvImageFile + FileNumber
Var AdvImageFile = AdvImageFile + ".png"
Var AdvImageTimeout = 8000
Open "/mnt/sdcard/coffeevending/taobin_project/xml/adv_play.xml"
</EventEnd>
<EventSecurity> <EventSecurity>
Open "/mnt/sdcard/coffeevending/xml/security_alarm.xml" Open "/mnt/sdcard/coffeevending/xml/security_alarm.xml"
</EventSecurity> </EventSecurity>

View file

@ -62,6 +62,9 @@
Var ShowVersionAll = ShowVersionAll + " | " Var ShowVersionAll = ShowVersionAll + " | "
Var ShowVersionAll = ShowVersionAll + taobin_version Var ShowVersionAll = ShowVersionAll + taobin_version
Var ShowVersionAll = ShowVersionAll + " | "
Var ShowVersionAll = ShowVersionAll + JXMLVersion
Var IDCardState = "Invisible" Var IDCardState = "Invisible"
Var Timeout = 0 Var Timeout = 0

49
xml/video_loop2.xml Normal file
View file

@ -0,0 +1,49 @@
<Page>
<Scale> "ALL" </Scale>
<Width> HeadScreenWidth </Width>
<Height> HeadScreenHeight </Height>
<Video>
;<Volume> 0 </Volume>
<Filename> HeadVideoFilename </Filename>
</Video>
<EventOpen>
</EventOpen>
<Timeout> 14000 </Timeout>
<EventTimeout>
Var AdvImageFile = "/mnt/sdcard/coffeevending/taobin_project/image/adv_img_"
Var AdvImageFile = AdvImageFile + FileNumber
Var AdvImageFile = AdvImageFile + ".png"
Var AdvImageTimeout = 8000
Open "/mnt/sdcard/coffeevending/taobin_project/xml/adv_play.xml"
</EventTimeout>
<EventEnd>
Var AdvImageFile = "/mnt/sdcard/coffeevending/taobin_project/image/adv_img_"
Var AdvImageFile = AdvImageFile + FileNumber
Var AdvImageFile = AdvImageFile + ".png"
Var AdvImageTimeout = 8000
Open "/mnt/sdcard/coffeevending/taobin_project/xml/adv_play.xml"
</EventEnd>
<EventSecurity>
Open "/mnt/sdcard/coffeevending/xml/security_alarm.xml"
</EventSecurity>
<Button>
<X> 870 </X>
<Y> 0 </Y>
<Width> 200 </Width>
<Height> 200 </Height>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
OpenInst 0 "//mnt/sdcard/coffeevending/taobin_project/xml/vending_info.xml"
;OpenInst 0 "//mnt/sdcard/coffeevending/taobin_project/xml/page_remove_cup.xml"
</EventClick>
</Page>