~wjc/HomeApp.git

old mode 100644 new mode 100755

			@@ -21,14 +21,14 @@
			public HorizontalScrolViewLayout roomhorizontalScrol = new HorizontalScrolViewLayout
			{
			Width = Application.GetRealWidth(1080 - 58),
			Height = Application.GetRealHeight(200),
			Height = Application.GetRealHeight(204),
			Y = Application.GetRealHeight(184),
			X = Application.GetRealWidth(58),
			};
			public VerticalScrolViewLayout middle = new VerticalScrolViewLayout
			{
			Width = Application.GetRealWidth(1080),
			Height = Application.GetRealHeight(1920 - 260 - 200 - 184),
			Height = Application.GetRealHeight(Method.H - 260 - 204 - 184),
			BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
			};

			@@ -228,49 +228,31 @@
			for (int i = 0; i < RoomList.Count; i++)
			{
			var room = RoomList[i];
			var fra = new FrameLayout
			{
			Height = Application.GetRealHeight(200),
			Width = Application.GetRealWidth(255),
			};
			roomhorizontalScrol.AddChidren(fra);

			var roombjBtn = new Button
			{
			Height = Application.GetRealHeight(158),
			Width = Application.GetRealWidth(255),
			UnSelectedImagePath = "ZigeeLogic/iconBackgroundColor.png",
			SelectedImagePath = "ZigeeLogic/iconSelectedBackgroundColor.png",
			Y = Application.GetRealHeight(21),
			};
			fra.AddChidren(roombjBtn);

			var roomnameBtn = new Button
			{

			Height = Application.GetRealHeight(152 - 26 - 20),
			Width = Application.GetRealWidth(255 - 20 - 50),
			Text = room.Name,
			TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
			SelectedTextColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
			Y = Application.GetRealHeight(21 + 13 + 10),
			X = Application.GetRealWidth(10 + 25),

			};
			fra.AddChidren(roomnameBtn);
			LogicView.RoomClickView roomClickView = new LogicView.RoomClickView();
			roomClickView.Show(roomhorizontalScrol);
			roomClickView.roomnameBtn.Text =room.Name;

			if (i == 0)
			{
			roombjButton.IsSelected = false;
			roombjButton = roombjBtn;
			roombjBtn.IsSelected = true;

			roombjButton.IsSelected = false;
			roomClickView.roombjBtn.Height = Application.GetRealHeight(135);
			roomClickView.roombjBtn.Width = Application.GetRealWidth(245);
			roomClickView.roombjBtn.Y = Application.GetRealHeight(40);
			roomClickView.roombjBtn.X = Application.GetRealWidth(0);
			roombjButton = roomClickView.roombjBtn;
			roomClickView.roombjBtn.IsSelected = true;
			roomTextButton.IsSelected = false;
			roomTextButton = roomnameBtn;
			roomnameBtn.IsSelected = true;
			roomClickView.roomnameBtn.Width = Application.GetRealWidth(245 - 60 * 2);
			roomClickView.roomnameBtn.X = Application.GetRealWidth(60);
			roomTextButton = roomClickView.roomnameBtn;
			roomClickView.roomnameBtn.IsSelected = true;

			SceneView(room.ListSceneId);

			}


			EventHandler<MouseEventArgs> roomclick = (sender, e) =>
			{
			@@ -279,17 +261,31 @@
			clickbutton = null;
			clickbutton = new Button();

			roombjButton.Height = Application.GetRealHeight(72);
			roombjButton.Width = Application.GetRealWidth(170);
			roombjButton.Y = Application.GetRealHeight(60);
			roombjButton.X = Application.GetRealWidth(26);
			roombjButton.IsSelected = false;
			roombjButton = roombjBtn;
			roombjBtn.IsSelected = true;

			roomClickView.roombjBtn.Height = Application.GetRealHeight(135);
			roomClickView.roombjBtn.Width = Application.GetRealWidth(245);
			roomClickView.roombjBtn.Y = Application.GetRealHeight(40);
			roomClickView.roombjBtn.X = Application.GetRealWidth(0);
			roombjButton = roomClickView.roombjBtn;
			roomClickView.roombjBtn.IsSelected = true;

			roomTextButton.Width = Application.GetRealWidth(125);
			roomTextButton.X = Application.GetRealWidth(26 + 22);
			roomTextButton.IsSelected = false;
			roomTextButton = roomnameBtn;
			roomnameBtn.IsSelected = true;
			roomClickView.roomnameBtn.Width = Application.GetRealWidth(245 - 60 * 2);
			roomClickView.roomnameBtn.X = Application.GetRealWidth(60);
			roomTextButton = roomClickView.roomnameBtn;
			roomClickView.roomnameBtn.IsSelected = true;

			SceneView(room.ListSceneId);
			};
			roomnameBtn.MouseUpEventHandler += roomclick;
			roombjBtn.MouseUpEventHandler += roomclick;
			roomClickView.roomnameBtn.MouseUpEventHandler += roomclick;
			roomClickView.roombjBtn.MouseUpEventHandler += roomclick;

			}
			}
			@@ -303,9 +299,9 @@
			foreach (var sceneId in scenelist)
			{
			var scene = UserCenter.HdlSceneLogic.Current.GetSceneUIBySceneId(sceneId);
			if (scene == null)
			{
			continue;
			if (scene == null)
			{
			continue;
			}
			var sceneFramelayout = new FrameLayout
			{
			@@ -313,7 +309,6 @@
			BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
			};
			middle.AddChidren(sceneFramelayout);


			var sceneIconBtn = new Button
			{
			@@ -332,8 +327,7 @@
			Width = Application.GetRealWidth(850),
			Height = Application.GetRealHeight(130),
			X = Application.GetRealWidth(176 + 10),
			LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,

			LineColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
			};
			sceneFramelayout.AddChidren(sceneRow);

			@@ -349,15 +343,23 @@

			var selectedBtn = new Button
			{
			Width = Application.GetRealWidth(58),
			Height = Application.GetRealHeight(58),
			Width = Application.GetMinRealAverage(60),
			Height = Application.GetMinRealAverage(60),
			X = Application.GetRealWidth(789),
			UnSelectedImagePath = "ZigeeLogic/selected.png",
			Visible = false,
			Gravity = Gravity.CenterVertical,
			};
			sceneRow.AddChidren(selectedBtn);

			var lineBtn = new Button
			{
			Y = sceneFramelayout.Height - 1,
			Width = Application.GetRealWidth(850),
			Height = 1,
			X = Application.GetRealWidth(176 + 10),
			BackgroundColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
			};
			sceneFramelayout.AddChidren(lineBtn);
			EventHandler<MouseEventArgs> sceneclick = (sender, e) =>
			{
			tempScene = scene;