diff --git a/image/drink_option_myr/blend.png b/image/drink_option_myr/blend.png new file mode 100644 index 00000000..7ad4bd7f Binary files /dev/null and b/image/drink_option_myr/blend.png differ diff --git a/image/drink_option_myr/blend_db.png b/image/drink_option_myr/blend_db.png new file mode 100644 index 00000000..bb6cc618 Binary files /dev/null and b/image/drink_option_myr/blend_db.png differ diff --git a/image/drink_option_myr/cold.png b/image/drink_option_myr/cold.png new file mode 100644 index 00000000..cd2864c4 Binary files /dev/null and b/image/drink_option_myr/cold.png differ diff --git a/image/drink_option_myr/cold_db.png b/image/drink_option_myr/cold_db.png new file mode 100644 index 00000000..2555de15 Binary files /dev/null and b/image/drink_option_myr/cold_db.png differ diff --git a/image/drink_option_myr/hot.png b/image/drink_option_myr/hot.png new file mode 100644 index 00000000..ef289c7d Binary files /dev/null and b/image/drink_option_myr/hot.png differ diff --git a/image/drink_option_myr/hot_db.png b/image/drink_option_myr/hot_db.png new file mode 100644 index 00000000..5cac0be9 Binary files /dev/null and b/image/drink_option_myr/hot_db.png differ diff --git a/image/drink_option_myr/option_deactive.png b/image/drink_option_myr/option_deactive.png new file mode 100644 index 00000000..154d6289 Binary files /dev/null and b/image/drink_option_myr/option_deactive.png differ diff --git a/image/liveness/arrow_down.png b/image/liveness/arrow_down.png new file mode 100644 index 00000000..f9d123ef Binary files /dev/null and b/image/liveness/arrow_down.png differ diff --git a/image/liveness/arrow_up.png b/image/liveness/arrow_up.png new file mode 100644 index 00000000..947565da Binary files /dev/null and b/image/liveness/arrow_up.png differ diff --git a/image/page_drink_disable_n2/bn_jasmine_milk_tea.png b/image/page_drink_disable_n2/bn_jasmine_milk_tea.png new file mode 100644 index 00000000..0419f855 Binary files /dev/null and b/image/page_drink_disable_n2/bn_jasmine_milk_tea.png differ diff --git a/image/page_drink_disable_n2/bn_jasmine_tea.png b/image/page_drink_disable_n2/bn_jasmine_tea.png new file mode 100644 index 00000000..e5a6244a Binary files /dev/null and b/image/page_drink_disable_n2/bn_jasmine_tea.png differ diff --git a/image/page_drink_n/bn_jasmine_milk_tea.png b/image/page_drink_n/bn_jasmine_milk_tea.png new file mode 100644 index 00000000..059633f3 Binary files /dev/null and b/image/page_drink_n/bn_jasmine_milk_tea.png differ diff --git a/image/page_drink_n/bn_jasmine_tea.png b/image/page_drink_n/bn_jasmine_tea.png new file mode 100644 index 00000000..bf4d2693 Binary files /dev/null and b/image/page_drink_n/bn_jasmine_tea.png differ diff --git a/image/page_drink_picture2_n/bn_jasmine_milk_tea.png b/image/page_drink_picture2_n/bn_jasmine_milk_tea.png new file mode 100644 index 00000000..69153720 Binary files /dev/null and b/image/page_drink_picture2_n/bn_jasmine_milk_tea.png differ diff --git a/image/page_drink_picture2_n/bn_jasmine_tea.png b/image/page_drink_picture2_n/bn_jasmine_tea.png new file mode 100644 index 00000000..03f479ad Binary files /dev/null and b/image/page_drink_picture2_n/bn_jasmine_tea.png differ diff --git a/image/page_drink_press_n/bn_jasmine_milk_tea.png b/image/page_drink_press_n/bn_jasmine_milk_tea.png new file mode 100644 index 00000000..2b4f3301 Binary files /dev/null and b/image/page_drink_press_n/bn_jasmine_milk_tea.png differ diff --git a/image/page_drink_press_n/bn_jasmine_tea.png b/image/page_drink_press_n/bn_jasmine_tea.png new file mode 100644 index 00000000..723795a0 Binary files /dev/null and b/image/page_drink_press_n/bn_jasmine_tea.png differ diff --git a/liveness/sound/face_compare_error.wav b/liveness/sound/face_compare_error.wav new file mode 100644 index 00000000..766290e4 Binary files /dev/null and b/liveness/sound/face_compare_error.wav differ diff --git a/xml/menu_catalog_default_init.lxml b/xml/menu_catalog_default_init.lxml index b34ccad0..907dd4a3 100644 --- a/xml/menu_catalog_default_init.lxml +++ b/xml/menu_catalog_default_init.lxml @@ -18,6 +18,22 @@ Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา " Var DirImage = "ROOT/taobin_project/image/page3" EndIf + + If CountryName = "Malaysia" Then + If LanguageShow = "ENG" Then + Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" + Var DirImage = "ROOT/taobin_project/image/page3_en" + Var ice_tab_text = "Ice will be ready at " + + EndIf + If LanguageShow = "MALAY" Then + Var DirImage2 = "ROOT/taobin_project/image/drink_option_myr/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" + Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา " + Var DirImage = "ROOT/taobin_project/image/page3" + EndIf + EndIf If ICE_PROCESS_STATUS = 2 Then diff --git a/xml/menu_new_layout_gen_v2.py b/xml/menu_new_layout_gen_v2.py index 1bc1c8e6..cd3038bb 100644 --- a/xml/menu_new_layout_gen_v2.py +++ b/xml/menu_new_layout_gen_v2.py @@ -12,7 +12,7 @@ idx_img = 2 - idx_hot_product_code = 6 + idx_hot_product_code = 7 idx_cold_product_code = idx_hot_product_code + 1 idx_blend_product_code = idx_cold_product_code + 1 idx_hot_product_code2 = idx_blend_product_code + 1 diff --git a/xml/page_board.xml b/xml/page_board.xml index 23cf5a76..baae1a6d 100644 --- a/xml/page_board.xml +++ b/xml/page_board.xml @@ -674,19 +674,21 @@ - Var CountDownCheckCamera = 2 - If Not#CameraSettingStatus = "" Then - DEBUGVAR CameraCount - If CameraCount = 1 Then - - Var CountDownCheckCamera = 2 - CameraSetting "usbfront" "default" "Rotate=90,Resolution=1280x720,scaleX=1.0,scaleY=0.7" - Else - Var CountDownCheckCamera = 5 - EndIf - Else - Var CountDownCheckCamera = 20 - EndIf + ;Var CountDownCheckCamera = 2 + ;If Not#CameraSettingStatus = "" Then + ; DEBUGVAR CameraCount + ; If CameraCount = 1 Then + ; + ; Var CountDownCheckCamera = 2 + ; CameraSetting "usbfront" "default" "Rotate=90,Resolution=1280x720,scaleX=1.0,scaleY=0.7" + ; Else + ; Var CountDownCheckCamera = 5 + ; EndIf + ;Else + ; Var CountDownCheckCamera = 20 + ;EndIf + + Var CountDownCheckCamera = 10 DEBUGVAR EnableLiveness DEBUGVAR LivenessLicenseFailNumber @@ -896,7 +898,7 @@ EndIf ;DEBUGVAR CountDownCheckCamera - ;DEBUGVAR Not#CameraSettingStatus + DEBUGVAR Not#CameraSettingStatus If CountDownCheckCamera = 0 Then If Not#CameraSettingStatus = "" Then diff --git a/xml/page_catalog_group_tea.xml b/xml/page_catalog_group_tea.xml index 48b9e0c0..582d828b 100644 --- a/xml/page_catalog_group_tea.xml +++ b/xml/page_catalog_group_tea.xml @@ -525,7 +525,7 @@ Var block_index_override = 0 Var block_index_move = 0 -; menu_new_list 29 +; menu_new_list 31 ; ==================> Len = 11 ; 12-02-01-0001 12-02-02-0001 12-02-03-0001 @@ -2310,8 +2310,8 @@ GINGER TEA" Var NameDrink = "THAI MILK TEA" Var NameDrinkTH = "ชานมไทย " - Var DrinkDescriptionTH = "ชาไทย และ นมอุ่น" - Var DrinkDescription = "Thai tea, Sugar, Warm milk" + Var DrinkDescriptionTH = "ชาไทย และ นม" + Var DrinkDescription = "Thai tea, Sugar, milk" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_thai_milk_tea_chatramue.png" Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $12-02-01-0039.Price @@ -2390,7 +2390,7 @@ GINGER TEA" KanitMediumTTF 0x6F5F51 showthaiText - "ชาไทย และ นมอุ่น" + "ชาไทย และ นม" 16 @@ -2411,7 +2411,7 @@ GINGER TEA" KanitMediumTTF 0x6F5F51 showengText - "Thai tea, Sugar, Warm milk" + "Thai tea, Sugar, milk" 16 @@ -5066,6 +5066,510 @@ LIMENADE" text_unavailable center-vertical-horizontal + + ; - - - + ; ==================> Len = 11 + ; 12-02-01-0045 12-02-02-0045 - + + 33 + 22 + 225 + 296 + Flag( 12-02-01-0045.Button,12-02-02-0045.Button,$Sum12020100451202020045) + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "ชามะลิ" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "ชามะลิ น้ำ " + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "JASMINE TEA" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Jasmine Tea ,Water" + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + $12-02-01-0045.Button + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + 50 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-02-01-0045.Button + StringFmt( $12-02-01-0045.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $12-02-02-0045.Button + + + 115 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-02-02-0045.Button + StringFmt( $12-02-02-0045.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + "Invisible" + + + 180 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + If $Sum12020100451202020045 = "Disable" Then + Var ice_tab_process_show = "Disable" + Else + Var ice_tab_process_show = "Enable" + EndIf + + Else + Var ice_tab_process_show = "Invisible" + EndIf + Var return = ice_tab_process_show + ) + + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" + + + 49 + 117 + + eval( + If $Sum12020100451202020045 = "Disable" Then + STRCONTAIN "ERR" $12-02-01-0045.TAG tag1_is_disable + STRCONTAIN "ERR" $12-02-02-0045.TAG tag2_is_disable + STRCONTAIN "ERR" $##-##-##-####.TAG tag3_is_disable + Var return = "Invisible" + If tag1_is_disable = "true" Then + Var return = "Enable" + EndIf + If tag2_is_disable = "true" Then + Var return = "Enable" + EndIf + If tag3_is_disable = "true" Then + Var return = "Enable" + EndIf + Else + Var return = "Invisible" + EndIf + ) + + "ROOT/taobin_project/image//img_menu_err2.png" + + + 84 + 266 + 10 + OpunMediumTTF + 0xDE794E + ice_tab_process_show + ice_show_open + + + 48 + 116 + 32 + 128 + 64 + MITRegularTTF + 0x5A5A5A + "disable-show" + $Sum12020100451202020045 + text_unavailable + center-vertical-horizontal + + + ; - - - + ; ==================> Len = 11 + ; 12-02-01-0046 12-02-02-0046 - + + 33 + 22 + 225 + 296 + Flag( 12-02-01-0046.Button,12-02-02-0046.Button,$Sum12020100461202020046) + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "ชามะลิลาเต้" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "ชามะลิ และนม" + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "JASMINE MILK TEA" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Jasmine & Milk" + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + $12-02-01-0046.Button + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + 50 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-02-01-0046.Button + StringFmt( $12-02-01-0046.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $12-02-02-0046.Button + + + 115 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-02-02-0046.Button + StringFmt( $12-02-02-0046.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + "Invisible" + + + 180 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + If $Sum12020100461202020046 = "Disable" Then + Var ice_tab_process_show = "Disable" + Else + Var ice_tab_process_show = "Enable" + EndIf + + Else + Var ice_tab_process_show = "Invisible" + EndIf + Var return = ice_tab_process_show + ) + + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" + + + 49 + 117 + + eval( + If $Sum12020100461202020046 = "Disable" Then + STRCONTAIN "ERR" $12-02-01-0046.TAG tag1_is_disable + STRCONTAIN "ERR" $12-02-02-0046.TAG tag2_is_disable + STRCONTAIN "ERR" $##-##-##-####.TAG tag3_is_disable + Var return = "Invisible" + If tag1_is_disable = "true" Then + Var return = "Enable" + EndIf + If tag2_is_disable = "true" Then + Var return = "Enable" + EndIf + If tag3_is_disable = "true" Then + Var return = "Enable" + EndIf + Else + Var return = "Invisible" + EndIf + ) + + "ROOT/taobin_project/image//img_menu_err2.png" + + + 84 + 266 + 10 + OpunMediumTTF + 0xDE794E + ice_tab_process_show + ice_show_open + + + 48 + 116 + 32 + 128 + 64 + MITRegularTTF + 0x5A5A5A + "disable-show" + $Sum12020100461202020046 + text_unavailable + center-vertical-horizontal + ; - - - ; ==================> Len = 16 diff --git a/xml/page_drinkfail3.xml b/xml/page_drinkfail3.xml index ce3ead3c..b034ff0c 100644 --- a/xml/page_drinkfail3.xml +++ b/xml/page_drinkfail3.xml @@ -34,6 +34,10 @@ Var Timeout = Timeout + 1 + DEBUGVAR Timeout + DEBUGVAR MachineStage + DEBUGVAR NextOrder + If Door_Open_flagBlink = 0 Then Var Door_Open_flagBlink = 1 Var Door_Open_State="Enable" diff --git a/xml/page_identity_verification.xml b/xml/page_identity_verification.xml index 5e9f3e79..011fa86f 100644 --- a/xml/page_identity_verification.xml +++ b/xml/page_identity_verification.xml @@ -56,7 +56,7 @@ Var LivenessResult = "" - Var CountDownDelayReadCardID = 5 + Var CountDownDelayReadCardID = 3 DEBUGVAR CameraCount ;STOPCARDID Var LivenessShowString = "" @@ -69,6 +69,11 @@ Var LivenessRestartCount = 0 Var FailTrickCount = 0 + + Var FrameOfFaceStepMoveY = 40 + + Var FrameOfFaceYPosition = 909 + Var FrameOfFaceCropImageYPosition = 230 @@ -170,7 +175,10 @@ If Adult20 = 1 Then - LivenessCommand "start" + LivenessCommand "SetY" 210 + + LivenessCommand "start" 0 + Var load_gif_stage = "Invisible" Var IDcardStageText = "Invisible" Var IDcardStage = "Invisible" @@ -225,7 +233,7 @@ Var LivenessShowString = "Pass " Var load_gif_stage = "Enable" - CROP_IMAGE "/mnt/sdcard/camera1_alter.jpg" 170 230 380 500 "/mnt/sdcard/camera1.jpg" + CROP_IMAGE "/mnt/sdcard/camera1_alter.jpg" 170 FrameOfFaceCropImageYPosition 380 500 "/mnt/sdcard/camera1.jpg" Open "ROOT/taobin_project/xml/page_face_compare.xml" EndIff @@ -234,7 +242,7 @@ Var LivenessRestartCount = LivenessRestartCount + 1 If LivenessRestartCount = 2 Then Var LivenessRestartCount = 0 - LivenessCommand "start" + LivenessCommand "start" 0 Var LivenessResult = "-" EndIf EndIf @@ -249,6 +257,9 @@ EndIf EndIf + DEBUGVAR LivenessFramePositionX + DEBUGVAR LivenessFramePositionY + Refresh TimerReset @@ -311,6 +322,91 @@ +; arrow up + + +; arrow down + + + +; arrow up + + +; arrow down + + @@ -332,18 +428,18 @@ 423 - 909 + FrameOfFaceYPosition CameraStage "ROOT/taobin_project/image/liveness/bg3.png" -; -; 249 -; 751 -; IDcardStage -; "ROOT/taobin_project/image/liveness/bg1.png" -; + + 196 + 737 + IDcardStage + "ROOT/taobin_project/image/liveness/bg_21.png" + 0