From 9f326f4000847e6167d8166fa2f6a66f53cb3734 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 17 十二月 2020 09:07:13 +0800
Subject: [PATCH] 新云端Ver1.3
---
ZigbeeApp/Shared/Phone/Device/Logic/Send.cs | 216 ++++++++++++++++++++++++++---------------------------
1 files changed, 107 insertions(+), 109 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs b/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs
index 1f50bbe..e092601 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];
@@ -825,14 +825,14 @@
var AllUserIfon = await ReadUserListIfon(doorlockMac);
var currUserIfon = new MembershipIfon();
currUserIfon.CloudAccountId = Config.Instance.Guid;
- if (string.IsNullOrEmpty(UserCenter.UserCenterResourse.UserInfo.UserName))
+ if (string.IsNullOrEmpty(HdlUserCenterResourse.UserInfo.NickName))
{
///濡傛灉鏄电О涓虹┖锛屾鏃讹紝鐧婚檰璐﹀彿涓洪粯璁ゆ樀绉帮紱
- currUserIfon.UserName = UserCenter.UserCenterResourse.UserInfo.Account;
+ currUserIfon.UserName = HdlUserCenterResourse.UserInfo.Account;
}
else
{
- currUserIfon.UserName = UserCenter.UserCenterResourse.UserInfo.UserName;
+ currUserIfon.UserName = HdlUserCenterResourse.UserInfo.NickName;
}
foreach (var o in AllUserIfon)
{
@@ -860,44 +860,38 @@
userlist.Add(currUserIfon);
}
- if (UserCenter.UserCenterResourse.UserInfo.AuthorityNo != 3)
+ if (HdlUserCenterResourse.ResidenceOption.AuthorityNo != 3)
{
- var pra = new UserCenter.MemberListInfoPra();
- string result = "";
+ List<MemberInfoRes> listInfo = null;
if (AllUserIfon.Count != 0)
{
//鏈嶅姟杩斿洖鏉ユ病鏈夐棬閿佹垚鍛樹俊鎭紝娌℃湁蹇呰鍐嶅幓璇锋眰鎴愬憳鍒楄〃锛�
//鍘熷洜锛氳妭绾︽椂闂达紝浣撻獙鏁堟灉濂斤紱
- result = UserCenter.UserCenterLogic.GetResponseDataByRequestHttps("ZigbeeUsers/GetSubAccountByDistributedMark", false, pra);
- }
- if (string.IsNullOrEmpty(result))
- {
- //闃叉涓虹┖鎶涘紓甯革紱
- return userlist;
+ listInfo = HdlMemberLogic.Current.GetMemberListInfo();
}
- var listInfo = Newtonsoft.Json.JsonConvert.DeserializeObject<List<UserCenter.MemberInfoRes>>(result);
- if (listInfo == null)
- {
- //闃叉涓虹┖鎶涘紓甯革紱
+ if (listInfo == null)
+ {
+ //闃叉涓虹┖鎶涘紓甯革紱
return userlist;
}
for (int i = 0; i < listInfo.Count; i++)
{
var userIfon = new MembershipIfon();
- var user = listInfo[i];
- userIfon.CloudAccountId = user.SubAccountDistributedMark;
- if (string.IsNullOrEmpty(user.UserName))
- {
- ///濡傛灉鏄电О涓虹┖锛屾鏃讹紝鐧婚檰璐﹀彿涓洪粯璁ゆ樀绉帮紱
- userIfon.UserName = user.Account;
+ //鈽嗐優銉笺偗鈽�
+ //var user = listInfo[i];
+ //userIfon.CloudAccountId = user.SubAccountDistributedMark;
+ //if (string.IsNullOrEmpty(user.UserName))
+ //{
+ // ///濡傛灉鏄电О涓虹┖锛屾鏃讹紝鐧婚檰璐﹀彿涓洪粯璁ゆ樀绉帮紱
+ // userIfon.UserName = user.Account;
- }
- else
- {
- userIfon.UserName = user.UserName;
+ //}
+ //else
+ //{
+ // userIfon.UserName = user.UserName;
- }
+ //}
for (int j = 0; j < AllUserIfon.Count; j++)
{
if (AllUserIfon[j].IsFreezeUser || string.IsNullOrEmpty(AllUserIfon[j].UserId))
@@ -909,25 +903,27 @@
{
userIfon.DoorLockMacPort = AllUserIfon[j].DoorLockMacPort;
}
+ //鈽嗐優銉笺偗鈽�
///鏌ユ壘鎴愬憳浠ュ強鎴愬憳闂ㄩ攣瑙﹀彂婧�(1鎸夐敭/3鍗�/15鎸囩汗)
- if (user.SubAccountDistributedMark == AllUserIfon[j].CloudAccountId)
- {
- UnlockingMode unlockingMode = new UnlockingMode();
- unlockingMode.OpenMode = AllUserIfon[j].OpenMode;
- unlockingMode.UserId = AllUserIfon[j].UserId;
- unlockingMode.ModeName = AllUserIfon[j].ModeName;
- userIfon.UserIdMode.Add(unlockingMode);
- }
+ //if (user.SubAccountDistributedMark == AllUserIfon[j].CloudAccountId)
+ //{
+ // UnlockingMode unlockingMode = new UnlockingMode();
+ // unlockingMode.OpenMode = AllUserIfon[j].OpenMode;
+ // unlockingMode.UserId = AllUserIfon[j].UserId;
+ // unlockingMode.ModeName = AllUserIfon[j].ModeName;
+ // userIfon.UserIdMode.Add(unlockingMode);
+ //}
}
if (userIfon.UserIdMode.Count != 0)
{
+ //鈽嗐優銉笺偗鈽�
///杩囨护鎺夐噸澶嶆暟鎹紱
- var str = userlist.Find((c) => { return c.CloudAccountId == user.SubAccountDistributedMark; });
- if (str == null)
- {
- userlist.Add(userIfon);
- }
+ //var str = userlist.Find((c) => { return c.CloudAccountId == user.SubAccountDistributedMark; });
+ //if (str == null)
+ //{
+ // userlist.Add(userIfon);
+ //}
}
}
@@ -969,7 +965,7 @@
public static async System.Threading.Tasks.Task<string> ReadUserList(string doorlockMac)
{
string s = null;
- var str = await WebClientAsync(0, CommonPage.RequestHttpsHost + "/App/GetHomePager");//涓嶅悓鍖哄煙鍩熷悕鍓嶇紑涓嶄竴鏍�
+ var str = await WebClientAsync(0, HdlHttpLogic.Current.RequestHttpsHost + "/App/GetHomePager");//涓嶅悓鍖哄煙鍩熷悕鍓嶇紑涓嶄竴鏍�
var jObject = JObject.Parse(str);
if (jObject == null || jObject["StateCode"].ToString() != "Success")
@@ -994,12 +990,12 @@
residential.MainUserDistributedMark = data["MainUserDistributedMark"].ToString();
residential.IsOtherAccountCtrl = true;
residential.doorlockmac = doorlockMac;
- residential.Url = CommonPage.RequestHttpsHost + "/App/GetSharedHomeApiControl";
+ residential.Url = HdlHttpLogic.Current.RequestHttpsHost + "/App/GetSharedHomeApiControl";
s = await ReadUserDoorLock(residential);
}
else
{
- residential.Url = CommonPage.RequestHttpsHost + "/DoorLock/GetDoorLockPager";
+ residential.Url = HdlHttpLogic.Current.RequestHttpsHost + "/DoorLock/GetDoorLockPager";
residential.Token = Config.Instance.Token;
residential.Id = Config.Instance.HomeId;
residential.IsOtherAccountCtrl = false;
@@ -1138,7 +1134,7 @@
/// <summary>
/// 褰撳墠鐢ㄦ埛鐨勪俊鎭�
/// </summary>
- public static UserCenter.MemberInfoRes UserMemberInfoRes = null;
+ public static MemberInfoRes UserMemberInfoRes = null;
#endregion
/// <summary>
@@ -1189,17 +1185,19 @@
{
var getUrl = "";
var jObject = new JObject();
- if (UserCenter.UserCenterResourse.UserInfo.AuthorityNo == 1)
+ if (HdlUserCenterResourse.ResidenceOption.AuthorityNo == 1)
{
- getUrl = CommonPage.RequestHttpsHost + url;//璇锋眰鍦板潃锛�
+ //鈽嗐優銉笺偗鈽�
+ //getUrl = HdlHttpLogic.Current.RequestHttpsHost + url;//璇锋眰鍦板潃锛�
jObject.Add("IsOtherAccountCtrl", false);
jObject.Add("LoginAccessToken", Config.Instance.Token);
}
else
{
- getUrl = Config.Instance.AdminRequestBaseUrl + url;//璇锋眰鍦板潃锛�
+ //鈽嗐優銉笺偗鈽�
+ //getUrl = Config.Instance.AdminRequestBaseUrl + url;//璇锋眰鍦板潃锛�
jObject.Add("IsOtherAccountCtrl", true);
- jObject.Add("LoginAccessToken", Config.Instance.AdminRequestToken);
+ //jObject.Add("LoginAccessToken", Config.Instance.AdminRequestToken);
}
switch (command)
{
@@ -1234,42 +1232,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 +1317,7 @@
#endregion
#region 瀛樺彇鏈湴鏂囦欢鐨勬柟娉� ---鏆傛椂涓嶇敤鍚堝苟璇ユ柟娉�---
- /// <summary>
+ /// <summary>
/// 鍒ゆ柇鏄惁寮�鍚疓PS鏈嶅姟
/// </summary>
public static string If_Exist
@@ -1337,43 +1335,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