~wjc/HomeApp.git

old mode 100755 new mode 100644

			@@ -6,6 +6,7 @@
			using Shared.Phone.Device.CommonForm;
			using Shared.Phone.UserCenter.DoorLock;
			using System.Timers;
			using Shared.Phone.Device.DeviceLogic;

			namespace Shared.Phone.UserView
			{
			@@ -180,8 +181,8 @@
			return;
			}
			airSwitch.OnOffStatus = airSwitch.DeviceStatusReport.AttriBute[0].AttriButeData;
			(rowFL.GetChildren(0) as FunctionMainView).IsSelected = airSwitch.OnOffStatus == 1;
			(rowFL.GetChildren(0) as FunctionMainView).StatuButton.Text = deviceUI.GetDeviceStatu();
			(rowFL.GetChildren(0) as FunctionMainView).IsSelected = airSwitch.OnOffStatus == 1;
			(rowFL.GetChildren(0) as FunctionMainView).StatuButton.Text = deviceUI.GetDeviceStatu();
			//记录回复时间
			airSwitch.LastDateTime = DateTime.Now;
			}
			@@ -425,7 +426,10 @@
			Gravity = Gravity.CenterVertical,
			UnSelectedImagePath = "Item/Floor.png"
			};
			topFrameLayout.AddChidren(floor);
			if (Config.Instance.Home.FloorDics.Count > 0)
			{
			topFrameLayout.AddChidren(floor);
			}

			floorBtn = new Button
			{
			@@ -437,7 +441,10 @@
			TextColor = ZigbeeColor.Current.GXCTextColor,
			Text = Config.Instance.Home.GetCurrentFloorName
			};
			topFrameLayout.AddChidren(floorBtn);
			if (Config.Instance.Home.FloorDics.Count > 0)
			{
			topFrameLayout.AddChidren(floorBtn);
			}

			var messageBtn = new Button()
			{
			@@ -459,7 +466,8 @@
			TextAlignment = TextAlignment.CenterLeft,
			Text = Config.Instance.Home.Name ?? Language.StringByID(R.MyInternationalizationString.TheResidenceNameNull),
			TextSize = 24,
			TextColor = ZigbeeColor.Current.GXCTextBlackColor
			TextColor = ZigbeeColor.Current.GXCTextBlackColor,
			IsBold=true
			};
			if (Config.Instance.Home.IsOthreShare)
			{
			@@ -475,7 +483,7 @@
			var tempHomeBtn = send as Button;
			if (Config.Instance.HomeFilePathList.Count == 0)
			{
			var alert = new Alert(Language.StringByID(R.MyInternationalizationString.TIP), Language.StringByID(R.MyInternationalizationString.CurrentlyTheUserIshHouseIsEmptyPleaseBuildANewHouseFirst), Language.StringByID(R.MyInternationalizationString.Close), Language.StringByID(R.MyInternationalizationString.OK));
			var alert = new Alert(Language.StringByID(R.MyInternationalizationString.TIP), Language.StringByID(R.MyInternationalizationString.CurrentlyTheUserIshHouseIsEmptyPleaseBuildANewHouseFirst), Language.StringByID(R.MyInternationalizationString.Close), Language.StringByID(R.MyInternationalizationString.Confrim));
			alert.Show();
			alert.ResultEventHandler += (senderHouse, eHouse) =>
			{
			@@ -502,7 +510,7 @@
			Y = Application.GetRealHeight(248),
			Width = Application.GetMinRealAverage(449),
			Height = Application.GetMinRealAverage(478),
			UnSelectedImagePath = "Item/SelectHouse"
			UnSelectedImagePath = "Item/SelectHouse.png"
			};
			closeBGview.AddChidren(bg);

			@@ -510,8 +518,8 @@
			{
			X = Application.GetRealWidth(35),
			Y = Application.GetRealHeight(271),
			Height = Application.GetRealHeight(449),
			Width = Application.GetRealWidth(440),
			Height = Application.GetMinRealAverage(449),
			Width = Application.GetMinRealAverage(440),
			Radius = CommonPage.BigFormRadius,
			BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor
			};
			@@ -623,23 +631,25 @@
			//消息
			messageBtn.MouseUpEventHandler += (send, e) =>
			{


			};

			#endregion

			if (CanBindGateway() == false)
			{
			var roomPageView = new PageLayout()

			var roomPageView = new HorizontalPages()
			{
			Y = Application.GetRealHeight(302),
			Width = Application.GetRealWidth(CommonPage.AppRealWidth - CommonPage.XLeft * 2),
			Height = Application.GetMinRealAverage(roomPageView_Height),
			Radius = CommonPage.BigFormRadius,
			Gravity = Gravity.CenterHorizontal,
			IsShowPoint = false
			Width = Application.GetRealWidth(CommonPage.AppRealWidth),
			Height = Application.GetRealHeight(478),
			};
			AddChidren(roomPageView);
			//突出边距
			roomPageView.TCBJ = Application.GetRealWidth(112);
			//两个page之间的间距
			roomPageView.JMBJ = Application.GetRealWidth(69);

			//当前房间
			//Room.CurrentRoom = Room.CurrentRoom == null ? Room.Lists[0] : Room.CurrentRoom;
			@@ -647,50 +657,12 @@
			Room.CurrentRoom = rList[0];
			foreach (var room in rList)
			{
			var roomBackView = new FrameLayout()
			var roomView = new Device.CommonForm.RoomView(0, 0);
			roomPageView.AddChidren(roomView);
			roomView.Init(room);
			roomView.action += () =>
			{
			BackgroundImagePath = room.BackgroundImage
			};
			roomPageView.AddChidren(roomBackView);
			var roomBG = new Button()
			{
			UnSelectedImagePath = "Room/HomeBG.png",
			//UnSelectedImagePath = room.BackgroundImage
			};
			roomBackView.AddChidren(roomBG);
			var roomName = new Button()
			{
			X = Application.GetRealWidth(20),
			Y = Application.GetRealHeight(20),
			Width = Application.GetRealWidth(500),
			Height = Application.GetRealHeight(80),
			Text = room.Name,
			TextAlignment = TextAlignment.CenterLeft,
			TextColor = ZigbeeColor.Current.GXCTextWhiteColor,
			TextSize = 18,
			};
			roomBackView.AddChidren(roomName);
			var roomListBtn = new Device.CommonForm.SelectedStatuButton()
			{
			X = roomPageView.Width - Application.GetRealWidth(100 + 20),
			Y = Application.GetRealHeight(20),
			Width = Application.GetMinRealAverage(100),
			Height = Application.GetMinRealAverage(100),
			UnSelectedImagePath = "Item/List.png",
			};
			roomBackView.AddChidren(roomListBtn);

			roomListBtn.MouseUpEventHandler += (send, e) =>
			{
			CommonPage.Instance.IsDrawerLockMode = true;
			var editRoom = new Device.Room.EditRoom();
			HomePage.Instance.AddChidren(editRoom);
			HomePage.Instance.PageIndex += 1;
			editRoom.Show(room);
			editRoom.action += () =>
			{
			Show();
			};
			Show();
			};
			}

			@@ -714,7 +686,9 @@
			TextColor = ZigbeeColor.Current.GXCTextGrayColor3,
			SelectedTextColor = ZigbeeColor.Current.GXCTextWhiteColor,
			TextID = R.MyInternationalizationString.Scence,
			IsSelected = false
			IsSelected = true,
			TextSize=16,
			IsBold=true
			};
			functionSceneView.AddChidren(sceneBtn);

			@@ -728,7 +702,8 @@
			TextColor = ZigbeeColor.Current.GXCTextGrayColor3,
			SelectedTextColor = ZigbeeColor.Current.GXCTextWhiteColor,
			TextID = R.MyInternationalizationString.Function,
			IsSelected = false
			IsSelected = false,
			TextSize=14
			};
			functionSceneView.AddChidren(functionBtn);

			@@ -747,6 +722,10 @@
			{
			sceneBtn.IsSelected = false;
			functionBtn.IsSelected = true;
			sceneBtn.TextSize = 14;
			sceneBtn.IsBold = false;
			functionBtn.TextSize = 16;
			functionBtn.IsBold = true;
			RefreshBodyView();
			};
			//选择场景分栏
			@@ -754,6 +733,10 @@
			{
			functionBtn.IsSelected = false;
			sceneBtn.IsSelected = true;
			sceneBtn.TextSize = 16;
			sceneBtn.IsBold = true;
			functionBtn.TextSize = 14;
			functionBtn.IsBold = false;
			RefreshBodyView();
			};

			@@ -770,7 +753,7 @@
			{
			ShowNoGatewayTip();
			}


			}

			#endregion
			@@ -909,7 +892,7 @@
			private void GoToAddGateWay(object sender, MouseEventArgs mouseEventArgs)
			{
			var selectNewGateWayForm = new UserCenter.GatewayAdd.NewGateWayMenuSelectForm { };
			selectNewGateWayForm.AddForm();
			selectNewGateWayForm.AddForm(selectNewGateWayForm);
			}

			#endregion
			@@ -935,7 +918,7 @@
			{
			Y = noFunction.Bottom,
			Height = Application.GetRealHeight(200),
			Text = Language.StringByID(R.MyInternationalizationString.NoFunction).Replace("{\\r\\n}", "\r\n"),
			Text = Language.StringByID(R.MyInternationalizationString.NoFunction_Tip).Replace("{\\r\\n}", "\r\n"),
			TextColor = ZigbeeColor.Current.GXCPlaceHolderTextColor,
			IsMoreLines = true
			};
			@@ -1019,14 +1002,14 @@
			//发送读取状态命令
			ReadStatus(rollerShade, () =>
			{
			rollerShade.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
			ReadDeviceAttributeLogic.Instance.SendCurtainStatuComand(device.CommonDevice);
			});
			}
			else
			{
			if (CommonPage.ReadDeviceStatuSpan < (DateTime.Now - rollerShade.LastDateTime).TotalSeconds)
			{
			rollerShade.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
			ReadDeviceAttributeLogic.Instance.SendCurtainStatuComand(device.CommonDevice);
			}
			}
			var lightView = new FunctionMainView(xx, yy);
			@@ -1049,7 +1032,7 @@
			zbGateway.ReportAction += UpdateDeviceControllStatu;
			AddZbGateway(zbGatewayList, zbGateway, commonDeviceList, device.CommonDevice);

			(device.CommonDevice as Rollershade).CurtainUpDownStopControl(1);
			(device.CommonDevice as Rollershade).CurtainUpDownStopControl(0);

			((sender as Button).Parent as FunctionMainView).SetStatuText(CommonFormResouce.GetSwitchStatu(true));
			((sender as Button).Parent as FunctionMainView).IsSelected = true;
			@@ -1075,7 +1058,7 @@
			zbGateway.ReportAction += UpdateDeviceControllStatu;
			AddZbGateway(zbGatewayList, zbGateway, commonDeviceList, device.CommonDevice);

			(device.CommonDevice as Rollershade).CurtainUpDownStopControl(0);
			(device.CommonDevice as Rollershade).CurtainUpDownStopControl(1);

			((sender as Button).Parent as FunctionMainView).SetStatuText(CommonFormResouce.GetSwitchStatu(false));
			((sender as Button).Parent as FunctionMainView).IsSelected = false;
			@@ -1124,16 +1107,14 @@
			//发送读取状态命令
			ReadStatus(light, () =>
			{
			light.ReadOnOffStatus();
			light.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
			ReadDeviceAttributeLogic.Instance.SendLightStatuComand(device.CommonDevice);
			});
			}
			else
			{
			if (CommonPage.ReadDeviceStatuSpan < (DateTime.Now - light.LastDateTime).TotalSeconds)
			{
			light.ReadOnOffStatus();
			light.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
			ReadDeviceAttributeLogic.Instance.SendLightStatuComand(device.CommonDevice);
			}
			}

			@@ -1259,8 +1240,7 @@
			//发送读取状态命令
			ReadStatus(airSwitch, () =>
			{
			airSwitch.ReadOnOffStatus();
			airSwitch.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
			ReadDeviceAttributeLogic.Instance.SendLightStatuComand(device.CommonDevice);
			});
			}
			else
			@@ -1268,8 +1248,7 @@
			//防止短时间内多次读取设备状态
			if ((DateTime.Now - airSwitch.LastDateTime).TotalSeconds > CommonPage.ReadDeviceStatuSpan)
			{
			airSwitch.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
			airSwitch.ReadOnOffStatus();
			ReadDeviceAttributeLogic.Instance.SendLightStatuComand(device.CommonDevice);
			}
			}

			@@ -1367,15 +1346,7 @@
			//发送读取状态命令
			ReadStatus(ac, () =>
			{
			ac.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
			ac.ReadLocalTemperature();
			ac.ReadCoolingSetpoint();
			ac.ReadHeatingSetpoint();
			ac.ReadAutoSetpoint();
			ac.ReadFanMode();
			ac.ReadSystemMode();
			ac.ReadSystemFansSwingMode();
			ac.ReadModeSupport();
			ReadDeviceAttributeLogic.Instance.SendACStatuComand(device.CommonDevice);
			});
			}
			else
			@@ -1383,15 +1354,7 @@
			//防止短时间内多次读取设备状态
			if ((DateTime.Now - ac.LastDateTime).TotalSeconds > CommonPage.ReadDeviceStatuSpan)
			{
			ac.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
			ac.ReadLocalTemperature();
			ac.ReadCoolingSetpoint();
			ac.ReadHeatingSetpoint();
			ac.ReadAutoSetpoint();
			ac.ReadFanMode();
			ac.ReadSystemMode();
			ac.ReadSystemFansSwingMode();
			ac.ReadModeSupport();
			ReadDeviceAttributeLogic.Instance.SendACStatuComand(device.CommonDevice);
			}
			}
			var lightView = new FunctionMainView(xx, yy);
			@@ -1486,8 +1449,7 @@
			//发送读取状态命令
			ReadStatus(dimmableLight, () =>
			{
			dimmableLight.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
			dimmableLight.ReadOnOffStatus();
			ReadDeviceAttributeLogic.Instance.SendDimmableLightStatuComand(device.CommonDevice);
			});
			}
			else
			@@ -1495,8 +1457,7 @@
			//防止短时间内多次读取设备状态
			if ((DateTime.Now - dimmableLight.LastDateTime).TotalSeconds > CommonPage.ReadDeviceStatuSpan)
			{
			dimmableLight.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
			dimmableLight.ReadOnOffStatus();
			ReadDeviceAttributeLogic.Instance.SendDimmableLightStatuComand(device.CommonDevice);
			}
			}

			@@ -1597,20 +1558,6 @@
			{
			continue;
			}
			if (dimmableLight.Gateway.IsVirtual)
			{
			ReadStatus(dimmableLight, () =>
			{
			dimmableLight.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
			});
			}
			else
			{
			if ((DateTime.Now - dimmableLight.LastDateTime).TotalSeconds > CommonPage.ReadDeviceStatuSpan)
			{
			dimmableLight.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
			}
			}

			var lightView = new FunctionMainView(xx, yy);
			itemView.AddChidren(lightView);
			@@ -1691,7 +1638,7 @@
			{
			Y = noScene.Bottom,
			Height = Application.GetRealHeight(200),
			Text = Language.StringByID(R.MyInternationalizationString.NoScene).Replace("{\\r\\n}", "\r\n"),
			Text = Language.StringByID(R.MyInternationalizationString.NoScene_Tip).Replace("{\\r\\n}", "\r\n"),
			TextColor = ZigbeeColor.Current.GXCPlaceHolderTextColor,
			IsMoreLines = true
			};
			@@ -1720,7 +1667,7 @@
			for (int i = 0; i < sceneList.Count; i++)
			{
			var scene = sceneList[i];
			int xx = 43 + i % 2 * (20 + 487);
			int xx = 33 + i % 2 * (40 + 487);
			int yy = 14;
			if (scene == null)
			{