Merge branch 'master' of forthrd.ddns.net:/1TBHDD/ikong/taobin_project

xml/page_board.xml

@@ -4,7 +4,7 @@
 <Cache> "Enable" </Cache>
 <Width> 1080 </Width>
 <Height> 1312 </Height>
-<Background> "0xEFEDEA" </Background>
+<Background> "0xFF0000" </Background>
 <Volume> SoundVolume </Volume>
 <EventOpen>
 	TopView "hide"
@@ -119,14 +119,20 @@
 	EndIf
 
 	If NetworkStatus = "ACTIVATE" Then
+		Var ShowNetworkProblem = "Invisible"
+		Var ShowNetworkProblemText = ""
 		
 	Else
+		Var ShowNetworkProblem = "Enable"
 		Var ShowButtonClick2 = "Invisible"
+		Var ShowNetworkProblemText = "การสื่อสารขัดข้อง ชำระเงินได้เฉพาะเงินสด"
 	EndIf
 
 
 	
 	
+
+
 	Var ShowPrice = "Enable"
 	If RoadShow = "true" Then
 		Var ShowPrice = "Invisible"
@@ -525,7 +531,7 @@
 <Button>
 <X> 212 </X>
 <Y> 1695 </Y>
-<State> ShowButtonClick </State>
+<State> ShowButtonClick2 </State>
 ;<Color> "0x00BDFF" </Color>
 <FilenamePress> "ROOT/taobin_project/image/main_page/bp_main_page_member.png" </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
@@ -545,7 +551,7 @@
 <Button>
 <X> 556 </X>
 <Y> 1695 </Y>
-<State> ShowButtonClick </State>
+<State> ShowButtonClick2 </State>
 ;<Color> "0x00BDFF" </Color>
 <FilenamePress> "ROOT/taobin_project/image/main_page/bp_main_page_topup.png" </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
@@ -595,4 +601,24 @@
 </EventClick>
 </Button>
 
+<Button>
+<X> 0 </X>
+<Y> 1870 </Y>
+<State> ShowNetworkProblem </State>
+<Color> "0xFF0000" </Color>
+<Width> 1080 </Width>
+<Height> 60 </Height>
+</Button>
+
+<Text>
+<X> 5 </X>
+<Y> 1880 </Y>
+<Size> 24 </Size>
+<Align> Center </Align>
+<Width> 1080 </Width>
+<Font> RobotoRegular </Font>
+<Color> 0xFFFFFF </Color>
+<Value> ShowNetworkProblemText </Value>
+</Text>
+
 </Page>

xml/page_catalog.xml

@@ -53,6 +53,16 @@
 		Var ShowButtonClick2 = "Invisible"
 	EndIf
 
+	If NetworkStatus = "ACTIVATE" Then
+		Var ShowNetworkProblem = "Invisible"
+		Var ShowNetworkProblemText = ""
+		
+	Else
+		Var ShowNetworkProblem = "Enable"
+		Var ShowButtonClick2 = "Invisible"
+		Var ShowNetworkProblemText = "การสื่อสารขัดข้อง ชำระเงินได้เฉพาะเงินสด"
+	EndIf
+
 
 </EventOpen>
 <Timeout> 1000 </Timeout>
@@ -257,5 +267,25 @@
 </EventClick>
 </Button>
 
+<Button>
+<X> 0 </X>
+<Y> 1870 </Y>
+<State> ShowNetworkProblem </State>
+<Color> "0xFF0000" </Color>
+<Width> 1080 </Width>
+<Height> 60 </Height>
+</Button>
+
+<Text>
+<X> 5 </X>
+<Y> 1880 </Y>
+<Size> 24 </Size>
+<Align> Center </Align>
+<Width> 1080 </Width>
+<Font> RobotoRegular </Font>
+<Color> 0xFFFFFF </Color>
+<Value> ShowNetworkProblemText </Value>
+</Text>
+
 
 </Popup>

xml/page_catalog_choose_drink1.xml

@@ -44,6 +44,17 @@
     SAVELOG PreviseXMLFileName2
 
     Var Timeout = 0
+
+	If NetworkStatus = "ACTIVATE" Then
+		Var ShowNetworkProblem = "Invisible"
+		Var ShowNetworkProblemText = ""
+		
+	Else
+		Var ShowNetworkProblem = "Enable"
+		Var ShowButtonClick2 = "Invisible"
+		Var ShowNetworkProblemText = "การสื่อสารขัดข้อง ชำระเงินได้เฉพาะเงินสด"
+	EndIf
+
 </EventOpen>
 
 
@@ -1752,6 +1763,25 @@
 </FrameScroll>
 
 
+<Button>
+<X> 0 </X>
+<Y> 1870 </Y>
+<State> ShowNetworkProblem </State>
+<Color> "0xFF0000" </Color>
+<Width> 1080 </Width>
+<Height> 60 </Height>
+</Button>
+
+<Text>
+<X> 5 </X>
+<Y> 1880 </Y>
+<Size> 24 </Size>
+<Align> Center </Align>
+<Width> 1080 </Width>
+<Font> RobotoRegular </Font>
+<Color> 0xFFFFFF </Color>
+<Value> ShowNetworkProblemText </Value>
+</Text>
 
 
 

xml/page_collect_point_2.xml

@@ -21,7 +21,7 @@
 	Var TaobinErrorNetwork = 0
 
 	If PayOfflineMode = 1 Then
-
+		Var TaobinErrorNetwork = 1
 		Var PointTaobinStr = "" + PayAmount
 		Var PointTaobinStr = PointTaobinStr + "/1/0"
 		Var TNumberTaobinMember = TelephoneNumber

xml/page_payment_cash.xml

@@ -271,6 +271,16 @@
 		Var PayOfflineMode = 0
 	EndIf
 
+	If NetworkStatus = "ACTIVATE" Then
+		Var ShowNetworkProblem = "Invisible"
+		Var ShowNetworkProblemText = ""
+		
+	Else
+		Var ShowNetworkProblem = "Enable"
+		Var ShowButtonClick2 = "Invisible"
+		Var ShowNetworkProblemText = "การสื่อสารขัดข้อง ชำระเงินได้เฉพาะเงินสด"
+	EndIf
+
 	Var pay_with_credit_image = DirImage + "/bp_pay_with_credit.png"
 	Var pay_with_chanel_text = DirImage + "/text_1.png"
 	
@@ -1212,16 +1222,25 @@
 </EventClick>
 </Button>
 
-;<Text>
+<Button>
-;<X> 0 </X>
+<X> 0 </X>
-;<Y> 1886 </Y>
+<Y> 1870 </Y>
-;<Size> 20 </Size>
+<State> ShowNetworkProblem </State>
-;<Width> 1080</Width>
+<Color> "0xFF0000" </Color>
-;<Align> end </Align>
+<Width> 1080 </Width>
-;<Font> RobotoBlack </Font>
+<Height> 60 </Height>
-;<Color> 0x513C2F </Color>
+</Button>
-;<Value> countClick2 </Value>
+
-;</Text>
+<Text>
+<X> 5 </X>
+<Y> 1880 </Y>
+<Size> 24 </Size>
+<Align> Center </Align>
+<Width> 1080 </Width>
+<Font> RobotoRegular </Font>
+<Color> 0xFFFFFF </Color>
+<Value> ShowNetworkProblemText </Value>
+</Text>