From 89cedc2d883d5a3e8a685d0855493e659d7ca3dc Mon Sep 17 00:00:00 2001 From: kong Date: Thu, 20 Apr 2023 19:13:28 +0700 Subject: [PATCH] SNAP 7.13 --- image/liveness/bg3.png | Bin 5682 -> 3834 bytes xml/page_board.xml | 124 +---------------------------- xml/page_catalog.xml | 94 ---------------------- xml/page_face_compare.xml | 49 ++++++++---- xml/page_identity_verification.xml | 9 ++- xml/vending_info.xml | 1 + xml_main/startup.xml | 4 +- 7 files changed, 45 insertions(+), 236 deletions(-) diff --git a/image/liveness/bg3.png b/image/liveness/bg3.png index cc348a0c8479b0ef4c0801d661f4c3175575452f..f4a5052ba400b7e58009fb0de217589cf6d900f9 100644 GIT binary patch delta 3820 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 diff --git a/xml/page_board.xml b/xml/page_board.xml index fe4b6c5a..57bdf555 100644 --- a/xml/page_board.xml +++ b/xml/page_board.xml @@ -672,130 +672,7 @@ - Var PromotionOreoVolcanoEnable = 0 - - If SystemDateMonthInt = 2 Then - If SystemDateDayInt = 20 Then - Var PromotionOreoVolcanoEnable = 1 - EndIf - If SystemDateDayInt = 24 Then - Var PromotionOreoVolcanoEnable = 1 - EndIf - - If SystemDateDayInt = 27 Then - Var PromotionOreoVolcanoEnable = 1 - EndIf - EndIf - - If SystemDateMonthInt = 3 Then - If SystemDateDayInt = 6 Then - Var PromotionOreoVolcanoEnable = 1 - EndIf - If SystemDateDayInt = 13 Then - Var PromotionOreoVolcanoEnable = 1 - EndIf - If SystemDateDayInt = 20 Then - Var PromotionOreoVolcanoEnable = 1 - EndIf - If SystemDateDayInt = 27 Then - Var PromotionOreoVolcanoEnable = 1 - EndIf - EndIf - - Var PromotionOreoToppingFreeEnable = 0 - - If SystemDateMonthInt = 2 Then - If SystemDateDayInt = 21 Then - Var PromotionOreoToppingFreeEnable = 1 - EndIf - If SystemDateDayInt = 24 Then - Var PromotionOreoToppingFreeEnable = 1 - EndIf - EndIf - - If SystemDateMonthInt = 3 Then - If SystemDateDayInt = 1 Then - Var PromotionOreoToppingFreeEnable = 1 - EndIf - If SystemDateDayInt = 8 Then - Var PromotionOreoToppingFreeEnable = 1 - EndIf - If SystemDateDayInt = 15 Then - Var PromotionOreoToppingFreeEnable = 1 - EndIf - If SystemDateDayInt = 22 Then - Var PromotionOreoToppingFreeEnable = 1 - EndIf - If SystemDateDayInt = 29 Then - Var PromotionOreoToppingFreeEnable = 1 - EndIf - EndIf - - - Var ShowPromoitonOreo = 1 - - If SystemDateMonthInt = 3 Then - If SystemDateDayInt = 30 Then - Var ShowPromoitonOreo = 0 - EndIf - If SystemDateDayInt = 31 Then - Var ShowPromoitonOreo = 0 - EndIf - EndIf - - If SystemDateMonthInt = 4 Then - Var ShowPromoitonOreo = 0 - - EndIf - If SystemDateMonthInt = 5 Then - Var ShowPromoitonOreo = 0 - EndIf - - ;Var ShowPromoitonOreo = 0 - - If ShowPromoitonOreo = 0 Then - Var PromotionOreoVolcanoEnable = 0 - Var PromotionOreoToppingFreeEnable = 0 - EndIf - - - DEBUGVAR $12-03-03-0009.Button - - If PromotionOreoVolcanoEnable = 1 Then - Var bn_oreo_vo_get1_full_path = "ROOT/taobin_project/image/page_drink_picture2_n//bn_oreo_vo_get1_final.png" - Var smoothie_oreo_resting = "ROOT/taobin_project/image/page_drink_n//bn_oreo_vo_get1_final.png" - Var smoothie_oreo_press = "ROOT/taobin_project/image/page_drink_press_n//bn_oreo_vo_get1_final.png" - Var smoothie_oreo_disable = "ROOT/taobin_project/image/page_drink_disable_n2//bn_oreo_vo_get1_final.png" - - Else - - Var smoothie_oreo_resting = "ROOT/taobin_project/image/page_drink_n//bn_smoothie_oreo.png" - Var smoothie_oreo_press = "ROOT/taobin_project/image/page_drink_press_n//bn_smoothie_oreo.png" - Var smoothie_oreo_disable = "ROOT/taobin_project/image/page_drink_disable_n2//bn_smoothie_oreo.png" - Var bn_oreo_vo_get1_full_path = "ROOT/taobin_project/image/page_drink_picture2_n//bn_smoothie_oreo.png" - EndIf - - - Var PromotionIDCurrentOrder = 0 - If OreoEnable = "true" Then - - Else - Var PromotionOreoVolcanoEnable = 0 - Var PromotionOreoToppingFreeEnable = 0 - Var ShowPromoitonOreo = 0 - EndIf - Var SongkranEnable = 0 - If BoxID = 173149 Then - Var SongkranEnable = 1 - Var PromotionOreoVolcanoEnable = 0 - Var PromotionOreoToppingFreeEnable = 0 - Var ShowPromoitonOreo = 0 - EndIf - - If BoxID = 200001 Then - Var SongkranEnable = 1 - EndIf If SystemDateMonthInt = 4 Then If SystemDateDayInt > 7 Then @@ -827,6 +704,7 @@ Var CountDownCheckCamera = 0 DEBUGVAR EnableLiveness + DEBUGVAR LivenessControlVersion RootLayoutVisible 3 "hide" diff --git a/xml/page_catalog.xml b/xml/page_catalog.xml index 6f9b7700..5187c9c4 100644 --- a/xml/page_catalog.xml +++ b/xml/page_catalog.xml @@ -8,100 +8,6 @@ Var PromotionOreoVolcanoEnable = 0 - If SystemDateMonthInt = 2 Then - If SystemDateDayInt = 20 Then - Var PromotionOreoVolcanoEnable = 1 - EndIf - If SystemDateDayInt = 24 Then - Var PromotionOreoVolcanoEnable = 1 - EndIf - - If SystemDateDayInt = 27 Then - Var PromotionOreoVolcanoEnable = 1 - EndIf - EndIf - - If SystemDateMonthInt = 3 Then - If SystemDateDayInt = 6 Then - Var PromotionOreoVolcanoEnable = 1 - EndIf - If SystemDateDayInt = 13 Then - Var PromotionOreoVolcanoEnable = 1 - EndIf - If SystemDateDayInt = 20 Then - Var PromotionOreoVolcanoEnable = 1 - EndIf - If SystemDateDayInt = 27 Then - Var PromotionOreoVolcanoEnable = 1 - EndIf - EndIf - - Var PromotionOreoToppingFreeEnable = 0 - - If SystemDateMonthInt = 2 Then - If SystemDateDayInt = 21 Then - Var PromotionOreoToppingFreeEnable = 1 - EndIf - If SystemDateDayInt = 24 Then - Var PromotionOreoToppingFreeEnable = 1 - EndIf - EndIf - - If SystemDateMonthInt = 3 Then - If SystemDateDayInt = 1 Then - Var PromotionOreoToppingFreeEnable = 1 - EndIf - If SystemDateDayInt = 8 Then - Var PromotionOreoToppingFreeEnable = 1 - EndIf - If SystemDateDayInt = 15 Then - Var PromotionOreoToppingFreeEnable = 1 - EndIf - If SystemDateDayInt = 22 Then - Var PromotionOreoToppingFreeEnable = 1 - EndIf - If SystemDateDayInt = 29 Then - Var PromotionOreoToppingFreeEnable = 1 - EndIf - EndIf - - - - DEBUGVAR $12-03-03-0009.Button - - If PromotionOreoVolcanoEnable = 1 Then - Var bn_oreo_vo_get1_full_path = "ROOT/taobin_project/image/page_drink_picture2_n//bn_oreo_vo_get1_final.png" - Var smoothie_oreo_resting = "ROOT/taobin_project/image/page_drink_n//bn_oreo_vo_get1_final.png" - Var smoothie_oreo_press = "ROOT/taobin_project/image/page_drink_press_n//bn_oreo_vo_get1_final.png" - Var smoothie_oreo_disable = "ROOT/taobin_project/image/page_drink_disable_n2//bn_oreo_vo_get1_final.png" - - Else - - Var smoothie_oreo_resting = "ROOT/taobin_project/image/page_drink_n//bn_smoothie_oreo.png" - Var smoothie_oreo_press = "ROOT/taobin_project/image/page_drink_press_n//bn_smoothie_oreo.png" - Var smoothie_oreo_disable = "ROOT/taobin_project/image/page_drink_disable_n2//bn_smoothie_oreo.png" - Var bn_oreo_vo_get1_full_path = "ROOT/taobin_project/image/page_drink_picture2_n//bn_smoothie_oreo.png" - EndIf - - - Var PromotionIDCurrentOrder = 0 - - If SystemDateMonthInt = 3 Then - If SystemDateDayInt = 30 Then - Var ShowPromoitonOreo = 0 - EndIf - If SystemDateDayInt = 31 Then - Var ShowPromoitonOreo = 0 - EndIf - EndIf - - If SystemDateMonthInt = 4 Then - Var ShowPromoitonOreo = 0 - EndIf - If SystemDateMonthInt = 5 Then - Var ShowPromoitonOreo = 0 - EndIf - If SpiralOnline = "true" Then If Seeker = "next" Then diff --git a/xml/page_face_compare.xml b/xml/page_face_compare.xml index 7ef5b7f2..80454153 100644 --- a/xml/page_face_compare.xml +++ b/xml/page_face_compare.xml @@ -1,5 +1,4 @@ - "Enable" 1080 1920 "0xeae6e1" @@ -9,7 +8,7 @@ Var Timeout = 0 - Var IDcardTextStatus = "กรุณารอสักครู" + Var IDcardTextStatus = "กำลังตรวจสอบ" Var FaceCompareStatus = "" Var load_gif_stage = "Enable" Var IDcardTextState = "Invisible" @@ -32,7 +31,17 @@ EndIf - CameraCmd "usbfront" "--delete-file" "/mnt/sdcard/camera1.jpg" + Var save_file_name = "pass_face_" + SystemDateMonth + Var save_file_name = save_file_name + SystemDateDay + Var save_file_name = save_file_name + SystemTimeHour + Var save_file_name = save_file_name + SystemTimeMinute + Var save_file_name = "/mnt/sdcard/" + save_file_name + Var save_file_name = save_file_name + ".jpg" + + Var save_file_name = "/mnt/sdcard/camera1.jpg," + save_file_name + + + CameraCmd "usbfront" "--copy-file" save_file_name Open "ROOT/taobin_project/xml/page_payment.xml" @@ -53,7 +62,7 @@ Var save_file_name = "face_" + SystemDateMonth Var save_file_name = save_file_name + SystemDateDay - Var save_file_name = save_file_name + SystemTimeMinute + Var save_file_name = save_file_name + SystemTimeHour Var save_file_name = save_file_name + SystemTimeMinute Var save_file_name = "/mnt/sdcard/" + save_file_name Var save_file_name = save_file_name + ".jpg" @@ -114,16 +123,25 @@ - 249 + 123 + 598 + "Enable" + "ROOT/taobin_project/image/liveness/bg2.png" + + + + + + 350 751 "Enable" - "ROOT/taobin_project/image/liveness/bg1.png" + "/mnt/sdcard/camera1.jpg" 0 - 1050 - IDcardTextState + 602 + "Enable" 1080 Center 56 @@ -164,12 +182,12 @@ - - 440 - 988 - load_gif_stage - "ROOT/taobin_project/image/page_payment/loading.gif" - +; +; 440 +; 988 +; load_gif_stage +; "ROOT/taobin_project/image/page_payment/loading.gif" +; EventEvaluate "EventActionOk" @@ -177,5 +195,8 @@ EventEvaluate "EventActionError" + + Open "ROOT/taobin_project/xml/page_catalog2.xml" + diff --git a/xml/page_identity_verification.xml b/xml/page_identity_verification.xml index 9cc02b91..983b16ba 100644 --- a/xml/page_identity_verification.xml +++ b/xml/page_identity_verification.xml @@ -223,6 +223,9 @@ If LivenessResult = "pass" Then Var LivenessShowString = "Pass " Var load_gif_stage = "Enable" + + CROP_IMAGE "/mnt/sdcard/camera1_alter.jpg" 170 230 380 500 "/mnt/sdcard/camera1.jpg" + Open "ROOT/taobin_project/xml/page_face_compare.xml" EndIff @@ -309,14 +312,14 @@ "usbfront" 800 800 - "FileName=/mnt/sdcard/camera1.jpg" + "FileName=/mnt/sdcard/camera1_alter.jpg" - 351 - 880 + 423 + 909 CameraStage "ROOT/taobin_project/image/liveness/bg3.png" diff --git a/xml/vending_info.xml b/xml/vending_info.xml index df35fb57..e0359bcb 100644 --- a/xml/vending_info.xml +++ b/xml/vending_info.xml @@ -113,6 +113,7 @@ DEBUGVAR AndroidBoardTemp10 + 1000 diff --git a/xml_main/startup.xml b/xml_main/startup.xml index 2f878f8f..0b551d51 100644 --- a/xml_main/startup.xml +++ b/xml_main/startup.xml @@ -108,8 +108,8 @@ Var RandomPromotionMyworld = 0 Var RandomSalePackage = 0 - Var XMLPageVersion = "7.12" - Var XMLPageVersionInt = 712 + Var XMLPageVersion = "7.13" + Var XMLPageVersionInt = 713