This commit is contained in:
wanlop run 2024-02-21 11:12:38 +07:00
parent f4389e579d
commit bd0aa40509
4 changed files with 117 additions and 39 deletions

View file

@ -308,6 +308,8 @@
800072 Water Tank restart. ถังน้ำดี เริ่มนับใหม่ Water Tank restart.
800073 Restart Shot coffee count เริ่มนับใหม่ Restart Shot coffee count
800074 Disc module not close completely แขนปิดไม่สนิท
Soda System
800100 stop หยุด stop

Can't render this file because it has a wrong number of fields in line 21.

View file

@ -116,46 +116,7 @@
EndIf
Var NoWaitMachineEnable = 1
DEBUGVAR NeedUpgrade
If NoWaitMachineEnable = 1 Then
If stop_now = "true" Then
If InternationalEnable = 1 Then
Open "ROOT/taobin_project/xml/page_show_error.lxml"
Else
Open "ROOT/taobin_project/xml/page_show_error.xml"
EndIf
EndIf
Else
If MachineStage = "close-maintenance" Then
If InternationalEnable = 1 Then
RootLayoutVisible 3 "hide"
Open "ROOT/taobin_project/xml/page_show_error.lxml"
Else
Open "ROOT/taobin_project/xml/page_show_error.xml"
EndIf
EndIf
EndIf
If MachineStage = "mcu-upgrade" Then
If InternationalEnable = 1 Then
Open "ROOT/taobin_project/xml/page_show_error.lxml"
Else
Open "ROOT/taobin_project/xml/page_show_error.xml"
EndIf
EndIf
If NeedUpgrade = "true" Then
If InternationalEnable = 1 Then
Open "ROOT/taobin_project/xml/page_show_error.lxml"
Else
Open "ROOT/taobin_project/xml/page_show_error.xml"
EndIf
EndIf
@ -731,6 +692,12 @@
Var CountryName = "Singapore"
EndIf
If StrCountryShort = "UAE_DUBAI" Then
Var CountryName = "UnitedArabEmirates Dubai"
EndIf
;
EndIf
@ -758,6 +725,10 @@
TRY "/mnt/sdcard/coffeevending/taobin_project/inter/sgp/video/script_video.ev"
EndIf
If CountryName = "UnitedArabEmirates Dubai" Then
TRY "/mnt/sdcard/coffeevending/taobin_project/inter/sgp/video/script_video.ev"
EndIf
DEBUGVAR CountDownShowButton
DEBUGVAR EventTurnOn
@ -965,6 +936,48 @@
EndIf
; wait
If CountryName = "UnitedArabEmirates Dubai" Then
TRY "/mnt/sdcard/coffeevending/taobin_project/inter/sgp/video/script_video.ev"
Var WebAppShow = "Invisible"
EnableLanguage "ENG"
SetLanguage "ENG"
LanguageControl "UpdateList" "-"
Var InternationalEnable = 1
Var show_eng = "true"
Var img_press_main_page = "ROOT/taobin_project/image/main_page_en/bp_main_page_start.png"
Var ShowNetworkProblemText = "Network error. Payment Cash only."
Var CountryRootPath = "ROOT/taobin_project/inter/sgp/"
ar TextPriceMenuSize = 12
Var TextPriceMenuY = 264
Var TextPriceMenuBlendX = 180
Var TextPriceMenuHotX = 48
Var ShowButtonClick2 = "Enable"
Var ButtontoTopupMenu = "Invisible"
Var PriceUnitText = "Price in SGD"
Var MemberButtonFileName = "ROOT/taobin_project/image/main_page_en/bp_main_page_member.png"
Var show_eng_button_stage = "Invisible"
Var CountDownShowButton = 35
Var XButtonMember = 384
Var YButtonMember = 1695
If Not#LanguageLoaded = "" Then
LoadLanguage "/mnt/sdcard/coffeevending/taobin_project/inter/sgp/menu/lang.tsv"
EndIf
EndIf
DEBUGVAR InternationalEnable
@ -1055,6 +1068,47 @@
Var NETCORE_LOST_COUNT_UP = 0
Var NoWaitMachineEnable = 1
DEBUGVAR NeedUpgrade
If NoWaitMachineEnable = 1 Then
If stop_now = "true" Then
If InternationalEnable = 1 Then
Open "ROOT/taobin_project/xml/page_show_error.lxml"
Else
Open "ROOT/taobin_project/xml/page_show_error.xml"
EndIf
EndIf
Else
If MachineStage = "close-maintenance" Then
If InternationalEnable = 1 Then
RootLayoutVisible 3 "hide"
Open "ROOT/taobin_project/xml/page_show_error.lxml"
Else
Open "ROOT/taobin_project/xml/page_show_error.xml"
EndIf
EndIf
EndIf
If MachineStage = "mcu-upgrade" Then
If InternationalEnable = 1 Then
Open "ROOT/taobin_project/xml/page_show_error.lxml"
Else
Open "ROOT/taobin_project/xml/page_show_error.xml"
EndIf
EndIf
If NeedUpgrade = "true" Then
If InternationalEnable = 1 Then
Open "ROOT/taobin_project/xml/page_show_error.lxml"
Else
Open "ROOT/taobin_project/xml/page_show_error.xml"
EndIf
EndIf
If RoadShow = "true" Then
Var ShowNetworkProblem = "Invisible"
Var ShowNetworkProblemText = ""

View file

@ -34,6 +34,13 @@
Open "ROOT/taobin_project/xml/page_payment_cash-SGP.xml"
EndIf
If CountryName = "UnitedArabEmirates Dubai" Then
Open "ROOT/taobin_project/xml/page_payment_cash-UAE.xml"
EndIf
Var PreScaleCanculate = 1

View file

@ -332,6 +332,21 @@
Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_main_blank.xml"
EndIf
READ_FILE "/mnt/sdcard/coffeevending/.test_menu" str_test_menu
DEBUGVAR str_test_menu
If str_test_menu = "1" Then
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog.xml"
TopView "show"
Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_main_blank.xml"
EndIf
If CountTouchButton = 7 Then
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"