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

MYS: fix case switch app & cannot input number from 30/8

Browse source
This commit is contained in:
Pakin 2024-09-02 09:55:55 +07:00
parent 3f2d68fa03
commit d1b3bc91d7
7 changed files with 2834 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1092
inter/mys/xml/page_collect_point_1.lxml Normal file
View file

File diff suppressed because it is too large Load diff

363
inter/mys/xml/page_collect_point_2.lxml Normal file
View file

@ -0,0 +1,363 @@
<Popup>
<Cache> "Enable" </Cache>
<Width> 1080 </Width>
<Height> 1920 </Height>
<Background> "0xeae6e1" </Background>
<Volume> SoundVolume </Volume>
<EventOpen>
; On open
Var Timeout = 0
SAVELOG UnitTestType
If UnitTestType = "1" Then
Var CoffeePoint = 10
Open "ROOT/taobin_project/xml/page_show_consent.xml"
EndIf
Var TaobinLevel = 0
Var Point2X = 0
Var Seeker.IsLineMember = 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/inter/mys/xml/page_collect_point_error.lxml"
EndIf
Var GetLuckyDraw = 0
</EventOpen>
<Timeout> 1000 </Timeout>
<EventTimeout>
Var CountDownBrewing = BREW_CNT
Var ShowCountDownBrewing = CountDownBrewing
Var Timeout = Timeout + 1
If Timeout > 30 Then
Var TaobinLevel = 0
Var CoffeePoint = 1
Var Seeker.TaobinErrorNetwork = 1
Var Seeker.PointTaobinStr = ParamCP
Var TelephoneNumber = TelephoneNumberX
Var Seeker.TNumberTaobinMember= TelephoneNumber
Open "ROOT/taobin_project/inter/mys/xml/page_collect_point_error.lxml"
EndIf
TimerReset
Refresh
</EventTimeout>
<EventSecurity>
Open "/media/bt/xml/security_alarm.xml"
</EventSecurity>
<EventActionOk>
If StepGetPoint = 0 Then
If PdpaAsk = 0 Then
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/mys/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/mys/xml/page_collect_point_error.lxml"
Else
If GetLuckyDraw = 1 Then
If Ext1a = "ok" Then
DEBUGVAR Ext1h
DEBUGVAR Ext1i
Var luckyDrawTicket = Ext1h
INT luckyDrawTicket
Var luckyDrawAlredyGotReward = Ext1i
If luckyDrawAlredyGotReward = 1 Then
Open "ROOT/taobin_project/xml/page_collect_point_3_28.xml"
Else
Open "ROOT/taobin_project/xml/page_collect_point_3_28_lucky_draw_campaign.xml"
EndIf
Else
Var Seeker.TaobinErrorNetwork = 1
Var Seeker.PointTaobinStr = ParamCP
Var TelephoneNumber = TelephoneNumberX
Var Seeker.TNumberTaobinMember = TelephoneNumber
Open "ROOT/taobin_project/inter/mys/xml/page_collect_point_error.lxml"
EndIf
EndIf
If GetLuckyDraw = 0 Then
If Ext1a = "ok" Then
Var TaobinName = Ext1d
Var TaobinCoupons = Ext1g
Var TaobinExpire = Ext1f
Var TaobinLevel = Ext1e
Var TaobinPDPA = Ext1h
Var TaobinPromoX = Ext1j
DEBUGVAR TaobinPDPA
Var PointTaobinTmp = Ext1i
DEBUGVAR PointTaobinTmp
INT PointTaobinTmp
INT TaobinPDPA
If TaobinName = "-" Then
Var Seeker.IsLineMember = 0
Else
Var Seeker.IsLineMember = 1
EndIf
Var TelephoneNumber = TelephoneNumberX
Var TNumberTaobinMemberXXX = TelephoneNumber
;Var PointTaobinTmp = 4
Var PointTaobin = PointTaobinTmp
Var pTaobin = PointTaobin
DEBUGVAR TaobinLevel
If TaobinLevel = "1" Then
Var pTaobin = PayAmount / 20
Else
Var pTaobin = PayAmount / 15
EndIf
If pTaobin > 0 Then
Var pTaobinX = PointTaobin / pTaobin
If pTaobinX >= 2 Then
Var Point2X = 1
EndIf
EndIf
Var Seeker.PointTaobinStr = ParamCP
Var Seeker.TNumberTaobinMember = TelephoneNumberX
Var CoffeePointRank = Ext1b
INT CoffeePointRank
Var CoffeePoint1 = Ext1c
INT CoffeePoint1
Var CoffeePoint = PointTaobin + CoffeePoint1
Var CoffeePointOld = CoffeePoint1
If TaobinLevel = 1 Then
Var CoffeePointRank = CoffeePointRank + 0
Else
Var CoffeePointRank = CoffeePointRank + PointTaobin
EndIf
Var CoffeePointRankTmp = CoffeePointRank
DEBUGVAR Seeker.PointTaobinStr
DEBUGVAR Seeker.TNumberTaobinMember
If TaobinPDPA = 0 Then
;inter-xml-open
If CountryName = "Malaysia" Then
Open "ROOT/taobin_project/inter/mys/xml/page_collect_point_3.xml"
EndIf
;inter-xml-open
If CountryName = "Indonesia" Then
Open "ROOT/taobin_project/xml/page_collect_point_3.xml"
EndIf
;inter-xml-open
If CountryName = "Australia" Then
If NewCollectPointFlag = 1 Then
Var pageCollectPoint = CountryRootPath + "/xml/page_collect_point_3.lxml"
Open pageCollectPoint
Else
Open "ROOT/taobin_project/xml/page_collect_point_3.lxml"
EndIf
EndIf
;inter-xml-open
If CountryName = "Singapore" Then
Open "ROOT/taobin_project/xml/page_collect_point_3.xml"
EndIf
Open "ROOT/taobin_project/xml/page_show_consent.xml"
EndIf
If PayAmount >= 20 Then
If TaobinPromoX = "p2.no_otp" Then
Open "ROOT/taobin_project/xml/page_collect_point_extend1.xml"
EndIf
If TaobinPromoX = "p2.unused" Then
Open "ROOT/taobin_project/xml/page_collect_point_extend1.xml"
EndIf
EndIf
If NewCollectPoint = 1 Then
If LuckyDrawCampaign = 1 Then
Var GetLuckyDraw = 1
GETACCEXT TelephoneNumber 14
Else
Open "ROOT/taobin_project/xml/page_collect_point_3_28.xml"
EndIf
Else
Open "ROOT/taobin_project/inter/mys/xml/page_collect_point_3.lxml"
EndIf
Else
Var Seeker.TaobinErrorNetwork = 1
Var Seeker.PointTaobinStr = ParamCP
Var TelephoneNumber = TelephoneNumberX
Var Seeker.TNumberTaobinMember = TelephoneNumber
Open "ROOT/taobin_project/inter/mys/xml/page_collect_point_error.lxml"
EndIf
EndIf
EndIf
EndIf
</EventActionOk>
<EventActionError>
Var Seeker.TaobinErrorNetwork = 1
Var Seeker.PointTaobinStr = ParamCP
Var TelephoneNumber = TelephoneNumberX
Var Seeker.TNumberTaobinMember= TelephoneNumber
Open "ROOT/taobin_project/inter/mys/xml/page_collect_point_error.lxml"
</EventActionError>
<EventMachine>
If MachineStage = "drink-success" Then
Var MachineState_Result = 1
EndIf
If MachineStage = "drink-failed" Then
Var MachineState_Result = 2
EndIf
</EventMachine>
<Image>
<X> 178 </X>
<Y> 680 </Y>
<Filename> Var( DirImage + "/text20.png" ) </Filename>
</Image>
;include="ROOT/taobin_project/inc/video.inc"
<Text>
<X> 0 </X>
<Y> 873 </Y>
<Width> 1080 </Width>
<Align> Center </Align>
<Size> 62 </Size>
<Font> RobotoBlack </Font>
<Color> 0x513C2F </Color>
<Value> TelephoneNumber </Value>
<Format> Telnum-mask-1 </Format>
</Text>
;
<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>

1256
inter/mys/xml/page_collect_point_3.lxml Normal file
View file

File diff suppressed because it is too large Load diff

112
inter/mys/xml/page_collect_point_error.lxml Normal file
View file

@ -0,0 +1,112 @@
<Popup>
<Cache> "Enable" </Cache>
<Width> 1080 </Width>
<Height> 1920 </Height>
<Background> "0xeae6e1" </Background>
<Volume> SoundVolume </Volume>
<EventOpen>
; On open
Var Timeout = 0
SAVELOG show_eng
If show_eng = "true" Then
Var DirImage = "ROOT/taobin_project/image/display_get_free_en/"
Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png"
Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png"
Else
Var DirImage = "ROOT/taobin_project/image/display_get_free/"
Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png"
Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png"
EndIf
</EventOpen>
<Timeout> 1000 </Timeout>
<EventTimeout>
Var Timeout = Timeout + 1
If Timeout > 5 Then
; goto lid straw
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
TimerReset
Refresh
</EventTimeout>
<EventMachine>
If MachineStage = "drink-success" Then
Var MachineState_Result = 1
EndIf
If MachineStage = "drink-failed" Then
Var MachineState_Result = 2
EndIf
</EventMachine>
<Image>
<X> 0 </X>
<Y> 380 </Y>
<Filename> "ROOT/taobin_project/image/collectiing/alpha.png" </Filename>
</Image>
<Image>
<X> 158 </X>
<Y> 665 </Y>
<Filename> Var( DirImage + "/img_popup4.png" )</Filename>
</Image>
<Button>
<X> 397 </X>
<Y> 1680 </Y>
<Filename> Var( DirImage + "/bn_accept.png" ) </Filename>
<FilenamePress> Var( DirImage + "/bp_accept.png" )</FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
; goto lid straw
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
</EventClick>
</Button>
;include="ROOT/taobin_project/inc/video.inc"
<EventSecurity>
Open "/media/bt/xml/security_alarm.xml"
</EventSecurity>
</Page>

4
xml/open_page_collect_point.ev
View file

@ -6,6 +6,10 @@ If CountryName = "Australia" Then
Var PageCollectPoint1 = "ROOT/taobin_project/inter/aus/xml/page_collect_point_1.lxml" Var PageCollectPoint1 = "ROOT/taobin_project/inter/aus/xml/page_collect_point_1.lxml"
EndIf EndIf
If CountryName = "Malaysia" Then
Var PageCollectPoint1 = "ROOT/taobin_project/inter/mys/xml/page_collect_point_1.lxml"
EndIf
If CountryName = "Singapore" Then If CountryName = "Singapore" Then
; ask-if-member-yet ; ask-if-member-yet
Var MemberPrompt = CountryRootPath + "xml/page_member_prompt.lxml" Var MemberPrompt = CountryRootPath + "xml/page_member_prompt.lxml"

2
xml/page_payment_cash-MYR.xml
View file

@ -523,7 +523,6 @@
EndIf EndIf
WRITE_FILE "/mnt/sdcard/app_run_flag" "1"
</EventOpen> </EventOpen>
@ -1718,6 +1717,7 @@ If alphaState = "Invisible" Then
DEBUGVAR VendingCashless DEBUGVAR VendingCashless
Var ReqPayInfoFromCashOther = 2 Var ReqPayInfoFromCashOther = 2
WRITE_FILE "/mnt/sdcard/app_run_flag" "1"
EndIf EndIf
EndIf EndIf

6
xml/verify_number.ev
View file

@ -17,4 +17,10 @@ EndIf
If Tel2D = "09" Then If Tel2D = "09" Then
Var Tel2DFlag = 1 Var Tel2DFlag = 1
EndIf
If InternationalEnable = 1 Then
Var VerifyFile = CountryRootPath + "/xml/verify_number.ev"
TRY VerifyFile
EndIf EndIf