From 7eb8b78a26accd059cf8e17d756f6d77e6b3f9dd Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期四, 09 六月 2022 21:40:26 +0800
Subject: [PATCH] 2022年06月09日21:39:40
---
HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs | 226 +++++++++++++++++++++++---------------------------------
1 files changed, 93 insertions(+), 133 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs b/HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs
index 0f9942c..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()
{
@@ -631,7 +631,7 @@
};
contentView.AddChidren(listView);
- if (ximoVideoList.Count == 1)
+ //if (ximoVideoList.Count == 1)
{
Loading loading = new Loading();
contentView.AddChidren(loading);
@@ -649,11 +649,11 @@
ImageView codeImage = new ImageView()
{
Gravity = Gravity.Center,
- Height = Application.GetRealWidth(200),
- Width = Application.GetRealWidth(200),
+ Height = Application.GetRealWidth(320),
+ Width = Application.GetRealWidth(320),
ImageBytes = Scan.BytesFromText(pairs[0].qrcode, Application.GetRealWidth(200), Application.GetRealWidth(200)),
};
- contentView.AddChidren(codeImage);
+ dialogView.AddChidren(codeImage);
});
}
}
@@ -675,154 +675,114 @@
})
{ IsBackground = true }.Start();
}
- else
- {
+ //else
+ //{
- foreach (var v in ximoVideoList)
- {
- Button btnMsg = new Button()
- {
- Gravity = Gravity.CenterHorizontal,
- Height = Application.GetRealHeight(50),
- Width = Application.GetRealHeight(160),
- TextAlignment = TextAlignment.Center,
- TextColor = CSS_Color.TextualColor,
- TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
- Text = v.deviceName,
- Radius = (uint)Application.GetRealWidth(5),
- BackgroundColor = CSS_Color.DividingLineColor,
- IsMoreLines = true,
- };
- listView.AddChidren(btnMsg);
+ // foreach (var v in ximoVideoList)
+ // {
+ // Button btnMsg = new Button()
+ // {
+ // Gravity = Gravity.CenterHorizontal,
+ // Height = Application.GetRealHeight(50),
+ // Width = Application.GetRealHeight(160),
+ // TextAlignment = TextAlignment.Center,
+ // TextColor = CSS_Color.TextualColor,
+ // TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+ // Text = v.deviceName,
+ // Radius = (uint)Application.GetRealWidth(5),
+ // BackgroundColor = CSS_Color.DividingLineColor,
+ // IsMoreLines = true,
+ // };
+ // listView.AddChidren(btnMsg);
- listView.AddChidren(new Button() { Height = Application.GetRealHeight(12) });
+ // listView.AddChidren(new Button() { Height = Application.GetRealHeight(12) });
- btnMsg.MouseUpEventHandler = (sender, e) =>
- {
+ // btnMsg.MouseUpEventHandler = (sender, e) =>
+ // {
- if (v.spk == "door.gate")
- {
- Loading loading = new Loading();
- contentView.AddChidren(loading);
- loading.Start("");
- new System.Threading.Thread(() =>
- {
- try
- {
- var pack = VideoSend.GetQRcode();
- var pairs = Newtonsoft.Json.JsonConvert.DeserializeObject<List<AccessControlQRode>>(pack.Data.ToString());
- if (pairs.Count > 0)
- {
- Application.RunOnMainThread(() =>
- {
- ImageView codeImage = new ImageView()
- {
- Gravity = Gravity.Center,
- Height = Application.GetRealWidth(200),
- Width = Application.GetRealWidth(200),
- ImageBytes = Scan.BytesFromText(pairs[0].qrcode, Application.GetRealWidth(200), Application.GetRealWidth(200)),
- };
- contentView.AddChidren(codeImage);
- });
- }
- }
- catch (Exception ex)
- {
- MainPage.Log($"鑾峰彇闂ㄧ浜岀淮鐮佸紓甯革細{ex.Message}");
- }
- finally
- {
- Application.RunOnMainThread(() =>
- {
- if (loading != null)
- {
- loading.Hide();
- loading.RemoveFromParent();
- }
- });
- }
- })
- { IsBackground = true }.Start();
- return;
- }
+ // if (v.spk == "door.gate")
+ // {
+
+ // return;
+ // }
- //闂ㄧ浜岀淮鐮佸浐瀹氭湁鐨�
- VideoSend.GetQRcode(this, v, (tag, paw) =>
- {
- if (tag)
- {
- //娉ㄦ剰锛氬瘑鐮佹湁鍙兘寤舵椂1鍒嗛挓鐢熸晥
- View.ShowDialog showDialog = new View.ShowDialog();
- showDialog.QRcode(paw);
- }
- });
- dialog.Close();
- };
- }
- }
+ // //闂ㄧ浜岀淮鐮佸浐瀹氭湁鐨�
+ // VideoSend.GetQRcode(this, v, (tag, paw) =>
+ // {
+ // if (tag)
+ // {
+ // //娉ㄦ剰锛氬瘑鐮佹湁鍙兘寤舵椂1鍒嗛挓鐢熸晥
+ // View.ShowDialog showDialog = new View.ShowDialog();
+ // showDialog.QRcode(paw);
+ // }
+ // });
+ // dialog.Close();
+ // };
+ // }
+ //}
dialog.Show();
}
-
/// <summary>
/// 閫夋嫨寰樺緤鎶ヨ鍒楄〃鏄剧ず
/// </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)
{
@@ -847,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