Release 6.62
This commit is contained in:
parent
38a2806c55
commit
e171403c48
15 changed files with 291 additions and 20 deletions
|
|
@ -89,6 +89,8 @@
|
|||
Var MenuVSelected2 = "Invisible"
|
||||
Var Menu11Selected2 = "Invisible"
|
||||
|
||||
Var Menu21Selected2 = "Invisible"
|
||||
|
||||
; init default
|
||||
Var Menu1Selected = "Enable"
|
||||
Var Menu2Selected = "Enable"
|
||||
|
|
@ -105,6 +107,7 @@
|
|||
Var Menu7Selected = "Invisible"
|
||||
Var Menu8Selected = "Enable"
|
||||
EndIf
|
||||
|
||||
|
||||
If AppFastEnable = "true" Then
|
||||
Var Menu11Selected = "Enable"
|
||||
|
|
|
|||
|
|
@ -44,10 +44,15 @@
|
|||
|
||||
If show_eng = "true" Then
|
||||
;Var DirImage = "ROOT/taobin_project/image/collect_point1_en"
|
||||
|
||||
Var IMG_CNT = "ROOT/taobin_project/image/page_doing/img2_eng.png"
|
||||
|
||||
Play "ROOT/taobin_project/sound_eng/Wait_a_moment.mp3"
|
||||
Else
|
||||
;Var DirImage = "ROOT/taobin_project/image/collect_point1"
|
||||
Play "ROOT/taobin_project/sound_thai/thankyou.mp3"
|
||||
|
||||
Var IMG_CNT = "ROOT/taobin_project/image/page_doing/img2.png"
|
||||
EndIf
|
||||
|
||||
Var waitAckPay = 0
|
||||
|
|
@ -1092,7 +1097,7 @@
|
|||
<Image>
|
||||
<X> 751 </X>
|
||||
<Y> 413 </Y>
|
||||
<Filename> "ROOT/taobin_project/image/page_doing/img2.png" </Filename>
|
||||
<Filename> IMG_CNT </Filename>
|
||||
</Image>
|
||||
;
|
||||
<Text>
|
||||
|
|
|
|||
|
|
@ -18,9 +18,11 @@
|
|||
If show_eng = "true" Then
|
||||
Var DirImage = "ROOT/taobin_project/image/page_payment_en/page_payment"
|
||||
Var DirImage2 = "ROOT/taobin_project/image/topping2_en"
|
||||
Var IMG_CNT = "ROOT/taobin_project/image/page_doing/img2_eng.png"
|
||||
Else
|
||||
Var DirImage = "ROOT/taobin_project/image/page_payment"
|
||||
Var DirImage2 = "ROOT/taobin_project/image/topping2"
|
||||
Var IMG_CNT = "ROOT/taobin_project/image/page_doing/img2.png"
|
||||
EndIf
|
||||
|
||||
Var next_pic_bn = DirImage + "/bn_add_order.png"
|
||||
|
|
@ -939,7 +941,7 @@
|
|||
<Image>
|
||||
<X> 751 </X>
|
||||
<Y> 413 </Y>
|
||||
<Filename> "ROOT/taobin_project/image/page_doing/img2.png" </Filename>
|
||||
<Filename> IMG_CNT </Filename>
|
||||
</Image>
|
||||
;
|
||||
<Text>
|
||||
|
|
|
|||
|
|
@ -43,6 +43,22 @@
|
|||
;EndIf
|
||||
</EventChangeStatus>
|
||||
|
||||
<CameraX>
|
||||
<X> 0 </X>
|
||||
<Y> 381 </Y>
|
||||
<Name>"usbfront"</Name>
|
||||
;<Width> 1280 </Width>
|
||||
;<Height> 720 </Height>
|
||||
<Width> 700 </Width>
|
||||
<Height> 394 </Height>
|
||||
</CameraX>
|
||||
|
||||
<EventCamera>
|
||||
DEBUGVAR BugFlag
|
||||
If BugFlag = 0 Then
|
||||
Var BugFlag = 1
|
||||
EndIf
|
||||
</EventCamera>
|
||||
|
||||
<Video>
|
||||
<X> 0 </X>
|
||||
|
|
@ -86,20 +102,6 @@
|
|||
</EventClick>
|
||||
</Button>
|
||||
|
||||
<CameraX>
|
||||
<X> 40 </X>
|
||||
<Y> 780 </Y>
|
||||
<Name>"usbfront"</Name>
|
||||
<Width> 1280 </Width>
|
||||
<Height> 780 </Height>
|
||||
</CameraX>
|
||||
|
||||
<EventCamera>
|
||||
DEBUGVAR BugFlag
|
||||
If BugFlag = 0 Then
|
||||
Var BugFlag = 1
|
||||
EndIf
|
||||
</EventCamera>
|
||||
|
||||
|
||||
</Popup>
|
||||
|
|
|
|||
|
|
@ -99,6 +99,8 @@
|
|||
Var MenuVSelected2 = "Invisible"
|
||||
Var Menu11Selected2 = "Invisible"
|
||||
|
||||
Var Menu21Selected2 = "Invisible"
|
||||
|
||||
; init default
|
||||
Var Menu1Selected = "Enable"
|
||||
Var Menu2Selected = "Enable"
|
||||
|
|
@ -115,6 +117,7 @@
|
|||
Var Menu7Selected = "Invisible"
|
||||
Var Menu8Selected = "Enable"
|
||||
EndIf
|
||||
|
||||
|
||||
If AppFastEnable = "true" Then
|
||||
Var Menu11Selected = "Enable"
|
||||
|
|
|
|||
|
|
@ -99,6 +99,8 @@
|
|||
Var MenuVSelected2 = "Invisible"
|
||||
Var Menu11Selected2 = "Invisible"
|
||||
|
||||
Var Menu21Selected2 = "Invisible"
|
||||
|
||||
; init default
|
||||
Var Menu1Selected = "Enable"
|
||||
Var Menu2Selected = "Enable"
|
||||
|
|
@ -115,6 +117,7 @@
|
|||
Var Menu7Selected = "Invisible"
|
||||
Var Menu8Selected = "Enable"
|
||||
EndIf
|
||||
|
||||
|
||||
If AppFastEnable = "true" Then
|
||||
Var Menu11Selected = "Enable"
|
||||
|
|
|
|||
|
|
@ -99,6 +99,8 @@
|
|||
Var MenuVSelected2 = "Invisible"
|
||||
Var Menu11Selected2 = "Invisible"
|
||||
|
||||
Var Menu21Selected2 = "Invisible"
|
||||
|
||||
; init default
|
||||
Var Menu1Selected = "Enable"
|
||||
Var Menu2Selected = "Enable"
|
||||
|
|
@ -115,6 +117,7 @@
|
|||
Var Menu7Selected = "Invisible"
|
||||
Var Menu8Selected = "Enable"
|
||||
EndIf
|
||||
|
||||
|
||||
If AppFastEnable = "true" Then
|
||||
Var Menu11Selected = "Enable"
|
||||
|
|
|
|||
|
|
@ -99,6 +99,8 @@
|
|||
Var MenuVSelected2 = "Invisible"
|
||||
Var Menu11Selected2 = "Invisible"
|
||||
|
||||
Var Menu21Selected2 = "Invisible"
|
||||
|
||||
; init default
|
||||
Var Menu1Selected = "Enable"
|
||||
Var Menu2Selected = "Enable"
|
||||
|
|
@ -115,6 +117,7 @@
|
|||
Var Menu7Selected = "Invisible"
|
||||
Var Menu8Selected = "Enable"
|
||||
EndIf
|
||||
|
||||
|
||||
If AppFastEnable = "true" Then
|
||||
Var Menu11Selected = "Enable"
|
||||
|
|
|
|||
|
|
@ -99,6 +99,8 @@
|
|||
Var MenuVSelected2 = "Invisible"
|
||||
Var Menu11Selected2 = "Invisible"
|
||||
|
||||
Var Menu21Selected2 = "Invisible"
|
||||
|
||||
; init default
|
||||
Var Menu1Selected = "Enable"
|
||||
Var Menu2Selected = "Enable"
|
||||
|
|
@ -115,6 +117,7 @@
|
|||
Var Menu7Selected = "Invisible"
|
||||
Var Menu8Selected = "Enable"
|
||||
EndIf
|
||||
|
||||
|
||||
If AppFastEnable = "true" Then
|
||||
Var Menu11Selected = "Enable"
|
||||
|
|
|
|||
|
|
@ -99,6 +99,8 @@
|
|||
Var MenuVSelected2 = "Invisible"
|
||||
Var Menu11Selected2 = "Invisible"
|
||||
|
||||
Var Menu21Selected2 = "Invisible"
|
||||
|
||||
; init default
|
||||
Var Menu1Selected = "Enable"
|
||||
Var Menu2Selected = "Enable"
|
||||
|
|
@ -115,6 +117,7 @@
|
|||
Var Menu7Selected = "Invisible"
|
||||
Var Menu8Selected = "Enable"
|
||||
EndIf
|
||||
|
||||
|
||||
If AppFastEnable = "true" Then
|
||||
Var Menu11Selected = "Enable"
|
||||
|
|
|
|||
|
|
@ -99,6 +99,8 @@
|
|||
Var MenuVSelected2 = "Invisible"
|
||||
Var Menu11Selected2 = "Invisible"
|
||||
|
||||
Var Menu21Selected2 = "Invisible"
|
||||
|
||||
; init default
|
||||
Var Menu1Selected = "Enable"
|
||||
Var Menu2Selected = "Enable"
|
||||
|
|
@ -115,6 +117,7 @@
|
|||
Var Menu7Selected = "Invisible"
|
||||
Var Menu8Selected = "Enable"
|
||||
EndIf
|
||||
|
||||
|
||||
If AppFastEnable = "true" Then
|
||||
Var Menu11Selected = "Enable"
|
||||
|
|
@ -714,7 +717,7 @@
|
|||
<Service> testservice </Service>
|
||||
</QRCode>
|
||||
</Block>
|
||||
; menu_new_list 35
|
||||
; menu_new_list 36
|
||||
; 12-06-01-0001 - -
|
||||
<Block>
|
||||
<MarginLeft> 33 </MarginLeft>
|
||||
|
|
@ -8555,6 +8558,238 @@ VOLCANO" </Value>
|
|||
<State> ice_tab_process_show </State>
|
||||
<Value> ice_show_open </Value>
|
||||
</Text>
|
||||
</Block>
|
||||
; - 12-05-02-0046 12-05-03-0046
|
||||
<Block>
|
||||
<MarginLeft> 33 </MarginLeft>
|
||||
<MarginTop> 22 </MarginTop>
|
||||
<Width> 225 </Width>
|
||||
<Height> 296 </Height>
|
||||
<State> Flag( 12-05-02-0046.Button,12-05-03-0046.Button,Disable=Invisible,$Sum12050200461205030046) </State>
|
||||
<Button>
|
||||
<State> $Sum12050200461205030046 </State>
|
||||
<Filename> "ROOT/taobin_project/image/page_drink_n//bn_iced_pepsi_plum.png" </Filename>
|
||||
<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_iced_pepsi_plum.png" </FilenamePress>
|
||||
<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n//bn_iced_pepsi_plum.png" </FilenameDisable>
|
||||
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
|
||||
<Volume> SoundVolume </Volume>
|
||||
<EventOnClick>
|
||||
Var NameDrink = "PEPSI PLUM"
|
||||
Var NameDrinkTH = "เป๊ปซี่บ๊วย"
|
||||
Var DrinkDescriptionTH = "เป๊ปซี่ น้ำเชื่อมบ๊วย โซดา "
|
||||
Var DrinkDescription = "Pepsi, Ume Syrup & Ice"
|
||||
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_pepsi_plum.png"
|
||||
Var OpenFromXML = CurrentXMLFileName2
|
||||
Var PriceD1 = $-.Price
|
||||
Var PriceD2 = $12-05-02-0046.Price
|
||||
Var PriceD3 = $12-05-03-0046.Price
|
||||
Var PD_CODE1 = "##-##-##-####"
|
||||
Var PD_CODE2 = "12-05-02-0046"
|
||||
Var PD_CODE3 = "12-05-03-0046"
|
||||
Var PD_STAGE_1 = "Disable2"
|
||||
Var PD_STAGE_2 = $12-05-02-0046.Button
|
||||
Var PD_STAGE_3 = $12-05-03-0046.Button
|
||||
Var SelectCountDrinkType = 0
|
||||
Var DefaultDrinkType = 0
|
||||
If PD_STAGE_1 = "Enable" Then
|
||||
Var SelectCountDrinkType = SelectCountDrinkType + 1
|
||||
Var DefaultDrinkType = 1
|
||||
EndIf
|
||||
If PD_STAGE_2 = "Enable" Then
|
||||
Var SelectCountDrinkType = SelectCountDrinkType + 1
|
||||
Var DefaultDrinkType = 2
|
||||
EndIf
|
||||
If PD_STAGE_3 = "Enable" Then
|
||||
Var SelectCountDrinkType = SelectCountDrinkType + 1
|
||||
Var DefaultDrinkType = 3
|
||||
EndIf
|
||||
If PD_STAGE_2 = "Enable" Then
|
||||
Topping "Load" "12-05-02-0046"
|
||||
Else
|
||||
If PD_STAGE_1 = "Enable" Then
|
||||
Topping "Load" "-"
|
||||
Else
|
||||
Topping "Load" "12-05-03-0046"
|
||||
EndIf
|
||||
EndIf
|
||||
Var menu_name_eng_hot = $##-##-##-####.NameE
|
||||
Var menu_desc_eng_hot = $##-##-##-####.descriptionE
|
||||
Var menu_name_thai_hot = $##-##-##-####.Name
|
||||
Var menu_desc_thai_hot = $##-##-##-####.description
|
||||
|
||||
Var menu_name_eng_cold = $12-05-02-0046.NameE
|
||||
Var menu_desc_eng_cold = $12-05-02-0046.descriptionE
|
||||
Var menu_name_thai_cold = $12-05-02-0046.Name
|
||||
Var menu_desc_thai_cold = $12-05-02-0046.description
|
||||
|
||||
Var menu_name_eng_blender = $12-05-03-0046.NameE
|
||||
Var menu_desc_eng_blender = $12-05-03-0046.descriptionE
|
||||
Var menu_name_thai_blender = $12-05-03-0046.Name
|
||||
Var menu_desc_thai_blender = $12-05-03-0046.description
|
||||
|
||||
DEBUGVAR PD_STAGE_1
|
||||
DEBUGVAR PD_STAGE_2
|
||||
DEBUGVAR PD_STAGE_3
|
||||
|
||||
|
||||
Open "ROOT/taobin_project/xml/page_topping_select4.xml"
|
||||
|
||||
</EventOnClick>
|
||||
</Button>
|
||||
<Text>
|
||||
<X> 16 </X>
|
||||
<Y> 164 </Y>
|
||||
<Size> 24 </Size>
|
||||
<Width>220</Width>
|
||||
<Mode> "multi2" </Mode>
|
||||
<Font> KanitMediumTTF </Font>
|
||||
<Color> 0x322B26 </Color>
|
||||
<State> showthaiText </State>
|
||||
<Value> "เป๊ปซี่บ๊วย" </Value>
|
||||
</Text>
|
||||
<Text>
|
||||
<X> 16 </X>
|
||||
<Y> 220 </Y>
|
||||
<Size> 14 </Size>
|
||||
<Width>220</Width>
|
||||
<Font> KanitMediumTTF </Font>
|
||||
<Color> 0x6F5F51 </Color>
|
||||
<State> showthaiText </State>
|
||||
<Value> "เป๊ปซี่ น้ำเชื่อมบ๊วย โซดา " </Value>
|
||||
</Text>
|
||||
<Text>
|
||||
<X> 16 </X>
|
||||
<Y> 164 </Y>
|
||||
<Size> 22 </Size>
|
||||
<Width>220</Width>
|
||||
<Mode> "multi2" </Mode>
|
||||
<Font> KanitMediumTTF </Font>
|
||||
<Color> 0x322B26 </Color>
|
||||
<State> showengText </State>
|
||||
<Value> "PEPSI PLUM" </Value>
|
||||
</Text>
|
||||
<Text>
|
||||
<X> 16 </X>
|
||||
<Y> 220 </Y>
|
||||
<Size> 14 </Size>
|
||||
<Width>220</Width>
|
||||
<Font> KanitMediumTTF </Font>
|
||||
<Color> 0x6F5F51 </Color>
|
||||
<State> showengText </State>
|
||||
<Value> "Pepsi, Ume Syrup & Ice" </Value>
|
||||
</Text>
|
||||
<Image>
|
||||
<X> 16 </X>
|
||||
<Y> 264 </Y>
|
||||
<Filename> Var( DirImage2 + "option_deactive.png" ) </Filename>
|
||||
</Image>
|
||||
<Image>
|
||||
<X> 16 </X>
|
||||
<Y> 264 </Y>
|
||||
<State> "Invisible" </State>
|
||||
<Filename> Var( DirImage2 + "hot.png" ) </Filename>
|
||||
<FilenameDisable> Var( DirImage2 + "hot_db.png" ) </FilenameDisable>
|
||||
</Image>
|
||||
<Text>
|
||||
<X> 50 </X>
|
||||
<Y> 265 </Y>
|
||||
<Size> 14 </Size>
|
||||
<Width>220</Width>
|
||||
<Font> KanitMediumTTF </Font>
|
||||
<Color> 0x6F5F51 </Color>
|
||||
<ColorDisable> 0xEAE6E1 </ColorDisable>
|
||||
<State> "Invisible" </State>
|
||||
<Value> Var( "฿" + $-.Price ) </Value>
|
||||
</Text>
|
||||
<Image>
|
||||
<X> 81 </X>
|
||||
<Y> 264 </Y>
|
||||
<Filename> Var( DirImage2 + "cold.png" ) </Filename>
|
||||
<FilenameDisable> Var( DirImage2 + "cold_db.png" ) </FilenameDisable>
|
||||
<State> $12-05-02-0046.Button </State>
|
||||
</Image>
|
||||
<Text>
|
||||
<X> 115 </X>
|
||||
<Y> 265 </Y>
|
||||
<Size> 14 </Size>
|
||||
<Width>220</Width>
|
||||
<Font> KanitMediumTTF </Font>
|
||||
<Color> 0x6F5F51 </Color>
|
||||
<ColorDisable> 0xEAE6E1 </ColorDisable>
|
||||
<State> $12-05-02-0046.Button </State>
|
||||
<Value> Var( "฿" + $12-05-02-0046.Price ) </Value>
|
||||
</Text>
|
||||
<Image>
|
||||
<X> 146 </X>
|
||||
<Y> 264 </Y>
|
||||
<Filename> Var( DirImage2 + "blend.png" ) </Filename>
|
||||
<FilenameDisable> Var( DirImage2 + "blend_db.png" ) </FilenameDisable>
|
||||
<State> $12-05-03-0046.Button </State>
|
||||
</Image>
|
||||
<Text>
|
||||
<X> 183 </X>
|
||||
<Y> 265 </Y>
|
||||
<Size> 14 </Size>
|
||||
<Width>220</Width>
|
||||
<Font> KanitMediumTTF </Font>
|
||||
<Color> 0x6F5F51 </Color>
|
||||
<ColorDisable> 0xEAE6E1 </ColorDisable>
|
||||
<State> $12-05-03-0046.Button </State>
|
||||
<Value> Var( "฿" + $12-05-03-0046.Price ) </Value>
|
||||
</Text>
|
||||
<Image>
|
||||
<X> 81 </X>
|
||||
<Y> 264 </Y>
|
||||
<State>
|
||||
eval(
|
||||
If ICE_PROCESS_STATUS = 2 Then
|
||||
|
||||
Var ice_tab_process_show = "Invisible"
|
||||
|
||||
Else
|
||||
Var ice_tab_process_show = "Invisible"
|
||||
EndIf
|
||||
Var return = ice_tab_process_show
|
||||
)
|
||||
</State>
|
||||
<Filename> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" </Filename>
|
||||
<FilenameDisable> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" </FilenameDisable>
|
||||
</Image>
|
||||
<Image>
|
||||
<X> 49 </X>
|
||||
<Y> 117 </Y>
|
||||
<State>
|
||||
eval(
|
||||
If $Sum12050200461205030046 = "Disable" Then
|
||||
STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
|
||||
STRCONTAIN "ERR" $12-05-02-0046.TAG tag2_is_disable
|
||||
STRCONTAIN "ERR" $12-05-03-0046.TAG tag3_is_disable
|
||||
Var return = "Invisible"
|
||||
If tag1_is_disable = "true" Then
|
||||
Var return = "Enable"
|
||||
EndIf
|
||||
If tag2_is_disable = "true" Then
|
||||
Var return = "Enable"
|
||||
EndIf
|
||||
If tag3_is_disable = "true" Then
|
||||
Var return = "Enable"
|
||||
EndIf
|
||||
Else
|
||||
Var return = "Invisible"
|
||||
EndIf
|
||||
)
|
||||
</State>
|
||||
<Filename> "ROOT/taobin_project/image//img_menu_err.png" </Filename>
|
||||
</Image>
|
||||
<Text>
|
||||
<X> 84 </X>
|
||||
<Y> 266 </Y>
|
||||
<Size> 10 </Size>
|
||||
<Font> OpunMediumTTF </Font>
|
||||
<Color> 0xDE794E </Color>
|
||||
<State> ice_tab_process_show </State>
|
||||
<Value> ice_show_open </Value>
|
||||
</Text>
|
||||
</Block>
|
||||
; - 12-05-02-0035 12-05-03-0035
|
||||
<Block>
|
||||
|
|
|
|||
|
|
@ -99,6 +99,8 @@
|
|||
Var MenuVSelected2 = "Invisible"
|
||||
Var Menu11Selected2 = "Invisible"
|
||||
|
||||
Var Menu21Selected2 = "Invisible"
|
||||
|
||||
; init default
|
||||
Var Menu1Selected = "Enable"
|
||||
Var Menu2Selected = "Enable"
|
||||
|
|
@ -115,6 +117,7 @@
|
|||
Var Menu7Selected = "Invisible"
|
||||
Var Menu8Selected = "Enable"
|
||||
EndIf
|
||||
|
||||
|
||||
If AppFastEnable = "true" Then
|
||||
Var Menu11Selected = "Enable"
|
||||
|
|
|
|||
|
|
@ -99,6 +99,8 @@
|
|||
Var MenuVSelected2 = "Invisible"
|
||||
Var Menu11Selected2 = "Invisible"
|
||||
|
||||
Var Menu21Selected2 = "Invisible"
|
||||
|
||||
; init default
|
||||
Var Menu1Selected = "Enable"
|
||||
Var Menu2Selected = "Enable"
|
||||
|
|
@ -115,6 +117,7 @@
|
|||
Var Menu7Selected = "Invisible"
|
||||
Var Menu8Selected = "Enable"
|
||||
EndIf
|
||||
|
||||
|
||||
If AppFastEnable = "true" Then
|
||||
Var Menu11Selected = "Enable"
|
||||
|
|
|
|||
|
|
@ -445,7 +445,7 @@
|
|||
|
||||
If CameraCount = 1 Then
|
||||
|
||||
CameraSetting "usbfront" "default" "Rotate=270,Resolution=1280x720,scaleX=1.0,scaleY=1.0"
|
||||
CameraSetting "usbfront" "default" "Rotate=90,Resolution=1280x720,scaleX=1.0,scaleY=1.0"
|
||||
EndIf
|
||||
|
||||
Var GoToCamera = 3
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue