Merge branch 'masterpiece' of ssh://192.168.10.159:/1TBHDD/ikong/taobin_project into sgp_blue
This commit is contained in:
Pakin
commit
12f7a04e18
21 changed files with 556 additions and 355 deletions
|
|
@ -632,6 +632,8 @@
|
|||
DEBUGVAR EventTurnOn
|
||||
|
||||
Var UsePepsiTheme = 0
|
||||
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/sold_cup_count.xml"
|
||||
|
||||
|
||||
;inter-page-board
|
||||
If CountryName = "Malaysia" Then
|
||||
|
|
@ -698,6 +700,7 @@
|
|||
If BoxID = 200002 Then
|
||||
Var UseSlideShowVideo = 1
|
||||
EndIf
|
||||
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/sold_cup_count.xml"
|
||||
|
||||
EndIf
|
||||
|
||||
|
|
@ -727,6 +730,7 @@
|
|||
Var MaxPhoneNumber = 12
|
||||
|
||||
STRCONTAIN "1215" MaterialAvailable SugarZeroCalEnable
|
||||
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/sold_cup_count.xml"
|
||||
EndIf
|
||||
|
||||
;inter-page-board
|
||||
|
|
@ -746,6 +750,7 @@
|
|||
;Var VideoMainPage = "ROOT/taobin_project/inter/aus/video/video_main.mp4"
|
||||
Var img_press_main_page = "ROOT/taobin_project/image/main_page_en/bp_main_page_start.png"
|
||||
|
||||
|
||||
Var ShowNetworkProblemText = "Network error. Payment Cash only."
|
||||
|
||||
Var CountryRootPath = "ROOT/taobin_project/inter/aus/"
|
||||
|
|
@ -779,6 +784,7 @@
|
|||
|
||||
Var MinPhoneNumber = 10
|
||||
Var MaxPhoneNumber = 10
|
||||
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/sold_cup_count.xml"
|
||||
|
||||
EndIf
|
||||
|
||||
|
|
@ -827,6 +833,7 @@
|
|||
|
||||
Var MinPhoneNumber = 10
|
||||
Var MaxPhoneNumber = 11
|
||||
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/sold_cup_count.xml"
|
||||
|
||||
EndIf
|
||||
|
||||
|
|
@ -844,6 +851,7 @@
|
|||
Var show_eng = "true"
|
||||
Var img_press_main_page = "ROOT/taobin_project/image/main_page_en/bp_main_page_start.png"
|
||||
|
||||
|
||||
Var VideoMainPage = "ROOT/taobin_project/inter/sgp/video/video_main.mp4"
|
||||
|
||||
Var ShowNetworkProblemText = "Network error. Payment Cash only."
|
||||
|
|
@ -862,6 +870,10 @@
|
|||
|
||||
Var MemberButtonFileName = ""
|
||||
Var MemberButtonFileNameRest = ""
|
||||
|
||||
|
||||
Var MemberButtonFileName = "ROOT/taobin_project/image/main_page_en/bp_main_page_member.png"
|
||||
Var MemberButtonFileNameRest = "ROOT/taobin_project/image/main_page_en/bn_main_page_member.png"
|
||||
Var show_eng_button_stage = "Invisible"
|
||||
|
||||
Var CountDownShowButton = 35
|
||||
|
|
@ -880,7 +892,10 @@
|
|||
|
||||
; Singapore disable point
|
||||
Var SettingIgnoreCollectPoint = 1
|
||||
|
||||
If BoxID = 210604 Then
|
||||
Var SettingIgnoreCollectPoint = 0
|
||||
EndIf
|
||||
|
||||
READ_FILE "/mnt/sdcard/coffeevending/use_pt_dev" use_pt_dev
|
||||
STRCONTAIN "1" use_pt_dev enable_pt_mode_by_cfg
|
||||
|
||||
|
|
@ -901,6 +916,10 @@
|
|||
Var UsePepsiTheme = 1
|
||||
Var TargetThemeNum = 2
|
||||
|
||||
Var VideoAdvert = "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
|
||||
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/sold_cup_count.xml"
|
||||
|
||||
|
||||
|
||||
EndIf
|
||||
|
||||
|
|
@ -962,6 +981,7 @@
|
|||
Var MaxPhoneNumber = 9
|
||||
|
||||
Var UsePepsiTheme = 1
|
||||
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/sold_cup_count.xml"
|
||||
|
||||
EndIf
|
||||
|
||||
|
|
@ -1030,6 +1050,7 @@
|
|||
Var ShowCountDownAsPercent = 1
|
||||
|
||||
DEBUGVAR ShowButtonClick2
|
||||
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/sold_cup_count.xml"
|
||||
EndIf
|
||||
|
||||
|
||||
|
|
@ -1232,6 +1253,11 @@
|
|||
|
||||
XMLSaveFileNameForResume 0 "/mnt/sdcard/coffeevending/taobin_project/xml/page_board.xml"
|
||||
XMLSaveFileNameForResume 1 "/mnt/sdcard/coffeevending/taobin_project/xml/sold_cup_count.xml"
|
||||
|
||||
Var CountDownPauseVideo2 = 2
|
||||
DEBUGVAR CountDownPauseVideo2
|
||||
Var TimeProfilePrice = 0
|
||||
Var XMLProfilePrevious = XMLProfile
|
||||
|
||||
</EventOpen>
|
||||
|
||||
|
|
@ -1305,7 +1331,7 @@
|
|||
<EventUnitTest2>
|
||||
Var NextPage = "ROOT/taobin_project/xml/page_back_to_main.xml"
|
||||
|
||||
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
|
||||
OpenInst 1 VideoAdvert
|
||||
|
||||
|
||||
Var OpenFromPageBoard = 1
|
||||
|
|
@ -1328,118 +1354,49 @@
|
|||
</EventUnitTest2>
|
||||
|
||||
<EventUnitTest3>
|
||||
Var XMLProfile = "General"
|
||||
PRICE "Reset" "-"
|
||||
PRICE "Load" "-"
|
||||
PRICE "CheckAndApply" XMLProfile
|
||||
Var XMLProfile = "ProfileIncrease15"
|
||||
Var TimeProfilePrice = 0
|
||||
|
||||
DEBUGVAR ProfileIndex[0]
|
||||
DEBUGVAR ProfileIndex[1]
|
||||
DEBUGVAR ProfileIndex[2]
|
||||
DEBUGVAR ProfileIndex[3]
|
||||
DEBUGVAR ProfileIndex[4]
|
||||
DEBUGVAR ProfileIndex[5]
|
||||
DEBUGVAR ProfileIndex[6]
|
||||
DEBUGVAR ProfileIndex[7]
|
||||
DEBUGVAR ProfileIndex[8]
|
||||
DEBUGVAR ProfileIndex[9]
|
||||
DEBUGVAR ProfileIndex[10]
|
||||
|
||||
PRICE "Reload" ""
|
||||
</EventUnitTest3>
|
||||
|
||||
<EventUnitTest4>
|
||||
Var XMLProfile = "ProfileIncrease15"
|
||||
Var XMLProfile = "ProfileIncrease25"
|
||||
Var TimeProfilePrice = 0
|
||||
|
||||
</EventUnitTest4>
|
||||
|
||||
<EventUnitTest5>
|
||||
Var XMLProfile = "School"
|
||||
PRICE "Reset" "-"
|
||||
PRICE "Load" "-"
|
||||
PRICE "CheckAndApply" XMLProfile
|
||||
Var XMLProfile = "ProfileIncrease30"
|
||||
Var TimeProfilePrice = 0
|
||||
|
||||
DEBUGVAR ProfileIndex[0]
|
||||
DEBUGVAR ProfileIndex[1]
|
||||
DEBUGVAR ProfileIndex[2]
|
||||
DEBUGVAR ProfileIndex[3]
|
||||
DEBUGVAR ProfileIndex[4]
|
||||
DEBUGVAR ProfileIndex[5]
|
||||
DEBUGVAR ProfileIndex[6]
|
||||
DEBUGVAR ProfileIndex[7]
|
||||
DEBUGVAR ProfileIndex[8]
|
||||
DEBUGVAR ProfileIndex[9]
|
||||
DEBUGVAR ProfileIndex[10]
|
||||
PRICE "Reload" ""
|
||||
</EventUnitTest5>
|
||||
|
||||
|
||||
<EventUnitTest6>
|
||||
Var XMLProfile = "TierSouki"
|
||||
PRICE "Reset" "-"
|
||||
PRICE "Load" "-"
|
||||
PRICE "CheckAndApply" XMLProfile
|
||||
|
||||
DEBUGVAR ProfileIndex[0]
|
||||
DEBUGVAR ProfileIndex[1]
|
||||
DEBUGVAR ProfileIndex[2]
|
||||
DEBUGVAR ProfileIndex[3]
|
||||
DEBUGVAR ProfileIndex[4]
|
||||
DEBUGVAR ProfileIndex[5]
|
||||
DEBUGVAR ProfileIndex[6]
|
||||
DEBUGVAR ProfileIndex[7]
|
||||
DEBUGVAR ProfileIndex[8]
|
||||
DEBUGVAR ProfileIndex[9]
|
||||
DEBUGVAR ProfileIndex[10]
|
||||
PRICE "Reload" ""
|
||||
Var XMLProfile = "ProfileIncrease35"
|
||||
Var TimeProfilePrice = 0
|
||||
|
||||
</EventUnitTest6>
|
||||
|
||||
<EventUnitTest7>
|
||||
Var XMLProfile = "Tier1"
|
||||
PRICE "Reset" "-"
|
||||
PRICE "Load" "-"
|
||||
PRICE "CheckAndApply" XMLProfile
|
||||
|
||||
DEBUGVAR ProfileIndex[0]
|
||||
DEBUGVAR ProfileIndex[1]
|
||||
DEBUGVAR ProfileIndex[2]
|
||||
DEBUGVAR ProfileIndex[3]
|
||||
DEBUGVAR ProfileIndex[4]
|
||||
DEBUGVAR ProfileIndex[5]
|
||||
DEBUGVAR ProfileIndex[6]
|
||||
DEBUGVAR ProfileIndex[7]
|
||||
DEBUGVAR ProfileIndex[8]
|
||||
DEBUGVAR ProfileIndex[9]
|
||||
DEBUGVAR ProfileIndex[10]
|
||||
PRICE "Reload" ""
|
||||
Var XMLProfile = "ProfileIncrease45"
|
||||
Var TimeProfilePrice = 0
|
||||
|
||||
</EventUnitTest7>
|
||||
|
||||
<EventUnitTest8>
|
||||
Var XMLProfile = "Discount50"
|
||||
|
||||
|
||||
CacheVarStr "put" XMLProfile
|
||||
;PRICE "Reset" "-"
|
||||
;PRICE "Load" "-"
|
||||
;PRICE "CheckAndApply" XMLProfile
|
||||
|
||||
;DEBUGVAR ProfileIndex[0]
|
||||
;DEBUGVAR ProfileIndex[1]
|
||||
;DEBUGVAR ProfileIndex[2]
|
||||
;DEBUGVAR ProfileIndex[3]
|
||||
;DEBUGVAR ProfileIndex[4]
|
||||
;DEBUGVAR ProfileIndex[5]
|
||||
;DEBUGVAR ProfileIndex[6]
|
||||
;DEBUGVAR ProfileIndex[7]
|
||||
;DEBUGVAR ProfileIndex[8]
|
||||
;DEBUGVAR ProfileIndex[9]
|
||||
;DEBUGVAR ProfileIndex[10]
|
||||
;PRICE "Reload" ""
|
||||
Var TimeProfilePrice = 0
|
||||
|
||||
</EventUnitTest8>
|
||||
|
||||
<EventUnitTest9>
|
||||
Var XMLProfile = "Discount90Per"
|
||||
CacheVarStr "put" XMLProfile
|
||||
|
||||
|
||||
</EventUnitTest9>
|
||||
|
||||
<EventDrink>
|
||||
SAVELOG "EventDrink EventDrink EventDrink EventDrink EventDrink "
|
||||
</EventDrink>
|
||||
|
|
@ -1597,7 +1554,7 @@
|
|||
Var ShowButtonClick = "Invisible"
|
||||
Refresh
|
||||
EndIf
|
||||
|
||||
|
||||
If CountDownShowButton = 3 Then
|
||||
|
||||
Var ShowButtonClick = "Enable"
|
||||
|
|
@ -1606,9 +1563,12 @@
|
|||
EndIf
|
||||
|
||||
If CountDownPauseVideo > 0 Then
|
||||
DEBUGVAR CountDownPauseVideo
|
||||
; ignore
|
||||
|
||||
Var CountDownPauseVideo = CountDownPauseVideo - 1
|
||||
|
||||
Var CountDownPauseVideo2 = CountDownPauseVideo - 1
|
||||
DEBUGVAR CountDownPauseVideo2
|
||||
If CountDownPauseVideo = 2 Then
|
||||
|
||||
TapScreen 30 638
|
||||
|
|
@ -1617,16 +1577,17 @@
|
|||
|
||||
|
||||
If CountDownPauseVideo = 1 Then
|
||||
|
||||
|
||||
TapScreen 860 1004
|
||||
|
||||
EndIf
|
||||
|
||||
|
||||
If CountDownPauseVideo = 0 Then
|
||||
|
||||
Var NextPage = "ROOT/taobin_project/xml/page_back_to_main.xml"
|
||||
|
||||
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
|
||||
OpenInst 1 VideoAdvert
|
||||
|
||||
|
||||
Var OpenFromPageBoard = 1
|
||||
|
|
@ -1739,6 +1700,32 @@
|
|||
EndIf
|
||||
|
||||
|
||||
|
||||
Var TimeProfilePrice = TimeProfilePrice + 1
|
||||
If XMLProfilePrevious = XMLProfile Then
|
||||
|
||||
Else
|
||||
If TimeProfilePrice = 5 Then
|
||||
PRICE "Reset" "-"
|
||||
PRICE "Load" "-"
|
||||
PRICE "CheckAndApply" XMLProfile
|
||||
|
||||
DEBUGVAR ProfileIndex[0]
|
||||
DEBUGVAR ProfileIndex[1]
|
||||
DEBUGVAR ProfileIndex[2]
|
||||
DEBUGVAR ProfileIndex[3]
|
||||
DEBUGVAR ProfileIndex[4]
|
||||
DEBUGVAR ProfileIndex[5]
|
||||
DEBUGVAR ProfileIndex[6]
|
||||
DEBUGVAR ProfileIndex[7]
|
||||
DEBUGVAR ProfileIndex[8]
|
||||
DEBUGVAR ProfileIndex[9]
|
||||
DEBUGVAR ProfileIndex[10]
|
||||
|
||||
PRICE "Reload" "-"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
Refresh
|
||||
|
||||
TimerReset
|
||||
|
|
@ -1792,10 +1779,10 @@
|
|||
; Handle penetrator
|
||||
|
||||
If Only18 = "true" Then
|
||||
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
|
||||
OpenInst 1 VideoAdvert
|
||||
OpenInst 2 "ROOT/taobin_project/xml/page_identity18_verification.xml"
|
||||
Else
|
||||
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
|
||||
OpenInst 1 VideoAdvert
|
||||
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml"
|
||||
EndIf
|
||||
|
||||
|
|
@ -1831,7 +1818,7 @@
|
|||
<Volume> SoundVolume </Volume>
|
||||
<EventClick>
|
||||
|
||||
;OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
|
||||
OpenInst 1 VideoAdvert
|
||||
If CocktailShow = "true" Then
|
||||
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_cocktail.xml"
|
||||
Else
|
||||
|
|
@ -1869,7 +1856,7 @@
|
|||
|
||||
Var NextPage = "-"
|
||||
|
||||
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
|
||||
OpenInst 1 VideoAdvert
|
||||
|
||||
If InternationalEnable = 1 Then
|
||||
;inter-xml-open
|
||||
|
|
@ -1923,7 +1910,7 @@
|
|||
SAVELOG "click ShowButtonClickFull"
|
||||
|
||||
Var NextPage = "-"
|
||||
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
|
||||
OpenInst 1 VideoAdvert
|
||||
If SpiralOnline = "true" Then
|
||||
|
||||
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_with_vending.xml"
|
||||
|
|
@ -1994,7 +1981,7 @@
|
|||
If IgnoreNetCore = "true" Then
|
||||
|
||||
Var NextPage = "-"
|
||||
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
|
||||
OpenInst 1 VideoAdvert
|
||||
|
||||
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog.lxml"
|
||||
|
||||
|
|
@ -2017,7 +2004,7 @@
|
|||
|
||||
Var NextPage = "ROOT/taobin_project/xml/page_back_to_main.xml"
|
||||
|
||||
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
|
||||
OpenInst 1 VideoAdvert
|
||||
|
||||
|
||||
Var OpenFromPageBoard = 1
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue