Merge branch 'masterpiece' of ssh://192.168.10.159:/1TBHDD/ikong/taobin_project into masterpiece
This commit is contained in:
commit
06c83a1c00
203 changed files with 11336 additions and 1265 deletions
|
|
@ -440,10 +440,34 @@
|
|||
|
||||
Play PlaySoundStraw
|
||||
Else
|
||||
Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/drinkfinish.mp3"
|
||||
If CountryName = "Thailand" Then
|
||||
Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/drinkfinish.mp3"
|
||||
|
||||
If FromJemilaPro = 1 Then
|
||||
Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/jemila/drinkfinish.m4a"
|
||||
If FromJemilaPro = 1 Then
|
||||
Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/jemila/drinkfinish.m4a"
|
||||
EndIf
|
||||
Else
|
||||
Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Straw.mp3"
|
||||
|
||||
If CountryName = "Malaysia" Then
|
||||
Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Straw_without_change.m4a"
|
||||
EndIf
|
||||
|
||||
If CountryName = "Australia" Then
|
||||
Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Straw_without_change.m4a"
|
||||
EndIf
|
||||
|
||||
If CountryName = "UnitedArabEmirates Dubai" Then
|
||||
Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Straw_without_change.m4a"
|
||||
EndIf
|
||||
|
||||
If CountryName = "Singapore" Then
|
||||
Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Straw_without_change.m4a"
|
||||
EndIf
|
||||
|
||||
If CountryName = "HongKong" Then
|
||||
Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Straw_without_change.m4a"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
Play PlaySoundLag
|
||||
|
|
|
|||
|
|
@ -564,14 +564,7 @@
|
|||
</EventTimeout>
|
||||
|
||||
|
||||
<Video>
|
||||
<X> 0 </X>
|
||||
<Y> 0 </Y>
|
||||
<Width> 1080</Width>
|
||||
<Height> 380 </Height>
|
||||
<Loop> "true" </Loop>
|
||||
<Filename> video_menu_0 </Filename>
|
||||
</Video>
|
||||
;include="ROOT/taobin_project/inc/video.inc"
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -588,7 +588,7 @@
|
|||
If show_eng = "true" Then
|
||||
PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Please_scan_to_pay_via_mobile.mp3"
|
||||
Else
|
||||
PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_thai/Please_scan_to_pay_via_mobile.mp3"
|
||||
PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Please_scan_to_pay_via_mobile.mp3"
|
||||
EndIf
|
||||
|
||||
EndIf
|
||||
|
|
@ -614,7 +614,7 @@
|
|||
If show_eng = "true" Then
|
||||
PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Please_scan_to_pay_via_e-wallet.mp3"
|
||||
Else
|
||||
PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_thai/Please_scan_to_pay_via_e-wallet.mp3"
|
||||
PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Please_scan_to_pay_via_e-wallet.mp3"
|
||||
EndIf
|
||||
|
||||
EndIf
|
||||
|
|
@ -643,7 +643,7 @@
|
|||
If show_eng = "true" Then
|
||||
PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Please_scan_to_pay_via_e-wallet.mp3"
|
||||
Else
|
||||
PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_thai/Please_scan_to_pay_via_e-wallet.mp3"
|
||||
PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Please_scan_to_pay_via_e-wallet.mp3"
|
||||
EndIf
|
||||
|
||||
EndIf
|
||||
|
|
@ -670,7 +670,7 @@
|
|||
If show_eng = "true" Then
|
||||
PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Please_scan_to_pay_via_e-wallet.mp3"
|
||||
Else
|
||||
PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_thai/Please_scan_to_pay_via_e-wallet.mp3"
|
||||
PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Please_scan_to_pay_via_e-wallet.mp3"
|
||||
EndIf
|
||||
|
||||
EndIf
|
||||
|
|
@ -697,7 +697,7 @@
|
|||
If show_eng = "true" Then
|
||||
PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Please_scan_to_pay_via_e-wallet.mp3"
|
||||
Else
|
||||
PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_thai/Please_scan_to_pay_via_e-wallet.mp3"
|
||||
PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Please_scan_to_pay_via_e-wallet.mp3"
|
||||
EndIf
|
||||
|
||||
EndIf
|
||||
|
|
@ -724,7 +724,7 @@
|
|||
If show_eng = "true" Then
|
||||
PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Please_scan_to_pay_via_e-wallet.mp3"
|
||||
Else
|
||||
PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_thai/Please_scan_to_pay_via_e-wallet.mp3"
|
||||
PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Please_scan_to_pay_via_e-wallet.mp3"
|
||||
EndIf
|
||||
|
||||
EndIf
|
||||
|
|
@ -1476,7 +1476,7 @@
|
|||
If show_eng = "true" Then
|
||||
PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/The_change_has_run_out.mp3"
|
||||
Else
|
||||
PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_thai/The_change_has_run_out.mp3"
|
||||
PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/The_change_has_run_out.mp3"
|
||||
EndIf
|
||||
|
||||
EndIf
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<EventOpen>
|
||||
Var Top2Timeout = 0
|
||||
|
||||
|
||||
Var InitialMultiInstance = 0
|
||||
|
||||
If InternationalEnable = 1 Then
|
||||
Var topview2_script = CountryRootPath + "/xml/topview2_script.ev"
|
||||
|
|
@ -25,6 +25,9 @@
|
|||
If CountryName = "HongKong" Then
|
||||
If EnableMultiInstance = "true" Then
|
||||
TRY topview2_script
|
||||
Else
|
||||
ENABLE_MULTI_INSTANCE "set"
|
||||
Var InitialMultiInstance = 1
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
|
|
@ -177,6 +180,13 @@
|
|||
Refresh
|
||||
EndIf
|
||||
|
||||
If InitialMultiInstance = 1 Then
|
||||
If Top2Timeout >= 5 Then
|
||||
FINISH
|
||||
Var InitialMultiInstance = 0
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
If EnableMultiInstance = "true" Then
|
||||
If Not#CountDownForMulti = 99 Then
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue