From a7e64578baffc0b20852f798277d3d836d3e3d9a Mon Sep 17 00:00:00 2001
From: miggaze <pichet@forth.co.th>
Date: Fri, 21 Jul 2023 12:17:46 +0700
Subject: [PATCH] ...

---
 xml/page_collect_point_extend1.xml | 10 ++++-----
 xml/page_collect_point_extend2.xml |  7 +++---
 xml/page_identityMember_number.xml |  2 +-
 xml/page_identityMember_otp.xml    | 35 ++++++++++++++++++------------
 4 files changed, 30 insertions(+), 24 deletions(-)

diff --git a/xml/page_collect_point_extend1.xml b/xml/page_collect_point_extend1.xml
index b5d57703..9408a1f6 100644
--- a/xml/page_collect_point_extend1.xml
+++ b/xml/page_collect_point_extend1.xml
@@ -55,14 +55,14 @@
 
 
 <Image>
-<X> 158 </X>
-<Y> 665 </Y>
+<X> 182 </X>
+<Y> 748 </Y>
 <Filename> Var( DirImage + "/img_popup5.png" )</Filename>
 </Image>
 
 
 <Button>
-<X> 270 </X>
+<X> 633 </X>
 <Y> 1379 </Y>
 <Filename> Var( DirImage + "/bn_accept.png" ) </Filename>
 <FilenamePress> Var( DirImage + "/bp_accept.png" )</FilenamePress>
@@ -72,14 +72,14 @@
 	; goto lid straw
 
 	
-	Open "ROOT/taobin_project/xml/page_collect_point_extent2.xml"
+	Open "ROOT/taobin_project/xml/page_collect_point_extend2.xml"
 
 </EventClick>
 </Button>
 
 
 <Button>
-<X> 633 </X>
+<X> 270 </X>
 <Y> 1379 </Y>
 <Filename> Var( DirImage + "/bn_skip.png" ) </Filename>
 <FilenamePress> Var( DirImage + "/bn_skip.png" )</FilenamePress>
diff --git a/xml/page_collect_point_extend2.xml b/xml/page_collect_point_extend2.xml
index 45aad401..07e543ac 100644
--- a/xml/page_collect_point_extend2.xml
+++ b/xml/page_collect_point_extend2.xml
@@ -23,6 +23,7 @@
 		Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png"
 	EndIf
 
+	Var img_popupX = "/img_popup8.png"
 
 	If TaobinPromoX = "p2.no_otp" Then
 
@@ -45,8 +46,6 @@
 		Var img_popupX = "/img_popup7.png"
 	EndIf
 
-	
-	Var img_popupX = "/img_popup7.png"
 
 </EventOpen>
 <Timeout> 1000 </Timeout>
@@ -77,8 +76,8 @@
 
 
 <Image>
-<X> 158 </X>
-<Y> 665 </Y>
+<X> 182 </X>
+<Y> 748 </Y>
 <Filename> Var( DirImage + img_popupX )</Filename>
 </Image>
 
diff --git a/xml/page_identityMember_number.xml b/xml/page_identityMember_number.xml
index 3f710ef3..d778b88a 100644
--- a/xml/page_identityMember_number.xml
+++ b/xml/page_identityMember_number.xml
@@ -78,7 +78,7 @@
 	If FailState = "Enable" Then
 
 		Var failTime = failTime + 1
-		If failTime >= 3 Then
+		If failTime >= 5 Then
 			Var failTime = 0
 			Var FailState = "Invisible"
 			Var TelephoneNumber = ""
diff --git a/xml/page_identityMember_otp.xml b/xml/page_identityMember_otp.xml
index f91892bb..fcd2f1f4 100644
--- a/xml/page_identityMember_otp.xml
+++ b/xml/page_identityMember_otp.xml
@@ -39,7 +39,7 @@
 
 	Var Tel_Confirm_Flag = 1
 
-	Var PinNumber = 4
+	Var MaxNumber = 4  
 
 
 </EventOpen>
@@ -93,7 +93,7 @@
 <EventClick> 
 	Var Timeout = 0
 	Var PinNumber = PinNumber + "1"
-	Trim PinNumber PinNumber
+	Trim PinNumber MaxNumber
 	StrLen PinNumber TelNumLen
 	
 	If TelNumLen >= 4 Then 
@@ -123,7 +123,7 @@
 <EventClick> 
 	Var Timeout = 0
 	Var PinNumber = PinNumber + "2"
-	Trim PinNumber PinNumber
+	Trim PinNumber MaxNumber
 	StrLen PinNumber TelNumLen
 	
 	If TelNumLen >= 4 Then 
@@ -148,7 +148,7 @@
 <EventClick> 
 	Var Timeout = 0
 	Var PinNumber = PinNumber + "3"
-	Trim PinNumber PinNumber
+	Trim PinNumber MaxNumber
 	StrLen PinNumber TelNumLen
 	
 	If TelNumLen >= 4 Then 
@@ -173,7 +173,7 @@
 <EventClick> 
 	Var Timeout = 0
 	Var PinNumber = PinNumber + "4"
-	Trim PinNumber PinNumber
+	Trim PinNumber MaxNumber
 	StrLen PinNumber TelNumLen
 	
 	If TelNumLen >= 4 Then 
@@ -198,7 +198,7 @@
 <EventClick> 
 	Var Timeout = 0
 	Var PinNumber = PinNumber + "5"
-	Trim PinNumber PinNumber
+	Trim PinNumber MaxNumber
 	StrLen PinNumber TelNumLen
 	
 	If TelNumLen >= 4 Then 
@@ -223,7 +223,7 @@
 <EventClick> 
 	Var Timeout = 0
 	Var PinNumber = PinNumber + "6"
-	Trim PinNumber PinNumber
+	Trim PinNumber MaxNumber
 	StrLen PinNumber TelNumLen
 	
 	If TelNumLen >= 4 Then 
@@ -248,7 +248,7 @@
 <EventClick> 
 	Var Timeout = 0
 	Var PinNumber = PinNumber + "7"
-	Trim PinNumber PinNumber
+	Trim PinNumber MaxNumber
 	StrLen PinNumber TelNumLen
 	
 	If TelNumLen >= 4 Then 
@@ -273,7 +273,7 @@
 <EventClick> 
 	Var Timeout = 0
 	Var PinNumber = PinNumber + "8"
-	Trim PinNumber PinNumber
+	Trim PinNumber MaxNumber
 	StrLen PinNumber TelNumLen
 	
 	If TelNumLen >= 4 Then 
@@ -298,7 +298,7 @@
 <EventClick> 
 	Var Timeout = 0
 	Var PinNumber = PinNumber + "9"
-	Trim PinNumber PinNumber
+	Trim PinNumber MaxNumber
 	StrLen PinNumber TelNumLen
 	
 	If TelNumLen >= 4 Then 
@@ -324,7 +324,7 @@
 <EventClick> 
 	Var Timeout = 0
 	Var PinNumber = PinNumber + "0"
-	Trim PinNumber PinNumber
+	Trim PinNumber MaxNumber
 	StrLen PinNumber TelNumLen
 	
 	If TelNumLen >= 4 Then 
@@ -434,7 +434,7 @@
 			Var text_show_error = DirImage2 + "/text_show_error5.png"
 
 			Var ShowErrorText = "Enable"
-			;Var PinNumber = ""
+			Var PinNumber = ""
 			Var Tel_Confirm_State = "Invisible"
 			Refresh
 
@@ -455,12 +455,12 @@
 
 <Image>
 <X> 259 </X>
-<Y> 802 </Y>
+<Y> 868 </Y>
 <Filename> "ROOT/taobin_project/image/collect_point1/img4.png" </Filename>
 </Image>
 
 <Image>
-<X> 157 </X>
+<X> 248 </X>
 <Y> 868 </Y>
 <State> ShowTextNumber </State>
 <Filename> Var( DirImage + "/text_edit2.png") </Filename>
@@ -473,6 +473,13 @@
 <Filename> Var( DirImage + "/text_7.png") </Filename>
 </Image>
 
+<Image>
+<X> 152 </X>
+<Y> 955 </Y>
+<State> ShowErrorText </State>
+<Filename> text_show_error </Filename>
+</Image>
+
 
 
 <Video>