AUS: Add CleanFeedback
This commit is contained in:
parent
b376726bac
commit
c5a0631077
6 changed files with 78 additions and 63 deletions
|
|
@ -9,7 +9,8 @@
|
|||
; Enable app game
|
||||
Var GameEnableFromTrickerEv = 0
|
||||
|
||||
Var NewCollectPointFlag = 1
|
||||
Var New_Payment = 1
|
||||
Var CleanFeedbackFlag = 1
|
||||
|
||||
Var HappyEasterPro = 0
|
||||
Var AutumnBreezePro = 0
|
||||
|
|
|
|||
|
|
@ -1122,18 +1122,17 @@
|
|||
If AddData = 1 Then
|
||||
Var Cid = 26
|
||||
|
||||
If NewCollectPointFlag = 1 Then
|
||||
If Seeker.redeemDiscount = "2_dollar" Then
|
||||
Var Cid = 49
|
||||
EndIf
|
||||
|
||||
If Seeker.redeemDiscount = "1_dollar" Then
|
||||
Var Cid = 48
|
||||
EndIf
|
||||
|
||||
Var Seeker.redeemDiscount = ""
|
||||
If Seeker.redeemDiscount = "2_dollar" Then
|
||||
Var Cid = 49
|
||||
EndIf
|
||||
|
||||
If Seeker.redeemDiscount = "1_dollar" Then
|
||||
Var Cid = 48
|
||||
EndIf
|
||||
|
||||
Var Seeker.redeemDiscount = ""
|
||||
|
||||
AddData Cid Seeker.TNumberTaobinMember Seeker.PointTaobinStr PointCrm GetScore
|
||||
EndIf
|
||||
|
||||
|
|
@ -1238,17 +1237,15 @@
|
|||
|
||||
If AddData = 1 Then
|
||||
Var Cid = 26
|
||||
If NewCollectPointFlag = 1 Then
|
||||
If Seeker.redeemDiscount = "2_dollar" Then
|
||||
Var Cid = 49
|
||||
EndIf
|
||||
|
||||
If Seeker.redeemDiscount = "1_dollar" Then
|
||||
Var Cid = 48
|
||||
EndIf
|
||||
|
||||
Var Seeker.redeemDiscount = ""
|
||||
If Seeker.redeemDiscount = "2_dollar" Then
|
||||
Var Cid = 49
|
||||
EndIf
|
||||
|
||||
If Seeker.redeemDiscount = "1_dollar" Then
|
||||
Var Cid = 48
|
||||
EndIf
|
||||
|
||||
Var Seeker.redeemDiscount = ""
|
||||
AddData Cid Seeker.TNumberTaobinMember Seeker.PointTaobinStr PointCrm GetScore
|
||||
EndIf
|
||||
|
||||
|
|
|
|||
|
|
@ -622,19 +622,17 @@
|
|||
If AddData = 1 Then
|
||||
Var Cid = 26
|
||||
DEBUGVAR "Brewing3Conti"
|
||||
If NewCollectPointFlag = 1 Then
|
||||
If Seeker.redeemDiscount = "2_dollar" Then
|
||||
Var Cid = 49
|
||||
EndIf
|
||||
|
||||
If Seeker.redeemDiscount = "1_dollar" Then
|
||||
Var Cid = 48
|
||||
EndIf
|
||||
|
||||
DEBUGVAR Seeker.redeemDiscount
|
||||
Var Seeker.redeemDiscount = ""
|
||||
If Seeker.redeemDiscount = "2_dollar" Then
|
||||
Var Cid = 49
|
||||
EndIf
|
||||
|
||||
If Seeker.redeemDiscount = "1_dollar" Then
|
||||
Var Cid = 48
|
||||
EndIf
|
||||
|
||||
DEBUGVAR Seeker.redeemDiscount
|
||||
Var Seeker.redeemDiscount = ""
|
||||
|
||||
DEBUGVAR Cid
|
||||
DEBUGVAR Seeker
|
||||
DEBUGVAR Seeker.TNumberTaobinMember
|
||||
|
|
@ -750,18 +748,16 @@
|
|||
If AddData = 1 Then
|
||||
Var Cid = 26
|
||||
|
||||
If NewCollectPointFlag = 1 Then
|
||||
If Seeker.redeemDiscount = "2_dollar" Then
|
||||
Var Cid = 49
|
||||
EndIf
|
||||
|
||||
If Seeker.redeemDiscount = "1_dollar" Then
|
||||
Var Cid = 48
|
||||
EndIf
|
||||
|
||||
Var Seeker.redeemDiscount = ""
|
||||
If Seeker.redeemDiscount = "2_dollar" Then
|
||||
Var Cid = 49
|
||||
EndIf
|
||||
|
||||
If Seeker.redeemDiscount = "1_dollar" Then
|
||||
Var Cid = 48
|
||||
EndIf
|
||||
|
||||
Var Seeker.redeemDiscount = ""
|
||||
|
||||
DEBUGVAR Cid
|
||||
DEBUGVAR Seeker
|
||||
DEBUGVAR Seeker.TNumberTaobinMember
|
||||
|
|
|
|||
|
|
@ -185,7 +185,12 @@
|
|||
;Open "ROOT/taobin_project/xml/page_catalog.xml"
|
||||
|
||||
|
||||
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
|
||||
If CleanFeedbackFlag = 1 Then
|
||||
Var CleanFeedBackToCollectPoint = 0
|
||||
Open "ROOT/taobin_project/xml/page_clean_feedback.xml"
|
||||
Else
|
||||
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
If Timeout = 18 Then
|
||||
|
|
@ -531,7 +536,12 @@
|
|||
;Open "ROOT/taobin_project/xml/page_catalog.xml"
|
||||
SAVELOG "collect_point1-p589."
|
||||
|
||||
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
|
||||
If CleanFeedbackFlag = 1 Then
|
||||
Var CleanFeedBackToCollectPoint = 0
|
||||
Open "ROOT/taobin_project/xml/page_clean_feedback.xml"
|
||||
Else
|
||||
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
|
||||
EndIf
|
||||
</EventClick>
|
||||
</Button>
|
||||
|
||||
|
|
|
|||
|
|
@ -165,11 +165,12 @@
|
|||
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"
|
||||
EndIf
|
||||
If CleanFeedbackFlag = 1 Then
|
||||
Var CleanFeedBackToCollectPoint = 1
|
||||
Open "ROOT/taobin_project/xml/page_clean_feedback.xml"
|
||||
Else
|
||||
Open "ROOT/taobin_project/inter/aus/xml/page_collect_point_3.lxml"
|
||||
EndIf
|
||||
|
||||
Else
|
||||
|
||||
|
|
|
|||
|
|
@ -7,12 +7,12 @@
|
|||
|
||||
<EventOpen>
|
||||
; On open
|
||||
|
||||
|
||||
|
||||
Var Timeout = 0
|
||||
SAVELOG show_eng
|
||||
|
||||
If show_eng = "true" Then
|
||||
|
||||
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"
|
||||
|
|
@ -24,17 +24,22 @@
|
|||
EndIf
|
||||
</EventOpen>
|
||||
<Timeout> 1000 </Timeout>
|
||||
<EventTimeout>
|
||||
<EventTimeout>
|
||||
|
||||
Var Timeout = Timeout + 1
|
||||
If Timeout > 5 Then
|
||||
; goto lid straw
|
||||
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
|
||||
If CleanFeedbackFlag = 1 Then
|
||||
Var CleanFeedBackToCollectPoint = 0
|
||||
Open "ROOT/taobin_project/xml/page_clean_feedback.xml"
|
||||
Else
|
||||
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
TimerReset
|
||||
Refresh
|
||||
</EventTimeout>
|
||||
</EventTimeout>
|
||||
|
||||
<EventMachine>
|
||||
If MachineStage = "drink-success" Then
|
||||
|
|
@ -73,10 +78,15 @@
|
|||
<FilenamePress> Var( DirImage + "/bp_accept.png" )</FilenamePress>
|
||||
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
|
||||
<Volume> SoundVolume </Volume>
|
||||
<EventClick>
|
||||
<EventClick>
|
||||
; goto lid straw
|
||||
|
||||
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
|
||||
If CleanFeedbackFlag = 1 Then
|
||||
Var CleanFeedBackToCollectPoint = 0
|
||||
Open "ROOT/taobin_project/xml/page_clean_feedback.xml"
|
||||
Else
|
||||
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
|
||||
EndIf
|
||||
|
||||
</EventClick>
|
||||
</Button>
|
||||
|
|
@ -91,17 +101,17 @@
|
|||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<EventSecurity>
|
||||
Open "/media/bt/xml/security_alarm.xml"
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<EventSecurity>
|
||||
Open "/media/bt/xml/security_alarm.xml"
|
||||
</EventSecurity>
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue