From d5b9ff8bf8cc36f5b13c46b66682f5988d3a6f36 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期五, 15 五月 2020 11:36:11 +0800
Subject: [PATCH] 2020-05-15-1
---
ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs | 572 ++++++++++++++++++++++++++++++++------------------------
1 files changed, 326 insertions(+), 246 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs b/ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs
index 4501171..18ab2aa 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs
@@ -8,46 +8,47 @@
{
public class SoneLogicList : FrameLayout
{
- /// <summary>
- /// 缁橲one闂ㄩ攣寰愭鏇存柊鐣岄潰鐢ㄧ殑
- /// </summary>
- ///
+ public static SoneLogicList soneLogicList;
public SoneLogicList()
{
Tag = "SoneLogic";
+ soneLogicList = this;
+
}
+ /// 缁欏緪姊呭埛鏂扮晫闈㈢敤鐨�
+ public Action<bool> action;
+ ///绗簩鍧楃涓�绾х埗鎺т欢
+ FrameLayout fLayout = new FrameLayout();
+ ///绗笁鍧楃涓�绾х埗鎺т欢
+ FrameLayout listLogicFl = new FrameLayout();
+ ///甯稿紑鑷姩鍖栧垪琛ㄤ笂涓嬫粦鍔ㄧ殑鎺т欢
+ VerticalRefreshLayout verticalRefresh = new VerticalRefreshLayout();
/// <summary>
- ///
+ /// 璁板綍閫昏緫id
/// </summary>
- /// <param name="action">缁欏緪姊呭埛鏂扮晫闈㈢敤鐨�</param>
- /// <param name="bool_If"></param>
- public async void Show(Action action, bool bool_If = false)
+ public int logicId = 0;
+ /// <summary>
+ /// 璁板綍閫変腑鏃堕棿
+ /// </summary>
+ public int timeValue = 0;
+ public async void Show()
{
- #region 寰愭鍙繖鏍峰仛鐨�
- string key = Send.CurrentDoorLock.DeviceAddr + "_" + Send.CurrentDoorLock.DeviceEpoint;
- if (Send.CurrentDoorLock.IsDoorLockNormallyMode.ContainsKey(key))
- {
- if (Send.CurrentDoorLock.IsDoorLockNormallyMode[key] == true)
- {
- bool_If = true;
- }
- }
- #endregion
+
#region 鐣岄潰鐨勫竷灞�浠ｇ爜
UserView.HomePage.Instance.ScrollEnabled = false;//閿佷綇宸︽粦
TopView view = new TopView();
this.AddChidren(view.TopRowView());
- view.toptitleNameBtn.TextID = MyInternationalizationString.selection;
+ view.toptitleNameBtn.TextID = MyInternationalizationString.openmode;
view.clickBtn.MouseDownEventHandler += (sender, e) =>
{
UserView.HomePage.Instance.ScrollEnabled = true;
+ //鎶婇潤鎬佸彉閲忕殑杩欎釜涓滆タ缃┖
+ soneLogicList = null;
+ this.RemoveFromParent();
if (action != null)
{
- action();
+ action(Send.CurrentDoorLock.IsDoorLockNormallyMode);
}
-
- RemoveFromParent();
-
};
var middle = new FrameLayout
@@ -58,208 +59,38 @@
};
this.AddChidren(middle);
#endregion
+ //鏄父寮�妯″紡鍐嶅幓璇诲彇
+ if (Send.CurrentDoorLock.IsDoorLockNormallyMode)
+ {
+ //杩涙潵鏇存柊涓�娆�
+ //鏌ユ壘鏄惁瀛樺湪鏃舵晥鎬ц嚜鍔ㄥ寲锛涙湁鐨勮瘽灏辫繑鍥炶嚜鍔ㄥ寲瀵硅薄;
+ var logic = await SkipView.GetLogicIfon(Send.CurrentDoorLock);
+ if (logic != null)
+ {
+ try
+ {
+ //杩涙潵鏇存柊涓�娆″��
+ logicId = logic.LogicId;
+ timeValue = int.Parse(logic.Conditions[0]["DoorLockOpenDelayTime"]);
+ }
+ catch { }
+ }
+ }
#region 甯稿紑妯″紡鍥炬爣 鏃舵晥鎬у父寮�璁剧疆
///绗簩鍧楃涓�绾х埗鎺т欢
- var fLayout = new FrameLayout
+ fLayout = new FrameLayout
{
Width = Application.GetRealWidth(1080),
Height = Application.GetRealHeight(829 - 184),
BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
};
middle.AddChidren(fLayout);
- ///甯稿紑妯″紡鍥炬爣
- var modeIconBtn = new Button
- {
- X = Application.GetRealWidth(395),
- Y = Application.GetRealHeight(92),
- Width = Application.GetMinRealAverage(294),
- Height = Application.GetMinRealAverage(294),
- UnSelectedImagePath = "ZigeeLogic/noMode.png",
- SelectedImagePath = "ZigeeLogic/openMode.png",
- };
- fLayout.AddChidren(modeIconBtn);
-
- if (bool_If)
- {
- /// 鏌ユ壘鏄惁瀛樺湪鏃舵晥鎬ц嚜鍔ㄥ寲锛涙湁鐨勮瘽灏辫繑鍥炶嚜鍔ㄥ寲瀵硅薄;
- var logic = await SkipView.GetLogicIfon();
-
- fLayout.Height = Application.GetRealHeight(780);//鏀瑰彉楂樺害
- modeIconBtn.IsSelected = true;//鏀瑰彉鍥炬爣鐘舵��
- ///绗簩绾х埗鎺т欢
- var openModeFl = new FrameLayout
- {
- Y = Application.GetRealHeight(455),
- Height = Application.GetRealHeight(127 + 199),
- Width = Application.GetRealWidth(1080),
- };
- fLayout.AddChidren(openModeFl);
- ///鍏抽棴鏃舵晥鎬ц嚜鍔ㄥ寲
- Button closeBtn = new Button
- {
- X = Application.GetRealWidth(86),
- Height = Application.GetRealHeight(127),
- Width = Application.GetRealWidth(907),
- Radius = (uint)Application.GetRealHeight(58),
- BackgroundColor = ZigbeeColor.Current.LogicBtnSaveBackgroundColor,
- TextID = MyInternationalizationString.closeUp,
- TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor,
- TextSize = 16,
- };
- openModeFl.AddChidren(closeBtn);
- closeBtn.MouseUpEventHandler += async (sender, e) =>
- {
- var result = await UserCenter.DoorLock.DoorLockCommonInfo.DelNormallyOpenMode(Send.CurrentDoorLock);
- if (result)
- {
- if (logic != null)
- {
- ///鏈夊彲鑳藉彧鏈夊父寮�妯″紡锛屾病鏈夋椂鏁堟�ц嚜鍔ㄥ寲
- ///娌℃湁鍒ゆ柇鐨勮瘽锛岄�昏緫浼氫负绌猴紝鎶涘嚭寮傚父;
- Send.DelLogic(logic.LogicId);
- }
- this.RemoveFromParent();
- var soneLogicList = new SoneLogicList();
- UserView.HomePage.Instance.AddChidren(soneLogicList);
- UserView.HomePage.Instance.PageIndex += 1;
- soneLogicList.Show(() => { }, false);
- }
- else
- {
- ///鎻愮ず澶辫触
- }
-
- };
-
- ///鏄剧ず澶辨晥璁剧疆鏃堕棿鏂囨湰鎺т欢
- var timeTextBtn = new Button
- {
- Y = Application.GetRealHeight(127 + 69),
- X = Application.GetRealWidth(225),
- Width = Application.GetRealWidth(634),
- Height = Application.GetRealHeight(60),
- TextSize = 15,
- TextColor = ZigbeeColor.Current.LogicTextBlackColor,
- Text = "鏃舵晥鎬у父寮�璁剧疆12:20",
- };
- if (logic != null)
- {
- ///鏈夋椂鏁堟�у父寮�鎵嶆樉绀烘椂闂存潯浠舵枃鏈�
- openModeFl.AddChidren(timeTextBtn);
- }
- ///鏃舵晥鎬у父寮�鍙湁涓�涓潯浠�;
- try
- {
- var y = DateTime.Now.ToString("yy");//閭ｄ竴骞�
- var m = DateTime.Now.ToString("mm");//閭ｄ竴鏈�
- var d = DateTime.Now.ToString("dd");//閭ｄ竴澶�
- var h = int.Parse(DateTime.Now.ToString("HH"));//褰撳墠绯荤粺鏃堕棿
- var me = DateTime.Now.ToLongDateString();
- var timeInt = int.Parse(logic.Conditions[0]["DoorLockOpenDelayTime"]);
- int dayInt = (h + timeInt) / 24;//绠楀嚭鍑犲ぉ鍚庢墽琛�
- int hour = (h + timeInt) % 24;//绠楀嚭鍑犲ぉ鍚庨偅涓椂闂存墽琛�
- timeTextBtn.Text = "鏃舵晥鎬у父寮�璁剧疆" + y + "骞�" + m + "鏈�" + d + dayInt + "鍙�" + timeInt + "鏃�" + "鎵ц";
- }
- catch { }
-
- }
- else
- {
- fLayout.Height = Application.GetRealHeight(645);//鏀瑰彉楂樺害
- modeIconBtn.IsSelected = false;//鏀瑰彉鍥炬爣鐘舵��
- ///绗簩绾х埗鎺т欢
- var modeFl = new FrameLayout
- {
- Y = Application.GetRealHeight(478),
- X = Application.GetRealWidth(58),
- Height = Application.GetRealHeight(138),
- Width = Application.GetRealWidth(1022),
- BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
- };
- fLayout.AddChidren(modeFl);
- modeFl.SetCornerWithSameRadius(Application.GetRealHeight(17), HDLUtils.RectCornerTopLeft);
- modeFl.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerBottomLeft);
- ///鏃舵晥鎬у父寮�璁剧疆鏄剧ず鏂囨湰鎺т欢
- var modeTextBtn = new Button
- {
-
- Y = Application.GetRealHeight(40),
- X = Application.GetRealWidth(58),
- Width = Application.GetRealWidth(600),
- Height = Application.GetRealHeight(60),
- TextSize = 15,
- TextColor = ZigbeeColor.Current.LogicTextBlackColor,
- TextAlignment = TextAlignment.CenterLeft,
- // Text = "鏃舵晥鎬у父寮�璁剧疆",
- TextID = MyInternationalizationString.timeSetSone,
- };
- modeFl.AddChidren(modeTextBtn);
- ///涓嬩竴绾ц彍鍗曞浘鏍囨帶浠�
- var nextIconBtn = new Button
- {
- Width = Application.GetMinRealAverage(104),
- Height = Application.GetMinRealAverage(104),
- X = Application.GetRealWidth(861),
- Y = Application.GetRealHeight(17),
- UnSelectedImagePath = "ZigeeLogic/next.png",
- };
- modeFl.AddChidren(nextIconBtn);
-
-
-
- nextIconBtn.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)
- {
- Application.RunOnMainThread(() =>
- {
- ///鎻愮ず澶辫触
- });
- return;
- }
- else
- {
- ///鍥犱负鏈夊父寮�妯″紡涓嬫墠鍙互鍒涘缓澶辨晥閫昏緫锛�
- SkipView.GetLogicAll();//鍒犻櫎涔嬪墠鎵�鏈夊け鏁堥�昏緫
- var addResult = await SkipView.LockAddModifyLogic(int.Parse(str), Send.CurrentDoorLock);//娣诲姞涓�鏉″け鏁堥�昏緫
- if (!addResult)
- {
- ///鎻愮ず澶辫触
- return;
- }
- this.RemoveFromParent();
- var soneLogicList = new SoneLogicList();
- UserView.HomePage.Instance.AddChidren(soneLogicList);
- UserView.HomePage.Instance.PageIndex += 1;
- soneLogicList.Show(() => { }, true);
-
- }
- }
- catch
- {
-
- }
- });
-
- });
-
- };
- }
-
+ ModeView();
#endregion
-
#region 甯稿紑鑷姩鍖�
///绗笁鍧楃涓�绾х埗鎺т欢
- var listLogicFl = new FrameLayout
+ listLogicFl = new FrameLayout
{
Y = fLayout.Bottom,
X = Application.GetRealWidth(58),
@@ -301,7 +132,16 @@
UnSelectedImagePath = "ZigeeLogic/add.png",
};
addLogicfL.AddChidren(addIconBtn);
- addIconBtn.MouseUpEventHandler += (sender, e) =>
+ ///鍔犲ぇ鐐瑰嚮鐑敭
+ var addIconclickBtn = new Button
+ {
+ Width = Application.GetRealWidth(90 + 69 + 63),
+ Height = Application.GetRealHeight(69),
+ X = Application.GetRealWidth(800),
+ Y = Application.GetRealHeight(60),
+ };
+ addLogicfL.AddChidren(addIconclickBtn);
+ addIconclickBtn.MouseUpEventHandler += (sender, e) =>
{
//璇诲彇绯荤粺褰撳墠鏃堕棿锛氭椂-鍒�
@@ -323,6 +163,9 @@
actionsInfo.Add("DeviceAddr", Send.CurrentDoorLock.DeviceAddr);
actionsInfo.Add("Epoint", "200");
actionsInfo.Add("PassData", "055704010113");//榛樿闂ㄩ攣甯稿叧
+ Dictionary<string, string> accounts = new Dictionary<string, string>();
+ accounts.Add("Option4", Send.CurrentDoorLock.DeviceAddr.ToString());//鐢ㄤ簬鍒ゆ柇璇嗗埆鏄摢涓棬閿�;
+ accounts.Add("Option2", Send.CurrentDoorLock.DeviceEpoint.ToString());
//new涓�涓柊閫昏緫瀵硅薄锛�
//鏂板闂ㄩ攣甯稿紑妯″紡鑷姩鍖栧叆鍙ｏ紱
Common.Logic.CurrentLogic = new Common.Logic();
@@ -331,6 +174,7 @@
Common.Logic.CurrentLogic.LogicName = Language.StringByID(MyInternationalizationString.openmode);
Common.Logic.CurrentLogic.Conditions.Add(timeConditionsInfo);//娣诲姞鏉′欢
Common.Logic.CurrentLogic.Actions.Add(actionsInfo);//娣诲姞鐩爣
+ Common.Logic.CurrentLogic.Accounts.Add(accounts);
var oneLogic = new OneLogic();
UserView.HomePage.Instance.AddChidren(oneLogic);
UserView.HomePage.Instance.PageIndex += 1;
@@ -339,7 +183,7 @@
};
///甯稿紑鑷姩鍖栧垪琛ㄤ笂涓嬫粦鍔ㄧ殑鎺т欢
- var verticalRefresh = new VerticalRefreshLayout
+ verticalRefresh = new VerticalRefreshLayout
{
Y = addLogicfL.Bottom,
@@ -351,17 +195,254 @@
verticalRefresh.BeginHeaderRefreshingAction += () =>
{
Common.Logic.SoneLogicList.Clear();
- Read(verticalRefresh, false);
+ Read(false);
verticalRefresh.EndHeaderRefreshing();
};
- Read(verticalRefresh, true);
+ Read(true);
#endregion
+
+ UserCenter.DoorLock.DoorLockCommonInfo.LogicAction = (_bool) =>
+ {
+
+ try
+ {
+ Application.RunOnMainThread(() =>
+ {
+ Send.CurrentDoorLock.IsDoorLockNormallyMode = _bool;
+ ModeView();
+ });
+ }
+ catch { }
+ };
+
+ }
+ /// <summary>
+ /// 甯稿紑妯″紡寮�鍏冲垏鎹㈠浘鏍囩晫闈�
+ /// </summary>
+ public void ModeView()
+ {
+
+ fLayout.RemoveAll();
+ ///甯稿紑妯″紡鍥炬爣
+ Button modeIconBtn = new Button
+ {
+ X = Application.GetRealWidth(395),
+ Y = Application.GetRealHeight(92),
+ Width = Application.GetMinRealAverage(294),
+ Height = Application.GetMinRealAverage(294),
+ };
+ fLayout.AddChidren(modeIconBtn);
+ if (Send.CurrentDoorLock.IsDoorLockNormallyMode)
+ {
+
+ fLayout.Height = Application.GetRealHeight(780);//鏀瑰彉楂樺害
+ modeIconBtn.UnSelectedImagePath = "ZigeeLogic/openMode.png";//鏀瑰彉鍥炬爣鐘舵��
+ ///绗簩绾х埗鎺т欢
+ var openModeFl = new FrameLayout
+ {
+ Y = Application.GetRealHeight(455),
+ Height = Application.GetRealHeight(127 + 199),
+ Width = Application.GetRealWidth(1080),
+ };
+ fLayout.AddChidren(openModeFl);
+ ///鍏抽棴鏃舵晥鎬ц嚜鍔ㄥ寲
+ Button closeBtn = new Button
+ {
+ X = Application.GetRealWidth(86),
+ Height = Application.GetRealHeight(127),
+ Width = Application.GetRealWidth(907),
+ Radius = (uint)Application.GetRealHeight(58),
+ BackgroundColor = ZigbeeColor.Current.LogicBtnSaveBackgroundColor,
+ TextID = MyInternationalizationString.closeUp,
+ TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor,
+ TextSize = 16,
+ };
+ openModeFl.AddChidren(closeBtn);
+ closeBtn.MouseUpEventHandler += async (sender, e) =>
+ {
+ CommonPage.Loading.Start();
+ try
+ {
+ var result = await UserCenter.DoorLock.DoorLockCommonInfo.DelNormallyOpenMode(Send.CurrentDoorLock);
+ if (result)
+ {
+ if (logicId != 0)
+ {
+
+ ///鏈夊彲鑳藉彧鏈夊父寮�妯″紡锛屾病鏈夋椂鏁堟�ц嚜鍔ㄥ寲
+ Send.DelLogic(logicId);
+ }
+ Send.CurrentDoorLock.IsDoorLockNormallyMode = false;
+ ModeView();
+ }
+ else
+ {
+ LogicView.TipView.ShowFlashTip(Language.StringByID(MyInternationalizationString.closeFailed));
+ }
+ }
+ catch { }
+ finally
+ {
+ Application.RunOnMainThread(() =>
+ {
+ CommonPage.Loading.Hide();
+
+ });
+ }
+ };
+
+ ///鏄剧ず澶辨晥璁剧疆鏃堕棿鏂囨湰鎺т欢
+ var timeTextBtn = new Button
+ {
+ Y = Application.GetRealHeight(127 + 69),
+ X = Application.GetRealWidth(125),
+ Width = Application.GetRealWidth(634 + 200),
+ Height = Application.GetRealHeight(60),
+ TextSize = 15,
+ TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+ };
+ if (logicId != 0)
+ {
+ openModeFl.AddChidren(timeTextBtn);
+ ///鏈夋椂鏁堟�у父寮�鎵嶆樉绀烘椂闂存潯浠舵枃鏈�
+ 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"));//褰撳墠绯荤粺鏃堕棿
+ int dayInt = (h + timeValue) / 24;//绠楀嚭鍑犲ぉ鍚庢墽琛�
+ int hour = (h + timeValue) % 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);
+ timeTextBtn.Text = text1 + y + text2 + m + text3 + days.ToString() + text4 + hour.ToString() + text5;
+ }
+
+
+ }
+ else
+ {
+ fLayout.Height = Application.GetRealHeight(645);//鏀瑰彉楂樺害
+ modeIconBtn.UnSelectedImagePath = "ZigeeLogic/noMode.png";//鏀瑰彉鍥炬爣鐘舵��
+ ///绗簩绾х埗鎺т欢
+ var modeFl = new FrameLayout
+ {
+ Y = Application.GetRealHeight(478),
+ X = Application.GetRealWidth(58),
+ Height = Application.GetRealHeight(138),
+ Width = Application.GetRealWidth(1022),
+ BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
+ };
+ fLayout.AddChidren(modeFl);
+ modeFl.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerBottomLeft);
+ ///鏃舵晥鎬у父寮�璁剧疆鏄剧ず鏂囨湰鎺т欢
+ var modeTextBtn = new Button
+ {
+
+ Y = Application.GetRealHeight(40),
+ X = Application.GetRealWidth(58),
+ Width = Application.GetRealWidth(600),
+ Height = Application.GetRealHeight(60),
+ TextSize = 15,
+ TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+ TextAlignment = TextAlignment.CenterLeft,
+ // Text = "鏃舵晥鎬у父寮�璁剧疆",
+ TextID = MyInternationalizationString.timeSetSone,
+ };
+ modeFl.AddChidren(modeTextBtn);
+ ///涓嬩竴绾ц彍鍗曞浘鏍囨帶浠�
+ var nextIconBtn = new Button
+ {
+ Width = Application.GetMinRealAverage(104),
+ Height = Application.GetMinRealAverage(104),
+ X = Application.GetRealWidth(861),
+ Y = Application.GetRealHeight(17),
+ UnSelectedImagePath = "ZigeeLogic/nextIconSone.png",
+ };
+ modeFl.AddChidren(nextIconBtn);
+
+ ///鍔犲ぇ鐐瑰嚮鐑敭
+ var clickBtn = new Button
+ {
+ Width = Application.GetRealWidth(104 + 161 + 30),
+ Height = Application.GetRealHeight(138),
+ X = Application.GetRealWidth(700),
+ };
+ modeFl.AddChidren(clickBtn);
+ clickBtn.MouseUpEventHandler += (sender, e) =>
+ {
+
+ LogicView.TipView.ShowConfrimTip(() =>
+ {///鍐嶆纭
+ LogicView.TipView.ShowInputTip(true, async (str) =>
+ {///纭鍙戦�佸懡浠�
+ CommonPage.Loading.Start();
+ try
+ {
+ ///xm
+ var result = await UserCenter.DoorLock.DoorLockCommonInfo.SetNormallyOpenModeFuncAsync(Send.CurrentDoorLock);
+ if (!result)
+ {
+ LogicView.TipView.ShowFlashTip(Language.StringByID(MyInternationalizationString.openFailed));
+ return;
+ }
+ else
+ {
+ ///鍥犱负鏈夊父寮�妯″紡涓嬫墠鍙互鍒涘缓澶辨晥閫昏緫锛�
+ SkipView.GetLogicAll(Send.CurrentDoorLock);//鍒犻櫎涔嬪墠鎵�鏈夊け鏁堥�昏緫
+ var addResult = await SkipView.LockAddModifyLogic(int.Parse(str), Send.CurrentDoorLock);//娣诲姞涓�鏉″け鏁堥�昏緫
+ if (addResult == 0)
+ {
+ ///鍙璇村鏋滃父寮�妯″紡寮�锛屽垱寤鸿嚜鍔ㄥ寲澶辫触锛岄偅涔堝皢瑕佸彂涓�鏉″父寮�妯″紡鍏抽棴鍛戒护;
+ UserCenter.DoorLock.DoorLockCommonInfo.DelNormallyOpenMode(Send.CurrentDoorLock);
+ ///鎻愮ず澶辫触
+ LogicView.TipView.ShowFlashTip(Language.StringByID(MyInternationalizationString.addFailed));
+ return;
+ }
+ else
+ {
+ logicId = addResult;
+ timeValue = int.Parse(str);
+ Send.CurrentDoorLock.IsDoorLockNormallyMode = true;
+ ModeView();
+ ///娣诲姞APP寮�鍚父寮�妯″紡鐨勫巻鍙茶褰�
+ UserCenter.HdlDeviceDoorLockLogic.Current.AddDoorHistoryLog(Send.CurrentDoorLock, 9001, string.Empty);
+ }
+
+
+ }
+ }
+ catch
+ {
+
+ }
+ finally
+ {
+ Application.RunOnMainThread(() =>
+ {
+ CommonPage.Loading.Hide();
+
+ });
+ }
+ });
+
+ });
+
+ };
+ }
+ 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="verticalRefresh"></param>
- private async void Read(VerticalRefreshLayout verticalRefresh, bool yes)
+ /// <param name="yes"></param>
+ private async void Read( bool yes)
{
if (yes)
{
@@ -382,7 +463,10 @@
{
continue;
}
- Common.Logic.SoneLogicList.Add(logic);
+ if (SkipView.ExistLogic(logic, Send.CurrentDoorLock))
+ {
+ Common.Logic.SoneLogicList.Add(logic);
+ }
}
}
}
@@ -392,7 +476,7 @@
var dd = e.Message;
}
//鑷姩鍖�
- RefreshView(verticalRefresh);
+ RefreshView();
if (yes)
{
CommonPage.Loading.Hide();
@@ -400,44 +484,44 @@
}
}
/// <summary>
+ /// 璁板綍宸︽粦鐘舵��
+ /// </summary>
+ RowLayout selectedRow = new RowLayout() { Tag = "0" };
+ int a = 1;
+ /// <summary>
/// 鍔犺浇鑷姩鍖栧垪琛�
/// </summary>
- /// <param name="verticalRefresh"></param>
- private void RefreshView(VerticalRefreshLayout verticalRefresh)
+ public void RefreshView()
{
verticalRefresh.RemoveAll();
- for (int i = 0; i < 6; i++)
- {
- Common.Logic.SoneLogicList.Add(new Common.Logic { LogicName = i.ToString() });
-
- }
foreach (var logic in Common.Logic.SoneLogicList)
{
#region 鑷姩鍖栧竷灞�View
-
///鑷姩鍖栫埗鎺т欢
- var fLayout = new FrameLayout
+ var fLayoutLogic = new FrameLayout
{
Height = Application.GetRealHeight(184),
};
- verticalRefresh.AddChidren(fLayout);
+ verticalRefresh.AddChidren(fLayoutLogic);
///宸﹀彸鍙粦鍔ㄦ帶浠�
var logicRow = new RowLayout
{
LineColor = ZigbeeColor.Current.LogicBackgroundColor,
BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
SubViewWidth = Application.GetRealWidth(184),//鏀瑰彉缂栬緫鎺т欢瀹藉害澶氬皯锛�
+ Tag = a.ToString(),
};
- fLayout.AddChidren(logicRow);
+ fLayoutLogic.AddChidren(logicRow);
//宸︽粦鑿滃崟浜嬩欢
logicRow.OpenMenuAction += () =>
{
- //if (selectedRow.Tag.ToString() != logicRowlayout.Tag.ToString())
- //{ //淇濈暀宸︽粦鍙湁涓�涓�;
- // selectedRow.HideMenu();//
- //}
- //selectedRow = logicRowlayout;
+ if (selectedRow.Tag.ToString() != logicRow.Tag.ToString())
+ { //淇濈暀宸︽粦鍙湁涓�涓�;
+ selectedRow.HideMenu();//
+ }
+ selectedRow = logicRow;
};
+ a++;
///鏄剧ず閫昏緫鍚嶇О鐨勬帶浠�
var nameBtn = new Button
{
@@ -502,10 +586,7 @@
TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor,
};
logicRow.AddRightView(edit);
- if (logic.LogicType == 2)
- {
- edit.TextID = MyInternationalizationString.look;
- }
+
///鍒犻櫎
var del = new Button
{
@@ -517,12 +598,12 @@
///绾跨殑鎺т欢
var line = new Button
{
- Y = fLayout.Height - 1,
+ Y = fLayoutLogic.Height - 1,
Height = 1,
Width = Application.GetRealWidth(976),
BackgroundColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
};
- fLayout.AddChidren(line);
+ fLayoutLogic.AddChidren(line);
#endregion
///寮�鍏崇偣鍑讳簨浠�
switchBtn.MouseUpEventHandler += (sender1, e1) =>
@@ -564,14 +645,13 @@
{
Common.Logic.SoneLogicList.Remove(logic);
//logicRow.Parent.RemoveFromParent();
- fLayout.RemoveFromParent();
+ fLayoutLogic.RemoveFromParent();
Send.DelLogic(logic.LogicId);
};
};
}
-
-
}
+
}
}
--
Gitblit v1.8.0