2020-01-10 2020-01-10 1.修改切换本地和远程问题。 2.修改判断住宅网关方案。 3.其它优化修改。

陈嘉乐

2020-01-10 365eadb33ee86b05ac74d408025d102a758c2efd

 Crabtree/SmartHome/UI/SimpleControl/Phone/Schedule/AddSchedule.cs

@@ -431,11 +431,16 @@
                timerTemp.RoomName = roomNameList [0];
            }
            btnRoomChoose.Text = timerTemp.RoomName;
       

            #endregion

            #region Devices
            timerControlDeviceList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<DeviceInfo>> (timerTemp.ControlDeviceData);//devicesControlDataList
            try { 
                timerControlDeviceList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<DeviceInfo>> (timerTemp.ControlDeviceData);//devicesControlDataList
            } catch {
                timerControlDeviceList = null;
            }

            if (timerControlDeviceList == null)
                timerControlDeviceList = new List<DeviceInfo> ();

@@ -572,7 +577,7 @@
                    //new Alert ("", "请填写定时器名称!", "Close").Show ();
                    new Alert ("", "Please set name for the timer!", "Close").Show ();
                    return;
                } else if (listTimer.Find ((obj) => obj.TimerName == timerTemp.TimerName) != null && !isEdit) {
                } else if (listTimer.Find ((obj) => obj.TimerName == timerTemp.TimerName) != null) {//2020-01-09 编辑的时候也提示重复名字
                    new Alert ("", "The timer name already exists. Please change it before saving it.", "Close").Show ();
                    return;
                }
@@ -617,8 +622,8 @@
                    timerTemp.Periodicity = timerTemp.Periodicity.Remove (timerTemp.Periodicity.Length - 1, 1);
                }
                timerTemp.IsStart = true;
                if (string.IsNullOrEmpty (timerTemp.Guid)) {
                    timerTemp.Guid = Guid.NewGuid ().ToString ();
                if (string.IsNullOrEmpty (timerTemp.Id)) {
                    timerTemp.Id = Guid.NewGuid ().ToString ();
                }
                timerTemp.ControlDeviceData = Newtonsoft.Json.JsonConvert.SerializeObject (timerControlDeviceList);
                MainPage.Loading.Start ("Saving...");
@@ -630,9 +635,9 @@
                        var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject (timerTemp);
                        ResponsePack revertObj = null;
                        if (isEdit) {
                            revertObj = MainPage.RequestHttps (API.EditTimer, requestJson, true);
                            revertObj = MainPage.RequestHttps (API.EditTimer, requestJson);
                        } else {
                            revertObj = MainPage.RequestHttps (API.AddTimer, requestJson, true);
                            revertObj = MainPage.RequestHttps (API.AddTimer, requestJson);
                        }

                        Application.RunOnMainThread (() => {