Merge branch 'masterpiece' of ssh://192.168.10.159/1TBHDD/ikong/taobin_project into masterpiece
This commit is contained in:
commit
d422d55733
70 changed files with 16954 additions and 10157 deletions
|
|
@ -197,6 +197,8 @@ If SystemDateMonthInt = 7 Then
|
|||
|
||||
EndIf
|
||||
|
||||
DEBUGVAR AppleFarmFestivalPro
|
||||
|
||||
|
||||
Var JemilaToppingFlag = 1
|
||||
If SystemDateDayOfWeek = "Wednesday" Then
|
||||
|
|
@ -243,11 +245,6 @@ If BoxID = 201729 Then
|
|||
EndIf
|
||||
|
||||
If BoxID = 123456 Then
|
||||
Var AppleFarmFestivalPro = 0
|
||||
Var HappyTriosPro = 0
|
||||
Var SchoolOvaltinePro = 0
|
||||
;Var AmericanoPro = 1
|
||||
;Var TaiwaneseTeaPro = 1
|
||||
EndIf
|
||||
|
||||
If BoxID = 173149 Then
|
||||
|
|
@ -319,6 +316,11 @@ If taobin_nopro = "true" Then
|
|||
Var AdvertiseProfile = "00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00"
|
||||
|
||||
Var Discount7_7Pro = 0
|
||||
|
||||
Var AmericanoPro = 0
|
||||
Var TaiwaneseTeaPro = 0
|
||||
|
||||
|
||||
EndIf
|
||||
|
||||
; zone block logic follow ingredent
|
||||
|
|
|
|||
|
|
@ -492,15 +492,12 @@
|
|||
Var TOPPING_PRICE = TOPPING_PRICE + OreoPrice
|
||||
Var strMulti6_1 = "TPID=321,multiply=1"
|
||||
Var DisableUsingCode = "true"
|
||||
DEBUGVAR DisableUsingCode
|
||||
Else
|
||||
|
||||
Else
|
||||
;Var PriceDrinkTmp = PriceDrinkNoTop
|
||||
|
||||
Var strMulti6_1 = "TPID=320,multiply=0"
|
||||
|
||||
Var DisableUsingCode = "false"
|
||||
DEBUGVAR DisableUsingCode
|
||||
|
||||
EndIf
|
||||
|
||||
|
|
@ -510,14 +507,12 @@
|
|||
;Var topping6 = toppingID6index5
|
||||
Var strMulti6_2 = "TPID=323,multiply=1"
|
||||
Var DisableUsingCode = "true"
|
||||
DEBUGVAR DisableUsingCode
|
||||
Else
|
||||
;Var PriceDrinkTmp = PriceDrinkNoTop
|
||||
|
||||
Var strMulti6_2 = "TPID=320,multiply=0"
|
||||
|
||||
Var DisableUsingCode = "false"
|
||||
DEBUGVAR DisableUsingCode
|
||||
|
||||
EndIf
|
||||
|
||||
|
|
@ -526,7 +521,6 @@
|
|||
;Var topping6 = toppingID6index3
|
||||
Var strMulti6_3 = "TPID=322,multiply=1"
|
||||
Var DisableUsingCode = "true"
|
||||
DEBUGVAR DisableUsingCode
|
||||
Else
|
||||
|
||||
;Var PriceDrinkTmp = PriceDrinkNoTop
|
||||
|
|
@ -534,61 +528,52 @@
|
|||
Var strMulti6_3 = "TPID=320,multiply=0"
|
||||
|
||||
Var DisableUsingCode = "false"
|
||||
DEBUGVAR DisableUsingCode
|
||||
|
||||
EndIf
|
||||
|
||||
If CustomMilkState[0] = "PressForever" Then
|
||||
Var strMulti11_1 = "TPID=541,multiply=1"
|
||||
Var DisableUsingCode = "true"
|
||||
DEBUGVAR DisableUsingCode
|
||||
Else
|
||||
Var strMulti11_1 = "TPID=542,multiply=0"
|
||||
Var DisableUsingCode = "false"
|
||||
DEBUGVAR DisableUsingCode
|
||||
EndIf
|
||||
|
||||
If CustomMilkState[1] = "PressForever" Then
|
||||
Var strMulti11_2 = "TPID=542,multiply=1"
|
||||
Var DisableUsingCode = "true"
|
||||
DEBUGVAR DisableUsingCode
|
||||
Else
|
||||
Var strMulti11_2 = "TPID=542,multiply=0"
|
||||
Var DisableUsingCode = "false"
|
||||
DEBUGVAR DisableUsingCode
|
||||
EndIf
|
||||
|
||||
If CustomMilkState[2] = "PressForever" Then
|
||||
Var strMulti11_3 = "TPID=543,multiply=1"
|
||||
Var DisableUsingCode = "true"
|
||||
DEBUGVAR DisableUsingCode
|
||||
Else
|
||||
Var strMulti11_3 = "TPID=542,multiply=0"
|
||||
Var DisableUsingCode = "false"
|
||||
DEBUGVAR DisableUsingCode
|
||||
EndIf
|
||||
|
||||
If CustomTaiwaneseTeaState[0] = "PressForever" Then
|
||||
Var strMulti11_4 = "TPID=546,multiply=1"
|
||||
Var DisableUsingCode = "true"
|
||||
DEBUGVAR DisableUsingCode
|
||||
Else
|
||||
Var strMulti11_4 = "TPID=546,multiply=0"
|
||||
Var DisableUsingCode = "false"
|
||||
DEBUGVAR DisableUsingCode
|
||||
EndIf
|
||||
|
||||
If CustomTaiwaneseTeaState[1] = "PressForever" Then
|
||||
Var strMulti11_5 = "TPID=547,multiply=1"
|
||||
Var DisableUsingCode = "true"
|
||||
DEBUGVAR DisableUsingCode
|
||||
Else
|
||||
Var strMulti11_5 = "TPID=547,multiply=0"
|
||||
Var DisableUsingCode = "false"
|
||||
DEBUGVAR DisableUsingCode
|
||||
EndIf
|
||||
|
||||
|
||||
DEBUGVAR DisableUsingCode
|
||||
|
||||
If CustomTaiwaneseTeaState[1] = "PressForever" Then
|
||||
Var TOPPING_PRICE = TOPPING_PRICE + TaiwaneseTeaIncreasePrice
|
||||
EndIf
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -8,7 +8,15 @@
|
|||
<Volume> SoundVolume </Volume>
|
||||
<EventOpen>
|
||||
; tab_menu hide
|
||||
;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml"
|
||||
If CountryName = "Thailand" Then
|
||||
;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml"
|
||||
EndIf
|
||||
If CountryName = "HongKong" Then
|
||||
;include="ROOT/taobin_project/inter/hkg/xml/multi/tab_menu_hide.lxml"
|
||||
EndIf
|
||||
If CountryName = "Australia" Then
|
||||
;include="ROOT/taobin_project/inter/hkg/xml/multi/tab_menu_hide.lxml"
|
||||
EndIf
|
||||
|
||||
RootLayoutVisible 3 "hide"
|
||||
|
||||
|
|
@ -59,6 +67,9 @@
|
|||
DEBUGVAR web_pin
|
||||
|
||||
Var web_telnumOK = ""
|
||||
|
||||
DEBUGVAR web_readyOK
|
||||
|
||||
Var web_readyOK = "false"
|
||||
|
||||
Var GetFreeFromError = 0
|
||||
|
|
@ -74,7 +85,6 @@
|
|||
Var Seeker.CurrCreditTelNum = ""
|
||||
Var Seeker.CurrCreditPinNum = ""
|
||||
|
||||
DEBUGVAR PaySuccessWithDaemonTask
|
||||
|
||||
Var PaidPaymentFromNextStage = 0
|
||||
Var DrinkPaid = "-"
|
||||
|
|
@ -149,7 +159,7 @@
|
|||
Var XPosiShowCountDownBrew = 768
|
||||
EndIf
|
||||
|
||||
|
||||
Var CountUpForProjectThisFileStruct = 0
|
||||
|
||||
Var MinPhoneNumber = 10
|
||||
Var MaxPhoneNumber = 10
|
||||
|
|
@ -181,7 +191,7 @@
|
|||
|
||||
STRCONTAIN "1060" MaterialAvailable TaiwanesePowderEnable
|
||||
|
||||
|
||||
|
||||
|
||||
If XMLProfile = "" Then
|
||||
CacheVarStr "get" XMLProfile
|
||||
|
|
@ -656,6 +666,7 @@
|
|||
|
||||
If default_english = "true" Then
|
||||
Var show_eng = "true"
|
||||
SetLanguage "ENG"
|
||||
EndIf
|
||||
|
||||
Var InternationalEnable = 0
|
||||
|
|
@ -732,6 +743,7 @@
|
|||
|
||||
|
||||
;inter-page-board
|
||||
|
||||
If CountryName = "Malaysia" Then
|
||||
|
||||
TRY "/mnt/sdcard/coffeevending/taobin_project/inter/mys/video/script_video.ev"
|
||||
|
|
@ -1386,7 +1398,6 @@
|
|||
Var WebAppShow = "Invisible"
|
||||
Var ENABLE_UAE_DUBAI = "Invisible"
|
||||
|
||||
Var LanguageShow = "THAI"
|
||||
EnableLanguage "ENG"
|
||||
EnableLanguage "THAI"
|
||||
|
||||
|
|
@ -1396,7 +1407,6 @@
|
|||
EnableLanguage "MSC"
|
||||
EndIf
|
||||
|
||||
SetLanguage "THAI"
|
||||
LanguageControl "UpdateList" "-"
|
||||
Var show_eng = "false"
|
||||
|
||||
|
|
@ -2050,7 +2060,15 @@ PRICE "Reset" "-"
|
|||
<Timeout> 1000 </Timeout>
|
||||
<EventTimeout>
|
||||
|
||||
;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml"
|
||||
If CountryName = "Thailand" Then
|
||||
;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml"
|
||||
EndIf
|
||||
If CountryName = "HongKong" Then
|
||||
;include="ROOT/taobin_project/inter/hkg/xml/multi/tab_menu_hide.lxml"
|
||||
EndIf
|
||||
If CountryName = "Australia" Then
|
||||
;include="ROOT/taobin_project/inter/hkg/xml/multi/tab_menu_hide.lxml"
|
||||
EndIf
|
||||
|
||||
DEBUGVAR XMLEngineFrontStage
|
||||
|
||||
|
|
@ -2356,7 +2374,7 @@ PRICE "Reset" "-"
|
|||
; Original value is 40
|
||||
If EnableMultiInstance = "true" Then
|
||||
|
||||
If CountUpReloadAll > 100 Then
|
||||
If CountUpReloadAll > 200 Then
|
||||
Var NeedReboot = "false"
|
||||
|
||||
Var StartUpExt = "-"
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -2325,9 +2325,9 @@ Longback" </Value>
|
|||
<State> Flag( 12-03-03-0107.Button,$Sum1203030107) </State>
|
||||
<Button>
|
||||
<State> $Sum1203030107 </State>
|
||||
<Filename> "ROOT/taobin_project/image/page_drink_n//bn_Apple_Oreo_Volcano.png" </Filename>
|
||||
<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_Apple_Oreo_Volcano.png" </FilenamePress>
|
||||
<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_Apple_Oreo_Volcano.png" </FilenameDisable>
|
||||
<Filename> "ROOT/taobin_project/image/page_drink_n//bn_Apple_Oreo_Volcano_banner.png" </Filename>
|
||||
<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_Apple_Oreo_Volcano_banner.png" </FilenamePress>
|
||||
<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_Apple_Oreo_Volcano_banner.png" </FilenameDisable>
|
||||
<OverlayImage> xmlpro( 12-03-03-0107, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
|
||||
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
|
||||
<Volume> SoundVolume </Volume>
|
||||
|
|
@ -2336,7 +2336,7 @@ Longback" </Value>
|
|||
Var NameDrinkTH = "แอปเปิ้ลโอริโอ"
|
||||
Var DrinkDescriptionTH = "แอปเปิ้ล นม โอรีโอ"
|
||||
Var DrinkDescription = "Apple Milk Oreo"
|
||||
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Apple_Oreo_Volcano.png"
|
||||
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Apple_Oreo_Volcano_banner.png"
|
||||
Var OpenFromXML = CurrentXMLFileName2
|
||||
Var PriceD1 = $-.Price
|
||||
Var PriceD2 = $-.Price
|
||||
|
|
|
|||
|
|
@ -2,64 +2,12 @@
|
|||
<Width> 1080 </Width>
|
||||
<Height> 1312 </Height>
|
||||
<EventOpen>
|
||||
DEBUGVAR PaySuccessWithDaemonTask
|
||||
|
||||
|
||||
</EventOpen>
|
||||
<Timeout> 1000 </Timeout>
|
||||
<EventTimeout>
|
||||
|
||||
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
|
||||
|
|
|
|||
|
|
@ -170,7 +170,7 @@
|
|||
|
||||
Var buttonRemoveCup = "Invisible"
|
||||
|
||||
Var thankyouContiVersion = "TC13 "
|
||||
Var thankyouContiVersion = "TC15 "
|
||||
SAVELOG "Thank you conti version " + thankyouContiVersion
|
||||
SAVELOG "Support NextSmoothie and fix bug next"
|
||||
SAVELOG "MenuErrorCode"
|
||||
|
|
@ -300,8 +300,9 @@
|
|||
EndIf
|
||||
EndIf
|
||||
|
||||
|
||||
__CMD "check-cup" Seeker.selected_a_drink "-" "-"
|
||||
If New_Payment = 1 Then
|
||||
__CMD "check-cup" Seeker.selected_a_drink "-" "-"
|
||||
EndIf
|
||||
|
||||
; old condition
|
||||
If HaveCup = "false" Then
|
||||
|
|
@ -442,32 +443,34 @@
|
|||
DEBUGVAR MenuErrorCode
|
||||
|
||||
If MenuReadyForCup = "YES" Then
|
||||
|
||||
|
||||
If DoorCupPosition = "bottom" Then
|
||||
; new payment not enable. use have cup false only.
|
||||
If New_Payment = 1 Then
|
||||
Var VideoPlayFile = VideoPath
|
||||
Var VideoPlayFile = VideoPlayFile + VideoFileBegin
|
||||
Var VideoPlayFile = VideoPlayFile + "1"
|
||||
Var VideoPlayFile = VideoPlayFile + VideoFileEnd
|
||||
|
||||
Var VideoPlayFile = VideoPath
|
||||
Var VideoPlayFile = VideoPlayFile + VideoFileBegin
|
||||
Var VideoPlayFile = VideoPlayFile + "1"
|
||||
Var VideoPlayFile = VideoPlayFile + VideoFileEnd
|
||||
Var PictureFile = PicturePath
|
||||
Var PictureFile = PictureFile + PictureBegin
|
||||
Var PictureFile = PictureFile + "1"
|
||||
Var PictureFile = PictureFile + PictureEnd
|
||||
|
||||
Var PictureFile = PicturePath
|
||||
Var PictureFile = PictureFile + PictureBegin
|
||||
Var PictureFile = PictureFile + "1"
|
||||
Var PictureFile = PictureFile + PictureEnd
|
||||
DEBUGVAR CountDownForShowMenuNextOrderToBrew
|
||||
DEBUGVAR Seeker.selected_a_drink
|
||||
|
||||
DEBUGVAR CountDownForShowMenuNextOrderToBrew
|
||||
DEBUGVAR Seeker.selected_a_drink
|
||||
If CountDownForShowMenuNextOrderToBrew = 3 Then
|
||||
|
||||
If CountDownForShowMenuNextOrderToBrew = 3 Then
|
||||
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
|
||||
If CountDownForShowMenuNextOrderToBrew = 0 Then
|
||||
Var CountDownThankyou = 0
|
||||
Else
|
||||
Var CountDownForShowMenuNextOrderToBrew = CountDownForShowMenuNextOrderToBrew - 1
|
||||
If CountDownForShowMenuNextOrderToBrew = 0 Then
|
||||
Var CountDownThankyou = 0
|
||||
Else
|
||||
Var CountDownForShowMenuNextOrderToBrew = CountDownForShowMenuNextOrderToBrew - 1
|
||||
|
||||
EndIf
|
||||
EndIf
|
||||
Else
|
||||
|
||||
|
|
|
|||
|
|
@ -2609,6 +2609,10 @@
|
|||
Var showShotEnable = "Invisible"
|
||||
Var ShotCoffeePremium = "Invisible"
|
||||
Var ExtraTopping = "Invisible"
|
||||
|
||||
Var CustomCoffeeEnable = "False"
|
||||
Var showCustomCoffee = "Invisible"
|
||||
var showCoffeeLevel = "Invisible"
|
||||
EndIf
|
||||
|
||||
Function 2
|
||||
|
|
@ -2619,24 +2623,6 @@
|
|||
</EventMachine>
|
||||
|
||||
<EventCart>
|
||||
;Var BugFlag = 1
|
||||
If CartUpdate = "true" Then
|
||||
Var CartUpdate = "-"
|
||||
|
||||
|
||||
If CART_COUNT = 3 Then
|
||||
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml"
|
||||
Open "ROOT/taobin_project/xml/page_payment_multi.xml"
|
||||
Else
|
||||
If ButtonNext = "true" Then
|
||||
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml"
|
||||
Open "ROOT/taobin_project/xml/page_payment_multi.xml"
|
||||
Else
|
||||
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
|
||||
Open "ROOT/taobin_project/xml/page_catalog.xml"
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
</EventCart>
|
||||
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -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,102 +47,22 @@
|
|||
|
||||
|
||||
|
||||
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 ==========="
|
||||
|
||||
Var $12-03-03-0094.Price = 35
|
||||
Var $12-03-03-0094.Discount = 15
|
||||
|
||||
|
||||
|
||||
</EventOpen>
|
||||
<Timeout> 120000 </Timeout>
|
||||
|
|
@ -160,5 +79,46 @@
|
|||
|
||||
</EventTimeout>
|
||||
|
||||
<Text>
|
||||
<X>200</X>
|
||||
<Y>200</Y>
|
||||
<Value> "Value must be ฿15 "
|
||||
</Value>
|
||||
<Size> 30 </Size>
|
||||
<Font> fontType1 </Font>
|
||||
<Color> 0x000000 </Color>
|
||||
</Text>
|
||||
|
||||
<Text>
|
||||
<X>480</X>
|
||||
<Y>200</Y>
|
||||
<Value>
|
||||
|
||||
eval(
|
||||
SAVELOG " ============ This is test express recursive ==========="
|
||||
If $12-03-03-0094.Price = -1 Then
|
||||
Var priceFormat = "Free"
|
||||
Else
|
||||
If $12-03-03-0094.Discount = "" Then
|
||||
Var priceFormat = $12-03-03-0094.Price
|
||||
Else
|
||||
If $12-03-03-0094.Discount > 0 Then
|
||||
Var priceFormat = $12-03-03-0094.Discount
|
||||
Else
|
||||
Var priceFormat = $12-03-03-0094.Price
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
DEBUGVAR priceFormat
|
||||
Var return !assigned StringFmt( priceFormat, DisplayFormat, PreScaleConvertShow)
|
||||
|
||||
)
|
||||
|
||||
</Value>
|
||||
<Size> 30 </Size>
|
||||
<Font> fontType1 </Font>
|
||||
<Color> 0x000000 </Color>
|
||||
</Text>
|
||||
|
||||
</Page>
|
||||
|
|
|
|||
92
xml/test_else_if.xml
Normal file
92
xml/test_else_if.xml
Normal file
|
|
@ -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
|
||||
|
|
@ -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
|
||||
|
||||
47
xml/test_forloop.xml
Normal file
47
xml/test_forloop.xml
Normal file
|
|
@ -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 ================"
|
||||
|
|
@ -162,7 +162,6 @@
|
|||
EndIf
|
||||
EndIf
|
||||
|
||||
DEBUGVAR exhaust_fan_schedule
|
||||
|
||||
TRY exhaust_fan_schedule
|
||||
|
||||
|
|
@ -170,14 +169,23 @@
|
|||
|
||||
;include="ROOT/taobin_project/inc/language_toggle_mode.inc"
|
||||
|
||||
DEBUGVAR langfn
|
||||
DEBUGVAR LanguageButtonEnable
|
||||
DEBUGVAR LanguageShow
|
||||
;DEBUGVAR langfn
|
||||
;DEBUGVAR LanguageButtonEnable
|
||||
;DEBUGVAR LanguageShow
|
||||
|
||||
Var CheckDisableTimeout = 0
|
||||
|
||||
TRY "ROOT/taobin_project/xml/features/alert_sms/check_disable.ev"
|
||||
|
||||
READ_FILE "/mnt/sdcard/coffeevending/openfile_xml_0" str_openfile_xml_0
|
||||
READ_FILE "/mnt/sdcard/coffeevending/openfile_xml_2" str_openfile_xml_2
|
||||
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
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
|
||||
</EventOpen>
|
||||
<Timeout> 1000 </Timeout>
|
||||
|
|
@ -307,6 +315,7 @@
|
|||
EndIf
|
||||
EndIf
|
||||
|
||||
|
||||
TimerReset
|
||||
|
||||
</EventTimeout>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue