diff --git a/inter/aus/xml/page_collect_point_2.lxml b/inter/aus/xml/page_collect_point_2.lxml index 493a33f1..3b4710f6 100644 --- a/inter/aus/xml/page_collect_point_2.lxml +++ b/inter/aus/xml/page_collect_point_2.lxml @@ -10,7 +10,7 @@ Var Timeout = 0 SAVELOG UnitTestType - + If UnitTestType = "1" Then Var CoffeePoint = 10 Open "ROOT/taobin_project/xml/page_show_consent.xml" @@ -23,12 +23,12 @@ Var Seeker.TaobinErrorNetwork = 0 - If show_eng = "true" Then + 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" @@ -40,13 +40,13 @@ Var Seeker.PointTaobinStr = ParamCP Var TelephoneNumber = TelephoneNumberX Var Seeker.TNumberTaobinMember= TelephoneNumber - Open "ROOT/taobin_project/inter/aus/xml/page_collect_point_error.xml" + Open "ROOT/taobin_project/inter/aus/xml/page_collect_point_error.lxml" EndIf - + 1000 - + Var CountDownBrewing = BREW_CNT Var ShowCountDownBrewing = CountDownBrewing @@ -54,57 +54,57 @@ Var Timeout = Timeout + 1 If Timeout > 30 Then - - + + Var TaobinLevel = 0 - Var CoffeePoint = 1 + Var CoffeePoint = 1 Var Seeker.TaobinErrorNetwork = 1 Var Seeker.PointTaobinStr = ParamCP - + Var TelephoneNumber = TelephoneNumberX - + Var Seeker.TNumberTaobinMember= TelephoneNumber Open "ROOT/taobin_project/inter/aus/xml/page_collect_point_error.xml" - - + + EndIf TimerReset Refresh - + - - - Open "/media/bt/xml/security_alarm.xml" + + + Open "/media/bt/xml/security_alarm.xml" If StepGetPoint = 0 Then If PdpaAsk = 0 Then - Open "ROOT/taobin_project/xml/page_show_consent.xml" + Open "ROOT/taobin_project/xml/page_show_consent.xml" Else Var StepGetPoint = 1 - + Var TelephoneNumber = TelephoneNumberX - + GETACCEXT TelephoneNumber 14 Var Ext1a = "" - Open "ROOT/taobin_project/inter/aus/xml/page_collect_point_2.xml" + Open "ROOT/taobin_project/inter/aus/xml/page_collect_point_2.xml" EndIf Else If Ext1a = "" Then - + Var Seeker.TaobinErrorNetwork = 1 Var Seeker.PointTaobinStr = ParamCP Var TelephoneNumber = TelephoneNumberX Var Seeker.TNumberTaobinMember = TelephoneNumber Open "ROOT/taobin_project/inter/aus/xml/page_collect_point_error.xml" - + Else If Ext1a = "ok" Then @@ -130,13 +130,13 @@ Else Var Seeker.IsLineMember = 1 EndIf - + Var TelephoneNumber = TelephoneNumberX Var TNumberTaobinMemberXXX = TelephoneNumber ;Var PointTaobinTmp = 4 - + Var PointTaobin = PointTaobinTmp DEBUGVAR TaobinLevel @@ -149,7 +149,7 @@ Var CoffeePoint1 = Ext1c INT CoffeePoint1 - + Var CoffeePoint = PointTaobin + CoffeePoint1 Var CoffeePointOld = CoffeePoint1 @@ -157,24 +157,24 @@ Var CoffeePointRank = CoffeePointRank + 0 Else Var CoffeePointRank = CoffeePointRank + PointTaobin - EndIf + EndIf Var CoffeePointRankTmp = CoffeePointRank DEBUGVAR Seeker.PointTaobinStr DEBUGVAR Seeker.TNumberTaobinMember - + If NewCollectPointFlag = 1 Then Open "ROOT/taobin_project/inter/aus/xml/page_collect_point_3.lxml" Else - Open "ROOT/taobin_project/xml/page_collect_point_3.xml" + Open "ROOT/taobin_project/xml/page_collect_point_3.xml" EndIf Else - + Var Seeker.TaobinErrorNetwork = 1 - + Var Seeker.PointTaobinStr = ParamCP Var TelephoneNumber = TelephoneNumberX Var Seeker.TNumberTaobinMember = TelephoneNumber @@ -185,20 +185,20 @@ - + + + - - Var Seeker.TaobinErrorNetwork = 1 - + Var Seeker.PointTaobinStr = ParamCP Var TelephoneNumber = TelephoneNumberX Var Seeker.TNumberTaobinMember= TelephoneNumber Open "ROOT/taobin_project/inter/aus/xml/page_collect_point_error.lxml" - - + + If MachineStage = "drink-success" Then @@ -261,4 +261,3 @@ - \ No newline at end of file