From 365eadb33ee86b05ac74d408025d102a758c2efd Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期五, 10 一月 2020 15:27:17 +0800
Subject: [PATCH] 2020-01-10 2020-01-10 1.修改切换本地和远程问题。 2.修改判断住宅网关方案。 3.其它优化修改。
---
Crabtree/SmartHome/UI/SimpleControl/Phone/Schedule/UserSchedule.cs | 38 ++++++++++++++++++++++++--------------
1 files changed, 24 insertions(+), 14 deletions(-)
diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/Schedule/UserSchedule.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/Schedule/UserSchedule.cs
index 9b2eb04..ab1194c 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/Phone/Schedule/UserSchedule.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/Schedule/UserSchedule.cs
@@ -102,7 +102,7 @@
try {
var requestObj = new Timer () { RegionID = UserConfig.Instance.CurrentRegion.Id };
var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject (requestObj);
- var revertObj = MainPage.RequestHttps (API.GetTimerList, requestJson, true);
+ var revertObj = MainPage.RequestHttps (API.GetTimerList, requestJson);
if (revertObj.StateCode.ToUpper() == "SUCCESS") {
timers = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Timer>> (revertObj.ResponseData.ToString ());
foreach (var schedule in timers) {
@@ -157,7 +157,7 @@
var view = bodyView.GetChildren (i);
if(view.GetType() == typeof(RowLayout)){
var rowView = view as RowLayout;
- if (rowView.GetTagByKey("guid").ToString () == schedule.Guid) {
+ if (rowView.GetTagByKey("guid").ToString () == schedule.Id) {
for (int j = 0; j < rowView.ChildrenCount; j++) {
var viewChilren = rowView.GetChildren (j);
if (viewChilren.GetType () == typeof (Button)) {
@@ -214,7 +214,7 @@
Height = Application.GetRealHeight (180),
};
bodyView.AddChidren (rowView);
- rowView.AddTag ("guid", schedule.Guid);
+ rowView.AddTag ("guid", schedule.Id);
var btnScheduleName = new Button () {
X = Application.GetRealWidth (30),
@@ -227,7 +227,7 @@
Tag = "btnScheduleName",
};
rowView.AddChidren (btnScheduleName);
- btnScheduleName.AddTag ("guid", schedule.Guid);
+ btnScheduleName.AddTag ("guid", schedule.Id);
var btnScheduleRoomName = new Button () {
X = btnScheduleName.Right,
@@ -239,7 +239,7 @@
Tag = "btnScheduleRoomName",
};
rowView.AddChidren (btnScheduleRoomName);
- btnScheduleRoomName.AddTag ("guid", schedule.Guid);
+ btnScheduleRoomName.AddTag ("guid", schedule.Id);
var btnScheduleTime = new Button () {
X = Application.GetRealWidth (30),
@@ -253,7 +253,7 @@
Tag = "btnScheduleTime",
};
rowView.AddChidren (btnScheduleTime);
- btnScheduleTime.AddTag ("guid", schedule.Guid);
+ btnScheduleTime.AddTag ("guid", schedule.Id);
var btnScheduleDay = new Button () {
X = Application.GetRealWidth (33),
@@ -266,7 +266,7 @@
Tag = "btnScheduleDay",
};
rowView.AddChidren (btnScheduleDay);
- btnScheduleDay.AddTag ("guid", schedule.Guid);
+ btnScheduleDay.AddTag ("guid", schedule.Id);
if (schedule.Periodicity.Contains ("0")) {
btnScheduleDay.Text += "Sun ";
@@ -298,7 +298,7 @@
UnSelectedImagePath = "Item/SwitchClose.png",
SelectedImagePath = "Item/SwitchOpen.png",
IsSelected = schedule.IsStart,
- Tag = schedule.Guid
+ Tag = schedule.Id
};
rowView.AddChidren (tempSiwtch);
@@ -307,9 +307,9 @@
MainPage.Loading.Start ("Loading");
System.Threading.Tasks.Task.Run (() => {
try {
- var switchObj = new Timer () { Guid = (sdd as Button).Tag.ToString () };
+ var switchObj = new Timer () { Id = (sdd as Button).Tag.ToString () };
var switchRequestJson = Newtonsoft.Json.JsonConvert.SerializeObject (switchObj);
- var switchRevertObj = MainPage.RequestHttps (API.IsEnableTimer, switchRequestJson, true);
+ var switchRevertObj = MainPage.RequestHttps (API.IsEnableTimer, switchRequestJson);
if (switchRevertObj.StateCode.ToUpper() != "SUCCESS") {
Application.RunOnMainThread (() => {
tempSiwtch.IsSelected = !tempSiwtch.IsSelected;
@@ -328,10 +328,13 @@
Button btnDel = new Button () {
TextID = R.MyInternationalizationString.Del,
BackgroundColor = SkinStyle.Current.DelColor,
- Tag = schedule.Guid
+ Tag = schedule.Id
};
rowView.AddRightView (btnDel);
btnDel.MouseUpEventHandler += (sender, er) => {
+ if ((sender as Button).Tag == null) return;
+ //string uuid = (sender as Button).Tag.ToString ();
+
DeleteTimerAction ((sender as Button).Tag.ToString (), rowView, true);
//var delObj = new Timer () { Guid = (sender as Button).Tag.ToString () };
//var delRequestJson = Newtonsoft.Json.JsonConvert.SerializeObject (delObj);
@@ -368,6 +371,7 @@
alert.Show ();
alert.ResultEventHandler += (sender2, e2) => {
if (e2) {
+ if ((sender as Button).GetTagByKey ("guid") == null) return;
DeleteTimerAction ((sender as Button).GetTagByKey ("guid").ToString (), rowView);
}
};
@@ -380,6 +384,7 @@
alert.Show ();
alert.ResultEventHandler += (sender2, e2) => {
if (e2) {
+ if ((sender as Button).GetTagByKey ("guid") == null) return;
DeleteTimerAction ((sender as Button).GetTagByKey ("guid").ToString (), rowView);
}
};
@@ -392,6 +397,7 @@
alert.Show ();
alert.ResultEventHandler += (sender2, e2) => {
if (e2) {
+ if ((sender as Button).GetTagByKey ("guid") == null) return;
DeleteTimerAction ((sender as Button).GetTagByKey ("guid").ToString (), rowView);
}
};
@@ -410,13 +416,17 @@
/// <param name="bTimersRemove"></param>
void DeleteTimerAction (string GUID, View rowView, bool bTimersRemove = false)
{
- var delObj = new Timer () { Guid = GUID };
+ 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, true);
+ var delRevertObj = MainPage.RequestHttps (API.DeleteTimer, delRequestJson);
+
+ MainPage.Loading.Hide ();
if (delRevertObj.StateCode.ToUpper () == "SUCCESS") {
rowView.RemoveFromParent ();
if (bTimersRemove) {
- timers.Remove (timers.Find ((obj) => obj.Guid == delObj.Guid));
+ timers.Remove (timers.Find ((obj) => obj.Id == delObj.Id));
}
} else {
//鍒犻櫎澶辫触
--
Gitblit v1.8.0