From b68cdc7e103a00d5df73e4b75603be8da1815b4a Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期三, 29 四月 2020 13:59:52 +0800
Subject: [PATCH] 上传版本
---
ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs | 235 +++++++++++++++++++++++-----------------------------------
1 files changed, 95 insertions(+), 140 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs b/ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs
index 78b35c0..ca15989 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs
@@ -15,10 +15,10 @@
/// </summary>
public static void SkipAddLogic(int intvalue, DoorLock doorLock = null, UserCenter.MemberInfoRes accountObj = null)
{
- /// 0.姝ｅ父鑷姩鍖�;1.闂ㄩ攣鑷姩鍖�;2.闂ㄩ攣甯稿紑.鍏�;
+ /// 0.姝ｅ父鑷姩鍖�;1.闂ㄩ攣鑷姩鍖�;2.Sone闂ㄩ攣;
switch (intvalue)
{
- case 0:
+ case 0:
{
//new涓�涓柊閫昏緫瀵硅薄锛�
//鏂板姝ｅ父鑷姩鍖栧叆鍙�
@@ -30,75 +30,57 @@
UserView.HomePage.Instance.AddChidren(addLogicPage);
UserView.HomePage.Instance.PageIndex += 1;
addLogicPage.Show();
- }
+
+ }
break;
- case 1:
+ case 1:
{
//杩涘叆闂ㄩ攣鑱斿姩浜嬩欢鍏ュ彛
- Send.UserMemberInfoRes = accountObj;
- Send.CurrentDoorLock = doorLock;
- if (accountObj == null)
- {
- ///闃叉鎶涘紓甯�
- Send.UserMemberInfoRes = new UserCenter.MemberInfoRes();
- }
- if (doorLock == null)
- {
- ///闃叉鎶涘紓甯�
- Send.CurrentDoorLock = new DoorLock();
- }
- ///杩涙潵鍒锋柊涓�娆¤澶囧垪琛紱
- Common.Logic.LogicDviceList.Clear();
- if (Common.Logic.LogicDviceList.Count == 0)
- {
- Common.Logic.LogicDviceList.AddRange(LocalDevice.Current.listAllDevice.ToArray());
- }
- var doorLockLogicList = new DoorLockLogic.LockLogicList();
- UserView.HomePage.Instance.AddChidren(doorLockLogicList);
- UserView.HomePage.Instance.PageIndex += 1;
- doorLockLogicList.Show();
- }
- break;
- case 2:
- {
+ Send.UserMemberInfoRes = accountObj;
+ Send.CurrentDoorLock = doorLock;
+ if (accountObj == null)
+ {
+ ///闃叉鎶涘紓甯�
+ Send.UserMemberInfoRes = new UserCenter.MemberInfoRes();
+ }
+ if (doorLock == null)
+ {
+ ///闃叉鎶涘紓甯�
+ Send.CurrentDoorLock = new DoorLock();
+ }
+ ///杩涙潵鍒锋柊涓�娆¤澶囧垪琛紱
Common.Logic.LogicDviceList.Clear();
if (Common.Logic.LogicDviceList.Count == 0)
{
Common.Logic.LogicDviceList.AddRange(LocalDevice.Current.listAllDevice.ToArray());
}
- //璇诲彇绯荤粺褰撳墠鏃堕棿锛氭椂-鍒�
- //璇诲彇绯荤粺褰撳墠鏃堕棿锛氭椂-鍒�
- var h = DateTime.Now.ToString("HH");
- var m = DateTime.Now.ToString("mm");
- Dictionary<string, string> timeConditionsInfo = new Dictionary<string, string>();
- timeConditionsInfo.Add("Type", "0");
- timeConditionsInfo.Add("IsValid", "1");
- timeConditionsInfo.Add("DateType", "0");
- timeConditionsInfo.Add("RemindTime", "0");
- timeConditionsInfo.Add("EnDelay", "0");
- timeConditionsInfo.Add("DelayTime", "0");
- timeConditionsInfo.Add("DoorLockOpenDelayTime", "0");
- timeConditionsInfo.Add("StartHour", h);
- timeConditionsInfo.Add("StartMin", m);
- Dictionary<string, object> actionsInfo = new Dictionary<string, object>();
- actionsInfo.Add("LinkType", 8);
- actionsInfo.Add("DeviceAddr", doorLock.DeviceAddr);
- actionsInfo.Add("Epoint", doorLock.DeviceEpoint);
- actionsInfo.Add("PassData", "055704010113");//榛樿闂ㄩ攣甯稿叧
-
- //new涓�涓柊閫昏緫瀵硅薄锛�
- //鏂板闂ㄩ攣甯稿紑妯″紡鑷姩鍖栧叆鍙ｏ紱
- Common.Logic.CurrentLogic = new Common.Logic();
- Common.Logic.CurrentLogic.IsEnable = 1;//榛樿涓哄紑
- Common.Logic.CurrentLogic.LogicType = 2;//鏍囪閫昏緫绫诲瀷
- Common.Logic.CurrentLogic.LogicName = Language.StringByID(MyInternationalizationString.openmode);
- Common.Logic.CurrentLogic.Conditions.Add(timeConditionsInfo);//娣诲姞鏉′欢
- Common.Logic.CurrentLogic.Actions.Add(actionsInfo);//娣诲姞鐩爣
- var oneLogic = new OneLogic();
- UserView.HomePage.Instance.AddChidren(oneLogic);
+ var doorLockLogicList = new DoorLockLogic.LockLogicList();
+ UserView.HomePage.Instance.AddChidren(doorLockLogicList);
UserView.HomePage.Instance.PageIndex += 1;
- oneLogic.Show(false);
- }
+ doorLockLogicList.Show();
+ }
+ break;
+ case 2:
+ {
+ ///Sone闂ㄩ攣涓诲叆鍙�
+ if (doorLock == null)
+ {
+ ///闃叉鎶涘紓甯�
+ doorLock = new DoorLock();
+ }
+ Send.CurrentDoorLock = doorLock;
+ ///杩涙潵鍒锋柊涓�娆¤澶囧垪琛紱
+ Common.Logic.LogicDviceList.Clear();
+ if (Common.Logic.LogicDviceList.Count == 0)
+ {
+ Common.Logic.LogicDviceList.AddRange(LocalDevice.Current.listAllDevice.ToArray());
+ }
+ var addLogicPage = new SoneLogicList();
+ UserView.HomePage.Instance.AddChidren(addLogicPage);
+ UserView.HomePage.Instance.PageIndex += 1;
+ addLogicPage.Show();
+
+ }
break;
}
@@ -106,7 +88,6 @@
#region 鈼� 鑷姩鍖朹_________________________
-
/// <summary>
/// 鑷姩鍖栧姛鑳戒唬鐮佸叆鍙�
/// </summary>
@@ -180,8 +161,8 @@
X = Application.GetRealWidth(58),
Y = scenehorizontalScrol.Bottom,
};
- functionSceneAutoBodyView.AddChidren(logicScrolView);
-
+ functionSceneAutoBodyView.AddChidren(logicScrolView);
+
logicScrolView.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerTopLeft);
bool no = false;
//鏄剧ず榛樿妯℃澘鐨勭晫闈簨浠�
@@ -286,9 +267,9 @@
Read(logicScrolView, no);
//鍏抽棴鍒锋柊View锛�
logicScrolView.EndHeaderRefreshing();
- };
-
- //鑷姩鍖�
+ };
+
+ //鑷姩鍖�
Read(logicScrolView, no);
}
@@ -341,6 +322,7 @@
Automationview(logicScrolView, no);
CommonPage.Loading.Hide();
}
+ static RowLayout selectedRow = new RowLayout() { Tag = "0" };//璁板綍宸︽粦鐘舵��
/// <summary>
/// 鍔犺浇鑷姩鍖栧垪琛ㄧ晫闈�
/// </summary>
@@ -363,8 +345,8 @@
var noIconBtn = new Button
{
Y = Application.GetRealHeight(294 - 55),
- Width = Application.GetMinRealAverage(756),
- Height = Application.GetMinRealAverage(434),
+ Width = Application.GetMinRealAverage(757),
+ Height = Application.GetMinRealAverage(435),
UnSelectedImagePath = "Item/NoFunction.png",
X = Application.GetRealWidth(104),
};
@@ -417,17 +399,27 @@
LineColor = ZigbeeColor.Current.LogicBackgroundColor,
BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
SubViewWidth = Application.GetRealWidth(184),//鏀瑰彉缂栬緫鎺т欢瀹藉害澶氬皯锛�
+ Tag = i.ToString(),
};
fLayout.AddChidren(logicRowlayout);
+ //宸︽粦鑿滃崟浜嬩欢
+ logicRowlayout.OpenMenuAction += () =>
+ {
+ if (selectedRow.Tag.ToString() != logicRowlayout.Tag.ToString())
+ { //淇濈暀宸︽粦鍙湁涓�涓�;
+ selectedRow.HideMenu();//
+ }
+ selectedRow = logicRowlayout;
+ };
if (i == 1)
{
//瀹炵幇android鏄剧ず閫昏緫鍒楄〃鐨勫渾瑙�;
fLayout.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerTopLeft);
logicRowlayout.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerTopLeft);
- i = 2;
- }
-
+
+ }
+ i++;
var logicnameBtn = new Button
{
Height = Application.GetRealHeight(58),
@@ -524,13 +516,13 @@
{
var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Confirm,
Language.StringByID(MyInternationalizationString.doyouwanttodelete),
- Language.StringByID(MyInternationalizationString.confrim));
- alert.Show();
- alert.ConfirmClickEvent += () =>
+ Language.StringByID(MyInternationalizationString.confrim));
+ alert.Show();
+ alert.ConfirmClickEvent += () =>
{
Common.Logic.LogicList.Remove(logic);
Automationview(refresview, no);
- Send.DelLogic(logic.LogicId);
+ Send.DelLogic(logic.LogicId);
};
};
@@ -542,9 +534,9 @@
Width = Application.GetRealWidth(1080 - 58),
BackgroundColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
};
- fLayout.AddChidren(line);
-
-
+ fLayout.AddChidren(line);
+
+
}
}
@@ -582,8 +574,8 @@
{
indexlist.Add(linkType);
}
- }
- //鎺掑垪鍥炬爣椤哄簭;
+ }
+ //鎺掑垪鍥炬爣椤哄簭;
if (indexlist.Contains("0") || indexlist.Contains("8"))
{
iconIndexlist.Add("0");
@@ -703,7 +695,6 @@
}
}
}
-
#endregion
/// <summary>
@@ -740,12 +731,11 @@
currentLogic.LogicName = Language.StringByID(R.MyInternationalizationString.openmode);
currentLogic.Conditions.Add(timeConditionsInfo);
currentLogic.Actions.Add(actionsInfo);
- Exist(3);//鏌ユ壘鏄惁瀛樺湪璁剧疆杩囧け鏁堟椂闂�(鏈夌殑璇濆垹闄わ紝鍐嶆坊鍔�)
var logicIfon = await Send.AddModifyLogic(currentLogic);
- if (logicIfon != null && logicIfon.LogicId != 0)
- {
- //娣诲姞闂ㄩ攣澶辨晥鏃堕棿鐨勫巻鍙茶褰�
- UserCenter.HdlDeviceDoorLockLogic.Current.AddDoorHistoryLog((DoorLock)common, 9003, timeVlaue.ToString());
+ if (logicIfon != null && logicIfon.LogicId != 0)
+ {
+ //娣诲姞闂ㄩ攣澶辨晥鏃堕棿鐨勫巻鍙茶褰�
+ UserCenter.HdlDeviceDoorLockLogic.Current.AddDoorHistoryLog((DoorLock)common, 9003, timeVlaue.ToString());
return true;//琛ㄧず娣诲姞鎴愬姛;
}
return false;//琛ㄧず娣诲姞澶辫触;
@@ -753,73 +743,38 @@
}
///<summary>
- /// s-one闂ㄩ攣鏄惁瀛樺湪鑷姩鍖栫殑鏂规硶(true涓哄瓨鍦�)
+ /// s-one闂ㄩ攣鏄惁瀛樺湪鑷姩鍖栫殑鏂规硶;
+ /// 娉ㄦ剰(鍙傛暟:2-甯稿紑鑷姩鍖�;3-澶辨晥鏃堕棿鑷姩鍖�);
+ /// 杩斿洖鍊硷細0涓嶅瓨鍦�;鍏跺畠鍊奸兘瀛樺湪;
/// </summary>
- public static async System.Threading.Tasks.Task<bool> Exist(int valueInt = 2)
+ public static async System.Threading.Tasks.Task<int> Exist(int valueInt)
{
- bool exist = false;
+ int exist = 0;
var Idlist = await Send.GetLogicId(valueInt);
if (Idlist.Count != 0)
{
- if (valueInt == 3)
- {
- for (int i = 0; i < Idlist.Count; i++)
- {
- //valueInt=3涓�鏉＄壒娈婄殑鑷姩鍖�(鐢ㄦ潵璁剧疆澶辨晥鏃堕棿)
- Send.DelLogic(Idlist[i]);
- }
- }
- exist = true;
+ //榛樿鍙栫涓�涓�昏緫ID
+ exist = Idlist[0];
+
}
return exist;
}
///<summary>
- /// s-one闂ㄩ攣纭鍙栨秷(浣挎弧瓒虫潯浠舵墍鏈夐�昏緫澶辫兘涓�娆�)鍙戦�佺殑鏂规硶
+ ///鑾峰彇閫昏緫淇℃伅
+ /// 杩斿洖鍊硷細null涓嶅瓨鍦�;鍏跺畠鍊奸兘瀛樺湪;
/// </summary>
- public static async void LockCloseLogic(CommonDevice common)
+ public static async System.Threading.Tasks.Task<Common.Logic> GetLogicIfon()
{
- //璇诲彇绯荤粺褰撳墠鏃堕棿锛氭椂-鍒�
- int h = int.Parse(DateTime.Now.ToString("HH"));
- int m = int.Parse(DateTime.Now.ToString("mm"));
- //杞寲涓哄灏戝垎閽�;
- int s = h * 60 + m;
- var logicList = new List<Common.Logic>();
- logicList.Clear();
- var Idlist = await Send.GetLogicId(2);
+ Common.Logic logic = null;
+ var Idlist = await Send.GetLogicId(3);
if (Idlist.Count != 0)
- { //鍏堝幓璇诲彇缃戝叧鐪嬫槸鍚﹀瓨鍦ㄦ暟鎹�;
- var list = await Send.ReadList(Idlist.Count, 2);
- for (int j = 0; j < list.Count; j++)
- {
- var logic = list[j];
- foreach (var conditions in logic.Conditions)
- {
- var linkType = conditions["Type"];
- if (linkType == "5")
- {
- int startMin = int.Parse(conditions["StartMin"]);
- int startHour = int.Parse(conditions["StartHour"]);
- int stopMin = int.Parse(conditions["StopMin"]);
- int stopHour = int.Parse(conditions["StopHour"]);
- int s1 = startMin + startHour * 60;//寮�濮嬫椂闂村��
- int s2 = stopMin + stopHour * 60;//缁撴潫鏃堕棿鍊�
- if (s >= s1 && s <= s2)
- {
- //鏌ユ壘绯荤粺鏃堕棿鍊兼槸鍚﹀睘浜庤繖涓寖鍥达紱
- logicList.Add(logic);
- }
- }
- }
-
- }
- }
- foreach (var logic in logicList)
{
- logic.IsEnable = 3;//鏀瑰彉閫昏緫浣胯兘鐘舵��;
- //鐢╢oreach鍙戦�佸懡浠わ紱
- Send.AddModifyLogic(logic);
+ //榛樿鍙栫涓�涓�昏緫ID(鏃舵晥鎬у彧鏈変竴鏉￠�昏緫)
+ int exist = Idlist[0];
+ logic = await Send.GetLogic(exist, 3);
}
+ return logic;
}
}
}
--
Gitblit v1.8.0