From 3dcbd186c42c598c0c08d1cd37034cf2baa09e54 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 30 十二月 2019 15:47:51 +0800
Subject: [PATCH] 合并了代码
---
ZigbeeApp/Shared/Phone/Device/Logic/Send.cs | 233 +++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 166 insertions(+), 67 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs b/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs
index 9f6f14d..93dc41f 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs
@@ -5,6 +5,8 @@
using ZigBee.Common;
using Shared.Common;
using System.Collections.Specialized;
+using System.Net;
+using System.IO;
namespace Shared.Phone.Device.Logic
{
@@ -99,8 +101,8 @@
var Logicifon = jObjectdata["Data"];
logic.LogicId = int.Parse(Logicifon["LogicId"]?.ToString());
logic.IsEnable = int.Parse(Logicifon["IsEnable"]?.ToString());
- logic.LogicName = Logicifon["LogicName"]?.ToString();
-
+ logic.LogicName = Logicifon["LogicName"]?.ToString();
+ logic.LogicCustomPushText = Logicifon["LogicCustomPushText"].ToString();
logic.Relationship = int.Parse(Logicifon["Relationship"]?.ToString());
logic.TimeAttribute = Newtonsoft.Json.JsonConvert.DeserializeObject<TimeAttributeObj>(Logicifon["TimeAttribute"].ToString());
logic.Conditions = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Dictionary<string, string>>>(Logicifon["Conditions"].ToString());
@@ -620,7 +622,8 @@
logic.IsEnable = int.Parse(Logicifon["IsEnable"].ToString());
logic.LogicName = Logicifon["LogicName"].ToString();
logic.LogicType = int.Parse(Logicifon["LogicType"].ToString());
- logic.Relationship = int.Parse(Logicifon["Relationship"].ToString());
+ logic.Relationship = int.Parse(Logicifon["Relationship"].ToString());
+ logic.LogicCustomPushText = Logicifon["LogicCustomPushText"].ToString();
logic.TimeAttribute = Newtonsoft.Json.JsonConvert.DeserializeObject<Common.TimeAttributeObj>(Logicifon["TimeAttribute"].ToString());
logic.Conditions = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Dictionary<string, string>>>(Logicifon["Conditions"].ToString());
logic.Accounts = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Dictionary<string, string>>>(Logicifon["Accounts"].ToString());
@@ -708,7 +711,7 @@
});
}
// <summary>
- /// 閫氳繃璁惧鎵惧埌鍖哄煙(鎴块棿)鍚嶇О
+ /// 閫氳繃璁惧鎵惧埌鍖哄煙(鎴块棿)鍚嶇О
/// </summary>
/// <param name="btnregionname">Btnregionname.</param>
/// <param name="device">Device.</param>
@@ -1008,47 +1011,15 @@
return await WebClientAsync(2, lockifon.Url, lockifon);
}
- /// <summary>
- /// 璇锋眰鏈嶅姟鍣ㄧ殑鏂规硶
- /// </summary>
- /// <param name="postValues">post鍙傛暟</param>
- /// <param name="url"></param>
- /// <returns></returns>
- public static async System.Threading.Tasks.Task<string> WebClientAsync(int value, string url, Residential residential = null)
+ //鎵撳嵃NameValueCollection()鏄剧ず绱㈠紩, 閿�,鍊�
+ public static void PrintKeysAndValues2(NameValueCollection myCol)
{
-
- NameValueCollection postValues = new NameValueCollection();
-
- if (value == 0)
+ for (int i = 0; i < myCol.Count; i++)
{
- postValues.Add("RequestVersion", CommonPage.RequestVersion);
- postValues.Add("ReqDto.LoginAccessToken", Config.Instance.Token);
- postValues.Add("ReqDto.PageSetting.PageSize", Int32.MaxValue.ToString());//
-
+ //鎵撳嵃鏄剧ず绱㈠紩, 閿�,鍊�
+ Console.WriteLine("[{0}]{1,-10} {2}", i, myCol.GetKey(i), myCol.Get(i));
}
- else if (value == 1)
- {
- postValues.Add("RequestVersion", CommonPage.RequestVersion);
- postValues.Add("LoginAccessToken", Config.Instance.Token);
- postValues.Add("MainAccountId", residential.MainUserDistributedMark);
- postValues.Add("SharedHid", residential.Id);
- }
- else if (value == 2)
- {
- postValues.Add("RequestVersion", CommonPage.RequestVersion);
- postValues.Add("LoginAccessToken", residential.Token);
- postValues.Add("HomeId", residential.Id);
- postValues.Add("DoorLockId", residential.doorlockmac);//闂ㄩ攣Mac+绔彛
- postValues.Add("IsOtherAccountCtrl", residential.IsOtherAccountCtrl.ToString());
- postValues.Add("PageSetting.PageSize", Int32.MaxValue.ToString());
- }
- System.Net.WebClient webClient = new System.Net.WebClient();
- byte[] responseArray = webClient.UploadValues(url, postValues);
- var s = System.Text.Encoding.UTF8.GetString(responseArray);
- return s;
-
}
-
public class Residential
{
/// <summary>
@@ -1157,38 +1128,166 @@
public static UserCenter.MemberInfoRes UserMemberInfoRes = null;
#endregion
- #region 瀛樺彇鏈湴鏂囦欢鐨勬柟娉� ---鏆傛椂涓嶇敤鍚堝苟璇ユ柟娉�---
+ #region 璇锋眰鏈嶅姟鍣ㄦ柟娉�---
/// <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>
- /// 鏂囦欢璇诲彇
- /// </summary>
- /// <param name="FileName">鏂囦欢璺緞</param>
+ /// <param name="command">璇嗗埆鍛戒护鍒ゆ柇瀛楃涓�</param>
+ /// <param name="url">璇锋眰鍦板潃</param>
+ /// <param name="method">璇锋眰鏂瑰紡涓篜OST/GET</param>
+ /// <param name="obj">瀛樺偍鍙戦�佹暟鎹殑瀵硅薄</param>
/// <returns></returns>
- public static string ReadLocalFile(string FileName)
+ public static async System.Threading.Tasks.Task<string>Data(string command, string url, string method, object obj = null)
{
- if (System.IO.File.Exists(FileName) == false)
+ var getUrl = CommonPage.RequestHttpsHost + url;//璇锋眰鍦板潃锛�
+ var jObject = new JObject();
+ if (UserCenter.UserCenterResourse.UserInfo.AuthorityNo == 1)
{
- ///鍒ゆ柇鏄惁鏈夋枃浠�;
- return null;
+ jObject.Add("IsOtherAccountCtrl", false);
}
- //璇诲嚭淇濆瓨璇ヨ矾寰勭殑鏂囦欢锛�
- var varByte = Shared.IO.FileUtils.ReadFile(FileName);
- //瀛楄妭娴佽浆鎹负瀛楃涓诧紱
- return System.Text.Encoding.UTF8.GetString(varByte);
+ else
+ {
+ jObject.Add("IsOtherAccountCtrl", true);
+ }
+ switch (command)
+ {
+ case "娣诲姞/鏇存柊":
+ {
+ jObject.Add("RequestVersion", CommonPage.RequestVersion);
+ jObject.Add("LoginAccessToken", Config.Instance.Token);
+ jObject.Add("HomeId", Config.Instance.HomeId);
+ jObject.Add("LogicID", Common.Logic.CurrentLogic.LogicId);
+ jObject.Add("PushUserIds", new JArray { Config.Instance.Guid });
+ jObject.Add("PushContent", Common.Logic.CurrentLogic.LogicCustomPushText);
+
+ }
+ break;
+ case "鍒犻櫎":
+ {
+ jObject.Add("RequestVersion", CommonPage.RequestVersion);
+ jObject.Add("LoginAccessToken", Config.Instance.Token);
+ jObject.Add("HomeId", Config.Instance.HomeId);
+ jObject.Add("LogicID", Common.Logic.CurrentLogic.LogicId);
+ }
+ break;
+ }
+ return await HttpWebRequest(getUrl, jObject.ToString(), method);
+ }
+ /// <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)
+ {
+ HttpWebRequest request = WebRequest.Create(getUrl) as HttpWebRequest; //鍒涘缓璇锋眰
+ request.Method = method; //璇锋眰鏂瑰紡涓篜OST/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();
+ }
+ //鍙戦�佽姹傚苟鑾峰彇鐩稿簲鍥炲簲鏁版嵁
+ 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;
+ }
+ /// <summary>
+ /// 璇锋眰鏈嶅姟鍣ㄧ殑鏂规硶
+ /// </summary>
+ /// <param name="value">鍖哄垎鍙戦�佸懡浠ょ殑鏁版嵁鍒ゆ柇鍊�</param>
+ /// <param name="url">璇锋眰鐨勫湴鍧�</param>
+ /// <param name="residential">瑁呮暟鎹殑瀵硅薄</param>
+ /// <returns></returns>
+ public static async System.Threading.Tasks.Task<string> WebClientAsync(int value, string url, Residential residential = null)
+ {
+ NameValueCollection postValues = new NameValueCollection();
+ switch (value)
+ {
+ case 0:
+ {
+ postValues.Add("RequestVersion", CommonPage.RequestVersion);
+ postValues.Add("ReqDto.LoginAccessToken", Config.Instance.Token);
+ postValues.Add("ReqDto.PageSetting.PageSize", Int32.MaxValue.ToString());//
+ }
+ break;
+ case 1:
+ {
+ postValues.Add("RequestVersion", CommonPage.RequestVersion);
+ postValues.Add("LoginAccessToken", Config.Instance.Token);
+ postValues.Add("MainAccountId", residential.MainUserDistributedMark);
+ postValues.Add("SharedHid", residential.Id);
+
+ }
+ break;
+ case 2:
+ {
+ postValues.Add("RequestVersion", CommonPage.RequestVersion);
+ postValues.Add("LoginAccessToken", residential.Token);
+ postValues.Add("HomeId", residential.Id);
+ postValues.Add("DoorLockId", residential.doorlockmac);//闂ㄩ攣Mac+绔彛
+ postValues.Add("IsOtherAccountCtrl", residential.IsOtherAccountCtrl.ToString());
+ postValues.Add("PageSetting.PageSize", Int32.MaxValue.ToString());
+ }
+ break;
+ }
+ //PrintKeysAndValues2(postValues);
+ System.Net.WebClient webClient = new System.Net.WebClient();
+ byte[] responseArray = webClient.UploadValues(url, postValues);
+ var s = System.Text.Encoding.UTF8.GetString(responseArray);
+ return s;
+ }
+ #endregion
+
+ #region 瀛樺彇鏈湴鏂囦欢鐨勬柟娉� ---鏆傛椂涓嶇敤鍚堝苟璇ユ柟娉�---
+ /// <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>
+ /// 鏂囦欢璇诲彇
+ /// </summary>
+ /// <param name="FileName">鏂囦欢璺緞</param>
+ /// <returns></returns>
+ public static string ReadLocalFile(string FileName)
+ {
+ if (System.IO.File.Exists(FileName) == false)
+ {
+ ///鍒ゆ柇鏄惁鏈夋枃浠�;
+ return null;
+ }
+ //璇诲嚭淇濆瓨璇ヨ矾寰勭殑鏂囦欢锛�
+ var varByte = Shared.IO.FileUtils.ReadFile(FileName);
+ //瀛楄妭娴佽浆鎹负瀛楃涓诧紱
+ return System.Text.Encoding.UTF8.GetString(varByte);
}
#endregion
}
--
Gitblit v1.8.0