请合并新代码，更改多功能面板绑定表重复问题

xm

2020-08-14 a45fe56aeeac8f28a9891b83362954067c8166dc

 ZigbeeApp/Shared/Phone/Device/Logic/Send.cs

@@ -1236,33 +1236,45 @@
        /// <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)
        public static async System.Threading.Tasks.Task<string> HttpWebRequest(string getUrl, string str, string method, int second = 3, bool _bool = false)
        {
            HttpWebRequest request = WebRequest.Create(getUrl) as HttpWebRequest; //创建请求
            request.Method = method; //请求方式为POST/GET
            request.ContentType = "application/json";
            request.Timeout = second * 1000;//超时时间
            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();
            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;

            }
            //发送请求并获取相应回应数据       
            HttpWebResponse res;
            try
            {
                res = (HttpWebResponse)request.GetResponse();
            catch
            {

                return null;

            }
            catch (WebException ex)
            {
                res = (HttpWebResponse)ex.Response;
            }
            StreamReader sr = new StreamReader(res.GetResponseStream(), System.Text.Encoding.UTF8);
            string content = sr.ReadToEnd(); //获得响应字符串
            return content;
        }
        /// <summary>
        /// 请求服务器的方法
@@ -1349,8 +1361,8 @@
        /// 判断字典是否存在的方法
        /// </summary>
        /// <param name="deviceConditionsInfo"></param>
        /// <param name="Key"></param>
        /// <param name="Value"></param>
        /// <param name="Key">键</param>
        /// <param name="Value">键值</param>
        public static void dictionary(Dictionary<string, string> deviceConditionsInfo, string Key, string Value)
        {
            if (deviceConditionsInfo.ContainsKey(Key))
@@ -1360,6 +1372,6 @@
            deviceConditionsInfo.Add(Key, Value);
        }


      
    }
}