ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide | 补丁 | 查看 | 原始文档 | blame | 历史 | |
ZigbeeApp/Shared/Phone/Device/Logic/CurrentDeviceState.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
ZigbeeApp/Shared/Phone/Device/Logic/LogicView/LightView.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
ZigbeeApp/Shared/Phone/Device/Logic/Method.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
ZigbeeApp/Shared/Phone/Device/Logic/Nightlight.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
@@ -3,29 +3,23 @@ <MonoDevelop.Ide.ItemProperties.ShardLib PreferredExecutionTarget="Android.Android_Accelerated_Oreo" /> <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/Logic/Method.cs"> <Files> <File FileName="Shared/Phone/Device/Logic/CurrentDeviceState.cs" Line="135" Column="14" /> <File FileName="Shared/Phone/Device/Logic/RoomAndDeviceView.cs" Line="290" Column="47" /> <File FileName="Shared/Phone/Device/Logic/LogicCommunalPage.cs" Line="685" Column="51" /> <File FileName="Shared/Phone/Device/Logic/Nightlight.cs" Line="15" Column="10" /> <File FileName="Shared/Phone/Device/Logic/Method.cs" Line="106" Column="36" /> <File FileName="Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs" Line="507" Column="75" /> <File FileName="Shared/Phone/Device/Logic/LogicCommunalPage.cs" Line="1211" Column="38" /> <File FileName="Shared/Phone/Device/Logic/Nightlight.cs" Line="21" Column="48" /> <File FileName="Shared/Phone/Device/Logic/CurrentDeviceState.cs" Line="923" Column="42" /> <File FileName="Shared/Phone/Device/Logic/Send.cs" Line="554" Column="52" /> <File FileName="Shared/Phone/Device/Logic/Method.cs" Line="29" Column="45" /> </Files> <Pads> <Pad Id="ProjectPad"> <State name="__root__"> <Node name="GateWay" expanded="True"> <Node name="GateWay.Droid" expanded="True" /> <Node name="Home.IOS" expanded="True"> <Node name="Resources" expanded="True"> <Node name="Phone" expanded="True"> <Node name="ZigeeLogic" expanded="True" /> </Node> </Node> </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="DoorLockLogic" expanded="True" /> <Node name="Method.cs" selected="True" /> </Node> </Node> @@ -33,6 +27,7 @@ <Node name="Gateway" expanded="True"> <Node name="Manage" expanded="True" /> </Node> <Node name="HideOption" expanded="True" /> </Node> <Node name="ZigBee" expanded="True"> <Node name="Device" expanded="True" /> ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ideBinary files differZigbeeApp/Shared/Phone/Device/Logic/CurrentDeviceState.cs
@@ -1206,11 +1206,15 @@ } break; case DeviceType.ColorTemperatureLight: { flMain.RemoveFromParent(); var nightlight = new Nightlight(); UserView.HomePage.Instance.AddChidren(nightlight); UserView.HomePage.Instance.PageIndex += 1; nightlight.Show(common, false); nightlight.Show(common, false, _if[1]); } break; } ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.csold mode 100755 new mode 100644
@@ -504,7 +504,86 @@ } } break; case DeviceType.ColorTemperatureLight: { icon = "ZigeeLogic/nightLight.png"; var taskList = actions["TaskList"] as List<Dictionary<string, string>>; if (taskList == null) { continue; } foreach (var tasks in taskList) { switch (tasks["TaskType"]) { case "1": { if (tasks["Data1"] == "0") { state += Language.StringByID(MyInternationalizationString.close) + ";"; } else { state += Language.StringByID(MyInternationalizationString.open) + ";"; } } break; } } foreach (var tasks in taskList) { switch (tasks["TaskType"]) { case "3": { var intvalue = int.Parse(tasks["Data1"]); var lightbrightnessvalue = (intvalue * 100) / 254; state += Language.StringByID(MyInternationalizationString.brightness) + lightbrightnessvalue.ToString() + "%;"; } break; } } foreach (var tasks in taskList) { switch (tasks["TaskType"]) { case "7": { if (tasks["Data1"] == "0") { state += Language.StringByID(MyInternationalizationString.buzzer) + Language.StringByID(MyInternationalizationString.close) + ";"; } else { state += Language.StringByID(MyInternationalizationString.buzzer) + Language.StringByID(MyInternationalizationString.open) + ";"; } } break; } } foreach (var tasks in taskList) { switch (tasks["TaskType"]) { case "8": { var intvalue = int.Parse(tasks["Data1"]); var colorTemperatureValue = 1000000 / (intvalue * 100); state += Language.StringByID(MyInternationalizationString.colorTemperature) + colorTemperatureValue.ToString() + "K"; } break; } } state = state.TrimEnd(';');//去掉最后那个";" } break; } @@ -567,10 +646,22 @@ case 8: { var deviceinof = Method.GetCommonDevice(actions["DeviceAddr"].ToString(), actions["Epoint"].ToString()); if (deviceinof.Type != DeviceType.ColorTemperatureLight) { var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicViewBackgroundColor }; this.AddChidren(flMain); CurrentDeviceState.CurrentDeviceView(flMain, deviceinof, true, "action_lockaction"); } else { var nightlight = new Nightlight(); UserView.HomePage.Instance.AddChidren(nightlight); UserView.HomePage.Instance.PageIndex += 1; nightlight.Show(deviceinof, true, "lockaction",actions); } } break; ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs
@@ -1003,11 +1003,11 @@ { if (tasks["Data1"] == "0") { state = Language.StringByID(MyInternationalizationString.close) + ";"; state += Language.StringByID(MyInternationalizationString.close) + ";"; } else { state = Language.StringByID(MyInternationalizationString.open) + ";"; state += Language.StringByID(MyInternationalizationString.open) + ";"; } } break; @@ -1038,11 +1038,11 @@ { if (tasks["Data1"] == "0") { state += Language.StringByID(MyInternationalizationString.buzzer) + MyInternationalizationString.close + ";"; state += Language.StringByID(MyInternationalizationString.buzzer) + Language.StringByID(MyInternationalizationString.close) + ";"; } else { state += Language.StringByID(MyInternationalizationString.buzzer) + MyInternationalizationString.open + ";"; state += Language.StringByID(MyInternationalizationString.buzzer) + Language.StringByID(MyInternationalizationString.open) + ";"; } } break; @@ -1057,12 +1057,14 @@ case "8": { var intvalue = int.Parse(tasks["Data1"]); var lightbrightnessvalue = intvalue / 100; state += Language.StringByID(MyInternationalizationString.colorTemperature) + lightbrightnessvalue.ToString() + "K"; var colorTemperatureValue = 1000000/(intvalue *100); state += Language.StringByID(MyInternationalizationString.colorTemperature) + colorTemperatureValue.ToString() + "K"; } break; } } state=state.TrimEnd(';');//去掉最后那个";" } break; } @@ -1210,7 +1212,7 @@ var nightlight = new Nightlight(); UserView.HomePage.Instance.AddChidren(nightlight); UserView.HomePage.Instance.PageIndex += 1; nightlight.Show(deviceinof, true, actions); nightlight.Show(deviceinof, true, "logic", actions); } } break; ZigbeeApp/Shared/Phone/Device/Logic/LogicView/LightView.cs
@@ -47,7 +47,7 @@ public Button seletecdTextBtn = new Button { X = Application.GetRealWidth(300), Y = Application.GetRealHeight(34), Y = Application.GetRealHeight(34+20), Height = Application.GetRealHeight(58), Width = Application.GetRealWidth(1080-300 - 126), TextAlignment = TextAlignment.CenterRight, ZigbeeApp/Shared/Phone/Device/Logic/Method.cs
@@ -380,6 +380,7 @@ deviceTypeList.Add(DeviceType.WindowCoveringDevice); deviceTypeList.Add(DeviceType.Thermostat); deviceTypeList.Add(DeviceType.AirSwitch); deviceTypeList.Add(DeviceType.ColorTemperatureLight); ///门锁特殊 // deviceTypeList.Add(DeviceType.DoorLock); } ZigbeeApp/Shared/Phone/Device/Logic/Nightlight.cs
@@ -16,7 +16,7 @@ string selectedDeviceStatus = ""; Dictionary<string, object> actionsInfo = null; List<Dictionary<string, string>> TaskList = null; public void Show(CommonDevice common, bool edit, Dictionary<string, object> editdeviceActionInfo = null) public void Show(CommonDevice common, bool edit,string str_if,Dictionary<string, object> editdeviceActionInfo = null) { actionsInfo = editdeviceActionInfo; this.BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor; @@ -91,10 +91,22 @@ } } if (str_if == "logic") { var logicCommunalPage = new LogicCommunalPage(); UserView.HomePage.Instance.AddChidren(logicCommunalPage); UserView.HomePage.Instance.PageIndex += 1; logicCommunalPage.Show(() => { }); } else if (str_if == "lockaction") { //门锁联动事件 var lockLogicCommunalPage = new DoorLockLogic.LockLogicCommunalPage(); UserView.HomePage.Instance.AddChidren(lockLogicCommunalPage); UserView.HomePage.Instance.PageIndex += 1; lockLogicCommunalPage.Show(() => { }); } }; @@ -146,7 +158,7 @@ case "8": { var intvalue = int.Parse(tasks["Data1"]); var lightbrightnessvalue = intvalue / 100; var lightbrightnessvalue = 1000000 / (intvalue * 100); colorTemperatureView.seletecdTextBtn.Text = lightbrightnessvalue.ToString() + "K"; } break; @@ -336,7 +348,7 @@ EventHandler<int> progressclick = (sender, e) => { selectedDeviceStatus = "8"; var lightbrightnessvalue = (100 * horizontalSeekBarVol.Progress); var lightbrightnessvalue = 1000000 / (100 * horizontalSeekBarVol.Progress); Send.dictionary(brightnessDictionary, "Data1", lightbrightnessvalue.ToString()); DicValue("8", brightnessDictionary); status = horizontalSeekBarVol.Progress.ToString() + "K"; @@ -352,7 +364,7 @@ if (value["TaskType"] == "8") { var intvalue = int.Parse(value["Data1"]); var lightbrightnessvalue = intvalue / 100; var lightbrightnessvalue = 1000000 / (intvalue * 100); horizontalSeekBarVol.Progress = lightbrightnessvalue; break; }