From 25429f085093d89d543a0b90e30d0d62d1b7dac9 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期二, 30 八月 2022 09:37:38 +0800
Subject: [PATCH] 合并了IOS的代码
---
ZigbeeApp/Shared/Phone/Login/Logic/AccountLogic.cs | 24 ++++++++++++++++--------
1 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Login/Logic/AccountLogic.cs b/ZigbeeApp/Shared/Phone/Login/Logic/AccountLogic.cs
old mode 100755
new mode 100644
index c3889ad..35cc3f0
--- a/ZigbeeApp/Shared/Phone/Login/Logic/AccountLogic.cs
+++ b/ZigbeeApp/Shared/Phone/Login/Logic/AccountLogic.cs
@@ -38,7 +38,7 @@
/// <returns></returns>
public bool CheckEmail(string email)
{
- var regex= new Regex(CommonPage.EmailRegexStr);
+ var regex= new Regex(CommonPage.EmailRegexStr);
return regex.IsMatch(email);
}
@@ -115,7 +115,15 @@
Latitude = lat
};
var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(requestObj);
- var revertObj = await RequestHttpsZigbeeAsync("ProcessRange/ReceiveAppLatAndLon", System.Text.Encoding.UTF8.GetBytes(requestJson));
+ var revertObj = RequestHttpsZigbeeAsync("ProcessRange/ReceiveAppLatAndLon", System.Text.Encoding.UTF8.GetBytes(requestJson));
+
+ if (UserCenter.UserCenterResourse.HideOption.WriteGpsPoint == 1)
+ {
+ string flage = revertObj == null ? "false" : revertObj.StateCode;
+ string txtvalue = "lon:" + lon + " lat:" + lat + " " + flage;
+ HdlMessageLogic.Current.ShowMassage(ShowMsgType.Tip, txtvalue);
+ UserCenter.HdlLogLogic.Current.WriteLog(-1, "缁忕含搴︿笂鎶� " + txtvalue);
+ }
}
catch { }
}
@@ -127,9 +135,9 @@
/// <param name="requestUrl">璇锋眰Url</param>
/// <param name="byteData">璇锋眰鐨勭殑鏁版嵁</param>
/// <returns>寰楀埌鍝嶅簲鐨勬暟鎹�</returns>
- public async System.Threading.Tasks.Task<Shared.Common.ResponseEntity.ResponsePack> RequestHttpsZigbeeAsync(string requestUrl, byte[] byteData)
+ public Shared.Common.ResponseEntity.ResponsePack RequestHttpsZigbeeAsync(string requestUrl, byte[] byteData)
{
- string result = await RequestHttpsZigbeeResultAsync(requestUrl, byteData);
+ string result = RequestHttpsZigbeeResultAsync(requestUrl, byteData);
if (result != null)
{
try
@@ -152,9 +160,9 @@
/// <param name="requestUrl">璇锋眰Url</param>
/// <param name="byteData">璇锋眰鐨勭殑鏁版嵁</param>
/// <returns>寰楀埌鍝嶅簲鐨勬暟鎹�</returns>
- public async System.Threading.Tasks.Task<string> RequestHttpsZigbeeResultAsync(string requestUrl, byte[] byteData)
+ public string RequestHttpsZigbeeResultAsync(string requestUrl, byte[] byteData)
{
- var result = await RequestHttpsZigbeeBytesResultAsync(requestUrl, byteData);
+ var result = RequestHttpsZigbeeBytesResultAsync(requestUrl, byteData);
if (result != null)
{
return Encoding.UTF8.GetString(result);
@@ -170,12 +178,12 @@
/// <param name="byteData">璇锋眰鐨勭殑鏁版嵁</param>
/// <param name="requestMethod">POST 鎴栬�� GET 绛夌瓑</param>
/// <returns>寰楀埌鍝嶅簲鐨勬暟鎹�</returns>
- public async System.Threading.Tasks.Task<byte[]> RequestHttpsZigbeeBytesResultAsync(string requestUrl, byte[] byteData, string requestMethod = "POST")
+ public byte[] RequestHttpsZigbeeBytesResultAsync(string requestUrl, byte[] byteData, string requestMethod = "POST")
{
//璇锋眰Url鐨勫畬鎴愯矾寰�
var requestHost = "https://global.hdlcontrol.com/GeofenceService";
var fullUrl = $"{requestHost}/{requestUrl}";
- return await CommonPage.Instance.DoRequestZigbeeHttpsInterface(fullUrl, byteData, Config.Instance.Token, requestMethod);
+ return CommonPage.Instance.DoRequestZigbeeHttpsInterface(fullUrl, byteData, Config.Instance.Token, requestMethod);
}
#endregion
--
Gitblit v1.8.0