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

DOING and fix 5.65

Browse source
This commit is contained in:
kong 2021-10-29 18:02:29 +07:00
parent e737762343
commit a8cf23f0a3
14 changed files with 1626 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

43
animation01/sync_0.file Normal file
View file

@ -0,0 +1,43 @@
total 253480
-rw-r--r--@ 1 wanloprungsiyangkul staff 20682 Sep 30 15:05 Menu Description - Sheet1.tsv
-rw-r--r--@ 1 wanloprungsiyangkul staff 15623 Sep 22 20:35 Menu Description - Sheet1_.tsv
-rw-r--r--@ 1 wanloprungsiyangkul staff 948282 Nov 15 2020 TaoBin2_draft02_art1.mp4
-rw-r--r--@ 1 wanloprungsiyangkul staff 3603060 Nov 15 2020 TaoBin2_draft02_art10.mp4
-rw-r--r--@ 1 wanloprungsiyangkul staff 3166935 Nov 15 2020 TaoBin2_draft02_art11.mp4
-rw-r--r--@ 1 wanloprungsiyangkul staff 2523981 Nov 15 2020 TaoBin2_draft02_art12.mp4
-rw-r--r--@ 1 wanloprungsiyangkul staff 3033922 Nov 15 2020 TaoBin2_draft02_art13.mp4
-rw-r--r--@ 1 wanloprungsiyangkul staff 1504005 Nov 15 2020 TaoBin2_draft02_art14.mp4
-rw-r--r--@ 1 wanloprungsiyangkul staff 3485911 Nov 15 2020 TaoBin2_draft02_art15.mp4
-rw-r--r--@ 1 wanloprungsiyangkul staff 3116323 Nov 15 2020 TaoBin2_draft02_art16.mp4
-rw-r--r--@ 1 wanloprungsiyangkul staff 3221745 Nov 15 2020 TaoBin2_draft02_art17.mp4
-rw-r--r--@ 1 wanloprungsiyangkul staff 1375111 Nov 15 2020 TaoBin2_draft02_art18.mp4
-rw-r--r--@ 1 wanloprungsiyangkul staff 1478218 Nov 15 2020 TaoBin2_draft02_art19.mp4
-rw-r--r--@ 1 wanloprungsiyangkul staff 4333281 Nov 15 2020 TaoBin2_draft02_art2.mp4
-rw-r--r--@ 1 wanloprungsiyangkul staff 1416127 Nov 15 2020 TaoBin2_draft02_art20.mp4
-rw-r--r--@ 1 wanloprungsiyangkul staff 1495680 Nov 15 2020 TaoBin2_draft02_art21.mp4
-rw-r--r--@ 1 wanloprungsiyangkul staff 1469930 Nov 15 2020 TaoBin2_draft02_art22.mp4
-rw-r--r--@ 1 wanloprungsiyangkul staff 1920522 Nov 15 2020 TaoBin2_draft02_art23.mp4
-rw-r--r--@ 1 wanloprungsiyangkul staff 1425647 Nov 15 2020 TaoBin2_draft02_art24.mp4
-rw-r--r--@ 1 wanloprungsiyangkul staff 2879806 Dec 5 2020 TaoBin2_draft02_art25.mp4
-rw-r--r--@ 1 wanloprungsiyangkul staff 3161811 Dec 5 2020 TaoBin2_draft02_art26.mp4
-rw-r--r--@ 1 wanloprungsiyangkul staff 5410752 Dec 15 2020 TaoBin2_draft02_art27.mp4
-rw-r--r--@ 1 wanloprungsiyangkul staff 6889815 Dec 15 2020 TaoBin2_draft02_art28.mp4
-rw-r--r--@ 1 wanloprungsiyangkul staff 1966646 Nov 15 2020 TaoBin2_draft02_art3.mp4
-rw-r--r--@ 1 wanloprungsiyangkul staff 1876379 Apr 21 21:02 TaoBin2_draft02_art31.mp4
-rw-r--r--@ 1 wanloprungsiyangkul staff 1796407 Apr 21 21:02 TaoBin2_draft02_art32.mp4
-rw-r--r--@ 1 wanloprungsiyangkul staff 1840993 Apr 21 21:02 TaoBin2_draft02_art33.mp4
-rw-r--r--@ 1 wanloprungsiyangkul staff 4730836 Apr 21 21:02 TaoBin2_draft02_art34.mp4
-rw-r--r--@ 1 wanloprungsiyangkul staff 1375111 Nov 15 2020 TaoBin2_draft02_art35.mp4
-rw-r--r--@ 1 wanloprungsiyangkul staff 10750801 Aug 25 10:14 TaoBin2_draft02_art36.mp4
-rw-r--r--@ 1 wanloprungsiyangkul staff 1504005 Nov 15 2020 TaoBin2_draft02_art37.mp4
-rw-r--r--@ 1 wanloprungsiyangkul staff 1595611 Nov 15 2020 TaoBin2_draft02_art4.mp4
-rw-r--r--@ 1 wanloprungsiyangkul staff 3055256 Sep 24 18:44 TaoBin2_draft02_art40.mp4
-rw-r--r--@ 1 wanloprungsiyangkul staff 3605634 Sep 24 18:44 TaoBin2_draft02_art41.mp4
-rw-r--r--@ 1 wanloprungsiyangkul staff 9350285 Sep 24 18:44 TaoBin2_draft02_art42.mp4
-rw-r--r--@ 1 wanloprungsiyangkul staff 9643046 Sep 24 18:44 TaoBin2_draft02_art43.mp4
-rw-r--r--@ 1 wanloprungsiyangkul staff 2041924 Nov 16 2020 TaoBin2_draft02_art5.mp4
-rw-r--r--@ 1 wanloprungsiyangkul staff 3843048 Nov 15 2020 TaoBin2_draft02_art6.mp4
-rw-r--r--@ 1 wanloprungsiyangkul staff 3740266 Nov 15 2020 TaoBin2_draft02_art7.mp4
-rw-r--r--@ 1 wanloprungsiyangkul staff 3998856 Nov 15 2020 TaoBin2_draft02_art8.mp4
-rw-r--r--@ 1 wanloprungsiyangkul staff 3616423 Nov 15 2020 TaoBin2_draft02_art9.mp4
-rw-r--r-- 1 wanloprungsiyangkul staff 0 Oct 11 00:29 sync_0.file

BIN
image/topping2/bd_add_shot.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
image/topping2/bd_add_shot2.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.3 KiB

BIN
image/topping2/bd_blended.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
image/vending_error/img1.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 54 KiB

After

Width:  |  Height:  |  Size: 54 KiB

Before After
Before After

BIN
image/vending_error_en/img1.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 54 KiB

After

Width:  |  Height:  |  Size: 54 KiB

Before After
Before After

1
xml/page_board.xml
View file

@ -11,6 +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
DEBUGVAR SoundVolume
Var GetFreeFromError = 0 Var GetFreeFromError = 0
Var taobin_version = "1.53" Var taobin_version = "1.53"

13
xml/page_brewing3.xml
View file

@ -249,10 +249,19 @@
Var Timeout = Timeout + 1 Var Timeout = Timeout + 1
If CountDownBrewing > 0 Then If MOVE_CUP_TO_DOOR = "true" Then
Var CountDownBrewing = CountDownBrewing - 1 Var MOVE_CUP_TO_DOOR = "false"
EndIf EndIf
If BREW_COUNT_DOWN_FROM_APP = "on" Then
Var CountDownBrewing = BREW_CNT
Else
If CountDownBrewing > 0 Then
Var CountDownBrewing = CountDownBrewing - 1
EndIf
Endif
If Simulation = "true" Then If Simulation = "true" Then
If CountDownBrewing = 0 Then If CountDownBrewing = 0 Then
;Open "ROOT/taobin_project/xml/page_drinkok.xml" ;Open "ROOT/taobin_project/xml/page_drinkok.xml"

3
xml/page_catalog.xml
View file

@ -18,7 +18,7 @@
Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_tt_catalog.xml" Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_tt_catalog.xml"
EndIf EndIf
Machine DoorLidClose ;Machine DoorLidClose
Var GetPayInfoFlag = 0 Var GetPayInfoFlag = 0
Var countDownRetrun = 30 Var countDownRetrun = 30
@ -51,7 +51,6 @@
Var StrawAutoRelease1 = "false" Var StrawAutoRelease1 = "false"
Var StrawAutoRelease2 = "false" Var StrawAutoRelease2 = "false"
Machine DoorClose
If NetworkStatus = "ACTIVATE" Then If NetworkStatus = "ACTIVATE" Then
Var ShowButtonClick2 = "Enable" Var ShowButtonClick2 = "Enable"

2
xml/page_payment_cash.xml
View file

@ -305,6 +305,8 @@
EndIf EndIf
EndIf EndIf
Machine DoorClose
</EventOpen> </EventOpen>
<EventActionOk> <EventActionOk>

3
xml/page_topping_select.xml
View file

@ -7,6 +7,9 @@
<EventOpen> <EventOpen>
Var y_topping_bg = 912 Var y_topping_bg = 912
If JXMLVersionInt > 355 Then
Open "ROOT/taobin_project/xml/page_topping_select3.xml"
EndIf
If ConfigNumer > 360 Then If ConfigNumer > 360 Then
SAVELOG "Recipe have smoothies" SAVELOG "Recipe have smoothies"
Open "ROOT/taobin_project/xml/page_topping_select2.xml" Open "ROOT/taobin_project/xml/page_topping_select2.xml"

16
xml/page_topping_select2.xml
View file

@ -7,6 +7,10 @@
<EventOpen> <EventOpen>
Var y_topping_bg = 912 Var y_topping_bg = 912
;Machine DoorClose
Machine DoorLidClose
DEBUGVAR video_menu_0 DEBUGVAR video_menu_0
DEBUGVAR SelectDrink DEBUGVAR SelectDrink
@ -94,8 +98,6 @@
Var backGroundAddShotPremium = DirImage + "/bg_add_shot_coffee2_only.png" Var backGroundAddShotPremium = DirImage + "/bg_add_shot_coffee2_only.png"
Var backGroundAddShotPremiumWith = DirImage + "/bg_add_shot_coffee_only.png" Var backGroundAddShotPremiumWith = DirImage + "/bg_add_shot_coffee_only.png"
; Move to catalog.
;Machine DoorClose
;Var blendedState = "Enable" ;Var blendedState = "Enable"
@ -145,6 +147,8 @@
Var btnAddCart = "Invisible" Var btnAddCart = "Invisible"
EndIf EndIf
EndIf EndIf
</EventOpen> </EventOpen>
<Timeout> 2000 </Timeout> <Timeout> 2000 </Timeout>
<EventTimeout> <EventTimeout>
@ -557,14 +561,6 @@
Var ShotCoffeePremium = "Enable" Var ShotCoffeePremium = "Enable"
Var showShotEnable = "Enable" Var showShotEnable = "Enable"
DEBUGVAR TOPPING2
Refresh
EndIf
If TOPPING2 = "shot coffee 1008" Then
Var ShotCoffeePremium = "Enable"
Var showShotEnable = "Enable"
DEBUGVAR TOPPING2 DEBUGVAR TOPPING2
Refresh Refresh
EndIf EndIf

1558
xml/page_topping_select3.xml Normal file
View file

File diff suppressed because it is too large Load diff

2
xml_main/startup.xml
View file

@ -95,7 +95,7 @@
Var RandomPromotionMyworld = 0 Var RandomPromotionMyworld = 0
Var RandomSalePackage = 0 Var RandomSalePackage = 0
Var XMLPageVersion = "5.64" Var XMLPageVersion = "5.65"
</EventOpen> </EventOpen>