Merge apple
This commit is contained in:
parent
4f9bc018eb
commit
7b3c793961
65 changed files with 32394 additions and 28639 deletions
|
|
@ -14,6 +14,7 @@
|
|||
If CountryName = "UnitedArabEmirates Dubai" Then
|
||||
TRY topview2_script
|
||||
Else
|
||||
;inter-lang
|
||||
If CountryName = "Malaysia" Then
|
||||
TRY topview2_script
|
||||
EndIf
|
||||
|
|
@ -67,7 +68,7 @@
|
|||
Var langFileNameIcon = lang_icon_file_name[LanguageShowByIndex]
|
||||
|
||||
Var langfn = "ROOT/taobin_project/image/lang/" + langFileNameIcon
|
||||
DEBUGVAR langfn
|
||||
|
||||
Var DirLanguageImage = "ROOT/taobin_project/image/lang/"
|
||||
|
||||
|
||||
|
|
@ -75,7 +76,6 @@
|
|||
Var ButtonLanguageListXPositionIcon = ButtonLanguageListXPosition + 27
|
||||
Var ButtonLanguageListYPositionIcon = ButtonLanguageListYPosition + 14
|
||||
Var ButtonLanguageListWidth = 70
|
||||
l 86
|
||||
|
||||
Var ButtonLanguageListXPositionIconForFlag = ButtonLanguageListXPositionIcon - 10
|
||||
|
||||
|
|
@ -155,23 +155,29 @@
|
|||
|
||||
If PowderScheduleTimeOut = 0 Then
|
||||
Var PowderScheduleTimeOut = 1
|
||||
Var powder_sch_ev = "ROOT/taobin_project/inter/tha/" + "/hardware/powder_schedule_v2.ev"
|
||||
EndIf
|
||||
Var powder_sch_ev = "ROOT/taobin_project/inter/tha/" + "/hardware/powder_schedule_v2.ev"
|
||||
|
||||
|
||||
TRY powder_sch_ev
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
DEBUGVAR exhaust_fan_schedule
|
||||
|
||||
TRY exhaust_fan_schedule
|
||||
|
||||
|
||||
|
||||
;include="ROOT/taobin_project/inc/language_toggle_mode.inc"
|
||||
|
||||
|
||||
DEBUGVAR langfn
|
||||
DEBUGVAR LanguageButtonEnable
|
||||
DEBUGVAR LanguageShow
|
||||
|
||||
Var CheckDisableTimeout = 0
|
||||
|
||||
TRY "ROOT/taobin_project/xml/features/alert_sms/check_disable.ev"
|
||||
|
||||
|
||||
</EventOpen>
|
||||
<Timeout> 1000 </Timeout>
|
||||
|
|
@ -226,9 +232,7 @@
|
|||
Var ENABLE_MALAY = "Invisible"
|
||||
Var ENABLE_MTC = "Invisible"
|
||||
|
||||
If EnableMultiInstance = "true" Then
|
||||
TRY "ROOT/taobin_project/inter/tha/xml/multi/control_and_lang_swith.ev"
|
||||
EndIf
|
||||
TRY "ROOT/taobin_project/inter/tha/xml/multi/control_and_lang_swith.ev"
|
||||
EndIf
|
||||
If CountryName = "HongKong" Then
|
||||
Var ENABLE_UAE_DUBAI = "Invisible"
|
||||
|
|
@ -386,8 +390,6 @@
|
|||
DEBUGVAR langfn
|
||||
LanguageControl "ChangeNextLang" ""
|
||||
|
||||
;include="ROOT/taobin_project/inc/language_toggle_mode.inc"
|
||||
|
||||
If EnableMultiInstance = "true" Then
|
||||
Var CountDownRefreshAllGroup = 1
|
||||
EndIf
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue