This commit is contained in:
kong 2022-02-17 22:16:11 +07:00
parent 9dd3b81e41
commit 8244f5cead
48 changed files with 515 additions and 21 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 23 KiB

Before After
Before After

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 25 KiB

Before After
Before After

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 23 KiB

Before After
Before After

Binary file not shown.

After

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 25 KiB

Before After
Before After

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 2.6 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.6 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

Before After
Before After

BIN
image/page3/bn_cho_ca2.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.8 KiB

BIN
image/page3/bn_coffee2.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
image/page3/bn_protein2.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

BIN
image/page3/bn_sodada2.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.3 KiB

BIN
image/page3/bn_tea2.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
image/page3/bn_vending2.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 2.5 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.5 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

Before After
Before After

BIN
image/page3/bp_cho_ca2.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.6 KiB

BIN
image/page3/bp_coffee2.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
image/page3/bp_protein2.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

BIN
image/page3/bp_sodada2.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.3 KiB

BIN
image/page3/bp_tea2.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
image/page3/bp_vending2.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2 KiB

After

Width:  |  Height:  |  Size: 2.5 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.5 KiB

After

Width:  |  Height:  |  Size: 2 KiB

Before After
Before After

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3 KiB

BIN
image/page3_en/bn_tea2.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 2 KiB

Before After
Before After

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

BIN
image/page3_en/bp_tea2.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.7 KiB

View file

@ -174,8 +174,8 @@
<X> 696 </X>
<Y> 395 </Y>
<State> Menu11Selected </State>
<Filename> Var( DirImage + "/bn_appfast2.png") </Filename>
<FilenamePress> Var( DirImage + "/bp_appfast2.png") </FilenamePress>
<Filename> Var( DirImage + "/bn_appfast.png") </Filename>
<FilenamePress> Var( DirImage + "/bp_appfast.png") </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
@ -199,20 +199,6 @@
</EventClick>
</Button>
; obselete
;<Button>
;<X> 696 </X>
;<Y> 395 </Y>
;<State> Menu5Selected </State>
;<Filename> Var( DirImage + "/bn_fruit.png") </Filename>
;<FilenamePress> Var( DirImage + "/bp_fruit.png") </FilenamePress>
;<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
;<Volume> SoundVolume </Volume>
;<EventClick>
; Open "ROOT/taobin_project/xml/page_catalog_choose_drink5.xml"
;</EventClick>
;</Button>
<Button>
<X> 847 </X>

View file

@ -373,6 +373,8 @@
Var WebAppShow = "Enable"
Var EnableSelectMenuBetweenBrew = "Enable"
DEBUGVAR XMLProfile
@ -403,6 +405,13 @@
Var ButtontoTopupMenu = "Enable"
EndIf
If NetworkStatus = "DOWN" Then
Var WebAppShow = "Invisible"
EndIf
READ_FILE "/mnt/sdcard/spiral" SpiralOnline
DEBUGVAR SpiralOnline
</EventOpen>
<Timeout> 1000 </Timeout>
@ -412,6 +421,7 @@
Else
If NetworkStatus = "DOWN" Then
;Open "/ROOT/xml/outservice.xml"
Var WebAppShow = "Invisible"
EndIf
If NetworkStatus = "DEACTIVE" Then
Open "/ROOT/xml/offline.xml"
@ -628,10 +638,17 @@
If CocktailShow = "true" Then
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_cocktail.xml"
Else
;If TaobinOnline = "true" Then
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog.xml"
;EndIf
If SpiralOnline = "true" Then
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_with_vending.xml"
Else
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog.xml"
EndIf
If TermTemOnline = "true" Then
OpenInst 2 "/mnt/sdcard/coffeevending/termtem_project/xml/page_tt_catalog.xml"

View file

@ -0,0 +1,491 @@
<Popup>
<Cache> "Enable" </Cache>
<Width> 1080 </Width>
<Height> 1920 </Height>
<Background> "0xeae6e1" </Background>
<Volume> SoundVolume </Volume>
<EventOpen>
TopView "show"
; On open
Var Seeker.thankLidFlag = 0
Var Seeker.thankStrawFlag = 0
WEB "DISABLE"
Var web_readyOK = "false"
Var web_telnumOK = ""
Var PicturePath = "/mnt/sdcard/coffeevending/taobin_project/image/page_doing/"
If CocktailShow = "true" Then
Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_cocktail.xml"
EndIf
If TermTemOnline = "true" Then
Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_tt_catalog.xml"
EndIf
;Machine DoorLidClose
Var GetPayInfoFlag = 0
Var countDownRetrun = 30
CoinVending OFF
; Clear value
Topping "clear" "-"
If show_eng = "true" Then
Var DirImage = "ROOT/taobin_project/image/page2_en/page2"
Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png"
Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png"
Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_eng/What_would_you_like_to_drink_today.mp3"
Play PlaySoundLag
Var DirImageCart = "ROOT/taobin_project/image/cart_en"
Else
Var DirImage = "ROOT/taobin_project/image/page2"
Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png"
Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png"
Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/taobin_sawade.mp3"
Play PlaySoundLag
Var DirImageCart = "ROOT/taobin_project/image/cart_th"
EndIf
Var StrawAutoRelease1 = "false"
Var StrawAutoRelease2 = "false"
If NetworkStatus = "ACTIVATE" Then
Var ShowButtonClick2 = "Enable"
Else
Var ShowButtonClick2 = "Invisible"
Var ButtontoTopupMenu = "Invisible"
EndIf
If NetworkStatus = "ACTIVATE" Then
Var ShowNetworkProblem = "Invisible"
Var ShowNetworkProblemText = ""
GenHashWithTimeStamp QRCODE99
WEB "ENABLE"
Else
Var ShowNetworkProblem = "Enable"
Var ShowButtonClick2 = "Invisible"
Var ButtontoTopupMenu = "Invisible"
Var ShowNetworkProblemText = "การสื่อสารขัดข้อง ชำระเงินได้เฉพาะเงินสด"
Var QRCODE99 = ""
WEB "DISABLE"
EndIf
; 1035 is Coke.
STRCONTAIN "1035" MaterialAvailable CokeUI
Var bnSodaAndOther = DirImage + "/bn_soda_coke.png"
Var bpSodaAndOther = DirImage + "/bp_soda_coke.png"
Var countClick = 0
DEBUGVAR CART_COUNT
Var QRCODE99_Y = 1718
Var showCart = "Invisible"
If MultiPayEnable = "true" Then
If CART_COUNT = 1 Then
Var showCart = "Enable"
Var cart_image_bn = DirImageCart + "/bn_cart1.png"
Var cart_image_bp = DirImageCart + "/bp_cart1.png"
Var QRCODE99_Y = 1580
EndIf
If CART_COUNT = 2 Then
Var showCart = "Enable"
Var cart_image_bn = DirImageCart + "/bn_cart2.png"
Var cart_image_bp = DirImageCart + "/bp_cart2.png"
Var QRCODE99_Y = 1580
EndIf
If CART_COUNT = 3 Then
Open "ROOT/taobin_project/xml/page_payment_multi.xml"
EndIf
EndIf
If Seeker = "next" Then
Var ShowButtonClick2 = "Invisible"
Var ButtontoTopupMenu = "Invisible"
EndIf
If XMLProfile = "taobin_notopup" Then
Var ButtontoTopupMenu = "Disable"
EndIf
</EventOpen>
<Timeout> 1000 </Timeout>
<EventTimeout>
;SAVELOG SoundPlaying
If countDownRetrun > 0 Then
Var countDownRetrun = countDownRetrun - 1
EndIf
If countDownRetrun = 0 Then
If Seeker = "next" Then
Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"
Else
Open "ROOT/taobin_project/xml/page_back_to_main.xml"
EndIf
EndIf
Refresh
TimerReset
</EventTimeout>
<EventChangeStatus>
;If ChangeStatus = "payout-end" Then
; Var ChangeOK = 1
;EndIf
</EventChangeStatus>
<EventWebApp>
DEBUGVAR web_ready
If web_ready = "true" Then
If web_ref = QRCODE99 Then
Cart "DeleteMenuID" "ALL"
Var web_readyOK = web_ready
Var web_telnumOK = web_telnum
Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml"
EndIf
Else
EndIf
</EventWebApp>
<Video>
<X> 0 </X>
<Y> 0 </Y>
<Width> 1080</Width>
<Height> 380 </Height>
<Loop> "true" </Loop>
<Filename> video_menu_0 </Filename>
</Video>
; back
<Button>
<X> 19 </X>
<Y> 420 </Y>
<Filename> "ROOT/taobin_project/image/page2/bn_back_arrow.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/page2/bn_back_arrow.png" </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
If Seeker = "next" Then
Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"
Else
Open "ROOT/taobin_project/xml/page_back_to_main.xml"
EndIf
</EventClick>
</Button>
<Button>
<X> 990 </X>
<Y> 438 </Y>
<Filename> show_btn </Filename>
<FilenamePress> show_btp </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
; eng
If show_eng = "true" Then
Var show_eng = "false"
Else
Var show_eng = "true"
EndIf
Open CurrentXMLFileName2
</EventClick>
</Button>
<Image>
<X> 70 </X>
<Y> 583 </Y>
<Filename> Var(DirImage + "/text1.png") </Filename>
</Image>
; menu row 1
<Button>
<X> 220 </X>
<Y> 844 </Y>
<Filename> Var(DirImage + "/bn_diy.png") </Filename>
<FilenamePress> Var(DirImage + "/bp_diy.png") </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
; eng
Open "ROOT/taobin_project/xml/page_catalog_choose_drink1.xml"
</EventClick>
</Button>
<Button>
<X> 564 </X>
<Y> 844 </Y>
<Filename> Var(DirImage + "/bn_vending_machine.png") </Filename>
<FilenamePress> Var(DirImage + "/bp_vending_machine.png") </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
; eng
Open "ROOT/taobin_sprial/xml/page_catalog_vending_machine.xml"
</EventClick>
</Button>
; menu row 2
<Button>
<X> 48 </X>
<Y> 1188 </Y>
<Filename> Var(DirImage + "/bn_coffee.png") </Filename>
<FilenamePress> Var(DirImage + "/bp_coffee.png") </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
Open "ROOT/taobin_project/xml/page_catalog_choose_drink2.xml"
</EventClick>
</Button>
<Button>
<X> 392 </X>
<Y> 1188 </Y>
<Filename> Var(DirImage + "/bn_tea.png") </Filename>
<FilenamePress> Var(DirImage + "/bp_tea.png") </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
Open "ROOT/taobin_project/xml/page_catalog_choose_drink3.xml"
</EventClick>
</Button>
<Button>
<X> 736 </X>
<Y> 1188 </Y>
<Filename> Var(DirImage + "/bn_cho_caramel.png") </Filename>
<FilenamePress> Var(DirImage + "/bp_cho_caramel.png") </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
Open "ROOT/taobin_project/xml/page_catalog_choose_drink4.xml"
</EventClick>
</Button>
; row 3
<Button>
<X> 220 </X>
<Y> 1532 </Y>
<State>WheyButtonState</State>
<Filename> Var(DirImage + "/bn_protein.png") </Filename>
<FilenamePress> Var(DirImage + "/bp_protein.png") </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
Open "ROOT/taobin_project/xml/page_catalog_choose_drink7.xml"
</EventClick>
</Button>
<Button>
<X> 220 </X>
<Y> 1532 </Y>
<State>AppFastButtonState</State>
<Filename> Var(DirImage + "/bn_appfast.png") </Filename>
<FilenamePress> Var(DirImage + "/bp_appfast.png") </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
Open "ROOT/taobin_project/xml/page_catalog_choose_drink11.xml"
</EventClick>
</Button>
<Button>
<X> 564 </X>
<Y> 1532 </Y>
<Filename> bnSodaAndOther </Filename>
<FilenamePress> bpSodaAndOther </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
Open "ROOT/taobin_project/xml/page_catalog_choose_drink6.xml"
</EventClick>
</Button>
; top menu
<Button>
<X> 225 </X>
<Y> 424 </Y>
<State> ShowButtonClick2 </State>
<Filename> Var(DirImage + "/bn_main_page_member.png") </Filename>
<FilenamePress> Var(DirImage + "/bp_main_page_member.png") </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
; eng
Open "ROOT/taobin_project/xml/page_check_member.xml"
</EventClick>
</Button>
<Button>
<X> 696 </X>
<Y> 424 </Y>
<State> ButtontoTopupMenu </State>
<Filename> Var(DirImage + "/bn_main_page_topup.png") </Filename>
<FilenamePress> Var(DirImage + "/bp_main_page_topup.png") </FilenamePress>
<FilenameDisable> Var(DirImage + "/bp_main_page_topup.png") </FilenameDisable>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
; eng
Var PayDetail=""
Open "ROOT/taobin_project/xml/page_back_to_topup.xml"
</EventClick>
</Button>
<Button>
<X> 0 </X>
<Y> 1870 </Y>
<State> ShowNetworkProblem </State>
<Color> "0xFF0000" </Color>
<Width> 1080 </Width>
<Height> 60 </Height>
</Button>
<Text>
<X> 5 </X>
<Y> 1880 </Y>
<Size> 24 </Size>
<Align> Center </Align>
<Width> 1080 </Width>
<Font> RobotoRegular </Font>
<Color> 0xFFFFFF </Color>
<Value> ShowNetworkProblemText </Value>
</Text>
<Button>
<X> 0 </X>
<Y> 1860 </Y>
<Width> 200 </Width>
<Height> 50 </Height>
<Volume> SoundVolume </Volume>
<EventClick>
Var countClick = countClick + 1
If countClick = 3 Then
;Var TestLoopMakeDrink = 1
EndIf
DEBUGVAR countClick
If countClick = 5 Then
If ToppingNewEnable = "false" Then
Var ToppingNewEnable = "true"
Else
Var ToppingNewEnable = "false"
EndIf
Open "ROOT/taobin_project/xml/page_catalog_choose_drink3.xml"
EndIf
Refresh
</EventClick>
</Button>
;<QRCode>
;<X> 895 </X>
;<Y> QRCODE99_Y</Y>
;<Width> 178 </Width>
;<Height> 178 </Height>
;<State> "Enable" </State>
;<Service> testservice </Service>
;</QRCode>
; Cart
<Button>
<X> 915 </X>
<Y> 1769 </Y>
<State> showCart </State>
<Filename> cart_image_bn </Filename>
<Filename> cart_image_bp </Filename>
<FilenamePress> cart_image_bp </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<Interval> 400</Interval>
<EventClick>
Open "ROOT/taobin_project/xml/page_payment_multi.xml"
</EventClick>
</Button>
<EventWebApp>
DEBUGVAR web_ready
If web_ready = "true" Then
If web_ref = QRCODE99x Then
Var web_readyOK = web_ready
Var web_telnumOK = web_telnum
Var web_app_prepar = "true"
Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml"
EndIf
Else
EndIf
</EventWebApp>
</Popup>

View file

@ -95,8 +95,8 @@
Var RandomPromotionMyworld = 0
Var RandomSalePackage = 0
Var XMLPageVersion = "6.04"
Var XMLPageVersionInt = 604
Var XMLPageVersion = "6.05"
Var XMLPageVersionInt = 605
</EventOpen>
<Text>