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

2025-07-17 13:30:39 +07:00 · 2025-07-17 13:30:39 +07:00 · 6316d785c6
commit 6316d785c6
parent 4ed6b64d68 0a8922c52c
26 changed files with 781 additions and 11 deletions
--- a/image/event/lent_day/bn_continue.png
+++ b/image/event/lent_day/bn_continue.png
--- a/image/event/lent_day/bn_redeem.png
+++ b/image/event/lent_day/bn_redeem.png
--- a/image/event/lent_day/collect_fail.png
+++ b/image/event/lent_day/collect_fail.png
--- a/image/event/lent_day/collecting_level.png
+++ b/image/event/lent_day/collecting_level.png
--- a/image/event/lent_day/layer1.png
+++ b/image/event/lent_day/layer1.png
--- a/image/event/lent_day/layer2.png
+++ b/image/event/lent_day/layer2.png
--- a/image/event/lent_day/layer3.png
+++ b/image/event/lent_day/layer3.png
--- a/image/event/lent_day/layer4.png
+++ b/image/event/lent_day/layer4.png
--- a/image/event/lent_day/lent.png
+++ b/image/event/lent_day/lent.png
--- a/image/event/lent_day/redeem_25.png
+++ b/image/event/lent_day/redeem_25.png
--- a/image/event/lent_day/redeem_50.png
+++ b/image/event/lent_day/redeem_50.png
--- a/image/event/lent_day/redeem_free.png
+++ b/image/event/lent_day/redeem_free.png
--- a/image/event/lent_day/redeem_or_continue_bg.png
+++ b/image/event/lent_day/redeem_or_continue_bg.png
--- a/image/event/lent_day/redeem_or_continue_text25.png
+++ b/image/event/lent_day/redeem_or_continue_text25.png
--- a/image/event/lent_day/redeem_or_continue_text50.png
+++ b/image/event/lent_day/redeem_or_continue_text50.png
--- a/image/event/lent_day/send_code_redeem.png
+++ b/image/event/lent_day/send_code_redeem.png
--- a/xml/event/lent_day/page_collect_lent_check.xml
+++ b/xml/event/lent_day/page_collect_lent_check.xml
@ -0,0 +1,158 @@
+<Popup>
+    <Cache> "Enable" </Cache>
+    <Width> 1080 </Width>
+    <Height> 1920 </Height>
+    <Background> "0xEAE6E1" </Background>
+    <Volume> SoundVolume </Volume>
+    <EventOpen>
+        Var Timeout = 0
+        Var Seeker.TaobinErrorNetwork = 0
+
+        If show_eng = "true" Then
+            Var DirImage = "ROOT/taobin_project/image/collectiing_en"
+
+            Var IMG_CNT = "ROOT/taobin_project/image/page_doing/img2_eng.png"
+        Else
+            Var DirImage = "ROOT/taobin_project/image/collectiing"
+
+            Var IMG_CNT = "ROOT/taobin_project/image/page_doing/img2.png"
+        EndIf
+
+        If PayOfflineMode = 1 Then
+            Var Seeker.TaobinErrorNetwork = 1
+            Var Seeker.PointTaobinStr = ParamCP
+            Var TelephoneNumber = TelephoneNumberX
+            Var Seeker.TNumberTaobinMember = TelephoneNumber
+            Open "ROOT/taobin_project/xml/event/lent_day/page_lent_day_collect_fail.xml"
+        EndIf
+    </EventOpen>
+
+    <Timeout> 1000 </Timeout>
+    <EventTimeout>
+        Var CountDownBrewing = BREW_CNT
+        Var ShowCountDownBrewing = CountDownBrewing
+
+        Var Timeout = Timeout + 1
+        If Timeout > 30 Then
+            Var Seeker.TaobinErrorNetwork = 1
+            Var Seeker.PointTaobinStr = ParamCP
+
+            Var TelephoneNumber = TelephoneNumberX
+            Var Seeker.TNumberTaobinMember = TelephoneNumber
+
+            Open "ROOT/taobin_project/xml/event/lent_day/page_lent_day_collect_fail.xml"
+        EndIf
+
+        TimerReset
+        Refresh
+    </EventTimeout>
+
+    <EventSecurity>
+        Open "/media/bt/xml/security_alarm.xml"
+    </EventSecurity>
+
+    <EventActionOk>
+        If Ext1a = "" Then
+            Var Seeker.TaobinErrorNetwork = 1
+            Var Seeker.PointTaobinStr = ParamCP
+            Var TelephoneNumber = TelephoneNumberX
+            Var Seeker.TNumberTaobinMember= TelephoneNumber
+            Open "ROOT/taobin_project/xml/event/lent_day/page_lent_day_collect_fail.xml"
+        Else
+            Var TaobinName = Ext1c
+            Var TelephoneNumber = TelephoneNumberX
+            Var TNumberTaobinMemberXXX = TelephoneNumber
+
+            If TaobinName = "" Then
+                Var Seeker.IsLineMember = 0
+            Else
+                If TaobinName = "-" Then
+                    Var Seeker.IsLineMember = 0
+                Else
+                    Var Seeker.IsLineMember = 1
+                EndIf
+            EndIf
+
+            If Seeker.IsLineMember = 0 Then
+                SAVELOG "Not Line member skip."
+                If Seeker.CodeChannel = 1 Then
+                    If Seeker.CollectPointMain = 1 Then
+                        GETACCEXT Param1 23
+                        Open "ROOT/taobin_project/xml/page_collect_point_2.xml"
+                    Else
+                        Open "ROOT/taobin_project/xml/page_lid_straw.xml"
+                    EndIf
+                Else
+                    GETACCEXT Param1 23
+                    Open "ROOT/taobin_project/xml/page_collect_point_2.xml"
+                EndIf
+            EndIf
+
+            Var Seeker.PointTaobinStr = ParamCP
+            Var Seeker.TNumberTaobinMember = TelephoneNumberX
+
+            DEBUGVAR Ext1b
+            Var TotalPrice = Ext1b
+            INT TotalPrice
+
+            DEBUGVAR PayAmount
+            DEBUGVAR TotalPrice
+            DEBUGVAR Seeker.PointTaobinStr
+            DEBUGVAR Seeker.TNumberTaobinMember
+
+            Open "ROOT/taobin_project/xml/event/lent_day/page_collect_lent_collecting.xml"
+        EndIf
+    </EventActionOk>
+
+    <EventActionError>
+        Var Seeker.TaobinErrorNetwork = 1
+        Var Seeker.PointTaobinStr = ParamCP
+        Var TelephoneNumber = TelephoneNumberX
+        Var Seeker.TNumberTaobinMember= TelephoneNumber
+        Open "ROOT/taobin_project/xml/event/lent_day/page_lent_day_collect_fail.xml"
+    </EventActionError>
+
+    <EventMachine>
+        If MachineStage = "drink-success" Then
+            Var MachineState_Result = 1
+        EndIf
+
+        If MachineStage = "drink-failed" Then
+            Var MachineState_Result = 2
+        EndIf
+    </EventMachine>
+
+    ;include="ROOT/taobin_project/inc/video.inc"
+
+    <Image>
+        <X> 178 </X>
+        <Y> 680 </Y>
+        <Filename> Var( DirImage + "/text20.png" ) </Filename>
+    </Image>
+
+    <GIF>
+        <X> 490 </X>
+        <Y> 1390 </Y>
+        <Width> 100 </Width>
+        <Height> 100 </Height>
+        <State> "Enable" </State>
+        <Filename> "ROOT/taobin_project/image/page_payment_en/page_payment/loading.gif" </Filename>
+    </GIF>
+
+    <Image>
+        <X> 751 </X>
+        <Y> 413 </Y>
+        <Filename> IMG_CNT </Filename>
+    </Image>
+
+    <Text>
+        <X> XPosiShowCountDownBrew </X>
+        <Y> 470 </Y>
+        <Align> End </Align>
+        <Width> 153 </Width>
+        <Size> 88 </Size>
+        <Font> RobotoBold </Font>
+        <Color> 0x513C2F </Color>
+        <Value> ShowCountDownBrewing </Value>
+    </Text>
+</Popup>
--- a/xml/event/lent_day/page_collect_lent_collecting.xml
+++ b/xml/event/lent_day/page_collect_lent_collecting.xml
@ -0,0 +1,248 @@
+<Popup>
+    <Cache> "Enable" </Cache>
+    <Width> 1080 </Width>
+    <Height> 1920 </Height>
+    <Background> "0xEAE6E1" </Background>
+    <Volume> SoundVolume </Volume>
+    <EventOpen>
+        Var Timeout = 0
+        Var TelephoneNumber = TelephoneNumberX
+        Var Seeker.TNumberTaobinMember = TelephoneNumber
+
+        DEBUGVAR TelephoneNumber
+        DEBUGVAR TelephoneNumberX
+
+        Var DirImage = "ROOT/taobin_project/image/event/lent_day/"
+
+        If show_eng = "true" Then
+            Var IMG_CNT = "ROOT/taobin_project/image/page_doing/img2_eng.png"
+        Else
+            Var IMG_CNT = "ROOT/taobin_project/image/page_doing/img2.png"
+        EndIf
+
+        Var FullLentState = "Invisible"
+        Var CurrentPriceTextState = "Invisible"
+        Var GIFAnimationState = "Invisible"
+
+        DEBUGVAR TotalPrice
+        DEBUGVAR PayAmount
+
+        Var TotalPriceAfterAdded = TotalPrice + PayAmount
+
+        Var PriceToShow = "฿" + TotalPriceAfterAdded
+        Var PriceToShow = PriceToShow + "->"
+
+        Var LentMinY = 1740
+        Var LentMaxY = 1076
+
+        Var MaxPrice = 350
+
+        Var LentSize = LentMinY - LentMaxY
+        
+        Var StartPriceDy = TotalPrice * 100
+        Var StartPriceDy = StartPriceDy / MaxPrice
+        Var PositionStart = StartPriceDy * LentSize
+        Var PositionStart = PositionStart / 100
+        Var PositionStart = LentMinY - PositionStart
+
+        If PositionStart < LentMaxY Then
+            PositionStart = LentMaxY
+        EndIf
+
+        Var LentPositionY = PositionStart
+
+        Var TargetPriceDy = TotalPriceAfterAdded * 100
+        Var TargetPriceDy = TargetPriceDy / MaxPrice
+        Var PositionTarget = TargetPriceDy * LentSize
+        Var PositionTarget = PositionTarget / 100 
+        Var PositionTarget = LentMinY - PositionTarget
+
+        If PositionTarget < LentMaxY Then
+            PositionTarget = LentMaxY
+        EndIf
+
+        Var PositionDiff = PositionStart - PositionTarget
+
+        Var TimeScopeSec = 0
+        Var AmountIncrease = 0
+        Var PourAnimationDelaySec = 0
+        If PositionDiff > 0 Then
+            Var TimeScopeSec = 7
+            Var AmountIncrease = 0 - PositionDiff
+            Var AmountIncrease = AmountIncrease / TimeScopeSec
+            Var PourAnimationDelaySec = 1
+            Var GIFAnimationState = "Enable"
+        EndIf
+
+        Var MaxTimeout = TimeScopeSec + PourAnimationDelaySec
+        Var MaxTimeout = MaxTimeout + 5
+
+        DEBUGVAR LentSize
+        DEBUGVAR PositionStart
+        DEBUGVAR PositionTarget
+        DEBUGVAR AmountIncrease
+        DEBUGVAR LentPositionY
+        DEBUGVAR MaxTimeout
+
+
+        Var val1 = "+"
+        Var val2 = PayAmount
+        Var val3 = "X"
+        AddData 58 TelephoneNumber val1 val2 val3
+
+    </EventOpen>
+
+    <Timeout> 1000 </Timeout>
+    <EventTimeout>
+        Var CountDownBrewing = BREW_CNT
+        Var ShowCountDownBrewing = CountDownBrewing
+
+        Var Timeout = Timeout + 1
+        If Timeout > MaxTimeout Then
+
+            If TotalPriceAfterAdded >= 350 Then
+                Open "ROOT/taobin_project/xml/event/lent_day/page_collect_lent_send_code.xml"
+            EndIf
+
+            If TotalPriceAfterAdded >= 175 Then
+                Open "ROOT/taobin_project/xml/event/lent_day/page_collect_lent_redeem_or_continue.xml"
+            EndIf
+
+            If Seeker.CodeChannel = 1 Then
+                If Seeker.CollectPointMain = 1 Then
+                    GETACCEXT Param1 23
+                    Open "ROOT/taobin_project/xml/page_collect_point_2.xml"
+                Else
+                    Open "ROOT/taobin_project/xml/page_lid_straw.xml"
+                EndIf
+            Else
+                GETACCEXT Param1 23
+                Open "ROOT/taobin_project/xml/page_collect_point_2.xml"
+            EndIf
+        EndIf
+
+        If PourAnimationDelaySec > 0 Then
+            Var PourAnimationDelaySec = PourAnimationDelaySec - 1
+        Else
+            If TimeScopeSec > 0 Then
+                Var LentPositionY = LentPositionY + AmountIncrease
+                DEBUGVAR LentPositionY
+                Var TimeScopeSec = TimeScopeSec - 1
+            Else
+                If TotalPriceAfterAdded >= 350 Then
+                    Var FullLentState = "Enable"
+                    Var CurrentPriceTextState = "Invisible"
+                EndIf
+
+                Var GIFAnimationState = "Invisible"
+            EndIf
+        EndIf
+
+        Refresh
+        TimerReset
+    </EventTimeout>
+
+    <EventSecurity>
+        Open "/media/bt/xml/security_alarm.xml"
+    </EventSecurity>
+
+    <EventMachine>
+        If MachineStage = "drink-success" Then
+            Var MachineState_Result = 1
+        EndIf
+
+        If MachineStage = "drink-failed" Then
+            Var MachineState_Result = 2
+        EndIf
+    </EventMachine>
+
+    ;include="ROOT/taobin_project/inc/video.inc"
+
+    <Image>
+        <X> 0 </X>
+        <Y> 380 </Y>
+        <Filename> Var( DirImage + "/layer1.png" ) </Filename>
+    </Image>
+
+    <GIF>
+        <X> 90 </X>
+        <Y> 760 </Y>
+        <Width> 800 </Width>
+        <Height> 333 </Height>
+        <State> GIFAnimationState </State>
+        ;<Mode> "OneShot,StopFrame=182" </Mode>
+        <Filename> Var( DirImage + "pour_animation.gif" ) </Filename>
+    </GIF>
+
+    <Image>
+        <X> 361 </X>
+        <Y> LentPositionY </Y>
+        <Width> 340 </Width>
+        <Height> 714 </Height>
+        <Filename> Var( DirImage + "/layer2.png" ) </Filename>
+    </Image>
+
+    <Image>
+        <X> 0 </X>
+        <Y> 1076 </Y>
+        <Filename> Var( DirImage + "/layer3.png" ) </Filename>
+    </Image>
+
+    <Image>
+        <X> 363 </X>
+        <Y> 1076 </Y>
+        <Filename> Var( DirImage + "/layer4.png" ) </Filename>
+    </Image>
+
+    <Text>
+        <X> 325 </X>
+        <Y> PositionTarget </Y>
+        <State> CurrentPriceTextState </State>
+        <Width> 150 </Width>
+        <Size> 32 </Size>
+        <Font> KanitTTF </Font>
+        <Color> 0x523D30 </Color>
+        <Value> PriceToShow </Value>
+    </Text>
+
+    <Image>
+        <X> 363 </X>
+        <Y> 821 </Y>
+        <State> FullLentState </State>
+        <Filename> Var( DirImage + "/lent.png" ) </Filename>
+    </Image>
+
+    <Image>
+        <X> 658 </X>
+        <Y> 990 </Y>
+        <Filename> Var( DirImage + "/collecting_level.png" ) </Filename>
+    </Image>
+
+    <Image>
+        <X> 751 </X>
+        <Y> 413 </Y>
+        <Filename> IMG_CNT </Filename>
+    </Image>
+
+    <Text>
+        <X> XPosiShowCountDownBrew </X>
+        <Y> 470 </Y>
+        <Align> End </Align>
+        <Width> 153 </Width>
+        <Size> 88 </Size>
+        <Font> RobotoBold </Font>
+        <Color> 0x513C2F </Color>
+        <Value> ShowCountDownBrewing </Value>
+    </Text>
+
+    <EventUnitTest2>
+        <Name> "Reload File" </Name>
+        <Script>
+            Open "ROOT/taobin_project/xml/event/lent_day/page_collect_lent_collecting.xml"
+        </Script>
+    </EventUnitTest2>
+
+    <EventUnitTest3>
+        Var MaxTimeout = 5
+    </EventUnitTest3>
+</Popup>
--- a/xml/event/lent_day/page_collect_lent_redeem_or_continue.xml
+++ b/xml/event/lent_day/page_collect_lent_redeem_or_continue.xml
@ -0,0 +1,123 @@
+<Popup>
+    <Cache> "Enable" </Cache>
+    <Width> 1080 </Width>
+    <Height> 1920 </Height>
+    <Background> "0xEAE6E1" </Background>
+    <Volume> SoundVolume </Volume>
+    <EventOpen>
+        Var Timeout = 0
+
+        Var DirImage = "ROOT/taobin_project/image/event/lent_day/"
+
+        If show_eng = "true" Then
+            Var IMG_CNT = "ROOT/taobin_project/image/page_doing/img2_eng.png"
+        Else
+            Var IMG_CNT = "ROOT/taobin_project/image/page_doing/img2.png"
+        EndIf
+
+        If TotalPriceAfterAdded >= 280 Then
+            Var RedeemText = "/redeem_or_continue_text50.png"
+        Else
+            Var RedeemText = "/redeem_or_continue_text25.png"
+        EndIf
+
+    </EventOpen>
+
+    <Timeout> 1000 </Timeout>
+    <EventTimeout>
+        Var CountDownBrewing = BREW_CNT
+        Var ShowCountDownBrewing = CountDownBrewing
+
+        Var Timeout = Timeout + 1
+        If Timeout > 10 Then
+            If Seeker.CodeChannel = 1 Then
+                If Seeker.CollectPointMain = 1 Then
+                    GETACCEXT Param1 23
+                    Open "ROOT/taobin_project/xml/page_collect_point_2.xml"
+                Else
+                    Open "ROOT/taobin_project/xml/page_lid_straw.xml"
+                EndIf
+            Else
+                GETACCEXT Param1 23
+                Open "ROOT/taobin_project/xml/page_collect_point_2.xml"
+            EndIf
+        EndIf
+
+        Refresh
+        TimerReset
+    </EventTimeout>
+
+    <EventSecurity>
+        Open "/media/bt/xml/security_alarm.xml"
+    </EventSecurity>
+
+    <EventMachine>
+        If MachineStage = "drink-success" Then
+            Var MachineState_Result = 1
+        EndIf
+
+        If MachineStage = "drink-failed" Then
+            Var MachineState_Result = 2
+        EndIf
+    </EventMachine>
+
+    ;include="ROOT/taobin_project/inc/video.inc"
+
+    <Image>
+        <X> 0 </X>
+        <Y> 380 </Y>
+        <Filename> Var( DirImage + "/redeem_or_continue_bg.png" ) </Filename>
+    </Image>
+
+    <Image>
+        <X> 237 </X>
+        <Y> 829 </Y>
+        <Filename> Var( DirImage + RedeemText ) </Filename>
+    </Image>
+
+    <Button>
+        <X> 285 </X>
+        <Y> 1128 </Y>
+        <Filename> Var( DirImage + "bn_redeem.png" ) </Filename>
+        <EventClick>
+            Open "ROOT/taobin_project/xml/event/lent_day/page_collect_lent_send_code.xml"
+        </EventClick>
+    </Button>
+
+    <Button>
+        <X> 285 </X>
+        <Y> 1395 </Y>
+        <Filename> Var( DirImage + "bn_continue.png" ) </Filename>
+        <EventClick>
+            If Seeker.CodeChannel = 1 Then
+                If Seeker.CollectPointMain = 1 Then
+                    GETACCEXT Param1 23
+                    Open "ROOT/taobin_project/xml/page_collect_point_2.xml"
+                Else
+                    Open "ROOT/taobin_project/xml/page_lid_straw.xml"
+                EndIf
+            Else
+                GETACCEXT Param1 23
+                Open "ROOT/taobin_project/xml/page_collect_point_2.xml"
+            EndIf
+        </EventClick>
+    </Button>
+
+    <Image>
+        <X> 751 </X>
+        <Y> 413 </Y>
+        <Filename> IMG_CNT </Filename>
+    </Image>
+
+    <Text>
+        <X> XPosiShowCountDownBrew </X>
+        <Y> 470 </Y>
+        <Align> End </Align>
+        <Width> 153 </Width>
+        <Size> 88 </Size>
+        <Font> RobotoBold </Font>
+        <Color> 0x513C2F </Color>
+        <Refresh> "Enable" </Refresh>
+        <Value> ShowCountDownBrewing </Value>
+    </Text>
+</Popup>
--- a/xml/event/lent_day/page_collect_lent_send_code.xml
+++ b/xml/event/lent_day/page_collect_lent_send_code.xml
@ -0,0 +1,146 @@
+<Popup>
+    <Cache> "Enable" </Cache>
+    <Width> 1080 </Width>
+    <Height> 1920 </Height>
+    <Background> "0xEAE6E1" </Background>
+    <Volume> SoundVolume </Volume>
+    <EventOpen>
+        Var Timeout = 0
+
+        Var DirImage = "ROOT/taobin_project/image/event/lent_day/"
+
+        If show_eng = "true" Then
+            Var IMG_CNT = "ROOT/taobin_project/image/page_doing/img2_eng.png"
+        Else
+            Var IMG_CNT = "ROOT/taobin_project/image/page_doing/img2.png"
+        EndIf
+
+        Var RedeemButtonState = "Enable"
+
+        If TotalPriceAfterAdded >= 175 Then
+            Var RedeemImage = "/redeem_25.png"
+            Var RedeemType = 1
+        EndIf
+        If TotalPriceAfterAdded >= 280 Then
+            Var RedeemImage = "/redeem_50.png"
+            Var RedeemType = 2
+        EndIf
+        If TotalPriceAfterAdded >= 350 Then
+            Var RedeemImage = "/redeem_free.png"
+            Var RedeemType = 3
+        EndIf
+
+        Var isTimeout = 0
+    </EventOpen>
+
+    <Timeout> 1000 </Timeout>
+    <EventTimeout>
+        Var CountDownBrewing = BREW_CNT
+        Var ShowCountDownBrewing = CountDownBrewing
+
+        Var Timeout = Timeout + 1
+        If Timeout > 4 Then
+            Var isTimeout = 1
+            If RedeemType = 1 Then
+                Var val2 = 175
+            EndIf
+            If RedeemType = 2 Then
+                Var val2 = 280
+            EndIf
+            If RedeemType = 3 Then
+                Var val2 = 350
+            EndIf
+
+            Var val1 = "-"
+            Var val3 = "X"
+            AddData 58 TelephoneNumber val1 val2 val3
+
+            Var RedeemImage = "/send_code_redeem.png"
+            Var RedeemButtonState = "Invisible"
+
+            If Seeker.CodeChannel = 1 Then
+                If Seeker.CollectPointMain = 1 Then
+                    GETACCEXT Param1 23
+                    Open "ROOT/taobin_project/xml/page_collect_point_2.xml"
+                Else
+                    Open "ROOT/taobin_project/xml/page_lid_straw.xml"
+                EndIf
+            Else
+                GETACCEXT Param1 23
+                Open "ROOT/taobin_project/xml/page_collect_point_2.xml"
+            EndIf
+        EndIf
+
+        Refresh
+        TimerReset
+    </EventTimeout>
+
+    <EventSecurity>
+        Open "/media/bt/xml/security_alarm.xml"
+    </EventSecurity>
+
+    <EventMachine>
+        If MachineStage = "drink-success" Then
+            Var MachineState_Result = 1
+        EndIf
+
+        If MachineStage = "drink-failed" Then
+            Var MachineState_Result = 2
+        EndIf
+    </EventMachine>
+
+    ;include="ROOT/taobin_project/inc/video.inc"
+
+    <Image>
+        <X> 0 </X>
+        <Y> 380 </Y>
+        <Filename> Var( DirImage + RedeemImage ) </Filename>
+    </Image>
+
+    <Button>
+        <X> 285 </X>
+        <Y> 1431</Y>
+        <State> RedeemButtonState </State>
+        <Filename> Var( DirImage + "bn_redeem.png" ) </Filename>
+        <EventClick>
+            If isTimeout = 0 Then
+                If RedeemType = 1 Then
+                    Var val2 = 175
+                EndIf
+                If RedeemType = 2 Then
+                    Var val2 = 280
+                EndIf
+                If RedeemType = 3 Then
+                    Var val2 = 350
+                EndIf
+
+                Var val1 = "-"
+                Var val3 = "X"
+                AddData 58 TelephoneNumber val1 val2 val3
+
+                Var RedeemImage = "/send_code_redeem.png"
+                Var RedeemButtonState = "Invisible"
+
+                Refresh
+            EndIf
+        </EventClick>
+    </Button>
+
+    <Image>
+        <X> 751 </X>
+        <Y> 413 </Y>
+        <Filename> IMG_CNT </Filename>
+    </Image>
+
+    <Text>
+        <X> XPosiShowCountDownBrew </X>
+        <Y> 470 </Y>
+        <Align> End </Align>
+        <Width> 153 </Width>
+        <Size> 88 </Size>
+        <Font> RobotoBold </Font>
+        <Color> 0x513C2F </Color>
+        <Refresh> "Enable" </Refresh>
+        <Value> ShowCountDownBrewing </Value>
+    </Text>
+</Popup>
--- a/xml/event/lent_day/page_lent_day_collect_fail.xml
+++ b/xml/event/lent_day/page_lent_day_collect_fail.xml
@ -0,0 +1,87 @@
+<Popup>
+    <Cache> "Enable" </Cache>
+    <Width> 1080 </Width>
+    <Height> 1920 </Height>
+    <Background> "0xEAE6E1" </Background>
+    <Volume> SoundVolume </Volume>
+    <EventOpen>
+        Var Timeout = 0
+        
+        Var DirImage = "ROOT/taobin_project/image/event/lent_day/"
+
+        If show_eng = "true" Then
+            Var IMG_CNT = "ROOT/taobin_project/image/page_doing/img2_eng.png"
+        Else
+            Var IMG_CNT = "ROOT/taobin_project/image/page_doing/img2.png"
+        EndIf
+        
+        Var val1 = "+"
+        Var val2 = PayAmount
+        Var val3 = "X"
+        AddData 58 TelephoneNumber val1 val2 val3
+    </EventOpen>
+
+    <Timeout> 1000 </Timeout>
+    <EventTimeout>
+        Var CountDownBrewing = BREW_CNT
+        Var ShowCountDownBrewing = CountDownBrewing
+
+        Var Timeout = Timeout + 1
+        If Timeout > 5 Then
+            If Seeker.CodeChannel = 1 Then
+                If Seeker.CollectPointMain = 1 Then
+                    GETACCEXT Param1 23
+                    Open "ROOT/taobin_project/xml/page_collect_point_2.xml"
+                Else
+                    Open "ROOT/taobin_project/xml/page_lid_straw.xml"
+                EndIf
+            Else
+                GETACCEXT Param1 23
+                Open "ROOT/taobin_project/xml/page_collect_point_2.xml"
+            EndIf
+        EndIf
+
+        Refresh
+        TimerReset
+    </EventTimeout>
+
+    <EventSecurity>
+        Open "/media/bt/xml/security_alarm.xml"
+    </EventSecurity>
+
+    <EventMachine>
+        If MachineStage = "drink-success" Then
+            Var MachineState_Result = 1
+        EndIf
+
+        If MachineStage = "drink-failed" Then
+            Var MachineState_Result = 2
+        EndIf
+    </EventMachine>
+
+    ;include="ROOT/taobin_project/inc/video.inc"
+
+    <Image>
+        <X> 0 </X>
+        <Y> 380 </Y>
+        <Filename> Var( DirImage + "/collect_fail.png" ) </Filename>
+    </Image>
+
+    <Image>
+        <X> 751 </X>
+        <Y> 413 </Y>
+        <Filename> IMG_CNT </Filename>
+    </Image>
+
+    <Text>
+        <X> XPosiShowCountDownBrew </X>
+        <Y> 470 </Y>
+        <Align> End </Align>
+        <Width> 153 </Width>
+        <Size> 88 </Size>
+        <Font> RobotoBold </Font>
+        <Color> 0x513C2F </Color>
+        <Refresh> "Enable" </Refresh>
+        <Value> ShowCountDownBrewing </Value>
+    </Text>
+</Popup>
--- a/xml/event/tricker.ev
+++ b/xml/event/tricker.ev
@ -101,6 +101,9 @@ Var Discount7_7Pro = 0
 ; Apple Farm Festival, 15 - 31 July
 Var AppleFarmFestivalPro = 0

+; Lent Day, 1 - 31 Aug
+Var LentDayPro = 0
+
 Var NewCollectPoint = 1
 Var PaymentCodeShouldCollectPromotionPoint = 0

@ -197,7 +200,9 @@ If SystemDateMonthInt = 7 Then

 EndIf

-DEBUGVAR AppleFarmFestivalPro
+If SystemDateMonthInt = 8 Then
+	Var LentDayPro = 1
+EndIf


 Var JemilaToppingFlag = 1
@ -222,8 +227,6 @@ If BoxID = 105005 Then
 	Var StrawberrySeriesPro = 1
 	Var StrawberrySeriesMenu = 1

-	Var SwensenPro = 1
-
 	Var JemilaToppingFlag = 1
 	Var JemilaToppingFreeFlag = 1
 	Var SugarZeroCalFreeFlag = 1
--- a/xml/page_NewBrewing3.xml
+++ b/xml/page_NewBrewing3.xml
@ -963,7 +963,7 @@
 			Var PayDetail2 = ""
 			Var VendingOrderID = Seeker.ORDER_ID
 			Var ServiceRefund = 0
-			Var ServiceCharge = Seeker.ServiceCharge
+			Var ServiceCharge = 0
 			Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceRefund ServiceCharge Donate

 			Var waitAckPay = 2
@ -1002,7 +1002,7 @@
 			Var PayDetail2 = ""
 			Var VendingOrderID = Seeker.ORDER_ID
 			Var ServiceRefund = 0
-			Var ServiceCharge = Seeker.ServiceCharge
+			Var ServiceCharge = 0
 			Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceRefund ServiceCharge Donate

 			Var waitAckPay = 2
--- a/xml/page_NewBrewing3Conti.xml
+++ b/xml/page_NewBrewing3Conti.xml
@ -413,7 +413,7 @@
 			Var PayDetail2 = ""
 			Var VendingOrderID = Seeker.ORDER_ID
 			Var ServiceRefund = 0
-			Var ServiceCharge = Seeker.ServiceCharge
+			Var ServiceCharge = 0
 			Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceRefund ServiceCharge Donate

 			Var waitAckPay = 2
@ -452,7 +452,7 @@
 			Var PayDetail2 = ""
 			Var VendingOrderID = Seeker.ORDER_ID
 			Var ServiceRefund = 0
-			Var ServiceCharge = Seeker.ServiceCharge
+			Var ServiceCharge = 0
 			Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceRefund ServiceCharge Donate

 			Var waitAckPay = 2
--- a/xml/page_collect_point_1.xml
+++ b/xml/page_collect_point_1.xml
@ -190,8 +190,7 @@
 			Var Param1 = TelephoneNumber + "/"
 			Var Param1 = Param1 + ParamCP

-			TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/7.7_up_to_35/can_get_code.ev"
-
+			;include="/mnt/sdcard/coffeevending/taobin_project/xml/sometime/before_collect_main_point.xml"

 			GETACCEXT Param1 23
 			Open "ROOT/taobin_project/xml/page_collect_point_2.xml"
@ -220,7 +219,7 @@
 		Var Param1 = TelephoneNumber + "/"
 		Var Param1 = Param1 + ParamCP

-        TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/7.7_up_to_35/can_get_code.ev"
+		;include="/mnt/sdcard/coffeevending/taobin_project/xml/sometime/before_collect_main_point.xml"

 		GETACCEXT Param1 23
 		Open "ROOT/taobin_project/xml/page_collect_point_2.xml"
@ -685,7 +684,7 @@
 			Var Param1 = TelephoneNumber + "/"
 			Var Param1 = Param1 + ParamCP

-            TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/7.7_up_to_35/can_get_code.ev"
+			;include="/mnt/sdcard/coffeevending/taobin_project/xml/sometime/before_collect_main_point.xml"

 			GETACCEXT Param1 23
 			Open "ROOT/taobin_project/xml/page_collect_point_2.xml"
--- a/xml/sometime/before_collect_main_point.xml
+++ b/xml/sometime/before_collect_main_point.xml
@ -0,0 +1,6 @@
+If LentDayPro = 1 Then
+    GETACCEXT TelephoneNumber 44
+    Open "ROOT/taobin_project/xml/event/lent_day/page_collect_lent_check.xml"
+EndIf
+
+TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/7.7_up_to_35/can_get_code.ev"