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

SGP: remove QR on drink fail & change contacts at show_error

Browse source
This commit is contained in:
Pakin 2024-09-20 13:33:51 +07:00
parent e2a4299282
commit 05ab6366f8
7 changed files with 53 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

23
inc/video.inc
View file

@ -6,6 +6,8 @@
<Refresh> "Reload" </Refresh> <Refresh> "Reload" </Refresh>
<EventOpen> <EventOpen>
READ_FILE "/mnt/sdcard/coffeevending/openfile_xml_0" CurrPageInst0
If showMultiAds = "true" Then If showMultiAds = "true" Then
@ -95,16 +97,35 @@
DEBUGVAR PreviseXMLFileName2 DEBUGVAR PreviseXMLFileName2
;auto-open
;/mnt/sdcard/coffeevending/taobin_project/xml/page_main_blank.xml
;from-test
;/mnt/sdcard/coffeevending/taobin_project/xml/vending_info.xml
If PreviseXMLFileName2 = "/mnt/sdcard/coffeevending/taobin_project/xml/page_list.xml" Then If PreviseXMLFileName2 = "/mnt/sdcard/coffeevending/taobin_project/xml/page_list.xml" Then
DEBUGVAR CurrentXMLFileName2 DEBUGVAR CurrentXMLFileName2
DEBUGVAR CurrentXMLFileName2 DEBUGVAR CurrentXMLFileName2
DEBUGVAR PreviseXMLFileName2 DEBUGVAR PreviseXMLFileName2
DEBUGVAR CurrPageInst0
Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_" + a_video_menu[ads_idx] Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_" + a_video_menu[ads_idx]
Var DisplayAds = AdvTaobinMenu + ".mp4" Var DisplayAds = AdvTaobinMenu + ".mp4"
EndIf EndIf
If CurrPageInst0 = "/mnt/sdcard/coffeevending/taobin_project/xml/vending_info.xml" Then
Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_" + a_video_menu[ads_idx]
Var DisplayAds = AdvTaobinMenu + ".mp4"
EndIf
If CurrPageInst0 = "/mnt/sdcard/coffeevending/taobin_project/xml/page_board.xml" Then
Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_" + a_video_menu[ads_idx]
Var DisplayAds = AdvTaobinMenu + ".mp4"
EndIf
Else Else
Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_" + a_video_menu[ads_idx] Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_" + a_video_menu[ads_idx]
Var DisplayAds = AdvTaobinMenu + ".mp4" Var DisplayAds = AdvTaobinMenu + ".mp4"
@ -176,6 +197,8 @@
EndIf EndIf
If CountryName = "Singapore" Then If CountryName = "Singapore" Then
DEBUGVAR CountryName
DEBUGVAR CurrentXMLFileName2
If CurrentXMLFileName2 = "/mnt/sdcard/coffeevending//taobin_project/xml/page_back_to_main.xml" Then If CurrentXMLFileName2 = "/mnt/sdcard/coffeevending//taobin_project/xml/page_back_to_main.xml" Then
If CountDownPauseVideo2 < 2 Then If CountDownPauseVideo2 < 2 Then
Var AdvTaobinMenu = "/mnt/sdcard Var AdvTaobinMenu = "/mnt/sdcard

18
inter/sgp/xml/page_drinkfail_sg.lxml
View file

@ -177,17 +177,17 @@ EndIf
<Image> <Image>
<X> 43 </X> <X> 0 </X>
<Y> 428 </Y> <Y> 440 </Y>
<Filename> Var( DirImage + "/text_11.png" ) </Filename> <Filename> Var( DirImage + "/text_11.png" ) </Filename>
</Image> </Image>
<Image> ;<Image>
<X> 429 </X> ;<X> 429 </X>
<Y> 1301 </Y> ;<Y> 1301 </Y>
<State> ShowQRByNoMember </State> ;<State> ShowQRByNoMember </State>
<Filename> Var( DirImage + "/QR_contract.png" ) </Filename> ;<Filename> Var( DirImage + "/QR_contract.png" ) </Filename>
</Image> ;</Image>
;<Image> ;<Image>
;<X> 190 </X> ;<X> 190 </X>
@ -197,7 +197,7 @@ EndIf
<Button> <Button>
<X> 392 </X> <X> 400 </X>
<Y> 1720 </Y> <Y> 1720 </Y>
<Filename> Var( DirImage + "/bn_close.png" )</Filename> <Filename> Var( DirImage + "/bn_close.png" )</Filename>
<FilenamePress> Var( DirImage + "/bp_close.png" )</FilenamePress> <FilenamePress> Var( DirImage + "/bp_close.png" )</FilenamePress>

23
inter/sgp/xml/page_show_error.lxml
View file

@ -280,17 +280,24 @@
<Image> <Image>
<State> show_error_normal </State> <State> show_error_normal </State>
<X> 69 </X> <X> 0 </X>
<Y> 642 </Y> <Y> 897 </Y>
<Filename> Var(DirImage + "/img1.png") </Filename> <Filename> Var(DirImage + "/img1.png") </Filename>
</Image> </Image>
;<Image> <Image>
;<State> show_error_sp1 </State> <State> show_error_normal </State>
;<X> 69 </X> <X> 0 </X>
;<Y> 642 </Y> <Y> 694 </Y>
;<Filename> Var(DirImage + "/img_error_sgp.png") </Filename> <Filename> Var(DirImage + "/text1.png") </Filename>
;</Image> </Image>
;
<Image>
<State> show_error_normal </State>
<X> 0 </X>
<Y> 1685 </Y>
<Filename> Var(DirImage + "/text2.png") </Filename>
</Image>
<Image> <Image>
<State> show_error_sp1 </State> <State> show_error_sp1 </State>

BIN
inter/whatthecup/sgp/image/collectiing/text_11.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 65 KiB

After

Width:  |  Height:  |  Size: 63 KiB

Before After
Before After

BIN
inter/whatthecup/sgp/image/vending_error_en/img1.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 55 KiB

After

Width:  |  Height:  |  Size: 45 KiB

Before After
Before After

BIN
inter/whatthecup/sgp/image/vending_error_en/text2.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 11 KiB

Before After
Before After

8
xml/page_back_to_error.xml
View file

@ -10,9 +10,13 @@
If InternationalEnable = 1 Then If InternationalEnable = 1 Then
If CountryName = "Australia" Then If CountryName = "Australia" Then
OpenInst 0 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_show_error.lxml" OpenInst 0 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_show_error.lxml"
Else
OpenInst 0 "/mnt/sdcard/coffeevending/taobin_project/xml/page_show_error.lxml"
EndIf EndIf
If CountryName = "Singapore" Then
OpenInst 0 "ROOT/taobin_project/inter/sgp/xml/page_show_error.lxml"
EndIf
OpenInst 0 "/mnt/sdcard/coffeevending/taobin_project/xml/page_show_error.lxml"
Else Else
OpenInst 0 "/mnt/sdcard/coffeevending/taobin_project/xml/page_show_error.xml" OpenInst 0 "/mnt/sdcard/coffeevending/taobin_project/xml/page_show_error.xml"
EndIf EndIf