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

DO

Browse source
This commit is contained in:
kong 2021-12-08 17:25:41 +07:00
parent 744134e271
commit e772afb8a3
38 changed files with 44 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
image/page_drink/bn_dirty_light__snowwhite.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 15 KiB

BIN
image/page_drink/bn_dirty_light_whiskydude.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 15 KiB

BIN
image/page_drink/bn_hot_americano_light.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 13 KiB

Before After
Before After

BIN
image/page_drink/bn_hot_americano_light_snowwhite.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 14 KiB

BIN
image/page_drink/bn_hot_americano_light_whiskydude.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 13 KiB

BIN
image/page_drink/bn_hot_espresso_light.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 12 KiB

Before After
Before After

BIN
image/page_drink/bn_hot_espresso_light_snowwhite.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 12 KiB

BIN
image/page_drink/bn_hot_espresso_light_whiskydude.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 12 KiB

BIN
image/page_drink/bn_iced_americano_light_snowwhite.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 13 KiB

BIN
image/page_drink/bn_iced_americano_light_whiskydude.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 12 KiB

BIN
image/page_drink_disable/bn_dirty_light__snowwhite.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 16 KiB

BIN
image/page_drink_disable/bn_dirty_light_whiskydude.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 15 KiB

BIN
image/page_drink_disable/bn_hot_americano_light_snowwhite.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 14 KiB

BIN
image/page_drink_disable/bn_hot_americano_light_whiskydude.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 13 KiB

BIN
image/page_drink_disable/bn_hot_espresso_light_snowwhite.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 13 KiB

BIN
image/page_drink_disable/bn_hot_espresso_light_whiskydude.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 12 KiB

BIN
image/page_drink_disable/bn_iced_americano_light_snowwhite.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 13 KiB

BIN
image/page_drink_disable/bn_iced_americano_light_whiskydude.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 12 KiB

BIN
image/page_drink_press/bn_dirty_light__snowwhite.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 15 KiB

BIN
image/page_drink_press/bn_dirty_light_whiskydude.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 14 KiB

BIN
image/page_drink_press/bn_hot_americano_light_snowwhite.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 13 KiB

BIN
image/page_drink_press/bn_hot_americano_light_whiskydude.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 13 KiB

BIN
image/page_drink_press/bn_hot_espresso_light_snowwhite.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 12 KiB

BIN
image/page_drink_press/bn_hot_espresso_light_whiskydude.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 11 KiB

BIN
image/page_drink_press/bn_iced_americano_light_snowwhite.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 13 KiB

BIN
image/page_drink_press/bn_iced_americano_light_whiskydude.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 12 KiB

BIN
image/page_drink_select/bn_dirty_light__snowwhite.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 29 KiB

BIN
image/page_drink_select/bn_dirty_light_whiskydude.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 28 KiB

BIN
image/page_drink_select/bn_hot_americano_light_snowwhite.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 26 KiB

BIN
image/page_drink_select/bn_hot_americano_light_whiskydude.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 24 KiB

BIN
image/page_drink_select/bn_hot_espresso_light_snowwhite.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 24 KiB

BIN
image/page_drink_select/bn_hot_espresso_light_whiskydude.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 22 KiB

BIN
image/page_drink_select/bn_iced_americano_light_snowwhite.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 24 KiB

BIN
image/page_drink_select/bn_iced_americano_light_whiskydude.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 22 KiB

4
xml/page_payment_cashMore.xml
View file

@ -1087,8 +1087,8 @@
<Y> 1677</Y> <Y> 1677</Y>
<State> PayState2</State> <State> PayState2</State>
<Filename> Var( DirImage + pay_with_code_imagebn) </Filename> <Filename> Var( DirImage + pay_with_code_imagebn) </Filename>
<FilenamePress> Var( DirImage + pay_with_code_imagebp") </FilenamePress> <FilenamePress> Var( DirImage + pay_with_code_imagebp) </FilenamePress>
<FilenameDisable> Var( DirImage + pay_with_code_imagebp") </FilenameDisable> <FilenameDisable> Var( DirImage + pay_with_code_imagebp) </FilenameDisable>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound> <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume> <Volume> SoundVolume </Volume>
<EventClick> <EventClick>

4
xml/page_topping_select.xml
View file

@ -8,6 +8,10 @@
Var y_topping_bg = 912 Var y_topping_bg = 912
WEB "DISABLE" WEB "DISABLE"
If JXMLVersionInt >= 369 Then
Open "ROOT/taobin_project/xml/page_topping_select4.xml"
EndIf
Open "ROOT/taobin_project/xml/page_topping_select3.xml" Open "ROOT/taobin_project/xml/page_topping_select3.xml"

53
xml/page_topping_select4.xml
View file

@ -152,6 +152,7 @@
Machine DoorLidClose Machine DoorLidClose
Var ButtonNext = "false" Var ButtonNext = "false"
Var NEW_MULTI = "Invisible" Var NEW_MULTI = "Invisible"
</EventOpen> </EventOpen>
@ -174,7 +175,6 @@
EndIf EndIf
Refresh Refresh
TimerReset TimerReset
</EventTimeout> </EventTimeout>
@ -277,10 +277,6 @@
DEBUGVAR SubMenuName12 DEBUGVAR SubMenuName12
DEBUGVAR TOPPING1 DEBUGVAR TOPPING1
DEBUGVAR TOPPING1_ALT_2
DEBUGVAR TOPPING1_ALT_3
DEBUGVAR TOPPING2 DEBUGVAR TOPPING2
DEBUGVAR TOPPING3 DEBUGVAR TOPPING3
DEBUGVAR TOPPING4 DEBUGVAR TOPPING4
@ -1426,6 +1422,10 @@
</EventClick> </EventClick>
</Button> </Button>
; add cart ; add cart
<Button> <Button>
<State> btnAddCart </State> <State> btnAddCart </State>
@ -1515,13 +1515,24 @@
<Volume> SoundVolume </Volume> <Volume> SoundVolume </Volume>
<EventClick> <EventClick>
Var Seeker = "curr"
Var PriceDrink = PriceDrinkTmp Var $curr.PriceDrink = PriceDrinkTmp
SAVELOG "USER press next ( topping ) - new" SAVELOG "USER press next ( topping ) - new"
DEBUGVAR topping1
DEBUGVAR topping2 Var $curr.topping1 = topping1
DEBUGVAR topping3 Var $curr.topping2 = topping2
Var $curr.topping3 = topping3
Var $curr.get_a_straw = StrawState
Var $curr.get_a_lid = LidState
DEBUGVAR $curr.topping1
DEBUGVAR $curr.topping2
DEBUGVAR $curr.topping3
DEBUGVAR $curr.get_a_straw
DEBUGVAR $curr.get_a_lid
DEBUGVAR LidState DEBUGVAR LidState
DEBUGVAR StrawState DEBUGVAR StrawState
@ -1547,16 +1558,24 @@
EndIf EndIf
Var SelectDrink = UserSelectProductCode Var SelectDrink = UserSelectProductCode
Var $curr.selected_a_drink = UserSelectProductCode
DEBUGVAR $curr.selected_a_drink
; Set drink ; Set drink
Topping "Select" UserSelectProductCode
; Set option toppinng and pack If Seeker = "curr" Then
Topping "Select1-ID" topping1 Topping "Select" UserSelectProductCode
Topping "Select2-ID" topping2
Topping "Select3-ID" topping3
; Pack ; Set option toppinng and pack
Topping "Pack" ExtendData Topping "Select1-ID" topping1
Topping "Select2-ID" topping2
Topping "Select3-ID" topping3
; Pack
Topping "Pack" ExtendData
EndIf
If CART_COUNT = 0 Then If CART_COUNT = 0 Then
Open "ROOT/taobin_project/xml/page_payment.xml" Open "ROOT/taobin_project/xml/page_payment.xml"

4
xml_main/startup.xml
View file

@ -95,8 +95,8 @@
Var RandomPromotionMyworld = 0 Var RandomPromotionMyworld = 0
Var RandomSalePackage = 0 Var RandomSalePackage = 0
Var XMLPageVersion = "5.81" Var XMLPageVersion = "5.83"
Var XMLPageVersionInt = 581 Var XMLPageVersionInt = 583
</EventOpen> </EventOpen>
<Text> <Text>