From 003abaf86b766eb40ef62300ab0c707774c36ba9 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 30 三月 2021 20:10:16 +0800
Subject: [PATCH] 2021-3-30-2
---
HDL_ON/UI/UI2/FuntionControlView/Video/MainView.cs | 41 ++++++++++++++++++++++++++++++++---------
1 files changed, 32 insertions(+), 9 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Video/MainView.cs b/HDL_ON/UI/UI2/FuntionControlView/Video/MainView.cs
index 647a483..ada70a2 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Video/MainView.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Video/MainView.cs
@@ -2,13 +2,15 @@
using HDL_ON.UI.Music;
using System.Collections.Generic;
using Shared;
+using HDL_ON.Stan;
+using ZXing.QrCode.Internal;
using static HDL_ON.UI.UI2.FuntionControlView.Video.VideoMethod;
namespace HDL_ON.UI.UI2.FuntionControlView.Video
{
public class MainView : FrameLayout
{
- public void Show(List<ESVideoInfo> listVideo, List<CallView> listCall, VideoClouds video)
+ public void Show(List<VideoMethod.FlVideo> listVideo, List<CallView> listCall, VideoClouds video)
{
this.BackgroundColor = MusicColor.ViewColor;
var topView = new TopView();
@@ -30,7 +32,7 @@
pageView.AddChidren(view1);
var view2 = new FrameLayout();
pageView.AddChidren(view2);
- View1(view1, listVideo);
+ View1(view1, listVideo, video);
View2(view2, listCall, video);
Button btn11 = new Button
{
@@ -93,9 +95,9 @@
/// 绗竴涓晫闈�
/// </summary>
/// <param name="view1">鐖舵帶浠�</param>
- void View1(FrameLayout view1, List<ESVideoInfo> list)
+ void View1(FrameLayout view1, List<VideoMethod.FlVideo> list, VideoClouds videoClouds)
{
-
+
var bjFl = new FrameLayout
{
Y = Application.GetRealHeight(24),
@@ -168,6 +170,11 @@
Width = Application.GetRealWidth(327),
};
bjFl.AddChidren(vv);
+ if (list.Count > 0)
+ {
+ //闂ㄧ浜岀淮鐮佸浐瀹氭湁鐨�,铏氭嫙涓�涓嚭鏉�
+ list.Add(new VideoMethod.FlVideo { aliasName = "闂ㄧ浜岀淮鐮�", devType = "10" });
+ }
//鏁扮粍涓暟
//int value = 15;
//鍏堣绠楁暟鎹墍闇�瑕佺殑寰堥珮搴︼紱
@@ -188,17 +195,16 @@
};
vv.AddChidren(fL);
int line = 0;
+
for (int i = 1, j = 0; i <= list.Count; i++, j++)
{
var video = list[i - 1];
-
var fLayout = new FrameLayout
{
Width = Application.GetRealWidth(50),
Height = Application.GetRealWidth(48),
X = Application.GetRealWidth(31 + (58 + 50) * j),
Y = Application.GetRealHeight(20 + (48 + 24) * line),
- BackgroundColor=0xff357657
};
fL.AddChidren(fLayout);
@@ -220,7 +226,7 @@
TextSize = TextSize.Text10,
TextColor = CSS.CSS_Color.TextualColor,
TextAlignment = TextAlignment.Center,
- Text = video.DeviceName,
+ Text = video.aliasName,
};
fLayout.AddChidren(iconNameBtn);
@@ -236,13 +242,28 @@
// GetIconAndText(i, deviceIconBtn, iconNameBtn);
clickBtn.MouseUpEventHandler += (sender, e) =>
{
- var eSVideoInfo = clickBtn.Tag as ESVideoInfo;
- if (string.IsNullOrEmpty(eSVideoInfo.uuid))
+ var flVideo = clickBtn.Tag as VideoMethod.FlVideo;
+ if (string.IsNullOrEmpty(flVideo.uuid))
{
new Intelligence.Automation.LogicView.TipPopView().FlashingBox(Language.StringByID(StringId.peizhicanshuyouyichang));
}
+ ESVideoInfo eSVideoInfo = new ESVideoInfo
+ {
+ ESVideoUUID = flVideo.uuid,
+ DeviceName = flVideo.aliasName,
+ roomno = videoClouds.flRoomId,
+ unitno= videoClouds.flBuildingId,
+ };
ESOnVideo.Current.ShowESVideoMonitor(eSVideoInfo);
+ //VideoSend.GetQRcode(this, videoClouds, (tag,paw) =>
+ //{
+ // if (tag)
+ // {
+ // View.ShowDialog showDialog = new View.ShowDialog();
+ // showDialog.QRcode(paw);
+ // }
+ //});
};
}
@@ -403,6 +424,8 @@
}
return s;
}
+
+
}
}
--
Gitblit v1.8.0