diff --git a/adv/sync_1.file b/adv/sync_1.file index 5db3b99b..fa504295 100644 --- a/adv/sync_1.file +++ b/adv/sync_1.file @@ -1,5 +1,5 @@ -total 133668 --rw-rw---- 1 root sdcard_rw 0 2025-07-02 15:04 sync_1.file +total 128268 +-rw-rw---- 1 root sdcard_rw 0 2025-07-03 14:41 sync_1.file -rw-rw---- 1 root sdcard_rw 3772465 2023-09-18 18:44 taobin_adv_00.mp4 -rw-rw---- 1 root sdcard_rw 2625751 2023-09-18 18:44 taobin_adv_menu_00.mp4 -rw-rw---- 1 root sdcard_rw 9129355 2025-06-18 11:18 taobin_adv_menu_01.mp4 @@ -17,7 +17,7 @@ total 133668 -rw-rw---- 1 root sdcard_rw 258907 2023-09-18 18:44 taobin_adv_menu_13.mp4 -rw-rw---- 1 root sdcard_rw 3868333 2023-09-18 18:44 taobin_adv_menu_14.mp4 -rw-rw---- 1 root sdcard_rw 3178714 1980-01-01 00:00 taobin_adv_menu_15.mp4 --rw-rw---- 1 root sdcard_rw 8649951 2025-06-23 15:01 taobin_adv_menu_16.mp4 +-rw-rw---- 1 root sdcard_rw 3182528 2025-07-02 15:43 taobin_adv_menu_16.mp4 -rw-rw---- 1 root sdcard_rw 18310974 2023-09-18 18:44 taobin_adv_menu_17.mp4 -rw-rw---- 1 root sdcard_rw 10038728 2024-11-19 11:49 taobin_adv_menu_18.mp4 -rw-rw---- 1 root sdcard_rw 10498599 2023-10-31 17:06 taobin_adv_menu_19.mp4 diff --git a/adv/taobin_adv_menu_16.mp4 b/adv/taobin_adv_menu_16.mp4 old mode 100644 new mode 100755 index eb515ed1..6ff783b6 Binary files a/adv/taobin_adv_menu_16.mp4 and b/adv/taobin_adv_menu_16.mp4 differ diff --git a/inter/tha/configure.ev b/inter/tha/configure.ev index 570d0046..3558f9d5 100644 --- a/inter/tha/configure.ev +++ b/inter/tha/configure.ev @@ -70,9 +70,7 @@ EndIf ; Test - If BoxID > 200010 Then - Var EnableMultiInstanceFromBoxID = 1 - EndIf + Var EnableMultiInstanceFromBoxID = 1 READ_FILE "/mnt/sdcard/enable_ui_v3" EnableMultiInstanceFromConfig If EnableMultiInstanceFromConfig = "true" Then diff --git a/video/sync_1.file b/video/sync_1.file index 320f9b1e..782f8848 100644 --- a/video/sync_1.file +++ b/video/sync_1.file @@ -1,4 +1,4 @@ -total 350188 +total 350060 -rw-rw---- 1 root sdcard_rw 12354151 2025-05-08 10:24 Mixer_proof3.mp4 -rw-rw---- 1 root sdcard_rw 10151578 2025-05-08 10:24 TaoBin_Tao_Pun_motion_proof3.mp4 -rw-rw---- 1 root sdcard_rw 76993 2025-05-08 10:24 TaoBin_Tao_Pun_motion_proof3_pause.mp4 @@ -50,7 +50,7 @@ total 350188 -rw-rw---- 1 root sdcard_rw 1020 2025-04-10 18:50 script2.ev -rw-rw---- 1 root sdcard_rw 210 2024-11-10 09:20 script3_brew.ev -rw-rw---- 1 root sdcard_rw 11032 2025-06-26 13:20 script3_first_brewing.ev --rw-rw---- 1 root sdcard_rw 0 2025-07-02 15:05 sync_1.file +-rw-rw---- 1 root sdcard_rw 0 2025-07-04 11:11 sync_1.file -rw-rw---- 1 root sdcard_rw 4806758 2023-09-18 18:44 taobin_save_world1.mp4 -rw-rw---- 1 root sdcard_rw 6428830 2023-09-18 18:44 taobin_save_world2.mp4 -rw-rw---- 1 root sdcard_rw 4634942 2023-09-18 18:44 taobin_save_world3.mp4 diff --git a/xml/multi_ads/ads_path.ev b/xml/multi_ads/ads_path.ev index 9def12d9..a33e1663 100644 --- a/xml/multi_ads/ads_path.ev +++ b/xml/multi_ads/ads_path.ev @@ -321,7 +321,7 @@ Else ;DEBUGVAR a_video_menu[12] ;DEBUGVAR a_video_menu[18] - DEBUGVAR a_video_menu[0] + ;DEBUGVAR a_video_menu[0] SPLIT XMLLiveInfo "/" 1 AdvDisplayMode SPLIT XMLLiveInfo "/" 2 CurrentTotalCup @@ -329,6 +329,6 @@ EndIf -DEBUGVAR showSingleAds -DEBUGVAR showMultiAds -DEBUGVAR XMLLiveInfo +;DEBUGVAR showSingleAds +;DEBUGVAR showMultiAds +;DEBUGVAR XMLLiveInfo diff --git a/xml/page_board.xml b/xml/page_board.xml index 50f7b41b..4f85743c 100644 --- a/xml/page_board.xml +++ b/xml/page_board.xml @@ -648,6 +648,7 @@ If default_english = "true" Then Var show_eng = "true" + SetLanguage "ENG" EndIf Var InternationalEnable = 0 @@ -724,6 +725,7 @@ ;inter-page-board + If CountryName = "Malaysia" Then TRY "/mnt/sdcard/coffeevending/taobin_project/inter/mys/video/script_video.ev" diff --git a/xml/page_main_blank.xml b/xml/page_main_blank.xml index 69da80b9..bef1c058 100644 --- a/xml/page_main_blank.xml +++ b/xml/page_main_blank.xml @@ -2,64 +2,12 @@ 1080 1312 - DEBUGVAR PaySuccessWithDaemonTask + 1000 - If PaySuccessWithDaemonTask = 1 Then - - DEBUGVAR PaidPaymentFromNextStage - DEBUGVAR LastMakeDrinkResult - ; from - If LastMakeDrinkResult = "success" Then - If PaidPaymentFromNextStage = 1 Then - Var DelayForMakeDrink = 0 - Var PaidPaymentFromNextStage = 2 - EndIf - EndIf - - If PaidPaymentFromNextStage = 2 Then - DEBUGVAR HaveCup - DEBUGVAR MaybeHaveCup - DEBUGVAR DoorCupPosition - - If HaveCup = "false" Then - If MaybeHaveCup = "false" Then - If DoorCupPosition = "bottom" Then - - Topping "Select" NextUserSelectDrinkFromPaid - - ; Set option toppinng and pack - Topping "Select1-ID" NextUserSelecttopping1Paid - Topping "Select2-ID" NextUserSelecttopping2Paid - Topping "Select3-ID" NextUserSelecttopping3Paid - - ; Pack - Topping "Pack" ExtendDataCurr - - Var DelayForMakeDrink = 2 - Var PaidPaymentFromNextStage = 3 - - DEBUGVAR NextUserSelectDrinkFromPaid - EndIf - EndIf - EndIf - EndIf - - DEBUGVAR DelayForMakeDrink - - EndIf - - If DelayForMakeDrink > 0 Then - DEBUGVAR DelayForMakeDrink - Var DelayForMakeDrink = DelayForMakeDrink - 1 - If DelayForMakeDrink = 0 Then - Var MakeContinue = 1 - MakeDrinkV1 NextUserSelectDrinkFromPaid SelectSugarID - EndIf - EndIf ; hurr TimerReset diff --git a/xml/test_all_syntax.xml b/xml/test_all_syntax.xml index c4eb77cd..4028343b 100644 --- a/xml/test_all_syntax.xml +++ b/xml/test_all_syntax.xml @@ -10,7 +10,6 @@ OpenInst 3 "ROOT/taobin_project/xml/page_list.xml" - OpenInst 1 "ROOT/taobin_project/xml/page_list.xml" OpenInst 2 "ROOT/taobin_project/xml/page_list.xml" @@ -48,100 +47,16 @@ - SAVELOG "============================== Test elseif =====================================" - Var idx = 0 - Var idx2 = 0 - - - If idx = 22 Then - SAVELOG "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" - ElIf idx = 11 Then - SAVELOG "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" - ElIf idx = 33 Then - SAVELOG "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" - ElIf idx = 0 Then - SAVELOG "================ Test 1 elseif true OK" - Else - SAVELOG "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" - EndIf - - - If idx = 0 Then - SAVELOG "================ Test 2 elseif true OK" - ElIf idx = 4 Then - SAVELOG "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" - ElIf idx = 2 Then - SAVELOG "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" - EndIf - - If idx = 0 Then - SAVELOG "================ Test 3 elseif true OK" - ElIf idx = 0 Then - SAVELOG "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" - ElIf idx = 0 Then - SAVELOG "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" - EndIf + SAVELOG "============================== Test step 1 ========================" + + Var idx_test = 0 + DEBUGVAR idx_test + + + TRY "ROOT/taobin_project/xml/test_forloop.xml" + - If idx = 99 Then - SAVELOG "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" - ElIf idx = 0 Then - SAVELOG "================ Test 4 elseif true OK" - ElIf idx = 98 Then - SAVELOG "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" - EndIf - - If idx = 2 Then - SAVELOG "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" - ElIf idx = 12 Then - SAVELOG "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" - ElIf idx = 13 Then - SAVELOG "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" - EndIf - - If idx = 2 Then - SAVELOG "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" - ElIf idx = 12 Then - SAVELOG "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" - ElIf idx = 14 Then - SAVELOG "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" - Else - SAVELOG "================ Test 5 elseif true OK" - EndIf - - SAVELOG "============================== Test step 1 ========================" - - If idx = 2 Then - SAVELOG "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" - If idx2 = 0 Then - SAVELOG "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" - EndIf - ElIf idx = 0 Then - If idx2 = 0 Then - SAVELOG "================ Test 6 elseif true OK" - EndIf - ElIf idx = 10 Then - SAVELOG "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" - EndIf - - - If idx = 2 Then - SAVELOG "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" - If idx2 = 0 Then - SAVELOG "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" - EndIf - ElIf idx = 0 Then - If idx2 = 2 Then - SAVELOG "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" - ElIf idx2 = 0 Then - SAVELOG "================ Test 5 elseif true OK" - EndIf - ElIf idx = 10 Then - SAVELOG "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" - EndIf - - - SAVELOG "=========== END ===========" diff --git a/xml/test_else_if.xml b/xml/test_else_if.xml new file mode 100644 index 00000000..6d8b79a8 --- /dev/null +++ b/xml/test_else_if.xml @@ -0,0 +1,92 @@ + + + + SAVELOG "============================== Test elseif =====================================" + Var idx = 0 + Var idx2 = 0 + + + If idx = 22 Then + SAVELOG "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" + ElIf idx = 11 Then + SAVELOG "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" + ElIf idx = 33 Then + SAVELOG "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" + ElIf idx = 0 Then + SAVELOG "================ Test 1 elseif true OK" + Else + SAVELOG "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" + EndIf + + + If idx = 0 Then + SAVELOG "================ Test 2 elseif true OK" + ElIf idx = 4 Then + SAVELOG "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" + ElIf idx = 2 Then + SAVELOG "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" + EndIf + + If idx = 0 Then + SAVELOG "================ Test 3 elseif true OK" + ElIf idx = 0 Then + SAVELOG "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" + ElIf idx = 0 Then + SAVELOG "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" + EndIf + + + If idx = 99 Then + SAVELOG "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" + ElIf idx = 0 Then + SAVELOG "================ Test 4 elseif true OK" + ElIf idx = 98 Then + SAVELOG "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" + EndIf + + If idx = 2 Then + SAVELOG "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" + ElIf idx = 12 Then + SAVELOG "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" + ElIf idx = 13 Then + SAVELOG "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" + EndIf + + If idx = 2 Then + SAVELOG "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" + ElIf idx = 12 Then + SAVELOG "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" + ElIf idx = 14 Then + SAVELOG "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" + Else + SAVELOG "================ Test 5 elseif true OK" + EndIf + + If idx = 2 Then + SAVELOG "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" + If idx2 = 0 Then + SAVELOG "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" + EndIf + ElIf idx = 0 Then + If idx2 = 0 Then + SAVELOG "================ Test 6 elseif true OK" + EndIf + ElIf idx = 10 Then + SAVELOG "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" + EndIf + + + If idx = 2 Then + SAVELOG "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" + If idx2 = 0 Then + SAVELOG "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" + EndIf + ElIf idx = 0 Then + If idx2 = 2 Then + SAVELOG "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" + ElIf idx2 = 0 Then + SAVELOG "================ Test 5 elseif true OK" + EndIf + ElIf idx = 10 Then + SAVELOG "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" + EndIf diff --git a/xml/test_for_loop.xml b/xml/test_for_loop.xml deleted file mode 100644 index d334efb2..00000000 --- a/xml/test_for_loop.xml +++ /dev/null @@ -1,35 +0,0 @@ - - For idx < 10 Loop - Var idx = idx + 1 - DEBUGVAR idx - If idx = 5 Then - SAVELOG "================ test for loop depth 1 with i f" - Else - SAVELOG "Hurr Hurr Hurr Hurr" - - EndIf - - Var TestLoopArray[idx] = idx + 10 - - Var idx2 = 0 - For idx2 < 30 Loop - Var idx2 = idx2 + 1 - DEBUGVAR idx2 - If idx2 < 15 Then - SAVELOG "###### TTTTTT ######" - Else - SAVELOG "++++++ TTTTTT ++++++" - EndIf - EndFor - - - EndFor - - Var idx = 0 - For idx < 10 Loop - Var idx = idx + 1 - DEBUGVAR TestLoopArray[idx] - - - EndFor - \ No newline at end of file diff --git a/xml/test_forloop.xml b/xml/test_forloop.xml new file mode 100644 index 00000000..9e489f5a --- /dev/null +++ b/xml/test_forloop.xml @@ -0,0 +1,47 @@ + + SAVELOG "================== start test f or l oop ================" + + + If HaveKok = "" Then + + Else + SAVELOG " NO KOK NO COMMIT " + EndIf + + + + + For idx_test < 10 Loop + DEBUGVAR idx_test + Var idx_test = idx_test + 1 + If idx_test = 5 Then + SAVELOG "================ test fo r lo op depth 1 with i f" + Else + SAVELOG "Hurr Hurr Hurr Hurr" + + EndIf + + Var TestroopArray[idx_test] = idx_test + 10 + + Var idx2 = 0 + For idx2 < 30 Loop + Var idx2 = idx2 + 1 + DEBUGVAR idx2 + If idx2 < 15 Then + SAVELOG "###### TTTTTT ######" + Else + SAVELOG "++++++ TTTTTT ++++++" + EndIf + EndFor + + + EndFor + + Var idx = 0 + For idx < 10 Loop + Var idx = idx + 1 + DEBUGVAR TestroopArray[idx] + + + EndFor + SAVELOG "================== end test f or l oop ================" diff --git a/xml/topview2.xml b/xml/topview2.xml index 30b5cde0..137a0382 100644 --- a/xml/topview2.xml +++ b/xml/topview2.xml @@ -182,7 +182,7 @@ If str_openfile_xml_0 = "/mnt/sdcard/coffeevending/taobin_project/xml/page_main_blank.xml" Then If str_openfile_xml_2 = "/mnt/sdcard/coffeevending/taobin_project/xml/page_list.xml" Then Var CountUpForProjectThisFileStruct = CountUpForProjectThisFileStruct + 1 - ;DEBUGVAR CountUpForProjectThisFileStruct + DEBUGVAR CountUpForProjectThisFileStruct EndIf EndIf diff --git a/xml_main/startup.xml b/xml_main/startup.xml index bb26536b..f610f428 100644 --- a/xml_main/startup.xml +++ b/xml_main/startup.xml @@ -108,8 +108,8 @@ Var RandomPromotionMyworld = 0 Var RandomSalePackage = 0 - Var XMLPageVersion = "10.12" - Var XMLPageVersionInt = 1012 + Var XMLPageVersion = "10.14" + Var XMLPageVersionInt = 1014 Var CurrentMainVideo = 2 diff --git a/xml_main/startup_dev.xml b/xml_main/startup_dev.xml index eef68cc1..ac7fed1c 100644 --- a/xml_main/startup_dev.xml +++ b/xml_main/startup_dev.xml @@ -108,8 +108,8 @@ Var RandomPromotionMyworld = 0 Var RandomSalePackage = 0 - Var XMLPageVersion = "11.12" - Var XMLPageVersionInt = 1112 + Var XMLPageVersion = "11.14" + Var XMLPageVersionInt = 1114 ;Oreo Var OreoGuarantee = 0