From 5727cf0b9b54da0a191dd1e23cb5abf21320fbff Mon Sep 17 00:00:00 2001 From: 黄学彪 <hxb@hdlchina.com.cn> Date: 星期一, 25 十一月 2019 10:34:17 +0800 Subject: [PATCH] IOS使用新的项目名称 --- ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs | 2179 +++++++++++++++------------------------------------------- 1 files changed, 569 insertions(+), 1,610 deletions(-) diff --git a/ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs b/ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs old mode 100755 new mode 100644 index 8004460..804648d --- a/ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs +++ b/ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs @@ -30,14 +30,7 @@ /// 鍔熻兘鍜屽満鏅痓odyView /// </summary> private FrameLayout functionSceneBodyView; - /// <summary> - /// The height of the top frame layout -- 500 - /// </summary> - private static readonly int topFrameLayout_Height = 500; - /// <summary> - /// 1524 - /// </summary> - private static readonly int midView_Height = 1524; + /// <summary> /// The height of the room page view. -- 550 /// </summary> @@ -78,6 +71,12 @@ /// </summary> private readonly int sleepSpan = 300; + + private FrameLayout itemView=new FrameLayout(); + /// <summary> + /// floorBtn + /// </summary> + private Button floorBtn; #endregion #region 鈼� 鎺ュ彛____________________________ @@ -115,9 +114,8 @@ for (int i = 0; deviceVerticalScrolViewLayout != null && i < deviceVerticalScrolViewLayout.ChildrenCount; i++) { var rowFL = deviceVerticalScrolViewLayout.GetChildren(i) as FrameLayout; - var rowLayout = rowFL.GetChildren(0) as RowLayout; - var deviceUI = rowLayout.Tag as DeviceUI; - if (deviceUI.CommonDevice == null || rowLayout.ChildrenCount == 0) + var deviceUI = rowFL.Tag as DeviceUI; + if (deviceUI.CommonDevice == null || rowFL.ChildrenCount == 0) { //璁惧涓虹┖鎴栬�呮帶浠朵负绌� continue; @@ -128,65 +126,35 @@ //鍒ゆ柇鏄惁涓哄綋鍓嶈澶� continue; } - var frameLayout = rowLayout.GetChildren(0) as FrameLayout; + var frameLayout = rowFL.GetChildren(0) as FrameLayout; switch (deviceUI.CommonDevice.Type) { case DeviceType.OnOffOutput: //寮�鍏冲姛鑳� - if ((common as ZigBee.Device.ToggleLight).DeviceStatusReport.CluterID == 6) + if (common.DeviceStatusReport.CluterID == 6) { var onOffOutputLight = deviceUI.CommonDevice as ZigBee.Device.ToggleLight; - onOffOutputLight.DeviceStatusReport = (common as ZigBee.Device.ToggleLight).DeviceStatusReport; - for (int j = 0; j < frameLayout.ChildrenCount; j++) - { - var tempView = frameLayout.GetChildren(j); - if (tempView.Tag == null) - { - continue; - } - if (tempView.Tag.ToString() == deviceStatus_OnOffStatus) - { - //璁板綍銆佹洿鏂扮姸鎬� - if (onOffOutputLight.DeviceStatusReport.AttriBute == null || onOffOutputLight.DeviceStatusReport.AttriBute.Count == 0) - { - continue; - } - onOffOutputLight.OnOffStatus = onOffOutputLight.DeviceStatusReport.AttriBute[0].AttriButeData; - (tempView as Button).IsSelected = onOffOutputLight.OnOffStatus == 1; - //璁板綍鍥炲鏃堕棿 - onOffOutputLight.LastDateTime = DateTime.Now; - } - } - } - //褰揅luterID=3,灏辫瘉鏄庤璁惧鍦ㄧ嚎锛岀洿鎺ユ爣璁� - if ((common as ZigBee.Device.ToggleLight).DeviceStatusReport.CluterID == 3) - { - var onOffOutputLight = deviceUI.CommonDevice as ToggleLight; - onOffOutputLight.IsOnline = 1; - for (int j = 0; j < frameLayout.ChildrenCount; j++) + onOffOutputLight.DeviceStatusReport = common.DeviceStatusReport; + + //璁板綍銆佹洿鏂扮姸鎬� + if (onOffOutputLight.DeviceStatusReport.AttriBute == null || onOffOutputLight.DeviceStatusReport.AttriBute.Count == 0) { - var tempView = frameLayout.GetChildren(j); - if (tempView.Tag == null) - { - continue; - } - if (tempView.Tag.ToString() == deviceStatus_Online) - { - (tempView as Button).IsSelected = onOffOutputLight.IsOnline == 1; - //璁板綍鍥炲鏃堕棿 - onOffOutputLight.LastDateTime = DateTime.Now; - } + continue; } - + onOffOutputLight.OnOffStatus = onOffOutputLight.DeviceStatusReport.AttriBute[0].AttriButeData; + (rowFL.GetChildren(0) as FunctionMainView).IsSelected = onOffOutputLight.OnOffStatus == 1; + (rowFL.GetChildren(0) as FunctionMainView).StatuButton.Text = deviceUI.GetDeviceStatu(); + //璁板綍鍥炲鏃堕棿 + onOffOutputLight.LastDateTime = DateTime.Now; } break; case DeviceType.AirSwitch: //寮�鍏冲姛鑳� - if ((common as ZigBee.Device.AirSwitch).DeviceStatusReport.CluterID == 6) + if (common.DeviceStatusReport.CluterID == 6) { var airSwitch = deviceUI.CommonDevice as ZigBee.Device.AirSwitch; - airSwitch.DeviceStatusReport = (common as ZigBee.Device.AirSwitch).DeviceStatusReport; + airSwitch.DeviceStatusReport = common.DeviceStatusReport; for (int j = 0; j < frameLayout.ChildrenCount; j++) { var tempView = frameLayout.GetChildren(j); @@ -202,190 +170,146 @@ return; } airSwitch.OnOffStatus = airSwitch.DeviceStatusReport.AttriBute[0].AttriButeData; - (tempView as Button).IsSelected = airSwitch.OnOffStatus == 1; + (rowFL.GetChildren(0) as FunctionMainView).IsSelected = airSwitch.OnOffStatus == 1; + (rowFL.GetChildren(0) as FunctionMainView).StatuButton.Text = deviceUI.GetDeviceStatu(); //璁板綍鍥炲鏃堕棿 airSwitch.LastDateTime = DateTime.Now; } } } //褰揅luterID=3,灏辫瘉鏄庤璁惧鍦ㄧ嚎锛岀洿鎺ユ爣璁� - if ((common as ZigBee.Device.AirSwitch).DeviceStatusReport.CluterID == 3) + if (common.DeviceStatusReport.CluterID == 3) { - var airSwitch = deviceUI.CommonDevice as AirSwitch; - airSwitch.IsOnline = 1; - for (int j = 0; j < frameLayout.ChildrenCount; j++) - { - var tempView = frameLayout.GetChildren(j); - if (tempView.Tag == null) - { - continue; - } - if (tempView.Tag.ToString() == deviceStatus_Online) - { - (tempView as Button).IsSelected = airSwitch.IsOnline == 1; - //璁板綍鍥炲鏃堕棿 - airSwitch.LastDateTime = DateTime.Now; - } - } + deviceUI.CommonDevice.IsOnline = 1; + deviceUI.CommonDevice.LastDateTime = DateTime.Now; } break; case DeviceType.WindowCoveringDevice: - if ((common as Rollershade).DeviceStatusReport.CluterID == 258) + if (common.DeviceStatusReport.CluterID == 258) { - if ((common as Rollershade).DeviceStatusReport.AttriBute[0].AttributeId == 0) + if (common.DeviceStatusReport.AttriBute[0].AttributeId == 0) { //绐楀笜绫诲瀷 var rollerShade = deviceUI.CommonDevice as Rollershade; - rollerShade.DeviceStatusReport = (common as Rollershade).DeviceStatusReport; - rollerShade.WcdType = (common as Rollershade).DeviceStatusReport.AttriBute[0].AttriButeData; + rollerShade.DeviceStatusReport = common.DeviceStatusReport; + rollerShade.WcdType = common.DeviceStatusReport.AttriBute[0].AttriButeData; rollerShade.LastDateTime = DateTime.Now; + (rowFL.GetChildren(0) as FunctionMainView).IsSelected = rollerShade.WcdCurrentPositionLiftPercentage == 100; + (rowFL.GetChildren(0) as FunctionMainView).StatuButton.Text = deviceUI.GetDeviceStatu(); } } - if ((common as ZigBee.Device.Rollershade).DeviceStatusReport.CluterID == 3) + if (common.DeviceStatusReport.CluterID == 3) { - var rollershade = deviceUI.CommonDevice as ZigBee.Device.Rollershade; - rollershade.IsOnline = 1; - for (int j = 0; j < frameLayout.ChildrenCount; j++) - { - var tempView = frameLayout.GetChildren(j); - if (tempView.Tag == null) - { - continue; - } - if (tempView.Tag.ToString() == deviceStatus_Online) - { - (tempView as Button).IsSelected = rollershade.IsOnline == 1; - //璁板綍鍥炲鏃堕棿 - rollershade.LastDateTime = DateTime.Now; - } - } + deviceUI.CommonDevice.IsOnline = 1; + deviceUI.CommonDevice.LastDateTime = DateTime.Now; } break; case DeviceType.Thermostat: //AC鍔熻兘 - if ((common as ZigBee.Device.AC).DeviceStatusReport.CluterID == 513) + if (common.DeviceStatusReport.CluterID == 513) { var ac = deviceUI.CommonDevice as ZigBee.Device.AC; - ac.DeviceStatusReport = (common as ZigBee.Device.AC).DeviceStatusReport; + ac.DeviceStatusReport = common.DeviceStatusReport; var attriButeList = ac.DeviceStatusReport.AttriBute; if (attriButeList == null || attriButeList.Count == 0) { continue; } + + var curTemp = (attriButeList[0].AttriButeData / 100 < ACControlBase.Temperature_High || attriButeList[0].AttriButeData / 100 > ACControlBase.Temperature_Low) ? attriButeList[0].AttriButeData / 100 : ACControlBase.Temperature_Default; switch (attriButeList[0].AttributeId) { case 0: //姝ゅ睘鎬ц〃鏄庡鍐呭綋鍓嶇殑娓╁害 * 100锛屽疄闄呮俯搴︿负鈥淟ocalTemperature / 100鈥濓紝鍗曚綅锛氣剝 - ac.currentLocalTemperature = (attriButeList[0].AttriButeData / 100 > ACControlBase.Temperature_High || attriButeList[0].AttriButeData / 100 < ACControlBase.Temperature_Low) ? attriButeList[0].AttriButeData / 100 : ACControlBase.Temperature_Default; + ac.currentLocalTemperature = curTemp; ac.LastDateTime = DateTime.Now; break; case 17: //姝ゅ睘鎬ц〃鏄庢璁惧褰撳墠鐨勫埗鍐锋俯搴︼紝瀹為檯娓╁害涓衡�淐oolingSetpoint / 100鈥濓紝鍗曚綅锛氣剝銆� - ac.currentCoolingSetpoint = (attriButeList[0].AttriButeData / 100 > ACControlBase.Temperature_High || attriButeList[0].AttriButeData / 100 < ACControlBase.Temperature_Low) ? attriButeList[0].AttriButeData / 100 : ACControlBase.Temperature_Default; + ac.currentCoolingSetpoint = curTemp; ac.LastDateTime = DateTime.Now; break; case 18: //姝ゅ睘鎬ц〃鏄庢璁惧褰撳墠鐨勫埗鐑俯搴︼紝瀹為檯娓╁害涓衡�淗eatingSetpoint / 100鈥濓紝鍗曚綅锛氣剝銆� - ac.currentHeatingSetpoint = (attriButeList[0].AttriButeData / 100 > ACControlBase.Temperature_High || attriButeList[0].AttriButeData / 100 < ACControlBase.Temperature_Low) ? attriButeList[0].AttriButeData / 100 : ACControlBase.Temperature_Default; + ac.currentHeatingSetpoint = curTemp; ac.LastDateTime = DateTime.Now; break; case 4096: //姝ゅ睘鎬ц〃鏄庢璁惧褰撳墠鐨勮嚜鍔ㄦ俯搴︼紝瀹為檯娓╁害涓衡�淎utoSetpoint / 100鈥濓紝鍗曚綅锛氣剝銆� - ac.currentAutoSetpoint = (attriButeList[0].AttriButeData / 100 > ACControlBase.Temperature_High || attriButeList[0].AttriButeData / 100 < ACControlBase.Temperature_Low) ? attriButeList[0].AttriButeData / 100 : ACControlBase.Temperature_Default; + ac.currentAutoSetpoint = curTemp; ac.LastDateTime = DateTime.Now; break; case 28: //姝ゅ睘鎬ф弿杩版亽娓╄澶囨澶勪簬鍝妯″紡 - //Off = 0 Auto = 1 Cool = 3 Heat = 4 FanOnly = 7 Dry = 8 ac.currentSystemMode = attriButeList[0].AttriButeData; ac.LastDateTime = DateTime.Now; - - for (int j = 0; j < frameLayout.ChildrenCount; j++) - { - var tempView = frameLayout.GetChildren(j); - if (tempView.Tag == null) - { - continue; - } - if (tempView.Tag.ToString() == "Temparetrue") - { - - (tempView as Button).Text = $"{ACControlBase.GetCurrentModeTemperature(ac)} 鈩�"; - } - - if (tempView.Tag.ToString() == deviceStatus_OnOffStatus) - { - (tempView as Button).IsSelected = ac.currentSystemMode != 0; - } - } break; - - } - + (rowFL.GetChildren(0) as FunctionMainView).IsSelected = ac.currentSystemMode != 0; + (rowFL.GetChildren(0) as FunctionMainView).StatuButton.Text = deviceUI.GetDeviceStatu(); + } + if (common.DeviceStatusReport.CluterID == 514) + { + var ac = deviceUI.CommonDevice as ZigBee.Device.AC; + var attriButeList = common.DeviceStatusReport.AttriBute; + if (attriButeList == null || attriButeList.Count == 0) + { + return; + } + ac.DeviceStatusReport = common.DeviceStatusReport; + switch (attriButeList[0].AttributeId) + { + case 0: + ac.currentFanMode = attriButeList[0].AttriButeData; + ac.LastDateTime = DateTime.Now; + break; + case 4096: + ac.currentFanSwingMode = attriButeList[0].AttriButeData; + ac.LastDateTime = DateTime.Now; + break; + } + (rowFL.GetChildren(0) as FunctionMainView).IsSelected = ac.currentSystemMode != 0; + (rowFL.GetChildren(0) as FunctionMainView).StatuButton.Text = deviceUI.GetDeviceStatu(); } //褰揅luterID=3,灏辫瘉鏄庤璁惧鍦ㄧ嚎锛岀洿鎺ユ爣璁� - if ((common as ZigBee.Device.AC).DeviceStatusReport.CluterID == 3) + if (common.DeviceStatusReport.CluterID == 3) { var ac = deviceUI.CommonDevice as AC; ac.IsOnline = 1; - for (int j = 0; j < frameLayout.ChildrenCount; j++) - { - var tempView = frameLayout.GetChildren(j); - if (tempView.Tag == null) - { - continue; - } - if (tempView.Tag.ToString() == deviceStatus_Online) - { - (tempView as Button).IsSelected = ac.IsOnline == 1; - //璁板綍鍥炲鏃堕棿 - ac.LastDateTime = DateTime.Now; - } - } - + ac.LastDateTime = DateTime.Now; } break; case DeviceType.DimmableLight: //璋冨厜鐏姛鑳� //寮�鍏冲姛鑳� - if ((common as ZigBee.Device.DimmableLight).DeviceStatusReport.CluterID == 6) + if (common.DeviceStatusReport.CluterID == 6) { - var dimmableLight = deviceUI.CommonDevice as ZigBee.Device.DimmableLight; - dimmableLight.DeviceStatusReport = (common as ZigBee.Device.DimmableLight).DeviceStatusReport; - for (int j = 0; j < frameLayout.ChildrenCount; j++) + var dimmableLight = deviceUI.CommonDevice as DimmableLight; + dimmableLight.DeviceStatusReport = common.DeviceStatusReport; + //璁板綍銆佹洿鏂扮姸鎬� + if (dimmableLight.DeviceStatusReport.AttriBute == null || dimmableLight.DeviceStatusReport.AttriBute.Count == 0) { - var tempView = frameLayout.GetChildren(j); - if (tempView.Tag == null) - { - continue; - } - if (tempView.Tag.ToString() == deviceStatus_OnOffStatus) - { - //璁板綍銆佹洿鏂扮姸鎬� - if (dimmableLight.DeviceStatusReport.AttriBute == null || dimmableLight.DeviceStatusReport.AttriBute.Count == 0) - { - return; - } - dimmableLight.OnOffStatus = dimmableLight.DeviceStatusReport.AttriBute[0].AttriButeData; - (tempView as Button).IsSelected = dimmableLight.OnOffStatus == 1; - //璁板綍鍥炲鏃堕棿 - dimmableLight.LastDateTime = DateTime.Now; - } + return; } + dimmableLight.OnOffStatus = dimmableLight.DeviceStatusReport.AttriBute[0].AttriButeData; + (rowFL.GetChildren(0) as FunctionMainView).IsSelected = dimmableLight.OnOffStatus == 1; + (rowFL.GetChildren(0) as FunctionMainView).StatuButton.Text = deviceUI.GetDeviceStatu(); + //璁板綍鍥炲鏃堕棿 + dimmableLight.LastDateTime = DateTime.Now; } + //浜害 - if ((common as ZigBee.Device.DimmableLight).DeviceStatusReport.CluterID == 8) + if (common.DeviceStatusReport.CluterID == 8) { - var dimmableLight = deviceUI.CommonDevice as ZigBee.Device.DimmableLight; - dimmableLight.DeviceStatusReport = (common as ZigBee.Device.DimmableLight).DeviceStatusReport; + var dimmableLight = deviceUI.CommonDevice as DimmableLight; + dimmableLight.DeviceStatusReport = common.DeviceStatusReport; var attriButeList = dimmableLight.DeviceStatusReport.AttriBute; if (attriButeList == null || attriButeList.Count == 0) { @@ -397,44 +321,12 @@ //姝ゅ睘鎬ц〃鏄庡綋鍓嶄寒搴︾▼搴� dimmableLight.Level = attriButeList[0].AttriButeData ; dimmableLight.LastDateTime = DateTime.Now; - for (int j = 0; j < frameLayout.ChildrenCount; j++) - { - var tempView = frameLayout.GetChildren(j); - if (tempView.Tag == null) - { - continue; - } - if (tempView.Tag.ToString() == "LevelSeekBar") - { - (tempView as HorizontalSeekBar).Progress = dimmableLight.Level; - } - } + (rowFL.GetChildren(0) as FunctionMainView).IsSelected = true; + (rowFL.GetChildren(0) as FunctionMainView).StatuButton.Text = deviceUI.GetDeviceStatu(); break; } } - //褰揅luterID=3,灏辫瘉鏄庤璁惧鍦ㄧ嚎锛岀洿鎺ユ爣璁� - if ((common as ZigBee.Device.DimmableLight).DeviceStatusReport.CluterID == 3) - { - var dimmableLight = deviceUI.CommonDevice as DimmableLight; - dimmableLight.IsOnline = 1; - for (int j = 0; j < frameLayout.ChildrenCount; j++) - { - var tempView = frameLayout.GetChildren(j); - if (tempView.Tag == null) - { - continue; - } - if (tempView.Tag.ToString() == deviceStatus_Online) - { - (tempView as Button).IsSelected = dimmableLight.IsOnline == 1; - //璁板綍鍥炲鏃堕棿 - dimmableLight.LastDateTime = DateTime.Now; - } - } - - } break; - } } } @@ -444,130 +336,7 @@ } }); } - //璁惧鍦ㄧ嚎鐘舵�佷笂鎶� - else if (typeTag == "OnlineStatusChange") - { - Application.RunOnMainThread(() => - { - try - { - for (int i = 0; deviceVerticalScrolViewLayout != null && i < deviceVerticalScrolViewLayout.ChildrenCount; i++) - { - var rowFL = deviceVerticalScrolViewLayout.GetChildren(i) as FrameLayout; - var rowLayout = rowFL.GetChildren(0) as RowLayout; - var deviceUI = rowLayout.Tag as DeviceUI; - if (deviceUI.CommonDevice == null || rowLayout.ChildrenCount == 0) - { - //璁惧涓虹┖鎴栬�呮帶浠朵负绌� - continue; - } - if (common.DeviceAddr != deviceUI.CommonDevice.DeviceAddr || common.DeviceEpoint != deviceUI.CommonDevice.DeviceEpoint) - { - //鍒ゆ柇鏄惁涓哄綋鍓嶈澶� - continue; - } - var frameLayout = rowLayout.GetChildren(0) as FrameLayout; - switch (deviceUI.CommonDevice.Type) - { - case DeviceType.OnOffOutput: - var onOffOutputLight = deviceUI.CommonDevice as ToggleLight; - onOffOutputLight.IsOnline = (common as ToggleLight).IsOnline; - for (int j = 0; j < frameLayout.ChildrenCount; j++) - { - var tempView = frameLayout.GetChildren(j); - if (tempView.Tag == null) - { - continue; - } - if (tempView.Tag.ToString() == deviceStatus_Online) - { - (tempView as Button).IsSelected = onOffOutputLight.IsOnline == 1; - } - } - //璁板綍鍥炲鏃堕棿 - onOffOutputLight.LastDateTime = DateTime.Now; - break; - case DeviceType.AirSwitch: - var airSwitch = deviceUI.CommonDevice as AirSwitch; - airSwitch.IsOnline = (common as AirSwitch).IsOnline; - for (int j = 0; j < frameLayout.ChildrenCount; j++) - { - var tempView = frameLayout.GetChildren(j); - if (tempView.Tag == null) - { - continue; - } - if (tempView.Tag.ToString() == deviceStatus_Online) - { - (tempView as Button).IsSelected = airSwitch.IsOnline == 1; - } - } - //璁板綍鍥炲鏃堕棿 - airSwitch.LastDateTime = DateTime.Now; - break; - case DeviceType.WindowCoveringDevice: - var rollershade = deviceUI.CommonDevice as ZigBee.Device.Rollershade; - rollershade.IsOnline = (common as Rollershade).IsOnline; - for (int j = 0; j < frameLayout.ChildrenCount; j++) - { - var tempView = frameLayout.GetChildren(j); - if (tempView.Tag == null) - { - continue; - } - if (tempView.Tag.ToString() == deviceStatus_Online) - { - (tempView as Button).IsSelected = rollershade.IsOnline == 1; - } - } - //璁板綍鍥炲鏃堕棿 - rollershade.LastDateTime = DateTime.Now; - break; - case DeviceType.Thermostat: - var ac = deviceUI.CommonDevice as ZigBee.Device.AC; - ac.IsOnline = (common as ZigBee.Device.AC).IsOnline; - for (int j = 0; j < frameLayout.ChildrenCount; j++) - { - var tempView = frameLayout.GetChildren(j); - if (tempView.Tag == null) - { - continue; - } - if (tempView.Tag.ToString() == deviceStatus_Online) - { - (tempView as Button).IsSelected = ac.IsOnline == 1; - } - } - //璁板綍鍥炲鏃堕棿 - ac.LastDateTime = DateTime.Now; - break; - case DeviceType.DimmableLight: - var dimmableLight = deviceUI.CommonDevice as ZigBee.Device.DimmableLight; - dimmableLight.IsOnline = (common as ZigBee.Device.DimmableLight).IsOnline; - for (int j = 0; j < frameLayout.ChildrenCount; j++) - { - var tempView = frameLayout.GetChildren(j); - if (tempView.Tag == null) - { - continue; - } - if (tempView.Tag.ToString() == deviceStatus_Online) - { - (tempView as Button).IsSelected = dimmableLight.IsOnline == 1; - } - } - //璁板綍鍥炲鏃堕棿 - dimmableLight.LastDateTime = DateTime.Now; - break; - } - } - } - catch (Exception ex) - { - System.Console.WriteLine($"涓婚〉鍔熻兘鍒锋柊-Error:{ex.Message}"); - } - }); - } + } /// <summary> /// Changeds the IL ogic status. @@ -639,7 +408,7 @@ }; topFrameLayout.AddChidren(floor); - var floorBtn = new Button + floorBtn = new Button { X=floor.Right, Width=Application.GetRealWidth(500), @@ -647,7 +416,7 @@ Gravity = Gravity.CenterVertical, TextAlignment =TextAlignment.CenterLeft, TextColor=ZigbeeColor.Current.GXCTextColor, - Text=Config.Instance.Home.GetCurrentFloorName() + Text=Config.Instance.Home.GetCurrentFloorName }; topFrameLayout.AddChidren(floorBtn); @@ -679,18 +448,8 @@ } AddChidren(residecneName); - EventHandler<MouseEventArgs> selectFloor = (send, e) => - { - var floorFL = new Phone.Device.Category.SelectFloor(); - AddChidren(floorFL); - floorFL.Init(35,153); - floorFL.FloorAction = (floorName) => - { - floorBtn.Text = floorName; - }; - }; - floor.MouseUpEventHandler += selectFloor; - floorBtn.MouseUpEventHandler += selectFloor; + floor.MouseUpEventHandler += SelectFloor; + floorBtn.MouseUpEventHandler += SelectFloor; //鍒囨崲浣忓畢 residecneName.MouseLongEventHandler += (send, e) => { @@ -845,7 +604,10 @@ //娑堟伅 messageBtn.MouseUpEventHandler += (send, e) => { - + var roomList = new Shared.Phone.Device.Room.RoomManagement(); + HomePage.Instance.AddChidren(roomList); + HomePage.Instance.PageIndex += 1; + roomList.Show(); }; #endregion @@ -868,7 +630,7 @@ { //Room.CurrentRoom = Room.CurrentRoom == null ? Room.Lists[0] : Room.CurrentRoom; Room.CurrentRoom = Room.Lists[0]; - foreach (var room in Room.Lists) + foreach (var room in Room.CurrentRoom.GetRoomsByCurrentFloorIdAppendLoveRoom()) { var roomBackView = new FrameLayout() { @@ -913,11 +675,14 @@ //{ // Show(); //}; - - var editRoom = new Device.Room.AddRoom(); + if(room.IsLove) + { + return; + } + var editRoom = new Device.Room.EditRoom(); HomePage.Instance.AddChidren(editRoom); HomePage.Instance.PageIndex += 1; - editRoom.Show(); + editRoom.Show(room); editRoom.action += () => { Show(); @@ -928,6 +693,7 @@ } else { + Room.CurrentRoom = Room.Lists[0]; var roomBackView = new FrameLayout() { BackgroundImagePath = "Room/r0.png" @@ -971,26 +737,12 @@ }; AddChidren(functionSceneView); - //鍔熻兘 - functionBtn = new Button() - { - X = Application.GetRealWidth(30), - Y=Application.GetRealHeight(12), - Width = Application.GetRealWidth(350), - Height = Application.GetRealHeight(100), - TextColor = ZigbeeColor.Current.GXCTextGrayColor3, - SelectedTextColor = ZigbeeColor.Current.GXCTextWhiteColor, - TextID = R.MyInternationalizationString.Function, - IsSelected = true - }; - functionSceneView.AddChidren(functionBtn); - //鍦烘櫙 var sceneBtn = new Button() { - X = Application.GetRealWidth(430), + X = Application.GetRealWidth(30), Y = Application.GetRealHeight(12), - Width = Application.GetRealWidth(360), + Width = Application.GetRealWidth(350), Height = Application.GetRealHeight(100), TextColor = ZigbeeColor.Current.GXCTextGrayColor3, SelectedTextColor = ZigbeeColor.Current.GXCTextWhiteColor, @@ -998,6 +750,20 @@ IsSelected = false }; functionSceneView.AddChidren(sceneBtn); + + //鍦烘櫙 + functionBtn = new Button() + { + X = Application.GetRealWidth(430), + Y = Application.GetRealHeight(12), + Width = Application.GetRealWidth(360), + Height = Application.GetRealHeight(100), + TextColor = ZigbeeColor.Current.GXCTextGrayColor3, + SelectedTextColor = ZigbeeColor.Current.GXCTextWhiteColor, + TextID = R.MyInternationalizationString.Function, + IsSelected = false + }; + functionSceneView.AddChidren(functionBtn); //鍔熻兘鍜屽満鏅痓odyView functionSceneBodyView = new FrameLayout() @@ -1037,13 +803,15 @@ { ShowNoGatewayTip(); } - + } #endregion #region 鈼� 鍒锋柊____________________________ - + /// <summary> + /// RefreshBodyView + /// </summary> public void RefreshBodyView() { if (Room.CanInitAllRoom == false) @@ -1059,6 +827,23 @@ { ShowScene(); } + } + + /// <summary> + /// SelectFloor + /// </summary> + /// <param name="sender"></param> + /// <param name="mouseEventArgs"></param> + public void SelectFloor(object sender,MouseEventArgs mouseEventArgs) + { + var floorFL = new Phone.Device.Category.SelectFloor(); + AddChidren(floorFL); + floorFL.Init(35, 153); + floorFL.FloorAction = (floorName) => + { + floorBtn.Text = floorName; + Show(); + }; } #endregion @@ -1159,8 +944,8 @@ /// <param name="mouseEventArgs">The ${ParameterType} instance containing the event data.</param> private void GoToAddGateWay(object sender, MouseEventArgs mouseEventArgs) { - UserCenter.GatewayAdd.NewGateWaySelectForm selectNewGateWayForm = new UserCenter.GatewayAdd.NewGateWaySelectForm { }; - selectNewGateWayForm.AddForm(selectNewGateWayForm); + var selectNewGateWayForm = new UserCenter.GatewayAdd.NewGateWayMenuSelectForm { }; + selectNewGateWayForm.AddForm(); } #endregion @@ -1172,13 +957,23 @@ /// </summary> private void ShowNoFunctionTip() { + var noFunction = new Button + { + Y = Application.GetRealHeight(69), + Width = Application.GetMinRealAverage(683), + Height = Application.GetMinRealAverage(392), + Gravity = Gravity.CenterHorizontal, + UnSelectedImagePath = "Item/NoFunction.png" + }; + functionSceneBodyView.AddChidren(noFunction); + var noFunctionTip = new Button() { + Y=noFunction.Bottom, Height = Application.GetRealHeight(200), - TextID = R.MyInternationalizationString.NoFunction, + Text = Language.StringByID(R.MyInternationalizationString.NoFunction).Replace("{\\r\\n}","\r\n"), TextColor = ZigbeeColor.Current.GXCPlaceHolderTextColor, - TextAlignment = TextAlignment.Center, - Gravity = Gravity.Center + IsMoreLines=true }; functionSceneBodyView.AddChidren(noFunctionTip); } @@ -1202,13 +997,31 @@ else { deviceVerticalScrolViewLayout = new VerticalScrolViewLayout { }; + functionSceneBodyView.AddChidren(deviceVerticalScrolViewLayout); - foreach (var device in deviceList) + for(int i=0;i<deviceList.Count;i++) { + int t = i % 2; + int tt = i / 2; + int xx = 43 + i % 2 * (20 + 487); + int yy = 14; + var device = deviceList[i]; if (device == null || device.CommonDevice == null) { continue; } + + if (i % 2 == 0) + { + itemView = new FrameLayout() + { + Height = Application.GetRealHeight(14 + 348), + Tag = device + }; + deviceVerticalScrolViewLayout.AddChidren(itemView); + } + + //鍒犻櫎璁惧 EventHandler<MouseEventArgs> delEvent = (sender, e) => { @@ -1225,30 +1038,21 @@ }; }; //鏀惰棌 - //EventHandler<MouseEventArgs> collectionEvent = (sender, e) => - //{ - // if ((sender as Button).IsSelected) - // { - // Room.Lists[0].DeleteDevice(device.FilePath); - // (sender as Button).IsSelected = false; - // if (Room.CurrentRoom == Room.Lists[0]) - // { - // DeviceVerticalScrolViewLayout.RemoveViewByTag((sender as Button).Tag); - // } - // } - // else - // { - // Room.Lists[0].AddDevice(device.FilePath); - // (sender as Button).IsSelected = true; - // } - // //RefreshBodyView(); - //}; EventHandler<MouseEventArgs> collectionEvent = (sender, e) => { - if (Room.CurrentRoom == Room.Lists[0]) + if ((sender as Button).IsSelected) { - Room.Lists[0].DeleteDevice(device.FileName); - deviceVerticalScrolViewLayout.RemoveViewByTag((sender as Button).Tag); + Shared.Common.Room.CurrentRoom.GetLoveRoom().DeleteDevice(device.FileName); + (sender as Button).IsSelected = false; + } + else + { + Shared.Common.Room.CurrentRoom.GetLoveRoom().AddDevice(device.FileName); + (sender as Button).IsSelected = true; + } + if (Room.CurrentRoom.IsLove) + { + RefreshBodyView(); } }; @@ -1277,332 +1081,90 @@ rollerShade.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch); } } + var lightView = new FunctionMainView(xx, yy); + itemView.AddChidren(lightView); + lightView.Init(); + lightView.SetDeviceImage(device.IconPath, device.OnlineIconPath); + lightView.SetStatuText(device.GetDeviceStatu()); + lightView.SetDeviceName(rollerShade.DeviceEpointName); + //lightView.SetStatu(true); + lightView.IsSelected = rollerShade.WcdCurrentPositionLiftPercentage == 100; + lightView.SetCollect(true); - var deviceFL = new FrameLayout + lightView.SwitchButton.MouseUpEventHandler += (sender, e) => { - Height = Application.GetRealHeight(deviceFL_Height), - BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor, - Tag = device - }; - deviceVerticalScrolViewLayout.AddChidren(deviceFL); - var deviceRowLayout = new RowLayout - { - Y = Application.GetRealHeight(25), - Height = Application.GetRealHeight(deviceFL_Height - 25) - 1, - LineColor = ZigbeeColor.Current.GXCBackgroundColor, - BackgroundColor = ZigbeeColor.Current.GXCTopViewBackgroundColor, - Radius = CommonPage.BigFormRadius, - Tag = device - }; - deviceFL.AddChidren(deviceRowLayout); - var deviceItemFL = new FrameLayout() - { - BackgroundColor = ZigbeeColor.Current.GXCTopViewBackgroundColor, - Radius = CommonPage.BigFormRadius - }; - deviceRowLayout.AddChidren(deviceItemFL); - var deviceIMG = new Button() - { - X = Application.GetRealWidth(50), - Y = Application.GetRealHeight(30), - Width = Application.GetMinRealAverage(110), - Height = Application.GetMinRealAverage(110), - UnSelectedImagePath = device.IconPath, - SelectedImagePath = device.OnlineIconPath, - IsSelected = rollerShade.IsOnline == 1, - Tag = deviceStatus_Online - }; - deviceItemFL.AddChidren(deviceIMG); - var deviceName = new Button() - { - X = Application.GetRealWidth(10), - Y = deviceIMG.Bottom, - Width = Application.GetRealWidth(180), - Height = Application.GetRealHeight(80), - TextColor = ZigbeeColor.Current.GXCTextBlackColor, - TextAlignment = TextAlignment.Center, - Text = device.CommonDevice.DeviceEpointName, - TextSize = 10, - IsMoreLines = true - }; - deviceItemFL.AddChidren(deviceName); - - var closeBtnBG = new Device.CommonForm.SelectedStatuButton() - { - X = deviceName.Right, - Width = Application.GetMinRealAverage(250), - Height = Application.GetMinRealAverage(250), - Gravity = Gravity.CenterVertical, - }; - deviceItemFL.AddChidren(closeBtnBG); - - var closeBtn = new Device.CommonForm.SelectedStatuButton() - { - X = Application.GetRealWidth(50) + deviceName.Right, - Width = Application.GetMinRealAverage(110), - Height = Application.GetMinRealAverage(110), - Gravity = Gravity.CenterVertical, - UnSelectedImagePath = "WindowCovering/RollerShadeClose.png", - SelectedImagePath = "WindowCovering/RollerShadeCloseSelected.png", - //Visible=false - }; - deviceItemFL.AddChidren(closeBtn); - - var stopBtnBG = new Device.CommonForm.SelectedStatuButton() - { - X = Application.GetRealWidth(120) + closeBtn.Right, - Width = Application.GetMinRealAverage(250), - Height = Application.GetMinRealAverage(250), - Gravity = Gravity.CenterVertical, - }; - deviceItemFL.AddChidren(stopBtnBG); - var stopBtn = new Device.CommonForm.SelectedStatuButton() - { - X = Application.GetRealWidth(120) + closeBtn.Right, - Width = Application.GetMinRealAverage(110), - Height = Application.GetMinRealAverage(110), - Gravity = Gravity.CenterVertical, - UnSelectedImagePath = "WindowCovering/RollerShadeStop.png", - SelectedImagePath = "WindowCovering/RollerShadeStopSelected.png", - //Visible=false - }; - deviceItemFL.AddChidren(stopBtn); - - var openBtnBG = new Device.CommonForm.SelectedStatuButton() - { - X = Application.GetRealWidth(20) + stopBtn.Right, - Width = Application.GetMinRealAverage(250), - Height = Application.GetMinRealAverage(250), - Gravity = Gravity.CenterVertical, - }; - deviceItemFL.AddChidren(openBtnBG); - var openBtn = new Device.CommonForm.SelectedStatuButton() - { - X = Application.GetRealWidth(120) + stopBtn.Right, - Width = Application.GetMinRealAverage(110), - Height = Application.GetMinRealAverage(110), - Gravity = Gravity.CenterVertical, - UnSelectedImagePath = "WindowCovering/RollerShadeOpen.png", - SelectedImagePath = "WindowCovering/RollerShadeOpenSelected.png", - //Visible=false - }; - deviceItemFL.AddChidren(openBtn); - var collectionBtn = new Button() - { - X = deviceItemFL.Right - Application.GetRealWidth(150), - Y = Application.GetRealHeight(20), - Width = Application.GetMinRealAverage(80), - Height = Application.GetMinRealAverage(80), - UnSelectedImagePath = "Item/Collection.png", - SelectedImagePath = "Item/CollectionSelected.png", - Tag = device - }; - //*****鍏堥殣钘�***** - //deviceItemFL.AddChidren(collectionBtn); - var deleteBtn = new Device.CommonForm.RowLayoutDeleteButton - { - Tag = device, - IsMoreLines = true - }; - - if (Room.CurrentRoom.IsLove) - { - deleteBtn.TextID = R.MyInternationalizationString.CancelCollect; - deleteBtn.BackgroundColor = ZigbeeColor.Current.GXCCancelCollectionBGColor; - deleteBtn.MouseUpEventHandler += collectionEvent; - deviceRowLayout.AddRightView(deleteBtn); - } - else if (Room.CurrentRoom.IsSharedRoom) - { - //涓嶅鐞� - } - else - { - deleteBtn.MouseUpEventHandler += delEvent; - deviceRowLayout.AddRightView(deleteBtn); - } - - if (rollerShade.WcdType == -1) - { - CommonPage.Loading.Start(); - new System.Threading.Thread(() => + (sender as Button).IsSelected = !(sender as Button).IsSelected; + if ((sender as Button).IsSelected) { - ZigBee.Device.Rollershade.ReadWcdTypeAction(rollerShade, () => + zbGateway = device.CommonDevice.Gateway; + sendedControlCommand = false; + zbGateway.ReportAction += UpdateDeviceControllStatu; + AddZbGateway(zbGatewayList, zbGateway, commonDeviceList, device.CommonDevice); + + (device.CommonDevice as Rollershade).CurtainUpDownStopControl(1); + + ((sender as Button).Parent as FunctionMainView).SetStatuText(CommonFormResouce.GetSwitchStatu(true)); + ((sender as Button).Parent as FunctionMainView).IsSelected = true; + + //鎺у埗寤舵椂鍥炶皟 + DeviceUI.SendCommandDelayAction(device.CommonDevice, () => { - Application.RunOnMainThread(() => + if (Parent == null) { - if (rollerShade.WcdType == 0) - { - closeBtn.UnSelectedImagePath = "WindowCovering/RollerShadeDown.png"; - closeBtn.SelectedImagePath = "WindowCovering/RollerShadeDownSelected.png"; - openBtn.UnSelectedImagePath = "WindowCovering/RollerShadeUp.png"; - openBtn.SelectedImagePath = "WindowCovering/RollerShadeUpSelected.png"; - } - else - { - closeBtn.UnSelectedImagePath = "WindowCovering/RollerShadeClose.png"; - closeBtn.SelectedImagePath = "WindowCovering/RollerShadeCloseSelected.png"; - openBtn.UnSelectedImagePath = "WindowCovering/RollerShadeOpen.png"; - openBtn.SelectedImagePath = "WindowCovering/RollerShadeOpenSelected.png"; - } - CommonPage.Loading.Hide(); - }); + return; + } + RemoveUpdateControlDeviceStatuAction(zbGateway); + if (sendedControlCommand == false) + { + DeviceUI.ShowStatuTip(R.MyInternationalizationString.FAIL); + } }); - }) - { IsBackground = true }.Start(); - } - else if (rollerShade.WcdType == 0) - { - closeBtn.UnSelectedImagePath = "WindowCovering/RollerShadeDown.png"; - closeBtn.SelectedImagePath = "WindowCovering/RollerShadeDownSelected.png"; - openBtn.UnSelectedImagePath = "WindowCovering/RollerShadeUp.png"; - openBtn.SelectedImagePath = "WindowCovering/RollerShadeUpSelected.png"; - } - else - { - closeBtn.UnSelectedImagePath = "WindowCovering/RollerShadeClose.png"; - closeBtn.SelectedImagePath = "WindowCovering/RollerShadeCloseSelected.png"; - openBtn.UnSelectedImagePath = "WindowCovering/RollerShadeOpen.png"; - openBtn.SelectedImagePath = "WindowCovering/RollerShadeOpenSelected.png"; - } + } + else + { + zbGateway = device.CommonDevice.Gateway; + sendedControlCommand = false; + zbGateway.ReportAction += UpdateDeviceControllStatu; + AddZbGateway(zbGatewayList, zbGateway, commonDeviceList, device.CommonDevice); + (device.CommonDevice as Rollershade).CurtainUpDownStopControl(0); - EventHandler<MouseEventArgs> curtainHandler = (sender, e) => + ((sender as Button).Parent as FunctionMainView).SetStatuText(CommonFormResouce.GetSwitchStatu(false)); + ((sender as Button).Parent as FunctionMainView).IsSelected = false; + + //鎺у埗寤舵椂鍥炶皟 + DeviceUI.SendCommandDelayAction(device.CommonDevice, () => + { + if (Parent == null) + { + return; + } + RemoveUpdateControlDeviceStatuAction(zbGateway); + if (sendedControlCommand == false) + { + DeviceUI.ShowStatuTip(R.MyInternationalizationString.FAIL); + } + }); + } + }; + + lightView.CardBG.MouseUpEventHandler += (sender, e) => { - var curtain = new Phone.Device.Curtain.RollerShadeControl(); - UserView.HomePage.Instance.ScrollEnabled = false; - UserView.HomePage.Instance.AddChidren(curtain); + var rollerShadeControl = new Phone.Device.Curtain.RollerShadeControl(); + UserView.HomePage.Instance.AddChidren(rollerShadeControl); UserView.HomePage.Instance.PageIndex += 1; - curtain.action = RefreshBodyView; - curtain.Show(device, Room.CurrentRoom); + UserView.HomePage.Instance.ScrollEnabled = false; + //rollerShadeControl.action = RefreshBodyView; + rollerShadeControl.Show(device, Room.CurrentRoom); }; - deviceItemFL.MouseUpEventHandler += curtainHandler; - //deviceItemFL.MouseLongEventHandler += curtainHandler; - deviceIMG.MouseUpEventHandler += curtainHandler; - deviceName.MouseUpEventHandler += curtainHandler; - //绐楀笜鍏� - closeBtn.MouseUpEventHandler += (sender, e) => - { - zbGateway = device.CommonDevice.Gateway; - sendedControlCommand = false; - zbGateway.ReportAction += UpdateDeviceControllStatu; - AddZbGateway(zbGatewayList, zbGateway, commonDeviceList, device.CommonDevice); - - rollerShade.CurtainUpDownStopControl(1); - - //鎺у埗寤舵椂鍥炶皟 - DeviceUI.SendCommandDelayAction(device.CommonDevice, () => - { - if (Parent == null) - { - return; - } - RemoveUpdateControlDeviceStatuAction(zbGateway); - if (sendedControlCommand == false) - { - DeviceUI.ShowStatuTip(R.MyInternationalizationString.FAIL); - } - }); - }; - //绐楀笜鍋� - stopBtn.MouseUpEventHandler += (sender, e) => - { - zbGateway = device.CommonDevice.Gateway; - sendedControlCommand = false; - zbGateway.ReportAction += UpdateDeviceControllStatu; - AddZbGateway(zbGatewayList, zbGateway, commonDeviceList, device.CommonDevice); - - rollerShade.CurtainUpDownStopControl(2); - - //鎺у埗寤舵椂鍥炶皟 - DeviceUI.SendCommandDelayAction(device.CommonDevice, () => - { - if (Parent == null) - { - return; - } - RemoveUpdateControlDeviceStatuAction(zbGateway); - if (sendedControlCommand == false) - { - DeviceUI.ShowStatuTip(R.MyInternationalizationString.FAIL); - } - }); - }; - //绐楀笜寮� - openBtn.MouseUpEventHandler += (sender, e) => - { - zbGateway = device.CommonDevice.Gateway; - sendedControlCommand = false; - zbGateway.ReportAction += UpdateDeviceControllStatu; - AddZbGateway(zbGatewayList, zbGateway, commonDeviceList, device.CommonDevice); - - rollerShade.CurtainUpDownStopControl(0); - - //鎺у埗寤舵椂鍥炶皟 - DeviceUI.SendCommandDelayAction(device.CommonDevice, () => - { - if (Parent == null) - { - return; - } - RemoveUpdateControlDeviceStatuAction(zbGateway); - if (sendedControlCommand == false) - { - DeviceUI.ShowStatuTip(R.MyInternationalizationString.FAIL); - } - }); - }; - //collectionBtn.MouseUpEventHandler += (sender, e) => - //{ - // if (collectionBtn.IsSelected) - // { - // Room.Lists[0].DeleteDevice(device.FilePath); - // collectionBtn.IsSelected = false; - // } - // else - // { - // Room.Lists[0].AddDevice(device.FilePath); - // collectionBtn.IsSelected = true; - // } - // //RefreshBodyView(); - //}; - collectionBtn.MouseUpEventHandler += collectionEvent; - //var dev = Room.LoveRoomDeviceUIFilePathList.Find((obj) => obj==device.FilePath); - //if(dev==null) - //{ - // collectionBtn.IsSelected = false; - //} - //else - //{ - // collectionBtn.IsSelected = true; - //} - - ////寮�鍏冲仠鎸夐挳鏄惁鏄剧ず - //foreach(var command in commandList) - //{ - // if (command == null) - // { - // continue; - // } - // if (command.commandId==0) - // { - // openBtn.Visible = true; - // } - // else if(command.commandId==1) - // { - // openBtn.Visible = true; - // } - // else if(command.commandId==2) - // { - // stopBtn.Visible = true; - // } - //} + lightView.CollectButton.MouseUpEventHandler += collectionEvent; } else if (device.CommonDevice.Type == ZigBee.Device.DeviceType.OnOffOutput) { //寮�鍏崇伅 var light = device.CommonDevice as ToggleLight; + //琛ヤ笂闈炶繙绋� if (light.Gateway == null) { @@ -1626,96 +1188,29 @@ } } + var lightView = new FunctionMainView(xx,yy); + itemView.AddChidren(lightView); + lightView.Init(); + lightView.SetDeviceImage(device.IconPath, device.OnlineIconPath); + lightView.SetStatuText(device.GetDeviceStatu()); + lightView.SetDeviceName(device.CommonDevice.DeviceEpointName); + lightView.IsSelected = light.OnOffStatus==1; + lightView.SetCollect(Room.CurrentRoom.IsCollectInRoom(Room.CurrentRoom,device.FileName)); - var deviceFL = new FrameLayout + var dev = Room.LoveRoomDeviceUIFilePathList.Find((obj) => obj == device.FileName); + if (dev == null) { - Height = Application.GetRealHeight(deviceFL_Height), - BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor, - Tag = device - }; - deviceVerticalScrolViewLayout.AddChidren(deviceFL); - var deviceRowLayout = new RowLayout + lightView.CollectButton.IsSelected = false; + } + else { - Y = Application.GetRealHeight(25), - Height = Application.GetRealHeight(deviceFL_Height - 25) - 1, - LineColor = ZigbeeColor.Current.GXCBackgroundColor, - BackgroundColor = ZigbeeColor.Current.GXCTopViewBackgroundColor, - Radius = CommonPage.BigFormRadius, - Tag = device - }; - deviceFL.AddChidren(deviceRowLayout); + lightView.CollectButton.IsSelected = true; + } - var deviceItemFL = new FrameLayout() + lightView.SwitchButton.MouseUpEventHandler += (sender, e) => { - BackgroundColor = ZigbeeColor.Current.GXCTopViewBackgroundColor, - Radius = CommonPage.BigFormRadius - }; - deviceRowLayout.AddChidren(deviceItemFL); - var deviceIMG = new Button() - { - X = Application.GetRealWidth(50), - Y = Application.GetRealHeight(30), - Width = Application.GetMinRealAverage(110), - Height = Application.GetMinRealAverage(110), - UnSelectedImagePath = device.IconPath, - SelectedImagePath = device.OnlineIconPath, - IsSelected = light.IsOnline == 1, - Tag = deviceStatus_Online - }; - deviceItemFL.AddChidren(deviceIMG); - var deviceName = new Button() - { - X = Application.GetRealWidth(10), - Y = deviceIMG.Bottom, - Width = Application.GetRealWidth(180), - Height = Application.GetRealHeight(80), - TextColor = ZigbeeColor.Current.GXCTextBlackColor, - TextAlignment = TextAlignment.Center, - Text = device.CommonDevice.DeviceEpointName, - TextSize = 10, - IsMoreLines = true - }; - deviceItemFL.AddChidren(deviceName); - - var collectionBtn = new Button() - { - X = deviceItemFL.Right - Application.GetRealWidth(150), - Y = Application.GetRealHeight(20), - Width = Application.GetMinRealAverage(80), - Height = Application.GetMinRealAverage(80), - UnSelectedImagePath = "Item/Collection.png", - SelectedImagePath = "Item/CollectionSelected.png", - Tag = device - }; - //***鍏堥殣钘�****** - //deviceItemFL.AddChidren(collectionBtn); - var switchBtnBG = new Button - { - X = deviceItemFL.Right - Application.GetRealWidth(250), - Width = Application.GetMinRealAverage(250), - Height = Application.GetMinRealAverage(250), - Gravity = Gravity.CenterVertical - }; - deviceItemFL.AddChidren(switchBtnBG); - - var switchBtn = new Button - { - X = deviceItemFL.Right - Application.GetRealWidth(200), - //Y = deviceItemFL.Bottom - Application.GetRealHeight(120), - Width = Application.GetMinRealAverage(183), - Height = Application.GetMinRealAverage(123), - UnSelectedImagePath = "Item/Switch.png", - SelectedImagePath = "Item/SwitchSelected.png", - IsSelected = light.OnOffStatus == 1, - Tag = deviceStatus_OnOffStatus, - //Visible=false - Gravity = Gravity.CenterVertical - }; - deviceItemFL.AddChidren(switchBtn); - switchBtn.MouseUpEventHandler += (send2, e2) => - { - switchBtn.IsSelected = !switchBtn.IsSelected; - if (switchBtn.IsSelected == true) + (sender as Button).IsSelected = !(sender as Button).IsSelected; + if ((sender as Button).IsSelected) { zbGateway = device.CommonDevice.Gateway; sendedControlCommand = false; @@ -1724,8 +1219,11 @@ light.SwitchControl(1); - //鎺у埗寤舵椂鍥炶皟 - DeviceUI.SendCommandDelayAction(device.CommonDevice, () => + ((sender as Button).Parent as FunctionMainView).SetStatuText(device.GetDeviceStatu()); + ((sender as Button).Parent as FunctionMainView).IsSelected = true; + + //鎺у埗寤舵椂鍥炶皟 + DeviceUI.SendCommandDelayAction(device.CommonDevice, () => { if (Parent == null) { @@ -1747,8 +1245,11 @@ light.SwitchControl(0); - //鎺у埗寤舵椂鍥炶皟 - DeviceUI.SendCommandDelayAction(device.CommonDevice, () => + ((sender as Button).Parent as FunctionMainView).SetStatuText(device.GetDeviceStatu()); + ((sender as Button).Parent as FunctionMainView).IsSelected = false; + + //鎺у埗寤舵椂鍥炶皟 + DeviceUI.SendCommandDelayAction(device.CommonDevice, () => { if (Parent == null) { @@ -1763,79 +1264,41 @@ } }; - - var deleteBtn = new Device.CommonForm.RowLayoutDeleteButton + lightView.CardBG.MouseUpEventHandler += (sender, e) => { - Tag = device, - IsMoreLines = true + if (device.CommonDevice.DfunctionType == DeviceFunctionType.A寮�鍏�) + { + var lightControl = new Phone.Device.Light.OnOffControl(); + UserView.HomePage.Instance.AddChidren(lightControl); + UserView.HomePage.Instance.PageIndex += 1; + //lightControl.action = RefreshBodyView; + lightControl.Show(device, Room.CurrentRoom); + } + else if (device.CommonDevice.DfunctionType == DeviceFunctionType.A鎻掑骇) + { + var lightControl = new Phone.Device.Light.PlugControl(); + UserView.HomePage.Instance.AddChidren(lightControl); + UserView.HomePage.Instance.PageIndex += 1; + //lightControl.action = RefreshBodyView; + lightControl.Show(device, Room.CurrentRoom); + } + else + { + var lightControl = new Phone.Device.Light.LightControl(); + UserView.HomePage.Instance.AddChidren(lightControl); + UserView.HomePage.Instance.PageIndex += 1; + //lightControl.action = RefreshBodyView; + lightControl.Show(device, Room.CurrentRoom); + } }; - if (Room.CurrentRoom.IsLove) - { - deleteBtn.TextID = R.MyInternationalizationString.CancelCollect; - deleteBtn.BackgroundColor = ZigbeeColor.Current.GXCCancelCollectionBGColor; - deleteBtn.MouseUpEventHandler += collectionEvent; - deviceRowLayout.AddRightView(deleteBtn); - } - else if (Room.CurrentRoom.IsSharedRoom) - { - //涓嶅鐞� - } - else - { - deleteBtn.MouseUpEventHandler += delEvent; - deviceRowLayout.AddRightView(deleteBtn); - } - - EventHandler<MouseEventArgs> lightHandler = (sender, e) => - { - var lightControl = new Phone.Device.Light.LightControl(); - UserView.HomePage.Instance.AddChidren(lightControl); - UserView.HomePage.Instance.PageIndex += 1; - lightControl.action = RefreshBodyView; - lightControl.Show(device, Room.CurrentRoom); - }; - //deviceItemFL.MouseLongEventHandler += lightHandler; - deviceItemFL.MouseUpEventHandler += lightHandler; - deviceName.MouseUpEventHandler += lightHandler; - deviceIMG.MouseUpEventHandler += lightHandler; - - //collectionBtn.MouseUpEventHandler += (sender, e) => - //{ - // if (collectionBtn.IsSelected) - // { - // Room.Lists[0].DeleteDevice(device.FilePath); - // collectionBtn.IsSelected = false; - // if(Room.CurrentRoom==Room.Lists[0]) - // { - // RefreshBodyView(); - // } - // } - // else - // { - // Room.Lists[0].AddDevice(device.FilePath); - // collectionBtn.IsSelected = true; - // } - // //RefreshBodyView(); - //}; - collectionBtn.MouseUpEventHandler += collectionEvent; - - //var dev = Room.LoveRoomDeviceUIFilePathList.Find((obj) => obj == device.FilePath); - //if (dev == null) - //{ - // collectionBtn.IsSelected = false; - //} - //else - //{ - // collectionBtn.IsSelected = true; - //} + lightView.CollectButton.MouseUpEventHandler += collectionEvent; } else if (device.CommonDevice.Type == ZigBee.Device.DeviceType.AirSwitch) { //绌烘皵寮�鍏� var airSwitch = device.CommonDevice as AirSwitch; - //琛ヤ笂闈炶繙绋� if (airSwitch.Gateway == null) { @@ -1855,99 +1318,25 @@ //闃叉鐭椂闂村唴澶氭璇诲彇璁惧鐘舵�� if ((DateTime.Now - airSwitch.LastDateTime).TotalSeconds > CommonPage.ReadDeviceStatuSpan) { - airSwitch.ReadOnOffStatus(); airSwitch.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch); + airSwitch.ReadOnOffStatus(); } } - var deviceFL = new FrameLayout - { - Height = Application.GetRealHeight(deviceFL_Height), - BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor, - Tag = device - }; - deviceVerticalScrolViewLayout.AddChidren(deviceFL); - var deviceRowLayout = new RowLayout - { - Y = Application.GetRealHeight(25), - Height = Application.GetRealHeight(deviceFL_Height - 25) - 1, - LineColor = ZigbeeColor.Current.GXCBackgroundColor, - BackgroundColor = ZigbeeColor.Current.GXCTopViewBackgroundColor, - Radius = CommonPage.BigFormRadius, - Tag = device - }; - deviceFL.AddChidren(deviceRowLayout); + var lightView = new FunctionMainView(xx, yy); + itemView.AddChidren(lightView); + lightView.Init(); + lightView.SetDeviceImage(device.IconPath, device.OnlineIconPath); + lightView.SetStatuText(device.GetDeviceStatu()); + lightView.SetDeviceName(airSwitch.DeviceEpointName); + //lightView.SetStatu(true); + lightView.IsSelected = airSwitch.OnOffStatus == 1; + lightView.SetCollect(Room.CurrentRoom.IsCollectInRoom(Room.CurrentRoom, device.FileName)); - var deviceItemFL = new FrameLayout() + lightView.SwitchButton.MouseUpEventHandler += (sender, e) => { - BackgroundColor = ZigbeeColor.Current.GXCTopViewBackgroundColor, - Radius = CommonPage.BigFormRadius - }; - deviceRowLayout.AddChidren(deviceItemFL); - var deviceIMG = new Button() - { - X = Application.GetRealWidth(50), - Y = Application.GetRealHeight(30), - Width = Application.GetMinRealAverage(110), - Height = Application.GetMinRealAverage(110), - UnSelectedImagePath = device.IconPath, - SelectedImagePath = device.OnlineIconPath, - IsSelected = airSwitch.IsOnline == 1, - Tag = deviceStatus_Online - }; - deviceItemFL.AddChidren(deviceIMG); - var deviceName = new Button() - { - X = Application.GetRealWidth(10), - Y = deviceIMG.Bottom, - Width = Application.GetRealWidth(180), - Height = Application.GetRealHeight(80), - TextColor = ZigbeeColor.Current.GXCTextBlackColor, - TextAlignment = TextAlignment.Center, - Text = device.CommonDevice.DeviceEpointName, - TextSize = 10, - IsMoreLines = true - }; - deviceItemFL.AddChidren(deviceName); - - var collectionBtn = new Button() - { - X = deviceItemFL.Right - Application.GetRealWidth(150), - Y = Application.GetRealHeight(20), - Width = Application.GetMinRealAverage(80), - Height = Application.GetMinRealAverage(80), - UnSelectedImagePath = "Item/Collection.png", - SelectedImagePath = "Item/CollectionSelected.png", - Tag = device - }; - //***鍏堥殣钘�****** - //deviceItemFL.AddChidren(collectionBtn); - var switchBtnBG = new Button - { - X = deviceItemFL.Right - Application.GetRealWidth(250), - Width = Application.GetMinRealAverage(250), - Height = Application.GetMinRealAverage(250), - Gravity = Gravity.CenterVertical - }; - deviceItemFL.AddChidren(switchBtnBG); - var switchBtn = new Button - { - X = deviceItemFL.Right - Application.GetRealWidth(200), - //Y = deviceItemFL.Bottom - Application.GetRealHeight(120), - Width = Application.GetMinRealAverage(183), - Height = Application.GetMinRealAverage(123), - UnSelectedImagePath = "Item/Switch.png", - SelectedImagePath = "Item/SwitchSelected.png", - IsSelected = airSwitch.OnOffStatus == 1, - Tag = deviceStatus_OnOffStatus, - //Visible=false - Gravity = Gravity.CenterVertical - }; - deviceItemFL.AddChidren(switchBtn); - switchBtn.MouseUpEventHandler += (send2, e2) => - { - switchBtn.IsSelected = !switchBtn.IsSelected; - if (switchBtn.IsSelected == true) + (sender as Button).IsSelected = !(sender as Button).IsSelected; + if ((sender as Button).IsSelected) { zbGateway = device.CommonDevice.Gateway; sendedControlCommand = false; @@ -1956,8 +1345,11 @@ airSwitch.SwitchControl(1); - //鎺у埗寤舵椂鍥炶皟 - DeviceUI.SendCommandDelayAction(device.CommonDevice, () => + ((sender as Button).Parent as FunctionMainView).SetStatuText(device.GetDeviceStatu()); + ((sender as Button).Parent as FunctionMainView).IsSelected = true; + + //鎺у埗寤舵椂鍥炶皟 + DeviceUI.SendCommandDelayAction(device.CommonDevice, () => { if (Parent == null) { @@ -1979,8 +1371,11 @@ airSwitch.SwitchControl(0); - //鎺у埗寤舵椂鍥炶皟 - DeviceUI.SendCommandDelayAction(device.CommonDevice, () => + ((sender as Button).Parent as FunctionMainView).SetStatuText(device.GetDeviceStatu()); + ((sender as Button).Parent as FunctionMainView).IsSelected = false; + + //鎺у埗寤舵椂鍥炶皟 + DeviceUI.SendCommandDelayAction(device.CommonDevice, () => { if (Parent == null) { @@ -1995,71 +1390,16 @@ } }; - var deleteBtn = new Device.CommonForm.RowLayoutDeleteButton + lightView.CardBG.MouseUpEventHandler += (sender, e) => { - Tag = device, - IsMoreLines = true - }; - if (Room.CurrentRoom.IsLove) - { - deleteBtn.TextID = R.MyInternationalizationString.CancelCollect; - deleteBtn.BackgroundColor = ZigbeeColor.Current.GXCCancelCollectionBGColor; - deleteBtn.MouseUpEventHandler += collectionEvent; - deviceRowLayout.AddRightView(deleteBtn); - } - else if (Room.CurrentRoom.IsSharedRoom) - { - //涓嶅鐞� - } - else - { - deleteBtn.MouseUpEventHandler += delEvent; - deviceRowLayout.AddRightView(deleteBtn); - } - - - EventHandler<MouseEventArgs> airSwitchHandler = (sender, e) => - { - var airSwitchControl = new Phone.Device.AirSwitch.AirSwitchControl(); - UserView.HomePage.Instance.AddChidren(airSwitchControl); + var lightControl = new Phone.Device.Light.AirSwitchControl(); + UserView.HomePage.Instance.AddChidren(lightControl); UserView.HomePage.Instance.PageIndex += 1; - airSwitchControl.action = RefreshBodyView; - airSwitchControl.Show(device, Room.CurrentRoom); + //lightControl.action = RefreshBodyView; + lightControl.Show(device, Room.CurrentRoom); }; - //deviceItemFL.MouseLongEventHandler += airSwitchHandler; - deviceItemFL.MouseUpEventHandler += airSwitchHandler; - deviceName.MouseUpEventHandler += airSwitchHandler; - deviceIMG.MouseUpEventHandler += airSwitchHandler; - //collectionBtn.MouseUpEventHandler += (sender, e) => - //{ - // if (collectionBtn.IsSelected) - // { - // Room.Lists[0].DeleteDevice(device.FilePath); - // collectionBtn.IsSelected = false; - // if(Room.CurrentRoom==Room.Lists[0]) - // { - // RefreshBodyView(); - // } - // } - // else - // { - // Room.Lists[0].AddDevice(device.FilePath); - // collectionBtn.IsSelected = true; - // } - // //RefreshBodyView(); - //}; - collectionBtn.MouseUpEventHandler += collectionEvent; - - //var dev = Room.LoveRoomDeviceUIFilePathList.Find((obj) => obj == device.FilePath); - //if (dev == null) - //{ - // collectionBtn.IsSelected = false; - //} - //else - //{ - // collectionBtn.IsSelected = true; - //} + lightView.CollectButton.MouseUpEventHandler += collectionEvent; } else if (device.CommonDevice.Type == ZigBee.Device.DeviceType.Thermostat) { @@ -2083,6 +1423,7 @@ ac.ReadAutoSetpoint(); ac.ReadFanMode(); ac.ReadSystemMode(); + ac.ReadSystemFansSwingMode(); }); } else @@ -2097,239 +1438,22 @@ ac.ReadAutoSetpoint(); ac.ReadFanMode(); ac.ReadSystemMode(); + ac.ReadSystemFansSwingMode(); } } + var lightView = new FunctionMainView(xx, yy); + itemView.AddChidren(lightView); + lightView.Init(); + lightView.SetDeviceImage(device.IconPath, device.OnlineIconPath); + lightView.SetStatuText(device.GetDeviceStatu()); + lightView.SetDeviceName(device.CommonDevice.DeviceEpointName); + lightView.IsSelected = ac.currentSystemMode != 0; + lightView.SetCollect(Room.CurrentRoom.IsCollectInRoom(Room.CurrentRoom, device.FileName)); - var deviceFL = new FrameLayout + lightView.SwitchButton.MouseUpEventHandler += (sender, e) => { - Height = Application.GetRealHeight(deviceFL_Height), - BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor, - Tag = device - }; - deviceVerticalScrolViewLayout.AddChidren(deviceFL); - var deviceRowLayout = new RowLayout - { - Y = Application.GetRealHeight(25), - Height = Application.GetRealHeight(deviceFL_Height - 25) - 1, - LineColor = ZigbeeColor.Current.GXCBackgroundColor, - BackgroundColor = ZigbeeColor.Current.GXCTopViewBackgroundColor, - Radius = CommonPage.BigFormRadius, - Tag = device - }; - deviceFL.AddChidren(deviceRowLayout); - - var deviceItemFL = new FrameLayout() - { - BackgroundColor = ZigbeeColor.Current.GXCTopViewBackgroundColor, - Radius = CommonPage.BigFormRadius - }; - deviceRowLayout.AddChidren(deviceItemFL); - var deviceIMG = new Button() - { - X = Application.GetRealWidth(50), - Y = Application.GetRealHeight(30), - Width = Application.GetMinRealAverage(110), - Height = Application.GetMinRealAverage(110), - UnSelectedImagePath = device.IconPath, - SelectedImagePath = device.OnlineIconPath, - IsSelected = ac.IsOnline == 1, - Tag = deviceStatus_Online - }; - deviceItemFL.AddChidren(deviceIMG); - var deviceName = new Button() - { - X = Application.GetRealWidth(10), - Y = deviceIMG.Bottom, - Width = Application.GetRealWidth(180), - Height = Application.GetRealHeight(80), - TextColor = ZigbeeColor.Current.GXCTextBlackColor, - TextAlignment = TextAlignment.Center, - Text = device.CommonDevice.DeviceEpointName, - TextSize = 10, - IsMoreLines = true - }; - deviceItemFL.AddChidren(deviceName); - - var collectionBtn = new Button() - { - X = deviceItemFL.Right - Application.GetRealWidth(150), - Y = Application.GetRealHeight(20), - Width = Application.GetMinRealAverage(80), - Height = Application.GetMinRealAverage(80), - UnSelectedImagePath = "Item/Collection.png", - SelectedImagePath = "Item/CollectionSelected.png", - Tag = device - }; - //***鍏堥殣钘�****** - //deviceItemFL.AddChidren(collectionBtn); - - //鍑� - var reduceBtnBG = new Device.CommonForm.SelectedStatuButton() - { - X = deviceName.Right, - Width = Application.GetMinRealAverage(250), - Height = Application.GetMinRealAverage(250), - Gravity = Gravity.CenterVertical, - }; - deviceItemFL.AddChidren(reduceBtnBG); - - var reduceBtn = new Device.CommonForm.SelectedStatuButton() - { - X = Application.GetRealWidth(30) + deviceName.Right, - Width = Application.GetMinRealAverage(110), - Height = Application.GetMinRealAverage(110), - Gravity = Gravity.CenterVertical, - UnSelectedImagePath = "Item/Reduce.png", - SelectedImagePath = "Item/ReduceSelected.png", - }; - deviceItemFL.AddChidren(reduceBtn); - //褰撳墠娓╁害 - var currentTemperatureBtn = new Button() - { - X = Application.GetRealWidth(50) + reduceBtn.Right, - Width = Application.GetRealWidth(200), - Height = Application.GetRealHeight(110), - Gravity = Gravity.CenterVertical, - TextColor = ZigbeeColor.Current.TextBlack, - TextSize = 16, - Text = $"{Device.AC.ACControlBase.GetCurrentModeTemperature(ac)} 掳C", - Tag = "Temparetrue" - }; - deviceItemFL.AddChidren(currentTemperatureBtn); - reduceBtn.MouseUpEventHandler += (send2, e2) => - { - if (Device.AC.ACControlBase.IsOpen(ac) == false) - { - Device.AC.ACControlBase.ShowACIsCloseTip(); - return; - } - //cool - if (ac.currentSystemMode == 3 || ac.currentSystemMode == 8) - { - if (ac.currentCoolingSetpoint <= ACControlBase.Temperature_Low) - { - return; - } - ac.currentCoolingSetpoint -= 1; - ac.SetCoolingTemperatureAsync(ac.currentCoolingSetpoint * 100); - currentTemperatureBtn.Text = $"{ac.currentCoolingSetpoint} 掳C"; - } - //heat - else if (ac.currentSystemMode == 4) - { - if (ac.currentHeatingSetpoint <= ACControlBase.Temperature_Low) - { - return; - } - ac.currentHeatingSetpoint -= 1; - ac.SetHeatingTemperatureAsync(ac.currentHeatingSetpoint * 100); - currentTemperatureBtn.Text = $"{ac.currentHeatingSetpoint} 掳C"; - } - else if (ac.currentSystemMode == 1) - { - if (ac.currentAutoSetpoint <= ACControlBase.Temperature_Low) - { - return; - } - ac.currentAutoSetpoint -= 1; - ac.SetAutoTemperatureAsync(ac.currentAutoSetpoint * 100); - currentTemperatureBtn.Text = $"{ac.currentAutoSetpoint} 掳C"; - } - //auto - //dry - //currentTemperatureBtn.Text = $"{Device.AC.ACControlBase.GetCurrentModeTemperature(ac)} 掳C"; - }; - - var addBtnBG = new Device.CommonForm.SelectedStatuButton() - { - X = currentTemperatureBtn.Right, - Width = Application.GetMinRealAverage(250), - Height = Application.GetMinRealAverage(250), - Gravity = Gravity.CenterVertical - }; - deviceItemFL.AddChidren(addBtnBG); - - var addBtn = new Device.CommonForm.SelectedStatuButton() - { - X = Application.GetRealWidth(30) + currentTemperatureBtn.Right, - Width = Application.GetMinRealAverage(110), - Height = Application.GetMinRealAverage(110), - Gravity = Gravity.CenterVertical, - UnSelectedImagePath = "Item/Add.png", - SelectedImagePath = "Item/AddSelected.png", - }; - deviceItemFL.AddChidren(addBtn); - - addBtn.MouseUpEventHandler += (send2, e2) => - { - if (Device.AC.ACControlBase.IsOpen(ac) == false) - { - Device.AC.ACControlBase.ShowACIsCloseTip(); - return; - } - //cool - if (ac.currentSystemMode == 3 || ac.currentSystemMode == 8) - { - if (ac.currentCoolingSetpoint >= ACControlBase.Temperature_High) - { - return; - } - ac.currentCoolingSetpoint += 1; - ac.SetCoolingTemperatureAsync(ac.currentCoolingSetpoint * 100); - - currentTemperatureBtn.Text = $"{ac.currentCoolingSetpoint} 掳C"; - } - //heat - else if (ac.currentSystemMode == 4) - { - if (ac.currentHeatingSetpoint >= ACControlBase.Temperature_High) - { - return; - } - ac.currentHeatingSetpoint += 1; - ac.SetHeatingTemperatureAsync(ac.currentHeatingSetpoint * 100); - - currentTemperatureBtn.Text = $"{ac.currentHeatingSetpoint} 掳C"; - } - else if (ac.currentSystemMode == 1) - { - if (ac.currentAutoSetpoint >= ACControlBase.Temperature_High) - { - return; - } - ac.currentAutoSetpoint += 1; - ac.SetAutoTemperatureAsync(ac.currentAutoSetpoint * 100); - currentTemperatureBtn.Text = $"{ac.currentAutoSetpoint} 掳C"; - } - - }; - - var switchBtnBG = new Button - { - X = deviceItemFL.Right - Application.GetRealWidth(250), - Width = Application.GetMinRealAverage(250), - Height = Application.GetMinRealAverage(250), - Gravity = Gravity.CenterVertical - }; - deviceItemFL.AddChidren(switchBtnBG); - var switchBtn = new Button - { - X = deviceItemFL.Right - Application.GetRealWidth(200), - //Y = deviceItemFL.Bottom - Application.GetRealHeight(120), - Width = Application.GetMinRealAverage(183), - Height = Application.GetMinRealAverage(123), - UnSelectedImagePath = "Item/Switch.png", - SelectedImagePath = "Item/SwitchSelected.png", - IsSelected = ac.currentSystemMode != 0, - Tag = deviceStatus_OnOffStatus, - //Visible=false - Gravity = Gravity.CenterVertical - }; - deviceItemFL.AddChidren(switchBtn); - switchBtn.MouseUpEventHandler += (send2, e2) => - { - switchBtn.IsSelected = !switchBtn.IsSelected; - if (switchBtn.IsSelected == true) + (sender as Button).IsSelected = !(sender as Button).IsSelected; + if ((sender as Button).IsSelected) { zbGateway = device.CommonDevice.Gateway; sendedControlCommand = false; @@ -2338,20 +1462,23 @@ ac.Open(); - //鎺у埗寤舵椂鍥炶皟 - //DeviceUI.SendCommandDelayAction(device.CommonDevice, () => - //{ - // if (Parent == null) - // { - // return; - // } - // RemoveUpdateControlDeviceStatuAction(zbGateway); - // if (sendedControlCommand == false) - // { - // DeviceUI.ShowStatuTip(R.MyInternationalizationString.FAIL); - // } - //}); - } + ((sender as Button).Parent as FunctionMainView).SetStatuText(device.GetDeviceStatu()); + ((sender as Button).Parent as FunctionMainView).IsSelected = true; + + //鎺у埗寤舵椂鍥炶皟 + DeviceUI.SendCommandDelayAction(device.CommonDevice, () => + { + if (Parent == null) + { + return; + } + RemoveUpdateControlDeviceStatuAction(zbGateway); + if (sendedControlCommand == false) + { + DeviceUI.ShowStatuTip(R.MyInternationalizationString.FAIL); + } + }); + } else { zbGateway = device.CommonDevice.Gateway; @@ -2361,63 +1488,40 @@ ac.Close(); - //鎺у埗寤舵椂鍥炶皟 - //DeviceUI.SendCommandDelayAction(device.CommonDevice, () => - //{ - // if (Parent == null) - // { - // return; - // } - // RemoveUpdateControlDeviceStatuAction(zbGateway); - // if (sendedControlCommand == false) - // { - // DeviceUI.ShowStatuTip(R.MyInternationalizationString.FAIL); - // } - //}); - } + ((sender as Button).Parent as FunctionMainView).SetStatuText(device.GetDeviceStatu()); + ((sender as Button).Parent as FunctionMainView).IsSelected = false; + + //鎺у埗寤舵椂鍥炶皟 + DeviceUI.SendCommandDelayAction(device.CommonDevice, () => + { + if (Parent == null) + { + return; + } + RemoveUpdateControlDeviceStatuAction(zbGateway); + if (sendedControlCommand == false) + { + DeviceUI.ShowStatuTip(R.MyInternationalizationString.FAIL); + } + }); + } }; - var deleteBtn = new Device.CommonForm.RowLayoutDeleteButton + lightView.CardBG.MouseUpEventHandler += (sender, e) => { - Tag = device, - IsMoreLines = true - }; - if (Room.CurrentRoom.IsLove) - { - deleteBtn.TextID = R.MyInternationalizationString.CancelCollect; - deleteBtn.BackgroundColor = ZigbeeColor.Current.GXCCancelCollectionBGColor; - deleteBtn.MouseUpEventHandler += collectionEvent; - deviceRowLayout.AddRightView(deleteBtn); - } - else if (Room.CurrentRoom.IsSharedRoom) - { - //涓嶅鐞� - } - else - { - deleteBtn.MouseUpEventHandler += delEvent; - deviceRowLayout.AddRightView(deleteBtn); - } - - - EventHandler<MouseEventArgs> acHandler = (sender, e) => - { - var acControl = new Phone.Device.AC.ACControl { }; - UserView.HomePage.Instance.AddChidren(acControl); + var lightControl = new Phone.Device.AC.ACControl(); + UserView.HomePage.Instance.AddChidren(lightControl); UserView.HomePage.Instance.PageIndex += 1; - acControl.action = RefreshBodyView; - acControl.Show(device, Room.CurrentRoom); + //lightControl.action = RefreshBodyView; + lightControl.Show(device, Room.CurrentRoom); }; - //deviceItemFL.MouseLongEventHandler += acHandler; - deviceItemFL.MouseUpEventHandler += acHandler; - deviceName.MouseUpEventHandler += acHandler; - deviceIMG.MouseUpEventHandler += acHandler; + + lightView.CollectButton.MouseUpEventHandler += collectionEvent; } else if (device.CommonDevice.Type == ZigBee.Device.DeviceType.DimmableLight) { //璋冨厜鐏� var dimmableLight = device.CommonDevice as DimmableLight; - //琛ヤ笂闈炶繙绋� if (dimmableLight.Gateway == null) { @@ -2430,7 +1534,6 @@ { dimmableLight.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch); dimmableLight.ReadOnOffStatus(); - dimmableLight.ReadLevel(); }); } else @@ -2440,237 +1543,108 @@ { dimmableLight.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch); dimmableLight.ReadOnOffStatus(); - dimmableLight.ReadLevel(); } } - var deviceFL = new FrameLayout - { - Height = Application.GetRealHeight(deviceFL_Height), - BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor, - Tag = device - }; - deviceVerticalScrolViewLayout.AddChidren(deviceFL); - var deviceRowLayout = new RowLayout - { - Y = Application.GetRealHeight(25), - Height = Application.GetRealHeight(deviceFL_Height - 25) - 1, - LineColor = ZigbeeColor.Current.GXCBackgroundColor, - BackgroundColor = ZigbeeColor.Current.GXCTopViewBackgroundColor, - Radius = CommonPage.BigFormRadius, - Tag = device - }; - deviceFL.AddChidren(deviceRowLayout); + var lightView = new FunctionMainView(xx, yy); + itemView.AddChidren(lightView); + lightView.Init(); + lightView.SetDeviceImage(device.IconPath, device.OnlineIconPath); + lightView.SetStatuText(device.GetDeviceStatu()); + lightView.SetDeviceName(device.CommonDevice.DeviceEpointName); + lightView.IsSelected = dimmableLight.OnOffStatus == 1; + lightView.SetCollect(Room.CurrentRoom.IsCollectInRoom(Room.CurrentRoom, device.FileName)); - var deviceItemFL = new FrameLayout() + var dev = Room.LoveRoomDeviceUIFilePathList.Find((obj) => obj == device.FileName); + if (dev == null) { - BackgroundColor = ZigbeeColor.Current.GXCTopViewBackgroundColor, - Radius = CommonPage.BigFormRadius - }; - deviceRowLayout.AddChidren(deviceItemFL); - var deviceIMG = new Button() - { - X = Application.GetRealWidth(50), - Y = Application.GetRealHeight(30), - Width = Application.GetMinRealAverage(110), - Height = Application.GetMinRealAverage(110), - UnSelectedImagePath = device.IconPath, - SelectedImagePath = device.OnlineIconPath, - IsSelected = dimmableLight.IsOnline == 1, - Tag = deviceStatus_Online - }; - deviceItemFL.AddChidren(deviceIMG); - var deviceName = new Button() - { - X = Application.GetRealWidth(10), - Y = deviceIMG.Bottom, - Width = Application.GetRealWidth(180), - Height = Application.GetRealHeight(80), - TextColor = ZigbeeColor.Current.GXCTextBlackColor, - TextAlignment = TextAlignment.Center, - Text = device.CommonDevice.DeviceEpointName, - TextSize = 10, - IsMoreLines = true - }; - deviceItemFL.AddChidren(deviceName); - - var levelSeekBar = new HorizontalSeekBar() - { - X = deviceIMG.Right + Application.GetRealWidth(50), - Width = Application.GetRealWidth(500), - Height = Application.GetRealHeight(80), - Gravity = Gravity.CenterVertical, - BackgroundColor = ZigbeeColor.Current.GXCSliderUnSelectedColor, - ThumbColor = ZigbeeColor.Current.GXCButtonBlueColor, - BorderColor = ZigbeeColor.Current.GXCButtonBlueColor, - ProgressColor = ZigbeeColor.Current.GXCButtonBlueColor, - Max = 254, - Tag = "LevelSeekBar", - Progress = dimmableLight.Level, - SleepTime = sleepSpan - }; - deviceItemFL.AddChidren(levelSeekBar); - levelSeekBar.ProgressChanged += (send2, e2) => - { - dimmableLight.SetLevel(levelSeekBar.Progress); - }; - - var collectionBtn = new Button() - { - X = deviceItemFL.Right - Application.GetRealWidth(150), - Y = Application.GetRealHeight(20), - Width = Application.GetMinRealAverage(80), - Height = Application.GetMinRealAverage(80), - UnSelectedImagePath = "Item/Collection.png", - SelectedImagePath = "Item/CollectionSelected.png", - Tag = device - }; - //***鍏堥殣钘�****** - //deviceItemFL.AddChidren(collectionBtn); - var switchBtnBG = new Button - { - X = deviceItemFL.Right - Application.GetRealWidth(250), - Width = Application.GetMinRealAverage(250), - Height = Application.GetMinRealAverage(250), - Gravity = Gravity.CenterVertical - }; - deviceItemFL.AddChidren(switchBtnBG); - var switchBtn = new Button - { - X = deviceItemFL.Right - Application.GetRealWidth(200), - //Y = deviceItemFL.Bottom - Application.GetRealHeight(120), - Width = Application.GetMinRealAverage(183), - Height = Application.GetMinRealAverage(123), - UnSelectedImagePath = "Item/Switch.png", - SelectedImagePath = "Item/SwitchSelected.png", - IsSelected = dimmableLight.OnOffStatus == 1, - Tag = deviceStatus_OnOffStatus, - //Visible=false - Gravity = Gravity.CenterVertical - }; - deviceItemFL.AddChidren(switchBtn); - switchBtn.MouseUpEventHandler += (send2, e2) => - { - switchBtn.IsSelected = !switchBtn.IsSelected; - if (switchBtn.IsSelected == true) - { - //zbGateway = device.CommonDevice.Gateway; - //sendedControlCommand = false; - //zbGateway.ReportAction += UpdateDeviceControllStatu; - //AddZbGateway(zbGatewayList, zbGateway, commonDeviceList, device.CommonDevice); - - dimmableLight.SwitchControl(1); - - //鎺у埗寤舵椂鍥炶皟 - //DeviceUI.SendCommandDelayAction(device.CommonDevice, () => - //{ - //if (Parent == null) - //{ - // return; - //} - //RemoveUpdateControlDeviceStatuAction(zbGateway); - //if (sendedControlCommand == false) - //{ - // DeviceUI.ShowStatuTip(R.MyInternationalizationString.FAIL); - //} - //}); - } - else - { - //zbGateway = device.CommonDevice.Gateway; - //sendedControlCommand = false; - //zbGateway.ReportAction += UpdateDeviceControllStatu; - //AddZbGateway(zbGatewayList, zbGateway, commonDeviceList, device.CommonDevice); - - dimmableLight.SwitchControl(0); - - //鎺у埗寤舵椂鍥炶皟 - //DeviceUI.SendCommandDelayAction(device.CommonDevice, () => - //{ - // if (Parent == null) - // { - // return; - // } - // RemoveUpdateControlDeviceStatuAction(zbGateway); - // if (sendedControlCommand == false) - // { - // DeviceUI.ShowStatuTip(R.MyInternationalizationString.FAIL); - // } - //}); - } - }; - - var deleteBtn = new Device.CommonForm.RowLayoutDeleteButton - { - Tag = device, - IsMoreLines = true - }; - if (Room.CurrentRoom.IsLove) - { - deleteBtn.TextID = R.MyInternationalizationString.CancelCollect; - deleteBtn.BackgroundColor = ZigbeeColor.Current.GXCCancelCollectionBGColor; - deleteBtn.MouseUpEventHandler += collectionEvent; - deviceRowLayout.AddRightView(deleteBtn); - } - else if (Room.CurrentRoom.IsSharedRoom) - { - //涓嶅鐞� + lightView.CollectButton.IsSelected = false; } else { - deleteBtn.MouseUpEventHandler += delEvent; - deviceRowLayout.AddRightView(deleteBtn); + lightView.CollectButton.IsSelected = true; } - EventHandler<MouseEventArgs> dimmableLightHandler = (sender, e) => + lightView.SwitchButton.MouseUpEventHandler += (sender, e) => + { + (sender as Button).IsSelected = !(sender as Button).IsSelected; + if ((sender as Button).IsSelected) + { + zbGateway = device.CommonDevice.Gateway; + sendedControlCommand = false; + zbGateway.ReportAction += UpdateDeviceControllStatu; + AddZbGateway(zbGatewayList, zbGateway, commonDeviceList, device.CommonDevice); + + dimmableLight.SwitchControl(1); + + ((sender as Button).Parent as FunctionMainView).SetStatuText(device.GetDeviceStatu()); + ((sender as Button).Parent as FunctionMainView).IsSelected = true; + + //鎺у埗寤舵椂鍥炶皟 + DeviceUI.SendCommandDelayAction(device.CommonDevice, () => + { + if (Parent == null) + { + return; + } + RemoveUpdateControlDeviceStatuAction(zbGateway); + if (sendedControlCommand == false) + { + DeviceUI.ShowStatuTip(R.MyInternationalizationString.FAIL); + } + }); + } + else + { + zbGateway = device.CommonDevice.Gateway; + sendedControlCommand = false; + zbGateway.ReportAction += UpdateDeviceControllStatu; + AddZbGateway(zbGatewayList, zbGateway, commonDeviceList, device.CommonDevice); + + dimmableLight.SwitchControl(0); + + ((sender as Button).Parent as FunctionMainView).SetStatuText(device.GetDeviceStatu()); + ((sender as Button).Parent as FunctionMainView).IsSelected = false; + + //鎺у埗寤舵椂鍥炶皟 + DeviceUI.SendCommandDelayAction(device.CommonDevice, () => + { + if (Parent == null) + { + return; + } + RemoveUpdateControlDeviceStatuAction(zbGateway); + if (sendedControlCommand == false) + { + DeviceUI.ShowStatuTip(R.MyInternationalizationString.FAIL); + } + }); + } + }; + + lightView.CardBG.MouseUpEventHandler += (sender, e) => { var dimmableLightControl = new Phone.Device.Light.DimmableLightControl(); UserView.HomePage.Instance.AddChidren(dimmableLightControl); UserView.HomePage.Instance.PageIndex += 1; UserView.HomePage.Instance.ScrollEnabled = false; - dimmableLightControl.action = RefreshBodyView; + //dimmableLightControl.action = RefreshBodyView; dimmableLightControl.Show(device, Room.CurrentRoom); }; - //deviceItemFL.MouseLongEventHandler += dimmableLightHandler; - deviceItemFL.MouseUpEventHandler += dimmableLightHandler; - deviceName.MouseUpEventHandler += dimmableLightHandler; - deviceIMG.MouseUpEventHandler += dimmableLightHandler; - //collectionBtn.MouseUpEventHandler += (sender, e) => - //{ - // if (collectionBtn.IsSelected) - // { - // Room.Lists[0].DeleteDevice(device.FilePath); - // collectionBtn.IsSelected = false; - // if(Room.CurrentRoom==Room.Lists[0]) - // { - // RefreshBodyView(); - // } - // } - // else - // { - // Room.Lists[0].AddDevice(device.FilePath); - // collectionBtn.IsSelected = true; - // } - // //RefreshBodyView(); - //}; - collectionBtn.MouseUpEventHandler += collectionEvent; - - //var dev = Room.LoveRoomDeviceUIFilePathList.Find((obj) => obj == device.FilePath); - //if (dev == null) - //{ - // collectionBtn.IsSelected = false; - //} - //else - //{ - // collectionBtn.IsSelected = true; - //} + lightView.CollectButton.MouseUpEventHandler += collectionEvent; } else if (device.CommonDevice.Type == DeviceType.OnOffSwitch) { - //鎸夐敭 - var panel = (Panel)device.CommonDevice; - + var lightView = new FunctionMainView(xx, yy); + itemView.AddChidren(lightView); + lightView.Init(); + lightView.SetDeviceImage(device.IconPath, device.OnlineIconPath); + lightView.SetStatuText(device.GetDeviceStatu()); + lightView.SetDeviceName(device.CommonDevice.DeviceEpointName); + //lightView.SetStatu(true); + lightView.IsSelected = true; + lightView.SetCollect(Room.CurrentRoom.IsCollectInRoom(Room.CurrentRoom, device.FileName)); } } } @@ -2686,13 +1660,22 @@ /// </summary> private void ShowNoSceneTip() { + var noScene = new Button + { + Y = Application.GetRealHeight(69), + Width = Application.GetMinRealAverage(683), + Height = Application.GetMinRealAverage(392), + Gravity = Gravity.CenterHorizontal, + UnSelectedImagePath = "Item/NoFunction.png" + }; + functionSceneBodyView.AddChidren(noScene); var noScenceTip = new Button() { + Y=noScene.Bottom, Height = Application.GetRealHeight(200), - TextID = R.MyInternationalizationString.NoScene, + Text =Language.StringByID(R.MyInternationalizationString.NoScene).Replace("{\\r\\n}","\r\n"), TextColor = ZigbeeColor.Current.GXCPlaceHolderTextColor, - TextAlignment = TextAlignment.Center, - Gravity = Gravity.Center, + IsMoreLines=true }; functionSceneBodyView.AddChidren(noScenceTip); } @@ -2716,81 +1699,66 @@ { var sceneScrolView = new VerticalScrolViewLayout { }; functionSceneBodyView.AddChidren(sceneScrolView); - foreach (var scene in sceneList) + for(int i=0;i<sceneList.Count;i++) { + var scene = sceneList[i]; + int xx = 43 + i % 2 * (20 + 487); + int yy = 14; if (scene == null) { continue; } - var sceneFL = new FrameLayout() + + if (i % 2 == 0) { - Height = Application.GetRealHeight(400), - BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor, - Tag = scene - }; - sceneScrolView.AddChidren(sceneFL); - var sceneRowLayout = new RowLayout() - { - Y = Application.GetRealHeight(30), - Height = Application.GetRealHeight(400 - 10 - 30), - LineColor = ZigbeeColor.Current.GXCBackgroundColor, - Radius = CommonPage.BigFormRadius - }; - sceneFL.AddChidren(sceneRowLayout); - var sceneItemFL = new FrameLayout() - { - BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor, - Radius = CommonPage.BigFormRadius - }; - sceneRowLayout.AddChidren(sceneItemFL); - var sceneImg = new Button() - { - UnSelectedImagePath = scene.IconPath, - Radius = CommonPage.BigFormRadius - }; - sceneItemFL.AddChidren(sceneImg); - var hardBlackBG = new Button() - { - BackgroundColor = ZigbeeColor.Current.GXCBlack70Color, - SelectedBackgroundColor = ZigbeeColor.Current.GXCBlack80Color, - Radius = CommonPage.BigFormRadius - }; - sceneItemFL.AddChidren(hardBlackBG); - var sceneNameBtn = new Button() - { - Text = scene.Name, - TextColor = ZigbeeColor.Current.GXCTextWhiteColor, - TextSize = 20 - }; - sceneItemFL.AddChidren(sceneNameBtn); - //缂栬緫 - var editBtn = new Device.CommonForm.RowLayoutEditButton - { - TextID = R.MyInternationalizationString.Edit, - Tag = scene - }; - //鍒犻櫎 - var deleteBtn = new Device.CommonForm.RowLayoutDeleteButton - { - Tag = scene - }; - if (!Room.CurrentRoom.IsSharedRoom) - { - sceneRowLayout.AddRightView(editBtn); - sceneRowLayout.AddRightView(deleteBtn); + itemView = new FrameLayout() + { + Height = Application.GetRealHeight(14 + 348), + Tag = scene + }; + sceneScrolView.AddChidren(itemView); } - EventHandler<MouseEventArgs> sceneDownHandler = (sender, e) => + var sceneView = new SceneMainView(xx, yy); + itemView.AddChidren(sceneView); + sceneView.Init(); + sceneView.SetSceneNameText(scene.Name); + sceneView.SetIcon($"SceneIcon/{i}.png"); + sceneView.SetCollect(Common.Room.CurrentRoom.GetLoveRoom().SceneUIFilePathList.Contains(scene.FileName)); + + if (scene.SceneDelayTime == 0) { - hardBlackBG.IsSelected = true; + sceneView.SetTimeImage(); + } + else + { + sceneView.SetTimeText(scene.SceneDelayTime.ToString()); + } + + sceneView.TimeButton.MouseUpEventHandler += (sender, e) => + { + var timeSelect = new SelectTime(); + CommonPage.Instance.AddChidren(timeSelect); + timeSelect.TempTime = scene.DelayTime; + timeSelect.Init(); + timeSelect.TimeAction = (t) => + { + scene.SceneDelayTime = t; + if(t>0) + { + sceneView.SetTimeText(CommonFormResouce.GetTimeString(scene.SceneDelayTime)); + } + else + { + sceneView.SetTimeImage(); + } + }; + }; - sceneNameBtn.MouseDownEventHandler += sceneDownHandler; - hardBlackBG.MouseDownEventHandler += sceneDownHandler; //璋冪敤鍦烘櫙 EventHandler<MouseEventArgs> sceneUpHandler = async (sender, e) => { - hardBlackBG.IsSelected = false; //1鎴愬姛 0澶辫触 //鍚庨潰琛ヤ笂鐩稿叧鎻愮ず // Error鍙傛暟鍚箟 @@ -2799,7 +1767,7 @@ //<para>3锛氭搷浣滆澶�/缁�/鍦烘櫙涓嶅瓨鍦�</para> //<para>4锛氬叾浠栭敊璇�</para> //<para>5锛氭暟鎹紶杈撻敊璇紙鍦ㄦ煇娆″鎴风鍚戠綉鍏冲彂閫佹暟鎹殑杩囩▼涓紝缃戝叧鍦ㄥ悎鐞嗘椂闂磋寖鍥村唴鎺ユ敹瀹㈡埛绔暟鎹笉瀹屾暣瀵艰嚧璇ラ敊璇彂鐢熴�傚瀹㈡埛绔悜缃戝叧涓�娆″彂閫�100涓瓧鑺傜殑鏁版嵁锛屼絾缃戝叧绛夊緟鎺ユ敹浜嗕竴绉掑彧鎺ユ敹浜�80涓瓧鑺傘�傚彂鐢熻閿欒锛岀綉鍏冲皢涓诲姩鍏抽棴瀹㈡埛绔繛鎺ワ級</para> - var sceneOpenAllData = await ZigBee.Device.Scene.ControlSceneAsync(scene.Id, 0); + var sceneOpenAllData = await ZigBee.Device.Scene.ControlSceneAsync(scene.Id, scene.SceneDelayTime); if (sceneOpenAllData == null || sceneOpenAllData.sceneOpenData == null) { return; @@ -2813,54 +1781,45 @@ CommonPage.Instance.ShowErrorInfoAlert(R.MyInternationalizationString.ControlSceneFail); } }; - sceneNameBtn.MouseUpEventHandler += sceneUpHandler; - hardBlackBG.MouseUpEventHandler += sceneUpHandler; - - //缂栬緫鍦烘櫙 - EventHandler<MouseEventArgs> editEvent = (sender, e) => + //鏀惰棌 + EventHandler<MouseEventArgs> collectionEvent = (sender, e) => { - SceneRoomUI.EditScene(scene, Room.CurrentRoom); - }; - editBtn.MouseUpEventHandler += editEvent; - - //鍒犻櫎鍦烘櫙 - EventHandler<MouseEventArgs> delEvent = (sender, e) => - { - var alert = new Alert(Language.StringByID(R.MyInternationalizationString.TIP), Language.StringByID(R.MyInternationalizationString.ConfirmDelete), Language.StringByID(R.MyInternationalizationString.Cancel), Language.StringByID(R.MyInternationalizationString.Confrim)); - alert.Show(); - alert.ResultEventHandler += async (send1, e1) => + (sender as Button).IsSelected = !(sender as Button).IsSelected; + if ((sender as Button).IsSelected) { - if (e1) - { - //0 绉婚櫎澶辫触 1 绉婚櫎鎴愬姛 2 娌℃湁璇ュ満鏅� - var removeSceneAllData = await ZigBee.Device.Scene.DeleteSceneAsync(scene.Id); - if (removeSceneAllData == null || removeSceneAllData.removeSceneData == null) - { - return; - } - if (removeSceneAllData.removeSceneData.Result == 1) - { - //1鎴愬姛 - Room.CurrentRoom.RemoveScene(scene); - //RefreshBodyView(); - sceneScrolView.RemoveViewByTag((sender as Button).Tag); - } - else if (removeSceneAllData.removeSceneData.Result == 0) - { - //0 绉婚櫎澶辫触 - CommonPage.Instance.ShowErrorInfoAlert(R.MyInternationalizationString.DeleteSceneFail); - } - else if (removeSceneAllData.removeSceneData.Result == 2) - { - //2 娌℃湁璇ュ満鏅� - Room.CurrentRoom.RemoveScene(scene); - //RefreshBodyView(); - sceneScrolView.RemoveViewByTag((sender as Button).Tag); - } - } - }; + //scene.IsCollected = true; + Room.CurrentRoom.GetLoveRoom().AddScene(scene); + } + else + { + //scene.IsCollected = false; + Room.CurrentRoom.GetLoveRoom().RemoveScene(scene); + } + scene.Save(); + + //if ((sender as Button).IsSelected) + //{ + // scene.Collect(false); + // (sender as Button).IsSelected = false; + //} + //else + //{ + // scene.Collect(true); + // (sender as Button).IsSelected = true; + //} + //scene.Save(); + //if (Room.CurrentRoom.IsLove) + //{ + // RefreshBodyView(); + //} + }; - deleteBtn.MouseUpEventHandler += delEvent; + + sceneView.CollectButton.MouseUpEventHandler += collectionEvent; + sceneView.MouseUpEventHandler += sceneUpHandler; + sceneView.SceneIcon.MouseUpEventHandler+= sceneUpHandler; + sceneView.SceneNameButton.MouseUpEventHandler += sceneUpHandler; + } } -- Gitblit v1.8.0