From 311aa775e05f567795e9cc131c67310b3bb133aa Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 26 三月 2021 10:49:09 +0800
Subject: [PATCH] Merge branch 'WJC' into temp-wxr
---
HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/SingleLogicView.cs | 8 +-
HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs | 6 +-
HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/View/PirView.cs | 1
HDL_ON/UI/UI2/FuntionControlView/Video/Send.cs | 115 ++++++++++++++++++++++++++++++++++++++
HDL_ON/HDL_ON.projitems | 1
5 files changed, 124 insertions(+), 7 deletions(-)
diff --git a/HDL_ON/HDL_ON.projitems b/HDL_ON/HDL_ON.projitems
index d78ef80..67e6d7f 100644
--- a/HDL_ON/HDL_ON.projitems
+++ b/HDL_ON/HDL_ON.projitems
@@ -388,6 +388,7 @@
<Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\EnvironmentalScience\EchartsOption_Pie.cs" />
<Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\PirDevice\SetPir.cs" />
<Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\1ContorlPage\AcControlPage_AddIrButton.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\Video\Send.cs" />
</ItemGroup>
<ItemGroup>
<Folder Include="$(MSBuildThisFileDirectory)DAL\" />
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs
index 3572fd7..3560fd2 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs
@@ -116,8 +116,8 @@
//push.frameLayout.Height = Application.GetRealHeight(50);
//push.frameLayout.SetCornerWithSameRadius(Application.GetRealHeight(12), HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerTopRight);
//push.btnText.TextID = StringId.push;
- //push.btnNextIcon.Width = Application.GetMinRealAverage(36);
- //push.btnNextIcon.Height = Application.GetMinRealAverage(36);
+ //push.btnNextIcon.Width = Application.GetRealWidth(36);
+ //push.btnNextIcon.Height = Application.GetRealWidth(36);
//push.btnNextIcon.X = Application.GetRealWidth(305);
//push.btnNextIcon.UnSelectedImagePath = "LogicIcon/off.png";
//push.btnNextIcon.SelectedImagePath = "LogicIcon/on.png";
@@ -128,7 +128,7 @@
//notification.btnText.TextID = StringId.notification;
//viewLayout.AddChidren(notification.FLayoutView());
/////涓婁笅闂撮殧62鍍忕礌
- //viewLayout.AddChidren(new FrameLayout { Height = Application.GetRealHeight(62) });
+ //viewLayout.AddChidren(new FrameLayout { Height = Application.GetRealHeight(40) });
#endregion
#region 淇濆瓨
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/SingleLogicView.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/SingleLogicView.cs
index e1487c5..2a67225 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/SingleLogicView.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/SingleLogicView.cs
@@ -48,8 +48,8 @@
/// </summary>
public Button btnStateIcon = new Button
{
- Width = Application.GetMinRealAverage(28),
- Height = Application.GetMinRealAverage(28),
+ Width = Application.GetRealWidth(28),
+ Height = Application.GetRealWidth(28),
Y = Application.GetRealHeight(8),
X = Application.GetRealWidth(TextSize.left12),
@@ -60,8 +60,8 @@
public Button btnLienIcon = new Button
{
- Width = Application.GetMinRealAverage(20),
- Height = Application.GetMinRealAverage(20),
+ Width = Application.GetRealWidth(20),
+ Height = Application.GetRealWidth(20),
Y = Application.GetRealHeight(66),
X = Application.GetRealWidth(48),
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/View/PirView.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/View/PirView.cs
index 8c536c0..d2fe09a 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/View/PirView.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/View/PirView.cs
@@ -147,6 +147,7 @@
geBtn.Width = geBtn.GetTextWidth();
devfLayout.AddChidren(sumBtn);
sumBtn.X = geBtn.Right;
+ sumBtn.TextAlignment = TextAlignment.CenterLeft;
devfLayout.AddChidren(stateIconBtn);
devfLayout.AddChidren(stateTextBtn);
devfLayout.AddChidren(lineBtn);
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Video/Send.cs b/HDL_ON/UI/UI2/FuntionControlView/Video/Send.cs
new file mode 100644
index 0000000..d04a166
--- /dev/null
+++ b/HDL_ON/UI/UI2/FuntionControlView/Video/Send.cs
@@ -0,0 +1,115 @@
+锘縰sing System;
+using System.IO;
+using System.Net;
+
+namespace HDL_ON.UI.UI2.FuntionControlView.Video
+{
+ public class Send
+ {
+ public Send()
+ {
+ }
+
+ ///// <summary>
+ ///// 鑾峰彇鍙瀵硅鍒楄〃
+ ///// </summary>
+ //static async System.Threading.Tasks.Task<List<VideoCalss>> GetVideoInfoList(CloudsVideo clouds)
+ //{
+ // List<VideoCalss> eSVideoInfosList = new List<VideoCalss>();
+ // var jobject = new JObject();
+ // jobject.Add("cmtID", clouds.FLCommunityID);
+ // jobject.Add("unitno", clouds.FLBuildingID);
+ // jobject.Add("method", "getUUIDList");
+ // var url = "http://112.74.164.111:180/api.php/Device/getmonitorUUID";
+ // var str = await Send.HttpWebRequest(url, jobject.ToString(), "POST");
+ // if (string.IsNullOrEmpty(str))
+ // {
+ // return eSVideoInfosList;
+ // }
+ // var json = JObject.Parse(str);
+ // if (json == null)
+ // {
+ // return eSVideoInfosList;
+ // }
+ // if (json["resCode"].ToString() != "0")
+ // {
+ // return eSVideoInfosList;
+ // }
+ // var list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Dictionary<string, string>>>(json["list"].ToString());
+ // if (list.Count == 0)
+ // {
+ // return eSVideoInfosList;
+ // }
+ // foreach (var videoInfo in list)
+ // {
+ // VideoCalss eSVideoInfo = new VideoCalss();
+ // eSVideoInfo.ESRoomID = int.Parse(clouds.FLRoomID);
+ // string str1 = clouds.FLBuildingID.Substring(0, 2).TrimStart('0');
+ // string str2 = clouds.FLBuildingID.Substring(2, 2).TrimStart('0');
+ // eSVideoInfo.RoomName = str1 + Language.StringByID(R.MyInternationalizationString.dong) + str2 + Language.StringByID(R.MyInternationalizationString.unit);
+ // eSVideoInfo.DeviceName = videoInfo["aliasName"];
+ // if (videoInfo["uuid"].Contains(","))
+ // {
+ // var uuid = videoInfo["uuid"].Split(',');
+ // eSVideoInfo.ESVideoUUID = uuid[0];
+ // }
+ // else
+ // {
+ // eSVideoInfo.ESVideoUUID = videoInfo["uuid"];
+ // }
+ // eSVideoInfosList.Add(eSVideoInfo);
+ // }
+ // return eSVideoInfosList;
+ //}
+
+ ///// <summary>
+ ///// 璇锋眰鏈嶅姟鍣ㄧ殑鏂规硶(鏀寔璇锋眰鏂瑰紡涓篜OST/GET)
+ ///// </summary>
+ ///// <param name="getUrl">璇锋眰鐨勫湴鍧�</param>
+ ///// <param name="str">璇锋眰鏁版嵁</param>
+ ///// <param name="method">璇锋眰鏂瑰紡涓篜OST/GET</param>
+ ///// <param name="second">瓒呮椂鏃堕棿</param>
+ ///// <returns></returns>
+ //public static async System.Threading.Tasks.Task<string> HttpWebRequest(string getUrl, string str, string method, int second = 3, bool _bool = false)
+ //{
+ // try
+ // {
+ // HttpWebRequest request = WebRequest.Create(getUrl) as HttpWebRequest; //鍒涘缓璇锋眰
+ // request.Method = method; //璇锋眰鏂瑰紡涓篜OST/GET
+ // request.ContentType = "application/json";
+ // request.Timeout = second * 1000;//瓒呮椂鏃堕棿
+ // if (_bool)
+ // {
+ // //鐢ㄤ簬楂樿儨鍙瀵硅鎺ュ彛
+ // request.Headers.Add("Authorization", Config.Instance.Token);
+ // }
+ // if (method == "POST")
+ // {
+ // byte[] jsonbyte = System.Text.Encoding.UTF8.GetBytes(str);
+ // request.ContentLength = jsonbyte.Length;
+ // Stream postStream = request.GetRequestStream();
+ // postStream.Write(jsonbyte, 0, jsonbyte.Length);
+ // postStream.Close();
+ // }
+ // //鍙戦�佽姹傚苟鑾峰彇鐩稿簲鍥炲簲鏁版嵁
+ // HttpWebResponse res;
+ // try
+ // {
+ // res = (HttpWebResponse)request.GetResponse();
+ // }
+ // catch (WebException ex)
+ // {
+ // res = (HttpWebResponse)ex.Response;
+ // }
+ // StreamReader sr = new StreamReader(res.GetResponseStream(), System.Text.Encoding.UTF8);
+ // string content = sr.ReadToEnd(); //鑾峰緱鍝嶅簲瀛楃涓�
+ // return content;
+ // }
+ // catch
+ // {
+ // return null;
+ // }
+ // }
+
+ }
+}
--
Gitblit v1.8.0