diff --git a/inter/aus/image/close_en/Frame1.png b/inter/aus/image/close_en/Frame1.png deleted file mode 100644 index 7a43d56e..00000000 Binary files a/inter/aus/image/close_en/Frame1.png and /dev/null differ diff --git a/inter/aus/image/close_en/Frame10.png b/inter/aus/image/close_en/Frame10.png deleted file mode 100644 index d2727ff0..00000000 Binary files a/inter/aus/image/close_en/Frame10.png and /dev/null differ diff --git a/inter/aus/image/close_en/Frame11.png b/inter/aus/image/close_en/Frame11.png deleted file mode 100644 index 1c737617..00000000 Binary files a/inter/aus/image/close_en/Frame11.png and /dev/null differ diff --git a/inter/aus/image/close_en/Frame12.png b/inter/aus/image/close_en/Frame12.png deleted file mode 100644 index e05c2fe6..00000000 Binary files a/inter/aus/image/close_en/Frame12.png and /dev/null differ diff --git a/inter/aus/image/close_en/Frame13.png b/inter/aus/image/close_en/Frame13.png deleted file mode 100644 index daa728db..00000000 Binary files a/inter/aus/image/close_en/Frame13.png and /dev/null differ diff --git a/inter/aus/image/close_en/Frame14.png b/inter/aus/image/close_en/Frame14.png deleted file mode 100644 index f8b63f68..00000000 Binary files a/inter/aus/image/close_en/Frame14.png and /dev/null differ diff --git a/inter/aus/image/close_en/Frame15.png b/inter/aus/image/close_en/Frame15.png deleted file mode 100644 index cc71fdf7..00000000 Binary files a/inter/aus/image/close_en/Frame15.png and /dev/null differ diff --git a/inter/aus/image/close_en/Frame16.png b/inter/aus/image/close_en/Frame16.png deleted file mode 100644 index 086fdc6e..00000000 Binary files a/inter/aus/image/close_en/Frame16.png and /dev/null differ diff --git a/inter/aus/image/close_en/Frame17.png b/inter/aus/image/close_en/Frame17.png deleted file mode 100644 index 50870424..00000000 Binary files a/inter/aus/image/close_en/Frame17.png and /dev/null differ diff --git a/inter/aus/image/close_en/Frame18.png b/inter/aus/image/close_en/Frame18.png deleted file mode 100644 index b5ae0cde..00000000 Binary files a/inter/aus/image/close_en/Frame18.png and /dev/null differ diff --git a/inter/aus/image/close_en/Frame19.png b/inter/aus/image/close_en/Frame19.png deleted file mode 100644 index fa991c07..00000000 Binary files a/inter/aus/image/close_en/Frame19.png and /dev/null differ diff --git a/inter/aus/image/close_en/Frame2.png b/inter/aus/image/close_en/Frame2.png deleted file mode 100644 index 31a7d4be..00000000 Binary files a/inter/aus/image/close_en/Frame2.png and /dev/null differ diff --git a/inter/aus/image/close_en/Frame20.png b/inter/aus/image/close_en/Frame20.png deleted file mode 100644 index 677d294c..00000000 Binary files a/inter/aus/image/close_en/Frame20.png and /dev/null differ diff --git a/inter/aus/image/close_en/Frame3.png b/inter/aus/image/close_en/Frame3.png deleted file mode 100644 index f24016c6..00000000 Binary files a/inter/aus/image/close_en/Frame3.png and /dev/null differ diff --git a/inter/aus/image/close_en/Frame4.png b/inter/aus/image/close_en/Frame4.png deleted file mode 100644 index 32d6d5cd..00000000 Binary files a/inter/aus/image/close_en/Frame4.png and /dev/null differ diff --git a/inter/aus/image/close_en/Frame5.png b/inter/aus/image/close_en/Frame5.png deleted file mode 100644 index 5cfde2bd..00000000 Binary files a/inter/aus/image/close_en/Frame5.png and /dev/null differ diff --git a/inter/aus/image/close_en/Frame6.png b/inter/aus/image/close_en/Frame6.png deleted file mode 100644 index 275b5a64..00000000 Binary files a/inter/aus/image/close_en/Frame6.png and /dev/null differ diff --git a/inter/aus/image/close_en/Frame7.png b/inter/aus/image/close_en/Frame7.png deleted file mode 100644 index 69859852..00000000 Binary files a/inter/aus/image/close_en/Frame7.png and /dev/null differ diff --git a/inter/aus/image/close_en/Frame8.png b/inter/aus/image/close_en/Frame8.png deleted file mode 100644 index 174339da..00000000 Binary files a/inter/aus/image/close_en/Frame8.png and /dev/null differ diff --git a/inter/aus/image/close_en/Frame9.png b/inter/aus/image/close_en/Frame9.png deleted file mode 100644 index 272d7f18..00000000 Binary files a/inter/aus/image/close_en/Frame9.png and /dev/null differ diff --git a/inter/aus/image/close_en/img_error_aus.png b/inter/aus/image/close_en/img_error_aus.png new file mode 100644 index 00000000..a5dc63e3 Binary files /dev/null and b/inter/aus/image/close_en/img_error_aus.png differ diff --git a/inter/aus/xml/page_show_error.lxml b/inter/aus/xml/page_show_error.lxml new file mode 100644 index 00000000..9e8e4657 --- /dev/null +++ b/inter/aus/xml/page_show_error.lxml @@ -0,0 +1,448 @@ + + 0 + 608 + "Enable" + 1080 + 1312 + "0xFCFBF7" + SoundVolume + + Var countClick = 0 + Var countClick2 = 0 + + + DEBUGVAR MachineStage + DEBUGVAR stop_now + DEBUGVAR LanguageShow + + ;OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_list.xml" + + Var show_error_normal = "Invisible" + Var show_error_sp1 = "Enable" + + StopLongPlay + + If LEDSet = "true" Then + + Else + LED LedDoorCup On 255 0 0 255 + LED LedDoorLid Off 255 255 255 255 + EndIf + + Function 2 + + Var TimeOut = 0 + Var textStep = 0 + RootLayoutVisible 3 "show" + + 1000 + + + Var EmergencyStop = "-" + + + If EmergencyStop = "true" Then + If DoorCupPosition = "bottom" Then + ; It normal + Var EmergencyStop = "false" + Else + Var MachineErrorDetailAll = "Emergency stop!" + + EndIf + Else + + Var MachineErrorDetailAll = MachineErrorDetailEng + + + If textStep > 3 Then + Var textStep = 0 + Var MachineErrorDetailAll = MachineErrorDetailAll + " [ \ ]" + EndIf + If textStep = 3 Then + Var MachineErrorDetailAll = MachineErrorDetailAll + " [ - ]" + EndIf + If textStep = 2 Then + Var MachineErrorDetailAll = MachineErrorDetailAll + " [ / ]" + EndIf + If textStep = 1 Then + Var MachineErrorDetailAll = MachineErrorDetailAll + " [ | ]" + EndIf + + Var textStep = textStep + 1 + + ;DEBUGVAR MachineErrorDetailAll + ;DEBUGVAR textStep + + If NETCORE_LOST_CNT > 0 Then + + Else + + DEBUGVAR NCIC07_EVENT_CNT + DEBUGVAR NETCORE_EVENT_CNT_TMP + + If NCIC07_EVENT_CNT = NETCORE_EVENT_CNT_TMP Then + + Var NETCORE_LOST_COUNT_UP = NETCORE_LOST_COUNT_UP + 1 + DEBUGVAR NETCORE_LOST_COUNT_UP + + If NETCORE_LOST_COUNT_UP > 300 Then + If textStep > 3 Then + Var MachineErrorDetailAll = MachineErrorDetailAll + " !" + EndIf + If textStep = 3 Then + Var MachineErrorDetailAll = MachineErrorDetailAll + " !!" + EndIf + If textStep = 2 Then + Var MachineErrorDetailAll = MachineErrorDetailAll + " !!!" + EndIf + If textStep = 1 Then + Var MachineErrorDetailAll = MachineErrorDetailAll + " !!!!" + EndIf + EndIf + + Else + + If stop_now_from_netcore_event = 1 Then + Var stop_now = "false" + SAVELOG "stop_now_from_netcore_event is set" + Var stop_now_from_netcore_event = 0 + EndIf + + If stop_now_from_door_cup = 1 Then + Var stop_now = "false" + SAVELOG "stop_now_from_door_cup is set" + Var stop_now_from_door_cup = 0 + EndIf + + If MachineStage = "" Then + + Var LEDSet = "false" + Open "ROOT/taobin_project/xml/page_board.xml" + + EndIf + If MachineStage = "show-menu" Then + + Var LEDSet = "false" + Open "ROOT/taobin_project/xml/page_board.xml" + + EndIf + If MachineStage = "remove-cup" Then + + Var LEDSet = "false" + Open "ROOT/taobin_project/xml/page_remove_cup.xml" + + EndIf + + If MachineStage = "drink-failed" Then + Var FirstOpen = 1 + Var LEDSet = "true" + ;Open "ROOT/taobin_project/inter/aus/xml/page_show_error.lxml" + Refresh + EndIf + + If FirstOpen = 1 Then + Var FirstOpen = 0 + If MachineStage = "close-maintenance" Then + + Var LEDSet = "true" + ;Open "ROOT/taobin_project/inter/aus/xml/page_show_error.lxml" + Refresh + + EndIf + EndIf + EndIf + EndIf + + + + + EndIf + + + + DEBUGVAR show_error_normal + DEBUGVAR show_error_sp1 + DEBUGVAR TimeOut + Var TimeOut = TimeOut + 1 + If TimeOut > 30 Then + Var TimeOut = 0 + Open "ROOT/taobin_project/inter/aus/xml/page_show_error.lxml" + + EndIf + + Refresh + TimerReset + + Var LEDSet = "true" + ;Open "ROOT/taobin_project/inter/aus/xml/page_show_error.lxml" + + + + DEBUGVAR LanguageShow + + Var LanguageButtonEnable = "Enable" + Var ButtonLanguageCurrentXPosition = 990 + Var ButtonLanguageCurrentYPosition = 648 + + Var ButtonLanguageListXPosition = 970 + Var ButtonLanguageListYPosition = 640 + OpenInst 3 "ROOT/taobin_project/xml/topview2.xml" + + Function 2 + + Refresh + + + + DEBUGVAR MachineStage + DEBUGVAR stop_now + Var DirImage = "ROOT/taobin_project/image/vending_error_en" + If MachineStage = "mcu-upgrade" Then + If LanguageShow = "THAI" Then + Var DirImage = "ROOT/taobin_project/image/vending_error" + EndIf + If LanguageShow = "ENG" Then + Var DirImage = CountryRootPath + "image/vending_error_en" + EndIf + If LanguageShow = "JAPAN" Then + Var DirImage = CountryRootPath + "image/vending_error_en" + EndIf + If LanguageShow = "CHINA" Then + Var DirImage = CountryRootPath + "image/vending_error_en" + EndIf + If LanguageShow = "MALAY" Then + Var DirImage = CountryRootPath + "image/vending_error_en" + EndIf + EndIf + + If NeedUpgrade = "true" Then + If LanguageShow = "THAI" Then + Var DirImage = "ROOT/taobin_project/image/vending_error" + EndIf + If LanguageShow = "ENG" Then + Var DirImage = CountryRootPath + "image/vending_error_en" + EndIf + If LanguageShow = "JAPAN" Then + Var DirImage = CountryRootPath + "image/vending_error_en" + EndIf + If LanguageShow = "CHINA" Then + Var DirImage = CountryRootPath + "image/vending_error_en" + EndIf + If LanguageShow = "MALAY" Then + Var DirImage = CountryRootPath + "image/vending_error_en" + EndIf + EndIf + + DEBUGVAR MachineStage + + If MachineStage = "close-maintenance" Then + DEBUGVAR stop_now + If stop_now = "true" Then + If LanguageShow = "THAI" Then + Var DirImage = "ROOT/taobin_project/image/vending_error" + EndIf + If LanguageShow = "ENG" Then + Var DirImage = CountryRootPath + "image/vending_error_en" + EndIf + If LanguageShow = "JAPAN" Then + Var DirImage = CountryRootPath + "image/vending_error_en" + EndIf + If LanguageShow = "CHINA" Then + Var DirImage = CountryRootPath + "image/vending_error_en" + EndIf + If LanguageShow = "MALAY" Then + Var DirImage = CountryRootPath + "image/vending_error_en" + EndIf + Else + Var show_error_normal = "Enable" + Var show_error_sp1 = "Invisible" + + If LanguageShow = "THAI" Then + Var DirImage = "ROOT/taobin_project/image/close_th" + EndIf + If LanguageShow = "ENG" Then + Var DirImage = CountryRootPath + "image/close_en" + EndIf + If LanguageShow = "JAPAN" Then + Var DirImage = CountryRootPath + "image/close_en" + EndIf + If LanguageShow = "CHINA" Then + Var DirImage = CountryRootPath + "image/close_en" + EndIf + If LanguageShow = "MALAY" Then + Var DirImage = CountryRootPath + "image/close_en" + EndIf + EndIf + EndIf + + + + If MachineStage = "drink-failed" Then + If stop_now = "true" Then + If LanguageShow = "THAI" Then + Var DirImage = "ROOT/taobin_project/image/vending_error" + EndIf + If LanguageShow = "ENG" Then + Var DirImage = CountryRootPath + "image/vending_error_en" + EndIf + If LanguageShow = "JAPAN" Then + Var DirImage = CountryRootPath + "image/vending_error_en" + EndIf + If LanguageShow = "CHINA" Then + Var DirImage = CountryRootPath + "image/vending_error_en" + EndIf + If LanguageShow = "MALAY" Then + Var DirImage = CountryRootPath + "image/vending_error_en" + EndIf + Else + Var show_error_normal = "Enable" + Var show_error_sp1 = "Invisible" + If LanguageShow = "THAI" Then + Var DirImage = "ROOT/taobin_project/image/close_th" + EndIf + If LanguageShow = "ENG" Then + Var DirImage = CountryRootPath + "image/close_en" + EndIf + If LanguageShow = "JAPAN" Then + Var DirImage = CountryRootPath + "image/close_en" + EndIf + If LanguageShow = "CHINA" Then + Var DirImage = CountryRootPath + "image/close_en" + EndIf + If LanguageShow = "MALAY" Then + Var DirImage = CountryRootPath + "image/close_en" + EndIf + EndIf + EndIf + + If NETCORE_LOST_CNT > 0 Then + If LanguageShow = "THAI" Then + Var DirImage = "ROOT/taobin_project/image/vending_error" + EndIf + If LanguageShow = "ENG" Then + Var DirImage = CountryRootPath + "image/vending_error_en" + EndIf + If LanguageShow = "JAPAN" Then + Var DirImage = CountryRootPath + "image/vending_error_en" + EndIf + If LanguageShow = "CHINA" Then + Var DirImage = CountryRootPath + "image/vending_error_en" + EndIf + If LanguageShow = "MALAY" Then + Var DirImage = CountryRootPath + "image/vending_error_en" + EndIf + EndIf + + If NETCORE_EVENT_CNT_X >= 30 Then + Var NETCORE_EVENT_CNT_X = 0 + If LanguageShow = "THAI" Then + Var DirImage = "ROOT/taobin_project/image/vending_error" + EndIf + If LanguageShow = "ENG" Then + Var DirImage = CountryRootPath + "image/vending_error_en" + EndIf + If LanguageShow = "JAPAN" Then + Var DirImage = CountryRootPath + "image/vending_error_en" + EndIf + If LanguageShow = "CHINA" Then + Var DirImage = CountryRootPath + "image/vending_error_en" + EndIf + If LanguageShow = "MALAY" Then + Var DirImage = CountryRootPath + "image/vending_error_en" + EndIf + EndIf + + Var MaintenanceCard = 20 + Random MaintenanceCard + Var index = 1 + MaintenanceCard + + DEBUGVAR DirImage + + + Var RandomImage = "ROOT/taobin_project/image/close_en/Frame" + index + Var RandomImage = RandomImage + ".png" + DEBUGVAR RandomImage + DEBUGVAR Seeker + DEBUGVAR DoorCupPosition + DEBUGVAR DoorLidPosition + DEBUGVAR EmergencyStop + + + + show_error_normal + 69 + 642 + Var(DirImage + "/img_error_aus.png") + + + + + show_error_sp1 + 0 + 897 + Var(DirImage + "/img1.png") + + + + show_error_sp1 + 0 + 694 + Var(DirImage + "/text1.png") + + + + show_error_sp1 + 127 + 1685 + Var(DirImage + "/text2.png") + + + + + + + + + + + 5 + 1868 + 24 + Center + 1080 + RobotoRegular + 0xDE794E + MachineErrorDetailAll + + + + \ No newline at end of file diff --git a/xml/page_back_to_error.xml b/xml/page_back_to_error.xml index 4d58f0ad..4e7b1beb 100644 --- a/xml/page_back_to_error.xml +++ b/xml/page_back_to_error.xml @@ -8,7 +8,11 @@ Var CheckCupStateDoorCupClose = "" If InternationalEnable = 1 Then - OpenInst 0 "/mnt/sdcard/coffeevending/taobin_project/xml/page_show_error.lxml" + If CountryName = "Australia" Then + OpenInst 0 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_show_error.lxml" + Else + OpenInst 0 "/mnt/sdcard/coffeevending/taobin_project/xml/page_show_error.lxml" + EndIf Else OpenInst 0 "/mnt/sdcard/coffeevending/taobin_project/xml/page_show_error.xml" EndIf diff --git a/xml/page_board.xml b/xml/page_board.xml index f576a9d7..3d9cae72 100644 --- a/xml/page_board.xml +++ b/xml/page_board.xml @@ -975,40 +975,23 @@ If NoWaitMachineEnable = 1 Then If stop_now = "true" Then - If InternationalEnable = 1 Then - Open "ROOT/taobin_project/xml/page_show_error.lxml" - Else - Open "ROOT/taobin_project/xml/page_show_error.xml" - EndIf + TRY "ROOT/taobin_project/xml/sometime/script_open_page_show_error.ev" EndIf Else If MachineStage = "close-maintenance" Then - If InternationalEnable = 1 Then - RootLayoutVisible 3 "hide" - Open "ROOT/taobin_project/xml/page_show_error.lxml" - Else - Open "ROOT/taobin_project/xml/page_show_error.xml" - EndIf + TRY "ROOT/taobin_project/xml/sometime/script_open_page_show_error.ev" EndIf EndIf If MachineStage = "mcu-upgrade" Then - If InternationalEnable = 1 Then - Open "ROOT/taobin_project/xml/page_show_error.lxml" - Else - Open "ROOT/taobin_project/xml/page_show_error.xml" - EndIf + TRY "ROOT/taobin_project/xml/sometime/script_open_page_show_error.ev" EndIf If NeedUpgrade = "true" Then - If InternationalEnable = 1 Then - Open "ROOT/taobin_project/xml/page_show_error.lxml" - Else - Open "ROOT/taobin_project/xml/page_show_error.xml" - EndIf + TRY "ROOT/taobin_project/xml/sometime/script_open_page_show_error.ev" EndIf If RoadShow = "true" Then @@ -1104,37 +1087,21 @@ If NoWaitMachineEnable = 1 Then If RecoveryRunning = "true" Then - If InternationalEnable = 1 Then - Open "ROOT/taobin_project/xml/page_show_error.lxml" - Else - Open "ROOT/taobin_project/xml/page_show_error.xml" - EndIf + TRY "ROOT/taobin_project/xml/sometime/script_open_page_show_error.ev" EndIf If stop_now = "true" Then - If InternationalEnable = 1 Then - Open "ROOT/taobin_project/xml/page_show_error.lxml" - Else - Open "ROOT/taobin_project/xml/page_show_error.xml" - EndIf + TRY "ROOT/taobin_project/xml/sometime/script_open_page_show_error.ev" EndIf Else If MachineStage = "close-maintenance" Then - If InternationalEnable = 1 Then - Open "ROOT/taobin_project/xml/page_show_error.lxml" - Else - Open "ROOT/taobin_project/xml/page_show_error.xml" - EndIf + TRY "ROOT/taobin_project/xml/sometime/script_open_page_show_error.ev" EndIf EndIf If MachineStage = "mcu-upgrade" Then - If InternationalEnable = 1 Then - Open "ROOT/taobin_project/xml/page_show_error.lxml" - Else - Open "ROOT/taobin_project/xml/page_show_error.xml" - EndIf + TRY "ROOT/taobin_project/xml/sometime/script_open_page_show_error.ev" EndIf @@ -1144,11 +1111,7 @@ Var stop_now = "true" Var MachineErrorDetailAll = "???" SAVELOG "NETCORE_LOST_CNT" - If InternationalEnable = 1 Then - Open "ROOT/taobin_project/xml/page_show_error.lxml" - Else - Open "ROOT/taobin_project/xml/page_show_error.xml" - EndIf + TRY "ROOT/taobin_project/xml/sometime/script_open_page_show_error.ev" EndIf @@ -1175,11 +1138,7 @@ Var MachineErrorDetailAll = "Netcore Lost" SAVELOG "Netcore Lost NCIC07_EVENT_CNT" DEBUGVAR NCIC07_EVENT_CNT - If InternationalEnable = 1 Then - Open "ROOT/taobin_project/xml/page_show_error.lxml" - Else - Open "ROOT/taobin_project/xml/page_show_error.xml" - EndIf + TRY "ROOT/taobin_project/xml/sometime/script_open_page_show_error.ev" EndIf Else @@ -1192,11 +1151,7 @@ EndIf If MachineStage = "drink-failed" Then - If InternationalEnable = 1 Then - Open "ROOT/taobin_project/xml/page_show_error.lxml" - Else - Open "ROOT/taobin_project/xml/page_show_error.xml" - EndIf + TRY "ROOT/taobin_project/xml/sometime/script_open_page_show_error.ev" EndIf @@ -1218,11 +1173,7 @@ Var stop_now = "true" Var stop_now_from_door_cup = 1 - If InternationalEnable = 1 Then - Open "ROOT/taobin_project/xml/page_show_error.lxml" - Else - Open "ROOT/taobin_project/xml/page_show_error.xml" - EndIf + TRY "ROOT/taobin_project/xml/sometime/script_open_page_show_error.ev" EndIf Else If DoorCupPosition = "Bottom" Then @@ -1236,11 +1187,7 @@ If NeedUpgrade = "true" Then - If InternationalEnable = 1 Then - Open "ROOT/taobin_project/xml/page_show_error.lxml" - Else - Open "ROOT/taobin_project/xml/page_show_error.xml" - EndIf + TRY "ROOT/taobin_project/xml/sometime/script_open_page_show_error.ev" EndIf If CountDownShowButton > 0 Then diff --git a/xml/sometime/script_open_page_show_error.ev b/xml/sometime/script_open_page_show_error.ev new file mode 100644 index 00000000..ca967d51 --- /dev/null +++ b/xml/sometime/script_open_page_show_error.ev @@ -0,0 +1,13 @@ +If InternationalEnable = 1 Then + If MachineStage = "close-maintenance" Then + RootLayoutVisible 3 "hide" + EndIf + + If CountryName = "Australia" Then + Open "ROOT/taobin_project/inter/aus/xml/page_show_error.lxml" + Else + Open "ROOT/taobin_project/xml/page_show_error.lxml" + EndIf +Else + Open "ROOT/taobin_project/xml/page_show_error.xml" +EndIf \ No newline at end of file