2020-04-03 1.去掉登录前ping百度域名的网络监测。

JLChen

2020-04-03 be95e839f40eb3ddf64706b60cba6dfcf4fad5e5

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

@@ -7,6 +7,7 @@
    public class AddSchedule : FrameLayout
    {
        VerticalScrolViewLayout bodyView;
        FrameLayout devicesListView;
        Action<Timer> action;
        List<Common> roomDeviceList = new List<Common>();
        List<string> roomNameList = new List<string> ();
@@ -431,11 +432,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> ();

@@ -454,7 +460,7 @@
            };
            devicesView.AddChidren (btnDeviceTitle);

            var devicesListView = new FrameLayout () {
           devicesListView = new FrameLayout () {
                Height = Application.GetRealHeight (130 * roomDeviceList.Count),
            };
            bodyView.AddChidren (devicesListView);
@@ -567,19 +573,56 @@
                    new Alert ("", "Please setting date!", "Close").Show ();
                    return;
                }
                timerTemp.TimerName = etName.Text.Trim ();
                if (string.IsNullOrEmpty (timerTemp.TimerName)) {

                string mTimerName = etName.Text.Trim ();
                if (string.IsNullOrEmpty (mTimerName)) {
                    //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 == mTimerName);
                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;
                    }
                }

                //2020-02-10 时间重复判断限制
                string mExecutionTime = btnTimelbl.Text;
                //timerTemp.ExecutionTime = btnTimelbl.Text;
                var mTimerExecutionTime = listTimer.Find ((obj) => (obj.ExecutionTime == mExecutionTime));
                if (isEdit) {
                    if (mTimerExecutionTime != null && mTimerExecutionTime.Id != timerTemp.Id) {
                        new Alert ("", "The timer time already exists. Please change it before saving it.", "Close").Show ();
                        return;
                    }
                } else {
                    if (mTimerExecutionTime != null) {
                        new Alert ("", "The timer time 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;
@@ -616,9 +659,12 @@
                if (timerTemp.Periodicity [timerTemp.Periodicity.Length - 1] == ',') {
                    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 +676,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 (() => {
@@ -646,7 +692,7 @@
                            }
                        });
                    } catch (Exception ex) {
                        Console.WriteLine (ex.Message);
                        Utlis.WriteLine (ex.Message);
                    } finally {
                        Application.RunOnMainThread (() => {
                            MainPage.Loading.Hide ();
@@ -656,6 +702,8 @@
            };

        }

        

        /// <summary>
        //(1)Success 则调用此接口成功
@@ -692,6 +740,7 @@
        private static void InitDeviceListView (List<Common> roomDeviceList, List<DeviceInfo> timerControlDeviceList, FrameLayout devicesListView)
        {
            devicesListView.RemoveAll ();
            
            System.Threading.Tasks.Task.Run (() => {
                try {
                    int iniIndex = 0;
@@ -702,6 +751,15 @@
                            i++;
                        }
                    }

#if __IOS__


#else
                  //刷新devicesListView 高度
                    devicesListView.Height = Application.GetRealHeight (130 * roomDeviceList.Count);
#endif

                    foreach (var deviceCommon2 in roomDeviceList) {
                        if (deviceCommon2 == null)
                            continue;
@@ -837,7 +895,7 @@
                                                    btnFanLevel.Text = "S" + e.ToString ();
                                                }
                                            } catch (Exception ex) {
                                                Console.WriteLine ("ss1: " + ex.Message);
                                                Utlis.WriteLine ("ss1: " + ex.Message);
                                            }
                                        };

@@ -1105,13 +1163,13 @@
                                        #endregion
                                    }
                                }catch(Exception ex) {
                                    Console.WriteLine ("AddSchedule error : "+ ex.Message);
                                    Utlis.WriteLine ("AddSchedule error : "+ ex.Message);
                                }
                            });
                        }
                    }
                } catch (Exception ex) {
                    Console.WriteLine (ex.Message);
                    Utlis.WriteLine (ex.Message);
                } finally {
                    Application.RunOnMainThread (() => {
                        MainPage.Loading.Hide ();