ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
ZigbeeApp/Shared/DLL/Android/Shared.Droid.HDLWidget.dll | 补丁 | 查看 | 原始文档 | blame | 历史 | |
ZigbeeApp/Shared/DLL/Android/Shared.Droid.dll | 补丁 | 查看 | 原始文档 | blame | 历史 | |
ZigbeeApp/Shared/Phone/Device/CommonForm/SelectFunctionView.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
@@ -1,43 +1,33 @@ <Properties StartupConfiguration="{28EDE1FF-20EF-476B-8AF8-24A3EEB69F45}|Default"> <MonoDevelop.Ide.ItemProperties.GateWay.Droid PreferredExecutionTarget="Android.M7BBB18B19152766" /> <MonoDevelop.Ide.ItemProperties.GateWay.Droid PreferredExecutionTarget="Android.SelectDevice" /> <MonoDevelop.Ide.ItemProperties.GateWay.Ios automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.8c0bdb303f25d82c2a42fb8bfca449bfaca00260" /> <MonoDevelop.Ide.ItemProperties.ShardLib PreferredExecutionTarget="Android.M7BBB18B19152766" /> <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/CommonForm/SceneCategoryView.cs"> <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/CommonForm/SelectFunctionView.cs"> <Files> <File FileName="Shared/R.cs" Line="1364" Column="1" /> <File FileName="GateWay.Droid/Assets/Language.ini" /> <File FileName="Shared/Phone/Device/CommonForm/SelectedStatuButton.cs" /> <File FileName="Shared/Phone/Device/CommonForm/CategoryFunctionForWinRow.cs" /> <File FileName="Shared/Phone/Device/Room/UnallocatedRoom.cs" /> <File FileName="Shared/Common/Room.cs" Line="1414" Column="51" /> <File FileName="Shared/Common/Room.cs" /> <File FileName="Shared/Phone/Device/Room/RoomManagement.cs" /> <File FileName="Shared/Common/House.cs" /> <File FileName="Shared/Phone/ZigBee/Device/Scene.cs" /> <File FileName="Shared/Phone/Device/Category/Category.cs" Line="1" Column="1" /> <File FileName="Shared/Phone/Device/CommonForm/SceneCategoryView.cs" Line="190" Column="22" /> <File FileName="Shared/Phone/Device/Category/Category.cs" /> <File FileName="Shared/Phone/Device/CommonForm/SceneCategoryView.cs" /> <File FileName="Shared/Phone/Device/CommonForm/SelectFunctionView.cs" Line="138" Column="22" /> <File FileName="Shared/Phone/UserView/UserHomeView.cs" /> </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 name="Phone" expanded="True" /> </Node> </Node> <Node name="Shared" expanded="True"> <Node name="Common" expanded="True" /> <Node name="Phone" expanded="True"> <Node name="Device" expanded="True"> <Node name="Category" expanded="True" /> <Node name="CommonForm" expanded="True"> <Node name="SceneCategoryView.cs" selected="True" /> <Node name="SelectFunctionView.cs" selected="True" /> </Node> <Node name="Room" expanded="True" /> </Node> <Node name="UserView" expanded="True" /> <Node name="ZigBee" expanded="True"> <Node name="Device" expanded="True" /> </Node> </Node> </Node> ZigbeeApp/Shared/DLL/Android/Shared.Droid.HDLWidget.dllBinary files differ
ZigbeeApp/Shared/DLL/Android/Shared.Droid.dllBinary files differ
ZigbeeApp/Shared/Phone/Device/CommonForm/SelectFunctionView.cs
@@ -123,9 +123,9 @@ var line = new Button() { X = Application.GetRealWidth(180), Y = this.Height - 2, Y = this.Height - 1, Width = Application.GetRealWidth(841), Height = 2, Height = 1, BackgroundColor = ZigbeeColor.Current.GXCGrayLineColor, Tag = Tag }; ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs
@@ -1078,6 +1078,7 @@ UserView.HomePage.Instance.AddChidren(rollerShadeControl); UserView.HomePage.Instance.PageIndex += 1; UserView.HomePage.Instance.ScrollEnabled = false; rollerShadeControl.IsDrawerLockMode = true; rollerShadeControl.Show(device, Room.CurrentRoom); rollerShadeControl.action += (curDev, curRoom) => { @@ -1197,6 +1198,7 @@ var lightControl = new Phone.Device.Light.OnOffControl(); UserView.HomePage.Instance.AddChidren(lightControl); UserView.HomePage.Instance.PageIndex += 1; lightControl.IsDrawerLockMode = true; lightControl.Show(device, Room.CurrentRoom); lightControl.action += (curDev, curRoom) => { @@ -1306,6 +1308,7 @@ var lightControl = new Phone.Device.Light.AirSwitchControl(); UserView.HomePage.Instance.AddChidren(lightControl); UserView.HomePage.Instance.PageIndex += 1; lightControl.IsDrawerLockMode = true; lightControl.Show(device, Room.CurrentRoom); lightControl.action += (curDev, curRoom) => { @@ -1416,6 +1419,7 @@ var lightControl = new Phone.Device.AC.ACControl(); UserView.HomePage.Instance.AddChidren(lightControl); UserView.HomePage.Instance.PageIndex += 1; lightControl.IsDrawerLockMode = true; lightControl.Show(device, Room.CurrentRoom); lightControl.action += (curDev, curRoom) => { @@ -1536,6 +1540,7 @@ var dimmableLightControl = new Phone.Device.Light.DimmableLightControl(); UserView.HomePage.Instance.AddChidren(dimmableLightControl); UserView.HomePage.Instance.PageIndex += 1; dimmableLightControl.IsDrawerLockMode = true; dimmableLightControl.Show(device, Room.CurrentRoom); dimmableLightControl.action += (curDev, curRoom) => { @@ -1675,7 +1680,6 @@ lightView.SetStatuText(device.GetDeviceStatu()); lightView.SetDeviceName(Common.LocalDevice.Current.GetDeviceEpointName(device.CommonDevice)); lightView.CanControl(false); //lightView.IsSelected = device.CommonDevice.IsOnline == 1; lightView.SetCollect(Room.CurrentRoom.IsCollectInRoom(device.FileName)); if (Common.Room.CurrentRoom.IsCollectInRoom(device.FileName) == false)