From 4ce5177289b1d34e467de9d8790836559cc5a09e Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 18 十一月 2019 18:06:28 +0800
Subject: [PATCH] 合并了全部的代码
---
ZigbeeApp/Shared/Phone/Device/Logic/Send.cs | 12 +++++-------
1 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs b/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs
index baa7047..8c9a7fd 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs
@@ -841,7 +841,7 @@
public static async System.Threading.Tasks.Task<string> ReadUserList(string doorlockMac)
{
- string s = null;
+ string s = null;
var str = await WebClientAsync(0, CommonPage.RequestHttpsHost+"/App/GetHomePager");//涓嶅悓鍖哄煙鍩熷悕鍓嶇紑涓嶄竴鏍�
// var str = await WebClientAsync(0, "https://global.hdlcontrol.com/HangZhouHdlCloudApi/App/GetHomePager");
var jObject = JObject.Parse(str);
@@ -886,7 +886,7 @@
}
return s;
}
-
+
public static async System.Threading.Tasks.Task<string> ReadUserDoorLock(Residential residential)
{
@@ -922,7 +922,7 @@
if (value == 0)
{
postValues.Add("RequestVersion", CommonPage.RequestVersion);
- postValues.Add("ReqDto.LoginAccessToken", Config.Instance.Token);
+ postValues.Add("ReqDto.LoginAccessToken", Config.Instance.Token);
postValues.Add("ReqDto.PageSetting.PageSize", Int32.MaxValue.ToString());//
}
@@ -939,7 +939,7 @@
postValues.Add("LoginAccessToken", residential.Token);
postValues.Add("HomeId", residential.Id);
postValues.Add("DoorLockId", residential.doorlockmac);//闂ㄩ攣Mac
- postValues.Add("IsOtherAccountCtrl", residential.IsOtherAccountCtrl.ToString());
+ postValues.Add("IsOtherAccountCtrl", residential.IsOtherAccountCtrl.ToString());
postValues.Add("PageSetting.PageSize", Int32.MaxValue.ToString());
}
System.Net.WebClient webClient = new System.Net.WebClient();
@@ -972,7 +972,7 @@
public string doorlockmac;
}
- public class MembershipIfon
+ public class MembershipIfon
{
/// <summary>
/// 璇嗗埆鐢ㄦ埛韬唤
@@ -1036,12 +1036,10 @@
}
-
/// <summary>
/// 闂ㄩ攣鍒楄〃
/// </summary>
public static List<MembershipIfon> LockList = new List<MembershipIfon>();
-
/// <summary>
/// 褰撳墠闂ㄩ攣
/// </summary>
--
Gitblit v1.8.0