DO new sutgar

xml/page_board.xml

@@ -975,7 +975,7 @@
 	Var NextPage = "-"
 	OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
 
-	OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog2.xml"
+	OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog.xml"
 
 
 	TopView "show"

xml/page_topping_select5.xml

@@ -14,6 +14,8 @@
 	WEB "DISABLE"
 	DEBUGVAR Seeker
 
+	Var BGSugarNew = "Enable"
+
 	DEBUGVAR video_menu_0
 
 	DEBUGVAR SelectDrink
@@ -1731,7 +1733,7 @@
 <Width> 988 </Width>
 <Height> 156 </Height>
 <MarginTop> 20 </MarginTop>
-<State> "Enable" </State> 
+<State> BGSugarNew </State> 
 ; sugar layout
 <Image>
 <State> "Enable" </State>
@@ -1746,9 +1748,9 @@
 <X> 120 </X>
 <Y> 79 </Y>
 <State> SugarState1 </State>
-<Filename> Var( DirImage + "/bn_sugar1.png" ) </Filename>
+<Filename> Var( DirImage + "/bn_sugarlevel1.png" ) </Filename>
-<FilenamePress> Var( DirImage + "/bp_sugar1.png" ) </FilenamePress>
+<FilenamePress> Var( DirImage + "/bp_sugarlevel1.png" ) </FilenamePress>
-<FilenameDisable> Var( DirImage + "/bu_sugar1.png" ) </FilenameDisable>
+<FilenameDisable> Var( DirImage + "/bu_sugarlevel1.png" ) </FilenameDisable>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
@@ -1781,12 +1783,12 @@
 
 ; sugar2
 <Button>
-<X> 288 </X>
+<X> 260 </X>
 <Y> 79 </Y>
 <State> SugarState2 </State>
-<Filename> Var( DirImage + "/bn_sugar2.png" ) </Filename>
+<Filename> Var( DirImage + "/bn_sugarlevel2.png" ) </Filename>
-<FilenamePress> Var( DirImage + "/bp_sugar2.png" ) </FilenamePress>
+<FilenamePress> Var( DirImage + "/bp_sugarlevel2.png" ) </FilenamePress>
-<FilenameDisable> Var( DirImage + "/bu_sugar2.png" ) </FilenameDisable>
+<FilenameDisable> Var( DirImage + "/bu_sugarlevel2.png" ) </FilenameDisable>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
@@ -1828,11 +1830,12 @@
 
 ; sugar3
 <Button>
-<X> 456 </X>
+<X> 400 </X>
 <Y> 79 </Y>
 <State> SugarState3 </State>
-<Filename> Var( DirImage + "/bn_sugar3.png" )</Filename>
+<Filename> Var( DirImage + "/bn_sugarlevel3.png" )</Filename>
-<FilenamePress> Var( DirImage + "/bp_sugar3.png" )</FilenamePress>
+<FilenamePress> Var( DirImage + "/bn_sugarlevel3.png" )</FilenamePress>
+<FilenameDisable> Var( DirImage + "/bu_sugarlevel3.png" )</FilenameDisable>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
@@ -1879,11 +1882,12 @@
 
 ; sugar4
 <Button>
-<X> 624 </X>
+<X> 540 </X>
 <Y> 79 </Y>
 <State> SugarState4 </State>
-<Filename> Var( DirImage + "/bn_sugar4.png" )</Filename>
+<Filename> Var( DirImage + "/bn_sugarlevel4.png" )</Filename>
-<FilenamePress> Var( DirImage + "/bp_sugar4.png" )</FilenamePress>
+<FilenamePress> Var( DirImage + "/bn_sugarlevel4.png" )</FilenamePress>
+<FilenameDisable> Var( DirImage + "/bu_sugarlevel4.png" )</FilenameDisable>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
@@ -1929,11 +1933,63 @@
 
 ; sugar5
 <Button>
-<X> 790 </X>
+<X> 680 </X>
 <Y> 79 </Y>
 <State> SugarState5 </State>
-<Filename> Var( DirImage + "/bn_sugar5.png" )</Filename>
+<Filename> Var( DirImage + "/bn_sugarlevel5.png" )</Filename>
-<FilenamePress> Var( DirImage + "/bp_sugar5.png" )</FilenamePress>
+<FilenamePress> Var( DirImage + "/bn_sugarlevel5.png" )</FilenamePress>
+<FilenameDisable> Var( DirImage + "/bu_sugarlevel5.png" )</FilenameDisable>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	SAVELOG "SUGAR5"
+
+	If SelectDrinkType = 0 Then
+		SAVELOG "drink type popup"
+		Var high_light_drink_type = "Enable"
+	Else
+
+		If ShiftSugarStep = 1 Then
+			Var SugarState1 = "Enable"
+			Var SugarState2 = "Enable"
+			Var SugarState3 = "Enable"
+			Var SugarState4 = "Enable"
+			Var SugarState5 = "PressForever"
+			Var topping1 = toppingID1index5
+		EndIf
+
+		If ShiftSugarStep = 2 Then
+			Var SugarState2 = "Enable"
+			Var SugarState3 = "Enable"
+			Var SugarState4 = "Enable"
+			Var SugarState5 = "PressForever"
+			Var topping1 = toppingID1index4
+		EndIf
+
+		If ShiftSugarStep = 3 Then
+
+			Var SugarState3 = "Enable"
+			Var SugarState4 = "Enable"
+			Var SugarState5 = "PressForever"
+			Var topping1 = toppingID1index3
+		EndIf
+
+		Var UserSeletedSugar = 1
+	EndIf
+
+	DEBUGVAR topping1
+	Refresh
+</EventClick>
+</Button>
+
+; sugar6
+<Button>
+<X> 820 </X>
+<Y> 79 </Y>
+<State> SugarState5 </State>
+<Filename> Var( DirImage + "/bn_sugarlevel6.png" )</Filename>
+<FilenamePress> Var( DirImage + "/bn_sugarlevel6.png" )</FilenamePress>
+<FilenameDisable> Var( DirImage + "/bu_sugarlevel6.png" )</FilenameDisable>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick>