From 0e1c6c25b1b0961d324811ff2132717a80f99efe Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期日, 26 四月 2020 14:15:05 +0800
Subject: [PATCH] 2020-04-26 1.添加住宅和修改住宅时，改为子线程操作。 2.远程连接模式时，禁用搜索网关和添加设备。3.修复切换住宅时，提示远程连接Loading不关闭问题。
---
Crabtree/SmartHome/UI/SimpleControl/Phone/Sensor/UserSensorHistoryPage.cs | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/Sensor/UserSensorHistoryPage.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/Sensor/UserSensorHistoryPage.cs
index 823df3d..0fee813 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/Phone/Sensor/UserSensorHistoryPage.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/Sensor/UserSensorHistoryPage.cs
@@ -12,7 +12,7 @@
public void ShowPage(Common sensor)
{
#if DEBUG
- UserConfig.Instance.GatewayMAC = "00005AF30A845F00";
+ //UserConfig.Instance.GatewayMAC = "00005AF30A845F00";
#endif
string unitText = "PM2.5";
string titleText = "";
@@ -181,7 +181,7 @@
var revertObj = MainPage.RequestHttps ("GetSensorPushHistory", requestJson);
if (revertObj != null) {
Application.RunOnMainThread (() => {
- if (revertObj.StateCode == "SUCCESS") {
+ if (revertObj.StateCode.ToUpper() == "SUCCESS") {
revertData = Newtonsoft.Json.JsonConvert.DeserializeObject<List<SensorPushHistoryRes>> (revertObj.ResponseData.ToString ());
int ass = 0;
for (int i = 0; i < revertData.Count;i++) {
@@ -198,7 +198,7 @@
});
}
} catch (Exception ex) {
- Console.WriteLine (ex.ToString ());
+ Utlis.WriteLine (ex.ToString ());
} finally {
Application.RunOnMainThread (() => {
MainPage.Loading.Hide ();
@@ -254,7 +254,7 @@
var revertObj = MainPage.RequestHttps ("GetSensorPushHistory", requestJson);
if (revertObj != null) {
Application.RunOnMainThread (() => {
- if (revertObj.StateCode == "SUCCESS") {
+ if (revertObj.StateCode.ToUpper() == "SUCCESS") {
revertData = Newtonsoft.Json.JsonConvert.DeserializeObject<List<SensorPushHistoryRes>> (revertObj.ResponseData.ToString ());
int ass = 0;
for (int i = 0; i < revertData.Count; i++) {
@@ -271,7 +271,7 @@
});
}
} catch (Exception ex) {
- Console.WriteLine (ex.ToString ());
+ Utlis.WriteLine (ex.ToString ());
} finally {
Application.RunOnMainThread (() => {
MainPage.Loading.Hide ();
@@ -302,7 +302,7 @@
var revertObj = MainPage.RequestHttps ("GetSensorPushHistory", requestJson);
if (revertObj != null) {
Application.RunOnMainThread (() => {
- if (revertObj.StateCode == "SUCCESS") {
+ if (revertObj.StateCode.ToUpper() == "SUCCESS") {
revertData = Newtonsoft.Json.JsonConvert.DeserializeObject<List<SensorPushHistoryRes>> (revertObj.ResponseData.ToString ());
int ass = 0;
for (int i = 0; i < revertData.Count; i++) {
@@ -319,7 +319,7 @@
});
}
} catch (Exception ex) {
- Console.WriteLine (ex.ToString ());
+ Utlis.WriteLine (ex.ToString ());
} finally {
Application.RunOnMainThread (() => {
MainPage.Loading.Hide ();
@@ -344,7 +344,7 @@
var revertObj = MainPage.RequestHttps ("GetSensorPushHistory", requestJson);
if (revertObj != null) {
Application.RunOnMainThread (() => {
- if (revertObj.StateCode == "SUCCESS") {
+ if (revertObj.StateCode.ToUpper() == "SUCCESS") {
revertData = Newtonsoft.Json.JsonConvert.DeserializeObject<List<SensorPushHistoryRes>> (revertObj.ResponseData.ToString ());
int ass = 0;
for (int i = 0; i < revertData.Count; i++) {
@@ -361,7 +361,7 @@
});
}
} catch (Exception ex) {
- Console.WriteLine (ex.ToString ());
+ Utlis.WriteLine (ex.ToString ());
} finally {
Application.RunOnMainThread (() => {
MainPage.Loading.Hide ();
--
Gitblit v1.8.0