Merge branch 'masterpiece' of kong:/1TBHDD/ikong/taobin_project into masterpiece

xml/page_board.xml

@@ -610,14 +610,11 @@
 		TRY "/mnt/sdcard/coffeevending/taobin_project/inter/sgp/video/script_video.ev"
 	EndIf
 
-	;inter-xml-open
-	If CountryName = "UnitedArabEmirates Dubai" Then
-		TRY "/mnt/sdcard/coffeevending/taobin_project/inter/uae_dubai/video/script_video.ev"
-	EndIf
 
 
-		DEBUGVAR CountDownShowButton
-		DEBUGVAR EventTurnOn
+
+	DEBUGVAR CountDownShowButton
+	DEBUGVAR EventTurnOn
 
 	;inter-page-board
 	If CountryName = "Malaysia" Then
@@ -718,7 +715,7 @@
 		Var CountryRootPath = "ROOT/taobin_project/inter/aus/"
 		Var CountryShortName = "aus"
 
-		ar TextPriceMenuSize = 12
+		Var TextPriceMenuSize = 12
 		Var TextPriceMenuY = 264
 		Var TextPriceMenuBlendX = 180
 		Var TextPriceMenuHotX = 48
@@ -845,9 +842,14 @@
 
 	;inter-page-board
 	; wait
+	
 	If CountryName = "UnitedArabEmirates Dubai" Then
+
+		SAVELOG "UnitedArabEmirates Dubai UnitedArabEmirates Dubai UnitedArabEmirates Dubai"
+		
 		TRY "/mnt/sdcard/coffeevending/taobin_project/inter/uae_dubai/video/script_video.ev"
 		
+		
 		Var WebAppShow = "Invisible"
 		EnableLanguage "ENG"
 		EnableLanguage "UAE_DUBAI"
@@ -864,7 +866,7 @@
 		Var CountryShortName = "uae_dubai"
 		
 		Var TextPriceMenuSize = 12
-		Var TextPriceMenuY = 264
+		Var TextPriceMenuY = 266
 		Var TextPriceMenuBlendX = 180
 		Var TextPriceMenuHotX = 48
 		Var ShowButtonClick2 = "Enable"
@@ -885,6 +887,12 @@
 		EndIf
 
 		Var SettingDisableTaobinCredit = "true"
+		Var SettingDisableTaobinCode = "false"
+		
+		; Dubai disable point
+		Var SettingIgnoreCollectPoint = 1
+
+		Var SettingVideoBrewingUseCommon = 1
 
 	EndIf
 
@@ -1240,11 +1248,19 @@
 			; ignore
 			Var CountDownPauseVideo = CountDownPauseVideo - 1
 
-			If CountDownPauseVideo  = 1 Then
+			If CountDownPauseVideo  = 2 Then
 
-			TapScreen 30 638
+				TapScreen 30 638
 
 			EndIf
+
+
+			If CountDownPauseVideo  = 1 Then
+
+				TapScreen 860 1004
+
+			EndIf
+
 			If CountDownPauseVideo  = 0 Then
 
 				Var NextPage = "ROOT/taobin_project/xml/page_back_to_main.xml"
@@ -1254,6 +1270,8 @@
 
 				Var OpenFromPageBoard = 1
 
+				
+
 				If InternationalEnable = 1 Then
 
 					; show language icon