~wjc/HomeApp.git

old mode 100755 new mode 100644

			@@ -20,6 +20,7 @@
			Button roomTextButton = new Button();
			Button devicetypeButton = new Button();
			VerticalScrolViewLayout middle;
			HorizontalScrolViewLayout devicetypehorizontalScrol1;
			FrameLayout clickframeLayout = new FrameLayout();
			Button clickbutton = new Button();
			Button clicktextcolcrbutton = new Button();
			@@ -39,11 +40,11 @@

			var titleName = new Button
			{
			TextSize = 16,
			TextSize = 17,
			TextColor = ZigbeeColor.Current.LogicTextBlackColor,
			TextAlignment = TextAlignment.CenterLeft,
			X = Application.GetRealWidth(160),
			Width = Application.GetRealWidth(300),
			Width = Application.GetRealWidth(600),
			Height = Application.GetRealHeight(69),
			Y = Application.GetRealHeight(92),
			TextID = MyInternationalizationString.devicestate,
			@@ -89,6 +90,7 @@
			Y = Application.GetRealHeight(92),
			//TextID = MyInternationalizationString.customroom,
			Text = Config.Instance.Home.GetCurrentFloorName,
			TextSize = 14,
			};
			topRowLayout.AddChidren(foolrname);
			var dropdown = new Button
			@@ -121,7 +123,7 @@
			this.AddChidren(roomhorizontalScrol);


			var devicetypehorizontalScrol1 = new HorizontalScrolViewLayout()
			devicetypehorizontalScrol1 = new HorizontalScrolViewLayout()
			{
			Width = Application.GetRealWidth(1080 - 58-200),
			Height = Application.GetRealHeight(280),
			@@ -145,7 +147,7 @@

			middle = new VerticalScrolViewLayout();
			middle.Y = devicetypehorizontalScrol.Bottom + Application.GetRealHeight(40);
			middle.Height = Application.GetRealHeight(1920) - devicetypehorizontalScrol.Y;
			middle.Height = Application.GetRealHeight(1920 - 40) - devicetypehorizontalScrol.Bottom;
			middle.BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor;
			middle.X = Application.GetRealWidth(58);
			middle.Radius = (uint)Application.GetRealHeight(50);
			@@ -172,38 +174,75 @@
			{
			flMain.RemoveFromParent();
			};
			var foolrbjicon = new FrameLayout
			{

			Width = Application.GetRealWidth(450),
			Height = Application.GetRealHeight(780),
			X = Application.GetRealWidth(1080 - 468 - 35),
			Y = Application.GetRealHeight(184),
			BackgroundImagePath = "Item/SelectFloor_Right.png",
			};
			flMain.AddChidren(foolrbjicon);

			var btnfoolrtext = new Button
			{
			Width = Application.GetRealWidth(450),
			Height = Application.GetRealHeight(150),
			TextAlignment = TextAlignment.CenterLeft,
			TextColor = ZigbeeColor.Current.LogicTextBlackColor,
			X = Application.GetRealWidth(80),
			TextID = MyInternationalizationString.selecfoolr,
			TextSize = 14,
			};
			foolrbjicon.AddChidren(btnfoolrtext);

			var foolrbj = new VerticalScrolViewLayout
			{

			Width = Application.GetRealWidth(400),
			Height = Application.GetRealHeight(600),
			X = Application.GetRealWidth(1080 - 400 - 60),
			Y = Application.GetRealHeight(184 + 50),
			BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
			Radius = (uint)Application.GetRealHeight(30),
			Width = Application.GetRealWidth(450),
			Height = foolrbjicon.Height - btnfoolrtext.Height,
			X = Application.GetRealWidth(80),
			Y = btnfoolrtext.Bottom,
			};
			flMain.AddChidren(foolrbj);
			foolrbjicon.AddChidren(foolrbj);

			foreach (var foolr in Config.Instance.Home.FloorDics)
			{

			var foolrRowLayout = new FrameLayout
			var foolrRowLayout = new RowLayout
			{
			Height = Application.GetRealHeight(150),
			LineColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
			};
			foolrbj.AddChidren(foolrRowLayout);

			var btnfoolricon = new Button
			{
			Width = Application.GetRealWidth(81),
			Height = Application.GetRealHeight(81),
			UnSelectedImagePath = "Floor/Floor.png",
			Gravity = Gravity.CenterVertical,
			};
			foolrRowLayout.AddChidren(btnfoolricon);


			var btnfoolrname = new Button
			{
			Width = Application.GetRealWidth(250),
			Height = Application.GetRealHeight(160),
			Height = Application.GetRealHeight(150),
			Text = foolr.Value,
			TextAlignment = TextAlignment.Center,
			TextColor = ZigbeeColor.Current.LogicTextBlackColor,
			//SelectedTextColor=0xfffc744b,
			TextAlignment = TextAlignment.CenterLeft,
			TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
			Tag = foolr.Key,
			X = btnfoolricon.Right + Application.GetRealWidth(12),
			TextSize = 14,
			};
			foolrRowLayout.AddChidren(btnfoolrname);

			if (foolrname.Text == foolr.Value)
			{
			btnfoolricon.UnSelectedImagePath = "Floor/FloorSelected.png";
			btnfoolrname.TextColor = ZigbeeColor.Current.LogicTextBlackColor;
			}

			EventHandler<MouseEventArgs> foolrnameclick = (sender13, e13) =>
			{
			@@ -214,6 +253,7 @@
			flMain.RemoveFromParent();
			var list = Send.GetRoomList(btnfoolrname.Tag.ToString());
			AllRoomView(list, deviceTypeList, roomhorizontalScrol, devicetypehorizontalScrol);

			};
			foolrRowLayout.MouseUpEventHandler += foolrnameclick;
			btnfoolrname.MouseUpEventHandler += foolrnameclick;
			@@ -311,6 +351,18 @@
			}
			list.Add(device);
			}
			if (list.Count == 0)
			{
			devicetypehorizontalScrol.Height = 0;
			devicetypehorizontalScrol1.Height = 0;
			middle.Height = 0;
			}
			else
			{
			devicetypehorizontalScrol.Height = Application.GetRealHeight(280);
			devicetypehorizontalScrol1.Height = Application.GetRealHeight(280);
			middle.Height = Application.GetRealHeight(1920 - 40) - devicetypehorizontalScrol.Bottom;
			}
			AllDeviceTypeView(list, devicetypehorizontalScrol);

			}
			@@ -337,6 +389,18 @@
			continue;
			}
			list.Add(device);
			}
			if (list.Count == 0)
			{
			devicetypehorizontalScrol.Height = 0;
			devicetypehorizontalScrol1.Height = 0;
			middle.Height = 0;
			}
			else
			{
			devicetypehorizontalScrol.Height = Application.GetRealHeight(280);
			devicetypehorizontalScrol1.Height = Application.GetRealHeight(280);
			middle.Height = Application.GetRealHeight(1920 - 40) - devicetypehorizontalScrol.Bottom;
			}
			AllDeviceTypeView(list, devicetypehorizontalScrol);

			@@ -550,6 +614,7 @@
			TextAlignment = TextAlignment.CenterLeft,
			TextColor = ZigbeeColor.Current.LogicTextBlackColor,
			SelectedTextColor = ZigbeeColor.Current.LogicAddColor,
			TextSize = 14,
			};
			deviceRow.AddChidren(devicename);
			switch (common.CommonDevice.Type)
			@@ -663,6 +728,8 @@
			Width = Application.GetRealWidth(200),
			X = Application.GetRealWidth(80),
			TextAlignment = TextAlignment.CenterLeft,
			TextSize = 14,

			};
			timetype.AddChidren(Btncancel);
			Btncancel.MouseUpEventHandler += (sender16, e16) =>
			@@ -676,9 +743,9 @@
			TextID = MyInternationalizationString.security,
			TextColor = ZigbeeColor.Current.LogicBtnTypeColor,
			Height = Application.GetRealHeight(140),
			Width = Application.GetRealWidth(320),
			Width = Application.GetRealWidth(420),
			TextAlignment = TextAlignment.Center,
			X = Btncancel.Right + Application.GetRealWidth(100),
			X = Btncancel.Right + Application.GetRealWidth(50),
			TextSize = 16,
			Text = common.DeviceEpointName,
			};
			@@ -690,7 +757,8 @@
			Height = Application.GetRealHeight(140),
			Width = Application.GetRealWidth(200),
			TextAlignment = TextAlignment.CenterRight,
			X = Btntitle.Right + Application.GetRealWidth(100),
			X = Btntitle.Right + Application.GetRealWidth(50),
			TextSize = 14,

			};
			timetype.AddChidren(Btncomplete);
			@@ -775,6 +843,7 @@
			TextID = MyInternationalizationString.open,
			TextAlignment = TextAlignment.CenterLeft,
			TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
			TextSize = 14,
			};
			openrowlayout.AddChidren(btnopen);

			@@ -805,6 +874,7 @@
			Width = Application.GetRealWidth(600),
			TextAlignment = TextAlignment.CenterLeft,
			TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
			TextSize = 14,
			};
			closerowlayout.AddChidren(btnclose);

			@@ -835,6 +905,7 @@
			Width = Application.GetRealWidth(600),
			TextAlignment = TextAlignment.CenterLeft,
			TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
			TextSize = 14,
			};
			takebackrowlayout.AddChidren(btntakeback);

			@@ -985,6 +1056,7 @@
			TextID = MyInternationalizationString.open,
			TextAlignment = TextAlignment.CenterLeft,
			TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
			TextSize = 14,
			};
			openrowlayout.AddChidren(btnopen);

			@@ -1041,6 +1113,7 @@
			Width = Application.GetRealWidth(600),
			TextAlignment = TextAlignment.CenterLeft,
			TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
			TextSize = 14,
			};
			closerowlayout.AddChidren(btnclose);

			@@ -1072,6 +1145,7 @@
			Width = Application.GetRealWidth(600),
			TextAlignment = TextAlignment.CenterLeft,
			TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
			TextSize = 14,
			};
			takebackrowlayout.AddChidren(btntakeback);

			@@ -1279,6 +1353,7 @@
			TextID = MyInternationalizationString.open,
			TextAlignment = TextAlignment.CenterLeft,
			TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
			TextSize = 14,
			};
			openrowlayout.AddChidren(btnopen);

			@@ -1336,6 +1411,7 @@
			Width = Application.GetRealWidth(600),
			TextAlignment = TextAlignment.CenterLeft,
			TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
			TextSize = 14,
			};
			closerowlayout.AddChidren(btnclose);

			@@ -1512,6 +1588,7 @@
			TextID = MyInternationalizationString.open,
			TextAlignment = TextAlignment.CenterLeft,
			TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
			TextSize = 14,
			};
			openrowlayout.AddChidren(btnopen);

			@@ -1542,6 +1619,7 @@
			Width = Application.GetRealWidth(600),
			TextAlignment = TextAlignment.CenterLeft,
			TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
			TextSize = 14,
			};
			closerowlayout.AddChidren(btnclose);

			@@ -1572,6 +1650,7 @@
			Width = Application.GetRealWidth(600),
			TextAlignment = TextAlignment.CenterLeft,
			TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
			TextSize = 14,
			};
			takebackrowlayout.AddChidren(btntakeback);

			@@ -1731,6 +1810,7 @@
			TextID = MyInternationalizationString.open,
			TextAlignment = TextAlignment.CenterLeft,
			TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
			TextSize = 14,
			};
			openrowlayout.AddChidren(btnopen);

			@@ -1818,6 +1898,7 @@
			Width = Application.GetRealWidth(600),
			TextAlignment = TextAlignment.CenterLeft,
			TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
			TextSize = 14,
			};
			closerowlayout.AddChidren(btnclose);