Merge branch 'masterpiece' of ssh://192.168.10.159:/1TBHDD/ikong/taobin_project into masterpiece
This commit is contained in:
commit
34d8c9cfa0
132 changed files with 17214 additions and 4333 deletions
|
|
@ -892,9 +892,9 @@ Caramel Cheesecake Splendor 51-03-03-0054 1 63 53 22 17 23 41 24 120 17:00 23
|
|||
Mint Cheesecake Symphony 51-03-03-0055 1 63 53 59 17 23 41 24 120 17:00 23
|
||||
Melon Cheesecake Sonata 51-03-03-0056 1 63 53 52 17 23 41 24 120 17:00 23
|
||||
Banana Cheesecake Royale 51-03-03-0057 1 63 53 56 17 23 41 24 120 17:00 23
|
||||
CARAMEL MILK \nBISCOFF VOLCANO 51-03-03-0045 1 22 17 23 40 41 24 120 17:00 23
|
||||
STRAWBERRY MILK \nBISCOFF VOLCANO 51-03-03-0046 1 19 17 23 40 41 24 120 17:00 23
|
||||
Mint MILK \nBISCOFF VOLCANO 51-03-03-0047 1 59 17 23 40 41 24 120 17:00 23
|
||||
CARAMEL MILK \nBISCOFF VOLCANO 51-03-03-0045 1 22 17 23 41 24 120 17:00 23
|
||||
STRAWBERRY MILK \nBISCOFF VOLCANO 51-03-03-0046 1 19 17 23 41 24 120 17:00 23
|
||||
Mint MILK \nBISCOFF VOLCANO 51-03-03-0047 1 59 17 23 41 24 120 17:00 23
|
||||
|
||||
STX On The Beach 51-99-05-0001 1 27 28 24 120 17:00 23
|
||||
Noxious Nitrous 51-99-05-0002 1 27 28 24 120 17:00 23
|
||||
|
|
|
|||
|
Can't render this file because it has a wrong number of fields in line 40.
|
BIN
inter/aus/image/event/anniversary_1st.png
Normal file
BIN
inter/aus/image/event/anniversary_1st.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 214 KiB |
|
|
@ -1,6 +1,3 @@
|
|||
normal_eng=ROOT/taobin_project/image/event/bn_MerdekaPromotionPepsi1.png
|
||||
normal_thai=ROOT/taobin_project/image/event/bn_MerdekaPromotionPepsi1.png
|
||||
press_eng=ROOT/taobin_project/image/event/bn_MerdekaPromotionPepsi1.png
|
||||
press_thai=ROOT/taobin_project/image/event/bn_MerdekaPromotionPepsi1.png
|
||||
disable_eng=ROOT/taobin_project/image/event/bd_MerdekaPromotionPepsi1.png
|
||||
disable_thai=ROOT/taobin_project/image/event/bd_MerdekaPromotionPepsi1.png
|
||||
normal_eng=ROOT/taobin_project/inter/aus/image/event/anniversary_1st.png
|
||||
press_eng=ROOT/taobin_project/inter/aus/image/event/anniversary_1st.png
|
||||
disable_eng=ROOT/taobin_project/inter/aus/image/event/anniversary_1st.png
|
||||
|
|
|
|||
|
|
@ -327,6 +327,10 @@ TextID Note English Thai
|
|||
|
||||
800072 Water Tank restart.
|
||||
800073 Restart Shot coffee count
|
||||
800074 Disc module not close completely แขนปิดไม่สนิท
|
||||
800075 Adjust ice weight Adjust ice weight
|
||||
|
||||
|
||||
|
||||
Soda System
|
||||
800100 stop หยุด
|
||||
|
|
|
|||
|
Can't render this file because it has a wrong number of fields in line 21.
|
|
|
@ -1 +1 @@
|
|||
/event/promotion_2.xml
|
||||
/event/promotion_anniversary_1st.lxml
|
||||
12166
inter/aus/xml/event/promotion_anniversary_1st.lxml
Normal file
12166
inter/aus/xml/event/promotion_anniversary_1st.lxml
Normal file
File diff suppressed because it is too large
Load diff
|
|
@ -1 +1 @@
|
|||
Open "ROOT/taobin_project/xml/page_catalog_momday.xml"
|
||||
; Do nothing
|
||||
|
|
|
|||
|
|
@ -3,33 +3,9 @@
|
|||
<X> 42 </X>
|
||||
<Y> 520 </Y>
|
||||
<State> BigButtonEnable </State>
|
||||
<Filename>
|
||||
eval(
|
||||
If show_eng = "true" Then
|
||||
Var return = ###normal_eng
|
||||
Else
|
||||
Var return = ###normal_thai
|
||||
EndIf
|
||||
)
|
||||
</Filename>
|
||||
<FilenamePress>
|
||||
eval(
|
||||
If show_eng = "true" Then
|
||||
Var return = ###press_eng
|
||||
Else
|
||||
Var return = ###press_thai
|
||||
EndIf
|
||||
)
|
||||
</FilenamePress>
|
||||
<FilenameDisable>
|
||||
eval(
|
||||
If show_eng = "true" Then
|
||||
Var return = ###disable_eng
|
||||
Else
|
||||
Var return = ###disable_thai
|
||||
EndIf
|
||||
)
|
||||
</FilenameDisable>
|
||||
<Filename> ###normal_eng </Filename>
|
||||
<FilenamePress> ###press_eng </FilenamePress>
|
||||
<FilenameDisable> ###disable_eng </FilenameDisable>
|
||||
<EventOnClick>
|
||||
|
||||
###EventOnClick
|
||||
|
|
|
|||
|
|
@ -14,6 +14,10 @@ If WestfieldCatalogFlag = 1 Then
|
|||
Var RecommendPage = "ROOT/taobin_project/inter/aus/xml/event/promotion_westfield.lxml"
|
||||
EndIf
|
||||
|
||||
If AnniverseryPro = 1 Then
|
||||
Var RecommendPage = "ROOT/taobin_project/inter/aus/xml/event/promotion_anniversary_1st.lxml"
|
||||
EndIf
|
||||
|
||||
If OpenFromPageBoard = 1 Then
|
||||
OpenInst 2 RecommendPage
|
||||
Else
|
||||
|
|
|
|||
|
|
@ -15,12 +15,23 @@ Var WinterWarmersCatalogFlag = 0
|
|||
|
||||
Var WestfieldCatalogFlag = 0
|
||||
|
||||
Var XMLLiveInfoEnable = 1
|
||||
; 2 - 29 Sep
|
||||
Var AnniverseryPro = 0
|
||||
|
||||
If BoxID = 200004 Then
|
||||
Var NewCollectPointFlag = 1
|
||||
If SystemDateMonthInt = 9 Then
|
||||
If SystemDateDayInt >= 2 Then
|
||||
If SystemDateDayInt <= 29 then
|
||||
Var AnniverseryPro = 1
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
Var XMLLiveInfoEnable = 1
|
||||
|
||||
|
||||
If BoxID = 200027 Then
|
||||
Var AnniverseryPro = 1
|
||||
EndIf
|
||||
|
||||
If BoxID = 210308 Then
|
||||
Var WestfieldCatalogFlag = 1
|
||||
|
|
|
|||
|
|
@ -9305,7 +9305,7 @@
|
|||
Var PD_CODE2 = "##-##-##-####"
|
||||
Var PD_CODE3 = "51-03-03-0047"
|
||||
; begin lang
|
||||
Var aliasName[0] = "Mint MILK \nBISCOFF VOLCANO"
|
||||
Var aliasName[0] = "MINT MILK \nBISCOFF VOLCANO"
|
||||
Var aliasDesc[0] = "Mint Syrup, Milk,\nSugar, Biscof"
|
||||
Var aliasName[1] = ""
|
||||
Var aliasDesc[1] = ""
|
||||
|
|
@ -9400,9 +9400,9 @@
|
|||
<Font> KanitMediumTTF </Font>
|
||||
<Color> 0x322B26 </Color>
|
||||
<LanguageGroup>
|
||||
<LanguageSlot1>Mint MILK \nBISCOFF VOLCANO</LanguageSlot1>
|
||||
<LanguageSlot1>MINT MILK \nBISCOFF VOLCANO</LanguageSlot1>
|
||||
<LanguageSlot2></LanguageSlot2>
|
||||
<LanguageSlot3>Mint MILK \nBISCOFF VOLCANO</LanguageSlot3>
|
||||
<LanguageSlot3>MINT MILK \nBISCOFF VOLCANO</LanguageSlot3>
|
||||
<LanguageSlot4></LanguageSlot4>
|
||||
<LanguageSlot5></LanguageSlot5>
|
||||
<LanguageSlot6></LanguageSlot6>
|
||||
|
|
|
|||
|
|
@ -12092,8 +12092,8 @@
|
|||
<State> buttonRemoveCup </State>
|
||||
;<Color> "0x00BDFF" </Color>
|
||||
<Interval> 500 </Interval>
|
||||
<Filename> "ROOT/taobin_project/image/main_page/bn_remove_cup.png" </Filename>
|
||||
<Filename> "ROOT/taobin_project/image/main_page/bp_remove_cup.png" </Filename>
|
||||
<Filename> "ROOT/taobin_project/image/main_page_inter/bn_remove_cup.png" </Filename>
|
||||
<Filename> "ROOT/taobin_project/image/main_page_inter/bp_remove_cup.png" </Filename>
|
||||
<EventClick>
|
||||
Machine RemoveCup
|
||||
Machine DoorLidOpen
|
||||
|
|
|
|||
|
|
@ -536,12 +536,8 @@
|
|||
|
||||
Var Tel2DFlag = 0
|
||||
|
||||
Var Tel2D = TelephoneNumber
|
||||
Trim Tel2D 1
|
||||
|
||||
If Tel2D = "0" Then
|
||||
Var Tel2DFlag = 1
|
||||
EndIf
|
||||
Var verifyNumberEV = CountryRootPath + "/xml/verify_number.ev"
|
||||
TRY verifyNumberEV
|
||||
|
||||
If Tel2DFlag = 1 Then
|
||||
|
||||
|
|
|
|||
|
|
@ -553,12 +553,8 @@
|
|||
|
||||
Var Tel2DFlag = 0
|
||||
|
||||
Var Tel2D = TelephoneNumber
|
||||
Trim Tel2D 1
|
||||
|
||||
If Tel2D = "0" Then
|
||||
Var Tel2DFlag = 1
|
||||
EndIf
|
||||
Var verifyNumberEV = CountryRootPath + "/xml/verify_number.ev"
|
||||
TRY verifyNumberEV
|
||||
|
||||
|
||||
If Tel2DFlag = 1 Then
|
||||
|
|
|
|||
|
|
@ -29,7 +29,68 @@
|
|||
LED LedDoorLid Off 255 255 255 255
|
||||
EndIf
|
||||
|
||||
Function 2
|
||||
DEBUGVAR MachineStage
|
||||
DEBUGVAR stop_now
|
||||
Var DirImage = "ROOT/taobin_project/inter/aus/image/vending_error_en"
|
||||
If MachineStage = "mcu-upgrade" Then
|
||||
Var DirImage = CountryRootPath + "image/vending_error_en"
|
||||
EndIf
|
||||
|
||||
If NeedUpgrade = "true" Then
|
||||
Var DirImage = CountryRootPath + "image/vending_error_en"
|
||||
EndIf
|
||||
|
||||
DEBUGVAR MachineStage
|
||||
|
||||
If MachineStage = "close-maintenance" Then
|
||||
DEBUGVAR stop_now
|
||||
If stop_now = "true" Then
|
||||
Var DirImage = CountryRootPath + "image/vending_error_en"
|
||||
Else
|
||||
Var show_error_normal = "Enable"
|
||||
Var show_error_sp1 = "Invisible"
|
||||
|
||||
Var DirImage = CountryRootPath + "image/vending_error_en"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
|
||||
|
||||
If MachineStage = "drink-failed" Then
|
||||
If stop_now = "true" Then
|
||||
Var DirImage = CountryRootPath + "image/vending_error_en"
|
||||
Else
|
||||
Var show_error_normal = "Enable"
|
||||
Var show_error_sp1 = "Invisible"
|
||||
Var DirImage = CountryRootPath + "image/vending_error_en"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
If NETCORE_LOST_CNT > 0 Then
|
||||
|
||||
Var DirImage = CountryRootPath + "image/vending_error_en"
|
||||
EndIf
|
||||
|
||||
If NETCORE_EVENT_CNT_X >= 30 Then
|
||||
Var NETCORE_EVENT_CNT_X = 0
|
||||
|
||||
Var DirImage = CountryRootPath + "image/vending_error_en"
|
||||
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
|
||||
|
||||
Var TimeOut = 0
|
||||
Var textStep = 0
|
||||
|
|
@ -188,76 +249,11 @@
|
|||
Var ButtonLanguageListYPosition = 640
|
||||
OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
|
||||
|
||||
Function 2
|
||||
Open "ROOT/taobin_project/inter/aus/xml/page_show_error.lxml"
|
||||
|
||||
Refresh
|
||||
</EventLanguageOnChange>
|
||||
|
||||
<Function2>
|
||||
DEBUGVAR MachineStage
|
||||
DEBUGVAR stop_now
|
||||
Var DirImage = "ROOT/taobin_project/inter/aus/image/vending_error_en"
|
||||
If MachineStage = "mcu-upgrade" Then
|
||||
Var DirImage = CountryRootPath + "image/vending_error_en"
|
||||
EndIf
|
||||
|
||||
If NeedUpgrade = "true" Then
|
||||
Var DirImage = CountryRootPath + "image/vending_error_en"
|
||||
EndIf
|
||||
|
||||
DEBUGVAR MachineStage
|
||||
|
||||
If MachineStage = "close-maintenance" Then
|
||||
DEBUGVAR stop_now
|
||||
If stop_now = "true" Then
|
||||
Var DirImage = CountryRootPath + "image/vending_error_en"
|
||||
Else
|
||||
Var show_error_normal = "Enable"
|
||||
Var show_error_sp1 = "Invisible"
|
||||
|
||||
Var DirImage = CountryRootPath + "image/vending_error_en"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
|
||||
|
||||
If MachineStage = "drink-failed" Then
|
||||
If stop_now = "true" Then
|
||||
Var DirImage = CountryRootPath + "image/vending_error_en"
|
||||
Else
|
||||
Var show_error_normal = "Enable"
|
||||
Var show_error_sp1 = "Invisible"
|
||||
Var DirImage = CountryRootPath + "image/vending_error_en"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
If NETCORE_LOST_CNT > 0 Then
|
||||
|
||||
Var DirImage = CountryRootPath + "image/vending_error_en"
|
||||
EndIf
|
||||
|
||||
If NETCORE_EVENT_CNT_X >= 30 Then
|
||||
Var NETCORE_EVENT_CNT_X = 0
|
||||
|
||||
Var DirImage = CountryRootPath + "image/vending_error_en"
|
||||
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
|
||||
</Function2>
|
||||
|
||||
<Image>
|
||||
<State> show_error_normal </State>
|
||||
<X> 69 </X>
|
||||
|
|
|
|||
8
inter/aus/xml/verify_number.ev
Normal file
8
inter/aus/xml/verify_number.ev
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
|
||||
|
||||
Var Tel2D = TelephoneNumber
|
||||
Trim Tel2D 1
|
||||
|
||||
If Tel2D = "0" Then
|
||||
Var Tel2DFlag = 1
|
||||
EndIf
|
||||
|
|
@ -536,17 +536,8 @@
|
|||
|
||||
Var Tel2DFlag = 0
|
||||
|
||||
Var Tel2D = TelephoneNumber
|
||||
Trim Tel2D 1
|
||||
|
||||
If Tel2D = "0" Then
|
||||
Var Tel2DFlag = 1
|
||||
Else
|
||||
; inter-accept-no-zero
|
||||
If CountryName = "HongKong" Then
|
||||
Var Tel2DFlag = 1
|
||||
EndIf
|
||||
EndIf
|
||||
Var verifyNumberEV = CountryRootPath + "/xml/verify_number.ev"
|
||||
TRY verifyNumberEV
|
||||
|
||||
If Tel2DFlag = 1 Then
|
||||
|
||||
|
|
|
|||
|
|
@ -852,17 +852,8 @@
|
|||
|
||||
Var Tel2DFlag = 0
|
||||
|
||||
Var Tel2D = TelephoneNumber
|
||||
Trim Tel2D 1
|
||||
|
||||
If Tel2D = "0" Then
|
||||
Var Tel2DFlag = 1
|
||||
Else
|
||||
; inter-accept-no-zero
|
||||
If CountryName = "HongKong" Then
|
||||
Var Tel2DFlag = 1
|
||||
EndIf
|
||||
EndIf
|
||||
Var verifyNumberEV = CountryRootPath + "/xml/verify_number.ev"
|
||||
TRY verifyNumberEV
|
||||
|
||||
|
||||
If Tel2DFlag = 1 Then
|
||||
|
|
|
|||
3
inter/hkg/xml/verify_number.ev
Normal file
3
inter/hkg/xml/verify_number.ev
Normal file
|
|
@ -0,0 +1,3 @@
|
|||
|
||||
; inter-accept-no-zero
|
||||
Var Tel2DFlag = 1
|
||||
|
|
@ -536,12 +536,8 @@
|
|||
|
||||
Var Tel2DFlag = 0
|
||||
|
||||
Var Tel2D = TelephoneNumber
|
||||
Trim Tel2D 1
|
||||
|
||||
If Tel2D = "0" Then
|
||||
Var Tel2DFlag = 1
|
||||
EndIf
|
||||
Var verifyNumberEV = CountryRootPath + "/xml/verify_number.ev"
|
||||
TRY verifyNumberEV
|
||||
|
||||
If Tel2DFlag = 1 Then
|
||||
|
||||
|
|
|
|||
7
inter/mys/xml/verify_number.ev
Normal file
7
inter/mys/xml/verify_number.ev
Normal file
|
|
@ -0,0 +1,7 @@
|
|||
|
||||
Var Tel2D = TelephoneNumber
|
||||
Trim Tel2D 1
|
||||
|
||||
If Tel2D = "0" Then
|
||||
Var Tel2DFlag = 1
|
||||
EndIf
|
||||
73
inter/sgp/hardware/exhaust_fan_schedule.ev
Normal file
73
inter/sgp/hardware/exhaust_fan_schedule.ev
Normal file
|
|
@ -0,0 +1,73 @@
|
|||
|
||||
;DEBUGVAR ExhaustFanTime1Enable
|
||||
;DEBUGVAR ExhaustFanTime1Hour
|
||||
;DEBUGVAR ExhaustFanTime1Min
|
||||
;
|
||||
;DEBUGVAR ExhaustFanTime2Enable
|
||||
;DEBUGVAR ExhaustFanTime2Hour
|
||||
;DEBUGVAR ExhaustFanTime2Min
|
||||
;
|
||||
;DEBUGVAR ExhaustFanTime3Enable
|
||||
;DEBUGVAR ExhaustFanTime3Hour
|
||||
;DEBUGVAR ExhaustFanTime3Min
|
||||
|
||||
DEBUGVAR ExhaustFanMode1
|
||||
DEBUGVAR ExhaustFanMode2
|
||||
DEBUGVAR ExhaustFanMode3
|
||||
|
||||
DEBUGVAR AirTemperature
|
||||
DEBUGVAR AirHumidity
|
||||
|
||||
|
||||
Var fan_mode_str = "set-fan-mode="
|
||||
|
||||
If ExhaustFanTime1Enable = "true" Then
|
||||
If ExhaustFanTime2Enable = "true" Then
|
||||
TimeRange ExhaustFanTime1Hour ExhaustFanTime1Min ExhaustFanTime2Hour ExhaustFanTime2Min SystemTimeHourInt SystemTimeMinuteInt CurrentTime1ToTime2
|
||||
Else
|
||||
Var CurrentTime1ToTime2 = "true"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
DEBUGVAR CurrentTime1ToTime2
|
||||
DEBUGVAR PreviseTime1ToTime2
|
||||
If PreviseTime1ToTime2 = CurrentTime1ToTime2 Then
|
||||
|
||||
Else
|
||||
Var PreviseTime1ToTime2 = CurrentTime1ToTime2
|
||||
If CurrentTime1ToTime2 = "true" Then
|
||||
Var fan_mode_str_final = fan_mode_str + ExhaustFanMode1
|
||||
__CMD "CLI" fan_mode_str_final "-" "-"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
|
||||
|
||||
If CurrentTime1ToTime2 = "false" Then
|
||||
|
||||
If ExhaustFanTime2Enable = "true" Then
|
||||
If ExhaustFanTime3Enable = "true" Then
|
||||
TimeRange ExhaustFanTime2Hour ExhaustFanTime2Min ExhaustFanTime3Hour ExhaustFanTime3Min SystemTimeHourInt SystemTimeMinuteInt CurrentTime2ToTime3
|
||||
Else
|
||||
Var CurrentTime2ToTime3 = "true"
|
||||
EndIf
|
||||
|
||||
EndIf
|
||||
|
||||
DEBUGVAR CurrentTime2ToTime3
|
||||
DEBUGVAR PreviseTime2ToTime3
|
||||
|
||||
If PreviseTime2ToTime3 = CurrentTime2ToTime3 Then
|
||||
|
||||
Else
|
||||
Var PreviseTime2ToTime3 = CurrentTime2ToTime3
|
||||
If CurrentTime2ToTime3 = "true" Then
|
||||
Var fan_mode_str_final = fan_mode_str + ExhaustFanMode2
|
||||
__CMD "CLI" fan_mode_str_final "-" "-"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
EndIf
|
||||
|
||||
DEBUGVAR LastTimeOfMainGateCloseUnitInMinute
|
||||
DEBUGVAR MachineUpTimeUnitInMinute
|
||||
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
|
|
@ -536,17 +536,8 @@
|
|||
|
||||
Var Tel2DFlag = 0
|
||||
|
||||
Var Tel2D = TelephoneNumber
|
||||
Trim Tel2D 1
|
||||
|
||||
If Tel2D = "0" Then
|
||||
Var Tel2DFlag = 1
|
||||
Else
|
||||
; inter-accept-no-zero
|
||||
If CountryName = "Singapore" Then
|
||||
Var Tel2DFlag = 1
|
||||
EndIf
|
||||
EndIf
|
||||
Var verifyNumberEV = CountryRootPath + "/xml/verify_number.ev"
|
||||
TRY verifyNumberEV
|
||||
|
||||
If Tel2DFlag = 1 Then
|
||||
|
||||
|
|
|
|||
|
|
@ -911,17 +911,8 @@
|
|||
|
||||
Var Tel2DFlag = 0
|
||||
|
||||
Var Tel2D = TelephoneNumber
|
||||
Trim Tel2D 1
|
||||
|
||||
If Tel2D = "0" Then
|
||||
Var Tel2DFlag = 1
|
||||
Else
|
||||
; inter-accept-no-zero
|
||||
If CountryName = "Singapore" Then
|
||||
Var Tel2DFlag = 1
|
||||
EndIf
|
||||
EndIf
|
||||
Var verifyNumberEV = CountryRootPath + "/xml/verify_number.ev"
|
||||
TRY verifyNumberEV
|
||||
|
||||
|
||||
If Tel2DFlag = 1 Then
|
||||
|
|
|
|||
3
inter/sgp/xml/verify_number.ev
Normal file
3
inter/sgp/xml/verify_number.ev
Normal file
|
|
@ -0,0 +1,3 @@
|
|||
|
||||
; inter-accept-no-zero
|
||||
Var Tel2DFlag = 1
|
||||
|
|
@ -1,19 +1,31 @@
|
|||
|
||||
DEBUGVAR ExhaustFanTime1Enable
|
||||
DEBUGVAR ExhaustFanTime1Hour
|
||||
DEBUGVAR ExhaustFanTime1Min
|
||||
;DEBUGVAR ExhaustFanTime1Enable
|
||||
;DEBUGVAR ExhaustFanTime1Hour
|
||||
;DEBUGVAR ExhaustFanTime1Min
|
||||
;
|
||||
;DEBUGVAR ExhaustFanTime2Enable
|
||||
;DEBUGVAR ExhaustFanTime2Hour
|
||||
;DEBUGVAR ExhaustFanTime2Min
|
||||
;
|
||||
;DEBUGVAR ExhaustFanTime3Enable
|
||||
;DEBUGVAR ExhaustFanTime3Hour
|
||||
;DEBUGVAR ExhaustFanTime3Min
|
||||
|
||||
DEBUGVAR ExhaustFanTime2Enable
|
||||
DEBUGVAR ExhaustFanTime2Hour
|
||||
DEBUGVAR ExhaustFanTime2Min
|
||||
DEBUGVAR ExhaustFanMode1
|
||||
DEBUGVAR ExhaustFanMode2
|
||||
DEBUGVAR ExhaustFanMode3
|
||||
|
||||
DEBUGVAR ExhaustFanTime3Enable
|
||||
DEBUGVAR ExhaustFanTime3Hour
|
||||
DEBUGVAR ExhaustFanTime3Min
|
||||
DEBUGVAR AirTemperature
|
||||
DEBUGVAR AirHumidity
|
||||
|
||||
|
||||
Var fan_mode_str = "set-fan-mode="
|
||||
|
||||
If ExhaustFanTime1Enable = "true" Then
|
||||
If ExhaustFanTime2Enable = "true" Then
|
||||
TimeRange ExhaustFanTime1Hour ExhaustFanTime1Min ExhaustFanTime2Hour ExhaustFanTime2Min SystemTimeHourInt SystemTimeMinuteInt CurrentTime1ToTime2
|
||||
Else
|
||||
Var CurrentTime1ToTime2 = "true"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
|
|
@ -22,6 +34,40 @@ DEBUGVAR PreviseTime1ToTime2
|
|||
If PreviseTime1ToTime2 = CurrentTime1ToTime2 Then
|
||||
|
||||
Else
|
||||
|
||||
;__CMD "CLI" "set-fan-mode=1" "-" "-"
|
||||
Var PreviseTime1ToTime2 = CurrentTime1ToTime2
|
||||
If CurrentTime1ToTime2 = "true" Then
|
||||
Var fan_mode_str_final = fan_mode_str + ExhaustFanMode1
|
||||
__CMD "CLI" fan_mode_str_final "-" "-"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
|
||||
|
||||
If CurrentTime1ToTime2 = "false" Then
|
||||
|
||||
If ExhaustFanTime2Enable = "true" Then
|
||||
If ExhaustFanTime3Enable = "true" Then
|
||||
TimeRange ExhaustFanTime2Hour ExhaustFanTime2Min ExhaustFanTime3Hour ExhaustFanTime3Min SystemTimeHourInt SystemTimeMinuteInt CurrentTime2ToTime3
|
||||
Else
|
||||
Var CurrentTime2ToTime3 = "true"
|
||||
EndIf
|
||||
|
||||
EndIf
|
||||
|
||||
DEBUGVAR CurrentTime2ToTime3
|
||||
DEBUGVAR PreviseTime2ToTime3
|
||||
|
||||
If PreviseTime2ToTime3 = CurrentTime2ToTime3 Then
|
||||
|
||||
Else
|
||||
Var PreviseTime2ToTime3 = CurrentTime2ToTime3
|
||||
If CurrentTime2ToTime3 = "true" Then
|
||||
Var fan_mode_str_final = fan_mode_str + ExhaustFanMode2
|
||||
__CMD "CLI" fan_mode_str_final "-" "-"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
EndIf
|
||||
|
||||
DEBUGVAR LastTimeOfMainGateCloseUnitInMinute
|
||||
DEBUGVAR MachineUpTimeUnitInMinute
|
||||
|
|
|
|||
|
|
@ -3,11 +3,10 @@ Var EventTurnOn = 0
|
|||
|
||||
|
||||
|
||||
<<<<<<< HEAD
|
||||
DEBUGVAR EventTurnOn
|
||||
|
||||
Var VideoMainPage = "ROOT/taobin_project/inter/common/video/video_main.mp4"
|
||||
=======
|
||||
|
||||
DEBUGVAR MainfileSize
|
||||
If SystemDateMonthInt = 12 Then
|
||||
GetFileSizeK "taobin_project/inter/common/video/video_main_event.mp4" MainfileSize
|
||||
|
|
@ -40,4 +39,3 @@ Else
|
|||
Var ShowButtonClickFull = "Invisible"
|
||||
Var VideoMainPage = "ROOT/taobin_project/inter/common/video/video_main.mp4"
|
||||
EndIf
|
||||
>>>>>>> a57ecc08db5486e3f26fe455f2d0e34aa480dd30
|
||||
|
|
|
|||
|
|
@ -536,12 +536,8 @@
|
|||
|
||||
Var Tel2DFlag = 0
|
||||
|
||||
Var Tel2D = TelephoneNumber
|
||||
Trim Tel2D 1
|
||||
|
||||
If Tel2D = "0" Then
|
||||
Var Tel2DFlag = 1
|
||||
EndIf
|
||||
Var verifyNumberEV = CountryRootPath + "/xml/verify_number.ev"
|
||||
TRY verifyNumberEV
|
||||
|
||||
If Tel2DFlag = 1 Then
|
||||
|
||||
|
|
|
|||
7
inter/uae_dubai/xml/verify_number.ev
Normal file
7
inter/uae_dubai/xml/verify_number.ev
Normal file
|
|
@ -0,0 +1,7 @@
|
|||
|
||||
Var Tel2D = TelephoneNumber
|
||||
Trim Tel2D 1
|
||||
|
||||
If Tel2D = "0" Then
|
||||
Var Tel2DFlag = 1
|
||||
EndIf
|
||||
Loading…
Add table
Add a link
Reference in a new issue