Merge branch 'master' of ssh://192.168.10.159:/1TBHDD/ikong/taobin_project
This commit is contained in:
commit
130ac15301
162 changed files with 13291 additions and 2651 deletions
|
|
@ -67,6 +67,9 @@
|
|||
Var KanitRegularTTF = "ROOT/taobin_project/font/Kanit/Kanit-Regular.ttf"
|
||||
Var KanitThinTTF = "ROOT/taobin_project/font/Kanit/Kanit-Thin.ttf"
|
||||
Var KanitLightTTF = "ROOT/taobin_project/font/Kanit/Kanit-Light.ttf"
|
||||
|
||||
Var OpunMediumTTF = "ROOT/taobin_project/font/Opun/Opun-Medium.ttf"
|
||||
Var OpunThinTTF = "ROOT/taobin_project/font/Opun/Opun-Thin.ttf"
|
||||
|
||||
Var KanitSemiBoldTTF = "ROOT/taobin_project/font/Kanit/Kanit-Medium.ttf"
|
||||
|
||||
|
|
@ -113,13 +116,6 @@
|
|||
Var TestLoopSuccess = 0
|
||||
Var TestLoopFailed = 0
|
||||
|
||||
;Var IgnoreNetCore = "false"
|
||||
;DEBUGVAR SaleProfile
|
||||
|
||||
;STRCONTAIN "whey" SaleProfile WheyShow
|
||||
;STRCONTAIN "cocktail" SaleProfile CocktailShow
|
||||
;STRCONTAIN "roadshow" SaleProfile RoadShow
|
||||
|
||||
Var cock_tail_str = ""
|
||||
READ_FILE "/mnt/sdcard/cock_tail_enable" cock_tail_str
|
||||
STRCONTAIN "1" cock_tail_str cock_tail_enable
|
||||
|
|
@ -348,27 +344,27 @@
|
|||
EndIf
|
||||
|
||||
If VideoAdvIndex = 0 Then
|
||||
Var video_menu_1 = AdvTaobinMenu + AdvertiseProfile7
|
||||
Var video_menu_1 = AdvTaobinMenu2 + AdvertiseProfile7
|
||||
Var video_menu_1 = video_menu_1 + ".mp4"
|
||||
EndIf
|
||||
If VideoAdvIndex = 1 Then
|
||||
Var video_menu_1 = AdvTaobinMenu + AdvertiseProfile8
|
||||
Var video_menu_1 = AdvTaobinMenu2 + AdvertiseProfile8
|
||||
Var video_menu_1 = video_menu_1 + ".mp4"
|
||||
EndIf
|
||||
If VideoAdvIndex = 2 Then
|
||||
Var video_menu_1 = AdvTaobinMenu + AdvertiseProfile9
|
||||
Var video_menu_1 = AdvTaobinMenu2 + AdvertiseProfile9
|
||||
Var video_menu_1 = video_menu_1 + ".mp4"
|
||||
EndIf
|
||||
If VideoAdvIndex = 3 Then
|
||||
Var video_menu_1 = AdvTaobinMenu + AdvertiseProfile10
|
||||
Var video_menu_1 = AdvTaobinMenu2 + AdvertiseProfile10
|
||||
Var video_menu_1 = video_menu_1 + ".mp4"
|
||||
EndIf
|
||||
If VideoAdvIndex = 4 Then
|
||||
Var video_menu_1 = AdvTaobinMenu + AdvertiseProfile11
|
||||
Var video_menu_1 = AdvTaobinMenu2 + AdvertiseProfile11
|
||||
Var video_menu_1 = video_menu_1 + ".mp4"
|
||||
EndIf
|
||||
If VideoAdvIndex = 5 Then
|
||||
Var video_menu_1 = AdvTaobinMenu + AdvertiseProfile12
|
||||
Var video_menu_1 = AdvTaobinMenu2 + AdvertiseProfile12
|
||||
Var video_menu_1 = video_menu_1 + ".mp4"
|
||||
EndIf
|
||||
|
||||
|
|
@ -390,22 +386,8 @@
|
|||
Machine CancelWepApp
|
||||
|
||||
|
||||
;StrLen AdvertiseProfile AdvertiseProfileLen
|
||||
;
|
||||
;If AdvertiseProfileLen = 0 Then
|
||||
; CacheVarStr "get" AdvertiseProfile
|
||||
;Else
|
||||
;
|
||||
; STRCONTAIN "00/00" AdvertiseProfile advPro
|
||||
;
|
||||
; If advPro = "true" Then
|
||||
; CacheVarStr "get" AdvertiseProfile
|
||||
; Else
|
||||
; CacheVarStr "put" AdvertiseProfile
|
||||
; EndIf
|
||||
;EndIf
|
||||
|
||||
DEBUGVAR AdvertiseProfile
|
||||
StrLen AdvertiseProfile AdvertiseProfileLen
|
||||
|
||||
|
||||
If XMLProfile = "taobin_notopup" Then
|
||||
Var ButtontoTopupMenu = "Disable"
|
||||
|
|
@ -422,11 +404,13 @@
|
|||
READ_FILE "/mnt/sdcard/new_layout" new_layout
|
||||
|
||||
|
||||
DEBUGVAR JXMLVersionInt
|
||||
DEBUGVAR XMLPageVersionInt
|
||||
|
||||
|
||||
If JXMLVersionInt > 389 Then
|
||||
If XMLPageVersionInt > 640 Then
|
||||
Var new_layout = "true"
|
||||
Else
|
||||
Var new_layout = "false"
|
||||
EndIf
|
||||
|
||||
DEBUGVAR new_layout
|
||||
|
|
@ -444,6 +428,22 @@
|
|||
If NetworkStatus = "DEACTIVE" Then
|
||||
Open "/ROOT/xml/offline.xml"
|
||||
EndIf
|
||||
|
||||
If AdvertiseProfileLen = 0 Then
|
||||
CacheVarStr "get" AdvertiseProfile
|
||||
Else
|
||||
|
||||
STRCONTAIN "00/00" AdvertiseProfile advPro
|
||||
|
||||
If advPro = "true" Then
|
||||
CacheVarStr "get" AdvertiseProfile
|
||||
Else
|
||||
CacheVarStr "put" AdvertiseProfile
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
DEBUGVAR AdvertiseProfile
|
||||
|
||||
</EventOpen>
|
||||
|
||||
<Timeout> 1000 </Timeout>
|
||||
|
|
@ -695,7 +695,7 @@
|
|||
;<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
|
||||
<Volume> SoundVolume </Volume>
|
||||
<EventClick>
|
||||
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
|
||||
;OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
|
||||
If CocktailShow = "true" Then
|
||||
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_cocktail.xml"
|
||||
Else
|
||||
|
|
@ -732,6 +732,8 @@
|
|||
<Volume> SoundVolume </Volume>
|
||||
<EventClick>
|
||||
|
||||
Var NextPage = "-"
|
||||
|
||||
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
|
||||
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_check_member.xml"
|
||||
|
||||
|
|
@ -752,6 +754,7 @@
|
|||
<Volume> SoundVolume </Volume>
|
||||
<EventClick>
|
||||
Var PayDetail=""
|
||||
Var NextPage = "-"
|
||||
Open "ROOT/xml/service_menu.xml"
|
||||
</EventClick>
|
||||
</Button>
|
||||
|
|
@ -766,6 +769,8 @@
|
|||
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
|
||||
<Volume> SoundVolume </Volume>
|
||||
<EventClick>
|
||||
|
||||
Var NextPage = "-"
|
||||
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
|
||||
If SpiralOnline = "true" Then
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue