diff --git a/image/page_drink_disable_n2/15THB/bn_hot_black_thai_tea.png b/image/page_drink_disable_n2/15THB/bn_hot_black_thai_tea.png index cc27ef8f..9f93f962 100644 Binary files a/image/page_drink_disable_n2/15THB/bn_hot_black_thai_tea.png and b/image/page_drink_disable_n2/15THB/bn_hot_black_thai_tea.png differ diff --git a/image/page_drink_disable_n2/15THB/bn_hot_jasmine_tea.png b/image/page_drink_disable_n2/15THB/bn_hot_jasmine_tea.png index 048a8c51..135d673e 100644 Binary files a/image/page_drink_disable_n2/15THB/bn_hot_jasmine_tea.png and b/image/page_drink_disable_n2/15THB/bn_hot_jasmine_tea.png differ diff --git a/image/page_drink_disable_n2/15THB/bn_hot_lime.png b/image/page_drink_disable_n2/15THB/bn_hot_lime.png index a26805c4..55e1ebd5 100644 Binary files a/image/page_drink_disable_n2/15THB/bn_hot_lime.png and b/image/page_drink_disable_n2/15THB/bn_hot_lime.png differ diff --git a/image/page_drink_disable_n2/15THB/bn_hot_matcha_tea.png b/image/page_drink_disable_n2/15THB/bn_hot_matcha_tea.png index 18c6cd56..071a3da0 100644 Binary files a/image/page_drink_disable_n2/15THB/bn_hot_matcha_tea.png and b/image/page_drink_disable_n2/15THB/bn_hot_matcha_tea.png differ diff --git a/image/page_drink_disable_n2/15THB/bn_iced_energy_drink.png b/image/page_drink_disable_n2/15THB/bn_iced_energy_drink.png index 8440bd9d..c8e5676c 100644 Binary files a/image/page_drink_disable_n2/15THB/bn_iced_energy_drink.png and b/image/page_drink_disable_n2/15THB/bn_iced_energy_drink.png differ diff --git a/image/page_drink_disable_n2/15THB/bn_iced_energy_drink_soda.png b/image/page_drink_disable_n2/15THB/bn_iced_energy_drink_soda.png index 00aa97e2..7fb4dd2e 100644 Binary files a/image/page_drink_disable_n2/15THB/bn_iced_energy_drink_soda.png and b/image/page_drink_disable_n2/15THB/bn_iced_energy_drink_soda.png differ diff --git a/image/page_drink_disable_n2/15THB/bn_iced_lime.png b/image/page_drink_disable_n2/15THB/bn_iced_lime.png index 2000beba..61f11c4f 100644 Binary files a/image/page_drink_disable_n2/15THB/bn_iced_lime.png and b/image/page_drink_disable_n2/15THB/bn_iced_lime.png differ diff --git a/image/page_drink_disable_n2/15THB/bn_iced_matcha_tea.png b/image/page_drink_disable_n2/15THB/bn_iced_matcha_tea.png index a1120c08..541806fa 100644 Binary files a/image/page_drink_disable_n2/15THB/bn_iced_matcha_tea.png and b/image/page_drink_disable_n2/15THB/bn_iced_matcha_tea.png differ diff --git a/image/page_drink_disable_n2/15THB/bn_iced_pepsi.png b/image/page_drink_disable_n2/15THB/bn_iced_pepsi.png index 41793b6c..3a4bddac 100644 Binary files a/image/page_drink_disable_n2/15THB/bn_iced_pepsi.png and b/image/page_drink_disable_n2/15THB/bn_iced_pepsi.png differ diff --git a/image/page_drink_disable_n2/15THB/bn_jasmine_lime_tea.png b/image/page_drink_disable_n2/15THB/bn_jasmine_lime_tea.png index 16420c0d..ebb0ecba 100644 Binary files a/image/page_drink_disable_n2/15THB/bn_jasmine_lime_tea.png and b/image/page_drink_disable_n2/15THB/bn_jasmine_lime_tea.png differ diff --git a/image/page_drink_disable_n2/15THB/bn_sala.png b/image/page_drink_disable_n2/15THB/bn_sala.png index 1ff99928..129b5668 100644 Binary files a/image/page_drink_disable_n2/15THB/bn_sala.png and b/image/page_drink_disable_n2/15THB/bn_sala.png differ diff --git a/image/page_drink_n/15THB/bn_hot_black_thai_tea.png b/image/page_drink_n/15THB/bn_hot_black_thai_tea.png index 42492bfa..cc57f986 100644 Binary files a/image/page_drink_n/15THB/bn_hot_black_thai_tea.png and b/image/page_drink_n/15THB/bn_hot_black_thai_tea.png differ diff --git a/image/page_drink_n/15THB/bn_hot_jasmine_tea.png b/image/page_drink_n/15THB/bn_hot_jasmine_tea.png index 39b1a330..6e2f727f 100644 Binary files a/image/page_drink_n/15THB/bn_hot_jasmine_tea.png and b/image/page_drink_n/15THB/bn_hot_jasmine_tea.png differ diff --git a/image/page_drink_n/15THB/bn_hot_lime.png b/image/page_drink_n/15THB/bn_hot_lime.png index 36be030f..c3ddf347 100644 Binary files a/image/page_drink_n/15THB/bn_hot_lime.png and b/image/page_drink_n/15THB/bn_hot_lime.png differ diff --git a/image/page_drink_n/15THB/bn_hot_matcha_tea.png b/image/page_drink_n/15THB/bn_hot_matcha_tea.png index fb0c2384..edcf8319 100644 Binary files a/image/page_drink_n/15THB/bn_hot_matcha_tea.png and b/image/page_drink_n/15THB/bn_hot_matcha_tea.png differ diff --git a/image/page_drink_n/15THB/bn_iced_energy_drink.png b/image/page_drink_n/15THB/bn_iced_energy_drink.png index 1bbdabcf..b65bf755 100644 Binary files a/image/page_drink_n/15THB/bn_iced_energy_drink.png and b/image/page_drink_n/15THB/bn_iced_energy_drink.png differ diff --git a/image/page_drink_n/15THB/bn_iced_energy_drink_soda.png b/image/page_drink_n/15THB/bn_iced_energy_drink_soda.png index 7f9ca019..7e6aaa8f 100644 Binary files a/image/page_drink_n/15THB/bn_iced_energy_drink_soda.png and b/image/page_drink_n/15THB/bn_iced_energy_drink_soda.png differ diff --git a/image/page_drink_n/15THB/bn_iced_lime.png b/image/page_drink_n/15THB/bn_iced_lime.png index fff1dd28..a3984457 100644 Binary files a/image/page_drink_n/15THB/bn_iced_lime.png and b/image/page_drink_n/15THB/bn_iced_lime.png differ diff --git a/image/page_drink_n/15THB/bn_iced_matcha_tea.png b/image/page_drink_n/15THB/bn_iced_matcha_tea.png index 7b904ae1..700df8c8 100644 Binary files a/image/page_drink_n/15THB/bn_iced_matcha_tea.png and b/image/page_drink_n/15THB/bn_iced_matcha_tea.png differ diff --git a/image/page_drink_n/15THB/bn_iced_pepsi.png b/image/page_drink_n/15THB/bn_iced_pepsi.png index f4981d9b..75a45816 100644 Binary files a/image/page_drink_n/15THB/bn_iced_pepsi.png and b/image/page_drink_n/15THB/bn_iced_pepsi.png differ diff --git a/image/page_drink_n/15THB/bn_jasmine_lime_tea.png b/image/page_drink_n/15THB/bn_jasmine_lime_tea.png index 1a438273..4208e3c5 100644 Binary files a/image/page_drink_n/15THB/bn_jasmine_lime_tea.png and b/image/page_drink_n/15THB/bn_jasmine_lime_tea.png differ diff --git a/image/page_drink_n/15THB/bn_sala.png b/image/page_drink_n/15THB/bn_sala.png index 89b3a623..5f059d44 100644 Binary files a/image/page_drink_n/15THB/bn_sala.png and b/image/page_drink_n/15THB/bn_sala.png differ diff --git a/image/page_drink_picture2_n/15THB/bn_hot_black_thai_tea.png b/image/page_drink_picture2_n/15THB/bn_hot_black_thai_tea.png index 539fd37d..49389147 100644 Binary files a/image/page_drink_picture2_n/15THB/bn_hot_black_thai_tea.png and b/image/page_drink_picture2_n/15THB/bn_hot_black_thai_tea.png differ diff --git a/image/page_drink_picture2_n/15THB/bn_hot_jasmine_tea.png b/image/page_drink_picture2_n/15THB/bn_hot_jasmine_tea.png index a507202e..8b929de4 100644 Binary files a/image/page_drink_picture2_n/15THB/bn_hot_jasmine_tea.png and b/image/page_drink_picture2_n/15THB/bn_hot_jasmine_tea.png differ diff --git a/image/page_drink_picture2_n/15THB/bn_hot_lime.png b/image/page_drink_picture2_n/15THB/bn_hot_lime.png index eace3cd3..91231e70 100644 Binary files a/image/page_drink_picture2_n/15THB/bn_hot_lime.png and b/image/page_drink_picture2_n/15THB/bn_hot_lime.png differ diff --git a/image/page_drink_picture2_n/15THB/bn_hot_matcha_tea.png b/image/page_drink_picture2_n/15THB/bn_hot_matcha_tea.png index dadfc7ff..182aa837 100644 Binary files a/image/page_drink_picture2_n/15THB/bn_hot_matcha_tea.png and b/image/page_drink_picture2_n/15THB/bn_hot_matcha_tea.png differ diff --git a/image/page_drink_picture2_n/15THB/bn_iced_energy_drink.png b/image/page_drink_picture2_n/15THB/bn_iced_energy_drink.png index e461a49c..6b4c7d96 100644 Binary files a/image/page_drink_picture2_n/15THB/bn_iced_energy_drink.png and b/image/page_drink_picture2_n/15THB/bn_iced_energy_drink.png differ diff --git a/image/page_drink_picture2_n/15THB/bn_iced_energy_drink_soda.png b/image/page_drink_picture2_n/15THB/bn_iced_energy_drink_soda.png index a04932a0..3436d6a7 100644 Binary files a/image/page_drink_picture2_n/15THB/bn_iced_energy_drink_soda.png and b/image/page_drink_picture2_n/15THB/bn_iced_energy_drink_soda.png differ diff --git a/image/page_drink_picture2_n/15THB/bn_iced_lime.png b/image/page_drink_picture2_n/15THB/bn_iced_lime.png index 25cc5eeb..f2d4e9c9 100644 Binary files a/image/page_drink_picture2_n/15THB/bn_iced_lime.png and b/image/page_drink_picture2_n/15THB/bn_iced_lime.png differ diff --git a/image/page_drink_picture2_n/15THB/bn_iced_matcha_tea.png b/image/page_drink_picture2_n/15THB/bn_iced_matcha_tea.png index 688c7329..d728334c 100644 Binary files a/image/page_drink_picture2_n/15THB/bn_iced_matcha_tea.png and b/image/page_drink_picture2_n/15THB/bn_iced_matcha_tea.png differ diff --git a/image/page_drink_picture2_n/15THB/bn_iced_pepsi.png b/image/page_drink_picture2_n/15THB/bn_iced_pepsi.png index 1baae086..13400125 100644 Binary files a/image/page_drink_picture2_n/15THB/bn_iced_pepsi.png and b/image/page_drink_picture2_n/15THB/bn_iced_pepsi.png differ diff --git a/image/page_drink_picture2_n/15THB/bn_jasmine_lime_tea.png b/image/page_drink_picture2_n/15THB/bn_jasmine_lime_tea.png index 9025113d..aa3af5d5 100644 Binary files a/image/page_drink_picture2_n/15THB/bn_jasmine_lime_tea.png and b/image/page_drink_picture2_n/15THB/bn_jasmine_lime_tea.png differ diff --git a/image/page_drink_picture2_n/15THB/bn_sala.png b/image/page_drink_picture2_n/15THB/bn_sala.png index 7fb038e0..7a55954a 100644 Binary files a/image/page_drink_picture2_n/15THB/bn_sala.png and b/image/page_drink_picture2_n/15THB/bn_sala.png differ diff --git a/image/page_drink_press_n/15THB/bn_hot_black_thai_tea.png b/image/page_drink_press_n/15THB/bn_hot_black_thai_tea.png index 765e80fa..4d4fb728 100644 Binary files a/image/page_drink_press_n/15THB/bn_hot_black_thai_tea.png and b/image/page_drink_press_n/15THB/bn_hot_black_thai_tea.png differ diff --git a/image/page_drink_press_n/15THB/bn_hot_jasmine_tea.png b/image/page_drink_press_n/15THB/bn_hot_jasmine_tea.png index 59daa875..70119038 100644 Binary files a/image/page_drink_press_n/15THB/bn_hot_jasmine_tea.png and b/image/page_drink_press_n/15THB/bn_hot_jasmine_tea.png differ diff --git a/image/page_drink_press_n/15THB/bn_hot_lime.png b/image/page_drink_press_n/15THB/bn_hot_lime.png index 125ca412..3e253ab4 100644 Binary files a/image/page_drink_press_n/15THB/bn_hot_lime.png and b/image/page_drink_press_n/15THB/bn_hot_lime.png differ diff --git a/image/page_drink_press_n/15THB/bn_hot_matcha_tea.png b/image/page_drink_press_n/15THB/bn_hot_matcha_tea.png index 7075dabb..2a2b09b6 100644 Binary files a/image/page_drink_press_n/15THB/bn_hot_matcha_tea.png and b/image/page_drink_press_n/15THB/bn_hot_matcha_tea.png differ diff --git a/image/page_drink_press_n/15THB/bn_iced_energy_drink.png b/image/page_drink_press_n/15THB/bn_iced_energy_drink.png index 37351c34..ec39dd36 100644 Binary files a/image/page_drink_press_n/15THB/bn_iced_energy_drink.png and b/image/page_drink_press_n/15THB/bn_iced_energy_drink.png differ diff --git a/image/page_drink_press_n/15THB/bn_iced_energy_drink_soda.png b/image/page_drink_press_n/15THB/bn_iced_energy_drink_soda.png index b9bcd8d4..144ad2dd 100644 Binary files a/image/page_drink_press_n/15THB/bn_iced_energy_drink_soda.png and b/image/page_drink_press_n/15THB/bn_iced_energy_drink_soda.png differ diff --git a/image/page_drink_press_n/15THB/bn_iced_lime.png b/image/page_drink_press_n/15THB/bn_iced_lime.png index 1bc794b3..b947c158 100644 Binary files a/image/page_drink_press_n/15THB/bn_iced_lime.png and b/image/page_drink_press_n/15THB/bn_iced_lime.png differ diff --git a/image/page_drink_press_n/15THB/bn_iced_matcha_tea.png b/image/page_drink_press_n/15THB/bn_iced_matcha_tea.png index d3ee261d..431ea117 100644 Binary files a/image/page_drink_press_n/15THB/bn_iced_matcha_tea.png and b/image/page_drink_press_n/15THB/bn_iced_matcha_tea.png differ diff --git a/image/page_drink_press_n/15THB/bn_iced_pepsi.png b/image/page_drink_press_n/15THB/bn_iced_pepsi.png index b2654621..c07fcf36 100644 Binary files a/image/page_drink_press_n/15THB/bn_iced_pepsi.png and b/image/page_drink_press_n/15THB/bn_iced_pepsi.png differ diff --git a/image/page_drink_press_n/15THB/bn_jasmine_lime_tea.png b/image/page_drink_press_n/15THB/bn_jasmine_lime_tea.png index bd930423..05d88b7d 100644 Binary files a/image/page_drink_press_n/15THB/bn_jasmine_lime_tea.png and b/image/page_drink_press_n/15THB/bn_jasmine_lime_tea.png differ diff --git a/image/page_drink_press_n/15THB/bn_sala.png b/image/page_drink_press_n/15THB/bn_sala.png index cce90f2c..55413812 100644 Binary files a/image/page_drink_press_n/15THB/bn_sala.png and b/image/page_drink_press_n/15THB/bn_sala.png differ diff --git a/ui/lang.tsv b/ui/lang.tsv index e20f98f2..fcd989a8 100644 --- a/ui/lang.tsv +++ b/ui/lang.tsv @@ -680,3 +680,4 @@ TextID Note English Thai China Japan Malaysia 800618 Gas Remaining แก๊สเหลือ 800619 Gas CO2 แก๊ส CO2 800620 Menu soda เมนูโซดา +800621 Almost full เกือบเต็ม diff --git a/xml/page_identity_verification.xml b/xml/page_identity_verification.xml index 569532e0..3c3b441e 100644 --- a/xml/page_identity_verification.xml +++ b/xml/page_identity_verification.xml @@ -5,66 +5,44 @@ "0xeae6e1" SoundVolume - Var KornCropCountDown = 5 - Var KornIsShuttered = "false" - Var KornOpenFaceCompareCountDown = 10 - Var KornIsCropped = "false" - - ; Note: - ; - Can't change roi and camera params in xml, - ; because the java code is not dynamic. - ; (It's a work-around method. (Maybe) Improve later.) - - ; Absolute positions - Var KornRoiX = 440 - Var KornRoiY = 909 - Var KornRoiW = 200 - Var KornRoiH = 200 - Var KornRoiStepY = 40 + Var Debug_Count = 0 + Var Debug_Count_Start = "false" + + Var Timeout_Delay_Count = 5 ; Re-calculate these values when either, ; - CameraX size changes ; - CameraX's hidden part size changes - Var KornCamDisplayX = 285 - Var KornCamDisplayY = 781 - Var KornCamDisplayW = 500 - Var KornCamDisplayH = 680 - Var KornCamYHidden = 208 + ;Var CamDisplayX = 285 + Var CamDisplayX = 320 + Var CamDisplayY = 781 + Var CamDisplayW = 500 + Var CamDisplayH = 680 + Var CamYHidden = 208 - Var KornCamX = KornCamDisplayX - Var KornCamY = KornCamDisplayY - KornCamYHidden - Var KornCamW = KornCamDisplayW - Var KornCamH = KornCamDisplayH + KornCamYHidden - - Var KornRoiYMin = KornCamDisplayY - Var KornRoiYRange = 220 - Var KornRoiYMax = KornCamDisplayY + KornRoiYRange - - ; To shrink the roi size, use this variable, - ; (value is between 0 and 100 (unit = percent)) - Var KornRoiPercentShrink = 30 - Var KornCamRoiDeltaX = KornRoiW * KornRoiPercentShrink - Var KornCamRoiDeltaX = KornCamRoiDeltaX / 100 - Var KornCamRoiDeltaY = KornRoiH * KornRoiPercentShrink - Var KornCamRoiDeltaY = KornCamRoiDeltaY / 100 - Var KornCamRoiW = KornRoiW - KornCamRoiDeltaX - Var KornCamRoiH = KornRoiH - KornCamRoiDeltaY + Var CamX = CamDisplayX + Var CamY = CamDisplayY - CamYHidden + Var CamW = CamDisplayW + Var CamH = CamDisplayH + CamYHidden ; CameraX params - Var KornCameraXOffsetX = 150 - Var KornCameraXX = KornCamDisplayX - KornCameraXOffsetX - Var KornCameraXY = KornCamDisplayY - Var KornCameraXW = 800 - Var KornCameraXH = 800 + Var CameraXOffsetX = 150 + Var CameraXX = CamDisplayX - CameraXOffsetX + Var CameraXY = CamDisplayY + Var CameraXW = 800 + Var CameraXH = 800 ; 800 = magic number + ; Shift to right to leave space for customer's guide + Var CameraXX = CameraXX + 100 + Var CamFlag = 0 - Var CamCount = 0 + Var CamCount = 0 Var Timeout = 0 Var ShutterResult = "-" Var AdultFlag = 1 - + If AdultFlag = 1 Then Var AdultFlag = 0 @@ -228,11 +206,14 @@ If Adult20 = 1 Then - LivenessCommand "SetY" KornRoiY - LivenessCommand "SetX" KornRoiX + ;LivenessCommand "SetY" RoiY + ;LivenessCommand "SetX" RoiX LivenessCommand "start" 0 + Var Debug_Count_Start = "true" + StartSavingLiveness + Var load_gif_stage = "Invisible" Var IDcardStageText = "Invisible" Var IDcardStage = "Invisible" @@ -253,6 +234,10 @@ 1000 + If Debug_Count_Start = "true" Then + Var Debug_Count = Debug_Count + 1 + EndIf + DEBUGVAR IDCardStatus DEBUGVAR IDCardReady DEBUGVAR IDCardData @@ -261,10 +246,10 @@ DEBUGVAR ShutterResult DEBUGVAR IDCardState - Var KornCamRoiDeltaXTmp = KornCamRoiDeltaX / 2 - Var KornCamRoiX = KornRoiX + KornCamRoiDeltaXTmp - Var KornCamRoiY = KornRoiY - + ; Debug rare case : id card is read but nothing happens + DEBUGVAR IDcardStage + DEBUGVAR CameraStage + DEBUGVAR load_gif_stage If IDBirthdate = "" Then Var CountDownDelayReadCardID = CountDownDelayReadCardID - 1 @@ -274,11 +259,24 @@ EndIf EndIf - DEBUGVAR Timeout + DEBUGVAR Timeout Var Timeout = Timeout + 1 + If Timeout = 120 Then + StopSavingLiveness + LivenessCommand "stop" 0 + EndIf + If Timeout > 120 Then - Open "ROOT/taobin_project/xml/page_catalog2.xml" + Var LivenessShowString = "หมดเวลา กลับเมนูใน " + Timeout_Delay_Count + Var LivenessShowString = LivenessShowString + " วิ" + + Var Timeout_Delay_Count = Timeout_Delay_Count - 1 + + If Timeout > 125 Then + LivenessCommand "stop" 0 + Open "ROOT/taobin_project/xml/page_catalog2.xml" + EndIf EndIf ;If ShutterResult = "ok" Then @@ -288,44 +286,8 @@ DEBUGVAR LivenessResult If LivenessResult = "pass" Then - - If KornCropCountDown > 0 Then - DEBUGVAR KornCropCountDown - Var KornCropCountDown = KornCropCountDown - 1 - - Var LivenessShowString = "Pass " - Var load_gif_stage = "Enable" - - If KornIsShuttered = "false" Then - CameraCmd "usbfront" "shutter" "/mnt/sdcard/camera1.jpg" - - Var KornShutter = "Shuttered" - DEBUGVAR KornShutter - - Var KornIsShuttered = "true" - EndIf - EndIf - - If KornCropCountDown <= 0 Then - - If KornIsCropped = "false" Then - - CROP_IMAGE "/mnt/sdcard/camera1.jpg" "/mnt/sdcard/camera1_alter.jpg" - - Var KornCrop = "Cropped" - DEBUGVAR KornCrop - - Var KornIsCropped = "true" - EndIf - - DEBUGVAR KornOpenFaceCompareCountDown - Var KornOpenFaceCompareCountDown = KornOpenFaceCompareCountDown - 1 - - If KornOpenFaceCompareCountDown <= 0 Then - Open "ROOT/taobin_project/xml/page_face_compare.xml" - EndIf - - EndIf + LivenessCommand "stop" 0 + Open "ROOT/taobin_project/xml/page_face_compare.xml" EndIf If LivenessResult = "fail" Then @@ -348,12 +310,8 @@ EndIf EndIf - DEBUGVAR LivenessFramePositionX - DEBUGVAR LivenessFramePositionY - - - Refresh - TimerReset + Refresh + TimerReset @@ -377,7 +335,8 @@ - 123 +; 123 + 223 598 CameraStage "ROOT/taobin_project/image/liveness/bg2.png" @@ -385,9 +344,11 @@ - 0 +; 0 + 220 602 - 1080 +; 1080 + 980 Center 60 KanitMediumTTF @@ -396,6 +357,95 @@ LivenessShowString +; guide for customers +; +; 20 +; 800 +; 1080 +; Start +; 45 +; KanitRegularTTF +; 0xFFFFFF +; "ทำยังไงให้ง่าย +;- มองกล้อง +;- ถอดแว่น +;- ถอดแมส +;- ไม่หลับตา +;- หน้าในกรอบ +;" +; + + + 100 + 750 + 1080 + Start + 30 + KanitRegularTTF + 0xFFFFFF + "ตัวอย่าง" + + + + 25 + 800 +150 + "ROOT/taobin_project/image/liveness/liveness_good_1.png" + + + + 25 + 1000 +150 + "ROOT/taobin_project/image/liveness/liveness_good_2.png" + + + + 25 + 1200 +150 + "ROOT/taobin_project/image/liveness/liveness_good_3.png" + + + + 175 + 800 +150 + "ROOT/taobin_project/image/liveness/liveness_bad_1.png" + + + + 175 + 1000 +150 + "ROOT/taobin_project/image/liveness/liveness_bad_2.png" + + + + 175 + 1200 +150 + "ROOT/taobin_project/image/liveness/liveness_bad_3.png" + + +; +; 25 +; 1400 +; 1080 +; Start +; 30 +; KanitRegularTTF +; 0xFFFFFF +; "เลื่อนกล้องให้ยืนสบาย" +; + +; +; 66 +; 1450 +;300 +; "Enable" +; "ROOT/taobin_project/image/liveness/move_cam_2.gif" +; ; back @@ -408,157 +458,76 @@ SoundVolume SAVELOG "Liveness Result - Cancel" + + Var Debug_Message = "Liveness Result - cancel " + FailTrickCount + Var Debug_Message = Debug_Message + " (" + Var Debug_Message = Debug_Message + Debug_Count + Var Debug_Message = Debug_Message + " seconds)" + SAVELOG Debug_Message + + StopSavingLivenessDelete + + LivenessCommand "stop" 0 Open "ROOT/taobin_project/xml/page_catalog2.xml" -; arrow up - - -; arrow down - - - -; arrow up - - -; arrow down - - - - 196 +; 196 + 320 737 "ROOT/taobin_project/image/liveness/bg_21.png" - KornCameraXX + CameraXX ;140 - KornCameraXY + CameraXY ;781 "usbfront" - KornCameraXW + CameraXW ;800 ; Display width is about 500, (full width is about the same) - KornCameraXH + CameraXH ;800 ; Display height is about 680, (full height = 888) - "FileName=/mnt/sdcard/camera1_alter.jpg" + "FileName=/mnt/sdcard/camera1.jpg" - + +; -35 + 5 + 780 +680 + CameraStage + "ROOT/taobin_project/image/liveness/transparent.png" + - KornCamRoiX -;FrameOfFaceXPosition - KornCamRoiY -;FrameOfFaceYPosition - KornCamRoiW -;200 - KornCamRoiH -;200 +; 550 + 620 + 780 +680 CameraStage - "ROOT/taobin_project/image/liveness/bg3.png" + "ROOT/taobin_project/image/liveness/transparent.png" - 196 +; 196 +; 296 + 320 737 IDcardStage "ROOT/taobin_project/image/liveness/bg_21.png" - 0 +; 0 +; 220 + 240 1050 IDcardStageText 1080 @@ -572,7 +541,9 @@ - 440 +; 440 +; 540 + 580 988 load_gif_stage "ROOT/taobin_project/image/page_payment/loading.gif" @@ -603,11 +574,13 @@ Play SoundWavFileName Var PrevSoundWavFileName = SoundWavFileName EndIf - + If LivenessResult = "pass" Then Else - Var LivenessShowString = LivenessStateString + If Timeout < 120 Then + Var LivenessShowString = LivenessStateString + EndIf EndIf Refresh @@ -619,10 +592,28 @@ Var strlog_liveness = "Liveness Result - pass " + FailTrickCount SAVELOG strlog_liveness + + Var Debug_Message = "Liveness Result - pass " + FailTrickCount + Var Debug_Message = Debug_Message + " (" + Var Debug_Message = Debug_Message + Debug_Count + Var Debug_Message = Debug_Message + " seconds)" + SAVELOG Debug_Message + + StopSavingLivenessDelete Else Var FailTrickCount = FailTrickCount + 1 Var strlog_liveness = "Liveness Result - fail " + FailTrickCount SAVELOG strlog_liveness + + Var Debug_Message = "Liveness Result - failed " + FailTrickCount + Var Debug_Message = Debug_Message + " (" + Var Debug_Message = Debug_Message + Debug_Count + Var Debug_Message = Debug_Message + " seconds)" + SAVELOG Debug_Message + Var Debug_Count = 0 + + StopSavingLiveness + StartSavingLiveness EndIf diff --git a/xml_main/startup.xml b/xml_main/startup.xml index fc9b2717..8d687799 100644 --- a/xml_main/startup.xml +++ b/xml_main/startup.xml @@ -108,8 +108,8 @@ Var RandomPromotionMyworld = 0 Var RandomSalePackage = 0 - Var XMLPageVersion = "7.83" - Var XMLPageVersionInt = 783 + Var XMLPageVersion = "7.84" + Var XMLPageVersionInt = 784 ;Oreo Var OreoGuarantee = 0