陈嘉乐
2021-03-26 feaf4e79e8a75b277910b5cfb15b4c71d605841b
2021-3-26-1
1个文件已添加
5个文件已修改
155 ■■■■ 已修改文件
.vs/HDL_APP_Project/xs/UserPrefs.xml 23 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/HDL_ON.projitems 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/SingleLogicView.cs 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/View/PirView.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/FuntionControlView/Video/Send.cs 115 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,15 +1,13 @@
<Properties StartupConfiguration="{09712674-2A38-407B-B1E2-560B2C352F9A}|Default">
  <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddButton.cs">
  <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Method.cs">
    <Files>
      <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/BrandList.cs" Line="132" Column="58" IsPinned="True" />
      <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirSend.cs" Line="153" Column="28" IsPinned="True" />
      <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Method.cs" Line="393" Column="20" />
      <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs" Line="271" Column="21" />
      <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs" Line="215" Column="23" />
      <File FileName="HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs" Line="504" Column="54" />
      <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddButton.cs" Line="137" Column="29" />
      <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddControl.cs" Line="12" Column="27" />
      <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs" Line="1" Column="1" />
      <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddControlComplete.cs" Line="62" Column="44" />
      <File FileName="../HomeApp/ZigbeeApp/Shared/Phone/Device/VideoIntercom/VideoMachine.cs" Line="264" Column="53" />
      <File FileName="HDL_ON/UI/UI2/FuntionControlView/Video/Send.cs" Line="23" Column="83" />
      <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs" Line="285" Column="34" />
      <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirSend.cs" Line="127" Column="57" />
      <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/View/PirView.cs" Line="1" Column="1" />
      <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Method.cs" Line="65" Column="155" />
    </Files>
    <Pads>
      <Pad Id="ProjectPad">
@@ -35,9 +33,12 @@
                  <Node name="4-PersonalCenter" expanded="True">
                    <Node name="PirDevice" expanded="True">
                      <Node name="View" expanded="True" />
                      <Node name="AddButton.cs" selected="True" />
                      <Node name="Method.cs" selected="True" />
                    </Node>
                  </Node>
                  <Node name="FuntionControlView" expanded="True">
                    <Node name="Video" expanded="True" />
                  </Node>
                </Node>
              </Node>
            </Node>
HDL_ON/HDL_ON.projitems
@@ -387,6 +387,7 @@
    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\EnvironmentalScience\EnvironmentalPage.cs" />
    <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\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
@@ -50,7 +50,7 @@
        /// <summary>
        /// 当前个数
        /// </summary>
        public Button geBtn = new Button
        public TextButton geBtn = new TextButton
        {
            Y = Application.GetRealHeight(40),
            X = Application.GetRealWidth(72),
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;
        //    }
       // }
    }
}