pakin/taobin_project
1
0
Fork 0
Code Issues Pull requests Projects 1 Releases 1 Packages Wiki Activity Actions

Merge branch 'master' of ssh://forthrd.ddns.net:2222/1TBHDD/ikong/taobin_project

Browse source
This commit is contained in:
kong 2023-07-21 15:18:01 +07:00
commit 4fd72aba2b
9 changed files with 41 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
image/collect_point1/text_6.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 12 KiB

Before After
Before After

BIN
image/collect_point1/text_edit2.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 2.7 KiB

Before After
Before After

BIN
image/collectiing/text_show_error6.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 9 KiB

BIN
image/collectiing_en/text_show_error6.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 7.7 KiB

10
xml/page_collect_point_extend1.xml
View file

@ -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>

7
xml/page_collect_point_extend2.xml
View file

@ -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>

11
xml/page_identityMember_number.xml
View file

@ -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 = ""
@ -533,7 +533,7 @@
Var text_show_error = DirImage2 + "/text_show_error5.png"
Var ShowErrorText = "Enable"
;Var TelephoneNumber = ""
Var TelephoneNumber = ""
Var Tel_Confirm_State = "Invisible"
Refresh
@ -566,6 +566,13 @@
<Filename> Var( DirImage + "/text_6.png") </Filename>
</Image>
<Image>
<X> 152 </X>
<Y> 955 </Y>
<State> ShowErrorText </State>
<Filename> text_show_error </Filename>
</Image>
<Image>

39
xml/page_identityMember_otp.xml
View file

@ -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
@ -431,10 +431,10 @@
Var DirImage2 = "ROOT/taobin_project/image/collectiing"
EndIf
Var text_show_error = DirImage2 + "/text_show_error5.png"
Var text_show_error = DirImage2 + "/text_show_error6.png"
Var ShowErrorText = "Enable"
;Var PinNumber = ""
Var PinNumber = ""
Var Tel_Confirm_State = "Invisible"
Refresh
@ -455,13 +455,13 @@
<Image>
<X> 259 </X>
<Y> 802 </Y>
<Y> 878 </Y>
<Filename> "ROOT/taobin_project/image/collect_point1/img4.png" </Filename>
</Image>
<Image>
<X> 157 </X>
<Y> 868 </Y>
<X> 248 </X>
<Y> 878 </Y>
<State> ShowTextNumber </State>
<Filename> Var( DirImage + "/text_edit2.png") </Filename>
</Image>
@ -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>

2
xml/page_topping_select7.xml
View file

@ -4496,7 +4496,7 @@
If SelectDrinkType = 1 Then
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml"
;Open "ROOT/taobin_project/xml/page_identity_verification.xml"
Open "ROOT/taobin_project/xml/page_identityMember_number.xml"
Open "ROOT/taobin_project/xml/page_pagement.xml"
EndIf
EndIf