merge
This commit is contained in:
commit
cc7ace4baf
314 changed files with 5768 additions and 1322 deletions
|
|
@ -140,22 +140,36 @@
|
|||
|
||||
; App fast
|
||||
STRCONTAIN "1063" MaterialAvailable AppFastEnable
|
||||
STRCONTAIN "1046" MaterialAvailable WheyEnable
|
||||
|
||||
Var MenuKidEnable = "false"
|
||||
|
||||
;Var AppFastEnable = "false"
|
||||
If AppFastEnable = "true" Then
|
||||
Var AppFastButtonState = "Enable"
|
||||
Var WheyButtonState = "Invisible"
|
||||
Var MenuKidButtonState ="Invisible"
|
||||
Else
|
||||
Var AppFastButtonState = "Invisible"
|
||||
Var WheyButtonState = "Enable"
|
||||
If WheyEnable = "true" Then
|
||||
Var AppFastButtonState = "Invisible"
|
||||
Var WheyButtonState = "Enable"
|
||||
Var MenuKidButtonState ="Invisible"
|
||||
Else
|
||||
Var MenuKidEnable = "true"
|
||||
Var AppFastButtonState = "Invisible"
|
||||
Var WheyButtonState = "Invisible"
|
||||
Var MenuKidButtonState ="Enable"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
|
||||
Var TaobinOnlineX = "true"
|
||||
|
||||
DEBUGVAR AppFastEnable
|
||||
DEBUGVAR MenuKidEnable
|
||||
DEBUGVAR TaobinOnline
|
||||
DEBUGVAR TermTemOnline
|
||||
DEBUGVAR WheyEnable
|
||||
|
||||
; Dtac.
|
||||
DEBUGVAR ShowDtac1
|
||||
|
|
@ -217,7 +231,11 @@
|
|||
Var ShowNetworkProblem = "Enable"
|
||||
Var ShowButtonClick2 = "Invisible"
|
||||
Var ShowNetworkProblemText = "การสื่อสารขัดข้อง ชำระเงินได้เฉพาะเงินสด"
|
||||
Machine NetworkDown
|
||||
|
||||
|
||||
If NetworkStatus = "DOWN" Then
|
||||
Machine NetworkDown
|
||||
EndIf
|
||||
|
||||
|
||||
Var QRCODE99 = ""
|
||||
|
|
@ -281,7 +299,7 @@
|
|||
|
||||
EndIf
|
||||
|
||||
|
||||
|
||||
SPLIT AdvertiseProfile "/" 1 AdvertiseProfile1
|
||||
SPLIT AdvertiseProfile "/" 2 AdvertiseProfile2
|
||||
SPLIT AdvertiseProfile "/" 3 AdvertiseProfile3
|
||||
|
|
@ -317,8 +335,14 @@
|
|||
Var video_main_4 = video_main_4 + ".mp4"
|
||||
Var video_main_5 = AdvTaobinHome + AdvertiseProfile12
|
||||
Var video_main_5 = video_main_5 + ".mp4"
|
||||
Var video_main_5 = AdvTaobinHome + AdvertiseProfile13
|
||||
Var video_main_6 = AdvTaobinHome + AdvertiseProfile13
|
||||
Var video_main_6 = video_main_6 + ".mp4"
|
||||
Var video_main_7 = AdvTaobinHome + AdvertiseProfile14
|
||||
Var video_main_7 = video_main_7 + ".mp4"
|
||||
Var video_main_8 = AdvTaobinHome + AdvertiseProfile15
|
||||
Var video_main_8 = video_main_8 + ".mp4"
|
||||
Var video_main_9 = AdvTaobinHome + AdvertiseProfile16
|
||||
Var video_main_9 = video_main_9 + ".mp4"
|
||||
|
||||
If AdvertiseProfile7 = "00" Then
|
||||
Var video_main_count = 1
|
||||
|
|
@ -374,6 +398,19 @@
|
|||
Var video_menu_0 = AdvTaobinMenu + AdvertiseProfile13
|
||||
Var video_menu_0 = video_menu_0 + ".mp4"
|
||||
EndIf
|
||||
If VideoAdvIndex = 7 Then
|
||||
Var video_menu_0 = AdvTaobinMenu + AdvertiseProfile14
|
||||
Var video_menu_0 = video_menu_0 + ".mp4"
|
||||
EndIf
|
||||
If VideoAdvIndex = 8 Then
|
||||
Var video_menu_0 = AdvTaobinMenu + AdvertiseProfile15
|
||||
Var video_menu_0 = video_menu_0 + ".mp4"
|
||||
EndIf
|
||||
If VideoAdvIndex = 9 Then
|
||||
Var video_menu_0 = AdvTaobinMenu + AdvertiseProfile16
|
||||
Var video_menu_0 = video_menu_0 + ".mp4"
|
||||
EndIf
|
||||
|
||||
|
||||
If VideoAdvIndex = 0 Then
|
||||
Var video_menu2_1 = AdvTaobinMenu2 + AdvertiseProfile7
|
||||
|
|
@ -403,6 +440,18 @@
|
|||
Var video_menu2_1 = AdvTaobinMenu2 + AdvertiseProfile13
|
||||
Var video_menu2_1 = video_menu2_1 + ".mp4"
|
||||
EndIf
|
||||
If VideoAdvIndex = 7 Then
|
||||
Var video_menu2_1 = AdvTaobinMenu2 + AdvertiseProfile14
|
||||
Var video_menu2_1 = video_menu2_1 + ".mp4"
|
||||
EndIf
|
||||
If VideoAdvIndex = 8 Then
|
||||
Var video_menu2_1 = AdvTaobinMenu2 + AdvertiseProfile15
|
||||
Var video_menu2_1 = video_menu2_1 + ".mp4"
|
||||
EndIf
|
||||
If VideoAdvIndex = 9 Then
|
||||
Var video_menu2_1 = AdvTaobinMenu2 + AdvertiseProfile16
|
||||
Var video_menu2_1 = video_menu2_1 + ".mp4"
|
||||
EndIf
|
||||
|
||||
|
||||
DEBUGVAR video_menu2_1
|
||||
|
|
@ -446,20 +495,9 @@
|
|||
|
||||
DEBUGVAR XMLPageVersionInt
|
||||
|
||||
|
||||
If XMLPageVersionInt > 640 Then
|
||||
Var new_layout = "true"
|
||||
Else
|
||||
Var new_layout = "false"
|
||||
EndIf
|
||||
|
||||
DEBUGVAR new_layout
|
||||
|
||||
If new_layout = "true" Then
|
||||
Machine MenuLayoutNew
|
||||
Else
|
||||
Machine MenuLayoutOld
|
||||
EndIf
|
||||
; forever
|
||||
Var new_layout = "true"
|
||||
Machine MenuLayoutNew
|
||||
|
||||
DEBUGVAR SpiralOnline
|
||||
|
||||
|
|
@ -491,31 +529,6 @@
|
|||
Var show_lang = "THAI"
|
||||
|
||||
|
||||
;Var NETCORE_EVENT_CNT_TMP = 0
|
||||
|
||||
;DEBUGVAR NETCORE_EVENT_CNT_TMP
|
||||
;DEBUGVAR NCIC07_EVENT_CNT
|
||||
;
|
||||
;If NCIC07_EVENT_CNT = NETCORE_EVENT_CNT_TMP Then
|
||||
;
|
||||
; Var NETCORE_EVENT_CNT_X = NETCORE_EVENT_CNT_X + 1
|
||||
; If NETCORE_EVENT_CNT_X >= 3 Then
|
||||
; Var stop_now = "true"
|
||||
; Var MachineErrorDetailAll = "Netcore Lost"
|
||||
; DEBUGVAR "NCIC07_EVENT_CNT"
|
||||
; DEBUGVAR NCIC07_EVENT_CNT
|
||||
; Open "ROOT/taobin_project/xml/page_show_error.xml"
|
||||
; EndIf
|
||||
;
|
||||
;
|
||||
;
|
||||
;Else
|
||||
;
|
||||
; Var NETCORE_EVENT_CNT_TMP = NCIC07_EVENT_CNT
|
||||
; Var NETCORE_EVENT_CNT_X = 0
|
||||
;
|
||||
;EndIf
|
||||
|
||||
Var NETCORE_EVENT_CNT_X = 0
|
||||
Var NETCORE_EVENT_CNT_TMP = NCIC07_EVENT_CNT
|
||||
|
||||
|
|
@ -525,6 +538,15 @@
|
|||
EndIf
|
||||
|
||||
|
||||
DEBUGVAR CameraCount
|
||||
If CameraCount = 0 Then
|
||||
CameraService "Start"
|
||||
EndIf
|
||||
|
||||
If CameraCount = "" Then
|
||||
CameraService "Start"
|
||||
EndIf
|
||||
|
||||
</EventOpen>
|
||||
|
||||
<Timeout> 1000 </Timeout>
|
||||
|
|
@ -533,7 +555,7 @@
|
|||
|
||||
Else
|
||||
If NetworkStatus = "DOWN" Then
|
||||
;Open "/ROOT/xml/outservice.xml"
|
||||
|
||||
Var WebAppShow = "Invisible"
|
||||
EndIf
|
||||
If SELLSTATUS = "DEACTIVE" Then
|
||||
|
|
@ -569,7 +591,7 @@
|
|||
If NETCORE_EVENT_CNT_X >= 30 Then
|
||||
Var stop_now = "true"
|
||||
Var MachineErrorDetailAll = "Netcore Lost"
|
||||
DEBUGVAR "NCIC07_EVENT_CNT"
|
||||
SAVELOG "Netcore Lost NCIC07_EVENT_CNT"
|
||||
DEBUGVAR NCIC07_EVENT_CNT
|
||||
Open "ROOT/taobin_project/xml/page_show_error.xml"
|
||||
EndIf
|
||||
|
|
@ -939,7 +961,7 @@
|
|||
<Width> 1080 </Width>
|
||||
<Height> 60 </Height>
|
||||
<EventClick>
|
||||
|
||||
|
||||
Var NextPage = "-"
|
||||
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue