From ee888ab45a850245b1e1372375ba9040316086ab Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期四, 30 四月 2020 18:05:34 +0800
Subject: [PATCH] 2020-04-30
---
ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs | 156 +++++++++++++++++++++++++++++++++-------------------
1 files changed, 99 insertions(+), 57 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs b/ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs
index b84b75c..ae7f8e6 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs
@@ -11,12 +11,28 @@
/// <summary>
/// 缁橲one闂ㄩ攣寰愭鏇存柊鐣岄潰鐢ㄧ殑
/// </summary>
+ ///
public SoneLogicList()
{
Tag = "SoneLogic";
}
- public async void Show(Action action = null, bool bool_If = false)
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="action">缁欏緪姊呭埛鏂扮晫闈㈢敤鐨�</param>
+ /// <param name="bool_If"></param>
+ public async void Show(Action action, bool bool_If = false)
{
+ #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();
@@ -102,23 +118,37 @@
alert.ConfirmClickEvent += async () =>
{
- var bool_ = await UserCenter.DoorLock.DoorLockCommonInfo.DelNormallyOpenMode(new ZigBee.Device.DoorLock { });
- if (bool_)
- {
+ Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.DelNormallyOpenMode(Send.CurrentDoorLock, action);
- }
- else { }
- 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();
+ Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.LogicAction += (d) => {
+ this.RemoveFromParent();
+ var soneLogicList = new SoneLogicList();
+ UserView.HomePage.Instance.AddChidren(soneLogicList);
+ UserView.HomePage.Instance.PageIndex += 1;
+ soneLogicList.Show(() => { }, false);
+
+ };
+
+ /////xm
+ //var result = await SkipView.OpenMode(false, 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 {
+ // ///鎻愮ず澶辫触
+ //}
+
};
};
@@ -196,54 +226,66 @@
};
modeFl.AddChidren(nextIconBtn);
- var clickBtn = new Button
- {
- Y = Application.GetRealHeight(478),
- X = Application.GetRealWidth(58),
- Height = Application.GetRealHeight(138),
- Width = Application.GetRealWidth(1022),
- };
- // modeFl.AddChidren(clickBtn);
+
- nextIconBtn.MouseUpEventHandler += (sender, e) =>
+ nextIconBtn.MouseUpEventHandler += (sender, e) =>
{
- Logic.LogicView.TipView tipView = new LogicView.TipView();
- FrameLayout fLayout1 = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicTranslucentColor };
- this.AddChidren(fLayout1);
- tipView.ShowTip(fLayout1);
- //string msg = Language.StringByID(R.MyInternationalizationString.SetDoorLockNomallyOpen).Replace("{0}", "\r\n");
- //var confirm = Language.StringByID(R.MyInternationalizationString.Confrim);
- //var alert = new UserCenter.DoorLock.ShowDoorLockMsgControl(UserCenter.DoorLock.ShowDoorLockMsgControl.DoorLockMsgType.Confirm, msg, confirm);
- //alert.Show();
- //alert.ConfirmClickEvent += () =>
- // {
- // string msgTimeInValidSetting = Language.StringByID(R.MyInternationalizationString.DoorLockOpenAllTheTime);
- // var timeConfrim = Language.StringByID(R.MyInternationalizationString.Confrim);
- // var alertTimeInValidSetting = new UserCenter.DoorLock.ShowDoorLockMsgControl(UserCenter.DoorLock.ShowDoorLockMsgControl.DoorLockMsgType.InValid, msgTimeInValidSetting, timeConfrim);
- // alertTimeInValidSetting.Show();
- // alertTimeInValidSetting.InvalidTimeAction += async (obj) =>
- // {
+ Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.NomallyOpenModeInvalidTimeDialog(Send.CurrentDoorLock, action);
+ Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.LogicAction += (d) => {
+ this.RemoveFromParent();
+ var soneLogicList = new SoneLogicList();
+ UserView.HomePage.Instance.AddChidren(soneLogicList);
+ UserView.HomePage.Instance.PageIndex += 1;
+ soneLogicList.Show(() => { }, true);
- // var result = await new ZigBee.Device.DoorLock { }.SetNormallyOpenModeFuncAsync(true);
- // //var res = await Shared.Phone.Device.Logic.SkipView.LockAddModifyLogic(DoorLockCommonInfo.NormallyOpenModeInvalidTime, doorLock);
- // };
- // };
+ };
+ #region
+ /*
+ LogicView.TipView.ShowConfrimTip(() =>
+ {///鍐嶆纭
+ LogicView.TipView.ShowInputTip(true, async (str) =>
+ {///纭鍙戦�佸懡浠�
+ try
+ {
+ ///xm
+ var result = await SkipView.OpenMode(true,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);
- // //UserCenter.DoorLock.DoorLockCommonInfo.NomallyOpenModeInvalidTimeDialog(new ZigBee.Device.DoorLock { });
+ }
+ }
+ catch
+ {
- //UserCenter.DoorLock.DoorLockCommonInfo.NomallyOpenModeStartDialog(new ZigBee.Device.DoorLock { }, () =>
- //{
- //});
- // var d = await SkipView.LockAddModifyLogic(12, Send.CurrentDoorLock);
+ }
+ });
- // var contr = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Tip, "sdgdgdfhfhfhgjggfg");
- //contr.Show();
- //contr.ConfirmClickEvent += () =>
- // {
- // };
+ });
+ */
- //UserCenter.DoorLock.DoorLockCommonInfo.NomallyOpenModeInvalidTimeDialog();
+ #endregion
};
}
--
Gitblit v1.8.0