Merge branch 'master' of forthrd.ddns.net:/1TBHDD/ikong/taobin_project
This commit is contained in:
commit
52d5df70b4
27 changed files with 2582 additions and 42 deletions
|
|
@ -19,8 +19,8 @@
|
|||
|
||||
product_code.append('12-03-02-0004')
|
||||
product_code.append('12-03-02-0006')
|
||||
product_code.append('12-03-02-0011')
|
||||
product_code.append('12-03-02-0010')
|
||||
product_code.append('12-03-03-0011')
|
||||
product_code.append('12-03-03-0010')
|
||||
|
||||
product_code.append('12-03-02-0005')
|
||||
#product_code.append('12-03-02-0002')
|
||||
|
|
|
|||
|
|
@ -1328,33 +1328,33 @@
|
|||
<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
|
||||
</Image>
|
||||
</Block>
|
||||
; button i=11 12-03-02-0011
|
||||
; button i=11 12-03-03-0011
|
||||
<Block>
|
||||
<MarginLeft> 33 </MarginLeft>
|
||||
<MarginTop> 22 </MarginTop>
|
||||
<Width> 225 </Width>
|
||||
<Height> 296 </Height>
|
||||
<State> $12-03-02-0011.Button </State>
|
||||
<State> $12-03-03-0011.Button </State>
|
||||
<Button>
|
||||
<State> $12-03-02-0011.Button </State>
|
||||
<Filename> Var( "ROOT/taobin_project/image/page_drink/" + $12-03-02-0011.image ) </Filename>
|
||||
<FilenamePress> Var( "ROOT/taobin_project/image/page_drink_press/" + $12-03-02-0011.image ) " </FilenamePress>
|
||||
<FilenameDisable> Var( "ROOT/taobin_project/image/page_drink_disable/" + $12-03-02-0011.image ) " </FilenameDisable>
|
||||
<State> $12-03-03-0011.Button </State>
|
||||
<Filename> Var( "ROOT/taobin_project/image/page_drink/" + $12-03-03-0011.image ) </Filename>
|
||||
<FilenamePress> Var( "ROOT/taobin_project/image/page_drink_press/" + $12-03-03-0011.image ) " </FilenamePress>
|
||||
<FilenameDisable> Var( "ROOT/taobin_project/image/page_drink_disable/" + $12-03-03-0011.image ) " </FilenameDisable>
|
||||
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
|
||||
<Volume> SoundVolume </Volume>
|
||||
<EventOnClick>
|
||||
Var SelectDrink = $12-03-02-0011.Self
|
||||
Var NameDrink = $12-03-02-0011.NameE
|
||||
Var NameDrinkTH = $12-03-02-0011.Name
|
||||
Var DrinkDescriptionTH = $12-03-02-0011.description
|
||||
Var DrinkDescription = $12-03-02-0011.descriptionE
|
||||
Var PriceDrink = $12-03-02-0011.Price
|
||||
Var PictureDrink = "ROOT/taobin_project/image/page_drink_select/" + $12-03-02-0011.image
|
||||
Var SelectDrink = $12-03-03-0011.Self
|
||||
Var NameDrink = $12-03-03-0011.NameE
|
||||
Var NameDrinkTH = $12-03-03-0011.Name
|
||||
Var DrinkDescriptionTH = $12-03-03-0011.description
|
||||
Var DrinkDescription = $12-03-03-0011.descriptionE
|
||||
Var PriceDrink = $12-03-03-0011.Price
|
||||
Var PictureDrink = "ROOT/taobin_project/image/page_drink_select/" + $12-03-03-0011.image
|
||||
Topping "Load" SelectDrink
|
||||
SAVELOG NameDrink
|
||||
Var PriceShowValue = charOfBaht + PriceDrink
|
||||
Var OpenFromXML = CurrentXMLFileName2
|
||||
STRCONTAIN "Smoothie" $12-03-02-0011.Button IsSmoRet
|
||||
STRCONTAIN "Smoothie" $12-03-03-0011.Button IsSmoRet
|
||||
Open "ROOT/taobin_project/xml/page_topping_alter.xml"
|
||||
</EventOnClick>
|
||||
</Button>
|
||||
|
|
@ -1367,7 +1367,7 @@
|
|||
<Size> 27 </Size>
|
||||
<Font> KanitTTF </Font>
|
||||
<Color> 0xB78F24 </Color>
|
||||
<Value> $12-03-02-0011.Price </Value>
|
||||
<Value> $12-03-03-0011.Price </Value>
|
||||
</Text>
|
||||
<Text>
|
||||
<X> 164 </X>
|
||||
|
|
@ -1388,7 +1388,7 @@
|
|||
<Font> KanitMediumTTF </Font>
|
||||
<Color> 0x322B26 </Color>
|
||||
<State> showthaiText </State>
|
||||
<Value> $12-03-02-0011.Name </Value>
|
||||
<Value> $12-03-03-0011.Name </Value>
|
||||
</Text>
|
||||
<Text>
|
||||
<X> 16 </X>
|
||||
|
|
@ -1398,7 +1398,7 @@
|
|||
<Font> KanitMediumTTF </Font>
|
||||
<Color> 0x6F5F51 </Color>
|
||||
<State> showthaiText </State>
|
||||
<Value> $12-03-02-0011.description </Value>
|
||||
<Value> $12-03-03-0011.description </Value>
|
||||
</Text>
|
||||
<Text>
|
||||
<X> 16 </X>
|
||||
|
|
@ -1409,7 +1409,7 @@
|
|||
<Font> KanitMediumTTF </Font>
|
||||
<Color> 0x322B26 </Color>
|
||||
<State> showengText </State>
|
||||
<Value> $12-03-02-0011.NameE </Value>
|
||||
<Value> $12-03-03-0011.NameE </Value>
|
||||
</Text>
|
||||
<Text>
|
||||
<X> 16 </X>
|
||||
|
|
@ -1419,12 +1419,12 @@
|
|||
<Font> KanitMediumTTF </Font>
|
||||
<Color> 0x6F5F51 </Color>
|
||||
<State> showengText </State>
|
||||
<Value> $12-03-02-0011.descriptionE </Value>
|
||||
<Value> $12-03-03-0011.descriptionE </Value>
|
||||
</Text>
|
||||
<Image>
|
||||
<X> 2 </X>
|
||||
<Y> 2 </Y>
|
||||
<State> eval( STRCONTAIN "Smoothie" $12-03-02-0011.Button SmoRet
|
||||
<State> eval( STRCONTAIN "Smoothie" $12-03-03-0011.Button SmoRet
|
||||
If SmoRet = "true" Then
|
||||
Var return = "Enable"
|
||||
Else
|
||||
|
|
@ -1434,33 +1434,33 @@
|
|||
<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
|
||||
</Image>
|
||||
</Block>
|
||||
; button i=12 12-03-02-0010
|
||||
; button i=12 12-03-03-0010
|
||||
<Block>
|
||||
<MarginLeft> 33 </MarginLeft>
|
||||
<MarginTop> 22 </MarginTop>
|
||||
<Width> 225 </Width>
|
||||
<Height> 296 </Height>
|
||||
<State> $12-03-02-0010.Button </State>
|
||||
<State> $12-03-03-0010.Button </State>
|
||||
<Button>
|
||||
<State> $12-03-02-0010.Button </State>
|
||||
<Filename> Var( "ROOT/taobin_project/image/page_drink/" + $12-03-02-0010.image ) </Filename>
|
||||
<FilenamePress> Var( "ROOT/taobin_project/image/page_drink_press/" + $12-03-02-0010.image ) " </FilenamePress>
|
||||
<FilenameDisable> Var( "ROOT/taobin_project/image/page_drink_disable/" + $12-03-02-0010.image ) " </FilenameDisable>
|
||||
<State> $12-03-03-0010.Button </State>
|
||||
<Filename> Var( "ROOT/taobin_project/image/page_drink/" + $12-03-03-0010.image ) </Filename>
|
||||
<FilenamePress> Var( "ROOT/taobin_project/image/page_drink_press/" + $12-03-03-0010.image ) " </FilenamePress>
|
||||
<FilenameDisable> Var( "ROOT/taobin_project/image/page_drink_disable/" + $12-03-03-0010.image ) " </FilenameDisable>
|
||||
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
|
||||
<Volume> SoundVolume </Volume>
|
||||
<EventOnClick>
|
||||
Var SelectDrink = $12-03-02-0010.Self
|
||||
Var NameDrink = $12-03-02-0010.NameE
|
||||
Var NameDrinkTH = $12-03-02-0010.Name
|
||||
Var DrinkDescriptionTH = $12-03-02-0010.description
|
||||
Var DrinkDescription = $12-03-02-0010.descriptionE
|
||||
Var PriceDrink = $12-03-02-0010.Price
|
||||
Var PictureDrink = "ROOT/taobin_project/image/page_drink_select/" + $12-03-02-0010.image
|
||||
Var SelectDrink = $12-03-03-0010.Self
|
||||
Var NameDrink = $12-03-03-0010.NameE
|
||||
Var NameDrinkTH = $12-03-03-0010.Name
|
||||
Var DrinkDescriptionTH = $12-03-03-0010.description
|
||||
Var DrinkDescription = $12-03-03-0010.descriptionE
|
||||
Var PriceDrink = $12-03-03-0010.Price
|
||||
Var PictureDrink = "ROOT/taobin_project/image/page_drink_select/" + $12-03-03-0010.image
|
||||
Topping "Load" SelectDrink
|
||||
SAVELOG NameDrink
|
||||
Var PriceShowValue = charOfBaht + PriceDrink
|
||||
Var OpenFromXML = CurrentXMLFileName2
|
||||
STRCONTAIN "Smoothie" $12-03-02-0010.Button IsSmoRet
|
||||
STRCONTAIN "Smoothie" $12-03-03-0010.Button IsSmoRet
|
||||
Open "ROOT/taobin_project/xml/page_topping_alter.xml"
|
||||
</EventOnClick>
|
||||
</Button>
|
||||
|
|
@ -1473,7 +1473,7 @@
|
|||
<Size> 27 </Size>
|
||||
<Font> KanitTTF </Font>
|
||||
<Color> 0xB78F24 </Color>
|
||||
<Value> $12-03-02-0010.Price </Value>
|
||||
<Value> $12-03-03-0010.Price </Value>
|
||||
</Text>
|
||||
<Text>
|
||||
<X> 164 </X>
|
||||
|
|
@ -1494,7 +1494,7 @@
|
|||
<Font> KanitMediumTTF </Font>
|
||||
<Color> 0x322B26 </Color>
|
||||
<State> showthaiText </State>
|
||||
<Value> $12-03-02-0010.Name </Value>
|
||||
<Value> $12-03-03-0010.Name </Value>
|
||||
</Text>
|
||||
<Text>
|
||||
<X> 16 </X>
|
||||
|
|
@ -1504,7 +1504,7 @@
|
|||
<Font> KanitMediumTTF </Font>
|
||||
<Color> 0x6F5F51 </Color>
|
||||
<State> showthaiText </State>
|
||||
<Value> $12-03-02-0010.description </Value>
|
||||
<Value> $12-03-03-0010.description </Value>
|
||||
</Text>
|
||||
<Text>
|
||||
<X> 16 </X>
|
||||
|
|
@ -1515,7 +1515,7 @@
|
|||
<Font> KanitMediumTTF </Font>
|
||||
<Color> 0x322B26 </Color>
|
||||
<State> showengText </State>
|
||||
<Value> $12-03-02-0010.NameE </Value>
|
||||
<Value> $12-03-03-0010.NameE </Value>
|
||||
</Text>
|
||||
<Text>
|
||||
<X> 16 </X>
|
||||
|
|
@ -1525,12 +1525,12 @@
|
|||
<Font> KanitMediumTTF </Font>
|
||||
<Color> 0x6F5F51 </Color>
|
||||
<State> showengText </State>
|
||||
<Value> $12-03-02-0010.descriptionE </Value>
|
||||
<Value> $12-03-03-0010.descriptionE </Value>
|
||||
</Text>
|
||||
<Image>
|
||||
<X> 2 </X>
|
||||
<Y> 2 </Y>
|
||||
<State> eval( STRCONTAIN "Smoothie" $12-03-02-0010.Button SmoRet
|
||||
<State> eval( STRCONTAIN "Smoothie" $12-03-03-0010.Button SmoRet
|
||||
If SmoRet = "true" Then
|
||||
Var return = "Enable"
|
||||
Else
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue