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

Do page concerned of point

Browse source
This commit is contained in:
kong 2020-11-01 22:09:26 +07:00
parent 1fec32bc08
commit b52704fecc
24 changed files with 73 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
image/collect_point1/bn_negative.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.5 KiB

BIN
image/collect_point1/bn_positive.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3 KiB

BIN
image/collect_point1/bp_negative.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.4 KiB

BIN
image/collect_point1/bp_positive.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.9 KiB

BIN
image/collect_point1/img3.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.8 KiB

BIN
image/collect_point1/text_1.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 9.2 KiB

BIN
image/collect_point1/text_edit.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 4.2 KiB

BIN
image/collect_point1_en/bn_ignore.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.8 KiB

BIN
image/collect_point1_en/bn_negative.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.5 KiB

BIN
image/collect_point1_en/bn_positive.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.6 KiB

BIN
image/collect_point1_en/bp_negative.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.9 KiB

BIN
image/collect_point1_en/bp_positive.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.9 KiB

BIN
image/collect_point1_en/img3.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.8 KiB

BIN
image/collect_point1_en/text_1.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 12 KiB

BIN
image/collect_point1_en/text_edit.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 4.6 KiB

BIN
image/page_payment_en/page_payment/bn_cash_2.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 5.1 KiB

BIN
image/page_payment_en/page_payment/bp_cash_2.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 5.1 KiB

10
xml/page_board.xml
View file

@ -43,15 +43,19 @@
Var ShowButtonClick = "Enable" Var ShowButtonClick = "Enable"
Var ShowButtonClickFull = "Invisible" Var ShowButtonClickFull = "Invisible"
;Var XPosiShowCountDownBrew = 768 SAVELOG DisplayType
Var XPosiShowCountDownBrew = 693
If DisplayType = "2" Then
Var XPosiShowCountDownBrew = 693
Else
Var XPosiShowCountDownBrew = 768
EndIf
If MachineStage = "close-maintenance" Then If MachineStage = "close-maintenance" Then
Open "ROOT/taobin_project/xml/page_show_error.xml" Open "ROOT/taobin_project/xml/page_show_error.xml"
EndIf EndIf
Var DirectoryImage = "ROOT/taobin_project/image"
</EventOpen> </EventOpen>

6
xml/page_catalog_choose_drink1.pml
View file

@ -112,7 +112,7 @@
; back ; back
<Button> <Button>
<X> 19 </X> <X> 19 </X>
<Y> 420 </Y> <Y> 397 </Y>
<Filename> "ROOT/taobin_project/image/page2/bn_back_arrow.png" </Filename> <Filename> "ROOT/taobin_project/image/page2/bn_back_arrow.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/page2/bn_back_arrow.png" </FilenamePress> <FilenamePress> "ROOT/taobin_project/image/page2/bn_back_arrow.png" </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound> <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
@ -124,7 +124,7 @@
</Button> </Button>
<Button> <Button>
<X> 990 </X> <X> 1000 </X>
<Y> 415 </Y> <Y> 415 </Y>
<Filename> show_btn </Filename> <Filename> show_btn </Filename>
<FilenamePress> show_btp </FilenamePress> <FilenamePress> show_btp </FilenamePress>
@ -169,7 +169,7 @@
</Button> </Button>
<Button> <Button>
<X> 397 </X> <X> 394 </X>
<Y> 395 </Y> <Y> 395 </Y>
<Filename> Var( DirImage + "/bn_tea.png") </Filename> <Filename> Var( DirImage + "/bn_tea.png") </Filename>
<FilenamePress> Var( DirImage + "/bp_tea.png") </FilenamePress> <FilenamePress> Var( DirImage + "/bp_tea.png") </FilenamePress>

6
xml/page_catalog_choose_drink1.xml
View file

@ -57,7 +57,7 @@
; back ; back
<Button> <Button>
<X> 19 </X> <X> 19 </X>
<Y> 420 </Y> <Y> 397 </Y>
<Filename> "ROOT/taobin_project/image/page2/bn_back_arrow.png" </Filename> <Filename> "ROOT/taobin_project/image/page2/bn_back_arrow.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/page2/bn_back_arrow.png" </FilenamePress> <FilenamePress> "ROOT/taobin_project/image/page2/bn_back_arrow.png" </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound> <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
@ -69,7 +69,7 @@
</Button> </Button>
<Button> <Button>
<X> 990 </X> <X> 1000 </X>
<Y> 415 </Y> <Y> 415 </Y>
<Filename> show_btn </Filename> <Filename> show_btn </Filename>
<FilenamePress> show_btp </FilenamePress> <FilenamePress> show_btp </FilenamePress>
@ -114,7 +114,7 @@
</Button> </Button>
<Button> <Button>
<X> 397 </X> <X> 394 </X>
<Y> 395 </Y> <Y> 395 </Y>
<Filename> Var( DirImage + "/bn_tea.png") </Filename> <Filename> Var( DirImage + "/bn_tea.png") </Filename>
<FilenamePress> Var( DirImage + "/bp_tea.png") </FilenamePress> <FilenamePress> Var( DirImage + "/bp_tea.png") </FilenamePress>

79
xml/page_collect_point_1.xml
View file

@ -14,9 +14,9 @@
Var TelephoneNumber = "" Var TelephoneNumber = ""
If show_eng = "true" Then If show_eng = "true" Then
Var DirImage = "ROOT/taobin_project/image/collectiing_en" Var DirImage = "ROOT/taobin_project/image/collect_point1_en"
Else Else
Var DirImage = "ROOT/taobin_project/image/collectiing" Var DirImage = "ROOT/taobin_project/image/collect_point1"
EndIf EndIf
</EventOpen> </EventOpen>
@ -51,6 +51,23 @@
Refresh Refresh
</EventTimeout> </EventTimeout>
<Image>
<X> 0 </X>
<Y> 380 </Y>
<Filename> "ROOT/taobin_project/image/collectiing/alpha.png" </Filename>
</Image>
<Image>
<X> 158 </X>
<Y> 665 </Y>
<Filename> "ROOT/taobin_project/image/collectiing/img_popup1.png" </Filename>
</Image>
<Button> <Button>
<X> 333 </X> <X> 333 </X>
<Y> 1086 </Y> <Y> 1086 </Y>
@ -254,22 +271,6 @@
</EventClick> </EventClick>
</Button> </Button>
<Button>
<X> 44 </X>
<Y> 1783 </Y>
<Filename> Var( DirImage + "/bn_back.png" ) </Filename>
<FilenamePress> Var( DirImage + "/bp_back.png" )</FilenamePress>
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
Var PayState1 = "PressForever"
Var PayState2 = "Enable"
Var QRChannel = 0
Open "ROOT/taobin_project/xml/page_payment_cash.xml"
</EventClick>
</Button>
<Button> <Button>
<X> 620 </X> <X> 620 </X>
<Y> 1517 </Y> <Y> 1517 </Y>
@ -294,6 +295,7 @@
</EventClick> </EventClick>
</Button> </Button>
<Text> <Text>
<X> 0 </X> <X> 0 </X>
<Y> 873 </Y> <Y> 873 </Y>
@ -307,10 +309,10 @@
</Text> </Text>
<Button> <Button>
<X> 44 </X> <X> 218 </X>
<Y> 1783 </Y> <Y> 1671 </Y>
<Filename> "ROOT/taobin_project/image/collectiing/bn_ignore.png" </Filename> <Filename> Var( DirImage + "/bn_negative.png") </Filename>
<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_ignore.png" </FilenamePress> <FilenamePress> Var( DirImage + "/bp_negative.png") </FilenamePress>
<Sound> "ROOT/sounds/codebuttom.wav" </Sound> <Sound> "ROOT/sounds/codebuttom.wav" </Sound>
<Volume> SoundVolume </Volume> <Volume> SoundVolume </Volume>
<EventClick> <EventClick>
@ -321,12 +323,12 @@
<Button> <Button>
<X> 751 </X> <X> 577 </X>
<Y> 1783 </Y> <Y> 1671 </Y>
<State> Tel_Confirm_State </State> <State> Tel_Confirm_State </State>
<Filename> "ROOT/taobin_project/image/collectiing/bn_confirm.png" </Filename> <Filename> Var( DirImage + "/bn_positive.png") </Filename>
<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_confirm.png" </FilenamePress> <FilenamePress> Var( DirImage + "/bp_positive.png") </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/image/collectiing/bd_confirm.png" </FilenameDisable> <FilenameDisable> Var( DirImage + "/bn_positive.png") </FilenameDisable>
<Sound> "ROOT/sounds/codebuttom.wav" </Sound> <Sound> "ROOT/sounds/codebuttom.wav" </Sound>
<Volume> SoundVolume </Volume> <Volume> SoundVolume </Volume>
<EventClick> <EventClick>
@ -343,29 +345,28 @@
</EventClick> </EventClick>
</Button> </Button>
; Border Edit
<Image> <Image>
<X> 217 </X> <X> 217 </X>
<Y> 833 </Y> <Y> 866 </Y>
<Filename> "ROOT/taobin_project/image/collectiing/img3.png" </Filename> <Filename> "ROOT/taobin_project/image/collect_point1/img3.png" </Filename>
</Image> </Image>
<Image> <Image>
<X> 364 </X> <X> 157 </X>
<Y> 887 </Y> <Y> 868 </Y>
<State> ShowTextNumber </State> <State> ShowTextNumber </State>
<Filename> "ROOT/taobin_project/image/collectiing/text21.png" </Filename> <Filename> Var( DirImage + "/text_edit.png") </Filename>
</Image> </Image>
<Image> <Image>
<X> 178 </X> <X> 236 </X>
<Y> 680 </Y> <Y> 699 </Y>
<Filename> "ROOT/taobin_project/image/collectiing/text20.png" </Filename> <Filename> Var( DirImage + "/text_1.png") </Filename>
</Image> </Image>
; Advertise
<Image> <Image>
<X> 0 </X> <X> 0 </X>
<Y> 0 </Y> <Y> 0 </Y>
@ -376,7 +377,7 @@
<Image> <Image>
<X> 751 </X> <X> 751 </X>
<Y> 413 </Y> <Y> 413 </Y>
<Filename> "ROOT/taobin_project/image/page_doing/img2.png" </Filename> <Filename> page_doing_show_time_image </Filename>
</Image> </Image>
; ;
<Text> <Text>

7
xml/page_collect_point_2.xml
View file

@ -9,9 +9,12 @@
; On open ; On open
Var Timeout = 0 Var Timeout = 0
SAVELOG UnitTestType
;Open "ROOT/taobin_project/xml/page_show_consent.xml" If UnitTestType = "1" Then
;Open "ROOT/taobin_project/xml/page_collect_point_3.xml" Var CoffeePoint = 10
Open "ROOT/taobin_project/xml/page_show_consent.xml"
EndIf
</EventOpen> </EventOpen>
<Timeout> 1000 </Timeout> <Timeout> 1000 </Timeout>

12
xml/page_payment_cash.xml
View file

@ -704,13 +704,21 @@
EndIf EndIf
If countClick2 = 5 Then If countClick2 = 5 Then
Var MachineStage = "make-drink" Var MachineStage = "make-drink"
; make drink
;MakeDrinkV1 SelectDrink SelectSugarID ;MakeDrinkV1 SelectDrink SelectSugarID
Var UnitTestType = "1"
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_show_consent.xml"
;Open "ROOT/taobin_project/xml/page_drinkok.xml" ;Open "ROOT/taobin_project/xml/page_drinkok.xml"
Open "ROOT/taobin_project/xml/page_thankyou.xml"
;Var CoffeePoint = 11 ;Var CoffeePoint = 11
;Open "ROOT/taobin_project/xml/page_collect_point_3.xml" ;Open "ROOT/taobin_project/xml/page_collect_point_3.xml"

6
xml/page_show_consent.xml
View file

@ -83,7 +83,11 @@
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound> <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume> <Volume> SoundVolume </Volume>
<EventClick> <EventClick>
If UnitTestType = "1" Then
Var CoffeePoint = 10
Open "ROOT/taobin_project/xml/page_collect_point_3.xml"
EndIf
Var StepGetPoint = 1 Var StepGetPoint = 1
GETACCEXT TelephoneNumber 5 GETACCEXT TelephoneNumber 5
; goto lid straw ; goto lid straw