AUS: Update collect point

inter/aus/xml/page_collect_point_3.lxml

@@ -9,6 +9,7 @@
 	; On open
 
 	Var Timeout = 0
+	Var TargetTimeout = 5
 	;CoffeePoint
 	;Var CoffeePoint = 30
     Var BmiYear = "0/0/0/0/0/0/0/0/0/1"
@@ -35,6 +36,7 @@
 	Var PointDiff = 0
 
 	Var redeemButtonState = "Disable"
+	Var closeButtonState = "Enable"
 	Var RedeemType = ""
 
 	Var TaobinExpireDay = ""
@@ -456,22 +458,44 @@
 	If CoffeePoint >= 30 Then
 		Var taobinP30 = "Enable"
 		Var taobinImgP30 = "/shell_get_free_active.png"
+		Var TargetTimeout = 2
+		Var redeemButtonState = "Invisible"
+		Var closeButtonState = "Invisible"
 	EndIf
 
 	;inter-from-consent
 	Var Seeker.FromConsent = 0
  
+	Var AlradyRedeem = 0
 
-	Var redeemSeeker = "curr-redeem"
-	If redeemSeeker.phoneNumber = Seeker.TNumberTaobinMember Then
-		If redeemSeeker.redeem1Dollar = 1 Then
-			Var redeemButtonState = "Disable"
-		Else
-			If redeemSeeker.redeem2Dollar = 1 Then
-				Var redeemButtonState = "Disable"
+	DEBUGVAR Seeker
+	DEBUGVAR Seeker.redeemDiscount
+
+
+	If Seeker = "next" Then
+		Var Seeker.redeemDiscount = ""
+		Var CurrSeeker = "curr"
+
+		If CurrSeeker.TNumberTaobinMember = Seeker.TNumberTaobinMember Then
+			DEBUGVAR CurrSeeker.redeemDiscount
+
+			If CurrSeeker.redeemDiscount = "" Then
+
+			Else
+				
+				If CurrSeeker.redeemDiscount = "get_free" Then
+					Var redeemButtonState = "Invisible"
+					Var closeButtonState = "Invisible"
+				Else
+					Var redeemButtonState = "Disable"
+				EndIf
+
+				Var AlradyRedeem = 1
 			EndIf
+
 		EndIf
 	EndIf
+
 </EventOpen>
 <Timeout> 1000 </Timeout>
 <EventTimeout> 
@@ -482,13 +506,22 @@
 
 	
 
-	;Var Timeout = Timeout + 1
-	If Timeout > 5 Then
+	Var Timeout = Timeout + 1
+	If Timeout > TargetTimeout Then
     	; goto lid straw
 
     	If CoffeePoint >= 30 Then
-			Var RedeemType = "get_free"
-			Open "ROOT/taobin_project/inter/aus/xml/page_collect_point_redeem.lxml"
+			If Seeker = "next" Then
+				If AlradyRedeem = 1 Then
+					Open "ROOT/taobin_project/xml/page_lid_straw.xml"
+				Else
+					Var RedeemType = "get_free"
+					Open "ROOT/taobin_project/inter/aus/xml/page_collect_point_redeem.lxml"
+				EndIf
+			Else
+				Var RedeemType = "get_free"
+				Open "ROOT/taobin_project/inter/aus/xml/page_collect_point_redeem.lxml"
+			EndIf
 		Else
 			Open "ROOT/taobin_project/xml/page_lid_straw.xml"
 		EndIf
@@ -929,6 +962,7 @@
 <Button>
 <X> 212 </X>
 <Y> 1752 </Y>
+<State> closeButtonState </State>
 <Filename> Var( DirImage + "/close_btn.png" )</Filename>
 <FilenamePress> Var( DirImage + "/close_btn_pressed.png" )</FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>