From 4b378188ce972df432b23d9cb73babb6cc0679c6 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期五, 17 一月 2020 14:56:15 +0800
Subject: [PATCH] 合并代码 ver.10086
---
ZigbeeApp/Shared/Phone/Device/Logic/Send.cs | 32 ++++++++++++++++++--------------
1 files changed, 18 insertions(+), 14 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs b/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs
index c8b31b4..ef0c136 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs
@@ -479,6 +479,7 @@
{
["Type"] = int.Parse(dictionary["Type"]),
["Account"] = dictionary["Account"],
+ ["AccountName"] = dictionary["AccountName"],
["UserId"] = dictionary["UserId"],
};
@@ -723,7 +724,11 @@
var room = new Common.Room();
btnregionname.Text = room.GetRoomNameByDevice(device);
}
-
+ /// <summary>
+ /// 鎵惧嚭妤煎眰鎵�鏈夋埧闂�
+ /// </summary>
+ /// <param name="floorId">妤煎眰ID</param>
+ /// <returns></returns>
public static List<Common.Room> GetRoomList(string floorId)
{
return Common.Room.Lists.FindAll((obj) => obj.FloorId == floorId);
@@ -750,8 +755,6 @@
/////杩斿洖鎴块棿鍒楄〃锛�
//return list1;
}
-
-
/// <summary>
/// 鑾峰彇鍦烘櫙淇℃伅鐨勬柟娉�
/// </summary>
@@ -1013,16 +1016,7 @@
lockifon.doorlockmac = residential.doorlockmac;
return await WebClientAsync(2, lockifon.Url, lockifon);
}
-
- //鎵撳嵃NameValueCollection()鏄剧ず绱㈠紩, 閿�,鍊�
- public static void PrintKeysAndValues2(NameValueCollection myCol)
- {
- for (int i = 0; i < myCol.Count; i++)
- {
- //鎵撳嵃鏄剧ず绱㈠紩, 閿�,鍊�
- Console.WriteLine("[{0}]{1,-10} {2}", i, myCol.GetKey(i), myCol.Get(i));
- }
- }
+ #region 瀹氫箟瑙ｆ瀽闂ㄩ攣鐨勫璞�
public class Residential
{
/// <summary>
@@ -1116,7 +1110,6 @@
public bool IsFreezeUser;
}
-
/// <summary>
/// 闂ㄩ攣鍒楄〃
/// </summary>
@@ -1130,6 +1123,8 @@
/// </summary>
public static UserCenter.MemberInfoRes UserMemberInfoRes = null;
#endregion
+ #endregion
+
/// <summary>
/// 鑷繁鐢�
/// </summary>
@@ -1199,6 +1194,15 @@
jObject.Add("LogicID", Common.Logic.CurrentLogic.LogicId);
}
break;
+ case "璇诲彇浜戠闂ㄩ攣鏁版嵁":
+ {
+ jObject.Add("RequestVersion", CommonPage.RequestVersion);
+ jObject.Add("HomeId", Config.Instance.HomeId);
+ jObject.Add("DoorLockId", obj.ToString());//闂ㄩ攣Mac+绔彛
+ jObject.Add("PageSetting.PageSize", Int32.MaxValue.ToString());
+ }
+ break;
+
}
return await HttpWebRequest(getUrl, jObject.ToString(), method);
}
--
Gitblit v1.8.0