From 5a5a2b696866f947b6025d26c3302e8ffef46435 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期一, 11 一月 2021 16:11:20 +0800
Subject: [PATCH] 2021-01-11 1.更新MQTT连接和本地搜索网关方法。2.子账号相关接口完善
---
Crabtree/SmartHome/UI/SimpleControl/Phone/Schedule/UserSchedule.cs | 27 ++++++++++++++++++---------
1 files changed, 18 insertions(+), 9 deletions(-)
diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/Schedule/UserSchedule.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/Schedule/UserSchedule.cs
index ab1194c..535402e 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/Phone/Schedule/UserSchedule.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/Schedule/UserSchedule.cs
@@ -75,7 +75,7 @@
UserMiddle.SettingPageView.PageIndex = 2;
});
}catch(Exception ex){
- Console.WriteLine (ex.Message);
+ Utlis.WriteLine (ex.Message);
}
finally{
Application.RunOnMainThread (() => {
@@ -103,7 +103,7 @@
var requestObj = new Timer () { RegionID = UserConfig.Instance.CurrentRegion.Id };
var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject (requestObj);
var revertObj = MainPage.RequestHttps (API.GetTimerList, requestJson);
- if (revertObj.StateCode.ToUpper() == "SUCCESS") {
+ if (revertObj.StateCode.ToUpper() == StateCode.SUCCESS) {
timers = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Timer>> (revertObj.ResponseData.ToString ());
foreach (var schedule in timers) {
initSchedule (schedule);
@@ -113,7 +113,7 @@
ShowGetTimerListErrorInfo (revertObj.StateCode);
}
} catch (Exception ex) {
- Console.WriteLine (ex.Message);
+ Utlis.WriteLine (ex.Message);
} finally {
Application.RunOnMainThread (() => {
MainPage.Loading.Hide ();
@@ -310,13 +310,13 @@
var switchObj = new Timer () { Id = (sdd as Button).Tag.ToString () };
var switchRequestJson = Newtonsoft.Json.JsonConvert.SerializeObject (switchObj);
var switchRevertObj = MainPage.RequestHttps (API.IsEnableTimer, switchRequestJson);
- if (switchRevertObj.StateCode.ToUpper() != "SUCCESS") {
+ if (switchRevertObj.StateCode.ToUpper() != StateCode.SUCCESS) {
Application.RunOnMainThread (() => {
tempSiwtch.IsSelected = !tempSiwtch.IsSelected;
});
}
} catch (Exception ex) {
- Console.WriteLine (ex.Message);
+ Utlis.WriteLine (ex.Message);
} finally {
Application.RunOnMainThread (() => {
MainPage.Loading.Hide ();
@@ -339,7 +339,7 @@
//var delObj = new Timer () { Guid = (sender as Button).Tag.ToString () };
//var delRequestJson = Newtonsoft.Json.JsonConvert.SerializeObject (delObj);
//var delRevertObj = MainPage.RequestHttps ("DeleteTimer", delRequestJson);
- //if (delRevertObj.StateCode.ToUpper() == "SUCCESS") {
+ //if (delRevertObj.StateCode.ToUpper() == StateCode.SUCCESS) {
// rowView.RemoveFromParent ();
// timers.Remove (timers.Find((obj) => obj.Guid == delObj.Guid));
//}
@@ -416,14 +416,17 @@
/// <param name="bTimersRemove"></param>
void DeleteTimerAction (string GUID, View rowView, bool bTimersRemove = false)
{
- MainPage.Loading.Start ("Please wait...");
+ //2020-01-11
+ Application.RunOnMainThread (() => {
+ MainPage.Loading.Start ("Please wait...");
+ });
var delObj = new Timer () { Id = GUID };
var delRequestJson = Newtonsoft.Json.JsonConvert.SerializeObject (delObj);
var delRevertObj = MainPage.RequestHttps (API.DeleteTimer, delRequestJson);
- MainPage.Loading.Hide ();
- if (delRevertObj.StateCode.ToUpper () == "SUCCESS") {
+
+ if (delRevertObj.StateCode.ToUpper () == StateCode.SUCCESS) {
rowView.RemoveFromParent ();
if (bTimersRemove) {
timers.Remove (timers.Find ((obj) => obj.Id == delObj.Id));
@@ -434,6 +437,12 @@
new Alert ("", ErrorCode.FailedDelete, Language.StringByID (R.MyInternationalizationString.Close)).Show ();
});
}
+
+ Application.RunOnMainThread (() => {
+ MainPage.Loading.Hide ();
+ });
+
+
}
}
}
--
Gitblit v1.8.0