diff --git a/image/new_vending_info/aftertestcoinfinlish_bn.png b/image/new_vending_info/aftertestcoinfinlish_bn.png new file mode 100644 index 00000000..4d3d5f0d Binary files /dev/null and b/image/new_vending_info/aftertestcoinfinlish_bn.png differ diff --git a/image/new_vending_info/aftertestcoinfinlish_bp.png b/image/new_vending_info/aftertestcoinfinlish_bp.png new file mode 100644 index 00000000..09ddb883 Binary files /dev/null and b/image/new_vending_info/aftertestcoinfinlish_bp.png differ diff --git a/image/new_vending_info/aftertestcoinwarning.png b/image/new_vending_info/aftertestcoinwarning.png new file mode 100644 index 00000000..17657790 Binary files /dev/null and b/image/new_vending_info/aftertestcoinwarning.png differ diff --git a/image/new_vending_info/beforetestcoinback_bn.png b/image/new_vending_info/beforetestcoinback_bn.png new file mode 100644 index 00000000..baaa2186 Binary files /dev/null and b/image/new_vending_info/beforetestcoinback_bn.png differ diff --git a/image/new_vending_info/beforetestcoinback_bp.png b/image/new_vending_info/beforetestcoinback_bp.png new file mode 100644 index 00000000..c1cb7506 Binary files /dev/null and b/image/new_vending_info/beforetestcoinback_bp.png differ diff --git a/image/new_vending_info/beforetestcoinstart_bn.png b/image/new_vending_info/beforetestcoinstart_bn.png new file mode 100644 index 00000000..ea48fbd4 Binary files /dev/null and b/image/new_vending_info/beforetestcoinstart_bn.png differ diff --git a/image/new_vending_info/beforetestcoinstart_bp.png b/image/new_vending_info/beforetestcoinstart_bp.png new file mode 100644 index 00000000..f057075f Binary files /dev/null and b/image/new_vending_info/beforetestcoinstart_bp.png differ diff --git a/image/new_vending_info/personguildline.png b/image/new_vending_info/personguildline.png index 18ce2e48..e8dbeead 100644 Binary files a/image/new_vending_info/personguildline.png and b/image/new_vending_info/personguildline.png differ diff --git a/image/new_vending_info/warningbeforetestcoin.png b/image/new_vending_info/warningbeforetestcoin.png new file mode 100644 index 00000000..10756ca3 Binary files /dev/null and b/image/new_vending_info/warningbeforetestcoin.png differ diff --git a/inc/video.inc b/inc/video.inc index 194b6e2c..8851ea6f 100644 --- a/inc/video.inc +++ b/inc/video.inc @@ -2,13 +2,12 @@ 0 0 1080 - 380 "true" "Reload" If showMultiAds = "true" Then - + If PreviousFileName = "" Then Var PreviousFileName = PreviseXMLFileName2 @@ -23,7 +22,6 @@ Var ads_idx = ads_idx + 1 EndIf - If ads_idx = 30 Then Var ads_idx = 0 EndIf @@ -32,9 +30,43 @@ DEBUGVAR a_video_menu[ads_idx] Var ads_idx = 0 EndIf + If CountDownPauseVideo2 = -1 Then + Var CountDownPauseVideo2 = 0 + EndIf - Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_" + a_video_menu[ads_idx] - Var DisplayAds = AdvTaobinMenu + ".mp4" + DEBUGVAR CurrentXMLFileName2 + DEBUGVAR PreviousFileName + DEBUGVAR CountDownPauseVideo2 + If CountryName = "Singapore" Then + If CurrentXMLFileName2 = "/mnt/sdcard/coffeevending//taobin_project/xml/page_back_to_main.xml" Then + + If CountDownPauseVideo2 < 2 Then + Var AdvTaobinMenu = "/mnt/sdcard + Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_" + a_video_menu[ads_idx] + Var DisplayAds = AdvTaobinMenu + ".mp4" + Else + Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_" + a_video_menu[ads_idx] + Var DisplayAds = AdvTaobinMenu + ".mp4" + EndIf + Else + Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_" + a_video_menu[ads_idx] + Var DisplayAds = AdvTaobinMenu + ".mp4" + EndIf + If CurrentXMLFileName2 = "" Then + If CountDownPauseVideo2 < 2 Then + Var AdvTaobinMenu = "/mnt/sdcard + Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_" + a_video_menu[ads_idx] + Var DisplayAds = AdvTaobinMenu + ".mp4" + Else + Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_" + a_video_menu[ads_idx] + Var DisplayAds = AdvTaobinMenu + ".mp4" + EndIf + EndIf + + Else + Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_" + a_video_menu[ads_idx] + Var DisplayAds = AdvTaobinMenu + ".mp4" + EndIf If CountryName = "Malaysia" Then If PromotionOreoToppingFreeEnable = 1 Then @@ -48,8 +80,28 @@ Else DEBUGVAR a_video_menu[ads_idx] - Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_" + a_video_menu[ads_idx] - Var DisplayAds = AdvTaobinMenu + ".mp4" + If CountryName = "Singapore" Then + If CurrentXMLFileName2 = "/mnt/sdcard/coffeevending//taobin_project/xml/page_back_to_main.xml" Then + Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_" + a_video_menu[ads_idx] + Var DisplayAds = AdvTaobinMenu + ".mp4" + Else + Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_" + a_video_menu[ads_idx] + Var DisplayAds = AdvTaobinMenu + ".mp4" + EndIf + If CurrentXMLFileName2 = "" Then + If CountDownPauseVideo2 < 2 Then + Var AdvTaobinMenu = "/mnt/sdcard + Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_" + a_video_menu[ads_idx] + Var DisplayAds = AdvTaobinMenu + ".mp4" + Else + Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_" + a_video_menu[ads_idx] + Var DisplayAds = AdvTaobinMenu + ".mp4" + EndIf + EndIf + Else + Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_" + a_video_menu[ads_idx] + Var DisplayAds = AdvTaobinMenu + ".mp4" + EndIf EndIf DEBUGVAR DisplayAds @@ -62,9 +114,15 @@ EndIf EndIf + - + DEBUGVAR CurrentXMLFileName2 + Var video_end = "Video end" + DEBUGVAR video_end + If CountDownPauseVideo2 = -1 Then + Var CountDownPauseVideo2 = 0 + EndIf If showMultiAds = "true" Then @@ -80,8 +138,34 @@ Var ads_idx = 0 EndIf - Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_" + a_video_menu[ads_idx] - Var DisplayAds = AdvTaobinMenu + ".mp4" + If CountryName = "Singapore" Then + If CurrentXMLFileName2 = "/mnt/sdcard/coffeevending//taobin_project/xml/page_back_to_main.xml" Then + If CountDownPauseVideo2 < 2 Then + Var AdvTaobinMenu = "/mnt/sdcard + Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_" + a_video_menu[ads_idx] + Var DisplayAds = AdvTaobinMenu + ".mp4" + Else + Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_" + a_video_menu[ads_idx] + Var DisplayAds = AdvTaobinMenu + ".mp4" + EndIf + Else + Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_" + a_video_menu[ads_idx] + Var DisplayAds = AdvTaobinMenu + ".mp4" + EndIf + If CurrentXMLFileName2 = "" Then + If CountDownPauseVideo2 < 2 Then + Var AdvTaobinMenu = "/mnt/sdcard + Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_" + a_video_menu[ads_idx] + Var DisplayAds = AdvTaobinMenu + ".mp4" + Else + Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_" + a_video_menu[ads_idx] + Var DisplayAds = AdvTaobinMenu + ".mp4" + EndIf + EndIf + Else + Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_" + a_video_menu[ads_idx] + Var DisplayAds = AdvTaobinMenu + ".mp4" + EndIf If CountryName = "Malaysia" Then If PromotionOreoToppingFreeEnable = 1 Then @@ -95,8 +179,34 @@ Else DEBUGVAR a_video_menu[ads_idx] - Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_" + a_video_menu[ads_idx] - Var DisplayAds = AdvTaobinMenu + ".mp4" + If CountryName = "Singapore" Then + If CurrentXMLFileName2 = "/mnt/sdcard/coffeevending//taobin_project/xml/page_back_to_main.xml" Then + If CountDownPauseVideo2 < 1 Then + Var AdvTaobinMenu = "/mnt/sdcard + Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_" + a_video_menu[ads_idx] + Var DisplayAds = AdvTaobinMenu + ".mp4" + Else + Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_" + a_video_menu[ads_idx] + Var DisplayAds = AdvTaobinMenu + ".mp4" + EndIf + Else + Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_" + a_video_menu[ads_idx] + Var DisplayAds = AdvTaobinMenu + ".mp4" + EndIf + If CurrentXMLFileName2 = "" Then + If CountDownPauseVideo2 < 2 Then + Var AdvTaobinMenu = "/mnt/sdcard + Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_" + a_video_menu[ads_idx] + Var DisplayAds = AdvTaobinMenu + ".mp4" + Else + Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_" + a_video_menu[ads_idx] + Var DisplayAds = AdvTaobinMenu + ".mp4" + EndIf + EndIf + Else + Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_" + a_video_menu[ads_idx] + Var DisplayAds = AdvTaobinMenu + ".mp4" + EndIf EndIf DEBUGVAR DisplayAds @@ -110,6 +220,9 @@ EndIf EndIf + Var XMLFileVideo = "false" + DEBUGVAR XMLFileVideo + DisplayAds diff --git a/xml/checkin.xml b/xml/checkin.xml index 0f8f575e..d07141d7 100644 --- a/xml/checkin.xml +++ b/xml/checkin.xml @@ -73,6 +73,8 @@ SAVELOG strOnpageLogtext + StatusLog "On checkin" + 1000 @@ -103,7 +105,8 @@ If TimerbacktoHome = 0 Then SAVELOG "timeout" SAVELOG "back_to_page_board" - Open "ROOT/taobin_project/xml/page_board.xml" + StatusLog "backtohome" + Open "ROOT/taobin_project/xml/vending_tasks_pre_main.xml" EndIf Refresh @@ -132,7 +135,10 @@ SoundVolume + StatusLog "backtohome" + Open "ROOT/taobin_project/xml/vending_tasks_pre_main.xml" + @@ -174,8 +180,8 @@ 280 - 250 - 510 + 240 + 700 510 SoundVolume "ROOT/taobin_project/image/new_vending_info/personguildline.png" @@ -234,7 +240,7 @@ Var showTimeCounter = "Enable" Var showTakePictureBtn = "Invisible" SAVELOG strOnstartLogtext - StatusLog "start capture checkin" + StatusLog "start capture" showTakePictureBtn @@ -249,9 +255,10 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Open "ROOT/taobin_project/xml/page_board.xml" SAVELOG strOnCancelLogtext - StatusLog "cancel capture checkin" + StatusLog "backtohome" + Open "ROOT/taobin_project/xml/vending_tasks_pre_main.xml" + diff --git a/xml/event/robinson_beauty/page_collect_point_robinson_beauty_2.xml b/xml/event/robinson_beauty/page_collect_point_robinson_beauty_2.xml index 9035b44c..a622c7b5 100644 --- a/xml/event/robinson_beauty/page_collect_point_robinson_beauty_2.xml +++ b/xml/event/robinson_beauty/page_collect_point_robinson_beauty_2.xml @@ -219,7 +219,7 @@ ; Menu 2 - If Seeker.selected_a_drink = "12-99-05-0059" Then + If Seeker.selected_a_drink = "12-99-05-0073" Then If MenuPoint[1] = 1 then Else diff --git a/xml/event/robinson_beauty/page_collect_point_robinson_beauty_error.xml b/xml/event/robinson_beauty/page_collect_point_robinson_beauty_error.xml index 7dc69e03..d657f4b5 100644 --- a/xml/event/robinson_beauty/page_collect_point_robinson_beauty_error.xml +++ b/xml/event/robinson_beauty/page_collect_point_robinson_beauty_error.xml @@ -43,7 +43,7 @@ ; Menu 2 - If Seeker.selected_a_drink = "12-99-05-0059" Then + If Seeker.selected_a_drink = "12-99-05-0073" Then Var newPointIndex = 1 EndIf diff --git a/xml/event/robinson_beauty/page_robinson_beauty_random_result.xml b/xml/event/robinson_beauty/page_robinson_beauty_random_result.xml index 4cb51b39..88f23381 100644 --- a/xml/event/robinson_beauty/page_robinson_beauty_random_result.xml +++ b/xml/event/robinson_beauty/page_robinson_beauty_random_result.xml @@ -24,10 +24,10 @@ If CodeType = "138" Then Var RewardText = DirImage + "/reward_lip_tint_oil_name.png" Var RewardImage = DirImage + "/reward_lip_tint_oil.png" - Var RewardText_X = 18 - Var RewardText_Y = 923 - Var RewardImage_X = 169 - Var RewardImage_Y = 578 + Var RewardText_X = 169 + Var RewardText_Y = 578 + Var RewardImage_X = 18 + Var RewardImage_Y = 923 EndIf If CodeType = "139" Then diff --git a/xml/page_NewBrewing3.xml b/xml/page_NewBrewing3.xml index 207f9e52..fb11825e 100644 --- a/xml/page_NewBrewing3.xml +++ b/xml/page_NewBrewing3.xml @@ -50,8 +50,6 @@ Var PrintCoinAmount = 0 - WRITE_FILE "/mnt/sdcard/coffeevending/log/drink-success" "--" - If show_eng = "true" Then @@ -297,7 +295,7 @@ If bg_lidProblem_ST = "Enable" Then Var EnableTopupCreditBetweenBrew = "Invisible" - Var EnableGetMore + Var GetLidButtonState = "Invisible" EndIf If bg_strawProblem_ST = "Enable" Then diff --git a/xml/page_board.xml b/xml/page_board.xml index 4a77a6de..57c51ba0 100644 --- a/xml/page_board.xml +++ b/xml/page_board.xml @@ -632,6 +632,8 @@ DEBUGVAR EventTurnOn Var UsePepsiTheme = 0 + OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/sold_cup_count.xml" + ;inter-page-board If CountryName = "Malaysia" Then @@ -698,6 +700,7 @@ If BoxID = 200002 Then Var UseSlideShowVideo = 1 EndIf + OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/sold_cup_count.xml" EndIf @@ -727,6 +730,7 @@ Var MaxPhoneNumber = 12 STRCONTAIN "1215" MaterialAvailable SugarZeroCalEnable + OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/sold_cup_count.xml" EndIf ;inter-page-board @@ -746,6 +750,7 @@ ;Var VideoMainPage = "ROOT/taobin_project/inter/aus/video/video_main.mp4" Var img_press_main_page = "ROOT/taobin_project/image/main_page_en/bp_main_page_start.png" + Var ShowNetworkProblemText = "Network error. Payment Cash only." Var CountryRootPath = "ROOT/taobin_project/inter/aus/" @@ -779,6 +784,7 @@ Var MinPhoneNumber = 10 Var MaxPhoneNumber = 10 + OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/sold_cup_count.xml" EndIf @@ -827,6 +833,7 @@ Var MinPhoneNumber = 10 Var MaxPhoneNumber = 11 + OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/sold_cup_count.xml" EndIf @@ -844,6 +851,7 @@ Var show_eng = "true" Var img_press_main_page = "ROOT/taobin_project/image/main_page_en/bp_main_page_start.png" + Var VideoMainPage = "ROOT/taobin_project/inter/sgp/video/video_main.mp4" Var ShowNetworkProblemText = "Network error. Payment Cash only." @@ -862,6 +870,10 @@ Var MemberButtonFileName = "" Var MemberButtonFileNameRest = "" + + + Var MemberButtonFileName = "ROOT/taobin_project/image/main_page_en/bp_main_page_member.png" + Var MemberButtonFileNameRest = "ROOT/taobin_project/image/main_page_en/bn_main_page_member.png" Var show_eng_button_stage = "Invisible" Var CountDownShowButton = 35 @@ -880,7 +892,10 @@ ; Singapore disable point Var SettingIgnoreCollectPoint = 1 - + If BoxID = 210604 Then + Var SettingIgnoreCollectPoint = 0 + EndIf + READ_FILE "/mnt/sdcard/coffeevending/use_pt_dev" use_pt_dev STRCONTAIN "1" use_pt_dev enable_pt_mode_by_cfg @@ -899,8 +914,13 @@ DEBUGVAR ShowButtonClick2 Var UsePepsiTheme = 0 + Var UsePepsiTheme = 1 Var TargetThemeNum = 2 + Var VideoAdvert = "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml" + OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/sold_cup_count.xml" + + EndIf @@ -962,6 +982,7 @@ Var MaxPhoneNumber = 9 Var UsePepsiTheme = 1 + OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/sold_cup_count.xml" EndIf @@ -1030,6 +1051,7 @@ Var ShowCountDownAsPercent = 1 DEBUGVAR ShowButtonClick2 + OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/sold_cup_count.xml" EndIf @@ -1232,6 +1254,11 @@ XMLSaveFileNameForResume 0 "/mnt/sdcard/coffeevending/taobin_project/xml/page_board.xml" XMLSaveFileNameForResume 1 "/mnt/sdcard/coffeevending/taobin_project/xml/sold_cup_count.xml" + + Var CountDownPauseVideo2 = 2 + DEBUGVAR CountDownPauseVideo2 + Var TimeProfilePrice = 0 + Var XMLProfilePrevious = XMLProfile @@ -1305,7 +1332,7 @@ Var NextPage = "ROOT/taobin_project/xml/page_back_to_main.xml" - OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml" + OpenInst 1 VideoAdvert Var OpenFromPageBoard = 1 @@ -1328,118 +1355,49 @@ - Var XMLProfile = "General" - PRICE "Reset" "-" - PRICE "Load" "-" - PRICE "CheckAndApply" XMLProfile + Var XMLProfile = "ProfileIncrease15" + Var TimeProfilePrice = 0 - DEBUGVAR ProfileIndex[0] - DEBUGVAR ProfileIndex[1] - DEBUGVAR ProfileIndex[2] - DEBUGVAR ProfileIndex[3] - DEBUGVAR ProfileIndex[4] - DEBUGVAR ProfileIndex[5] - DEBUGVAR ProfileIndex[6] - DEBUGVAR ProfileIndex[7] - DEBUGVAR ProfileIndex[8] - DEBUGVAR ProfileIndex[9] - DEBUGVAR ProfileIndex[10] - - PRICE "Reload" "" - Var XMLProfile = "ProfileIncrease15" + Var XMLProfile = "ProfileIncrease25" + Var TimeProfilePrice = 0 - Var XMLProfile = "School" - PRICE "Reset" "-" - PRICE "Load" "-" - PRICE "CheckAndApply" XMLProfile + Var XMLProfile = "ProfileIncrease30" + Var TimeProfilePrice = 0 - DEBUGVAR ProfileIndex[0] - DEBUGVAR ProfileIndex[1] - DEBUGVAR ProfileIndex[2] - DEBUGVAR ProfileIndex[3] - DEBUGVAR ProfileIndex[4] - DEBUGVAR ProfileIndex[5] - DEBUGVAR ProfileIndex[6] - DEBUGVAR ProfileIndex[7] - DEBUGVAR ProfileIndex[8] - DEBUGVAR ProfileIndex[9] - DEBUGVAR ProfileIndex[10] - PRICE "Reload" "" - Var XMLProfile = "TierSouki" - PRICE "Reset" "-" - PRICE "Load" "-" - PRICE "CheckAndApply" XMLProfile - - DEBUGVAR ProfileIndex[0] - DEBUGVAR ProfileIndex[1] - DEBUGVAR ProfileIndex[2] - DEBUGVAR ProfileIndex[3] - DEBUGVAR ProfileIndex[4] - DEBUGVAR ProfileIndex[5] - DEBUGVAR ProfileIndex[6] - DEBUGVAR ProfileIndex[7] - DEBUGVAR ProfileIndex[8] - DEBUGVAR ProfileIndex[9] - DEBUGVAR ProfileIndex[10] - PRICE "Reload" "" + Var XMLProfile = "ProfileIncrease35" + Var TimeProfilePrice = 0 - Var XMLProfile = "Tier1" - PRICE "Reset" "-" - PRICE "Load" "-" - PRICE "CheckAndApply" XMLProfile - - DEBUGVAR ProfileIndex[0] - DEBUGVAR ProfileIndex[1] - DEBUGVAR ProfileIndex[2] - DEBUGVAR ProfileIndex[3] - DEBUGVAR ProfileIndex[4] - DEBUGVAR ProfileIndex[5] - DEBUGVAR ProfileIndex[6] - DEBUGVAR ProfileIndex[7] - DEBUGVAR ProfileIndex[8] - DEBUGVAR ProfileIndex[9] - DEBUGVAR ProfileIndex[10] - PRICE "Reload" "" + Var XMLProfile = "ProfileIncrease45" + Var TimeProfilePrice = 0 Var XMLProfile = "Discount50" - - - CacheVarStr "put" XMLProfile - ;PRICE "Reset" "-" - ;PRICE "Load" "-" - ;PRICE "CheckAndApply" XMLProfile - - ;DEBUGVAR ProfileIndex[0] - ;DEBUGVAR ProfileIndex[1] - ;DEBUGVAR ProfileIndex[2] - ;DEBUGVAR ProfileIndex[3] - ;DEBUGVAR ProfileIndex[4] - ;DEBUGVAR ProfileIndex[5] - ;DEBUGVAR ProfileIndex[6] - ;DEBUGVAR ProfileIndex[7] - ;DEBUGVAR ProfileIndex[8] - ;DEBUGVAR ProfileIndex[9] - ;DEBUGVAR ProfileIndex[10] - ;PRICE "Reload" "" + Var TimeProfilePrice = 0 + + Var XMLProfile = "Discount90Per" + CacheVarStr "put" XMLProfile + + + + SAVELOG "EventDrink EventDrink EventDrink EventDrink EventDrink " @@ -1597,7 +1555,7 @@ Var ShowButtonClick = "Invisible" Refresh EndIf - + If CountDownShowButton = 3 Then Var ShowButtonClick = "Enable" @@ -1606,9 +1564,12 @@ EndIf If CountDownPauseVideo > 0 Then + DEBUGVAR CountDownPauseVideo ; ignore + Var CountDownPauseVideo = CountDownPauseVideo - 1 - + Var CountDownPauseVideo2 = CountDownPauseVideo - 1 + DEBUGVAR CountDownPauseVideo2 If CountDownPauseVideo = 2 Then TapScreen 30 638 @@ -1617,16 +1578,17 @@ If CountDownPauseVideo = 1 Then - + TapScreen 860 1004 EndIf + If CountDownPauseVideo = 0 Then Var NextPage = "ROOT/taobin_project/xml/page_back_to_main.xml" - OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml" + OpenInst 1 VideoAdvert Var OpenFromPageBoard = 1 @@ -1739,6 +1701,32 @@ EndIf + + Var TimeProfilePrice = TimeProfilePrice + 1 + If XMLProfilePrevious = XMLProfile Then + + Else + If TimeProfilePrice = 5 Then + PRICE "Reset" "-" + PRICE "Load" "-" + PRICE "CheckAndApply" XMLProfile + + DEBUGVAR ProfileIndex[0] + DEBUGVAR ProfileIndex[1] + DEBUGVAR ProfileIndex[2] + DEBUGVAR ProfileIndex[3] + DEBUGVAR ProfileIndex[4] + DEBUGVAR ProfileIndex[5] + DEBUGVAR ProfileIndex[6] + DEBUGVAR ProfileIndex[7] + DEBUGVAR ProfileIndex[8] + DEBUGVAR ProfileIndex[9] + DEBUGVAR ProfileIndex[10] + + PRICE "Reload" "-" + EndIf + EndIf + Refresh TimerReset @@ -1792,10 +1780,10 @@ ; Handle penetrator If Only18 = "true" Then - OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml" + OpenInst 1 VideoAdvert OpenInst 2 "ROOT/taobin_project/xml/page_identity18_verification.xml" Else - OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml" + OpenInst 1 VideoAdvert OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml" EndIf @@ -1831,7 +1819,7 @@ SoundVolume - ;OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml" + OpenInst 1 VideoAdvert If CocktailShow = "true" Then OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_cocktail.xml" Else @@ -1869,7 +1857,7 @@ Var NextPage = "-" - OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml" + OpenInst 1 VideoAdvert If InternationalEnable = 1 Then ;inter-xml-open @@ -1923,7 +1911,7 @@ SAVELOG "click ShowButtonClickFull" Var NextPage = "-" - OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml" + OpenInst 1 VideoAdvert If SpiralOnline = "true" Then OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_with_vending.xml" @@ -1994,7 +1982,7 @@ If IgnoreNetCore = "true" Then Var NextPage = "-" - OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml" + OpenInst 1 VideoAdvert OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog.lxml" @@ -2017,7 +2005,7 @@ Var NextPage = "ROOT/taobin_project/xml/page_back_to_main.xml" - OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml" + OpenInst 1 VideoAdvert Var OpenFromPageBoard = 1 diff --git a/xml/page_brewing3.xml b/xml/page_brewing3.xml index 3f79a9ed..87dc090c 100644 --- a/xml/page_brewing3.xml +++ b/xml/page_brewing3.xml @@ -52,8 +52,6 @@ Var PrintCoinAmount = 0 - WRITE_FILE "/mnt/sdcard/coffeevending/log/drink-success" "--" - If show_eng = "true" Then @@ -394,7 +392,7 @@ If bg_lidProblem_ST = "Enable" Then Var EnableTopupCreditBetweenBrew = "Invisible" - Var EnableGetMore + Var GetLidButtonState = "Invisible" EndIf If bg_strawProblem_ST = "Enable" Then diff --git a/xml/page_catalog_group_pro_robinson_beauty.xml b/xml/page_catalog_group_pro_robinson_beauty.xml index 98821d5f..36b10dfb 100644 --- a/xml/page_catalog_group_pro_robinson_beauty.xml +++ b/xml/page_catalog_group_pro_robinson_beauty.xml @@ -53,7 +53,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "ICED REVLON STRAW CHEE SODA" + Var NameDrink = "REVLON STRAW CHEE SODA SMOOTHIE" Var NameDrinkTH = "เรฟลอนสตรอว์ชี่ โซดา" Var DrinkDescriptionTH = "น้ำเชื่อมสตรอเบอร์รี่ น้ำเชื่อมลิ้นจี่ และโซดา" Var DrinkDescription = "Strawberry Syrup, Lychee Syrup &Soda" @@ -150,8 +150,8 @@ KanitMediumTTF 0x322B26 showengText - "ICED REVLON -STRAW CHEE SODA" + "REVLON +STRAW CHEE SODA SMOOTHIE" 16 @@ -1319,7 +1319,7 @@ STRAW CANO" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "ICED CLARINS PLUM CARA MILK" + Var NameDrink = "CLARINS PLUM CARA MILK SMOOTHIE" Var NameDrinkTH = "คลาแรงส์พลัม คารามิลล์" Var DrinkDescriptionTH = "น้ำเชื่อมบ๊วย น้ำเชื่อมคาราเมล นมและน้ำแข็ง" Var DrinkDescription = "Ume Syrup, Caramel Syrup, Milk ,Ice" @@ -1416,8 +1416,8 @@ STRAW CANO" KanitMediumTTF 0x322B26 showengText - "ICED CLARINS -PLUM CARA MILK" + "CLARINS +PLUM CARA MILK SMOOTHIE" 16 @@ -2582,7 +2582,7 @@ CAFE LATTE" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "ICED SON JAS CHEE TEA" + Var NameDrink = "SON JAS CHEE TEA SMOOTHIE" Var NameDrinkTH = "สันจัสชี่" Var DrinkDescriptionTH = "น้ำเชื่อมลิ้นจี่ ชามะลิ และน้ำ" Var DrinkDescription = "Lychee Syrup, Jasmine Tea, Water" @@ -2678,8 +2678,8 @@ CAFE LATTE" KanitMediumTTF 0x322B26 showengText - "ICED SON JAS -CHEE TEA" + "SON JAS +CHEE TEA SMOOTHIE" 16 diff --git a/xml/page_checkin_result.xml b/xml/page_checkin_result.xml index f03b87ae..11a091f1 100644 --- a/xml/page_checkin_result.xml +++ b/xml/page_checkin_result.xml @@ -47,6 +47,8 @@ SAVELOG strOnpageLogtext + StatusLog "On checkinresult" + 1000 @@ -90,7 +92,7 @@ If TimerbacktoHome = 0 Then SAVELOG "timeout" SAVELOG "back_to_page_board" - Open "ROOT/taobin_project/xml/page_board.xml" + Open "ROOT/taobin_project/xml/vending_tasks_pre_main.xml" EndIf @@ -172,7 +174,7 @@ PushFile "/sdcard/" "RootManPicture" filepushname SAVELOG strOnsendLogtext - StatusLog "send capture checkin" + StatusLog "send capture" Var statesendButton = "Invisible" Var stateprocessButton = "Enable" @@ -238,7 +240,7 @@ showSendandRetry SAVELOG strOnretryLogtext - StatusLog "retry capture checkin" + StatusLog "retry capture" Open "ROOT/taobin_project/xml/checkin.xml" @@ -252,7 +254,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Open "ROOT/taobin_project/xml/page_board.xml" + Open "ROOT/taobin_project/xml/vending_tasks_pre_main.xml" diff --git a/xml/page_test_money_coin.xml b/xml/page_test_money_coin.xml index be410585..e2420c68 100644 --- a/xml/page_test_money_coin.xml +++ b/xml/page_test_money_coin.xml @@ -16,7 +16,7 @@ Var startTimerChangeSuccess = "false" Var restartTimerChange = 3 Var startrestartTimerChange = "false" - Var TimerbacktoHome = 60 + Var TimerbacktoHome = 300 Var RemainAmountStr !assigned StringFmt( CoinAmount, DisplayFormat, PreScaleConvertShow ) Var TestCoinLine2 = "total amount " @@ -24,14 +24,19 @@ Var RemainAmountStr1 = 0 Var LastCoin = 0 - Var openTextPlaseWait = "Enable" - Var currentStage = "init" - Var coinChange = 10 + Var openTextPlaseWait = "Invisible" + Var currentStage = "" Var intosw = 0 + Var testCoinChange = 10 + + Var popupBeforeTestCoinWarning = "Enable" + Var buttonBeforeTestCoinBack = "Enable" + Var buttonTestCoinStart = "Enable" + + Var popupAfterTestCoinWarning = "Invisible" + Var buttonTestCoinEnd = "Invisible" + - Var showTextCoin5Foc = "Invisible" - Var showTextCoin5Succ = "Invisible" - Var showTextCoin5Fail = "Invisible" Var showTextCoin10Nor = "Invisible" Var showTextCoin10Foc = "Invisible" @@ -70,10 +75,12 @@ DEBUGVAR LastCoin DEBUGVAR CoinAmount + StatusLog "On testcoinbank" + - Var TimerbacktoHome = 60 + Var TimerbacktoHome = 300 Var LastCoin = CoinAmount - LastCoin Var RemainAmountStr1 !assigned StringFmt( LastCoin, DisplayFormat, PreScaleConvertShow ) @@ -86,22 +93,6 @@ DEBUGVAR LastCoin DEBUGVAR CoinAmount - If currentStage = "test5bath" Then - If intosw = 0 Then - Var intosw = 1 - If LastCoin = 5 Then - SAVELOG "test5bath_pass" - StatusLog "test5bath_pass" - Var currentStage = "test10bath" - SAVELOG "state_test10bath" - Else - SAVELOG "test5bath_fail" - StatusLog "test5bath_fail" - Var currentStage = "test5fail" - SAVELOG "state_test5bath_fail" - EndIf - EndIf - EndIf If currentStage = "test10bath" Then @@ -139,15 +130,6 @@ EndIf - If currentStage = "test5fail" Then - If LastCoin = 5 Then - SAVELOG "test5bath_pass" - StatusLog "test5bath_pass" - Var currentStage = "test10bath" - SAVELOG "state_test10bath" - EndIf - EndIf - If currentStage = "test10fail" Then If LastCoin = 10 Then @@ -190,7 +172,7 @@ - Var TimerbacktoHome = 60 + Var TimerbacktoHome = 300 DEBUGVAR ChangeStatus If ChangeStatus = "payout-end" Then Var ChangeOK = 1 @@ -225,94 +207,26 @@ DEBUGVAR currentStage - Var TimerCountDown = TimerCountDown - 1 + + If currentStage = "init" Then + Var TimerCountDown = TimerCountDown - 1 If TimerCountDown = 0 Then Coin ON - Var currentStage = "test5bath" + Var currentStage = "test10bath" Var openTextPlaseWait = "Invisible" - SAVELOG "state_test5bath" + SAVELOG "state_test10bath" EndIf EndIf - If currentStage = "test5bath" Then - - Var showTextCoin5Foc = "Enable" - Var showTextCoin5Succ = "Invisible" - Var showTextCoin5Fail = "Invisible" - - Var showTextCoin10Nor = "Enable" - Var showTextCoin10Foc = "Invisible" - Var showTextCoin10Succ = "Invisible" - Var showTextCoin10Fail = "Invisible" - - Var showTextBank20Nor = "Enable" - Var showTextBank20Foc = "Invisible" - Var showTextBank20Succ = "Invisible" - Var showTextBank20Fail = "Invisible" - - Var showTextChange10Nor = "Enable" - Var showTextChange10Foc = "Invisible" - Var showTextChange10Succ = "Invisible" - Var showTextChange10Fail = "Invisible" - - Var showButtonChange10 = "Invisible" - - Var showTextmessagebankfail = "Invisible" - Var showTextmessagecoinfail = "Invisible" - Var showTextmessagetestallsuccess = "Invisible" - Var showTextmesssagechangefail = "Invisible" - - Var showTextundotest_testcoin = "Invisible" - Var showTextbacktohome_testcoin = "Invisible" - Var showTextretryprocess_testcoin = "Invisible" - Var showExitbutton = "Enable" - - EndIf - - If currentStage = "test5fail" Then - - Var showTextCoin5Foc = "Invisible" - Var showTextCoin5Succ = "Invisible" - Var showTextCoin5Fail = "Enable" - - Var showTextCoin10Nor = "Enable" - Var showTextCoin10Foc = "Invisible" - Var showTextCoin10Succ = "Invisible" - Var showTextCoin10Fail = "Invisible" - - Var showTextBank20Nor = "Enable" - Var showTextBank20Foc = "Invisible" - Var showTextBank20Succ = "Invisible" - Var showTextBank20Fail = "Invisible" - - Var showTextChange10Nor = "Enable" - Var showTextChange10Foc = "Invisible" - Var showTextChange10Succ = "Invisible" - Var showTextChange10Fail = "Invisible" - - Var showButtonChange10 = "Invisible" - Var showTextmessagebankfail = "Invisible" - Var showTextmessagecoinfail = "Enable" - Var showTextmessagetestallsuccess = "Invisible" - Var showTextmesssagechangefail = "Invisible" - - Var showTextundotest_testcoin = "Invisible" - Var showTextbacktohome_testcoin = "Invisible" - Var showTextretryprocess_testcoin = "Invisible" - Var showExitbutton = "Enable" - - EndIf If currentStage = "test10bath" Then - Var showTextCoin5Foc = "Invisible" - Var showTextCoin5Succ = "Enable" - Var showTextCoin5Fail = "Invisible" + Var showTextCoin10Nor = "Invisible" Var showTextCoin10Foc = "Enable" @@ -346,9 +260,6 @@ If currentStage = "test10fail" Then - Var showTextCoin5Foc = "Invisible" - Var showTextCoin5Succ = "Enable" - Var showTextCoin5Fail = "Invisible" Var showTextCoin10Nor = "Invisible" Var showTextCoin10Foc = "Invisible" @@ -382,9 +293,8 @@ If currentStage = "test20bath" Then - Var showTextCoin5Foc = "Invisible" - Var showTextCoin5Succ = "Enable" - Var showTextCoin5Fail = "Invisible" + + Var showTextCoin10Nor = "Invisible" Var showTextCoin10Foc = "Invisible" @@ -417,9 +327,7 @@ If currentStage = "test20fail" Then - Var showTextCoin5Foc = "Invisible" - Var showTextCoin5Succ = "Enable" - Var showTextCoin5Fail = "Invisible" + Var showTextCoin10Nor = "Invisible" Var showTextCoin10Foc = "Invisible" @@ -453,9 +361,7 @@ If currentStage = "testchange10" Then - Var showTextCoin5Foc = "Invisible" - Var showTextCoin5Succ = "Enable" - Var showTextCoin5Fail = "Invisible" + Var showTextCoin10Nor = "Invisible" Var showTextCoin10Foc = "Invisible" @@ -489,46 +395,51 @@ If currentStage = "finish" Then - Var showTextCoin5Foc = "Invisible" - Var showTextCoin5Succ = "Enable" - Var showTextCoin5Fail = "Invisible" + + Var showTextCoin10Nor = "Invisible" Var showTextCoin10Foc = "Invisible" - Var showTextCoin10Succ = "Enable" + Var showTextCoin10Succ = "Invisible" Var showTextCoin10Fail = "Invisible" Var showTextBank20Nor = "Invisible" Var showTextBank20Foc = "Invisible" - Var showTextBank20Succ = "Enable" + Var showTextBank20Succ = "Invisible" Var showTextBank20Fail = "Invisible" Var showTextChange10Nor = "Invisible" Var showTextChange10Foc = "Invisible" - Var showTextChange10Succ = "Enable" + Var showTextChange10Succ = "Invisible" Var showTextChange10Fail = "Invisible" Var showButtonChange10 = "Invisible" Var showTextmessagebankfail = "Invisible" Var showTextmessagecoinfail = "Invisible" - Var showTextmessagetestallsuccess = "Enable" + Var showTextmessagetestallsuccess = "Invisible" Var showTextmesssagechangefail = "Invisible" Var showTextundotest_testcoin = "Invisible" - Var showTextbacktohome_testcoin = "Enable" - Var showTextretryprocess_testcoin = "Enable" + Var showTextbacktohome_testcoin = "Invisible" + Var showTextretryprocess_testcoin = "Invisible" Var showExitbutton = "Invisible" + + Var popupBeforeTestCoinWarning = "Invisible" + Var buttonBeforeTestCoinBack = "Invisible" + Var buttonTestCoinStart = "Invisible" + + Var buttonTestCoinEnd = "Enable" + Var popupAfterTestCoinWarning = "Enable" + EndIf If currentStage = "testchange10fail" Then - Var showTextCoin5Foc = "Invisible" - Var showTextCoin5Succ = "Enable" - Var showTextCoin5Fail = "Invisible" + Var showTextCoin10Nor = "Invisible" Var showTextCoin10Foc = "Invisible" @@ -600,7 +511,7 @@ Coin STANDBY CoinClear SAVELOG "back_to_page_board" - Open "ROOT/taobin_project/xml/page_board.xml" + Open "ROOT/taobin_project/xml/vending_tasks_pre_main.xml" EndIf @@ -629,6 +540,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume + StatusLog "backtohome" Coin STANDBY CoinClear Open "ROOT/taobin_project/xml/vending_tasks_pre_main.xml" @@ -661,48 +573,11 @@ - - -;group 5 bath start - - - 190 - 235 - 40 - 560 - SoundVolume - "ROOT/taobin_project/image/new_vending_info/testcoin_5_foc.png" - showTextCoin5Foc - - - - 200 - 235 - 60 - 590 - SoundVolume - "ROOT/taobin_project/image/new_vending_info/testcoin_5_succ.png" - showTextCoin5Succ - - - - 200 - 235 - 60 - 590 - SoundVolume - "ROOT/taobin_project/image/new_vending_info/testcoin_5_fail.png" - showTextCoin5Fail - - - -;group 5 bath end - ;group 10 bath start 200 - 320 + 230 40 560 SoundVolume @@ -712,7 +587,7 @@ 205 - 320 + 230 40 560 SoundVolume @@ -722,7 +597,7 @@ 210 - 320 + 230 60 590 SoundVolume @@ -732,7 +607,7 @@ 210 - 320 + 230 60 590 SoundVolume @@ -747,7 +622,7 @@ 180 - 410 + 320 40 560 SoundVolume @@ -757,7 +632,7 @@ 180 - 410 + 320 40 560 SoundVolume @@ -767,7 +642,7 @@ 175 - 410 + 320 60 590 SoundVolume @@ -778,7 +653,7 @@ 175 - 410 + 320 60 590 SoundVolume @@ -794,7 +669,7 @@ 245 - 500 + 400 60 590 SoundVolume @@ -805,7 +680,7 @@ 230 - 500 + 400 60 590 SoundVolume @@ -815,7 +690,7 @@ 255 - 500 + 400 60 590 SoundVolume @@ -825,7 +700,7 @@ 255 - 500 + 400 60 590 SoundVolume @@ -844,11 +719,11 @@ SoundVolume showButtonChange10 - Var TimerbacktoHome = 60 + Var TimerbacktoHome = 300 SAVELOG "change_btn_click" Var showTextundotest_testcoin = "Invisible" Var showButtonChange10 = "Invisible" - Change coinChange + Change testCoinChange Var startTimerChangeSuccess = "true" @@ -921,9 +796,10 @@ showTextbacktohome_testcoin SAVELOG "backtohome_click" + StatusLog "backtohome" Coin STANDBY CoinClear - Open "ROOT/taobin_project/xml/page_board.xml" + Open "ROOT/taobin_project/xml/vending_tasks_pre_main.xml" @@ -938,17 +814,13 @@ SoundVolume showTextretryprocess_testcoin - Var TimerbacktoHome = 60 + Var TimerbacktoHome = 300 Var currentStage = "init" Var openTextPlaseWait = "Enable" Var LastCoin = 0 Var TimerCountDown = 3 SAVELOG "retry_btn_click" - SAVELOG "state_test5bath" - - Var showTextCoin5Foc = "Invisible" - Var showTextCoin5Succ = "Invisible" - Var showTextCoin5Fail = "Invisible" + SAVELOG "state_test10bath" Var showTextCoin10Nor = "Invisible" Var showTextCoin10Foc = "Invisible" @@ -988,34 +860,7 @@ - ;group message end @@ -1031,11 +876,112 @@ showExitbutton SAVELOG "exit_button" + StatusLog "backtohome" Coin STANDBY CoinClear - Open "ROOT/taobin_project/xml/page_board.xml" + Open "ROOT/taobin_project/xml/vending_tasks_pre_main.xml" +; warning before start zone start + + + + 150 + 150 + 800 + 800 + SoundVolume + "ROOT/taobin_project/image/new_vending_info/warningbeforetestcoin.png" + popupBeforeTestCoinWarning + + + + + + + + + + + +; warning before start zone end + + +; warning after end zone start + + + + + 150 + 150 + 800 + 800 + SoundVolume + "ROOT/taobin_project/image/new_vending_info/aftertestcoinwarning.png" + popupAfterTestCoinWarning + + + + + + + + +; warning after end zone end + + \ No newline at end of file diff --git a/xml/page_thankyou.xml b/xml/page_thankyou.xml index 5820d5f9..1f0df729 100644 --- a/xml/page_thankyou.xml +++ b/xml/page_thankyou.xml @@ -45,6 +45,7 @@ If Seeker = "curr" Then Var LastMakeDrinkResult = "-" + WRITE_FILE "/mnt/sdcard/coffeevending/log/drink-success" "--" EndIf If show_eng = "true" Then diff --git a/xml/sold_cup_count.xml b/xml/sold_cup_count.xml index 275247e6..d4340f68 100644 --- a/xml/sold_cup_count.xml +++ b/xml/sold_cup_count.xml @@ -15,11 +15,15 @@ Var SoldCupTimeout = 0 Var KanitMediumTTF = "ROOT/taobin_project/font/Kanit/Kanit-Regular.ttf" + Var XMLFileVideo = "true" + DEBUGVAR XMLFileVideo + ;include="ROOT/taobin_project/inc/video.inc" + 1000 Var SoldCupTimeout = SoldCupTimeout + 1 @@ -38,6 +42,10 @@ Refresh EndIf + Var Timeout = 0 + If Timeout > 15 Then + ;include="ROOT/taobin_project/inc/video.inc" + EndIf TimerReset @@ -46,54 +54,117 @@ 39 450 "ROOT/taobin_project/image/sold_cup/rectangle.png" + eval( + If CountryName = "Singapore" Then + Var return = "Invisible" + Else + Var return = "Enable" + EndIf +) 148 450 "ROOT/taobin_project/image/sold_cup/rectangle.png" + eval( + If CountryName = "Singapore" Then + Var return = "Invisible" + Else + Var return = "Enable" + EndIf +) 257 450 "ROOT/taobin_project/image/sold_cup/rectangle.png" + eval( + If CountryName = "Singapore" Then + Var return = "Invisible" + Else + Var return = "Enable" + EndIf +) 383 450 "ROOT/taobin_project/image/sold_cup/rectangle.png" + eval( + If CountryName = "Singapore" Then + Var return = "Invisible" + Else + Var return = "Enable" + EndIf +) 492 450 "ROOT/taobin_project/image/sold_cup/rectangle.png" + eval( + If CountryName = "Singapore" Then + Var return = "Invisible" + Else + Var return = "Enable" + EndIf +) 601 450 "ROOT/taobin_project/image/sold_cup/rectangle.png" + eval( + If CountryName = "Singapore" Then + Var return = "Invisible" + Else + Var return = "Enable" + EndIf +) 730 450 "ROOT/taobin_project/image/sold_cup/rectangle.png" + eval( + If CountryName = "Singapore" Then + Var return = "Invisible" + Else + Var return = "Enable" + EndIf +) 839 450 "ROOT/taobin_project/image/sold_cup/rectangle.png" + eval( + If CountryName = "Singapore" Then + Var return = "Invisible" + Else + Var return = "Enable" + EndIf +) 948 450 "ROOT/taobin_project/image/sold_cup/rectangle.png" + eval( + If CountryName = "Singapore" Then + Var return = "Invisible" + Else + Var return = "Enable" + EndIf +) @@ -108,6 +179,13 @@ 1500 center-vertical-horizontal SoldCupDigit[0] + eval( + If CountryName = "Singapore" Then + Var return = "Invisible" + Else + Var return = "Enable" + EndIf +) @@ -122,6 +200,13 @@ 1500 center-vertical-horizontal SoldCupDigit[1] + eval( + If CountryName = "Singapore" Then + Var return = "Invisible" + Else + Var return = "Enable" + EndIf +) @@ -136,6 +221,13 @@ 1500 center-vertical-horizontal SoldCupDigit[2] + eval( + If CountryName = "Singapore" Then + Var return = "Invisible" + Else + Var return = "Enable" + EndIf +) @@ -149,7 +241,14 @@ 850 1500 center-vertical-horizontal - SoldCupDigit[3] + SoldCupDigit[3] + eval( + If CountryName = "Singapore" Then + Var return = "Invisible" + Else + Var return = "Enable" + EndIf +) @@ -163,7 +262,14 @@ 700 1500 center-vertical-horizontal - SoldCupDigit[4] + SoldCupDigit[4] + eval( + If CountryName = "Singapore" Then + Var return = "Invisible" + Else + Var return = "Enable" + EndIf +) @@ -178,6 +284,13 @@ 1500 center-vertical-horizontal SoldCupDigit[5] + eval( + If CountryName = "Singapore" Then + Var return = "Invisible" + Else + Var return = "Enable" + EndIf +) @@ -192,6 +305,13 @@ 1500 center-vertical-horizontal SoldCupDigit[6] + eval( + If CountryName = "Singapore" Then + Var return = "Invisible" + Else + Var return = "Enable" + EndIf +) @@ -206,6 +326,13 @@ 1500 center-vertical-horizontal SoldCupDigit[7] + eval( + If CountryName = "Singapore" Then + Var return = "Invisible" + Else + Var return = "Enable" + EndIf +) @@ -220,6 +347,13 @@ 1500 center-vertical-horizontal SoldCupDigit[8] + eval( + If CountryName = "Singapore" Then + Var return = "Invisible" + Else + Var return = "Enable" + EndIf +) @@ -230,6 +364,13 @@ KanitMediumTTF 0x523D30 cups_sold_text + eval( + If CountryName = "Singapore" Then + Var return = "Invisible" + Else + Var return = "Enable" + EndIf +) @@ -241,6 +382,13 @@ KanitMediumTTF 0x523D30 "," + eval( + If CountryName = "Singapore" Then + Var return = "Invisible" + Else + Var return = "Enable" + EndIf +) @@ -252,6 +400,13 @@ KanitMediumTTF 0x523D30 "," + eval( + If CountryName = "Singapore" Then + Var return = "Invisible" + Else + Var return = "Enable" + EndIf +) diff --git a/xml/vending_info.xml b/xml/vending_info.xml index 2f057b2d..0ea3abd7 100644 --- a/xml/vending_info.xml +++ b/xml/vending_info.xml @@ -920,6 +920,8 @@ "Access setting (V2)" + + ; ; 930 ; info_cancel_y diff --git a/xml/vending_info2.xml b/xml/vending_info2.xml index c59cd9db..958d3421 100644 --- a/xml/vending_info2.xml +++ b/xml/vending_info2.xml @@ -216,8 +216,8 @@ Var HiddenPassPhrase = "" If ClickOn = "GetAccess" Then - MainMenu2 - ;Open "ROOT/taobin_project/xml/vending_tasks_pre_main.xml" + ;MainMenu2 + Open "ROOT/taobin_project/xml/vending_tasks_pre_main.xml" EndIf If ClickOn = "QuickTest" Then @@ -243,8 +243,8 @@ Var HiddenPassPhrase = "" If ClickOn = "GetAccess" Then - MainMenu2 - ;Open "ROOT/taobin_project/xml/vending_tasks_pre_main.xml" + ;MainMenu2 + Open "ROOT/taobin_project/xml/vending_tasks_pre_main.xml" EndIf If ClickOn = "QuickTest" Then diff --git a/xml/vending_tasks_pre_main.xml b/xml/vending_tasks_pre_main.xml index 74204442..2ca496ec 100644 --- a/xml/vending_tasks_pre_main.xml +++ b/xml/vending_tasks_pre_main.xml @@ -11,9 +11,16 @@ Var EnableMaintenance = "Enable" Var EnableConfigureMachine = "Enable" + Var EnableCheckin = "Enable" + Var EnableTestCoinBank = "Enable" Var Timeout = 0 + If InternationalEnable = 1 Then + Var EnableCheckin = "Invisible" + Var EnableTestCoinBank = "Invisible" + EndIf + @@ -22,7 +29,8 @@ Var Timeout = Timeout + 1 - If Timeout > 30 Then + If Timeout > 300 Then + StatusLog "exit" Open "ROOT/taobin_project/xml/page_board.xml" EndIf @@ -31,8 +39,10 @@ Var Text1_9 = Text1_9 + " " Var Text1_9 = Text1_9 + SystemDate - Var BackToMainTime = 30 - Timeout + Var BackToMainTime = 300 - Timeout + DEBUGVAR tmpPassPhrase + Refresh TimerReset @@ -170,7 +180,7 @@ 22 560 80 - EnableTestSystem + EnableCheckin