Update strawberrh

animation01/Menu Description - Sheet1.tsv

@@ -76,7 +76,7 @@ Hot Water	12-05-01-0002	1	16								24	55	0:55	51
 Coke	12-05-02-0019												0:00	#DIV/0!
 Sprite	12-05-02-0020	1	23	18							24	20	0:20	8
 7UP	12-05-02-0021	1	23	18							24	20	0:20	8
-MATCHA SHAKE	12-04-02-0001	1	25	26	15	6	7	23			24	181	3:01	30
+MATCHA SHAKE	12-04-02-0001	1	25	26	9	6	7	23			24	181	3:01	30
 CHOCOLATE SHAKE	12-04-02-0002	1	25	26	6	7	15	23			24	219	3:39	36
 STRAWBERRY SHAKE	12-04-02-0003	1	25	26	19	17	23				24	178	2:58	35
 ESPRESSO SHAKE	12-04-02-0004	1	25	26	2	3	4	5	17	23	24	230	3:50	28

xml/page_camera.xml

@@ -106,13 +106,7 @@
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
-	; eng
-	If show_eng = "true" Then 
-		Var show_eng = "false"
-	Else
-		Var show_eng = "true"
-	EndIf
-	Open "ROOT/taobin_project/xml/page_catalog.xml" 
+	Shutter "/mnt/sdcard/shutter.jpg"
 </EventClick>
 </Button>
 

xml/page_catalog_choose_drink3.pml

@@ -23,6 +23,7 @@
  product_code.append('12-02-01-0008')
  product_code.append('12-02-01-0019')
  product_code.append('12-02-01-0009')
+ product_code.append('12-02-01-0022')
  product_code.append('12-02-01-0010')
  product_code.append('12-02-01-0011')
  product_code.append('12-02-01-0012')
@@ -41,6 +42,7 @@
  product_code.append('12-02-02-0008')
  product_code.append('12-02-02-0019')
  product_code.append('12-02-02-0009')
+ product_code.append('12-02-02-0022')
  product_code.append('12-02-02-0010')
  product_code.append('12-02-02-0011')
  product_code.append('12-02-02-0012')

xml/page_catalog_choose_drink5.pml

@@ -11,6 +11,7 @@
  product_code.append('12-05-02-0003')
  product_code.append('12-05-02-0004')
  product_code.append('12-05-02-0005')
+ product_code.append('12-05-02-0040')
  product_code.append('12-05-02-0006')
 
  

xml/page_catalog_choose_drink6.pml

@@ -17,6 +17,7 @@
  product_code.append('12-05-02-0028') 
 
  product_code.append('12-05-02-0012')
+ product_code.append('12-05-02-0041')
  product_code.append('12-05-02-0013')
  product_code.append('12-05-02-0031')
  product_code.append('12-05-02-0008')
@@ -40,6 +41,7 @@
  product_code.append('12-05-02-0004')
  product_code.append('12-05-02-0032')
  product_code.append('12-05-02-0005')
+ product_code.append('12-05-02-0040')
 
  product_code.append('12-05-02-0006')
  product_code.append('12-05-02-0026')

xml/page_catalog_choose_drink7.pml

@@ -9,6 +9,7 @@
  product_code.append('12-04-02-0001')
  product_code.append('12-04-02-0002')
  product_code.append('12-04-02-0003')
+ product_code.append('12-04-02-0013')
  product_code.append('12-04-02-0004')
  product_code.append('12-04-02-0005')
  product_code.append('12-04-02-0006')

xml/page_drinkfail3.xml

@@ -54,6 +54,12 @@
 		Open "ROOT/taobin_project/xml/page_back_to_main.xml" 
 	EndIf
 
+	If HaveCup = "true" Then
+			
+	Else
+		Open "ROOT/taobin_project/xml/page_back_to_main.xml" 
+	EndIf
+
 
     Refresh
 	TimerReset

xml/vending_info.xml

@@ -200,15 +200,15 @@
 <Filename> "ROOT/taobin_project/image/tab_1.png" </Filename>
 <EventClick>
 	;Var ShowPrice = "Invisible"
-	Open "ROOT/xml/test_coin.xml"
+	;Open "ROOT/xml/test_coin.xml"
 
 
 
-	;OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
-	;OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_camera.xml"
+	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"
+	TopView "show"
+	Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_main_blank.xml"
 </EventClick>
 </Image>