SGP: add expire date, adjust cup positions

This commit is contained in:
Pakin 2024-10-09 10:03:12 +07:00
parent 69e397ca55
commit ac865b94ed

View file

@ -217,20 +217,23 @@
INT TaobinExpireYear INT TaobinExpireYear
INT TaobinExpireDay INT TaobinExpireDay
Var TaobinExpireYear = TaobinExpireYear + 543 ;Var TaobinExpireYear = TaobinExpireYear + 543
EndIf EndIf
Var ExpireStrTmp = "" Var ExpireStrTmp = "EXPIRES IN "
Var ExpireStrTmp = ExpireStrTmp + TaobinExpireDay Var ExpireStrTmp = ExpireStrTmp + TaobinExpireDay
Var ExpireStrTmp = ExpireStrTmp + " " Var ExpireStrTmp = ExpireStrTmp + " "
Var ExpireStrTmp = ExpireStrTmp + TaobinExpireMonth Var ExpireStrTmp = ExpireStrTmp + TaobinExpireMonth
Var ExpireStrTmp = ExpireStrTmp + " " Var ExpireStrTmp = ExpireStrTmp + " "
Var ExpireStrTmp = ExpireStrTmp + TaobinExpireYear Var ExpireStrTmp = ExpireStrTmp + TaobinExpireYear
DEBUGVAR ExpireStrTmp
Var ExpireCupsDate = " 31/12/" + SystemDateYear
DEBUGVAR ExpireCupsDate
If TaobinLevel = "1" Then If TaobinLevel = "1" Then
Var PointMaskState = "Enable" Var PointMaskState = "Enable"
@ -320,19 +323,19 @@
Var MakeDrinkState = 0 Var MakeDrinkState = 0
; X Y taobin ; X Y taobin
Var ShellXCol1 = 173 Var ShellXCol1 = 170
Var ShellXCol2 = 268 Var ShellXCol2 = 268
Var ShellXCol3 = 365 Var ShellXCol3 = 367
Var ShellXCol4 = 462 Var ShellXCol4 = 467
Var ShellXCol5 = 557 Var ShellXCol5 = 562
Var ShellXCol6 = 662 Var ShellXCol6 = 662
Var ShellXCol7 = 757 Var ShellXCol7 = 762
Var ShellXCol8 = 852 Var ShellXCol8 = 860
; 1-8 ; 1-8
Var ShellYRow1 = 1047 Var ShellYRow1 = 1042
; 9-16 ; 9-16
Var ShellYRow2 = 1130 Var ShellYRow2 = 1125
; 17-24 ; 17-24
Var ShellYRow3 = 1213 Var ShellYRow3 = 1213
; 25-32 ; 25-32
@ -1607,13 +1610,40 @@
;<Value> TaobinLevelDesc2 </Value> ;<Value> TaobinLevelDesc2 </Value>
;</Text> ;</Text>
; expire ; expire-cup
<Image> <Image>
<X> 172 </X> <X> 172 </X>
<Y> 1650 </Y> <Y> 1650 </Y>
<Filename> PointAlert </Filename> <Filename> PointAlert </Filename>
</Image> </Image>
; ExpireCupsDate
<Text>
<X> 330 </X>
<Y> 1655 </Y>
<Size> 20 </Size>
<Font> PepsiExtend </Font>
<Color> WTCWhiteColor </Color>
<Value> ExpireCupsDate </Value>
</Text>
; ExpireStrTmp
;
<Text>
<X> 483 </X>
<Y> 960 </Y>
<Size> 20 </Size>
<Font> PepsiExtend </Font>
<Color> WTCMediumBlueColor </Color>
<Value> ExpireStrTmp </Value>
</Text>
;<Text> ;<Text>
;<X> xPointEndDate </X> ;<X> xPointEndDate </X>
;<Y> 1576 </Y> ;<Y> 1576 </Y>