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

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

Browse source
This commit is contained in:
pichet 2023-01-11 15:50:36 +07:00
commit 8d35a0baa7
7 changed files with 50 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

4
xml/page_board.xml
View file

@ -566,10 +566,6 @@
DEBUGVAR AdvertiseProfile DEBUGVAR AdvertiseProfile
If RoadShow = "true" Then
;Var new_layout = "false"
EndIf
Var show_lang = "THAI" Var show_lang = "THAI"

28
xml/page_camera.xml
View file

@ -43,22 +43,16 @@
;EndIf ;EndIf
</EventChangeStatus> </EventChangeStatus>
<CameraX>
<X> 753 </X>
<Y> 1394 </Y>
<Name>"usbfront"</Name>
<Width> 326 </Width>
<Height> 236 </Height>
</CameraX>
;<CameraX> ;<CameraX>
;<X> 0 </X> ;<X> 753 </X>
;<Y> 381 </Y> ;<Y> 1394 </Y>
;<Name>"usbfront"</Name> ;<Name>"usbfront"</Name>
;<Width> 700 </Width> ;<Width> 326 </Width>
;<Height> 394 </Height> ;<Height> 236 </Height>
;</CameraX> ;</CameraX>
<EventCamera> <EventCamera>
DEBUGVAR BugFlag DEBUGVAR BugFlag
If BugFlag = 0 Then If BugFlag = 0 Then
@ -72,7 +66,7 @@
<Width> 1080</Width> <Width> 1080</Width>
<Height> 380 </Height> <Height> 380 </Height>
<Loop> "true" </Loop> <Loop> "true" </Loop>
<Filename> "ROOT/taobin_project/campaign2/page_catalog_menu.mp4" </Filename> <Filename> "ROOT/taobin_project/adv/taobin_adv_menu_07.mp4" </Filename>
</Video> </Video>
@ -108,6 +102,14 @@
</EventClick> </EventClick>
</Button> </Button>
<CameraX>
;<State>"Invisible"</State>
<X> 0 </X>
<Y> 381 </Y>
<Name>"usbfront"</Name>
<Width> 700 </Width>
<Height> 394 </Height>
</CameraX>
</Popup> </Popup>

35
xml/page_catalog.lxml
View file

@ -499,7 +499,7 @@
<X> 28 </X> <X> 28 </X>
<Y> 202 </Y> <Y> 202 </Y>
<Width> 241 </Width> <Width> 241 </Width>
<Height> 72 </Height> <Height> 82 </Height>
</Language> </Language>
</Button> </Button>
@ -545,6 +545,11 @@
<Color> "0xFF0000" </Color> <Color> "0xFF0000" </Color>
<Width> 1080 </Width> <Width> 1080 </Width>
<Height> 60 </Height> <Height> 60 </Height>
<EventClick>
Open "ROOT/taobin_project/xml/page_camera.xml"
</EventClick>
</Button> </Button>
<Text> <Text>
@ -558,34 +563,6 @@
<Value> ShowNetworkProblemText </Value> <Value> ShowNetworkProblemText </Value>
</Text> </Text>
<Button>
<X> 0 </X>
<Y> 1860 </Y>
<Width> 200 </Width>
<Height> 50 </Height>
<Volume> SoundVolume </Volume>
<EventClick>
Var countClick = countClick + 1
If countClick = 3 Then
;Var TestLoopMakeDrink = 1
EndIf
DEBUGVAR countClick
If countClick = 5 Then
If ToppingNewEnable = "false" Then
Var ToppingNewEnable = "true"
Else
Var ToppingNewEnable = "false"
EndIf
Open "ROOT/taobin_project/xml/page_catalog_choose_drink3.xml"
EndIf
Refresh
</EventClick>
</Button>
; Cart ; Cart
<Button> <Button>
<X> 915 </X> <X> 915 </X>

34
xml/page_catalog_group_other.xml
View file

@ -7740,15 +7740,15 @@ Water & Ice" </Value>
</Block> </Block>
; - - - ; - - -
; ==================> Len = 16 ; ==================> Len = 16
; - 12-05-02-0040 12-05-03-0040 ; - - 12-05-03-0040
<Block> <Block>
<MarginLeft> 33 </MarginLeft> <MarginLeft> 33 </MarginLeft>
<MarginTop> 22 </MarginTop> <MarginTop> 22 </MarginTop>
<Width> 225 </Width> <Width> 225 </Width>
<Height> 296 </Height> <Height> 296 </Height>
<State> Flag( 12-05-02-0040.Button,12-05-03-0040.Button,$Sum12050200401205030040) </State> <State> Flag( 12-05-03-0040.Button,$Sum1205030040) </State>
<Button> <Button>
<State> $Sum12050200401205030040 </State> <State> $Sum1205030040 </State>
<Filename> "ROOT/taobin_project/image/page_drink_n//bn_iced_strawberry.png" </Filename> <Filename> "ROOT/taobin_project/image/page_drink_n//bn_iced_strawberry.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_iced_strawberry.png" </FilenamePress> <FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_iced_strawberry.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_iced_strawberry.png" </FilenameDisable> <FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_iced_strawberry.png" </FilenameDisable>
@ -7762,13 +7762,13 @@ Water & Ice" </Value>
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_strawberry.png" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_strawberry.png"
Var OpenFromXML = CurrentXMLFileName2 Var OpenFromXML = CurrentXMLFileName2
Var PriceD1 = $-.Price Var PriceD1 = $-.Price
Var PriceD2 = $12-05-02-0040.Price Var PriceD2 = $-.Price
Var PriceD3 = $12-05-03-0040.Price Var PriceD3 = $12-05-03-0040.Price
Var PD_CODE1 = "##-##-##-####" Var PD_CODE1 = "##-##-##-####"
Var PD_CODE2 = "12-05-02-0040" Var PD_CODE2 = "##-##-##-####"
Var PD_CODE3 = "12-05-03-0040" Var PD_CODE3 = "12-05-03-0040"
Var PD_STAGE_1 = "Disable2" Var PD_STAGE_1 = "Disable2"
Var PD_STAGE_2 = $12-05-02-0040.Button Var PD_STAGE_2 = "Disable2"
Var PD_STAGE_3 = $12-05-03-0040.Button Var PD_STAGE_3 = $12-05-03-0040.Button
Var SelectCountDrinkType = 0 Var SelectCountDrinkType = 0
Var DefaultDrinkType = 0 Var DefaultDrinkType = 0
@ -7785,7 +7785,7 @@ Water & Ice" </Value>
Var DefaultDrinkType = 3 Var DefaultDrinkType = 3
EndIf EndIf
If PD_STAGE_2 = "Enable" Then If PD_STAGE_2 = "Enable" Then
Topping "Load" "12-05-02-0040" Topping "Load" "-"
Else Else
If PD_STAGE_1 = "Enable" Then If PD_STAGE_1 = "Enable" Then
Topping "Load" "-" Topping "Load" "-"
@ -7798,10 +7798,10 @@ Water & Ice" </Value>
Var menu_name_thai_hot = $##-##-##-####.Name Var menu_name_thai_hot = $##-##-##-####.Name
Var menu_desc_thai_hot = $##-##-##-####.description Var menu_desc_thai_hot = $##-##-##-####.description
Var menu_name_eng_cold = $12-05-02-0040.NameE Var menu_name_eng_cold = $##-##-##-####.NameE
Var menu_desc_eng_cold = $12-05-02-0040.descriptionE Var menu_desc_eng_cold = $##-##-##-####.descriptionE
Var menu_name_thai_cold = $12-05-02-0040.Name Var menu_name_thai_cold = $##-##-##-####.Name
Var menu_desc_thai_cold = $12-05-02-0040.description Var menu_desc_thai_cold = $##-##-##-####.description
Var menu_name_eng_blender = $12-05-03-0040.NameE Var menu_name_eng_blender = $12-05-03-0040.NameE
Var menu_desc_eng_blender = $12-05-03-0040.descriptionE Var menu_desc_eng_blender = $12-05-03-0040.descriptionE
@ -7889,7 +7889,7 @@ Water, Ice" </Value>
<Y> 264 </Y> <Y> 264 </Y>
<Filename> Var( DirImage2 + "cold.png" ) </Filename> <Filename> Var( DirImage2 + "cold.png" ) </Filename>
<FilenameDisable> Var( DirImage2 + "cold_db.png" ) </FilenameDisable> <FilenameDisable> Var( DirImage2 + "cold_db.png" ) </FilenameDisable>
<State> $12-05-02-0040.Button </State> <State> "Invisible" </State>
</Image> </Image>
<Text> <Text>
<X> 115 </X> <X> 115 </X>
@ -7899,8 +7899,8 @@ Water, Ice" </Value>
<Font> KanitMediumTTF </Font> <Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color> <Color> 0x6F5F51 </Color>
<ColorDisable> 0xEAE6E1 </ColorDisable> <ColorDisable> 0xEAE6E1 </ColorDisable>
<State> $12-05-02-0040.Button </State> <State> "Invisible" </State>
<Value> StringFmt( $12-05-02-0040.Price , DisplayFormat, PreScaleConvertShow) </Value>; test <Value> StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
</Text> </Text>
<Image> <Image>
<X> 146 </X> <X> 146 </X>
@ -7943,9 +7943,9 @@ Water, Ice" </Value>
<Y> 117 </Y> <Y> 117 </Y>
<State> <State>
eval( eval(
If $Sum12050200401205030040 = "Disable" Then If $Sum1205030040 = "Disable" Then
STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
STRCONTAIN "ERR" $12-05-02-0040.TAG tag2_is_disable STRCONTAIN "ERR" $##-##-##-####.TAG tag2_is_disable
STRCONTAIN "ERR" $12-05-03-0040.TAG tag3_is_disable STRCONTAIN "ERR" $12-05-03-0040.TAG tag3_is_disable
Var return = "Invisible" Var return = "Invisible"
If tag1_is_disable = "true" Then If tag1_is_disable = "true" Then
@ -7982,7 +7982,7 @@ Water, Ice" </Value>
<Font> MITRegularTTF </Font> <Font> MITRegularTTF </Font>
<Color> 0x5A5A5A </Color> <Color> 0x5A5A5A </Color>
<Mode> "disable-show" </Mode> <Mode> "disable-show" </Mode>
<State> $Sum12050200401205030040 </State> <State> $Sum1205030040 </State>
<Value> text_unavailable </Value> <Value> text_unavailable </Value>
<Align> center-vertical-horizontal </Align> <Align> center-vertical-horizontal </Align>
</Text> </Text>

7
xml/page_payment_cash.xml
View file

@ -1093,7 +1093,12 @@
If VendingCashless = "READY" Then If VendingCashless = "READY" Then
Var QRCODE99 = "" Var QRCODE99 = ""
If CoinInOK = 1 Then
Else
Var Timeout = 0 Var Timeout = 0
EndIf
Var QRErrorState = "Invisible" Var QRErrorState = "Invisible"
Var QR_POPUP = "/img_popup8-2.png" Var QR_POPUP = "/img_popup8-2.png"
Var VendingCashless = "-" Var VendingCashless = "-"
@ -1548,7 +1553,7 @@
Var CoinInFlag = 1 Var CoinInFlag = 1
DEBUGVAR CoinInOK
If ViewBill > 0 Then If ViewBill > 0 Then

4
xml_main/startup.xml
View file

@ -106,8 +106,8 @@
Var RandomPromotionMyworld = 0 Var RandomPromotionMyworld = 0
Var RandomSalePackage = 0 Var RandomSalePackage = 0
Var XMLPageVersion = "6.88" Var XMLPageVersion = "6.89"
Var XMLPageVersionInt = 688 Var XMLPageVersionInt = 689
</EventOpen> </EventOpen>
<Text> <Text>