From 570e19c72bebd5dce295d18bb045bc2a26e85b1e Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 18 五月 2022 16:02:07 +0800
Subject: [PATCH] 自研可视对讲优化
---
HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs | 97 ++++++++++++++++++++++++------------------------
1 files changed, 49 insertions(+), 48 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs b/HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs
index 60179d5..b1c8fb3 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs
@@ -585,7 +585,7 @@
/// <summary>
- /// 鍔犺浇鎻愮ず寮圭獥
+ /// 鑾峰彇闂ㄧ浜岀淮鐮�
/// </summary>
public void ChooseVideoShowQRCode()
{
@@ -730,58 +730,59 @@
/// </summary>
public void ChooseAlarmShow()
{
- Dialog dialog = new Dialog()
- {
- BackgroundColor = CSS_Color.DialogTransparentColor1,
- };
-
- FrameLayout dialogView = new FrameLayout();
- dialog.AddChidren(dialogView);
- dialogView.MouseUpEventHandler = (sender, e) => {
- dialog.Close();
- };
-
- var contentView = new FrameLayout()
- {
- Gravity = Gravity.Center,
- Width = Application.GetRealWidth(270),
- Height = Application.GetRealHeight(280),
- BackgroundColor = CSS_Color.MainBackgroundColor,
- BorderColor = 0x00000000,
- BorderWidth = 0,
- Radius = (uint)Application.GetMinRealAverage(10),
- };
- dialogView.AddChidren(contentView);
-
- var btnTitle = new Button()
- {
- Height = Application.GetRealHeight(64),
- TextAlignment = TextAlignment.Center,
- TextColor = CSS_Color.FirstLevelTitleColor,
- TextID = StringId.menjinerweima,
- TextSize = CSS_FontSize.SubheadingFontSize,
- };
- contentView.AddChidren(btnTitle);
-
- var listView = new VerticalScrolViewLayout()
- {
- Gravity = Gravity.CenterHorizontal,
- Y = Application.GetRealHeight(70),
- Width = Application.GetRealWidth(230),
- Height = Application.GetRealHeight(200),
- };
- contentView.AddChidren(listView);
-
if (ximoVideoList.Count == 1)
{
- var wanderingAlarmPage = new WanderingAlarmPage();
+ var wanderingAlarmPage = new WanderingAlarmPage(ximoVideoList[0].deviceId);
MainPage.BasePageView.AddChidren(wanderingAlarmPage);
- wanderingAlarmPage.LoadPage(ximoVideoList[0].deviceId);
+ wanderingAlarmPage.LoadPage();
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
}
else
{
+ Dialog dialog = new Dialog()
+ {
+ BackgroundColor = CSS_Color.DialogTransparentColor1,
+ };
+
+ FrameLayout dialogView = new FrameLayout();
+ dialog.AddChidren(dialogView);
+ dialogView.MouseUpEventHandler = (sender, e) =>
+ {
+ dialog.Close();
+ };
+
+ var contentView = new FrameLayout()
+ {
+ Gravity = Gravity.Center,
+ Width = Application.GetRealWidth(270),
+ Height = Application.GetRealHeight(280),
+ BackgroundColor = CSS_Color.MainBackgroundColor,
+ BorderColor = 0x00000000,
+ BorderWidth = 0,
+ Radius = (uint)Application.GetMinRealAverage(10),
+ };
+ dialogView.AddChidren(contentView);
+
+ var btnTitle = new Button()
+ {
+ Height = Application.GetRealHeight(64),
+ TextAlignment = TextAlignment.Center,
+ TextColor = CSS_Color.FirstLevelTitleColor,
+ TextID = StringId.WanderingAlarm,
+ TextSize = CSS_FontSize.SubheadingFontSize,
+ };
+ contentView.AddChidren(btnTitle);
+
+ var listView = new VerticalScrolViewLayout()
+ {
+ Gravity = Gravity.CenterHorizontal,
+ Y = Application.GetRealHeight(70),
+ Width = Application.GetRealWidth(230),
+ Height = Application.GetRealHeight(200),
+ };
+ contentView.AddChidren(listView);
+
foreach (var v in ximoVideoList)
{
@@ -806,16 +807,16 @@
{
- var wanderingAlarmPage = new WanderingAlarmPage();
+ var wanderingAlarmPage = new WanderingAlarmPage(v.deviceId);
MainPage.BasePageView.AddChidren(wanderingAlarmPage);
- wanderingAlarmPage.LoadPage(v.deviceId);
+ wanderingAlarmPage.LoadPage();
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
dialog.Close();
};
}
+ dialog.Show();
}
- dialog.Show();
}
--
Gitblit v1.8.0