pakin/taobin_project
1
0
Fork 0
Code Issues Pull requests Projects 1 Releases 1 Packages Wiki Activity Actions

Merge branch 'masterpiece' of ssh://192.168.10.159:/1TBHDD/ikong/taobin_project into masterpiece

Browse source
This commit is contained in:
Pakin 2024-08-29 08:52:47 +07:00
commit 34d8c9cfa0
132 changed files with 17214 additions and 4333 deletions
Download patch file Download diff file Expand all files Collapse all files

73
inter/sgp/hardware/exhaust_fan_schedule.ev Normal file
View 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

1491
inter/sgp/xml/page_catalog_group_coffee.lxml
View file

File diff suppressed because it is too large Load diff

1476
inter/sgp/xml/page_catalog_group_milk.lxml
View file

File diff suppressed because it is too large Load diff

1490
inter/sgp/xml/page_catalog_group_recommend.lxml
View file

File diff suppressed because it is too large Load diff

1458
inter/sgp/xml/page_catalog_group_tea.lxml
View file

File diff suppressed because it is too large Load diff

1411
inter/sgp/xml/page_catalog_group_whey.lxml
View file

File diff suppressed because it is too large Load diff

13
inter/sgp/xml/page_check_member.lxml
View file

@ -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

13
inter/sgp/xml/page_collect_point_1.lxml
View file

@ -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
View file

@ -0,0 +1,3 @@
; inter-accept-no-zero
Var Tel2DFlag = 1