派生自 ~xm/HomeApp
| ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide | 补丁 | 查看 | 原始文档 | blame | 历史 | |
| ZigbeeApp/GateWay.Droid/Assets/Language.ini | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| ZigbeeApp/Home.Ios/Resources/Language.ini | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| ZigbeeApp/Shared/Phone/Device/Logic/Send.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| ZigbeeApp/Shared/R.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
@@ -1,21 +1,31 @@ <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/Phone/Device/Logic/SkipView.cs"> <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs"> <Files> <File FileName="Shared/Phone/Device/Logic/Send.cs" Line="489" Column="36" /> <File FileName="Shared/Phone/Device/Logic/SkipView.cs" Line="10" Column="2" /> <File FileName="Shared/Phone/Device/Logic/Send.cs" Line="39" Column="69" /> <File FileName="Shared/Phone/Device/Logic/SkipView.cs" Line="810" Column="32" /> <File FileName="Shared/Phone/Device/Logic/SoneLogicList.cs" Line="11" Column="36" /> <File FileName="GateWay.Droid/Assets/Language.ini" Line="547" Column="13" /> <File FileName="Shared/R.cs" Line="842" Column="55" /> <File FileName="Home.Ios/Resources/Language.ini" Line="554" Column="1" /> <File FileName="Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs" Line="1061" Column="29" /> </Files> <Pads> <Pad Id="ProjectPad"> <State name="__root__"> <Node name="GateWay" expanded="True"> <Node name="GateWay.Droid" expanded="True"> <Node name="Assets" expanded="True" /> </Node> <Node name="Home.IOS" expanded="True"> <Node name="Resources" expanded="True" /> </Node> <Node name="Shared" expanded="True"> <Node name="Phone" expanded="True"> <Node name="Device" expanded="True"> <Node name="Logic" expanded="True"> <Node name="DoorLockLogic" expanded="True" /> <Node name="SkipView.cs" selected="True" /> </Node> </Node> <Node name="UserCenter" expanded="True"> @@ -24,7 +34,9 @@ <Node name="MessageControls" expanded="True" /> </Node> </Node> <Node name="DoorLock" expanded="True" /> <Node name="DoorLock" expanded="True"> <Node name="UserDoorLockPage.cs" selected="True" /> </Node> </Node> </Node> </Node> ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ideBinary files differ
ZigbeeApp/GateWay.Droid/Assets/Language.ini
@@ -545,12 +545,12 @@ 5396=或 5397=时间为空 5398=只支持数字输入 5399=关闭失败 5400=开启常开模式失败 5401=添加时效性常开设置失败 5402=时效性常开设置 5403=时关闭 5403=分关闭 5404=时 10000=HDL Home 10001=常用 ZigbeeApp/Home.Ios/Resources/Language.ini
@@ -549,8 +549,8 @@ 5400=开启常开模式失败 5401=添加时效性常开设置失败 5402=时效性常开设置 5403=时关闭 5403=分关闭 5404=时
@@ -22,6 +22,7 @@ return await System.Threading.Tasks.Task.Run(async () => { List<int> logicIdList = new List<int>(); Action<string, string> action = (topic, data) => { var gatewayID = topic.Split('/')[0]; @@ -30,20 +31,24 @@ { return; } if (topic == $"{gatewayID}/Logic/GetLogicList_Respon") { Console.WriteLine("打印逻辑返回数据1===="); var list = jObjectdata["Data"]["LogicList"]; if (list == null) { return; } Console.WriteLine("打印逻辑返回数据2===="); foreach (var listIfon in list) { var logicId = int.Parse(listIfon["LogicId"].ToString()); logicIdList.Add(logicId); } Console.WriteLine("打印逻辑返回数据3===="+logicIdList.Count.ToString()); } }; ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs
@@ -60,6 +60,7 @@ this.AddChidren(middle); #endregion //是常开模式再去读取 if (Send.CurrentDoorLock.IsDoorLockNormallyMode) { //进来更新一次 @@ -309,16 +310,19 @@ var y = DateTime.Now.Year.ToString();//那一年 var m = DateTime.Now.Month.ToString();//那一月 var d = DateTime.Now.ToString("dd");//那一天 var h = int.Parse(DateTime.Now.ToString("HH"));//当前系统时间 var h = int.Parse(DateTime.Now.ToString("HH"));//小时 int dayInt = (h + timeValue) / 24;//算出几天后执行 int hour = (h + timeValue) % 24;//算出几天后那个时间执行 int days = int.Parse(d) + dayInt; int minute = DateTime.Now.Minute;//分钟 string text1 = Language.StringByID(MyInternationalizationString.timeSensitive); string text2 = Language.StringByID(MyInternationalizationString.yearSone); string text3 = Language.StringByID(MyInternationalizationString.monthSone); string text4 = Language.StringByID(MyInternationalizationString.numberSone); string text5 = Language.StringByID(MyInternationalizationString.executeSone); timeTextBtn.Text = text1 + y + text2 + m + text3 + days.ToString() + text4 + hour.ToString() + text5; string text5 = Language.StringByID(MyInternationalizationString.hour1); string text6 = Language.StringByID(MyInternationalizationString.executeSone); // timeTextBtn.Text = text1 + y + text2 + m + text3 + days.ToString() + text4 + hour.ToString() + text5 + minute.ToString() + text6; timeTextBtn.Text = text1 + m + text3 + days.ToString() + text4 + hour.ToString() + text5 + minute.ToString() + text6; } @@ -469,7 +473,7 @@ Common.Logic.SoneLogicList.Add(logic); } } } } } } catch (Exception e) @@ -620,6 +624,7 @@ else { //逻辑关 logic.IsEnable = 0; typeIconBtn.UnSelectedImagePath = "ZigeeLogic/nofunction.png"; typeBjBtn.BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor; } ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs
@@ -1052,18 +1052,19 @@ if (Common.Logic.LogicDviceList.Count == 0) { Common.Logic.LogicDviceList.AddRange(LocalDevice.Current.listAllDevice.ToArray()); } var addLogicPage = new Shared.Phone.Device.Logic.SoneLogicList(); UserView.HomePage.Instance.AddChidren(addLogicPage); UserView.HomePage.Instance.PageIndex += 1; addLogicPage.Show(); addLogicPage.action += (w) => { doorLock.IsDoorLockNormallyMode = w; } var addLogicPage = new Shared.Phone.Device.Logic.SoneLogicList(); UserView.HomePage.Instance.AddChidren(addLogicPage); UserView.HomePage.Instance.PageIndex += 1; addLogicPage.Show(); addLogicPage.action += (w) => { doorLock.IsDoorLockNormallyMode = w; ///留给徐梅用的 UpdateNomallyOpenStatus(); }; UpdateNomallyOpenStatus(); }; }; HdlCheckLogic.Current.CheckSecondarySecurity(action);
@@ -840,6 +840,7 @@ public readonly static int addFailed = 5401; public readonly static int timeSensitive = 5402; public readonly static int executeSone = 5403; public readonly static int hour1 = 5404;
