From be95e839f40eb3ddf64706b60cba6dfcf4fad5e5 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期五, 03 四月 2020 14:31:44 +0800
Subject: [PATCH] 2020-04-03 1.去掉登录前ping百度域名的网络监测。
---
Crabtree/SmartHome/UI/SimpleControl/Phone/Schedule/AddSchedule.cs | 130 +++++++++++++++++++++++++++++++++++++------
1 files changed, 111 insertions(+), 19 deletions(-)
diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/Schedule/AddSchedule.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/Schedule/AddSchedule.cs
index 9e042ca..57d0c7f 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/Phone/Schedule/AddSchedule.cs
+++ b/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> ();
@@ -25,7 +26,7 @@
public void ShowPage (Timer timerTemp, List<Timer> listTimer, bool isEdit = false)
{
UserMiddle.SettingPageView.ScrollEnabled = false;
- timerTemp.RegionID = UserConfig.Instance.CurrentRegion.RegionID;
+ timerTemp.RegionID = UserConfig.Instance.CurrentRegion.Id;
#region topview
var topView = new RowLayout () {
Y = Application.GetRealHeight (36),
@@ -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,21 +676,23 @@
var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject (timerTemp);
ResponsePack revertObj = null;
if (isEdit) {
- revertObj = MainPage.RequestHttps ("EditTimer", requestJson);
- } else {
- revertObj = MainPage.RequestHttps ("AddTimer", requestJson);
+ revertObj = MainPage.RequestHttps (API.EditTimer, requestJson);
+ } else {
+ revertObj = MainPage.RequestHttps (API.AddTimer, requestJson);
}
Application.RunOnMainThread (() => {
if (revertObj == null) {
new Alert ("", "Unable to save data, please check the network.", "Close").Show ();
- } else if (revertObj.StateCode == "SUCCESS") {
+ } else if (revertObj.StateCode.ToUpper() == "SUCCESS") {
this.RemoveFromParent ();
action (timerTemp);
+ } else {
+ ShowErrorInfo (revertObj.StateCode);
}
});
} catch (Exception ex) {
- Console.WriteLine (ex.Message);
+ Utlis.WriteLine (ex.Message);
} finally {
Application.RunOnMainThread (() => {
MainPage.Loading.Hide ();
@@ -655,9 +703,44 @@
}
+
+
+ /// <summary>
+ //(1)Success 鍒欒皟鐢ㄦ鎺ュ彛鎴愬姛
+ //(2)NoRecord 浣忓畢鏈粦瀹氱綉鍏筹紒
+ //(3)NoExist 浣忓畢涓嶅瓨鍦紒
+ //(4)Exist 鐢熸垚鐨凣uid宸插瓨鍦紒
+ /// </summary>
+ void ShowErrorInfo (string stateCodeStr)
+ {
+ string mes = "";
+ if (stateCodeStr == "NoRecord") {
+ // 浣忓畢鏈粦瀹氱綉鍏筹紒
+ mes = ErrorCode.HomeNoRecord;
+ } else if (stateCodeStr == "NoExist") {
+ //浣忓畢涓嶅瓨鍦紒
+ mes = ErrorCode.HomeNoExist;
+ } else if (stateCodeStr == "Exist") {
+ //鐢熸垚鐨凣uid宸插瓨鍦紒
+ mes = ErrorCode.GuidExist;
+ } else if (stateCodeStr == ErrorCode.NetworkError) {
+ mes = ErrorCode.NetworkError;
+ } else {
+ mes = ErrorCode.OperationFailed + ErrorCode.Reason + stateCodeStr;
+
+ }
+ if (!string.IsNullOrEmpty (mes)) {
+ //Application.RunOnMainThread (() => {
+ new Alert ("", mes, Language.StringByID (R.MyInternationalizationString.Close)).Show ();
+ //});
+ }
+
+ }
+
private static void InitDeviceListView (List<Common> roomDeviceList, List<DeviceInfo> timerControlDeviceList, FrameLayout devicesListView)
{
devicesListView.RemoveAll ();
+
System.Threading.Tasks.Task.Run (() => {
try {
int iniIndex = 0;
@@ -668,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;
@@ -803,7 +895,7 @@
btnFanLevel.Text = "S" + e.ToString ();
}
} catch (Exception ex) {
- Console.WriteLine ("ss1: " + ex.Message);
+ Utlis.WriteLine ("ss1: " + ex.Message);
}
};
@@ -1071,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 ();
--
Gitblit v1.8.0