From 9a97bb24be344f4291c909f8edfbc2fd94d111e8 Mon Sep 17 00:00:00 2001 From: kong Date: Tue, 4 Apr 2023 20:06:37 +0700 Subject: [PATCH] DO --- xml/page_board.xml | 25 ++++++++++++++++++++++++- xml/page_face_compare.xml | 2 +- xml/vending_info.xml | 5 +---- xml_main/startup.xml | 4 ++-- 4 files changed, 28 insertions(+), 8 deletions(-) diff --git a/xml/page_board.xml b/xml/page_board.xml index 320ef470..0a1962ab 100644 --- a/xml/page_board.xml +++ b/xml/page_board.xml @@ -207,7 +207,8 @@ If TaobinOnlineX = "true" Then Var EventTurnOn = 0 - Var CountDownShowButton = 35 + ; CountDownShowButton must value 35 + Var CountDownShowButton = 35 Var ShowButtonClickFull = "Invisible" If LanguageInit = "ENG" Then @@ -312,6 +313,7 @@ Else Machine Initial Var StartUpExt = "false" + Var CameraSettingStatus = "" ;DEBUGVAR "FlushTxRef1" ;FlushTxRef1 @@ -821,6 +823,9 @@ DEBUGVAR SoundThaiIndex + + Var CountDownCheckCamera = 0 + RootLayoutVisible 3 "hide" @@ -908,6 +913,8 @@ Var CountDownShowButton = CountDownShowButton - 1 EndIf + + ;SAVELOG MachineStage ;SAVELOG CountDownShowButton ;SAVELOG ShowButtonClickFull @@ -930,6 +937,8 @@ If CountDownPauseVideo > 0 Then ; ignore Var CountDownPauseVideo = CountDownPauseVideo - 1 + + If CountDownPauseVideo = 0 Then Var NextPage = "ROOT/taobin_project/xml/page_back_to_main.xml" @@ -1006,6 +1015,20 @@ EndIf EndIf + ;DEBUGVAR CountDownCheckCamera + DEBUGVAR Not#CameraSettingStatus + If CountDownCheckCamera = 0 Then + Var CountDownCheckCamera = 5 + If Not#CameraSettingStatus = "" Then + If CameraCount = 1 Then + + CameraSetting "usbfront" "default" "Rotate=90,Resolution=1280x720,scaleX=1.0,scaleY=1.0" + EndIf + EndIf + Else + Var CountDownCheckCamera = CountDownCheckCamera - 1 + EndIf + Refresh diff --git a/xml/page_face_compare.xml b/xml/page_face_compare.xml index 22553e99..8c602cad 100644 --- a/xml/page_face_compare.xml +++ b/xml/page_face_compare.xml @@ -20,7 +20,7 @@ SAVELOG "EventActionOk" Var AdultFlag = 0 CoinVending XBILL - Open "ROOT/taobin_project/xml/page_payment_cash.xml" + Open "ROOT/taobin_project/xml/page_catalog2.xml" diff --git a/xml/vending_info.xml b/xml/vending_info.xml index a2c643f0..80c56d07 100644 --- a/xml/vending_info.xml +++ b/xml/vending_info.xml @@ -570,10 +570,7 @@ info_10Y "ROOT/taobin_project/image/tab_1.png" - If CameraCount = 1 Then - - CameraSetting "usbfront" "default" "Rotate=90,Resolution=1280x720,scaleX=1.0,scaleY=1.0" - EndIf + ;Open "ROOT/taobin_project/xml/test_qr.xml" diff --git a/xml_main/startup.xml b/xml_main/startup.xml index e04d9309..0468e2a2 100644 --- a/xml_main/startup.xml +++ b/xml_main/startup.xml @@ -108,8 +108,8 @@ Var RandomPromotionMyworld = 0 Var RandomSalePackage = 0 - Var XMLPageVersion = "7.07" - Var XMLPageVersionInt = 707 + Var XMLPageVersion = "7.09" + Var XMLPageVersionInt = 709