diff --git a/adv/taobin_adv_17.mp4 b/adv/taobin_adv_17.mp4
new file mode 100644
index 00000000..d64cd8ea
Binary files /dev/null and b/adv/taobin_adv_17.mp4 differ
diff --git a/adv/taobin_adv_menu2_17.mp4 b/adv/taobin_adv_menu2_17.mp4
new file mode 100644
index 00000000..76539ec5
Binary files /dev/null and b/adv/taobin_adv_menu2_17.mp4 differ
diff --git a/adv/taobin_adv_menu_17.mp4 b/adv/taobin_adv_menu_17.mp4
new file mode 100644
index 00000000..1ac5a0b8
Binary files /dev/null and b/adv/taobin_adv_menu_17.mp4 differ
diff --git a/image/page2/bn_kidmenu.png b/image/page2/bn_kidmenu.png
new file mode 100644
index 00000000..d15bbe29
Binary files /dev/null and b/image/page2/bn_kidmenu.png differ
diff --git a/image/page2/bp_kidmenu.png b/image/page2/bp_kidmenu.png
new file mode 100644
index 00000000..5ac41251
Binary files /dev/null and b/image/page2/bp_kidmenu.png differ
diff --git a/image/page2_en/page2/bn_kidmenu.png b/image/page2_en/page2/bn_kidmenu.png
new file mode 100644
index 00000000..87b589f0
Binary files /dev/null and b/image/page2_en/page2/bn_kidmenu.png differ
diff --git a/image/page2_en/page2/bp_kidmenu.png b/image/page2_en/page2/bp_kidmenu.png
new file mode 100644
index 00000000..7427ae83
Binary files /dev/null and b/image/page2_en/page2/bp_kidmenu.png differ
diff --git a/image/page3/bn_forkid.png b/image/page3/bn_forkid.png
new file mode 100644
index 00000000..179511f5
Binary files /dev/null and b/image/page3/bn_forkid.png differ
diff --git a/image/page3/bp_forkid.png b/image/page3/bp_forkid.png
new file mode 100644
index 00000000..cd83e64d
Binary files /dev/null and b/image/page3/bp_forkid.png differ
diff --git a/image/page3_en/bn_forkid.png b/image/page3_en/bn_forkid.png
new file mode 100644
index 00000000..21221446
Binary files /dev/null and b/image/page3_en/bn_forkid.png differ
diff --git a/image/page3_en/bp_forkid.png b/image/page3_en/bp_forkid.png
new file mode 100644
index 00000000..26e859a6
Binary files /dev/null and b/image/page3_en/bp_forkid.png differ
diff --git a/xml/menu_catalog.xml b/xml/menu_catalog.xml
index e868a340..f23cd9de 100644
--- a/xml/menu_catalog.xml
+++ b/xml/menu_catalog.xml
@@ -380,6 +380,35 @@
+
+
+
+
+
@@ -75,13 +81,14 @@
"/mnt/sdcard/coffeevending/wav/click.wav"
SoundVolume
- Shutter "/mnt/sdcard/shutter.jpg"
+ DEBUGVAR CameraCount
+ CameraCmd "usbfront" "shutter" "/mnt/sdcard/camera1.jpg"
40
- 720
+ 780
"usbfront"
1280
780
diff --git a/xml/page_catalog.xml b/xml/page_catalog.xml
index 255cb4a9..d7645c84 100644
--- a/xml/page_catalog.xml
+++ b/xml/page_catalog.xml
@@ -379,6 +379,22 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 696
+ 395
+ Menu21Selected
+ Var( DirImage + "/bn_forkid.png")
+ Var( DirImage + "/bp_forkid.png")
+ "/mnt/sdcard/coffeevending/wav/click.wav"
+ SoundVolume
+
+ Var NextPage = "-"
+ Open "ROOT/taobin_project/xml/page_catalog_group_forkid.xml"
+
+
+
+ 611
+ 395
+ Menu21Selected2
+ Var( DirImage + "/bn_forkid2.png")
+ Var( DirImage + "/bp_forkid2.png")
+ "/mnt/sdcard/coffeevending/wav/click.wav"
+ SoundVolume
+
+ Var NextPage = "-"
+ Open "ROOT/taobin_project/xml/page_catalog_group_forkid.xml"
+
+
+
+
696
395
@@ -631,7 +668,7 @@
Var block_index_override = 0
Var block_index_move = 0
-; menu_new_list 15
+; menu_new_list 14
; 12-03-01-0005 12-03-02-0005 12-03-03-0005
33
@@ -3687,242 +3724,6 @@ VOLCANO"
ice_tab_process_show
ice_show_open
-
- ; 12-03-01-0023 12-03-02-0023 12-03-03-0023
-
- 33
- 22
- 225
- 296
- Flag( 12-03-01-0023.Button,12-03-02-0023.Button,12-03-03-0023.Button,$Sum120301002312030200231203030023)
-
- $Sum120301002312030200231203030023
- "ROOT/taobin_project/image/page_drink_n//bn_Yuzu_smoothie.png"
- "ROOT/taobin_project/image/page_drink_press_n//bn_Yuzu_smoothie.png"
- "ROOT/taobin_project/image/page_drink_disable_n//bn_Yuzu_smoothie.png"
- "/mnt/sdcard/coffeevending/wav/click.wav"
- SoundVolume
-
- Var NameDrink = "YUZU MILK"
- Var NameDrinkTH = "นมยูซุ"
- Var DrinkDescriptionTH = "นม และ น้ำเชื่อมยูซุ"
- Var DrinkDescription = "Milk & Yuzu Syrup"
- Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Yuzu_smoothie.png"
- Var OpenFromXML = CurrentXMLFileName2
- Var PriceD1 = $12-03-01-0023.Price
- Var PriceD2 = $12-03-02-0023.Price
- Var PriceD3 = $12-03-03-0023.Price
- Var PD_CODE1 = "12-03-01-0023"
- Var PD_CODE2 = "12-03-02-0023"
- Var PD_CODE3 = "12-03-03-0023"
- Var PD_STAGE_1 = $12-03-01-0023.Button
- Var PD_STAGE_2 = $12-03-02-0023.Button
- Var PD_STAGE_3 = $12-03-03-0023.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-03-02-0023"
- Else
- If PD_STAGE_1 = "Enable" Then
- Topping "Load" "12-03-01-0023"
- Else
- Topping "Load" "12-03-03-0023"
- EndIf
- EndIf
- Var menu_name_eng_hot = $12-03-01-0023.NameE
- Var menu_desc_eng_hot = $12-03-01-0023.descriptionE
- Var menu_name_thai_hot = $12-03-01-0023.Name
- Var menu_desc_thai_hot = $12-03-01-0023.description
-
- Var menu_name_eng_cold = $12-03-02-0023.NameE
- Var menu_desc_eng_cold = $12-03-02-0023.descriptionE
- Var menu_name_thai_cold = $12-03-02-0023.Name
- Var menu_desc_thai_cold = $12-03-02-0023.description
-
- Var menu_name_eng_blender = $12-03-03-0023.NameE
- Var menu_desc_eng_blender = $12-03-03-0023.descriptionE
- Var menu_name_thai_blender = $12-03-03-0023.Name
- Var menu_desc_thai_blender = $12-03-03-0023.description
-
- DEBUGVAR PD_STAGE_1
- DEBUGVAR PD_STAGE_2
- DEBUGVAR PD_STAGE_3
-
-
- Open "ROOT/taobin_project/xml/page_topping_select4.xml"
-
-
-
-
- 16
- 164
- 24
- 220
- "multi2"
- KanitMediumTTF
- 0x322B26
- showthaiText
- "นมยูซุ"
-
-
- 16
- 220
- 14
- 220
- KanitMediumTTF
- 0x6F5F51
- showthaiText
- "นม และ น้ำเชื่อมยูซุ"
-
-
- 16
- 164
- 22
- 220
- "multi2"
- KanitMediumTTF
- 0x322B26
- showengText
- "YUZU MILK"
-
-
- 16
- 220
- 14
- 220
- KanitMediumTTF
- 0x6F5F51
- showengText
- "Milk & Yuzu Syrup"
-
-
- 16
- 264
- Var( DirImage2 + "option_deactive.png" )
-
-
- 16
- 264
- $12-03-01-0023.Button
- Var( DirImage2 + "hot.png" )
- Var( DirImage2 + "hot_db.png" )
-
-
- 50
- 265
- 14
- 220
- KanitMediumTTF
- 0x6F5F51
- 0xEAE6E1
- $12-03-01-0023.Button
- Var( "฿" + $12-03-01-0023.Price )
-
-
- 81
- 264
- Var( DirImage2 + "cold.png" )
- Var( DirImage2 + "cold_db.png" )
- $12-03-02-0023.Button
-
-
- 115
- 265
- 14
- 220
- KanitMediumTTF
- 0x6F5F51
- 0xEAE6E1
- $12-03-02-0023.Button
- Var( "฿" + $12-03-02-0023.Price )
-
-
- 146
- 264
- Var( DirImage2 + "blend.png" )
- Var( DirImage2 + "blend_db.png" )
- $12-03-03-0023.Button
-
-
- 183
- 265
- 14
- 220
- KanitMediumTTF
- 0x6F5F51
- 0xEAE6E1
- $12-03-03-0023.Button
- Var( "฿" + $12-03-03-0023.Price )
-
-
- 81
- 264
-
- eval(
- If ICE_PROCESS_STATUS = 2 Then
-
- If $Sum120301002312030200231203030023 = "Disable" Then
- Var ice_tab_process_show = "Disable"
- Else
- Var ice_tab_process_show = "Enable"
- EndIf
-
- Else
- Var ice_tab_process_show = "Invisible"
- EndIf
- Var return = ice_tab_process_show
- )
-
- "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png"
- "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png"
-
-
- 49
- 117
-
- eval(
- If $Sum120301002312030200231203030023 = "Disable" Then
- STRCONTAIN "ERR" $12-03-01-0023.TAG tag1_is_disable
- STRCONTAIN "ERR" $12-03-02-0023.TAG tag2_is_disable
- STRCONTAIN "ERR" $12-03-03-0023.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
- )
-
- "ROOT/taobin_project/image//img_menu_err.png"
-
-
- 84
- 266
- 10
- OpunMediumTTF
- 0xDE794E
- ice_tab_process_show
- ice_show_open
-
; 12-03-01-0024 12-03-02-0024 12-03-03-0024
diff --git a/xml/page_catalog_group_other.xml b/xml/page_catalog_group_other.xml
index 30273eed..2ecd630a 100644
--- a/xml/page_catalog_group_other.xml
+++ b/xml/page_catalog_group_other.xml
@@ -107,10 +107,18 @@
If AppFastEnable = "true" Then
Var Menu11Selected = "Enable"
+ Var Menu21Selected = "Invisible"
Var Menu7Selected = "Invisible"
Else
- Var Menu11Selected = "Invisible"
- Var Menu7Selected = "Enable"
+ If MenuKidEnable = "true" Then
+ Var Menu11Selected = "Invisible"
+ Var Menu21Selected = "Enable"
+ Var Menu7Selected = "Invisible"
+ Else
+ Var Menu11Selected = "Invisible"
+ Var Menu21Selected = "Invisible"
+ Var Menu7Selected = "Enable"
+ EndIf
EndIf
EndIf
@@ -519,6 +527,35 @@
+
+
+ 696
+ 395
+ Menu21Selected
+ Var( DirImage + "/bn_forkid.png")
+ Var( DirImage + "/bp_forkid.png")
+ "/mnt/sdcard/coffeevending/wav/click.wav"
+ SoundVolume
+
+ Var NextPage = "-"
+ Open "ROOT/taobin_project/xml/page_catalog_group_forkid.xml"
+
+
+
+ 611
+ 395
+ Menu21Selected2
+ Var( DirImage + "/bn_forkid2.png")
+ Var( DirImage + "/bp_forkid2.png")
+ "/mnt/sdcard/coffeevending/wav/click.wav"
+ SoundVolume
+
+ Var NextPage = "-"
+ Open "ROOT/taobin_project/xml/page_catalog_group_forkid.xml"
+
+
+
+
696
395
diff --git a/xml/page_catalog_group_recommend.xml b/xml/page_catalog_group_recommend.xml
index 147e4c6e..803f18a4 100644
--- a/xml/page_catalog_group_recommend.xml
+++ b/xml/page_catalog_group_recommend.xml
@@ -107,10 +107,18 @@
If AppFastEnable = "true" Then
Var Menu11Selected = "Enable"
+ Var Menu21Selected = "Invisible"
Var Menu7Selected = "Invisible"
Else
- Var Menu11Selected = "Invisible"
- Var Menu7Selected = "Enable"
+ If MenuKidEnable = "true" Then
+ Var Menu11Selected = "Invisible"
+ Var Menu21Selected = "Enable"
+ Var Menu7Selected = "Invisible"
+ Else
+ Var Menu11Selected = "Invisible"
+ Var Menu21Selected = "Invisible"
+ Var Menu7Selected = "Enable"
+ EndIf
EndIf
EndIf
@@ -521,6 +529,35 @@
+
+
+ 696
+ 395
+ Menu21Selected
+ Var( DirImage + "/bn_forkid.png")
+ Var( DirImage + "/bp_forkid.png")
+ "/mnt/sdcard/coffeevending/wav/click.wav"
+ SoundVolume
+
+ Var NextPage = "-"
+ Open "ROOT/taobin_project/xml/page_catalog_group_forkid.xml"
+
+
+
+ 611
+ 395
+ Menu21Selected2
+ Var( DirImage + "/bn_forkid2.png")
+ Var( DirImage + "/bp_forkid2.png")
+ "/mnt/sdcard/coffeevending/wav/click.wav"
+ SoundVolume
+
+ Var NextPage = "-"
+ Open "ROOT/taobin_project/xml/page_catalog_group_forkid.xml"
+
+
+
+
696
395
diff --git a/xml/page_catalog_group_tea.xml b/xml/page_catalog_group_tea.xml
index 6b3fc546..df46572a 100644
--- a/xml/page_catalog_group_tea.xml
+++ b/xml/page_catalog_group_tea.xml
@@ -107,10 +107,18 @@
If AppFastEnable = "true" Then
Var Menu11Selected = "Enable"
+ Var Menu21Selected = "Invisible"
Var Menu7Selected = "Invisible"
Else
- Var Menu11Selected = "Invisible"
- Var Menu7Selected = "Enable"
+ If MenuKidEnable = "true" Then
+ Var Menu11Selected = "Invisible"
+ Var Menu21Selected = "Enable"
+ Var Menu7Selected = "Invisible"
+ Else
+ Var Menu11Selected = "Invisible"
+ Var Menu21Selected = "Invisible"
+ Var Menu7Selected = "Enable"
+ EndIf
EndIf
EndIf
@@ -522,6 +530,35 @@
+
+
+ 696
+ 395
+ Menu21Selected
+ Var( DirImage + "/bn_forkid.png")
+ Var( DirImage + "/bp_forkid.png")
+ "/mnt/sdcard/coffeevending/wav/click.wav"
+ SoundVolume
+
+ Var NextPage = "-"
+ Open "ROOT/taobin_project/xml/page_catalog_group_forkid.xml"
+
+
+
+ 611
+ 395
+ Menu21Selected2
+ Var( DirImage + "/bn_forkid2.png")
+ Var( DirImage + "/bp_forkid2.png")
+ "/mnt/sdcard/coffeevending/wav/click.wav"
+ SoundVolume
+
+ Var NextPage = "-"
+ Open "ROOT/taobin_project/xml/page_catalog_group_forkid.xml"
+
+
+
+
696
395
diff --git a/xml/page_catalog_group_whey.xml b/xml/page_catalog_group_whey.xml
index 5402ccd8..d94a3485 100644
--- a/xml/page_catalog_group_whey.xml
+++ b/xml/page_catalog_group_whey.xml
@@ -107,10 +107,18 @@
If AppFastEnable = "true" Then
Var Menu11Selected = "Enable"
+ Var Menu21Selected = "Invisible"
Var Menu7Selected = "Invisible"
Else
- Var Menu11Selected = "Invisible"
- Var Menu7Selected = "Enable"
+ If MenuKidEnable = "true" Then
+ Var Menu11Selected = "Invisible"
+ Var Menu21Selected = "Enable"
+ Var Menu7Selected = "Invisible"
+ Else
+ Var Menu11Selected = "Invisible"
+ Var Menu21Selected = "Invisible"
+ Var Menu7Selected = "Enable"
+ EndIf
EndIf
EndIf
@@ -535,6 +543,35 @@
+
+
+ 696
+ 395
+ Menu21Selected
+ Var( DirImage + "/bn_forkid.png")
+ Var( DirImage + "/bp_forkid.png")
+ "/mnt/sdcard/coffeevending/wav/click.wav"
+ SoundVolume
+
+ Var NextPage = "-"
+ Open "ROOT/taobin_project/xml/page_catalog_group_forkid.xml"
+
+
+
+ 611
+ 395
+ Menu21Selected2
+ Var( DirImage + "/bn_forkid2.png")
+ Var( DirImage + "/bp_forkid2.png")
+ "/mnt/sdcard/coffeevending/wav/click.wav"
+ SoundVolume
+
+ Var NextPage = "-"
+ Open "ROOT/taobin_project/xml/page_catalog_group_forkid.xml"
+
+
+
+
696
395
diff --git a/xml/page_collect_point_3.xml b/xml/page_collect_point_3.xml
index 8c88737c..1561191c 100644
--- a/xml/page_collect_point_3.xml
+++ b/xml/page_collect_point_3.xml
@@ -644,7 +644,7 @@
Var Timeout = Timeout + 1
- If Timeout > 60 Then
+ If Timeout > 5 Then
diff --git a/xml/page_drinkok.xml b/xml/page_drinkok.xml
index ee660c7c..d817a7ad 100644
--- a/xml/page_drinkok.xml
+++ b/xml/page_drinkok.xml
@@ -200,6 +200,7 @@
Var Seeker = "curr"
SAVELOG "Make next order by take-cup with close-maintenance"
+ Var error_code_stop_now = 1221
Open "ROOT/taobin_project/xml/page_cannotConti.xml"
Else
diff --git a/xml/page_thankyouConti.xml b/xml/page_thankyouConti.xml
index a977ebc1..607bf290 100644
--- a/xml/page_thankyouConti.xml
+++ b/xml/page_thankyouConti.xml
@@ -198,6 +198,8 @@
If RejectOrder = "true" Then
SAVELOG "RejectOrder page_thankyouConti"
+
+ Var error_code_stop_now = 1221
Open "ROOT/taobin_project/xml/page_cannotConti.xml"
EndIf
diff --git a/xml/vending_info.xml b/xml/vending_info.xml
index 54806a10..e48dabf0 100644
--- a/xml/vending_info.xml
+++ b/xml/vending_info.xml
@@ -16,6 +16,7 @@
Var info_6Y = 600
Var info_7Y = 670
Var info_8Y = 740
+ Var info_9Y = 810
Var info_text_startX = info_startX + 22
@@ -27,6 +28,7 @@
Var info_text_6Y = info_6Y + 18
Var info_text_7Y = info_7Y + 18
Var info_text_8Y = info_8Y + 18
+ Var info_text_9Y = info_9Y + 18
Var info2_startX = 550
@@ -83,7 +85,9 @@
Cart "DeleteMenuID" "ALL"
- Var Text1_8 = "IP " MobileIPNetwork
+ Var Text1_8 = "IP " + MobileIPNetwork
+
+ Var GoToCamera = 0
1000
@@ -94,9 +98,30 @@
Open "ROOT/taobin_project/xml/page_board.xml"
EndIf
+ If GoToCamera = 1 Then
+ Var NextPage = "-"
+ OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
+ OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_camera.xml"
+
+
+ TopView "show"
+ Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_main_blank.xml"
+ EndIf
+
+ If GoToCamera > 0 Then
+ Var GoToCamera = GoToCamera - 1
+
+ EndIf
+
DEBUGVAR AdvertiseProfile
- Var Text1_8 = "IP " MobileIPNetwork
+ Var Text1_8 = "IP " + MobileIPNetwork
+
+ Var Text2_8 = "Camera " + CameraCount
+
+ Var Text1_9 = SystemTime
+ Var Text1_9 = Text1_9 + " "
+ Var Text1_9 = Text1_9 + SystemDate
Refresh
TimerReset
@@ -402,7 +427,11 @@
info_8Y
"ROOT/taobin_project/image/tab_1.png"
- CameraService "Restart"
+ CameraService "filter-remove-all"
+ CameraService "add-filter=mClass=9,mSubclass=4"
+ CameraService "add-filter=USB Camera"
+
+ CameraService "Start"
@@ -412,7 +441,14 @@
info_8Y
"ROOT/taobin_project/image/tab_1.png"
- CameraService "Start"
+
+
+ If CameraCount = 1 Then
+
+ CameraSetting "usbfront" "default" "Rotate=270,Resolution=1280x720,scaleX=1.0,scaleY=1.0"
+ EndIf
+
+ Var GoToCamera = 3
@@ -437,9 +473,49 @@
+
+ info1_startX
+ info_9Y
+ "ROOT/taobin_project/image/tab_1.png"
+
+ CameraService "Start"
+
+
+
+
+
+ info2_startX
+ info_9Y
+ "ROOT/taobin_project/image/tab_1.png"
+
+
+
+
+
+
+
+
+ info_text_startX
+ info_text_9Y
+ 30
+ fontType1
+ 0x000000
+ Text1_9
+
+
+
+ info2_text_startX
+ info_text_9Y
+ 30
+ fontType1
+ 0x000000
+ Text2_9
+
+
+
431
- 875
+ 945
"ROOT/taobin_project/image//bp_cancel.png"
"ROOT/taobin_project/image/bp_cancel.png"
"/mnt/sdcard/coffeevending/wav/click.wav"
diff --git a/xml_main/startup.xml b/xml_main/startup.xml
index 7a29c501..389fc339 100644
--- a/xml_main/startup.xml
+++ b/xml_main/startup.xml
@@ -95,8 +95,8 @@
Var RandomPromotionMyworld = 0
Var RandomSalePackage = 0
- Var XMLPageVersion = "6.57"
- Var XMLPageVersionInt = 657
+ Var XMLPageVersion = "6.58"
+ Var XMLPageVersionInt = 658