From 3272ca5b51e19f7f8a827b0f68400570a547fe60 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 28 四月 2020 15:02:44 +0800
Subject: [PATCH] 2020-04-28-1
---
ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs | 81 +++++++-------------------
ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml | 32 +++++++---
ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide | 0
ZigbeeApp/Shared/R.cs | 2
ZigbeeApp/Shared/Phone/Device/Logic/OneLogic.cs | 6 +
ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs | 36 +++++++-----
6 files changed, 70 insertions(+), 87 deletions(-)
diff --git a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
index 51552b8..d3afcec 100644
--- a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
+++ b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
@@ -1,27 +1,37 @@
锘�<Properties StartupConfiguration="{28EDE1FF-20EF-476B-8AF8-24A3EEB69F45}|Default">
<MonoDevelop.Ide.ItemProperties.GateWay.Droid PreferredExecutionTarget="Android.5c86e4357d63" />
<MonoDevelop.Ide.ItemProperties.ShardLib PreferredExecutionTarget="Android.M7BBB18B19152766" />
- <MonoDevelop.Ide.Workbench ActiveDocument="Shared/R.cs">
+ <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/Logic/LogicIfon.cs">
<Files>
- <File FileName="Shared/Phone/Device/Logic/OneLogic.cs" Line="129" Column="16" />
- <File FileName="Shared/Phone/Device/Logic/SkipView.cs" Line="746" Column="12" />
- <File FileName="Shared/Phone/Device/Logic/SoneLogicList.cs" Line="75" Column="61" />
- <File FileName="Shared/Phone/Device/Logic/Method.cs" Line="824" Column="59" />
- <File FileName="Shared/R.cs" Line="820" Column="1" />
+ <File FileName="Shared/Phone/Device/Logic/SoneLogicList.cs" Line="37" Column="36" />
+ <File FileName="Shared/R.cs" Line="820" Column="47" />
+ <File FileName="GateWay.Droid/Assets/Language.ini" Line="537" Column="5" />
+ <File FileName="Shared/Phone/Device/Logic/SkipView.cs" Line="70" Column="26" />
+ <File FileName="Shared/Phone/Device/Logic/Send.cs" Line="1" Column="1" />
+ <File FileName="Shared/Phone/UserCenter/CommonBase/Logic/HdlCheckLogic.cs" Line="219" Column="43" />
+ <File FileName="Shared/Phone/UserCenter/DoorLock/DoorLockCommonLayout.cs" Line="550" Column="39" />
+ <File FileName="Shared/Phone/UserCenter/DoorLock/FunctionSetting.cs" Line="281" Column="17" />
+ <File FileName="Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs" Line="11" Column="29" />
+ <File FileName="Shared/Phone/Device/Logic/OneLogic.cs" Line="430" Column="42" />
+ <File FileName="Shared/Common/Device.cs" Line="1147" Column="44" />
+ <File FileName="Shared/Phone/ZigBee/Device/CommonDevice.cs" Line="1" Column="1" />
+ <File FileName="Shared/Phone/Device/Logic/Method.cs" Line="1" Column="1" />
+ <File FileName="Shared/Phone/Device/Logic/LogicIfon.cs" Line="160" Column="32" />
</Files>
<Pads>
<Pad Id="ProjectPad">
<State name="__root__">
<Node name="GateWay" expanded="True">
- <Node name="Home.IOS" expanded="True">
- <Node name="Resources" expanded="True" />
+ <Node name="GateWay.Droid" expanded="True">
+ <Node name="Assets" expanded="True" />
</Node>
<Node name="Shared" expanded="True">
<Node name="Common" expanded="True" />
<Node name="Phone" expanded="True">
<Node name="Device" expanded="True">
<Node name="Logic" expanded="True">
- <Node name="LogicView" expanded="True" />
+ <Node name="DoorLockLogic" expanded="True" />
+ <Node name="LogicIfon.cs" selected="True" />
</Node>
</Node>
<Node name="UserCenter" expanded="True">
@@ -30,8 +40,10 @@
</Node>
<Node name="DoorLock" expanded="True" />
</Node>
+ <Node name="ZigBee" expanded="True">
+ <Node name="Device" expanded="True" />
+ </Node>
</Node>
- <Node name="R.cs" selected="True" />
</Node>
</Node>
</State>
diff --git a/ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide b/ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide
index 78da438..e6a1f2c 100644
--- a/ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide
+++ b/ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide
Binary files differ
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/OneLogic.cs b/ZigbeeApp/Shared/Phone/Device/Logic/OneLogic.cs
index 2841713..11b22d8 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/OneLogic.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/OneLogic.cs
@@ -198,8 +198,9 @@
switch (linkType)
{
case 8:
- {
- //S-one闂ㄩ攣鐗规畩锛圡ac鏄敮涓�鐨勮瘑鍒級
+ {
+ //S-one闂ㄩ攣鐗规畩锛圡ac鏄敮涓�鐨勮瘑鍒級
+ ///濡傛灉涓嶈繖鏍锋煡鎵撅紝鍒嗙被-鑷姩鍖栬繘鏉ユ煡鐪嬩細瀛樺湪闂
var deviceinof = Common.Logic.LogicDviceList.Find((obj) => { return obj.DeviceAddr == actions["DeviceAddr"].ToString(); });
if (deviceinof == null)
{
@@ -246,6 +247,7 @@
case 8:
{
//S-one闂ㄩ攣鐗规畩锛圡ac鏄敮涓�鐨勮瘑鍒級
+ ///濡傛灉涓嶈繖鏍锋煡鎵撅紝鍒嗙被-鑷姩鍖栬繘鏉ユ煡鐪嬩細瀛樺湪闂
var deviceinof = Common.Logic.LogicDviceList.Find((obj) => { return obj.DeviceAddr == actions["DeviceAddr"].ToString(); });
if (deviceinof == null)
{
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs b/ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs
index c9fe20b..61313e9 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs
@@ -15,30 +15,21 @@
/// </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:
{
//new涓�涓柊閫昏緫瀵硅薄锛�
//鏂板姝ｅ父鑷姩鍖栧叆鍙�
- //Common.Logic.CurrentLogic = new Common.Logic();
- //Common.Logic.CurrentLogic.IsEnable = 1;//榛樿涓哄紑
- //Common.Logic.CurrentLogic.LogicType = 0;//鏍囪閫昏緫绫诲瀷
- //Common.Logic.CurrentLogic.LogicName = Language.StringByID(MyInternationalizationString.automation1);
- //var addLogicPage = new AddLogicPage();
- //UserView.HomePage.Instance.AddChidren(addLogicPage);
- //UserView.HomePage.Instance.PageIndex += 1;
- //addLogicPage.Show();
-
-
- var addLogicPage = new SoneLogicList();
+ Common.Logic.CurrentLogic = new Common.Logic();
+ Common.Logic.CurrentLogic.IsEnable = 1;//榛樿涓哄紑
+ Common.Logic.CurrentLogic.LogicType = 0;//鏍囪閫昏緫绫诲瀷
+ Common.Logic.CurrentLogic.LogicName = Language.StringByID(MyInternationalizationString.automation1);
+ var addLogicPage = new AddLogicPage();
UserView.HomePage.Instance.AddChidren(addLogicPage);
UserView.HomePage.Instance.PageIndex += 1;
addLogicPage.Show();
-
-
-
}
break;
@@ -70,51 +61,25 @@
}
break;
case 2:
- {
-
- if (doorLock == null)
- {
- ///闃叉鎶涘紓甯�
- doorLock = new DoorLock();
+ {
+ ///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());
+ ///杩涙潵鍒锋柊涓�娆¤澶囧垪琛紱
+ 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", "200");
- 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 addLogicPage = new SoneLogicList();
+ UserView.HomePage.Instance.AddChidren(addLogicPage);
UserView.HomePage.Instance.PageIndex += 1;
- oneLogic.Show(false);
+ addLogicPage.Show();
+
}
break;
}
@@ -123,7 +88,6 @@
#region 鈼� 鑷姩鍖朹_________________________
-
/// <summary>
/// 鑷姩鍖栧姛鑳戒唬鐮佸叆鍙�
/// </summary>
@@ -731,7 +695,6 @@
}
}
}
-
#endregion
/// <summary>
@@ -759,7 +722,7 @@
actionsInfo.Add("LinkType", 8);
actionsInfo.Add("DeviceAddr", common.DeviceAddr);
actionsInfo.Add("Epoint", common.DeviceEpoint);
- actionsInfo.Add("PassData", "055704010113");//榛樿闂ㄩ攣甯稿叧e
+ actionsInfo.Add("PassData", "055704010113");//榛樿闂ㄩ攣甯稿叧
Common.Logic currentLogic = new Common.Logic();
currentLogic.IsEnable = 1;//榛樿涓哄紑
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs b/ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs
index d616479..57a5a58 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs
@@ -155,7 +155,8 @@
TextSize = 15,
TextColor = ZigbeeColor.Current.LogicTextBlackColor,
TextAlignment = TextAlignment.CenterLeft,
- Text = "鏃舵晥鎬у父寮�璁剧疆",
+ // Text = "鏃舵晥鎬у父寮�璁剧疆",
+ TextID=MyInternationalizationString.timeSetSone,
};
modeFl.AddChidren(modeTextBtn);
///涓嬩竴绾ц彍鍗曞浘鏍囨帶浠�
@@ -168,6 +169,21 @@
UnSelectedImagePath = "ZigeeLogic/next.png",
};
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);
+
+
+ clickBtn.MouseUpEventHandler += async (sender, e) =>
+ {
+ var d = await SkipView.LockAddModifyLogic(12, Send.CurrentDoorLock);
+ };
}
#endregion
@@ -202,7 +218,8 @@
TextSize = 24,
TextColor = ZigbeeColor.Current.LogicTextBlackColor,
TextAlignment = TextAlignment.CenterLeft,
- Text = "甯稿紑鑷姩鍖�",
+ //Text = "甯稿紑鑷姩鍖�",
+ TextID = MyInternationalizationString.openAutomationSone,
};
addLogicfL.AddChidren(addTextBtn);
///娣诲姞鑷姩鍖栧浘鏍囩殑鎺т欢
@@ -217,18 +234,7 @@
addLogicfL.AddChidren(addIconBtn);
addIconBtn.MouseUpEventHandler += (sender, e) =>
{
- ZigBee.Device.DoorLock doorLock = null;
- if (doorLock == null)
- {
- ///闃叉鎶涘紓甯�
- doorLock = new ZigBee.Device.DoorLock();
- }
- Send.CurrentDoorLock = 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");
@@ -245,7 +251,7 @@
timeConditionsInfo.Add("StartMin", m);
Dictionary<string, object> actionsInfo = new Dictionary<string, object>();
actionsInfo.Add("LinkType", 8);
- actionsInfo.Add("DeviceAddr", doorLock.DeviceAddr);
+ actionsInfo.Add("DeviceAddr", Send.CurrentDoorLock.DeviceAddr);
actionsInfo.Add("Epoint", "200");
actionsInfo.Add("PassData", "055704010113");//榛樿闂ㄩ攣甯稿叧
//new涓�涓柊閫昏緫瀵硅薄锛�
diff --git a/ZigbeeApp/Shared/R.cs b/ZigbeeApp/Shared/R.cs
index 59ba6f3..5d02550 100644
--- a/ZigbeeApp/Shared/R.cs
+++ b/ZigbeeApp/Shared/R.cs
@@ -817,7 +817,7 @@
public readonly static int daySone = 5386;
public readonly static int numberSone = 5387;
public readonly static int openAutomationSone = 5388;
- public readonly static int timeSetone = 5389;
+ public readonly static int timeSetSone= 5389;
#region 鐧诲綍娉ㄥ唽
--
Gitblit v1.8.0