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

Merge branch 'master' of forthrd.ddns.net:/1TBHDD/ikong/taobin_project

Browse source
This commit is contained in:
miggaze 2021-03-19 14:41:54 +07:00
commit b8b768a500
54 changed files with 162 additions and 87 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
image/main_page/bn_remove_cup.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 5.6 KiB

BIN
image/main_page/bp_remove_cup.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 5.7 KiB

BIN
material_image/17-01-01-0002.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 329 KiB

BIN
material_image/17-01-01-0004.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 346 KiB

BIN
material_image/17-01-01-0006.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 179 KiB

BIN
material_image/17-01-01-0007.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 181 KiB

BIN
material_image/17-01-01-0020.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 375 KiB

BIN
material_image/17-01-01-0021.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 273 KiB

BIN
material_image/17-01-01-0023.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 242 KiB

BIN
material_image/17-01-01-0026.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 276 KiB

BIN
material_image/17-01-01-0027.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 321 KiB

BIN
material_image/17-01-01-0030.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 248 KiB

BIN
material_image/17-01-01-0031.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 98 KiB

BIN
material_image/17-01-01-0033.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 335 KiB

BIN
material_image/17-01-01-0034.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 198 KiB

BIN
material_image/17-01-01-0035.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 318 KiB

BIN
material_image/17-01-01-0036.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 245 KiB

BIN
material_image/17-01-01-0037.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 90 KiB

BIN
material_image/17-01-02-0003.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 266 KiB

BIN
material_image/17-01-02-0004.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 227 KiB

BIN
material_image/17-01-02-0005.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 166 KiB

BIN
material_image/17-01-02-0006.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 62 KiB

BIN
material_image/17-01-02-0007.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 176 KiB

BIN
material_image/17-01-03-0001.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 249 KiB

BIN
material_image/17-01-03-0002.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 178 KiB

BIN
material_image/17-01-03-0003.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 188 KiB

BIN
material_image/17-01-03-0004.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 179 KiB

BIN
material_image/17-01-03-0005.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 177 KiB

BIN
material_image/17-01-03-0006.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 179 KiB

BIN
video/main_page.mp4
View file

Binary file not shown.

BIN
video/taobin_adv1.mp4
View file

Binary file not shown.

BIN
video/taobin_adv2.mp4
View file

Binary file not shown.

BIN
video/taobin_adv2_1.mp4 Normal file
View file

Binary file not shown.

BIN
video/taobin_adv3.mp4 Normal file
View file

Binary file not shown.

2
xml/menu_catalog.xml
View file

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

31
xml/page_board.xml
View file

@ -11,7 +11,7 @@
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/topview_button_back_main.xml"
Var FileNumber = 1
Var taobin_version = "1.26"
Var taobin_version = "1.32"
; 1.00 is
; On open
@ -110,8 +110,8 @@
Var TimerFirst = "true"
; TODO: remove when release
;Var IgnoreNetCore = "true"
Var buttonRemoveCup = "Invisible"
</EventOpen>
@ -200,7 +200,7 @@
DEBUGVAR CountUpReloadAll
If CountUpReloadAll > 24 Then
If CountUpReloadAll > 180 Then
Var StartUpExt = "-"
Var CountUpReloadAll = 0
@ -209,8 +209,12 @@
EndIf
EndIf
If CupOnArm = "true" Then
Var buttonRemoveCup = "Enable"
Else
Var buttonRemoveCup = "Invisible"
EndIf
TimerReset
</EventTimeout>
@ -219,8 +223,8 @@
;SAVELOG ShowButtonClick
Var CountDownShowButton = 35
Var CountDownPauseVideo = 6
Open CurrentXMLFileName0
TouchTapClose
Open CurrentXMLFileName0
Refresh
</EventEnd>
@ -340,9 +344,22 @@
TopView "show"
Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_main_blank.xml"
</EventClick>
</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>

6
xml/page_brewing3.xml
View file

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

2
xml/page_catalog_choose_drink.xml
View file

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

2
xml/page_catalog_choose_drink1.xml
View file

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

2
xml/page_catalog_choose_drink2.pml
View file

@ -47,6 +47,8 @@
<Volume> SoundVolume </Volume>
<EventOpen>
; On open
;DEBUGVAR $12-01-01-0012.Button
If show_eng = "true" Then
Var showthaiText = "Invisible"

4
xml/page_catalog_choose_drink2.xml
View file

@ -10,6 +10,8 @@
<Volume> SoundVolume </Volume>
<EventOpen>
; On open
DEBUGVAR $12-01-01-0012.Button
If show_eng = "true" Then
Var showthaiText = "Invisible"
@ -84,7 +86,7 @@
<Width> 1080</Width>
<Height> 380 </Height>
<Loop> "true" </Loop>
<Filename> "ROOT/taobin_project/video/taobin_adv2.mp4" </Filename>
<Filename> "ROOT/taobin_project/video/taobin_adv2_1.mp4" </Filename>
</Video>
; under line

2
xml/page_catalog_choose_drink3.xml
View file

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

2
xml/page_catalog_choose_drink4.xml
View file

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

2
xml/page_catalog_choose_drink5.xml
View file

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

2
xml/page_catalog_choose_drink6.xml
View file

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

2
xml/page_catalog_choose_drink7.xml
View file

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

2
xml/page_catalog_choose_drink8.xml
View file

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

5
xml/page_lid_straw.xml
View file

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

2
xml/page_payment.xml
View file

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

51
xml/page_payment_cash.xml
View file

@ -1070,33 +1070,34 @@
EndIf
If countClick2 = 5 Then
If IgnoreNetCore = "true" Then
;Var MachineStage = "make-drink"
; make drink
MakeDrinkV1 SelectDrink ExtendData
Open "ROOT/taobin_project/xml/page_thankyou.xml"
;Var UnitTestType = "1"
Var UnitTestType = "2"
;Open "ROOT/taobin_project/xml/page_show_consent2.xml"
;Open "ROOT/taobin_project/xml/page_payment_code.xml"
;Open "ROOT/taobin_project/xml/page_thankyou.xml"
Var MachineStage = "make-drink"
; make drink
MakeDrinkV1 SelectDrink ExtendData
Open "ROOT/taobin_project/xml/page_thankyou.xml"
;Var UnitTestType = "1"
Var UnitTestType = "2"
;Open "ROOT/taobin_project/xml/page_show_consent2.xml"
;Open "ROOT/taobin_project/xml/page_payment_code.xml"
;Open "ROOT/taobin_project/xml/page_thankyou.xml"
;Open "ROOT/taobin_project/xml/page_collect_point_1.xml"
; show consent
;Open "ROOT/taobin_project/xml/page_show_consent.xml"
;Open "ROOT/taobin_project/xml/page_drinkok.xml"
;Open "ROOT/taobin_project/xml/page_collect_point_1.xml"
; show consent
;Open "ROOT/taobin_project/xml/page_show_consent.xml"
;Open "ROOT/taobin_project/xml/page_drinkok.xml"
;Var CoffeePoint = 11
;Open "ROOT/taobin_project/xml/page_collect_point_3.xml"
;Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_back_to_error.xml"
;Var CoffeePoint = 11
;Open "ROOT/taobin_project/xml/page_collect_point_3.xml"
;Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_back_to_error.xml"
EndIf
EndIf
Refresh
</EventClick>

40
xml/page_show_error.xml
View file

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

38
xml/test_video_loop.xml
View file

@ -3,30 +3,28 @@
<Scale> "ALL" </Scale>
<Width> HeadScreenWidth </Width>
<Height> HeadScreenHeight </Height>
<Video>
;<Volume> 0 </Volume>
<Filename> "/mnt/sdcard/coffeevending/taobin_project/video/taobin_adv1.mp4" </Filename>
</Video>
<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>
<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>
<Timeout> 5000 </Timeout>
<EventSecurity>
Open "/mnt/sdcard/coffeevending/xml/security_alarm.xml"
</EventSecurity>

3
xml/vending_info.xml
View file

@ -62,6 +62,9 @@
Var ShowVersionAll = ShowVersionAll + " | "
Var ShowVersionAll = ShowVersionAll + taobin_version
Var ShowVersionAll = ShowVersionAll + " | "
Var ShowVersionAll = ShowVersionAll + JXMLVersion
Var IDCardState = "Invisible"
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>