6.74

2022-11-07 14:13:14 +07:00 · 2022-11-07 14:13:14 +07:00 · fdd2b59366
commit fdd2b59366
parent 647c06c12c
13 changed files with 380 additions and 374 deletions
--- a/xml/page_brewing3.xml
+++ b/xml/page_brewing3.xml
@ -58,6 +58,8 @@
 		Var bnStrawProblemReport = "ROOT/taobin_project/image/page_doing/bn_send_report_straw_en.png"
 		Var bpStrawProblemReport = "ROOT/taobin_project/image/page_doing/bp_send_report_straw_en.png"

+		Var CampaingFilename = "ROOT/taobin_project/image/page_campaign_en"
+
 		Var XStraw = 336
 	Else
 		;Var DirImage = "ROOT/taobin_project/image/collect_point1"
@ -72,6 +74,8 @@
 		Var bnStrawProblemReport = "ROOT/taobin_project/image/page_doing/bn_send_report_straw.png"
 		Var bpStrawProblemReport = "ROOT/taobin_project/image/page_doing/bp_send_report_straw.png"

+		Var CampaingFilename = "ROOT/taobin_project/image/page_campaign"
+
 		Var XStraw = 382
 	EndIf

@ -278,6 +282,18 @@

 	Var CreditCardVoid = 0

+
+	READ_FILE "/mnt/sdcard/coffeevending/CampaignEnable" CampaignEnableStr
+	If CampaignEnableStr = "true" Then
+		Var CampaignEnable = 1
+		Var CampaignVideoTimeCountDown = 14
+		Var PictureFile = CampaingFilename + "/text_desc.png"
+		Var VideoPlayFile =  "ROOT/taobin_project/image/page_campaign/video_desc.mp4"
+	Else
+		Var CampaignEnable = 0
+	EndIf
+	
+
 </EventOpen>


@ -971,76 +987,87 @@
 	DEBUGVAR CountUpBrewing
 	; animation video loop
 	If AnimationOn = "true" Then
-		Var CountUpBrewing = CountUpBrewing + 1
-
-		Var SlotVideo = CountUpBrewing / AnimationVideoPlayTime
-		
-		If PreviseStepVideo = SlotVideo Then
-			;SAVELOG SlotVideo
+		If CampaignEnable = 1 Then
+			If CampaignVideoTimeCountDown > 0 Then
+				Var CampaignVideoTimeCountDown = CampaignVideoTimeCountDown - 1
+			EndIf
+			If CampaignVideoTimeCountDown = 0 Then
+				Var CampaignEnable = 0
+			EndIf
 		Else
-			Var PreviseStepVideo = SlotVideo
-			;SAVELOG PreviseStepVideo
-			;SAVELOG SlotVideo
-			;SAVELOG CountUpBrewing
+			Var CountUpBrewing = CountUpBrewing + 1

-			;Var CountDownVideoTime = CountDownVideoTimeReload
+			;CampaignEnable
+			Var SlotVideo = CountUpBrewing / AnimationVideoPlayTime
 			
-			Var StepVideo = SlotVideo + 2
-			
-			;SAVELOG StepVideo
-
-			If StepVideo = 1 Then
-				Var videoID = VideoID1
-			EndIf
-			If StepVideo = 2 Then
-				Var videoID = VideoID2
-			EndIf
-			If StepVideo = 3 Then
-				Var videoID = VideoID3
-			EndIf
-			If StepVideo = 4 Then
-				Var videoID = VideoID4
-			EndIf
-			If StepVideo = 5 Then
-				Var videoID = VideoID5
-			EndIf
-			If StepVideo = 6 Then
-				Var videoID = VideoID6
-			EndIf
-			If StepVideo = 7 Then
-				Var videoID = VideoID7
-			EndIf
-			If StepVideo = 8 Then
-				Var videoID = VideoID8
-			EndIf
-			If StepVideo = 9 Then
-				Var videoID = VideoID9
-			EndIf
-
-			;SAVELOG videoID
-
-			If videoID = 0 Then
-
+			If PreviseStepVideo = SlotVideo Then
+				;SAVELOG SlotVideo
 			Else
-				If videoID = "---" Then
+				Var PreviseStepVideo = SlotVideo
+				;SAVELOG PreviseStepVideo
+				;SAVELOG SlotVideo
+				;SAVELOG CountUpBrewing
+
+				;Var CountDownVideoTime = CountDownVideoTimeReload
+				
+				Var StepVideo = SlotVideo + 2
+				
+				;SAVELOG StepVideo
+
+				If StepVideo = 1 Then
+					Var videoID = VideoID1
+				EndIf
+				If StepVideo = 2 Then
+					Var videoID = VideoID2
+				EndIf
+				If StepVideo = 3 Then
+					Var videoID = VideoID3
+				EndIf
+				If StepVideo = 4 Then
+					Var videoID = VideoID4
+				EndIf
+				If StepVideo = 5 Then
+					Var videoID = VideoID5
+				EndIf
+				If StepVideo = 6 Then
+					Var videoID = VideoID6
+				EndIf
+				If StepVideo = 7 Then
+					Var videoID = VideoID7
+				EndIf
+				If StepVideo = 8 Then
+					Var videoID = VideoID8
+				EndIf
+				If StepVideo = 9 Then
+					Var videoID = VideoID9
+				EndIf
+
+				;SAVELOG videoID
+
+				If videoID = 0 Then

 				Else
+					If videoID = "---" Then

-					Var VideoPlayFile = VideoPath
-					Var VideoPlayFile = VideoPlayFile + VideoFileBegin
-					Var VideoPlayFile = VideoPlayFile + videoID
-					Var VideoPlayFile = VideoPlayFile + VideoFileEnd
+					Else

-					Var PictureFile = PicturePath
-					Var PictureFile = PictureFile + PictureBegin
-					Var PictureFile = PictureFile + videoID
-					Var PictureFile = PictureFile + PictureEnd
-					
-					DEBUGVAR VideoPlayFile
-					DEBUGVAR PictureFile
+						Var VideoPlayFile = VideoPath
+						Var VideoPlayFile = VideoPlayFile + VideoFileBegin
+						Var VideoPlayFile = VideoPlayFile + videoID
+						Var VideoPlayFile = VideoPlayFile + VideoFileEnd
+
+						Var PictureFile = PicturePath
+						Var PictureFile = PictureFile + PictureBegin
+						Var PictureFile = PictureFile + videoID
+						Var PictureFile = PictureFile + PictureEnd
+						
+						DEBUGVAR VideoPlayFile
+						DEBUGVAR PictureFile
+					EndIf
 				EndIf
 			EndIf
-		EndIf
+		EndIf 
+		; CampaignEnable
 	EndIf


@ -1134,12 +1161,6 @@
 <Filename> VideoPlayFile </Filename>
 </Video>

-;<Image>
-;<X> 0 </X>
-;<Y> 0 </Y>
-;<Filename> "ROOT/taobin_project/image/ad_medium_2.png" </Filename>
-;</Image>
-
 <Video>
 <X> 0 </X>
 <Y> 0 </Y>
@ -1197,51 +1218,6 @@
 <Value> ShowCountDownBrewing </Value>
 </Text>

-;<Text>
-;<X> 100 </X>
-;<Y> 470 </Y>
-;<Align> End </Align>
-;<Width> 153 </Width>
-;<Size> 30 </Size>
-;<Font> RobotoBold </Font>
-;<Color> 0x513C2F </Color>
-;<Value> MachineStage </Value>
-;</Text>
-;
-
-
-;<Text>
-;<X> 0 </X>
-;<Y> 1880 </Y>
-;<Size> 30 </Size>
-;<Align> Center </Align>
-;<Width> 1080 </Width>
-;<Font> KanitThinTTF </Font>
-;<Color> 0x513C2F </Color>
-;<Value> MachineStage </Value>
-;</Text>
-
-
-;<Button>
-;<X> 0 </X>
-;<Y> 1860 </Y>
-;<Width> 200 </Width>
-;<Height> 50 </Height>
-;<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
-;<Volume> SoundVolume </Volume>
-;<EventClick> 
-;	Var countClick = countClick + 1
-;	If countClick = 3 Then
-;		
-;	EndIf
-;
-;	If countClick = 5 Then
-;		Var countClick = 0
-;		MainMenu
-;	EndIf
-;	Refresh
-;</EventClick>
-;</Button>

 <Button>
 <X> 870 </X>