diff --git a/adv/taobin_adv_07.mp4 b/adv/taobin_adv_07.mp4 index 88077246..e2635ed8 100644 Binary files a/adv/taobin_adv_07.mp4 and b/adv/taobin_adv_07.mp4 differ diff --git a/adv/taobin_adv_12.mp4 b/adv/taobin_adv_12.mp4 index 834416d4..8c5b191f 100644 Binary files a/adv/taobin_adv_12.mp4 and b/adv/taobin_adv_12.mp4 differ diff --git a/adv/taobin_adv_16.mp4 b/adv/taobin_adv_16.mp4 index f7031adb..5ea89b11 100644 Binary files a/adv/taobin_adv_16.mp4 and b/adv/taobin_adv_16.mp4 differ diff --git a/adv/taobin_adv_18.mp4 b/adv/taobin_adv_18.mp4 index d72d9189..cec2c11c 100644 Binary files a/adv/taobin_adv_18.mp4 and b/adv/taobin_adv_18.mp4 differ diff --git a/adv/taobin_adv_menu2_07.mp4 b/adv/taobin_adv_menu2_07.mp4 index 37aea826..d9fd12e9 100644 Binary files a/adv/taobin_adv_menu2_07.mp4 and b/adv/taobin_adv_menu2_07.mp4 differ diff --git a/adv/taobin_adv_menu2_12.mp4 b/adv/taobin_adv_menu2_12.mp4 index f2c58170..c972ed35 100644 Binary files a/adv/taobin_adv_menu2_12.mp4 and b/adv/taobin_adv_menu2_12.mp4 differ diff --git a/adv/taobin_adv_menu2_16.mp4 b/adv/taobin_adv_menu2_16.mp4 index 5be73523..ff894dec 100644 Binary files a/adv/taobin_adv_menu2_16.mp4 and b/adv/taobin_adv_menu2_16.mp4 differ diff --git a/adv/taobin_adv_menu2_18.mp4 b/adv/taobin_adv_menu2_18.mp4 index 19db6422..0089c730 100644 Binary files a/adv/taobin_adv_menu2_18.mp4 and b/adv/taobin_adv_menu2_18.mp4 differ diff --git a/adv/taobin_adv_menu_07.mp4 b/adv/taobin_adv_menu_07.mp4 index a1fb39f0..bcd15548 100644 Binary files a/adv/taobin_adv_menu_07.mp4 and b/adv/taobin_adv_menu_07.mp4 differ diff --git a/adv/taobin_adv_menu_12.mp4 b/adv/taobin_adv_menu_12.mp4 index df3ff74e..b6ab3311 100644 Binary files a/adv/taobin_adv_menu_12.mp4 and b/adv/taobin_adv_menu_12.mp4 differ diff --git a/adv/taobin_adv_menu_16.mp4 b/adv/taobin_adv_menu_16.mp4 index 9ab3091e..9a192825 100644 Binary files a/adv/taobin_adv_menu_16.mp4 and b/adv/taobin_adv_menu_16.mp4 differ diff --git a/adv/taobin_adv_menu_18.mp4 b/adv/taobin_adv_menu_18.mp4 index 110a80e6..18628651 100644 Binary files a/adv/taobin_adv_menu_18.mp4 and b/adv/taobin_adv_menu_18.mp4 differ diff --git a/xml/page_face_compare.xml b/xml/page_face_compare.xml new file mode 100644 index 00000000..22553e99 --- /dev/null +++ b/xml/page_face_compare.xml @@ -0,0 +1,166 @@ + + "Enable" + 1080 + 1920 + "0xeae6e1" + SoundVolume + + + Var CamFlag = 0 + Var CamCount = 0 + Var Timeout = 0 + + Var LOADING_STATE = "Enable" + + DEBUGVAR LOADING_STATE + + + + + SAVELOG "EventActionOk" + Var AdultFlag = 0 + CoinVending XBILL + Open "ROOT/taobin_project/xml/page_payment_cash.xml" + + + + + SAVELOG "EventActionError" + Open "ROOT/taobin_project/xml/page_catalog2.xml" + + + + + 1000 + + DEBUGVAR Timeout + Var Timeout = Timeout + 1 + + If Timeout = 1 Then + FaceCompare 30 + EndIf + + If Timeout > 31 Then + Open "ROOT/taobin_project/xml/page_catalog2.xml" + EndIf + + Refresh + TimerReset + + + + + + + 144 + 413 + pay_with_chanel_text + + + +; back + + + + 375 + 623 + 331 + 435 + PictureDrink + + + + + 375 + 623 + eval( + If IsSmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + + "ROOT/taobin_project/image/topping2/blender_icon.png" + + + + + 0 + 1065 + 1080 + Center + 72 + KanitMediumTTF + 0xB78F24 + showRemaining + + + + + + 0 + 938 + 1080 + Center + 72 + KanitMediumTTF + 0x513C2F + showname + + + + 0 + 1022 + 1080 + Center + 24 + KanitLightTTF + 0x6F5F51 + showdesc + + + + + 0 + 380 + "Enable" + "ROOT/taobin_project/image/page_payment/alpha.png" + + + + + + 837 + 1255 + 94 + 94 + LOADING_STATE + Var( DirImage + "/loading.gif" ) + + + + diff --git a/xml/page_identity_verification.xml b/xml/page_identity_verification.xml index 857af798..ccf82b25 100644 --- a/xml/page_identity_verification.xml +++ b/xml/page_identity_verification.xml @@ -10,6 +10,8 @@ Var CamCount = 0 Var Timeout = 0 Var ShutterResult = "-" + + Var AdultFlag = 1 If AdultFlag = 1 Then @@ -36,6 +38,25 @@ Var AdultFlag2 = 1 EndIf + 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" + Var page_doing_show_time_image = "ROOT/taobin_project/image/page_doing/img2.png" + + Else + Var DirImage = "ROOT/taobin_project/image/page_payment" + Var DirImage2 = "ROOT/taobin_project/image/page_payment_cash_extend" + Var page_doing_show_time_image = "ROOT/taobin_project/image/page_doing/img2.png" + EndIf + + + If CameraCount = 1 Then + + EndIf + + + Var CountDownDelayReadCardID = 5 + DEBUGVAR CameraCount @@ -45,17 +66,154 @@ + + + DEBUGVAR IDCardStatus + DEBUGVAR IDCardReady + DEBUGVAR IDCardData + DEBUGVAR IDBirthdate + + If AdultFlag2 = 1 Then + + If IDCardStatus = "OK" Then + If IDCardReady = "OK" Then + If IDCardData = "START" Then + + Var AdultState2 = "Enable" + Var AdultState1 = "Invisible" + Var AdultState3 = "Invisible" + + Refresh + EndIf + EndIf + EndIf + + If IDCardStatus = "OK" Then + If IDCardReady = "OK" Then + If IDCardData = "ERROR" Then + Var AdultState2 = "Invisible" + Var AdultState3 = "Enable" + + Refresh + EndIf + EndIf + EndIf + + If IDCardStatus = "ERROR" Then + Var AdultState2 = "Invisible" + Var AdultState3 = "Enable" + + Refresh + EndIf + + If IDCardStatus = "OK" Then + If IDCardReady = "OK" Then + If IDCardData = "DONE" Then + + ;Var birthDate = IDBirthdate + Var StrYear = "" + Var StrMon = "" + Var StrDay = "" + + SUBSTRING IDBirthdate 0 4 StrYear + SUBSTRING IDBirthdate 4 6 StrMon + SUBSTRING IDBirthdate 6 8 StrDay + + INT StrYear + INT StrMon + INT StrDay + + Var Adult20 = 0 + + + DEBUGVAR StrYear + DEBUGVAR StrMon + DEBUGVAR StrDay + + DEBUGVAR sdatemonth + DEBUGVAR sdateday + + Var sdateyear = sdateyear + 543 + Var AgeNumber = sdateyear - StrYear + DEBUGVAR AgeNumber + + If AgeNumber >= 20 Then + + If AgeNumber = 20 Then + If sdatemonth > StrMon Then + Var Adult20 = 1 + Else + If sdatemonth = StrMon Then + If sdateday >= StrDay Then + Var Adult20 = 1 + EndIf + EndIf + EndIf + Else + Var Adult20 = 1 + EndIf + + If Adult20 = 1 Then + Var AdultState3 = "Invisible" + Var AdultState2 = "Invisible" + Var AdultState1 = "Invisible" + Var AdultState = "Invisible" + Refresh + + Else + Var AdultState2 = "Invisible" + Var AdultState3 = "Enable" + Refresh + EndIf + + Else + Var AdultState2 = "Invisible" + Var AdultState3 = "Enable" + Refresh + EndIf + + + Var AdultFlag2 = 1 + + EndIf + EndIf + EndIf + + + EndIf + + + + + + 1000 - + DEBUGVAR IDCardStatus + DEBUGVAR IDCardReady + DEBUGVAR IDCardData + DEBUGVAR IDBirthdate + DEBUGVAR CountDownDelayReadCardID + DEBUGVAR ShutterResult + + + If IDBirthdate = "" Then + Var CountDownDelayReadCardID = CountDownDelayReadCardID - 1 + If CountDownDelayReadCardID = 0 Then + READCARDID + Var CountDownDelayReadCardID = 10 + EndIf + EndIf + + DEBUGVAR Timeout Var Timeout = Timeout + 1 If Timeout > 30 Then - Open "ROOT/taobin_project/xml/page_catalog.xml" + Open "ROOT/taobin_project/xml/page_catalog2.xml" EndIf If ShutterResult = "ok" Then - Open "ROOT/taobin_project/xml/page_payment_cameraWait.xml" + Open "ROOT/taobin_project/xml/page_face_compare.xml" EndIf Refresh @@ -91,114 +249,6 @@ - - 375 - 623 - 331 - 435 - PictureDrink - - - -; -; -; -; -; -; -; -; -; -; - - - - - - - -; -; - - - 0 1065 @@ -212,29 +262,6 @@ - - 0 - 938 - 1080 - Center - 72 - KanitMediumTTF - 0x513C2F - showname - - - - 0 - 1022 - 1080 - Center - 24 - KanitLightTTF - 0x6F5F51 - showdesc - - - 0 380 @@ -259,7 +286,6 @@ Var Timeout = 0 CameraCmd "usbfront" "shutter" "/mnt/sdcard/camera1.jpg" - ;Open "ROOT/taobin_project/xml/page_payment_cameraWait.xml" @@ -273,22 +299,26 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Open "ROOT/taobin_project/xml/page_catalog.xml" + Open "ROOT/taobin_project/xml/page_catalog2.xml" - 735 - 1179 + 0 + 381 "usbfront" - 326 - 235 + 700 + 394 - - + + DEBUGVAR BugFlag + If BugFlag = 0 Then + Var BugFlag = 1 + EndIf + DEBUGVAR IDCardStatus diff --git a/xml/vending_info.xml b/xml/vending_info.xml index 9b69fbb8..a2c643f0 100644 --- a/xml/vending_info.xml +++ b/xml/vending_info.xml @@ -509,7 +509,6 @@ info_9Y "ROOT/taobin_project/image/tab_1.png" - CameraService "Start" @@ -548,7 +547,11 @@ info_10Y "ROOT/taobin_project/image/tab_1.png" + OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml" + OpenInst 2 "ROOT/taobin_project/xml/page_identity_verification.xml" + TopView "show" + Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_main_blank.xml" @@ -567,7 +570,12 @@ info_10Y "ROOT/taobin_project/image/tab_1.png" - Open "ROOT/taobin_project/xml/test_qr.xml" + 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"