From 23fb45dd846ed8b62304c408c6bbe64265d4ac8b Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期五, 20 十二月 2019 18:57:16 +0800
Subject: [PATCH] 代码合并
---
ZigbeeApp/Shared/Phone/Device/Account/AccountLogic.cs | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Account/AccountLogic.cs b/ZigbeeApp/Shared/Phone/Device/Account/AccountLogic.cs
index 97aaec9..da33ab7 100755
--- a/ZigbeeApp/Shared/Phone/Device/Account/AccountLogic.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Account/AccountLogic.cs
@@ -105,14 +105,14 @@
/// </summary>
/// <param name="lat"></param>
/// <param name="lon"></param>
- public async void ReceiveAppLatAndLon(string lat, string lon)
+ public async void ReceiveAppLatAndLon(string lon, string lat)
{
try
{
var requestObj = new SendDataToServer.ReceiveAppLatAndLonObj
{
- Latitude = lat,
- Longitude = lon
+ Longitude = lon,
+ Latitude = lat
};
var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(requestObj);
var revertObj = await RequestHttpsZigbeeAsync("ProcessRange/ReceiveAppLatAndLon", System.Text.Encoding.UTF8.GetBytes(requestJson));
@@ -177,8 +177,9 @@
public async System.Threading.Tasks.Task<byte[]> RequestHttpsZigbeeBytesResultAsync(string requestUrl, byte[] byteData, string requestMethod = "POST")
{
//璇锋眰Url鐨勫畬鎴愯矾寰�
- var fullUrl = $"{CommonPage.RequestHttpsHost}/{requestUrl}";
- return await CommonPage.Instance.DoRequestZigbeeHttpsInterface(fullUrl, byteData, Config.Instance.LoginToken, requestMethod);
+ var requestHost = "https://global.hdlcontrol.com/GeofenceService";
+ var fullUrl = $"{requestHost}/{requestUrl}";
+ return await CommonPage.Instance.DoRequestZigbeeHttpsInterface(fullUrl, byteData, Config.Instance.Token, requestMethod);
}
#endregion
--
Gitblit v1.8.0