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

xml/page_board.xml

@@ -667,6 +667,7 @@
 	Var UsePepsiTheme = 0
 
 	Var NoTrickPriceProfile = 0
+	Var NeedRefreshProfile = 0
 
 	OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/sold_cup_count.xml"
 
@@ -1502,7 +1503,7 @@ PRICE "Reset" "-"
  </EventUnitTest7>
 
  <EventUnitTest8>
-	Var XMLProfile = "Discount50"
+	Var XMLProfile = "General"
 	Var TimeProfilePrice = 0
 
  </EventUnitTest8>
@@ -2188,5 +2189,46 @@ PRICE "Reset" "-"
 <Value> ShowNetworkProblemText </Value>
 </Text>
 
+<Button>
+<X> 0 </X>
+<Y> 1870 </Y>
+<State> eval(
+    If LangProcess = "LoadConfig" Then
+        Var return = "Enable"
+    Else
+        Var return = "Invisible"
+    EndIf
+) </State>
+<Color> "0xFFFF00" </Color>
+<Width> 1080 </Width>
+<Height> 60 </Height>
+<EventClick>
+</EventClick>
+</Button>
+
+<Text>
+<State> eval(
+    If LangProcess = "LoadConfig" Then
+        Var return = "Enable"
+    Else
+        Var return = "Invisible"
+    EndIf
+) </State>
+<X> 5 </X>
+<Y> 1880 </Y>
+<Size> 24 </Size>
+<Align> Center </Align>
+<Width> 1080 </Width>
+<Font> RobotoRegular </Font>
+<Color> 0x000000 </Color>
+<Value> eval(
+    If LangProcess = "LoadConfig" Then
+        Var return = "Loading ..."
+    Else
+        Var return = ""
+    EndIf
+) </Value>
+</Text>
+
 
 </Page>

xml/page_thankyou.xml

@@ -161,6 +161,14 @@
 		Else
 			TRY "/mnt/sdcard/coffeevending/taobin_project/video/script2.ev"
 		EndIf
+	Else
+	    If InternationalEnable = 1 Then
+            If UsePepsiTheme = 1 Then
+                Var script_thankyou = CountryRootPath + "video/script_thank.ev"
+                TRY script_thankyou
+            EndIf
+        EndIf
+
 	EndIf