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

Fix on boot some time hang

Browse source
This commit is contained in:
wanlop run 2023-12-10 19:28:22 +07:00
parent 3cd0b26766
commit 791686b0a4
7 changed files with 35 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
xml/menutab/menu_new_layout_gen.py
View file

@ -711,6 +711,8 @@
out_xml( '\t\tVar OpenFromXML = CurrentXMLFileName2\r\n')
out_xml( '\t\tGetInstanceIDMenuTab OpenFromInstMenuTab\r\n')
out_xml( '\t\tVar PriceD1 = $' + spl[8] + '.Price\r\n')
out_xml( '\t\tVar PriceD2 = $' + spl[9] + '.Price\r\n')
out_xml( '\t\tVar PriceD3 = $' + spl[10] + '.Price\r\n')

24
xml/menutab/page_catalog_group_coffee.xml
View file

@ -771,6 +771,7 @@
Var DrinkDescription = "Espresso (30 ml)"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_espresso.png"
Var OpenFromXML = CurrentXMLFileName2
GetInstanceIDMenuTab OpenFromInstMenuTab
Var PriceD1 = $12-21-01-0001.Price
Var PriceD2 = $-.Price
Var PriceD3 = $-.Price
@ -1276,6 +1277,7 @@ ESPRESSO" </Value>
Var DrinkDescription = "Espresso (60 ml)"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_double_espresso.png"
Var OpenFromXML = CurrentXMLFileName2
GetInstanceIDMenuTab OpenFromInstMenuTab
Var PriceD1 = $12-31-01-0001.Price
Var PriceD2 = $-.Price
Var PriceD3 = $-.Price
@ -1781,6 +1783,7 @@ ESPRESSO" </Value>
Var DrinkDescription = "Espresso, Water"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_america_no.png"
Var OpenFromXML = CurrentXMLFileName2
GetInstanceIDMenuTab OpenFromInstMenuTab
Var PriceD1 = $12-21-01-0003.Price
Var PriceD2 = $12-21-02-0001.Price
Var PriceD3 = $-.Price
@ -5368,6 +5371,7 @@ Pink​ Rose & Berry" </Value>
Var DrinkDescription = "Espresso & Soda"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_americano_soda.png"
Var OpenFromXML = CurrentXMLFileName2
GetInstanceIDMenuTab OpenFromInstMenuTab
Var PriceD1 = $-.Price
Var PriceD2 = $12-21-02-0041.Price
Var PriceD3 = $-.Price
@ -11995,6 +11999,7 @@ ICED ESPRESSO" </Value>
Var DrinkDescription = "Espresso, Milk, Sugar,Ice"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_epsresso.png"
Var OpenFromXML = CurrentXMLFileName2
GetInstanceIDMenuTab OpenFromInstMenuTab
Var PriceD1 = $-.Price
Var PriceD2 = $12-31-02-0001.Price
Var PriceD3 = $12-31-03-0001.Price
@ -12496,6 +12501,7 @@ ICED ESPRESSO" </Value>
Var DrinkDescription = "Espresso, Milk, Foamed milk"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_latte.png"
Var OpenFromXML = CurrentXMLFileName2
GetInstanceIDMenuTab OpenFromInstMenuTab
Var PriceD1 = $12-21-01-0004.Price
Var PriceD2 = $12-21-02-0002.Price
Var PriceD3 = $12-21-03-0002.Price
@ -13000,6 +13006,7 @@ ICED ESPRESSO" </Value>
Var DrinkDescription = "Espresso, Milk, Foamed milk"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_cappuccino.png"
Var OpenFromXML = CurrentXMLFileName2
GetInstanceIDMenuTab OpenFromInstMenuTab
Var PriceD1 = $12-21-01-0005.Price
Var PriceD2 = $12-31-02-0002.Price
Var PriceD3 = $12-31-03-0002.Price
@ -13504,6 +13511,7 @@ ICED ESPRESSO" </Value>
Var DrinkDescription = "Espresso, Cocoa, Milk, Sugar"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_mocha.png"
Var OpenFromXML = CurrentXMLFileName2
GetInstanceIDMenuTab OpenFromInstMenuTab
Var PriceD1 = $12-21-01-0006.Price
Var PriceD2 = $12-21-02-0003.Price
Var PriceD3 = $12-21-03-0003.Price
@ -14010,6 +14018,7 @@ Caramel Syrup" </Value>
Var DrinkDescription = "Espresso, Milk, Caramel Syrup"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_caramel_latte.png"
Var OpenFromXML = CurrentXMLFileName2
GetInstanceIDMenuTab OpenFromInstMenuTab
Var PriceD1 = $12-21-01-0007.Price
Var PriceD2 = $12-21-02-0004.Price
Var PriceD3 = $12-21-03-0004.Price
@ -14518,6 +14527,7 @@ CAFÉ LATTE" </Value>
Var DrinkDescription = "Espresso, Matcha, Milk"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_greenteacoffee_lattle.png"
Var OpenFromXML = CurrentXMLFileName2
GetInstanceIDMenuTab OpenFromInstMenuTab
Var PriceD1 = $12-21-01-0031.Price
Var PriceD2 = $12-21-02-0031.Price
Var PriceD3 = $12-21-03-0031.Price
@ -15026,6 +15036,7 @@ CAFÉ LATTE" </Value>
Var DrinkDescription = "Espresso, Matcha, Milk"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_greenteacoffee_lattle.png"
Var OpenFromXML = CurrentXMLFileName2
GetInstanceIDMenuTab OpenFromInstMenuTab
Var PriceD1 = $12-21-01-0008.Price
Var PriceD2 = $12-21-02-0005.Price
Var PriceD3 = $12-21-03-0005.Price
@ -15535,6 +15546,7 @@ Kokuto syrup" </Value>
Var DrinkDescription = "Espresso, Milk, Kokuto syrup"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_kuromitsu_coffee.png"
Var OpenFromXML = CurrentXMLFileName2
GetInstanceIDMenuTab OpenFromInstMenuTab
Var PriceD1 = $12-21-01-0011.Price
Var PriceD2 = $12-21-02-0008.Price
Var PriceD3 = $12-21-03-0008.Price
@ -16044,6 +16056,7 @@ CAFÉ LATTE" </Value>
Var DrinkDescription = "Espresso, Melon, Milk, Sugar"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_melon_americano.png"
Var OpenFromXML = CurrentXMLFileName2
GetInstanceIDMenuTab OpenFromInstMenuTab
Var PriceD1 = $12-21-01-0039.Price
Var PriceD2 = $12-21-02-0039.Price
Var PriceD3 = $-.Price
@ -16553,6 +16566,7 @@ Milk, Sugar" </Value>
Var DrinkDescription = "Espresso, Taiwanese Tea, Milk, Sugar"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_taiwantea_macchiato.png"
Var OpenFromXML = CurrentXMLFileName2
GetInstanceIDMenuTab OpenFromInstMenuTab
Var PriceD1 = $12-21-01-0009.Price
Var PriceD2 = $12-21-02-0006.Price
Var PriceD3 = $12-21-03-0006.Price
@ -17061,6 +17075,7 @@ CAFÉ LATTE" </Value>
Var DrinkDescription = "Espresso, Thai tea, Milk, Sugar"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_coffee_thai_milk_tea.png"
Var OpenFromXML = CurrentXMLFileName2
GetInstanceIDMenuTab OpenFromInstMenuTab
Var PriceD1 = $12-21-01-0029.Price
Var PriceD2 = $12-21-02-0029.Price
Var PriceD3 = $12-21-03-0029.Price
@ -17567,6 +17582,7 @@ CAFÉ LATTE" </Value>
Var DrinkDescription = "Espresso, Thai tea, Milk, Sugar"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_coffee_thai_milk_tea_SingPark.png"
Var OpenFromXML = CurrentXMLFileName2
GetInstanceIDMenuTab OpenFromInstMenuTab
Var PriceD1 = $12-21-01-0055.Price
Var PriceD2 = $12-21-02-0055.Price
Var PriceD3 = $12-21-03-0055.Price
@ -18075,6 +18091,7 @@ Milk, Sugar" </Value>
Var DrinkDescription = "Espresso, Taiwanese Tea, Milk, Sugar"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_taiwantea_macchiato.png"
Var OpenFromXML = CurrentXMLFileName2
GetInstanceIDMenuTab OpenFromInstMenuTab
Var PriceD1 = $12-21-01-0030.Price
Var PriceD2 = $12-21-02-0030.Price
Var PriceD3 = $12-21-03-0030.Price
@ -18583,6 +18600,7 @@ Sugar, Water" </Value>
Var DrinkDescription = "Espresso, Lychee, Sugar, Water"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_lychee_espresso.png"
Var OpenFromXML = CurrentXMLFileName2
GetInstanceIDMenuTab OpenFromInstMenuTab
Var PriceD1 = $12-21-01-0017.Price
Var PriceD2 = $12-21-02-0017.Price
Var PriceD3 = $-.Price
@ -19089,6 +19107,7 @@ Sugar, Water" </Value>
Var DrinkDescription = "Espresso, Yuzu, Sugar, Water"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Yuzu_americano.png"
Var OpenFromXML = CurrentXMLFileName2
GetInstanceIDMenuTab OpenFromInstMenuTab
Var PriceD1 = $12-21-01-0040.Price
Var PriceD2 = $12-21-02-0040.Price
Var PriceD3 = $-.Price
@ -19596,6 +19615,7 @@ Sugar, Water" </Value>
Var DrinkDescription = "Espresso, Tokyo Banana Syrup, Sugar, Water"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_Banana_cafe_latte.png"
Var OpenFromXML = CurrentXMLFileName2
GetInstanceIDMenuTab OpenFromInstMenuTab
Var PriceD1 = $12-21-01-0042.Price
Var PriceD2 = $12-21-02-0042.Price
Var PriceD3 = $12-21-03-0042.Price
@ -20103,6 +20123,7 @@ Sugar, Milk" </Value>
Var DrinkDescription = "Espresso, Mint Syrup, Sugar, Milk"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Mint_cafe_Latte.png"
Var OpenFromXML = CurrentXMLFileName2
GetInstanceIDMenuTab OpenFromInstMenuTab
Var PriceD1 = $12-21-01-0057.Price
Var PriceD2 = $12-21-02-0057.Price
Var PriceD3 = $12-21-03-0057.Price
@ -20609,6 +20630,7 @@ Sugar, Water" </Value>
Var DrinkDescription = "Espresso, Mint Syrup, Sugar, Water"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Mint_Americano.png"
Var OpenFromXML = CurrentXMLFileName2
GetInstanceIDMenuTab OpenFromInstMenuTab
Var PriceD1 = $12-21-01-0058.Price
Var PriceD2 = $12-21-02-0058.Price
Var PriceD3 = $-.Price
@ -21115,6 +21137,7 @@ Sugar, Water" </Value>
Var DrinkDescription = "Espresso, Peach Syrup , Sugar, Water"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_americano_peach.png"
Var OpenFromXML = CurrentXMLFileName2
GetInstanceIDMenuTab OpenFromInstMenuTab
Var PriceD1 = $12-01-01-0059.Price
Var PriceD2 = $12-01-02-0059.Price
Var PriceD3 = $-.Price
@ -21621,6 +21644,7 @@ Sugar, Milk" </Value>
Var DrinkDescription = "Espresso, Peach Syrup, Sugar, Milk"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_peach_latte.png"
Var OpenFromXML = CurrentXMLFileName2
GetInstanceIDMenuTab OpenFromInstMenuTab
Var PriceD1 = $12-21-01-0060.Price
Var PriceD2 = $12-21-02-0060.Price
Var PriceD3 = $12-21-03-0060.Price

4
xml/menutab/page_catalog_group_health.xml
View file

@ -770,6 +770,7 @@
Var DrinkDescription = "Espresso, Water"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_america_no_Healthy.png"
Var OpenFromXML = CurrentXMLFileName2
GetInstanceIDMenuTab OpenFromInstMenuTab
Var PriceD1 = $12-21-01-1003.Price
Var PriceD2 = $12-21-02-1001.Price
Var PriceD3 = $-.Price
@ -1277,6 +1278,7 @@ Foamed milk" </Value>
Var DrinkDescription = "Espresso, Milk, Foamed milk"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_latte_Healthy.png"
Var OpenFromXML = CurrentXMLFileName2
GetInstanceIDMenuTab OpenFromInstMenuTab
Var PriceD1 = $12-21-01-1004.Price
Var PriceD2 = $12-21-02-1002.Price
Var PriceD3 = $-.Price
@ -1784,6 +1786,7 @@ Milk, Sugar" </Value>
Var DrinkDescription = "Espresso, Cocoa, Milk, Sugar"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_Mocha_Healthy.png"
Var OpenFromXML = CurrentXMLFileName2
GetInstanceIDMenuTab OpenFromInstMenuTab
Var PriceD1 = $12-21-01-1006.Price
Var PriceD2 = $12-21-02-1003.Price
Var PriceD3 = $-.Price
@ -2291,6 +2294,7 @@ Foamed milk" </Value>
Var DrinkDescription = "Espresso, Milk, Foamed milk"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_Cappu_Healthy.png"
Var OpenFromXML = CurrentXMLFileName2
GetInstanceIDMenuTab OpenFromInstMenuTab
Var PriceD1 = $12-21-01-1099.Price
Var PriceD2 = $12-21-02-1099.Price
Var PriceD3 = $-.Price

1
xml/menutab/page_catalog_group_oreo.xml
View file

@ -3801,6 +3801,7 @@ Sugar, Oreo" </Value>
Var DrinkDescription = "Peach Syrup, Milk, Sugar, Oreo"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_peach_Oreo_smoothie.png"
Var OpenFromXML = CurrentXMLFileName2
GetInstanceIDMenuTab OpenFromInstMenuTab
Var PriceD1 = $.Price
Var PriceD2 = $.Price
Var PriceD3 = $.Price

2
xml/menutab/page_catalog_group_pro_mymint.xml
View file

@ -768,6 +768,7 @@ Sugar, Milk" </Value>
Var DrinkDescription = "Espresso, Mint Syrup, Sugar, Milk"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Mint_Wealthy_cafe_Latte.png"
Var OpenFromXML = CurrentXMLFileName2
GetInstanceIDMenuTab OpenFromInstMenuTab
Var PriceD1 = $12-21-01-0057.Price
Var PriceD2 = $12-21-02-0057.Price
Var PriceD3 = $12-21-03-0057.Price
@ -1277,6 +1278,7 @@ Sugar, Water" </Value>
Var DrinkDescription = "Espresso, Mint Syrup, Sugar, Water"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Mint_Wealthy_Americano.png"
Var OpenFromXML = CurrentXMLFileName2
GetInstanceIDMenuTab OpenFromInstMenuTab
Var PriceD1 = $12-21-01-0058.Price
Var PriceD2 = $12-21-02-0058.Price
Var PriceD3 = $-.Price

11
xml/page_topping_select7.xml
View file

@ -687,20 +687,11 @@
;Open PreviseXMLFileName2
DEBUGVAR OpenFromXML
If ChildrenFree = 1 Then
Var ChildrenFree = 0
Var Cid = 33
Var PointCrm = "0"
Var GetScore = "1"
AddData Cid TelNumPromotion IDNum PointCrm GetScore
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog2.xml"
EndIf
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
DEBUGVAR OpenFromInstMenuTab
If OpenFromInstMenuTab > 0 Then
DEBUGVAR OpenFromInstMenuTab
TabMenuVisibleInst OpenFromInstMenuTab

2
xml/topview2.xml
View file

@ -125,7 +125,7 @@
EndIf
If CountDownForMulti = 99 Then
Var CountDownForMulti = 15
Var CountDownForMulti = 5
EndIf
EndIf