From 9a97bb24be344f4291c909f8edfbc2fd94d111e8 Mon Sep 17 00:00:00 2001 From: kong Date: Tue, 4 Apr 2023 20:06:37 +0700 Subject: [PATCH 1/8] DO --- xml/page_board.xml | 25 ++++++++++++++++++++++++- xml/page_face_compare.xml | 2 +- xml/vending_info.xml | 5 +---- xml_main/startup.xml | 4 ++-- 4 files changed, 28 insertions(+), 8 deletions(-) diff --git a/xml/page_board.xml b/xml/page_board.xml index 320ef470..0a1962ab 100644 --- a/xml/page_board.xml +++ b/xml/page_board.xml @@ -207,7 +207,8 @@ If TaobinOnlineX = "true" Then Var EventTurnOn = 0 - Var CountDownShowButton = 35 + ; CountDownShowButton must value 35 + Var CountDownShowButton = 35 Var ShowButtonClickFull = "Invisible" If LanguageInit = "ENG" Then @@ -312,6 +313,7 @@ Else Machine Initial Var StartUpExt = "false" + Var CameraSettingStatus = "" ;DEBUGVAR "FlushTxRef1" ;FlushTxRef1 @@ -821,6 +823,9 @@ DEBUGVAR SoundThaiIndex + + Var CountDownCheckCamera = 0 + RootLayoutVisible 3 "hide" @@ -908,6 +913,8 @@ Var CountDownShowButton = CountDownShowButton - 1 EndIf + + ;SAVELOG MachineStage ;SAVELOG CountDownShowButton ;SAVELOG ShowButtonClickFull @@ -930,6 +937,8 @@ If CountDownPauseVideo > 0 Then ; ignore Var CountDownPauseVideo = CountDownPauseVideo - 1 + + If CountDownPauseVideo = 0 Then Var NextPage = "ROOT/taobin_project/xml/page_back_to_main.xml" @@ -1006,6 +1015,20 @@ EndIf EndIf + ;DEBUGVAR CountDownCheckCamera + DEBUGVAR Not#CameraSettingStatus + If CountDownCheckCamera = 0 Then + Var CountDownCheckCamera = 5 + If Not#CameraSettingStatus = "" Then + If CameraCount = 1 Then + + CameraSetting "usbfront" "default" "Rotate=90,Resolution=1280x720,scaleX=1.0,scaleY=1.0" + EndIf + EndIf + Else + Var CountDownCheckCamera = CountDownCheckCamera - 1 + EndIf + Refresh diff --git a/xml/page_face_compare.xml b/xml/page_face_compare.xml index 22553e99..8c602cad 100644 --- a/xml/page_face_compare.xml +++ b/xml/page_face_compare.xml @@ -20,7 +20,7 @@ SAVELOG "EventActionOk" Var AdultFlag = 0 CoinVending XBILL - Open "ROOT/taobin_project/xml/page_payment_cash.xml" + Open "ROOT/taobin_project/xml/page_catalog2.xml" diff --git a/xml/vending_info.xml b/xml/vending_info.xml index a2c643f0..80c56d07 100644 --- a/xml/vending_info.xml +++ b/xml/vending_info.xml @@ -570,10 +570,7 @@ info_10Y "ROOT/taobin_project/image/tab_1.png" - 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" diff --git a/xml_main/startup.xml b/xml_main/startup.xml index e04d9309..0468e2a2 100644 --- a/xml_main/startup.xml +++ b/xml_main/startup.xml @@ -108,8 +108,8 @@ Var RandomPromotionMyworld = 0 Var RandomSalePackage = 0 - Var XMLPageVersion = "7.07" - Var XMLPageVersionInt = 707 + Var XMLPageVersion = "7.09" + Var XMLPageVersionInt = 709 From d3014f44fc12ad15f0b571889749630c1e9a7565 Mon Sep 17 00:00:00 2001 From: worawut Date: Wed, 5 Apr 2023 10:37:29 +0700 Subject: [PATCH 2/8] spiral makedrink --- spiral/product.json | 6 +- spiral/xml/page_catalog_vending_machine.xml | 319 +++++++++++++++++++- spiral/xml/page_spiral_select.xml | 6 +- 3 files changed, 321 insertions(+), 10 deletions(-) diff --git a/spiral/product.json b/spiral/product.json index f667203b..45f171a3 100644 --- a/spiral/product.json +++ b/spiral/product.json @@ -228,7 +228,7 @@ "id": 15, "code": "03-02-01-0013", "name": "บลูเบอรี่ พายป๊อปคอร์น", - "nameE": "Blueberry Pie Popcorn", + "nameE": "Blueberry Pie\nPopcorn", "desc": "TAO BIN SNACK STATION", "descE": "TAO BIN SNACK STATION", "image": "03-02-01-0013.png", @@ -243,8 +243,8 @@ { "id": 16, "code": "03-02-01-0014", - "name": "สตรอเบอร์รี่ ซันเดย์ป๊อปคอร์น", - "nameE": "Strawberry Sundea Popcorn", + "name": "สตรอเบอร์รี่ ซันเดย์\nป๊อปคอร์น", + "nameE": "Strawberry Sundea\nPopcorn", "desc": "TAO BIN SNACK STATION", "descE": "TAO BIN SNACK STATION", "image": "03-02-01-0014.png", diff --git a/spiral/xml/page_catalog_vending_machine.xml b/spiral/xml/page_catalog_vending_machine.xml index a8f4b512..944608ce 100644 --- a/spiral/xml/page_catalog_vending_machine.xml +++ b/spiral/xml/page_catalog_vending_machine.xml @@ -2640,6 +2640,320 @@ +; button i=1 03-02-01-0013 + + 33 + 22 + 225 + 296 + $03-02-01-0013.Button + + + + 49 + 117 + + eval( + If $03-02-01-0013.Button = "Disable" Then + Var return = "Enable" + + Else + Var return = "Invisible" + EndIf + ) + + "ROOT/taobin_project/image//img_menu_err2.png" + + + + 48 + 116 + 32 + 128 + 64 + MITRegularTTF + 0x5A5A5A + "disable-show" + $03-02-01-0013.Button + text_unavailable + center-vertical-horizontal + + + + + + 10 + 251 + ShowPrice + 67 + 62 + ImageShowPrice + + + + 57 + 260 + ShowPrice + "Hurr" + 150 + 17 + KanitMediumTTF + ColorBrown2 + $03-02-01-0013.Price + + + + 45 + 260 + ShowPrice + 20 + 17 + KanitMediumTTF + ColorBrown2 + "฿"" + + + + + + 16 + 180 + 22 + 220 + "multi2" + KanitMediumTTF + ColorBlack1 + showthaiText + $03-02-01-0013.Name + + + + 16 + 240 + 14 + 220 + KanitMediumTTF + ColorBrown + showthaiText + $03-02-01-0013.description + + + + 16 + 180 + 22 + 220 + "multi2" + KanitMediumTTF + ColorBlack1 + showengText + $03-02-01-0013.NameE + + + + 16 + 240 + 14 + 220 + KanitMediumTTF + ColorBrown + showengText + $03-02-01-0013.descriptionE + + + + + +; button i=1 03-02-01-0014 + + 33 + 22 + 225 + 296 + $03-02-01-0014.Button + + + + + 49 + 117 + + eval( + If $03-02-01-0014.Button = "Disable" Then + Var return = "Enable" + + Else + Var return = "Invisible" + EndIf + ) + + "ROOT/taobin_project/image//img_menu_err2.png" + + + + + 48 + 116 + 32 + 128 + 64 + MITRegularTTF + 0x5A5A5A + "disable-show" + $03-02-01-0014.Button + text_unavailable + center-vertical-horizontal + + + + 10 + 251 + ShowPrice + 67 + 62 + ImageShowPrice + + + + 57 + 260 + ShowPrice + "Hurr" + 150 + 17 + KanitMediumTTF + ColorBrown2 + $03-02-01-0014.Price + + + + 45 + 260 + ShowPrice + 20 + 17 + KanitMediumTTF + ColorBrown2 + "฿"" + + + + + + 16 + 180 + 22 + 220 + "multi2" + KanitMediumTTF + ColorBlack1 + showthaiText + $03-02-01-0014.Name + + + + 16 + 240 + 14 + 220 + KanitMediumTTF + ColorBrown + showthaiText + $03-02-01-0014.description + + + + 16 + 180 + 22 + 220 + "multi2" + KanitMediumTTF + ColorBlack1 + showengText + $03-02-01-0014.NameE + + + + 16 + 240 + 14 + 220 + KanitMediumTTF + ColorBrown + showengText + $03-02-01-0014.descriptionE + + + + + ; button i=1 01-00-00-0015 33 @@ -2651,7 +2965,7 @@ $01-00-00-0015.Button Var( "ROOT/taobin_project/spiral/image/page_spiral/" + $01-00-00-0015.image ) Var( "ROOT/taobin_project/spiral/image/page_spiral_press/" + $01-00-00-0015.image ) " - ; Var( "ROOT/taobin_project/spiral/image/page_spiral_disable/" + $01-00-00-0015.image ) " + ; Var( "ROOT/taobin_project/spiral/image/page_spiral_press/" + $01-00-00-0015.image ) " "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -2765,9 +3079,6 @@ - - - ; Cart + + + 49 + 117 + + eval( + If $03-02-01-0013.Button = "Disable" Then + Var return = "Enable" + + Else + Var return = "Invisible" + EndIf + ) + + "ROOT/taobin_project/image//img_menu_err2.png" + + + + 48 + 116 + 32 + 128 + 64 + MITRegularTTF + 0x5A5A5A + "disable-show" + $03-02-01-0013.Button + text_unavailable + center-vertical-horizontal + + + + + + 10 + 251 + ShowPrice + 67 + 62 + ImageShowPrice + + + + 57 + 260 + ShowPrice + "Hurr" + 150 + 17 + KanitMediumTTF + ColorBrown2 + $03-02-01-0013.Price + + + + 45 + 260 + ShowPrice + 20 + 17 + KanitMediumTTF + ColorBrown2 + "฿"" + + + + + + 16 + 180 + 22 + 220 + "multi2" + KanitMediumTTF + ColorBlack1 + showthaiText + $03-02-01-0013.Name + + + + 16 + 240 + 14 + 220 + KanitMediumTTF + ColorBrown + showthaiText + $03-02-01-0013.description + + + + 16 + 180 + 22 + 220 + "multi2" + KanitMediumTTF + ColorBlack1 + showengText + $03-02-01-0013.NameE + + + + 16 + 240 + 14 + 220 + KanitMediumTTF + ColorBrown + showengText + $03-02-01-0013.descriptionE + + + + + +; button i=1 03-02-01-0014 + + 33 + 22 + 225 + 296 + $03-02-01-0014.Button + + + + + 49 + 117 + + eval( + If $03-02-01-0014.Button = "Disable" Then + Var return = "Enable" + + Else + Var return = "Invisible" + EndIf + ) + + "ROOT/taobin_project/image//img_menu_err2.png" + + + + + 48 + 116 + 32 + 128 + 64 + MITRegularTTF + 0x5A5A5A + "disable-show" + $03-02-01-0014.Button + text_unavailable + center-vertical-horizontal + + + + 10 + 251 + ShowPrice + 67 + 62 + ImageShowPrice + + + + 57 + 260 + ShowPrice + "Hurr" + 150 + 17 + KanitMediumTTF + ColorBrown2 + $03-02-01-0014.Price + + + + 45 + 260 + ShowPrice + 20 + 17 + KanitMediumTTF + ColorBrown2 + "฿"" + + + + + + 16 + 180 + 22 + 220 + "multi2" + KanitMediumTTF + ColorBlack1 + showthaiText + $03-02-01-0014.Name + + + + 16 + 240 + 14 + 220 + KanitMediumTTF + ColorBrown + showthaiText + $03-02-01-0014.description + + + + 16 + 180 + 22 + 220 + "multi2" + KanitMediumTTF + ColorBlack1 + showengText + $03-02-01-0014.NameE + + + + 16 + 240 + 14 + 220 + KanitMediumTTF + ColorBrown + showengText + $03-02-01-0014.descriptionE + + + + + ; button i=1 03-02-01-0010 33 @@ -2640,319 +2955,6 @@ -; button i=1 03-02-01-0013 - - 33 - 22 - 225 - 296 - $03-02-01-0013.Button - - - - 49 - 117 - - eval( - If $03-02-01-0013.Button = "Disable" Then - Var return = "Enable" - - Else - Var return = "Invisible" - EndIf - ) - - "ROOT/taobin_project/image//img_menu_err2.png" - - - - 48 - 116 - 32 - 128 - 64 - MITRegularTTF - 0x5A5A5A - "disable-show" - $03-02-01-0013.Button - text_unavailable - center-vertical-horizontal - - - - - - 10 - 251 - ShowPrice - 67 - 62 - ImageShowPrice - - - - 57 - 260 - ShowPrice - "Hurr" - 150 - 17 - KanitMediumTTF - ColorBrown2 - $03-02-01-0013.Price - - - - 45 - 260 - ShowPrice - 20 - 17 - KanitMediumTTF - ColorBrown2 - "฿"" - - - - - - 16 - 180 - 22 - 220 - "multi2" - KanitMediumTTF - ColorBlack1 - showthaiText - $03-02-01-0013.Name - - - - 16 - 240 - 14 - 220 - KanitMediumTTF - ColorBrown - showthaiText - $03-02-01-0013.description - - - - 16 - 180 - 22 - 220 - "multi2" - KanitMediumTTF - ColorBlack1 - showengText - $03-02-01-0013.NameE - - - - 16 - 240 - 14 - 220 - KanitMediumTTF - ColorBrown - showengText - $03-02-01-0013.descriptionE - - - - - -; button i=1 03-02-01-0014 - - 33 - 22 - 225 - 296 - $03-02-01-0014.Button - - - - - 49 - 117 - - eval( - If $03-02-01-0014.Button = "Disable" Then - Var return = "Enable" - - Else - Var return = "Invisible" - EndIf - ) - - "ROOT/taobin_project/image//img_menu_err2.png" - - - - - 48 - 116 - 32 - 128 - 64 - MITRegularTTF - 0x5A5A5A - "disable-show" - $03-02-01-0014.Button - text_unavailable - center-vertical-horizontal - - - - 10 - 251 - ShowPrice - 67 - 62 - ImageShowPrice - - - - 57 - 260 - ShowPrice - "Hurr" - 150 - 17 - KanitMediumTTF - ColorBrown2 - $03-02-01-0014.Price - - - - 45 - 260 - ShowPrice - 20 - 17 - KanitMediumTTF - ColorBrown2 - "฿"" - - - - - - 16 - 180 - 22 - 220 - "multi2" - KanitMediumTTF - ColorBlack1 - showthaiText - $03-02-01-0014.Name - - - - 16 - 240 - 14 - 220 - KanitMediumTTF - ColorBrown - showthaiText - $03-02-01-0014.description - - - - 16 - 180 - 22 - 220 - "multi2" - KanitMediumTTF - ColorBlack1 - showengText - $03-02-01-0014.NameE - - - - 16 - 240 - 14 - 220 - KanitMediumTTF - ColorBrown - showengText - $03-02-01-0014.descriptionE - - - - ; button i=1 01-00-00-0015 From 542ba1a3e44f9b95f6741d4b7a093184e544e03a Mon Sep 17 00:00:00 2001 From: kong Date: Wed, 5 Apr 2023 17:02:34 +0700 Subject: [PATCH 5/8] DO --- xml/page_identity_verification.xml | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/xml/page_identity_verification.xml b/xml/page_identity_verification.xml index ccf82b25..b1082fac 100644 --- a/xml/page_identity_verification.xml +++ b/xml/page_identity_verification.xml @@ -29,8 +29,6 @@ INT sdateday INT sdatemonth INT sdateyear - READCARDID - Var AdultState = "Enable" Var AdultState1 = "Enable" @@ -54,9 +52,14 @@ EndIf + Var IDBirthdate = "" + + Var CountDownDelayReadCardID = 5 DEBUGVAR CameraCount + STOPCARDID + @@ -72,6 +75,7 @@ DEBUGVAR IDCardReady DEBUGVAR IDCardData DEBUGVAR IDBirthdate + DEBUGVAR IDFullNameEng If AdultFlag2 = 1 Then @@ -201,14 +205,14 @@ Var CountDownDelayReadCardID = CountDownDelayReadCardID - 1 If CountDownDelayReadCardID = 0 Then READCARDID - Var CountDownDelayReadCardID = 10 + Var CountDownDelayReadCardID = 600 EndIf EndIf DEBUGVAR Timeout Var Timeout = Timeout + 1 - If Timeout > 30 Then + If Timeout > 120 Then Open "ROOT/taobin_project/xml/page_catalog2.xml" EndIf @@ -320,7 +324,7 @@ - + SAVELOG "EventIDCard" DEBUGVAR IDCardStatus DEBUGVAR IDCardReady DEBUGVAR IDCardData From a8252aef379142de81e5d304af01140761fa8a8f Mon Sep 17 00:00:00 2001 From: kong Date: Fri, 7 Apr 2023 22:23:15 +0700 Subject: [PATCH 6/8] DO DO --- xml/page_board.xml | 2 +- xml/page_identity_verification.xml | 13 ++++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/xml/page_board.xml b/xml/page_board.xml index 0a1962ab..a4c9abaf 100644 --- a/xml/page_board.xml +++ b/xml/page_board.xml @@ -1022,7 +1022,7 @@ If Not#CameraSettingStatus = "" Then If CameraCount = 1 Then - CameraSetting "usbfront" "default" "Rotate=90,Resolution=1280x720,scaleX=1.0,scaleY=1.0" + CameraSetting "usbfront" "default" "Rotate=90,Resolution=1280x720,scaleX=1.0,scaleY=0.7" EndIf EndIf Else diff --git a/xml/page_identity_verification.xml b/xml/page_identity_verification.xml index b1082fac..de56a7ce 100644 --- a/xml/page_identity_verification.xml +++ b/xml/page_identity_verification.xml @@ -58,7 +58,7 @@ Var CountDownDelayReadCardID = 5 DEBUGVAR CameraCount - STOPCARDID + ;STOPCARDID @@ -199,6 +199,7 @@ DEBUGVAR IDBirthdate DEBUGVAR CountDownDelayReadCardID DEBUGVAR ShutterResult + DEBUGVAR IDCardState If IDBirthdate = "" Then @@ -308,11 +309,11 @@ - 0 - 381 + 140 + 1053 "usbfront" - 700 - 394 + 800 + 800 @@ -324,10 +325,12 @@ + ; SAVELOG "EventIDCard" DEBUGVAR IDCardStatus DEBUGVAR IDCardReady DEBUGVAR IDCardData DEBUGVAR IDBirthdate + DEBUGVAR IDCardState From 58c62b415a25eb685cdca3b4b73c42479e9e54a8 Mon Sep 17 00:00:00 2001 From: kong Date: Sun, 16 Apr 2023 22:14:50 +0700 Subject: [PATCH 7/8] DO live ness --- animation01/sync_1.file | 7 +- image/liveness/bg1.png | Bin 0 -> 4077 bytes image/liveness/bg2.png | Bin 0 -> 1374 bytes image/liveness/bn_cancel.png | Bin 0 -> 4945 bytes image/topping2/bn_price5baht.png | Bin 0 -> 4443 bytes image/topping2/bp_price5baht.png | Bin 0 -> 4457 bytes xml/android_info.xml | 1 + xml/page_board.xml | 3 +- xml/page_catalog2.xml | 3 + xml/page_face_compare.xml | 151 ++++++------- xml/page_identity_verification.xml | 329 ++++++++++++++++------------- xml/page_topping_select6.xml | 261 +++++++++++++++++++++++ xml/vending_info.xml | 13 ++ 13 files changed, 532 insertions(+), 236 deletions(-) create mode 100644 image/liveness/bg1.png create mode 100644 image/liveness/bg2.png create mode 100644 image/liveness/bn_cancel.png create mode 100644 image/topping2/bn_price5baht.png create mode 100644 image/topping2/bp_price5baht.png diff --git a/animation01/sync_1.file b/animation01/sync_1.file index bfb3fdb5..2fdcebb3 100644 --- a/animation01/sync_1.file +++ b/animation01/sync_1.file @@ -1,4 +1,4 @@ -total 215140 +total 215180 -rw-rw---- 1 root sdcard_rw 948282 2020-11-15 19:54 TaoBin2_draft02_art1.mp4 -rw-rw---- 1 root sdcard_rw 3603060 2020-11-15 20:03 TaoBin2_draft02_art10.mp4 -rw-rw---- 1 root sdcard_rw 3166935 2020-11-15 20:03 TaoBin2_draft02_art11.mp4 @@ -51,6 +51,7 @@ total 215140 -rw-rw---- 1 root sdcard_rw 3740266 2020-11-15 19:57 TaoBin2_draft02_art7.mp4 -rw-rw---- 1 root sdcard_rw 3998856 2020-11-15 20:01 TaoBin2_draft02_art8.mp4 -rw-rw---- 1 root sdcard_rw 3616423 2020-11-15 20:01 TaoBin2_draft02_art9.mp4 --rw-rw---- 1 root sdcard_rw 34133 2023-01-23 14:18 play_list.tsv +-rw-rw---- 1 root sdcard_rw 36315 2023-03-29 10:40 play_list.tsv -rw-rw---- 1 root sdcard_rw 33618 2023-01-04 13:56 play_list2.tsv --rw-rw---- 1 root sdcard_rw 0 2023-01-23 16:07 sync_1.file +-rw-rw---- 1 root sdcard_rw 35221 2023-03-17 10:42 play_list_.tsv +-rw-rw---- 1 root sdcard_rw 0 2023-04-12 14:42 sync_1.file diff --git a/image/liveness/bg1.png b/image/liveness/bg1.png new file mode 100644 index 0000000000000000000000000000000000000000..0ec224bd63c2fd9f01e01cdfa75419dd05a0d412 GIT binary patch literal 4077 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 bH37Q{gTfgM$A4oSW(007Ue1lAh#&t2bORLV literal 0 HcmV?d00001 diff --git a/image/liveness/bn_cancel.png b/image/liveness/bn_cancel.png new file mode 100644 index 0000000000000000000000000000000000000000..dbf9e145dd837f0225b88f0bb56642c11b8e7295 GIT binary patch literal 4945 zcmV-X6RzxuP)*C`^hE`go4x{7Diy8DmneN{MEn2&sR}VoQ4`9; zrb;D*iuh_#1xTfUR0N0^5-JESI6+i^P~#v0ArE2wWIKs>djI3O&gA;e%$?nt^?3IG zlP2rfyE|X^{^#6t&pB6$f-yQWGO%pf@j)S~Ltdq_N(wRH2{9DB4v4vp5JFsODE(+C z{g}|N!fPJ(n%?-<2X~K&f+58s0}-y)P7cXx^~dVJ!)hB6gb>m>#?&_M&CdR#2qL{G zqO66uQmtD4~3;Q{tSfD8n+YdETRfVoV4r z0i6)%TtwNApg5zsS-B}j1tEl#kNU|OCC>GFLu5=D&dA%t`fnOe=6h_WA5;dy&JAqE8@gmf8*)KI?W z^;!6uE22%dZyDLBCiC8-AQM8m73d#y5PB%uq%EKF{afzXrXCRwsULdw_JCcQCHl#x2k#1KLVX%9caWUdrNEV1s3`|ldL#jE(GHwhtKNZ6-*{Y|%tv%Yq& z|MTJhed2F6K8^VsQQ|D+`mHFpU zGs?dlQNSqDeL=ScA*2ArB_q?G5`qA_Z=H!DF-bVd_Gx{Lk$TCTA}ECfsCtv7$az*44_Ob8*J!8Yl)z*44_ zObF3na2#5Ri-S-NTIRn*RF(d-t^1S<^BC9tG(slIE;^|t>;Jq&l(mRz*GB3)? zN*)%Z>)-*Hw_Dx=Ily7`tSSV%P&3?S&-HDkk0V(3)!t% zF~!vCcA0l!%=wh7m5qXQC5S!!RFG~2>CmJ=cunZ=nD4%jLaq{o5JDCWrNisyUKPK) zdvjMs!mT*x+|zuiM?U|oBcWV=!2R;&3;ei~UmYt{HdNGcPOEG5<>%SEC=h1Vqx_rZ z{_?sndEEycUf6Ghnq_$&W)epp`$)p#qn0K$mELvhy{A(UoaWwbe)n4-;J5VS9BF6~QSt8T0|w``dhtjUTT5+w(X z?#drs9orZn+IM{@KD2s{XMB3hOVO4%6-85^!cI9Kt!X&`3m)SyeI8>xW;qi7_e|@ zzvDd)A3GipHp8JOoB*Q4()N(T=keKg1rgta+8JpHU#r7Gy^YBNjU@AAR?H67JShjA zmb6}?;KpW^9N|LRj${L$MQ2Cn(FI_N2#)irYp?S&z2Zbhi=(T6#qDpC8X3U4OL`Ev zJcwQPr|)H!Niq65#C<0$VQ&FabTa=w_cs0Kc=7yItGT5uVfgylmw1Vr%Q)dkcb;P;~Gb; z%ZBs2F;r?SMbd*H+@=89Ra8;< zq-%zAj63%5{n72Wl?RY^Ihdb~yI*Hp+%&EsaZ&9n?)u~50gL<3yZ%smi&^P$f6Xg# zd@}rGX5&I*c;<;mB0F@e_(SsuLB_t`QN#QR^=k9GX`d%Ls(HK^?!%RFG$$(o#|CkL z6@ob9xQQ+t8^jKRVO}c?lbxz@ttebJ-o!yHee0g&K>7qUNeZ%e)UkmIYdo_;g}(q z_}*TJ#1QNoeF5JGHjlB2TbQUx=rB0H!zosh)?(Ukv9iOi z0&T%!!fy52g%6jg{ox^>rhVa9kj#V)``KWO7PP;-%#(jgj|VDcwv=tdp`#tlI(z=v zbQ2WX8Zue=jpP-CJ4sZ>hsY#>jtU`4^8k#Rg7^^yluI! z{Sht)+sGoTkrEz;c+g=x5KLg&Mk2Z$LIe@vgAMLE^VlHXFX!N1!~Wl}_}s5(b6%q8 zK#!5p*H!7&Jsr&Vzx|H8P8+_tJmC+j;i)+>x#DZBi$PxCe9R%H%j71`1(S70lsJF< z!TZi(b-0G+{#->8L-UEiO>;PK)gkmh5m6{@qxMuT#aXi8el7&Cj%;1Do zZqB>xbqw3X!!pl_Xt?~$$e9(vTtkUtnFng3#Mo*vpkqM{I)xr`0W_rNRU?kuKPL8U zoflSrkrGU%+vpViK>~!1jfDX0PKd3ZJht%MT_3Q%&tC0I?+@4a2{o*avp(~<)|lY3 zO{kgsg74KVsfqYv7gtysY!iz3{;-7_7omZ6jU}O6Ln70HHir20uqBV<>0iD)w>g#~ zP!T2Opk-17zN#xM6Kd_E6H3saqby={NSCT?Wh(9hYwB6$KEP{K!6KJ?VS5PJt|dA# z?t`90wBcvoIV3Q&a-3`zk`5noJn z!U5b1x}(O4kZak;$sqLXqaZ^JR*x;ZAuG(uE)36c|CiD_a()|9LTK}!h7)P0+ zCqcYy{QI()1k^)1Q;?AWvOg!^TdSl=6K)q=e^ZddA#YiuW1Pdp#i$n%2q45ZDpp&g z&lMYlIjO#eEyLAy!frYkUAjzIy26DPP60ixd7iSAOPps7s{p<;+i=-*Uu1!{8p5EX zbh99XHJ0RwyaXB8&h3qu81EOgN<`&HTrFH2QDGDij zyvdrfk{hC=*iw8UkhUzUtguaNOcl(3X`3yFK<1UgY7>sUi_6$1Sj!Sd6`sh{0&N-t zMNLb7CnhS!hAq-$y2MLQ!BVbNnw4=;QZBTltLAOB+ExfYUa&@Fo7Bs)3Ytl8ABU%T zp-WrZ#MkCZTWa(VEN)hAr;(mFfjH&Tin48}mUgIQ6R@Js+$UkPKDwn|ZCTMp;Z5>L z(eLCc*tXRDBPC88@ha8v%83(VLX?y&d}THPTk1ZonGz5Gx*1!$>~*N<)}Ny6C*EtD zAIPIm*nH-PBdYP0g{?d4W0lc*y`dZ#rL>l94ds%AddFd+Cd4|Krrioj9n5xJ&N^pl zB)O1iY?*Gh5s=N&M69|CQE}f{qZb%3DftTAWBA8Uv-YG{taz=Au&pzuO9Cck1>q@e zE2HUWrxi$)Z33Ir!EC9kS6!2QO-N@z+xy8)w?)>Xwt-}j3mk{~HepLDKY#~4;+t*J zMepo$mk*Z=*SNk{W>H2Y9A4+rtYzgn;dz@y$DIWBQOgnewH{Io+jX{7k;Xfv0b-f7>UY|e!A;Pg@cFn=V-~UK;p&U!=9CM0zDitE%3ad)Hi{CG zHdR%FA^-cT@f~n1^s*RC2jv!VUb@PgE4Uu;k8jAi{31yQ#0&{eC>E9GzUZ(xR|7=X zvDV2aN&C`n6j!U&UsF&W3tSTLcc*EedU1%jH3`dv=QSVGKhIaa7#$fIsP%Y zWMTR0ec*h0`c9owH@7z>!V|yQx$C^p|4*@f%N?Uq%58!WLP$qYBK(*VB>FZ}=0M0s>aeL|FU!jBL_iUzFYKzHX^utuL}s5T*lkbF2{(c1;0 z9K_0v2|@@VxnZ-Cfpsz#)$~8MAi1ov3+kf)~{V76~lrMLP(}~LhjnO zv;H^R-zrfbnmt~rBYsX0LI}wW=<4i@7>)XSq$nfxx=A+%A%tYgtZd%rmrRbJ8u#Hn z``(&ZfBBj-rI42jLI@#k0k_4yJO8*N?mZQe!0b$Alx_?{2x*Tbw}mEAlwoG8S;F<| z$I`BPO$Z@5PUQn9MEZFz_{3o6S)v<;{W+LY6*bSeYpc-*FVVin4~{ObA)xj0K@?V!!jRe~9Ugpf|+iE&SQuM1guZn1!n P00000NkvXXu0mjf(&&CA literal 0 HcmV?d00001 diff --git a/image/topping2/bn_price5baht.png b/image/topping2/bn_price5baht.png new file mode 100644 index 0000000000000000000000000000000000000000..905445617a26d0fd9616a25916b956392d08afbc GIT binary patch literal 4443 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 literal 0 HcmV?d00001 diff --git a/image/topping2/bp_price5baht.png b/image/topping2/bp_price5baht.png new file mode 100644 index 0000000000000000000000000000000000000000..850a4fc437a4a543e641faad572ef30314d325f9 GIT binary patch literal 4457 zcmV-v5tin1f;2d(pX#Z zfro}a4<<#EvTBR=g&iYUG$sxWR7{&NV$*^?bPZr)fVn;2yK{EWp1pJb%-lPFzn^4x z{_O0Xd(S=Rdw=J9e&<{zZNSLNB?Xx^Ye+m*$SJkR^Q0j70jl~)2qEb+uC-=d>r7ec z=N0jeiSkNv`Eq&mgMXBy#VBb3BSQoIaARQ5GftTPwrk-?j^bRj|d@z^Z;22b)Tfjy1|>b zNly0arvpL=A-%(Z%E==)UOP`dJ$?2)Nr_YNsT(+x+^ zKN`IG=Q?WsqkdWtLI~+~l=SOpdgGFX^S(X##o43M01XNBx>Yx8uUT!^Pp=R{2qA_m zlu~y#YI)RUaUiEzUGgoBAt8hi5=PO>tF@!W(zqlfu|U&rCWMg0l)Ot?q!aqmi3Hjg z=RR+Y>thf?NJ8ouJd7>SRa;|B7&#L{NWGM_-7y^3?#M|@s-82&nGiziXP~O3v51w$ z;ZHyjwNVHmgfvRw#zph`KRtc+uTdY26lml*d!k+tLI@!#p;j(gIPdGIJn2vmx|*@^ ziEtGOuP%8x&_k2+4x}YRYm=YFZq=@2nJ8q$7lo?6_vhwe!@; z(`So8e+;xZs@BFSA%qZ;H8rh{V2h*A+a`n%LYhH8*3b|7!;A=;(K8{0G#^jY@aW-E z(SC1c1kLD~5JH-cl9}2&ErMqBOb8*Z!;PY+N6?I(2_d9q9(ec(|A!EgJr%h$oEJ~=MzB53 zcduC>olIB{AdD~n`yWZlOS|_^`>w|xSTEn4KNq@RO9yW8AOHNuYZ8aW*WVz8>u#8F zUQYe%Gb!tzdiI-iAURdYYqw*Wke=pv>Eno-pVj8eGp!d3h}o}R`9q@rLH5Z{?^>1U ze^#s-_Qlii(fec5#Q9eJ_Zyer;tT6y2<-eRfkin*3H0iF@ArS~{|n;OKR@%gHTKS1 zLb{inQj7A6x3ubc(9nCWvDb59fk4|Fa>@+ix>O5vQXt3=J+(t_iuu2|NNjm}hZOYV zo>zV&q&x9EDdh1>)fqhz(hj&*KpYF;tAsWIEQ&ksx@Yn=B5*{|jRG5FhmQV(Y$kk% zITnbxYvcS-Ul8!#tIur}(uF83&{~|kE`l~59wLmnx&mJv;N_k8+a`AhsPqfi-v`W%YcZkRur4$vo@=%4cM@M&#s!Eg#f@Sg;3zRdu&FK zP-bxiFzOs&dpHLut42LlSGdA_;d*hS=OA&$aa=e*=AR$f5QuW4Sif=e3~`2if#@7{ z$p+CmMA_aKTr{vR^;|55_5a%6{kHzzIOP^ruh2eV?|fhHqkG=to^#(yy6%R+?W320 zZDYUf$x=z`W+$Q64leVgOTY=+^~S;214h0t`1)(H25%r*o3=dR`;1Yb!eG0hf~YGP z_SJA)SKO@+KiKeRZ7`9<_A}S53LX!Jf19Lh4)NHnyVgOC8N!T+Fv*}Dj_1|qx7OXb z)^FN8EeoaAaW;ZmM$hQ-huDPir}s;f&r#Pl-+TA8zvJBC9ND1G?BBgBbh{5};kTpt zxb?xsJ*Lg~-5u*3)T&oW&OMH?R{PkZ?VjPgr;hI@daU4kdfWHu^BiUap^UNJZnEpT zD!&dDBZ)9T_>eY+1|Ei~cyYwp><0t`q8c^e(+*snFpC4?fW|#LpsZ)lO`cJKMu+T( z6|35FR-)g#u!I3Z5GBrWK##@72uu|4oiA7yN0eVZ-gnw0IrnHEn_{MH{!9l(Xn#>2 zJ=!yRE$vViX_1#M1W|zL?%0DtW}?N4Y8T0X%7RRWphkz!|Khoqr+prc15pb;ZyE~z z?lu&>hryqEqMJ0BlVC!L>3*WTCc5fV0uXd;xM-ofT`LN*&w;;QM|FGV9H0wpZx8RI zaXqf>iKLOVeQvVIDshE04RHo`6b#~sGeB969ehhx-#2A@-K6(1t^H~gv<;IEXwEz8 zi`(u{e~LQVJ>^(AE_O7HZNtvMc2Q@r-C?I3QIFi-N~h9Q0&P;KE=2ff=$^aXL_80w z;OJJ_l?p!di%&foCaPj-p_t?13Z#i-5uw=*7;q zT0z*kAA3i9+s{7V0BgBK)ji?<^3$<>T>RVRg4GCJWpUV%S`==2 zQc(9AB4>*@D#z9>4~9l*xVrCjM%CRbd^5m6rcF7d5yWXA0K#NfdK1CeBsm8t$HzCV zpV3{PozNng>wF&P&HkCwz|?d<+P99;3;;HYYsdK+8wsL+_k0%GK%k?}eUOC{=fZ+| zhl_Tt^6>}F4^9t&>_Ns(rYkLuIG7YB;}HjWXP5$QgUS_0eC#e5Frt%IW&!p&O!V%933Qi;5P z84QU71aN1Ku3;L~GsW5kjcdL28Y0_xhVe{rJ}15NkSqcl+y4YPf4f|XecDE58ZX*%!?35~EQp|u&6efQaxyy)Z=GNHXs1fq0 zbuoe>SGT*~4ADWv?nmz-elo<|j!chN2T|J^o8ejYWgkwNm2TNdZ~Ys-DD& zYFeb9n{H)|z^kt{3(xiO)65D;V?3hM?F|x5*9f$m4riu+y1CFcNExdYHFmP6<&TzY zF@92uv>|BF1cQmLINSN%L1lp6Ns@^G?H1Kxkk5|rVe145^wR38bcVF;4Yx;@RBYXP z+pQjKuhSI*T~9h3zzo8;0zIe0?jqv)x3|6lb{0nzJD=Yg8F{+B zm2WZ>n;F>;HH6X4l1ba%z<$`7J}84EnLch>U0MUsq`k;_o|L7-ai=OHN=hTzv7^6E zU(`MbJE}G_v|7Q{4W^uBfjh1L!wkyCy@=kLV5+-&0Vy}J%W{W=oj@ogLcU&=!aH zxpX*g<;1{O8Y`ona0Z6Zfc%A%G8jEagYy@YnZKZEqw{vT;i8ts1qhyXkbvSnh!Iw? zv#DpDizk2mvVUI89Zl@-^Ygo}pEx%6eu6>5=88Bzla=)ol!t9rR}88HI2NoSW6zia z_0AGCGhPiSr{C_`A2^_l_fW=e3Ts;Hl8~8bZT>nhT@pc~p_%S08X+#sf z0|Q}6KsuX!zdJNu{9wCgkOz$^>HY0y3_@1-*^tGW#xBSKw!8euZorRwZ1t=#=Wf%^ zrl~c72$O*@?Ykb#c}W5Wl3lV|xvmxv*PzuE?ehR?l^JZ3dIvDgEK|GQ;d^i)bK6eP zcOz4%ohR;eJW5JAQC?ZP00^&JSxlZQeo(>c$-zYf4azx2M1k$%v7QMYQM1^Z0UGw9 zfX3bEu?1m#Q*$m{{6*)tG-p{>l>IX`7T<9r#6uZRPQkv^$~ZFTA*{?^Oc-#uAd24Y ztS=4Rw&N1##sZ{4RIZeli+x4Ocm7RPOhrfJfrun6VF3^_2sO5y=E`)a;AZf#Raqif z!qFUC8vB5Ti%1yJET)Y|Em{MS!T&T8slHvk&=n#sDCVMwC_O0qAghJ>qcE%b!Mbp7 zLlp$}9c5N;Z^H#;0-;772&;?!I@Gwq@WHo2m#-x$aaqd#?PAvsF8iN!+1pr5n=XTv{mSu#5YmfyQa*6x*y37$4!votcS)@kS{;NCk_F@5WfgiGpuVs_`c}un z`QK^-`%WQ*5Rw|6r=A-9Tj|}f&x8szIQhkyquP(YO8e0(g%CnW!}z}QkKsW^i~ z7Kh8o;J|hz-ZmkG5HbT#)bB?RmmZNiiA=K#0P4!`w81wlQLz^Sm|Q zgjn|rA%wIS<60n#I#PbGnWAjd5`lIZxou!T4_6k%s|@5sE%PAQo_?)-;ih;KLbAb= vvj3>0tZj>O#q&NFl`G3dDW;Jo*C_u7o5>6A^98Rw00000NkvXXu0mjfzfXyo literal 0 HcmV?d00001 diff --git a/xml/android_info.xml b/xml/android_info.xml index b9d1ef13..7e6a7e08 100644 --- a/xml/android_info.xml +++ b/xml/android_info.xml @@ -50,6 +50,7 @@ Var android_text1_1 = AndroidBoardTemp0 + ;CPULP: 9, CPUHP: max(12,13,14,15), GPU:16 คับ Var Timeout = 0 diff --git a/xml/page_board.xml b/xml/page_board.xml index a4c9abaf..753c435b 100644 --- a/xml/page_board.xml +++ b/xml/page_board.xml @@ -826,6 +826,8 @@ Var CountDownCheckCamera = 0 + DEBUGVAR EnableLiveness + RootLayoutVisible 3 "hide" @@ -836,7 +838,6 @@ Var SongkranEnable = 1 - 1000 If IgnoreNetCore = "true" Then diff --git a/xml/page_catalog2.xml b/xml/page_catalog2.xml index e4ecd023..26831899 100644 --- a/xml/page_catalog2.xml +++ b/xml/page_catalog2.xml @@ -208,6 +208,9 @@ Else Var PromotionOreoVolcanoEnable = 0 EndIf + + + Var Price5Active = 0 ; diff --git a/xml/page_face_compare.xml b/xml/page_face_compare.xml index 8c602cad..d29a3088 100644 --- a/xml/page_face_compare.xml +++ b/xml/page_face_compare.xml @@ -6,27 +6,41 @@ SoundVolume - Var CamFlag = 0 - Var CamCount = 0 Var Timeout = 0 - Var LOADING_STATE = "Enable" - - DEBUGVAR LOADING_STATE + Var IDcardTextStatus = "กรุณารอสักครู" + Var FaceCompareStatus = "" + Var load_gif_stage = "Enable" + Var IDcardTextState = "Invisible" SAVELOG "EventActionOk" + Var FaceCompareStatus = "OK" Var AdultFlag = 0 - CoinVending XBILL - Open "ROOT/taobin_project/xml/page_catalog2.xml" + + Var load_gif_stage = "Invisible" + Var IDcardTextState = "Enable" + + Var Price5Active = 1 + + Var PriceDrink = 5 + If blend_button_state = "PressForever" Then + Var PriceDrink = 10 + EndIf + Open "ROOT/taobin_project/xml/page_payment.xml" + Var Price5Active = 0 + Var FaceCompareStatus = "Fail" SAVELOG "EventActionError" - Open "ROOT/taobin_project/xml/page_catalog2.xml" + Var load_gif_stage = "Invisible" + Var Timeout = 10 + Var IDcardTextState = "Enable" + Var IDcardTextStatus = "ใบหน้าไม่เหมือนกับบัตร" @@ -40,7 +54,7 @@ FaceCompare 30 EndIf - If Timeout > 31 Then + If Timeout > 40 Then Open "ROOT/taobin_project/xml/page_catalog2.xml" EndIf @@ -58,12 +72,6 @@ video_menu_0 - - 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 @@ -144,23 +92,54 @@ "ROOT/taobin_project/image/page_payment/alpha.png" - + + + - 837 - 1255 - 94 - 94 - LOADING_STATE - Var( DirImage + "/loading.gif" ) + 440 + 988 + load_gif_stage + "ROOT/taobin_project/image/page_payment/loading.gif" + + EventEvaluate "EventActionOk" + + + EventEvaluate "EventActionError" + diff --git a/xml/page_identity_verification.xml b/xml/page_identity_verification.xml index de56a7ce..5e35022e 100644 --- a/xml/page_identity_verification.xml +++ b/xml/page_identity_verification.xml @@ -54,12 +54,18 @@ Var IDBirthdate = "" - + Var LivenessResult = "" Var CountDownDelayReadCardID = 5 DEBUGVAR CameraCount ;STOPCARDID - + Var LivenessShowString = "" + + Var CameraStage = "Invisible" + Var IDcardStage = "Enable" + Var IDcardStageText = "Enable" + Var load_gif_stage = "Invisible" + Var IDcardTextStatus = "โปรดเสียบบัตรประชาชน \nเพื่อดำเนินการต่อ" @@ -77,117 +83,106 @@ DEBUGVAR IDBirthdate DEBUGVAR IDFullNameEng - 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 + If IDCardStatus = "OK" Then + If IDCardReady = "OK" Then + If IDCardData = "START" Then + Var load_gif_stage = "Enable" + Var IDcardStageText = "Invisible" + + RefreshAll EndIf EndIf + EndIf - If IDCardStatus = "OK" Then - If IDCardReady = "OK" Then - If IDCardData = "ERROR" Then - Var AdultState2 = "Invisible" - Var AdultState3 = "Enable" - - Refresh - EndIf + If IDCardStatus = "OK" Then + If IDCardReady = "OK" Then + If IDCardData = "ERROR" Then + Var load_gif_stage = "Invisible" + Var IDcardStageText = "Enable" + Var IDcardTextStatus = "อ่านบัตรไม่ได้อะ" + Refresh EndIf EndIf + EndIf - If IDCardStatus = "ERROR" Then - Var AdultState2 = "Invisible" - Var AdultState3 = "Enable" - - Refresh - EndIf + If IDCardStatus = "ERROR" Then + Var load_gif_stage = "Invisible" + Var IDcardStageText = "Enable" + Var IDcardTextStatus = "อ่านบัตรไม่ได้เลยนะ" + Refresh + EndIf - If IDCardStatus = "OK" Then - If IDCardReady = "OK" Then - If IDCardData = "DONE" Then + If IDCardStatus = "OK" Then + If IDCardReady = "OK" Then + If IDCardData = "DONE" Then - ;Var birthDate = IDBirthdate - Var StrYear = "" - Var StrMon = "" - Var StrDay = "" + ;Var birthDate = IDBirthdate + Var StrYear = "" + Var StrMon = "" + Var StrDay = "" - SUBSTRING IDBirthdate 0 4 StrYear - SUBSTRING IDBirthdate 4 6 StrMon - SUBSTRING IDBirthdate 6 8 StrDay + SUBSTRING IDBirthdate 0 4 StrYear + SUBSTRING IDBirthdate 4 6 StrMon + SUBSTRING IDBirthdate 6 8 StrDay - INT StrYear - INT StrMon - INT StrDay + INT StrYear + INT StrMon + INT StrDay - Var Adult20 = 0 + Var Adult20 = 0 - DEBUGVAR StrYear - DEBUGVAR StrMon - DEBUGVAR StrDay + DEBUGVAR StrYear + DEBUGVAR StrMon + DEBUGVAR StrDay - DEBUGVAR sdatemonth - DEBUGVAR sdateday + DEBUGVAR sdatemonth + DEBUGVAR sdateday - Var sdateyear = sdateyear + 543 - Var AgeNumber = sdateyear - StrYear - DEBUGVAR AgeNumber + Var sdateyear = sdateyear + 543 + Var AgeNumber = sdateyear - StrYear + DEBUGVAR AgeNumber - If AgeNumber >= 20 Then + 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 + 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 - 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 + Var Adult20 = 1 EndIf - Var AdultFlag2 = 1 - + Else + EndIf + + + If Adult20 = 1 Then + LivenessCommand "start" + Var load_gif_stage = "Invisible" + Var IDcardStageText = "Invisible" + Var IDcardStage = "Invisible" + Var IDcardTextStatus = "แสกนหน้า" + Var CameraStage = "Enable" + Refresh + EndIf + EndIf EndIf - - EndIf + @@ -217,9 +212,17 @@ Open "ROOT/taobin_project/xml/page_catalog2.xml" EndIf - If ShutterResult = "ok" Then + ;If ShutterResult = "ok" Then + ; Open "ROOT/taobin_project/xml/page_face_compare.xml" + ;EndIf + + DEBUGVAR LivenessResult + + If LivenessResult = "pass" Then + Var LivenessShowString = "Pass " + Var load_gif_stage = "Enable" Open "ROOT/taobin_project/xml/page_face_compare.xml" - EndIf + EndIff Refresh TimerReset @@ -235,35 +238,6 @@ video_menu_0 - - 144 - 413 - pay_with_chanel_text - - - -; back - - - - 0 - 1065 - 1080 - Center - 72 - KanitMediumTTF - 0xB78F24 - showRemaining - @@ -275,47 +249,86 @@ - 689 - 875 - "Enable" - Var( DirImage + "/img_popup6.png" ) + 123 + 598 + CameraStage + "ROOT/taobin_project/image/liveness/bg2.png" - + + 0 + 602 + 1080 + Center + 60 + KanitMediumTTF + 0xDE794E + CameraStage + LivenessShowString + + - 1032 - 875 - 48 - 48 + 249 + 751 + "ROOT/taobin_project/image/liveness/bg1.png" + + + +; back + + + + - 140 - 1053 + 120 + 781 "usbfront" 800 800 + "FileName=/mnt/sdcard/camera1.jpg" + + 249 + 751 + IDcardStage + "ROOT/taobin_project/image/liveness/bg1.png" + + + + 0 + 1050 + IDcardStageText + 1080 + Center + 56 + KanitMediumTTF + 0xDE794E + IDcardTextStatus + + + + + + 440 + 988 + load_gif_stage + "ROOT/taobin_project/image/page_payment/loading.gif" + + DEBUGVAR BugFlag @@ -324,13 +337,37 @@ EndIf - - ; - SAVELOG "EventIDCard" - DEBUGVAR IDCardStatus - DEBUGVAR IDCardReady - DEBUGVAR IDCardData - DEBUGVAR IDBirthdate - DEBUGVAR IDCardState - + + DEBUGVAR LivenessStateString + + If LivenessResult = "pass" Then + + Else + Var LivenessShowString = LivenessStateString + EndIf + Refresh + + + + DEBUGVAR LivenessResult + + + + + Var IDCardStatus = "OK" + Var IDCardReady = "OK" + Var IDCardData = "START" + EventEvaluate "EventIDCard" + + + + Var IDBirthdate = 25271014 + Var IDCardStatus = "OK" + Var IDCardReady = "OK" + Var IDCardData = "DONE" + EventEvaluate "EventIDCard" + + + + diff --git a/xml/page_topping_select6.xml b/xml/page_topping_select6.xml index 62aa2458..88c683d4 100644 --- a/xml/page_topping_select6.xml +++ b/xml/page_topping_select6.xml @@ -330,6 +330,25 @@ EndIf DEBUGVAR PromotionIDCurrentOrder + Var DiscountWithIdentifyState = "Invisible" + + DEBUGVAR Price5Active + DEBUGVAR EnableLiveness + + If EnableLiveness = "true" Then + If CameraCount = 1 Then + READ_FILE "/mnt/sdcard/enable_discount_price5" EnableDiscountPrice5 + DEBUGVAR EnableDiscountPrice5 + If EnableDiscountPrice5 = "true" Then + Var EnableDiscountWithIdentify = 1 + Var DiscountWithIdentifyState = "Enable" + EndIf + EndIf + EndIf + + If Price5Active = 1 Then + + EndIf @@ -3271,6 +3290,238 @@ + +; liveness + camera + IDcard + + + ; next