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

Merge branch 'masterpiece' of ssh://192.168.10.159:/1TBHDD/ikong/taobin_project into masterpiece

Browse source
This commit is contained in:
Pakin 2024-04-05 14:24:20 +07:00
commit a6ca83906e
54 changed files with 10581 additions and 3162 deletions
Download patch file Download diff file Expand all files Collapse all files

6980
xml/.page_topping_select_icream.xml Normal file
View file

File diff suppressed because it is too large Load diff

1
xml/event/tricker.ev
View file

@ -359,6 +359,7 @@ If taobin_nopro = "true" Then
Var ProBadValentineEnable = 0
Var FreeEnergyDrink = 0
Var MondayBananaPro = 0
Var FreeFirePro = 0
Var TeaTimePro = 0
Var PepsiSecondCup30Enable = 0

14
xml/menutab/menu_new_layout_gen.py
View file

@ -19,6 +19,12 @@
else:
from_my_mint_promotion = False
if current_file_name == "page_catalog_group_soft_serve.skt":
topping_redirect = True
else:
topping_redirect = False
#print ("######################################################################################################")
idx_of_eng = 2
out_xml('<FrameScroll> \r\n')
@ -291,7 +297,13 @@
out_xml( '\t\t\r\n')
out_xml( '\t\t\r\n')
if spl[1] != "None":
if topping_redirect:
out_xml( '\t\tTabMenuVisibleInst 99\r\n')
out_xml( '\t\tOpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/.page_topping_select_icream.xml"\r\n')
elif spl[1] != "None":
out_xml( '\t\tTabMenuVisibleInst 99\r\n')
out_xml( '\t\tOpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml"\r\n')
#out_xml( '\t\tOpen "ROOT/taobin_project/xml/page_topping_select5.xml"\r\n')

4
xml/menutab/page_catalog.xml
View file

@ -708,9 +708,11 @@
</EventUnitTest2>
<EventUnitTest3>
<EventUnitTest3>
Open "/mnt/sdcard/coffeevending/taobin_project/xml/menutab/page_catalog_group_soft_serve.xml"
</EventUnitTest3>
<EventUnitTest4>
</EventUnitTest4>

1026
xml/menutab/page_catalog_group_coffee.xml
View file

File diff suppressed because it is too large Load diff

34
xml/menutab/page_catalog_group_soft_serve.xml
View file

@ -649,7 +649,7 @@
TabMenuVisibleInst 99
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml"
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/.page_topping_select_icream.xml"
</EventOnClick>
</Button>
@ -902,7 +902,7 @@
TabMenuVisibleInst 99
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml"
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/.page_topping_select_icream.xml"
</EventOnClick>
</Button>
@ -1155,7 +1155,7 @@
TabMenuVisibleInst 99
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml"
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/.page_topping_select_icream.xml"
</EventOnClick>
</Button>
@ -1408,7 +1408,7 @@
TabMenuVisibleInst 99
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml"
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/.page_topping_select_icream.xml"
</EventOnClick>
</Button>
@ -1661,7 +1661,7 @@
TabMenuVisibleInst 99
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml"
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/.page_topping_select_icream.xml"
</EventOnClick>
</Button>
@ -1914,7 +1914,7 @@
TabMenuVisibleInst 99
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml"
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/.page_topping_select_icream.xml"
</EventOnClick>
</Button>
@ -2167,7 +2167,7 @@
TabMenuVisibleInst 99
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml"
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/.page_topping_select_icream.xml"
</EventOnClick>
</Button>
@ -2420,7 +2420,7 @@
TabMenuVisibleInst 99
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml"
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/.page_topping_select_icream.xml"
</EventOnClick>
</Button>
@ -2673,7 +2673,7 @@
TabMenuVisibleInst 99
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml"
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/.page_topping_select_icream.xml"
</EventOnClick>
</Button>
@ -2926,7 +2926,7 @@
TabMenuVisibleInst 99
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml"
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/.page_topping_select_icream.xml"
</EventOnClick>
</Button>
@ -3179,7 +3179,7 @@
TabMenuVisibleInst 99
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml"
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/.page_topping_select_icream.xml"
</EventOnClick>
</Button>
@ -3432,7 +3432,7 @@
TabMenuVisibleInst 99
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml"
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/.page_topping_select_icream.xml"
</EventOnClick>
</Button>
@ -3685,7 +3685,7 @@
TabMenuVisibleInst 99
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml"
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/.page_topping_select_icream.xml"
</EventOnClick>
</Button>
@ -3938,7 +3938,7 @@
TabMenuVisibleInst 99
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml"
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/.page_topping_select_icream.xml"
</EventOnClick>
</Button>
@ -4191,7 +4191,7 @@
TabMenuVisibleInst 99
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml"
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/.page_topping_select_icream.xml"
</EventOnClick>
</Button>
@ -4444,7 +4444,7 @@
TabMenuVisibleInst 99
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml"
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/.page_topping_select_icream.xml"
</EventOnClick>
</Button>
@ -4699,7 +4699,7 @@ Banana" </Value>
TabMenuVisibleInst 99
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml"
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/.page_topping_select_icream.xml"
</EventOnClick>
</Button>

4
xml/menutab/page_catalog_group_songkran.xml
View file

@ -1839,7 +1839,7 @@ HOUSE " </Value>
</Text>
</Block>
; - - -
; ==================> Len = 12
; ==================> Len = 17
; - 12-05-02-0055 -
<Block>
<MarginLeft> 33 </MarginLeft>
@ -2092,7 +2092,7 @@ HOUSE " </Value>
</Text>
</Block>
; - - -
; ==================> Len = 12
; ==================> Len = 17
; - 12-05-02-0056 -
<Block>
<MarginLeft> 33 </MarginLeft>

4
xml/page_back_to_main.xml
View file

@ -19,8 +19,8 @@
TopView "hide"
Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_list.xml"
;Open "/mnt/sdcard/coffeevending/taobin_project/xml/sometime/top_spender.xml"
;Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_list.xml"
Open "/mnt/sdcard/coffeevending/taobin_project/xml/sometime/top_spender.xml"
</EventOpen>

4
xml/page_board.xml
View file

@ -7,8 +7,8 @@
<Background> "0xeae6e1" </Background>
<Volume> SoundVolume </Volume>
<EventOpen>
TopView "hide"
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/topview_blank_main.xml"
;TopView "hide"
;OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/topview_blank_main.xml"
Var FileNumber = 1
Var img_press_main_page = "ROOT/taobin_project/image/main_page/bp_main_page_start.png"

2
xml/page_catalog2.xml
View file

@ -694,7 +694,7 @@
</EventUnitTest2>
<EventUnitTest3>
Open "/mnt/sdcard/coffeevending/taobin_project/xml/event/promotion_pepsi.xml"
Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_group_soft_serve.xml"
</EventUnitTest3>
<EventUnitTest4>
Open "/mnt/sdcard/coffeevending/taobin_project/xml/menutab/page_catalog.xml"

1018
xml/page_catalog_group_coffee.xml
View file

File diff suppressed because it is too large Load diff

2043
xml/page_catalog_group_recommend.xml
View file

File diff suppressed because it is too large Load diff

4
xml/page_topping_select7.xml
View file

@ -504,7 +504,7 @@
If MenuReady = "YES" Then
DEBUGVAR ToppingDetail
; echo -n true > /mnt/sdcard/coffeevending/menu_blend_free
@ -7677,6 +7677,8 @@
; Pack
Topping "Pack" ExtendDataCurr
Else
Topping "SetNextOrder" UserSelectProductCode