From e78430cf74bd6cba58b88066e0198c11fdf4008b Mon Sep 17 00:00:00 2001 From: kong Date: Tue, 16 May 2023 22:35:46 +0700 Subject: [PATCH] DO --- ui/lang.tsv | 26 +++++++++++++++++++++ xml/page_back_to_error.xml | 3 +++ xml/page_back_to_main.xml | 3 +++ xml/page_board.xml | 5 +++- xml/page_catalog2.xml | 6 ++++- xml/page_remove_cup.xml | 15 ++++++++++++ xml/test_xml_blank.xml | 48 ++++++++++++++++++++++++++++++++++++++ 7 files changed, 104 insertions(+), 2 deletions(-) create mode 100644 xml/test_xml_blank.xml diff --git a/ui/lang.tsv b/ui/lang.tsv index 6b25c841..c5697ecb 100644 --- a/ui/lang.tsv +++ b/ui/lang.tsv @@ -521,3 +521,29 @@ TextID Note English Thai China Japan Malaysia 800389 Powder set ชุดผง Powder set 800390 ARM แขน ARM 800391 Whipper หัวชง Whipper +800392 +800393 Password รหัสผ่าน +800394 Collect money เก็บเงิน. +800395 Refill เติมของ. +800396 Test/Check ตรวจสอบ. +800397 +800398 +800399 Inventory เติมของ +800400 Refill with order เติมของตามใบ +800401 Back กลับเมนูหลัก +800402 +800403 Save บันทึก +800404 Cancel ยกเลิก +800405 Edit แก้ไข +800406 +800407 Current value ปริมาตรปัจจุบัน +800408 refill/remove เติม/ลด +800409 gram กรัม +800410 enter new value ใส่จำนวนใหม่ +800411 bag ถุง +800412 +800413 Slot ช่อง +800414 ID รหัสวัตถุดิบ +800415 Code รหัสสินค้า +800416 Name ชื่อวัตถุดิบ +800417 diff --git a/xml/page_back_to_error.xml b/xml/page_back_to_error.xml index 7ae7eb27..8e218f82 100644 --- a/xml/page_back_to_error.xml +++ b/xml/page_back_to_error.xml @@ -3,6 +3,9 @@ 1920 + + ; Reset here + Var CheckCupStateDoorCupClose = "" OpenInst 0 "/mnt/sdcard/coffeevending/taobin_project/xml/page_show_error.xml" OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/test_video_loop.xml" diff --git a/xml/page_back_to_main.xml b/xml/page_back_to_main.xml index 67b6772b..407519d3 100644 --- a/xml/page_back_to_main.xml +++ b/xml/page_back_to_main.xml @@ -3,6 +3,9 @@ 1920 + + ; Reset here + Var CheckCupStateDoorCupClose = "" OpenInst 0 "/mnt/sdcard/coffeevending/taobin_project/xml/page_board.xml" If TermTemOnline = "true" Then diff --git a/xml/page_board.xml b/xml/page_board.xml index 8337be68..736bdf63 100644 --- a/xml/page_board.xml +++ b/xml/page_board.xml @@ -634,7 +634,7 @@ EndIf ; Set default lang - If JXMLVersionInt > 428 Then + If JXMLVersionInt > 444 Then SetLanguage LanguageInit @@ -651,6 +651,8 @@ SetLanguage "MALAY" LanguageControl "UpdateList" "-" Var InternationalEnable = 1 + Var show_eng = "true" + Var VideoMainPage = "ROOT/taobin_project/video/main_page_en.mp4" EndIf DEBUGVAR InternationalEnable @@ -689,6 +691,7 @@ Open "/ROOT/xml/offline.xml" EndIf + Var CheckCupStateDoorCupClose = "" ; zone cup on arm If CupOnArm = "true" Then diff --git a/xml/page_catalog2.xml b/xml/page_catalog2.xml index 28dfacc3..139add38 100644 --- a/xml/page_catalog2.xml +++ b/xml/page_catalog2.xml @@ -251,7 +251,9 @@ EndIf If countDownRetrun = 0 Then - If Seeker = "next" Then + + + If Seeker = "next" Then Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" Else Open "ROOT/taobin_project/xml/page_back_to_main.xml" @@ -340,6 +342,8 @@ If Seeker = "next" Then Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" Else + + Open "ROOT/taobin_project/xml/page_back_to_main.xml" EndIf diff --git a/xml/page_remove_cup.xml b/xml/page_remove_cup.xml index 808936a7..6d172317 100644 --- a/xml/page_remove_cup.xml +++ b/xml/page_remove_cup.xml @@ -51,6 +51,20 @@ If Timeout > 15 Then Var Timeout = 0 + + + EndIf + + ; Logic have differrent drinkfail3.xml + ; protect lock + ; + + If CheckCupStateDoorCupCloseCnt > 0 Then + Var CheckCupStateDoorCupCloseCnt = CheckCupStateDoorCupCloseCnt - 1 + EndIf + + If CheckCupStateDoorCupCloseCnt = 0 Then + Var CheckCupStateDoorCupClose = "" EndIf If HaveCup = "true" Then @@ -95,6 +109,7 @@ Machine DoorLidOpen Var buttonRemoveCup = "Invisible" Var CheckCupStateDoorCupClose = "reset" + Var CheckCupStateDoorCupCloseCnt = 30 diff --git a/xml/test_xml_blank.xml b/xml/test_xml_blank.xml new file mode 100644 index 00000000..1eb2ee50 --- /dev/null +++ b/xml/test_xml_blank.xml @@ -0,0 +1,48 @@ + + + 1080 + 1312 + SoundVolume + "ROOT/image/BG1SLOT_TAB.bmp" + + ; On open + + + 1000 + + + Var Timeout = Timeout + 1 + DEBUGVAR Timeout + + + Refresh + TimerReset + + + + + + + + + + Var IDCardState = "Enable" + + SAVELOG IDFullNameEng + + +; /mnt/sdcard/coffeevending/taobin_project/sound_thai/sublang/ + + + +