Merge branch 'WJC' into temp-wxr

wxr

2021-03-26 311aa775e05f567795e9cc131c67310b3bb133aa

Merge branch 'WJC' into temp-wxr

 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\" />


 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  保存

 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),


 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);

 HDL_ON/UI/UI2/FuntionControlView/Video/Send.cs

New file
@@ -0,0 +1,115 @@
using 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>
        /////  请求服务器的方法(支持请求方式为POST/GET)
        ///// </summary>
        ///// <param name="getUrl">请求的地址</param>
        ///// <param name="str">请求数据</param>
        ///// <param name="method">请求方式为POST/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; //请求方式为POST/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;
        //    }
       // }

    }
}