Merged

xml/page_drinkfail3.xml

@@ -6,32 +6,32 @@
 <Volume> SoundVolume </Volume>
 
 <EventOpen>
-	; On open
-	
-	
+ ; On open
 
-	If show_eng = "true" Then 
-		Var DirImage = "ROOT/taobin_project/image/collectiing_en/"
 
-	Else
-		Var DirImage = "ROOT/taobin_project/image/collectiing/"
-	EndIf
 
-	If LanguageShow = "MYANMAR" Then 
-		Var DirImage = "ROOT/taobin_project/image/collectiing_mmr/"
-	EndIf
+ If show_eng = "true" Then
+  Var DirImage = "ROOT/taobin_project/image/collectiing_en/"
 
-	
-	Var Timeout = 0
+ Else
+  Var DirImage = "ROOT/taobin_project/image/collectiing/"
+ EndIf
+
+ If LanguageShow = "MYANMAR" Then
+  Var DirImage = "ROOT/taobin_project/image/collectiing_mmr/"
+ EndIf
+
+
+    Var Timeout = 0
 
     Var Door_Open_State="Invisible"
     Var Door_Open_flagBlink = 0
 
 </EventOpen>
 <Timeout> 1000 </Timeout>
-<EventTimeout> 
-	
-	
+<EventTimeout>
+
+
 
     Var Timeout = Timeout + 1
 
@@ -40,8 +40,6 @@
     DEBUGVAR NextOrder
     DEBUGVAR HaveCup
 
-    
-
     DEBUGVAR buttonRemoveCup
     DEBUGVAR NextOrder
     DEBUGVAR Door_Open_State
@@ -76,11 +74,12 @@
 		EndIf
 	EndIf
 
-    Refresh
-	TimerReset
-    
 
-</EventTimeout> 
+    Refresh
+    TimerReset
+
+
+</EventTimeout>
 
 
 
@@ -90,16 +89,6 @@
 
 
 
-
-
-
-
-
-
-
-
-
-
 <Image>
 <X> 53 </X>
 <Y> 473 </Y>
@@ -116,13 +105,13 @@
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <State>buttonRemoveCup</State>
-<EventClick> 
+<EventClick>
 
    Machine RemoveCup
    Var buttonRemoveCup = "Invisible"
    Var CheckCupStateDoorCupClose = "reset"
    Var CheckCupStateDoorCupCloseCnt = 15
-	
+
 </EventClick>
 </Button>
 
@@ -134,8 +123,8 @@
 <FilenamePress> Var( DirImage + "/bp_door_open.png" )</FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
-<EventClick> 
-	Machine RemoveCup
+<EventClick>
+ Machine RemoveCup
    Var buttonRemoveCup = "Invisible"
    Var CheckCupStateDoorCupClose = "reset"
    Var CheckCupStateDoorCupCloseCnt = 15