Merge branch 'masterpiece' of ssh://forthrd.ddns.net:2222/1TBHDD/ikong/taobin_project into masterpiece

inter/sgp/xml/page_brewing3_blue.lxml

@@ -614,6 +614,8 @@
 	DEBUGVAR MachineState_Result
 	DEBUGVAR BREW_COUNT_DOWN_FROM_APP
 
+    DEBUGVAR MOVE_CUP_TO_DOOR
+    DEBUGVAR SetPercent100
 
 	If MOVE_CUP_TO_DOOR = "true" Then
 		Var MOVE_CUP_TO_DOOR = "false"
@@ -683,6 +685,9 @@
 	EndIf
 
 
+
+    DEBUGVAR CountUpWhenBREW_CNT
+
 	If BREW_CNT = 0 Then
 		If CountUpWhenBREW_CNT > 56 Then
 			Var CountUpWhenBREW_CNT = 0
@@ -699,6 +704,32 @@
 
 	EndIf
 
+	If BREW_CNT > 0 Then
+
+		If XPercent = 100 Then
+		    SAVELOG "Sussy 100 percent success?"
+
+			If MachineState_Result = 0 Then
+
+			     SAVELOG "Recheck drink-success from touch file"
+
+			    Var CountUpWhenBREW_CNT = 0
+    			Var drink_success_set = "-"
+    			READ_FILE "/mnt/sdcard/coffeevending/log/drink-success" drink_success_set
+    			DEBUGVAR drink_success_set
+    			If drink_success_set = "1" Then
+    				Var MachineState_Result = 1
+    			EndIf
+			EndIf
+
+
+
+		EndIf
+
+	EndIf
+
+
+
 	If Timeout > 480 Then
 		SAVELOG " Timeout > 480"
 		Var MachineState_Result = 2