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 00000000..0ec224bd Binary files /dev/null and b/image/liveness/bg1.png differ diff --git a/image/liveness/bg2.png b/image/liveness/bg2.png new file mode 100644 index 00000000..140a5ec3 Binary files /dev/null and b/image/liveness/bg2.png differ diff --git a/image/liveness/bn_cancel.png b/image/liveness/bn_cancel.png new file mode 100644 index 00000000..dbf9e145 Binary files /dev/null and b/image/liveness/bn_cancel.png differ diff --git a/image/topping2/bn_price5baht.png b/image/topping2/bn_price5baht.png new file mode 100644 index 00000000..90544561 Binary files /dev/null and b/image/topping2/bn_price5baht.png differ diff --git a/image/topping2/bp_price5baht.png b/image/topping2/bp_price5baht.png new file mode 100644 index 00000000..850a4fc4 Binary files /dev/null and b/image/topping2/bp_price5baht.png differ diff --git a/spiral/image/page_spiral/03-02-01-0013.png b/spiral/image/page_spiral/03-02-01-0013.png new file mode 100644 index 00000000..3301a6be Binary files /dev/null and b/spiral/image/page_spiral/03-02-01-0013.png differ diff --git a/spiral/image/page_spiral/03-02-01-0014.png b/spiral/image/page_spiral/03-02-01-0014.png new file mode 100644 index 00000000..887a7342 Binary files /dev/null and b/spiral/image/page_spiral/03-02-01-0014.png differ diff --git a/spiral/image/page_spiral/spiral_product_03-02-01-0013.png b/spiral/image/page_spiral/spiral_product_03-02-01-0013.png new file mode 100644 index 00000000..3fe6e9ea Binary files /dev/null and b/spiral/image/page_spiral/spiral_product_03-02-01-0013.png differ diff --git a/spiral/image/page_spiral/spiral_product_03-02-01-0014.png b/spiral/image/page_spiral/spiral_product_03-02-01-0014.png new file mode 100644 index 00000000..efff0568 Binary files /dev/null and b/spiral/image/page_spiral/spiral_product_03-02-01-0014.png differ diff --git a/spiral/image/page_spiral_press/03-02-01-0013.png b/spiral/image/page_spiral_press/03-02-01-0013.png new file mode 100644 index 00000000..458efe2e Binary files /dev/null and b/spiral/image/page_spiral_press/03-02-01-0013.png differ diff --git a/spiral/image/page_spiral_press/03-02-01-0014.png b/spiral/image/page_spiral_press/03-02-01-0014.png new file mode 100644 index 00000000..9a137d63 Binary files /dev/null and b/spiral/image/page_spiral_press/03-02-01-0014.png differ 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..d51d9df7 100644 --- a/spiral/xml/page_catalog_vending_machine.xml +++ b/spiral/xml/page_catalog_vending_machine.xml @@ -1859,6 +1859,321 @@ + +; 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 03-02-01-0010 33 @@ -2640,6 +2955,7 @@ + ; button i=1 01-00-00-0015 33 @@ -2651,7 +2967,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 +3081,6 @@ - - - ; Cart - - 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 ccf82b25..5e35022e 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,20 @@ EndIf + 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เพื่อดำเนินการต่อ" @@ -72,118 +81,108 @@ DEBUGVAR IDCardReady DEBUGVAR IDCardData 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 + @@ -195,26 +194,35 @@ DEBUGVAR IDBirthdate DEBUGVAR CountDownDelayReadCardID DEBUGVAR ShutterResult + DEBUGVAR IDCardState If IDBirthdate = "" Then 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 - 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 @@ -230,35 +238,6 @@ video_menu_0 - - 144 - 413 - pay_with_chanel_text - - - -; back - - - - 0 - 1065 - 1080 - Center - 72 - KanitMediumTTF - 0xB78F24 - showRemaining - @@ -270,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 + + + + - 0 - 381 + 120 + 781 "usbfront" - 700 - 394 + 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 @@ -319,11 +337,37 @@ EndIf - + + 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" + - DEBUGVAR IDCardStatus - DEBUGVAR IDCardReady - DEBUGVAR IDCardData - DEBUGVAR IDBirthdate - + + 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