2020-01-16 Version 2.50115-B3 1.优化MQTT连接。 2.增加本地通信加密。 3.增加配置网关提示语。 4.编辑定时器增...

JLChen

2020-01-16 8edf8fd9f5f7c29cc6302a8d46de06d391ed3657

 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,14 +577,33 @@
                    //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) {
                    new Alert ("", "The timer name already exists. Please change it before saving it.", "Close").Show ();
                    return;
                }
                //else if (listTimer.Find ((obj) => obj.TimerName == timerTemp.TimerName) != null && !isEdit) {//2020-01-09 编辑的时候也提示重复名字
                //    //if (isEdit) {

                //    //}
                //    new Alert ("", "The timer name already exists. Please change it before saving it.", "Close").Show ();
                //    return;
                //}

                if (timerControlDeviceList.Count == 0) {
                    new Alert ("", "Please choose at least one device!", "Close").Show ();
                    return;
                }

                var mTimer = listTimer.Find ((obj) => obj.TimerName == timerTemp.TimerName);
                if (isEdit) {
                    if (mTimer != null && mTimer.Id != timerTemp.Id) {
                        new Alert ("", "The timer name already exists. Please change it before saving it.", "Close").Show ();
                        return;
                    }
                } else {
                    if (mTimer != null) {
                        new Alert ("", "The timer name already exists. Please change it before saving it.", "Close").Show ();
                        return;
                    }
                }

                timerTemp.Periodicity = "";
                if (btnMonday.IsSelected == true && btnFriday.IsSelected == true && btnThursday.IsSelected == true && btnSunday.IsSelected == true && btnTuesday.IsSelected == true && btnSaturday.IsSelected == true && btnWednesday.IsSelected == true) {
                    timerTemp.TimerType = TimerType.EveryDay;
@@ -617,8 +641,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 +654,9 @@
                        var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject (timerTemp);
                        ResponsePack revertObj = null;
                        if (isEdit) {
                            revertObj = MainPage.RequestHttps (API.EditTimer, requestJson, true);
                        } else {
                            revertObj = MainPage.RequestHttps (API.AddTimer, requestJson, true);
                            revertObj = MainPage.RequestHttps (API.EditTimer, requestJson);
                        } else {   
                            revertObj = MainPage.RequestHttps (API.AddTimer, requestJson);
                        }

                        Application.RunOnMainThread (() => {