diff --git a/xml/page_identity_verification.xml b/xml/page_identity_verification.xml index 569532e0..9cf24849 100644 --- a/xml/page_identity_verification.xml +++ b/xml/page_identity_verification.xml @@ -63,7 +63,11 @@ Var Timeout = 0 Var ShutterResult = "-" - Var AdultFlag = 1 + ;Var AdultFlag = 1 + If Only18 = "true" Then + Var AdultFlag = 0 + EndIf + DEBUGVAR AdultFlag If AdultFlag = 1 Then @@ -88,6 +92,8 @@ Var AdultFlag2 = 1 EndIf + DEBUGVAR AdultState1 + If show_eng = "true" Then Var DirImage = "ROOT/taobin_project/image/page_payment_en/page_payment" Var DirImage2 = "ROOT/taobin_project/image/page_payment_cash_extend_en" @@ -419,6 +425,17 @@ 888 180 180 + eval( + If Only18 = "true" Then + + If EnableLiveness = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf + + EndIf +) "ROOT/taobin_project/image/liveness/arrow_up.png" "ROOT/taobin_project/image/liveness/arrow_up.png" "/mnt/sdcard/coffeevending/wav/click.wav" @@ -443,6 +460,17 @@ 1249 180 180 + eval( + If Only18 = "true" Then + + If EnableLiveness = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf + + EndIf +) "ROOT/taobin_project/image/liveness/arrow_down.png" "ROOT/taobin_project/image/liveness/arrow_down.png" "/mnt/sdcard/coffeevending/wav/click.wav" @@ -468,6 +496,17 @@ 888 180 180 + eval( + If Only18 = "true" Then + + If EnableLiveness = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf + + EndIf +) "ROOT/taobin_project/image/liveness/arrow_up.png" "ROOT/taobin_project/image/liveness/arrow_up.png" "/mnt/sdcard/coffeevending/wav/click.wav" @@ -492,6 +531,17 @@ 1249 180 180 + eval( + If Only18 = "true" Then + + If EnableLiveness = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf + + EndIf +) "ROOT/taobin_project/image/liveness/arrow_down.png" "ROOT/taobin_project/image/liveness/arrow_down.png" "/mnt/sdcard/coffeevending/wav/click.wav" @@ -531,6 +581,17 @@ KornCameraXH ;800 ; Display height is about 680, (full height = 888) + eval( + If Only18 = "true" Then + + If EnableLiveness = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf + + EndIf +) "FileName=/mnt/sdcard/camera1_alter.jpg" @@ -605,7 +666,9 @@ EndIf If LivenessResult = "pass" Then - + DEBUGVAR AdultFlag + DEBUGVAR AdultState1 + Open "ROOT/taobin_project/xml/page_payment.xml" Else Var LivenessShowString = LivenessStateString EndIf diff --git a/xml/page_payment.xml b/xml/page_payment.xml index 22d753d6..933e771a 100644 --- a/xml/page_payment.xml +++ b/xml/page_payment.xml @@ -33,26 +33,31 @@ Var AdultFlag = 0 - If SelectDrink = "12-05-02-0028" Then - Var AdultFlag = 1 - EndIf - If SelectDrink = "12-05-02-0029" Then - Var AdultFlag = 1 - EndIf - If SelectDrink = "12-05-03-0028" Then - Var AdultFlag = 1 - EndIf - If SelectDrink = "12-05-03-0029" Then - Var AdultFlag = 1 - EndIf - If SelectDrink = "12-02-01-0017" Then - Var AdultFlag = 1 - EndIf - If SelectDrink = "12-05-02-0027" Then - Var AdultFlag = 1 - EndIf - If SelectDrink = "12-05-03-0027" Then - Var AdultFlag = 1 + If Only18 = "true" Then + DEBUGVAR AdultState1 + DEBUGVAR AdultFlag + Else + If SelectDrink = "12-05-02-0028" Then + Var AdultFlag = 1 + EndIf + If SelectDrink = "12-05-02-0029" Then + Var AdultFlag = 1 + EndIf + If SelectDrink = "12-05-03-0028" Then + Var AdultFlag = 1 + EndIf + If SelectDrink = "12-05-03-0029" Then + Var AdultFlag = 1 + EndIf + If SelectDrink = "12-02-01-0017" Then + Var AdultFlag = 1 + EndIf + If SelectDrink = "12-05-02-0027" Then + Var AdultFlag = 1 + EndIf + If SelectDrink = "12-05-03-0027" Then + Var AdultFlag = 1 + EndIf EndIf If CustomerFilterEnable = "YES" Then @@ -459,6 +464,11 @@ EndIf + + If Only18 = "true" Then + Var AdultFlag = 0 + EndIf + Open "ROOT/taobin_project/xml/page_payment_cash.xml" EndIf EndIf diff --git a/xml/page_topping_select7_copy.xml b/xml/page_topping_select7_copy.xml index 16167156..a9906d6c 100644 --- a/xml/page_topping_select7_copy.xml +++ b/xml/page_topping_select7_copy.xml @@ -388,35 +388,24 @@ EndIf EndIf - ; If RestrictedDrink = "true" Then - ; DEBUGVAR RestrictedDrink - ; OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml" - ; Open "ROOT/taobin_project/xml/page_identity_verification.xml" - - ; Else - - ; ;DEBUGVAR UserSelectProductCode.Price - ; ; DEBUGVAR HalfPrice - ; ;DEBUGVAR PriceDrink - - ; ;If HalfPrice = "true" Then - - ; ; Var PriceDrinkTmp = UserSelectProductCode.Price - ; ; Var PriceDrink = PriceDrinkTmp - ; ;EndIf - - ; OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml" - ; Open "ROOT/taobin_project/xml/page_payment.xml" - ; EndIf - If Only18 = "true" Then DEBUGVAR SelectDrink MenuProfile SelectDrink "IsMenuInProfile" + + ; disable old verification + Var AdultState1 = "Invisible" + DEBUGVAR IsMenuInProfile If IsMenuInProfile = "true" Then OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml" + Open "ROOT/taobin_project/xml/page_identity_verification.xml" + + + ;If EnableLiveness = "true" Then + ;EndIf + Else OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml" Open "ROOT/taobin_project/xml/page_payment.xml"