派生自 ~xm/HomeApp
| ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide | 补丁 | 查看 | 原始文档 | blame | 历史 | |
| ZigbeeApp/Shared/Phone/Device/Logic/OneLogic.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| ZigbeeApp/Shared/R.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
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> ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ideBinary files differ
ZigbeeApp/Shared/Phone/Device/Logic/OneLogic.cs
@@ -198,8 +198,9 @@ switch (linkType) { case 8: { //S-one门锁特殊（Mac是唯一的识别） { //S-one门锁特殊（Mac是唯一的识别） ///如果不这样查找，分类-自动化进来查看会存在问题 var deviceinof = Common.Logic.LogicDviceList.Find((obj) => { return obj.DeviceAddr == actions["DeviceAddr"].ToString(); }); if (deviceinof == null) { @@ -246,6 +247,7 @@ case 8: { //S-one门锁特殊（Mac是唯一的识别） ///如果不这样查找，分类-自动化进来查看会存在问题 var deviceinof = Common.Logic.LogicDviceList.Find((obj) => { return obj.DeviceAddr == actions["DeviceAddr"].ToString(); }); if (deviceinof == null) { 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;//默认为开 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一个新逻辑对象； 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 登录注册
