From 25429f085093d89d543a0b90e30d0d62d1b7dac9 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期二, 30 八月 2022 09:37:38 +0800
Subject: [PATCH] 合并了IOS的代码
---
ZigbeeApp/Shared/Phone/Device/Logic/Send.cs | 138 +++++++++++++++++++++++-----------------------
1 files changed, 69 insertions(+), 69 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs b/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs
index 1f50bbe..2e07547 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs
@@ -656,7 +656,7 @@
return await System.Threading.Tasks.Task.Run(async () =>
{
- var listLogic = new List<Common.Logic>();
+ var listLogic = new List<Common.Logic>();
Action<string, string> action = (topic, data) =>
{
var gatewayID = topic.Split('/')[0];
@@ -869,16 +869,16 @@
//鏈嶅姟杩斿洖鏉ユ病鏈夐棬閿佹垚鍛樹俊鎭紝娌℃湁蹇呰鍐嶅幓璇锋眰鎴愬憳鍒楄〃锛�
//鍘熷洜锛氳妭绾︽椂闂达紝浣撻獙鏁堟灉濂斤紱
result = UserCenter.UserCenterLogic.GetResponseDataByRequestHttps("ZigbeeUsers/GetSubAccountByDistributedMark", false, pra);
- }
- if (string.IsNullOrEmpty(result))
- {
- //闃叉涓虹┖鎶涘紓甯革紱
+ }
+ if (string.IsNullOrEmpty(result))
+ {
+ //闃叉涓虹┖鎶涘紓甯革紱
return userlist;
}
- var listInfo = Newtonsoft.Json.JsonConvert.DeserializeObject<List<UserCenter.MemberInfoRes>>(result);
- if (listInfo == null)
- {
- //闃叉涓虹┖鎶涘紓甯革紱
+ var listInfo = Newtonsoft.Json.JsonConvert.DeserializeObject<List<UserCenter.MemberInfoRes>>(result);
+ if (listInfo == null)
+ {
+ //闃叉涓虹┖鎶涘紓甯革紱
return userlist;
}
for (int i = 0; i < listInfo.Count; i++)
@@ -1234,42 +1234,42 @@
/// <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;
+ 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;
+ {
+ return null;
}
}
/// <summary>
@@ -1319,7 +1319,7 @@
#endregion
#region 瀛樺彇鏈湴鏂囦欢鐨勬柟娉� ---鏆傛椂涓嶇敤鍚堝苟璇ユ柟娉�---
- /// <summary>
+ /// <summary>
/// 鍒ゆ柇鏄惁寮�鍚疓PS鏈嶅姟
/// </summary>
public static string If_Exist
@@ -1337,43 +1337,43 @@
}
/// <summary>
- /// 鏂囦欢淇濆瓨
- /// </summary>
- /// <param name="FileName">鏂囦欢璺緞</param>
- /// <param name="obj">闇�瑕佸簭鍒楀寲鏁版嵁</param>
- public static void SaveLocalFile(string FileName, object obj)
- {
- //鍏堝簭鍒楀寲鏁版嵁锛�
- var data = Newtonsoft.Json.JsonConvert.SerializeObject(obj);
- //鏁版嵁杞崲涓哄瓧鑺傛祦锛�
- var byteData = System.Text.Encoding.UTF8.GetBytes(data);
- //鍐欏叆鏁版嵁锛�
- Shared.IO.FileUtils.WriteFileByBytes(FileName, byteData);
- }
+ /// 鏂囦欢淇濆瓨
+ /// </summary>
+ /// <param name="FileName">鏂囦欢璺緞</param>
+ /// <param name="obj">闇�瑕佸簭鍒楀寲鏁版嵁</param>
+ public static void SaveLocalFile(string FileName, object obj)
+ {
+ //鍏堝簭鍒楀寲鏁版嵁锛�
+ var data = Newtonsoft.Json.JsonConvert.SerializeObject(obj);
+ //鏁版嵁杞崲涓哄瓧鑺傛祦锛�
+ var byteData = System.Text.Encoding.UTF8.GetBytes(data);
+ //鍐欏叆鏁版嵁锛�
+ Shared.IO.FileUtils.WriteFileByBytes(FileName, byteData);
+ }
/// <summary>
/// 鏂囦欢淇濆瓨
/// </summary>
/// <param name="FileName">鏂囦欢璺緞</param>
/// <param name="data">瀛楃涓�</param>
public static void SaveLocalFile(string FileName, string data)
- {
+ {
//鍏堝簭鍒楀寲鏁版嵁锛�
//鏁版嵁杞崲涓哄瓧鑺傛祦锛�
var byteData = System.Text.Encoding.UTF8.GetBytes(data);
//鍐欏叆鏁版嵁锛�
Shared.IO.FileUtils.WriteFileByBytes(FileName, byteData);
}
- /// <summary>
- /// 鏂囦欢璇诲彇
- /// </summary>
- /// <param name="FileName">鏂囦欢璺緞</param>
- /// <returns></returns>
- public static string ReadLocalFile(string FileName)
- {
- //璇诲嚭淇濆瓨璇ヨ矾寰勭殑鏂囦欢锛�
- var varByte = Shared.IO.FileUtils.ReadFile(FileName);
- //瀛楄妭娴佽浆鎹负瀛楃涓诧紱
- return System.Text.Encoding.UTF8.GetString(varByte);
+ /// <summary>
+ /// 鏂囦欢璇诲彇
+ /// </summary>
+ /// <param name="FileName">鏂囦欢璺緞</param>
+ /// <returns></returns>
+ public static string ReadLocalFile(string FileName)
+ {
+ //璇诲嚭淇濆瓨璇ヨ矾寰勭殑鏂囦欢锛�
+ var varByte = Shared.IO.FileUtils.ReadFile(FileName);
+ //瀛楄妭娴佽浆鎹负瀛楃涓诧紱
+ return System.Text.Encoding.UTF8.GetString(varByte);
}
#endregion
--
Gitblit v1.8.0