~wjc/HomeApp.git

old mode 100755 new mode 100644

			@@ -11,6 +11,10 @@
			{
			#region 本地变量
			/// <summary>
			/// 更新“逻辑常开”界面的回调
			/// </summary>
			public static Action<bool> LogicAction = null;
			/// <summary>
			/// 网关（门锁）所在的时间
			/// </summary>
			public static DateTime DoorlockZoneTime = DateTime.Now;
			@@ -97,10 +101,10 @@

			#region 常开模式 API
			/// <summary>
			/// 获取当前门锁的常开模式
			/// 获取当前门锁的常开模式
			/// </summary>
			/// <param name="doorLock:当前门锁"></param>
			/// <returns>null:没有回复； true:门锁常开；false：门锁常关</returns>
			/// <param name="doorLock:当前门锁"></param>
			/// <returns>null:没有回复； true:门锁常开；false：门锁常关</returns>
			public static async System.Threading.Tasks.Task<bool?> GetNormallyOpenMode(ZigBee.Device.DoorLock doorLock)
			{
			bool? IsDoorLockNormallyMode = null;
			@@ -127,8 +131,8 @@
			/// <summary>
			/// 门锁是否支持常开[这里暂时只有S-One门锁支持，H06C不支持, 后期通过能力值支持]
			/// </summary>
			/// <param name="doorLock:当前门锁"></param>
			/// <returns></returns>
			/// <param name="doorLock:当前门锁"></param>
			/// <returns>true:支持常开；false：不支持常开</returns>
			public static bool CanNormallyOpen(ZigBee.Device.DoorLock doorLock)
			{
			var listDevice = new List<CommonDevice> { };
			@@ -146,14 +150,11 @@
			/// </summary>
			public static void NormallyOpenModeValue(ZigBee.Device.DoorLock doorLock, bool value)
			{
			string key = doorLock.DeviceAddr + "_" + doorLock.DeviceEpoint;
			if (doorLock.IsDoorLockNormallyMode.ContainsKey(key))
			doorLock.IsDoorLockNormallyMode = value;

			if (LogicAction != null)
			{
			doorLock.IsDoorLockNormallyMode[key] = value;
			}
			else
			{
			doorLock.IsDoorLockNormallyMode.Add(key, value);
			LogicAction(value);
			}
			}

			@@ -193,7 +194,7 @@
			{
			if (doorLockMessType == DoorLockMessType.DeviceReport \|\| doorLockMessType == DoorLockMessType.ServicePush)
			{
			//上报“常开模式”已被取消，app默认了“常开模式”被取消
			//上报“常开模式”已被取消，app默认了“常开模式”被取消
			DoorLockCommonInfo.NormallyOpenModeValue(doorLock, false);
			}
			else
			@@ -210,17 +211,9 @@
			{
			//上报“常开模式”已被取消
			Application.RunOnMainThread(() => { CommonPage.Loading.Start(""); });
			//先删除已失效的“常开模式”的逻辑
			//if (resTemp == 1)
			//{
			// var restulTemp = await Shared.Phone.Device.Logic.SkipView.Exist(3);
			// //if (restulTemp == 3)
			// //{
			// // string msg0 = Language.StringByID(R.MyInternationalizationString.CancelLogicNormallyModeFailed2);
			// // this.ShowTipMsg(msg0);
			// // return;
			// //}
			//}

			//温居城方法？？？
			//此处是否要删除温居城的特殊逻辑

			//app重新开启“常开模式”
			var result = await doorLock.SetNormallyOpenModeFuncAsync(true);
			@@ -232,7 +225,6 @@
			ShowTipMsg(msg0);
			NormallyOpenModeValue(doorLock, false);
			CommonPage.Loading.Hide();
			//new Tip() { MaxWidth = 150, Text = msg0, Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(CommonPage.Instance);
			});
			action?.Invoke();
			return;
			@@ -245,14 +237,13 @@
			ShowTipMsg(msg1);
			NormallyOpenModeValue(doorLock, false);
			CommonPage.Loading.Hide();
			//new Tip() { MaxWidth = 150, Text = msg1, Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(CommonPage.Instance);
			});
			action?.Invoke();
			return;
			}
			else
			{
			//创建常开模式的特殊逻辑
			//创建常开模式的特殊逻辑
			var resu = await Shared.Phone.Device.Logic.SkipView.LockAddModifyLogic(DoorLockCommonInfo.NormallyOpenModeInvalidTime, doorLock);
			Application.RunOnMainThread(() =>
			{
			@@ -260,13 +251,12 @@
			ShowTipMsg(msg0);
			NormallyOpenModeValue(doorLock, true);
			CommonPage.Loading.Hide();
			//new Tip() { MaxWidth = 150, Text = msg0, Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(CommonPage.Instance);
			});
			}
			}
			else
			{
			//app操作不取消“常开模式”
			//app操作不取消“常开模式”
			DoorLockCommonInfo.NormallyOpenModeValue(doorLock, true);
			}
			action?.Invoke();
			@@ -279,12 +269,8 @@
			NormallyOpenModeValue(doorLock, false);
			if (haveLogic)
			{
			var resTemp2 = await Shared.Phone.Device.Logic.SkipView.Exist(3);
			//if (resTemp2 == 3)
			//{
			// string msg0 = Language.StringByID(R.MyInternationalizationString.CancelLogicNormallyModeFailed);
			// this.ShowTipMsg(msg0);
			//}
			//温居城方法？？？
			//此处是否要删除温居城的特殊逻辑
			}
			}
			else
			@@ -298,7 +284,6 @@
			{
			ShowTipMsg(Language.StringByID(R.MyInternationalizationString.GwResponseOvertime));
			CommonPage.Loading.Hide();
			//new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(CommonPage.Instance);
			});
			action?.Invoke();
			return;
			@@ -310,7 +295,6 @@
			string msg1 = Language.StringByID(R.MyInternationalizationString.CloseNormallyOpenModeFailed);
			ShowTipMsg(msg1);
			CommonPage.Loading.Hide();
			//new Tip() { MaxWidth = 150, Text = msg1, Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(CommonPage.Instance);
			});
			action?.Invoke();
			return;
			@@ -319,28 +303,14 @@
			{
			//添加App开启常开模式的历史记录
			HdlDeviceDoorLockLogic.Current.AddDoorHistoryLog(doorLock, 9002, string.Empty);
			//app确认取消“常开模式”成功
			//app确认取消“常开模式”成功
			NormallyOpenModeValue(doorLock, false);
			//删除设置常开模式创建的逻辑
			if (haveLogic)
			{
			var resTemp1 = await Shared.Phone.Device.Logic.SkipView.Exist(3);
			//因为目前机制问题，逻辑经常失败，所以不提示，后期机制要改，重新做一个这个界面
			//if (resTemp1 == 3)
			//{
			//Application.RunOnMainThread(() =>
			//{
			// string msg0 = Language.StringByID(R.MyInternationalizationString.CancelLogicNormallyModeFailed);
			// ShowTipMsg(msg0);
			//});
			//}
			//else if (resTemp1 == 2)
			//{
			//Application.RunOnMainThread(() =>
			//{
			// string msg0 = Language.StringByID(R.MyInternationalizationString.CloseNormallyOpenModeSuccess);
			// ShowTipMsg(msg0);
			//});
			//温居城方法？？？
			//此处是否要删除温居城的特殊逻辑
			}
			Application.RunOnMainThread(() =>
			{
			@@ -354,30 +324,54 @@
			};
			}

			/// <summary>
			/// 删除常开模式
			/// </summary>
			/// <param name="doorLock">当前门锁</param>
			/// <param name="action">回调处理更新内容</param>
			/// <returns></returns>
			public static async System.Threading.Tasks.Task<bool> DelNormallyOpenMode(ZigBee.Device.DoorLock doorLock, Action action = null)
			{
			//app操作取消“常开模式”
			var result = await doorLock.SetNormallyOpenModeFuncAsync(false);
			if (result == null \|\| result.defaultControlResponseData == null \|\| result.defaultControlResponseData.status != 0)
			{
			action?.Invoke();
			return false;
			}

			if (result.defaultControlResponseData.status == 0)
			{
			//app确认取消“常开模式”成功
			NormallyOpenModeValue(doorLock, false);
			action?.Invoke();
			return true;
			}
			return false;
			/// <summary>
			/// 删除常开模式
			/// </summary>
			/// <param name="doorLock">当前门锁</param>
			/// <param name="action">回调处理更新内容</param>
			/// <returns></returns>
			public static async System.Threading.Tasks.Task<bool> DelNormallyOpenMode(ZigBee.Device.DoorLock doorLock, Action action = null)
			{
			//app操作取消“常开模式”
			var result = await doorLock.SetNormallyOpenModeFuncAsync(false);
			if (result == null \|\| result.defaultControlResponseData == null \|\| result.defaultControlResponseData.status != 0)
			{
			action?.Invoke();
			return false;
			}

			if (result.defaultControlResponseData.status == 0)
			{
			//app确认取消“常开模式”成功
			NormallyOpenModeValue(doorLock, false);
			action?.Invoke();
			return true;
			}
			return false;
			}

			/// <summary>
			/// 设置常开模式
			/// </summary>
			/// <param name="doorLock">当前门锁</param>
			/// <param name="action">回调处理更新内容</param>
			/// <returns></returns>
			public static async System.Threading.Tasks.Task<bool> SetNormallyOpenModeFuncAsync(ZigBee.Device.DoorLock doorLock)
			{
			//app设置“常开模式”失败
			var result = await doorLock.SetNormallyOpenModeFuncAsync(false);
			if (result == null \|\| result.defaultControlResponseData == null \|\| result.defaultControlResponseData.status != 0)
			{
			return false;
			}

			if (result.defaultControlResponseData.status == 0)
			{
			//app设置“常开模式”成功
			NormallyOpenModeValue(doorLock, false);
			return true;
			}
			return false;
			}

			/// <summary>
			@@ -398,7 +392,7 @@
			return;
			}

			//设置常开模式后，您的门锁将始终处于打开状态，确认开启？
			//设置常开模式后，您的门锁将始终处于打开状态，确认开启？
			string msg = Language.StringByID(R.MyInternationalizationString.SetDoorLockNomallyOpen).Replace("{0}", "\r\n");
			var confirm = Language.StringByID(R.MyInternationalizationString.Confrim);
			var alert = new ShowDoorLockMsgControl(ShowDoorLockMsgControl.DoorLockMsgType.Confirm, msg, confirm);
			@@ -406,6 +400,27 @@

			alert.ConfirmClickEvent += async () =>
			{
			NomallyOpenModeInvalidTimeDialog(doorLock, action);
			};
			}

			/// <summary>
			/// 常开模式失效时间处理【弹窗】
			/// </summary>
			public static async void NomallyOpenModeInvalidTimeDialog(ZigBee.Device.DoorLock doorLock, Action action)
			{
			//失效设置
			string msgTimeInValidSetting = Language.StringByID(R.MyInternationalizationString.DoorLockOpenAllTheTime);
			var timeConfrim = Language.StringByID(R.MyInternationalizationString.Confrim);
			var alertTimeInValidSetting = new ShowDoorLockMsgControl(ShowDoorLockMsgControl.DoorLockMsgType.InValid, msgTimeInValidSetting, timeConfrim);
			alertTimeInValidSetting.Show();

			alertTimeInValidSetting.InvalidTimeAction += async (obj) =>
			{
			//常开模式失效时间设置成功
			var temp = int.Parse(obj);
			DoorLockCommonInfo.NormallyOpenModeInvalidTime = temp;

			Application.RunOnMainThread(() => { CommonPage.Loading.Start(""); });
			var result = await doorLock.SetNormallyOpenModeFuncAsync(true);
			if (result == null \|\| result.defaultControlResponseData == null)
			@@ -436,43 +451,12 @@
			action?.Invoke();
			Application.RunOnMainThread(() =>
			{
			NomallyOpenModeInvalidTimeDialog(doorLock);
			CommonPage.Loading.Hide();
			});
			}
			};
			}

			/// <summary>
			/// 常开模式失效时间处理【弹窗】
			/// </summary>
			public static async void NomallyOpenModeInvalidTimeDialog(ZigBee.Device.DoorLock doorLock)
			{
			//失效设置
			string msgTimeInValidSetting = Language.StringByID(R.MyInternationalizationString.DoorLockOpenAllTheTime);
			var timeConfrim = Language.StringByID(R.MyInternationalizationString.Confrim);
			var alertTimeInValidSetting = new ShowDoorLockMsgControl(ShowDoorLockMsgControl.DoorLockMsgType.InValid, msgTimeInValidSetting, timeConfrim);
			alertTimeInValidSetting.Show();

			alertTimeInValidSetting.InvalidTimeAction += async (obj) =>
			{
			//常开模式失效时间设置成功
			var temp = int.Parse(obj);
			DoorLockCommonInfo.NormallyOpenModeInvalidTime = temp;
			//默认创建常开模式的特殊逻辑
			var res = await Shared.Phone.Device.Logic.SkipView.LockAddModifyLogic(DoorLockCommonInfo.NormallyOpenModeInvalidTime, doorLock);
			if (!res)
			{
			Application.RunOnMainThread(() =>
			{
			//默认创建常开模式失败
			string msg0 = Language.StringByID(R.MyInternationalizationString.AddLogicNormallyModeFailed);
			var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Normal, msg0, Language.StringByID(R.MyInternationalizationString.confrim));
			alert.Show();
			//二次加载弹窗常开模式开启提示
			NomallyOpenModeInvalidTimeDialog(doorLock);
			});
			}
			//温居城方法？？？
			//此处是否要创建常开模式的特殊逻辑
			};
			}
			#endregion
			@@ -481,8 +465,8 @@
			/// <summary>
			/// 门锁是否支持音量[这里暂时只有S-One门锁支持，H06C不支持，后期通过能力值支持]
			/// </summary>
			/// <param name="doorLock:当前门锁"></param>
			/// <returns></returns>
			/// <param name="doorLock:当前门锁"></param>
			/// <returns></returns>
			public static bool CanVolume(ZigBee.Device.DoorLock doorLock)
			{
			var listDevice = new List<CommonDevice> { };
			@@ -497,7 +481,7 @@

			#endregion

			#region 从云端获取的方法
			#region 从云端获取的方法
			/// <summary>
			/// 获取当前账户门锁操作权限（是否被冻结）
			/// </summary>
			@@ -649,7 +633,7 @@
			}


			//2、读取云端门锁信息
			//2、读取云端门锁信息
			var getDoorLockInfoAllList = new List<ZigBee.Device.DoorLock.CloudDoorLockObj> { };
			var getDoorLockInfoList = await Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetDoorLockAllAccountInfolist(doorLock);
			if (getDoorLockInfoList != null)
			@@ -1135,7 +1119,7 @@
			/// <returns></returns>
			public static DateTime GetDoorLockZoneTime()
			{
			//通过经度获取时区
			//通过经度获取时区
			var gwZone = int.Parse(CaculateTimeZone(Common.Config.Instance.Home.Longitude));
			//将本地时间转换成世界时
			var utc = DateTime.Now.AddHours(-gwZone);
			@@ -1149,7 +1133,7 @@
			}

			/// <summary>
			/// 获取时区
			/// 获取时区
			/// </summary>
			/// <param name="currentLon">currentLon:"+"为东区，“-”为西区</param>
			/// <returns></returns>
			@@ -1210,7 +1194,7 @@

			#endregion

			#region 一般方法
			#region 一般方法
			/// <summary>
			/// 显示错误信息窗口
			/// </summary>
			@@ -1238,6 +1222,5 @@
			}

			#endregion

			}
			}