From 99da2604f81af29afc6b3c6f4f128b4e5a8a5649 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期三, 13 五月 2020 12:00:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into dev-2020xm
---
ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs | 189 ++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 184 insertions(+), 5 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs b/ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs
index 4c51329..05328f5 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs
@@ -33,7 +33,7 @@
public int timeValue = 0;
public async void Show()
{
-
+
#region 鐣岄潰鐨勫竷灞�浠ｇ爜
UserView.HomePage.Instance.ScrollEnabled = false;//閿佷綇宸︽粦
TopView view = new TopView();
@@ -316,8 +316,7 @@
}
- }
- else
+ button1 = new Button
{
fLayout.Height = Application.GetRealHeight(645);//鏀瑰彉楂樺害
modeIconBtn.UnSelectedImagePath = "ZigeeLogic/noMode.png";//鏀瑰彉鍥炬爣鐘舵��
@@ -431,6 +430,183 @@
listLogicFl.BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor;
}
/// <summary>
+ /// 甯稿紑妯″紡寮�鍏冲垏鎹㈠浘鏍囩晫闈�
+ /// </summary>
+ public async void ModeView()
+ {
+
+ if (Send.CurrentDoorLock.IsDoorLockNormallyMode)
+ {
+ /// 鏌ユ壘鏄惁瀛樺湪鏃舵晥鎬ц嚜鍔ㄥ寲锛涙湁鐨勮瘽灏辫繑鍥炶嚜鍔ㄥ寲瀵硅薄;
+ var logic = await SkipView.GetLogicIfon();
+
+ fLayout.Height = Application.GetRealHeight(780);//鏀瑰彉楂樺害
+ modeIconBtn.UnSelectedImagePath = "ZigeeLogic/openMode.png";//鏀瑰彉鍥炬爣鐘舵��
+ modeFl.Y = modeIconBtn.Bottom + Application.GetRealHeight(64);
+ modeFl.X = Application.GetRealWidth(0);
+ modeFl.Height = Application.GetRealHeight(127 + 199);
+ modeFl.Width = Application.GetRealHeight(1080);
+ modeFl.BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor;
+ modeFl.SetCornerWithSameRadius(Application.GetRealHeight(0), HDLUtils.RectCornerBottomLeft);
+
+ ///鍏抽棴鏃舵晥鎬ц嚜鍔ㄥ寲
+ button1.Y = Application.GetRealHeight(0);
+ button1.X = Application.GetRealWidth(86);
+ button1.Width = Application.GetRealWidth(907);
+ button1.Height = Application.GetRealHeight(127);
+ button1.Radius = (uint)Application.GetRealHeight(58);
+ button1.BackgroundColor = ZigbeeColor.Current.LogicBtnSaveBackgroundColor;
+ button1.TextAlignment = TextAlignment.Center;
+ button1.TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor;
+ button1.TextID = MyInternationalizationString.closeUp;
+ button1.TextSize = 16;
+
+ button1.MouseUpEventHandler = async (sender, e) =>
+ {
+ var result = await UserCenter.DoorLock.DoorLockCommonInfo.DelNormallyOpenMode(Send.CurrentDoorLock);
+ if (result)
+ {
+ if (logic != null)
+ {
+ ///鏈夊彲鑳藉彧鏈夊父寮�妯″紡锛屾病鏈夋椂鏁堟�ц嚜鍔ㄥ寲
+ ///娌℃湁鍒ゆ柇鐨勮瘽锛岄�昏緫浼氫负绌猴紝鎶涘嚭寮傚父;
+ Send.DelLogic(logic.LogicId);
+ }
+ Send.CurrentDoorLock.IsDoorLockNormallyMode = false;
+ ModeView();
+ }
+ else
+ {
+ LogicView.TipView.ShowFlashTip(Language.StringByID(MyInternationalizationString.closeFailed));
+ }
+
+ };
+ if (logic != null)
+ {
+ ///鏄剧ず澶辨晥璁剧疆鏃堕棿鏂囨湰鎺т欢
+ button2.Y = Application.GetRealHeight(127 + 69);
+ button2.X = Application.GetRealWidth(125);
+ button2.Width = Application.GetRealWidth(634 + 200);
+ button2.Height = Application.GetRealHeight(60);
+ button2.UnSelectedImagePath = "ZigeeLogic/1234.png";
+ button2.TextSize = 15;
+ button2.TextColor = ZigbeeColor.Current.LogicTextBlackColor;
+ ///鏈夋椂鏁堟�у父寮�鎵嶆樉绀烘椂闂存潯浠舵枃鏈�
+ }
+ else
+ {
+ button2.Width = Application.GetRealWidth(0);
+ button2.Height = Application.GetRealHeight(0);
+ }
+ ///鏃舵晥鎬у父寮�鍙湁涓�涓潯浠�;
+ try
+ {
+
+ var y = DateTime.Now.Year.ToString();//閭ｄ竴骞�
+ var m = DateTime.Now.Month.ToString();//閭ｄ竴鏈�
+ var d = DateTime.Now.ToString("dd");//閭ｄ竴澶�
+ var h = int.Parse(DateTime.Now.ToString("HH"));//褰撳墠绯荤粺鏃堕棿
+ var timeInt = int.Parse(logic.Conditions[0]["DoorLockOpenDelayTime"]);
+ int dayInt = (h + timeInt) / 24;//绠楀嚭鍑犲ぉ鍚庢墽琛�
+ int hour = (h + timeInt) % 24;//绠楀嚭鍑犲ぉ鍚庨偅涓椂闂存墽琛�
+ int days = int.Parse(d) + dayInt;
+ string text1 = Language.StringByID(MyInternationalizationString.timeSensitive);
+ string text2 = Language.StringByID(MyInternationalizationString.yearSone);
+ string text3 = Language.StringByID(MyInternationalizationString.monthSone);
+ string text4 = Language.StringByID(MyInternationalizationString.numberSone);
+ string text5 = Language.StringByID(MyInternationalizationString.executeSone);
+ button2.Text = text1 + y + text2 + m + text3 + days.ToString() + text4 + hour.ToString() + text5;
+ }
+ catch { }
+
+ }
+ else
+ {
+ fLayout.Height = Application.GetRealHeight(645);//鏀瑰彉楂樺害
+ modeIconBtn.UnSelectedImagePath = "ZigeeLogic/noMode.png";//鏀瑰彉鍥炬爣鐘舵��
+ modeFl.Y = modeIconBtn.Bottom + Application.GetRealHeight(92);
+ modeFl.X = Application.GetRealWidth(58);
+ modeFl.Height = Application.GetRealHeight(138);
+ modeFl.Width = Application.GetRealHeight(1022);
+ modeFl.BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor;
+ modeFl.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerBottomLeft);
+
+ ///鏃舵晥鎬у父寮�璁剧疆鏄剧ず鏂囨湰鎺т欢
+ button1.Y = Application.GetRealHeight(40);
+ button1.X = Application.GetRealWidth(58);
+ button1.Width = Application.GetRealWidth(600);
+ button1.Height = Application.GetRealHeight(60);
+ button1.Radius = (uint)Application.GetRealHeight(0);
+ button1.BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor;
+ button1.TextAlignment = TextAlignment.CenterLeft;
+ button1.TextColor = ZigbeeColor.Current.LogicTextBlackColor;
+ // Text = "鏃舵晥鎬у父寮�璁剧疆",
+ button1.TextID = MyInternationalizationString.timeSetSone;
+ button1.TextSize = 15;
+
+
+ ///涓嬩竴绾ц彍鍗曞浘鏍囨帶浠�
+ button2.Width = Application.GetMinRealAverage(104);
+ button2.Height = Application.GetMinRealAverage(104);
+ button2.X = Application.GetRealWidth(861);
+ button2.Y = Application.GetRealHeight(17);
+ button2.UnSelectedImagePath = "ZigeeLogic/nextIconSone.png";
+ button2.TextSize = 15;
+ button2.TextColor = ZigbeeColor.Current.LogicTextBlackColor;
+ button2.MouseUpEventHandler = (sender, e) =>
+ {
+
+ LogicView.TipView.ShowConfrimTip(() =>
+
+ {///鍐嶆纭
+ LogicView.TipView.ShowInputTip(true, async (str) =>
+ {///纭鍙戦�佸懡浠�
+ try
+ {
+ ///xm
+ var result = await UserCenter.DoorLock.DoorLockCommonInfo.SetNormallyOpenModeFuncAsync(Send.CurrentDoorLock);
+ if (!result)
+ {
+ LogicView.TipView.ShowFlashTip(Language.StringByID(MyInternationalizationString.openFailed));
+ return;
+ }
+ else
+ {
+ ///鍥犱负鏈夊父寮�妯″紡涓嬫墠鍙互鍒涘缓澶辨晥閫昏緫锛�
+ SkipView.GetLogicAll();//鍒犻櫎涔嬪墠鎵�鏈夊け鏁堥�昏緫
+ var addResult = await SkipView.LockAddModifyLogic(int.Parse(str), Send.CurrentDoorLock);//娣诲姞涓�鏉″け鏁堥�昏緫
+ if (!addResult)
+ {
+ ///鍙璇村鏋滃父寮�妯″紡寮�锛屽垱寤鸿嚜鍔ㄥ寲澶辫触锛岄偅涔堝皢瑕佸彂涓�鏉″父寮�妯″紡鍏抽棴鍛戒护;
+ UserCenter.DoorLock.DoorLockCommonInfo.DelNormallyOpenMode(Send.CurrentDoorLock);
+ ///鎻愮ず澶辫触
+ LogicView.TipView.ShowFlashTip(Language.StringByID(MyInternationalizationString.addFailed));
+ return;
+ }
+ Send.CurrentDoorLock.IsDoorLockNormallyMode = true;
+ ModeView();
+ //娣诲姞App寮�鍚父寮�妯″紡鐨勫巻鍙茶褰�
+ UserCenter.HdlDeviceDoorLockLogic.Current.AddDoorHistoryLog(Send.CurrentDoorLock, 9001, string.Empty);
+ }
+ }
+ catch
+ {
+
+ }
+ });
+
+ });
+
+ };
+ }
+
+ listLogicFl.Y = fLayout.Bottom;
+ listLogicFl.X = Application.GetRealWidth(58);
+ listLogicFl.Height = Application.GetRealHeight(Method.H - 184) - fLayout.Height;
+ listLogicFl.Width = Application.GetRealWidth(1022);
+ listLogicFl.BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor;
+ }
+ /// <summary>
/// 璇诲彇鑷姩鍖栧垪琛ㄦ暟鎹紱
/// </summary>
/// <param name="yes"></param>
@@ -472,6 +648,9 @@
}
}
+
+ RowLayout selectedRow = new RowLayout() { Tag = "0" };//璁板綍宸︽粦鐘舵��
+ int a = 1;
/// <summary>
/// 璁板綍宸︽粦鐘舵��
/// </summary>
@@ -575,7 +754,7 @@
TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor,
};
logicRow.AddRightView(edit);
-
+
///鍒犻櫎
var del = new Button
{
@@ -641,6 +820,6 @@
};
}
}
-
+
}
}
--
Gitblit v1.8.0