From 9eec81850e418a3c16410b4870910bde142b06e3 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 14 九月 2022 15:50:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/Dev-Branch' into wjc
---
HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs | 82 +++++++++++++++++++++-------------------
1 files changed, 43 insertions(+), 39 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs b/HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs
index b1c8fb3..d13882a 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs
@@ -2,15 +2,16 @@
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;
using HDL_ON.UI.CSS;
namespace HDL_ON.UI.UI2.FuntionControlView.Video
{
public class VideoMainView : FrameLayout
{
-
- List<Video> ximoVideoList = new List<Video>();
-
+ List<Video> xiMoVideoList = new List<Video>();
/// <summary>
/// 鍔犺浇鍙瀵硅UI
@@ -19,14 +20,12 @@
/// <param name="videoList">鍙瀵硅鍒楄〃</param>
public void Show(List<CallView> listCall, List<Video> videoList)
{
- ximoVideoList = videoList.FindAll((obj) => obj.spk == "door.gate");
-
+ xiMoVideoList = videoList.FindAll((obj) => obj.spk == "door.gate");
#region 甯冨眬鐣岄潰
this.BackgroundColor = MusicColor.ViewColor;
var topView = new TopView();
this.AddChidren(topView.TopFLayoutView());
topView.topNameBtn.TextID = StringId.keshiduijiang;
-
var pageView = new PageLayout()
{
@@ -38,7 +37,9 @@
var view1 = new FrameLayout();
pageView.AddChidren(view1);
var view2 = new FrameLayout();
- pageView.AddChidren(view2);
+ if (!Entity.DB_ResidenceData.Instance.SupportFVDevice) {//闈炲叏瑙嗛�氬睍绀洪�氳瘽璁板綍
+ pageView.AddChidren(view2);
+ }
View1(view1, videoList);
View2(view2, listCall, videoList);
Button btn11 = new Button
@@ -50,7 +51,7 @@
BackgroundColor = MusicColor.SelectedColor,
Radius = (uint)Application.GetRealHeight(4),
};
- view1.AddChidren(btn11);
+ //view1.AddChidren(btn11);
Button btn12 = new Button
{
@@ -61,7 +62,13 @@
BackgroundColor = 0x404484F4,
Radius = (uint)Application.GetRealHeight(4),
};
- view1.AddChidren(btn12);
+ //view1.AddChidren(btn12);
+ if (!Entity.DB_ResidenceData.Instance.SupportFVDevice)
+ {//闈炲叏瑙嗛�氬睍绀轰笅鏂归�夋嫨鎸夐挳
+ view1.AddChidren(btn11);
+ view1.AddChidren(btn12);
+ }
+
Button btn21 = new Button
{
X = Application.GetRealWidth(170),
@@ -199,13 +206,13 @@
if (bol)
{
//闂ㄧ浜岀淮鐮佸浐瀹氭湁鐨�,铏氭嫙涓�涓嚭鏉�
- videoList.Add(new Video { deviceName = Language.StringByID(StringId.menjinerweima), interphoneType = "100",devType = "100" });
+ videoList.Add(new Video { deviceName = Language.StringByID(StringId.menjinerweima), interphoneType = "100" ,devType = "100" });
}
- if (ximoVideoList.Count > 0)
+ if (xiMoVideoList.Count > 0)
{
//寰樺緤鎶ヨ
videoList.Add(new Video { deviceName = Language.StringByID(StringId.WanderingAlarm), interphoneType = "222", devType = "222" });
-
+
}
//鏁扮粍涓暟
//int value = 15;
@@ -227,13 +234,10 @@
};
vv.AddChidren(fL);
int line = 0;
-
-
#endregion
for (int i = 1, j = 0; i <= videoList.Count; i++, j++)
{
var video = videoList[i - 1];
-
#region
var fLayout = new FrameLayout
{
@@ -252,7 +256,6 @@
UnSelectedImagePath = "VideoIcon/weiqiangji.png",
};
fLayout.AddChidren(iconBtn);
-
var deviceNameBtn = new Button
{
@@ -281,24 +284,23 @@
//闂ㄥ彛鏈虹殑鐐瑰嚮浜嬩欢
clickBtn.MouseUpEventHandler += (sender, e) =>
{
- if (video.devType == "VisitorQrCode")
- {
-
- return;
- }
- else if (video.devType == "FaceManagement")
- {
-
- return;
- }
-
var video2 = clickBtn.Tag as Video;
if (video2.devType == "100")
{
ChooseVideoShowQRCode();
+ ////闂ㄧ浜岀淮鐮佸浐瀹氭湁鐨�
+ //VideoSend.GetQRcode(this, video2, (tag, paw) =>
+ //{
+ // if (tag)
+ // {
+ // //娉ㄦ剰锛氬瘑鐮佹湁鍙兘寤舵椂1鍒嗛挓鐢熸晥
+ // View.ShowDialog showDialog = new View.ShowDialog();
+ // showDialog.QRcode(paw);
+ // }
+ //});
}
- else if(video2.devType == "222")
+ else if (video2.devType == "222")
{
ChooseAlarmShow();
@@ -330,8 +332,10 @@
Lc_Psk = video.deviceId,//2021-10-15 PSK瀛楁涓嶈兘鍙杁eviceName
Lc_PlayToken = video.playToken,
deviceSipAccount = video.deviceSipAccount,
- HomeId = video.homeId
+ HomeId = video.homeId,
+ deviceCode=video.deviceCode
};
+
ESOnVideo.Current.ShowESVideoMonitor(eSVideoInfo, video.interphoneType);
}
};
@@ -574,15 +578,12 @@
for (int i = 0; i < videoList.Count; i++)
{
var _video = videoList[i];
- if (_video.interphoneType == "FLVI"|| _video.spk == "door.gate")
- {
+ if (_video.interphoneType == "FLVI" || _video.spk == "door.gate")
return true;
- }
}
return bol;
}
-
/// <summary>
/// 鑾峰彇闂ㄧ浜岀淮鐮�
@@ -604,7 +605,7 @@
{
Gravity = Gravity.Center,
Width = Application.GetRealWidth(270),
- Height = Application.GetRealHeight(280),
+ Height = Application.GetRealHeight(200),
BackgroundColor = CSS_Color.MainBackgroundColor,
BorderColor = 0x00000000,
BorderWidth = 0,
@@ -703,7 +704,7 @@
// if (v.spk == "door.gate")
// {
-
+
// return;
// }
@@ -725,14 +726,15 @@
}
+
/// <summary>
/// 閫夋嫨寰樺緤鎶ヨ鍒楄〃鏄剧ず
/// </summary>
public void ChooseAlarmShow()
{
- if (ximoVideoList.Count == 1)
+ if (xiMoVideoList.Count == 1)
{
- var wanderingAlarmPage = new WanderingAlarmPage(ximoVideoList[0].deviceId);
+ var wanderingAlarmPage = new WanderingAlarmPage(xiMoVideoList[0].deviceId);
MainPage.BasePageView.AddChidren(wanderingAlarmPage);
wanderingAlarmPage.LoadPage();
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
@@ -784,7 +786,7 @@
contentView.AddChidren(listView);
- foreach (var v in ximoVideoList)
+ foreach (var v in xiMoVideoList)
{
Button btnMsg = new Button()
{
@@ -820,9 +822,11 @@
}
-
}
+ /// <summary>
+ /// 闂ㄧ浜岀淮鐮佹暟鎹�
+ /// </summary>
public class AccessControlQRode
{
public string title = string.Empty;
--
Gitblit v1.8.0