From 323876bfe85fc2684871d5d95c213c6e2713f3f4 Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期三, 15 四月 2020 16:07:32 +0800
Subject: [PATCH] 2020-04-15-1
---
ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs | 261 ++++++++++++++++++++++++++++-----------------------
1 files changed, 142 insertions(+), 119 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs b/ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs
index 133f08d..833f0dd 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs
@@ -13,12 +13,13 @@
/// <summary>
/// 鍏跺畠鐣岄潰璺宠繘鏉ョ殑鍏ュ彛
/// </summary>
- public static void SkipAddLogic(int intvalue,DoorLock doorLock=null,UserCenter.MemberInfoRes accountObj = null)
+ public static void SkipAddLogic(int intvalue, DoorLock doorLock = null, UserCenter.MemberInfoRes accountObj = null)
{
/// 0.姝ｅ父鑷姩鍖�;1.闂ㄩ攣鑷姩鍖�;2.闂ㄩ攣甯稿紑.鍏�;
switch (intvalue)
{
- case 0: {
+ case 0:
+ {
//new涓�涓柊閫昏緫瀵硅薄锛�
//鏂板姝ｅ父鑷姩鍖栧叆鍙�
Common.Logic.CurrentLogic = new Common.Logic();
@@ -29,15 +30,17 @@
UserView.HomePage.Instance.AddChidren(addLogicPage);
UserView.HomePage.Instance.PageIndex += 1;
addLogicPage.Show();
- } break;
- case 1: {
+ }
+ break;
+ case 1:
+ {
//杩涘叆闂ㄩ攣鑱斿姩浜嬩欢鍏ュ彛
Send.UserMemberInfoRes = accountObj;
Send.CurrentDoorLock = doorLock;
if (accountObj == null)
{
///闃叉鎶涘紓甯�
- Send.UserMemberInfoRes = new UserCenter.MemberInfoRes();
+ Send.UserMemberInfoRes = new UserCenter.MemberInfoRes();
}
if (doorLock == null)
{
@@ -54,51 +57,49 @@
UserView.HomePage.Instance.AddChidren(doorLockLogicList);
UserView.HomePage.Instance.PageIndex += 1;
doorLockLogicList.Show();
- } break;
- case 2: {
+ }
+ break;
+ case 2:
+ {
Common.Logic.LogicDviceList.Clear();
if (Common.Logic.LogicDviceList.Count == 0)
{
Common.Logic.LogicDviceList.AddRange(LocalDevice.Current.listAllDevice.ToArray());
}
- int h =int.Parse(DateTime.Now.ToString("hh"));
- int m = int.Parse(DateTime.Now.ToString("mm"));
- //榛樿涓�涓椂闂存(寮�濮嬫椂闂翠负:绯荤粺褰撳墠锛岀粨鏉熸椂闂翠负:寮�濮嬫椂闂�+1涓椂闂�)
- Dictionary<string, string> timeDictionary = new Dictionary<string, string>();
- timeDictionary.Add("Type", "5");
- timeDictionary.Add("IsValid", "1");
- timeDictionary.Add("StartHour", h.ToString());
- timeDictionary.Add("StartMin", m.ToString());
- if (h + 1 == 24)
- {
- //缁撴潫鏃堕棿瓒呭嚭24灏忔椂澶勭悊鏂规硶;
- timeDictionary.Add("StopHour", h.ToString());
- timeDictionary.Add("StopMin", "59");
- }
- else
- {
- timeDictionary.Add("StopHour", (h + 1).ToString());
- timeDictionary.Add("StopMin", m.ToString());
- }
+ //璇诲彇绯荤粺褰撳墠鏃堕棿锛氭椂-鍒�
+ //璇诲彇绯荤粺褰撳墠鏃堕棿锛氭椂-鍒�
+ 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", "055704010112");//榛樿闂ㄩ攣甯稿紑
-
+ 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.automation1);
- Common.Logic.CurrentLogic.Conditions.Add(timeDictionary);//娣诲姞鏉′欢
+ 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);
UserView.HomePage.Instance.PageIndex += 1;
oneLogic.Show(false);
- } break;
+ }
+ break;
}
}
@@ -180,7 +181,7 @@
Y = scenehorizontalScrol.Bottom,
};
functionSceneAutoBodyView.AddChidren(logicScrolView);
-
+
logicScrolView.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerTopLeft);
bool no = false;
//鏄剧ず榛樿妯℃澘鐨勭晫闈簨浠�
@@ -287,8 +288,8 @@
logicScrolView.EndHeaderRefreshing();
};
- //鑷姩鍖�
- Read(logicScrolView, no);
+ //鑷姩鍖�
+ Read(logicScrolView, no);
}
/// <summary>
@@ -298,36 +299,43 @@
private static async void Read(VerticalRefreshLayout logicScrolView, bool no)
{
CommonPage.Loading.Start();
- if (Common.Logic.LogicList.Count == 0)
+ try
{
- var Idlist1 = await Send.GetLogicId(0);//
- var Idlist2 = await Send.GetLogicId(2);//闂ㄩ攣甯稿紑妯″紡
- if (Idlist1.Count != 0)
+ if (Common.Logic.LogicList.Count == 0)
{
- var listlogic1 = await Send.ReadList(Idlist1.Count, 0);
- for (int j = 0; j < listlogic1.Count; j++)
+ var Idlist1 = await Send.GetLogicId(0);//
+ var Idlist2 = await Send.GetLogicId(2);//闂ㄩ攣甯稿紑妯″紡
+ if (Idlist1.Count != 0)
{
- var logic = listlogic1[j];
- if (logic.LogicType != 0)
+ var listlogic1 = await Send.ReadList(Idlist1.Count, 0);
+ for (int j = 0; j < listlogic1.Count; j++)
{
- continue;
+ var logic = listlogic1[j];
+ if (logic.LogicType != 0)
+ {
+ continue;
+ }
+ Common.Logic.LogicList.Add(logic);
}
- Common.Logic.LogicList.Add(logic);
+ }
+ if (Idlist2.Count != 0)
+ {
+ var listlogic2 = await Send.ReadList(Idlist2.Count, 2);
+ for (int j = 0; j < listlogic2.Count; j++)
+ {
+ var logic = listlogic2[j];
+ if (logic.LogicType != 2)
+ {
+ continue;
+ }
+ Common.Logic.LogicList.Add(logic);
+ }
}
}
- if (Idlist2.Count != 0)
- {
- var listlogic2 = await Send.ReadList(Idlist2.Count, 2);
- for (int j = 0; j < listlogic2.Count; j++)
- {
- var logic = listlogic2[j];
- if (logic.LogicType != 2)
- {
- continue;
- }
- Common.Logic.LogicList.Add(logic);
- }
- }
+ }
+ catch (Exception e)
+ {
+ var dd = e.Message;
}
//鑷姩鍖�
Automationview(logicScrolView, no);
@@ -337,6 +345,9 @@
/// 鍔犺浇鑷姩鍖栧垪琛ㄧ晫闈�
/// </summary>
/// <param name="refresview">Refresview.</param>
+
+ static RowLayout selectedRow = new RowLayout() { Tag="0"};//璁板綍宸︽粦鐘舵��
+
private static async void Automationview(VerticalRefreshLayout refresview, bool no)
{
refresview.RemoveAll();
@@ -346,7 +357,7 @@
refresview.BackgroundColor = 0x00000000;
var noFrameLayout = new FrameLayout
{
- Height = Application.GetRealHeight(434 + 200 + 32 + 294-55),
+ Height = Application.GetRealHeight(434 + 200 + 32 + 294 - 55),
//BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
};
refresview.AddChidren(noFrameLayout);
@@ -354,9 +365,9 @@
var noIconBtn = new Button
{
- Y = Application.GetRealHeight(294-55),
- Width = Application.GetMinRealAverage(756),
- Height = Application.GetMinRealAverage(434),
+ Y = Application.GetRealHeight(294 - 55),
+ Width = Application.GetMinRealAverage(757),
+ Height = Application.GetMinRealAverage(435),
UnSelectedImagePath = "Item/NoFunction.png",
X = Application.GetRealWidth(104),
};
@@ -393,7 +404,7 @@
int i = 1;//灞�閮ㄥ彉閲忥紝榛樿鏄涓�鏉￠�昏緫;
foreach (var logic in Common.Logic.LogicList)
{
-
+
var fLayout = new FrameLayout
{
Height = Application.GetRealHeight(190 + 30),
@@ -401,7 +412,7 @@
BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
};
refresview.AddChidren(fLayout);
-
+
var logicRowlayout = new RowLayout
{
Height = Application.GetRealHeight(190 + 30),
@@ -409,17 +420,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),
@@ -460,7 +481,7 @@
logic.IsEnable = 0;
StatusColor(logic, logicRowlayout, 0);
}
- Send.LogicControlSwitch(logic);
+ Send.LogicControlSwitch(logic);
//Logic.Send.AddModifyLogic(logic);
};
if (logic.IsEnable == 1)
@@ -481,6 +502,10 @@
TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor,
};
logicRowlayout.AddRightView(edit);
+ if (logic.LogicType == 2)
+ {
+ edit.TextID = MyInternationalizationString.look;
+ }
edit.MouseUpEventHandler += (sender, e) =>
{
Common.Logic.CurrentLogic = logic;
@@ -531,6 +556,8 @@
BackgroundColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
};
fLayout.AddChidren(line);
+
+
}
}
@@ -569,8 +596,8 @@
indexlist.Add(linkType);
}
}
- //鎺掑垪鍥炬爣椤哄簭;
- if (indexlist.Contains("0")|| indexlist.Contains("8"))
+ //鎺掑垪鍥炬爣椤哄簭;
+ if (indexlist.Contains("0") || indexlist.Contains("8"))
{
iconIndexlist.Add("0");
}
@@ -693,14 +720,15 @@
#endregion
/// <summary>
- /// 闂ㄩ攣鍙栨秷璁剧疆鐢ㄧ殑鏂规硶(鐩稿綋涓�涓叧闂父寮�妯″紡鎸夐挳,涓嶉渶瑕佹樉绀鸿鑷姩鍖�)
+ /// 闂ㄩ攣鍙栨秷璁剧疆鐢ㄧ殑鏂规硶(鐩稿綋涓�涓叧闂父寮�妯″紡鎸夐挳,鍒嗙被-鑷姩鍖�-涓嶉渶瑕佹樉绀鸿鑷姩鍖�)
/// </summary>
/// <param name="timeVlaue">鏃堕棿鍊�</param>
/// <param name="common">璁惧</param>
/// <returns></returns>
- public static void LockAddModifyLogic(int timeVlaue, CommonDevice common)
+ public static async System.Threading.Tasks.Task<bool> LockAddModifyLogic(int timeVlaue, CommonDevice common)
{
- var h = DateTime.Now.ToString("hh");
+ //璇诲彇绯荤粺褰撳墠鏃堕棿锛氭椂-鍒�
+ var h = DateTime.Now.ToString("HH");
var m = DateTime.Now.ToString("mm");
Dictionary<string, string> timeConditionsInfo = new Dictionary<string, string>();
timeConditionsInfo.Add("Type", "0");
@@ -708,7 +736,7 @@
timeConditionsInfo.Add("DateType", "0");
timeConditionsInfo.Add("RemindTime", "0");
timeConditionsInfo.Add("EnDelay", "0");
- timeConditionsInfo.Add("DelayTime", "0");
+ timeConditionsInfo.Add("DelayTime", "0");
timeConditionsInfo.Add("StartHour", h);
timeConditionsInfo.Add("StartMin", m);
timeConditionsInfo.Add("DoorLockOpenDelayTime", timeVlaue.ToString());
@@ -725,57 +753,52 @@
currentLogic.LogicName = Language.StringByID(R.MyInternationalizationString.openmode);
currentLogic.Conditions.Add(timeConditionsInfo);
currentLogic.Actions.Add(actionsInfo);
- //淇敼鎴栬�呮坊鍔犳槸鏍规嵁閫昏緫id鍊硷紙0鏂板锛�1锛屼慨鏀癸級
- Send.AddModifyLogic(currentLogic);
-
- }
- ///<summary>
- /// 闂ㄩ攣鍒犻櫎閫昏緫
- /// </summary>
- public static async void LockDelLogic(CommonDevice common)
- {
- int logicId = 0;
- var Idlist = await Send.GetLogicId(2);
- if (Idlist.Count != 0)
- { //鍏堝幓璇诲彇缃戝叧鐪嬫槸鍚﹀瓨鍦ㄦ暟鎹�;
- var listlogic = await Send.ReadList(Idlist.Count, 2);
- for (int j = 0; j < listlogic.Count; j++)
- {
- var logic = listlogic[j];
- foreach (var actions in logic.Actions)
- {
- var linkType = actions["LinkType"].ToString();
- if (linkType != "8")
- {
- //鐢ㄦ埛鏈夊彲鑳藉湪鑷姩鍖栭偅閲屽啀娆＄紪杈�;
- //蹇呴』杩囨护鎺変笉闇�瑕佺殑淇℃伅(杈撳嚭鍔熻兘寤舵椂:鏄病鏈塂eviceAddr鍜孍point),鍚﹀垯鏈夊紓甯�;
- continue;
- }
- var obj1 = actions["DeviceAddr"].ToString();
- var obj2 = actions["Epoint"].ToString();
- if (common.DeviceAddr == obj1 && common.DeviceEpoint.ToString() == obj2)
- {
- logicId = logic.LogicId;
- break;
- //鎵惧埌璺冲嚭寰幆浣�
- }
-
- }
- if (logicId != 0)
- {
- break;
- //鎵惧埌璺冲嚭寰幆浣�
- }
- }
- }
- if (logicId == 0)
+ Exist(3);//鏌ユ壘鏄惁瀛樺湪璁剧疆杩囧け鏁堟椂闂�(鏈夌殑璇濆垹闄わ紝鍐嶆坊鍔�)
+ var logicIfon = await Send.AddModifyLogic(currentLogic);
+ if (logicIfon != null && logicIfon.LogicId != 0)
{
- //娌℃湁鎵惧埌logicId鍒犻櫎娌℃湁鎰忎箟;
- return;
+ return true;
}
- Send.DelLogic(logicId);
+ return false;
}
+ ///<summary>
+ /// s-one闂ㄩ攣鏄惁瀛樺湪鑷姩鍖栫殑鏂规硶;
+ /// 娉ㄦ剰锛堝弬鏁�2锛�3锛夛細valueInt=3鏄垹闄よ缃け鏁堟椂闂磋嚜鍔ㄥ寲锛泇alueInt=2鍒ゆ柇鏄惁瀛樺湪鑷姩鍖栵紱
+ /// 杩斿洖鍊硷細0涓嶅瓨鍦�;1瀛樺湪;2鍒犻櫎鎴愬姛;3鍒犻櫎澶辫触;
+ /// </summary>
+ public static async System.Threading.Tasks.Task<int> Exist(int valueInt = 2)
+ {
+ 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涓�鏉＄壒娈婄殑鑷姩鍖�(鐢ㄦ潵璁剧疆澶辨晥鏃堕棿)
+ var d=await Send.DelLogic(Idlist[i]);
+ if (d != 0)
+ {
+ //鍒犻櫎鎴愬姛
+ exist = 2;
+ }
+ else
+ {
+ //鍒犻櫎澶辫触
+ exist = 3;
+ }
+ return exist;
+
+ }
+ }
+ exist = 1;
+ }
+ return exist;
+ }
+
+
}
}
--
Gitblit v1.8.0