~wjc/HomeApp.git

old mode 100755 new mode 100644

			@@ -23,10 +23,11 @@
			FrameLayout clickframeLayout = new FrameLayout();
			Button clickbutton = new Button();
			Button clicktextcolcrbutton = new Button();
			HorizontalScrolViewLayout devicetypehorizontalScrol1;
			public void Show()

			public void Show()
			{


			UserView.HomePage.Instance.ScrollEnabled = false;
			this.BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor;
			#region 最上面的布局代码
			@@ -40,7 +41,7 @@

			var titleName = new Button
			{
			TextSize = 16,
			TextSize = 17,
			TextColor = ZigbeeColor.Current.LogicTextBlackColor,
			TextAlignment = TextAlignment.CenterLeft,
			X = Application.GetRealWidth(160),
			@@ -48,6 +49,7 @@
			Height = Application.GetRealHeight(69),
			Y = Application.GetRealHeight(92),
			TextID = MyInternationalizationString.devicestate,
			IsBold = true,
			};
			topRowLayout.AddChidren(titleName);

			@@ -90,6 +92,7 @@
			Y = Application.GetRealHeight(92),
			//TextID = MyInternationalizationString.customroom,
			Text = Config.Instance.Home.GetCurrentFloorName,
			TextSize = 14,
			};
			topRowLayout.AddChidren(foolrname);
			var dropdown = new Button
			@@ -121,15 +124,6 @@
			};
			this.AddChidren(roomhorizontalScrol);

			devicetypehorizontalScrol1 = new HorizontalScrolViewLayout()
			{
			Width = Application.GetRealWidth(1080 - 58 - 200),
			Height = Application.GetRealHeight(280),
			Y = roomhorizontalScrol.Bottom,
			BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
			X = Application.GetRealWidth(58 + 200),
			};
			this.AddChidren(devicetypehorizontalScrol1);
			///设备类型滑动控件
			var devicetypehorizontalScrol = new HorizontalScrolViewLayout()
			{
			@@ -138,19 +132,20 @@
			Y = roomhorizontalScrol.Bottom,
			BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
			X = Application.GetRealWidth(58),
			Radius = (uint)Application.GetRealHeight(50),
			// Radius = (uint)Application.GetRealHeight(50),

			};
			this.AddChidren(devicetypehorizontalScrol);
			devicetypehorizontalScrol.SetCornerWithSameRadius(Application.GetRealHeight(50), HDLUtils.RectCornerBottomLeft);

			middle = new VerticalScrolViewLayout();
			middle.Y = devicetypehorizontalScrol.Bottom + Application.GetRealHeight(40);
			middle.Height = Application.GetRealHeight(1920 - 40) - devicetypehorizontalScrol.Bottom;
			middle.BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor;
			middle.X = Application.GetRealWidth(58);
			middle.Radius = (uint)Application.GetRealHeight(50);
			//middle.Radius = (uint)Application.GetRealHeight(50);
			this.AddChidren(middle);

			middle.SetCornerWithSameRadius(Application.GetRealHeight(50), HDLUtils.RectCornerTopLeft);
			///目前支持的设备
			var deviceTypeList = new List<DeviceType> {
			DeviceType.IASZone,
			@@ -189,6 +184,7 @@
			TextColor = ZigbeeColor.Current.LogicTextBlackColor,
			X = Application.GetRealWidth(80),
			TextID = MyInternationalizationString.selecfoolr,
			TextSize = 14,
			};
			foolrbjicon.AddChidren(btnfoolrtext);

			@@ -230,6 +226,7 @@
			TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
			Tag = foolr.Key,
			X = btnfoolricon.Right + Application.GetRealWidth(12),
			TextSize = 14,
			};
			foolrRowLayout.AddChidren(btnfoolrname);
			if (foolrname.Text == foolr.Value)
			@@ -349,13 +346,11 @@
			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;
			}

			@@ -393,13 +388,11 @@
			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;
			}

			@@ -603,7 +596,7 @@
			Height = Application.GetRealHeight(112),
			X = Application.GetRealWidth(58),
			Y = Application.GetRealHeight(30 + 9),
			Radius = (uint)Application.GetRealHeight(56),
			// Radius = (uint)Application.GetRealHeight(56),
			BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
			};
			deviceFramelayout.AddChidren(bjFramelayout);
			@@ -634,6 +627,7 @@
			TextAlignment = TextAlignment.CenterLeft,
			TextColor = ZigbeeColor.Current.LogicTextBlackColor,
			SelectedTextColor = ZigbeeColor.Current.LogicAddColor,
			TextSize = 14,
			};
			deviceRow.AddChidren(devicename);
			switch (common.CommonDevice.Type)
			@@ -729,18 +723,7 @@
			flMain.MouseUpEventHandler += (sender, e) =>
			{
			flMain.RemoveFromParent();


			};

			var devicefra1 = new FrameLayout
			{
			Width = Application.GetRealWidth(1080),
			Height = Application.GetRealHeight(100),
			Y = Application.GetRealHeight(1920 - 100),
			BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
			};
			flMain.AddChidren(devicefra1);

			var devicefra = new FrameLayout
			{
			@@ -749,9 +732,10 @@
			Height = Application.GetRealHeight(530),
			Y = Application.GetRealHeight(1920 - 530),
			BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
			Radius = (uint)Application.GetRealHeight(60),
			// Radius = (uint)Application.GetRealHeight(60),
			};
			flMain.AddChidren(devicefra);
			devicefra.SetCornerWithSameRadius(Application.GetRealHeight(50), HDLUtils.RectCornerTopLeft\|HDLUtils.RectCornerTopRight);

			#region -------取消完成
			var timetype = new RowLayout
			@@ -768,6 +752,7 @@
			Width = Application.GetRealWidth(200),
			X = Application.GetRealWidth(80),
			TextAlignment = TextAlignment.CenterLeft,
			TextSize = 14,
			};
			timetype.AddChidren(Btncancel);
			Btncancel.MouseUpEventHandler += (sender16, e16) =>
			@@ -796,6 +781,7 @@
			Width = Application.GetRealWidth(200),
			TextAlignment = TextAlignment.CenterRight,
			X = Btntitle.Right + Application.GetRealWidth(50),
			TextSize = 14,

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

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

			@@ -981,6 +969,7 @@
			Height = Application.GetRealHeight(180),
			//SelectedBackgroundColor = 0xfffe5e00,
			TextColor = ZigbeeColor.Current.LogicTextBlackColor,
			TextSize = 14,
			};
			openrowlayout.AddChidren(btnopen);

			@@ -1011,6 +1000,7 @@
			Width = Application.GetRealWidth(300),
			Height = Application.GetRealHeight(180),
			TextColor = ZigbeeColor.Current.LogicTextBlackColor,
			TextSize = 14,
			};
			closerowlayout.AddChidren(btnclose);

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

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

			@@ -1180,7 +1172,7 @@
			dictionary(deviceConditionsInfo, "AttriButeData1", "0");
			if (iASZonedevice.IasDeviceType == 13)
			{
			SelectedDeviceStatuscondition = "no";
			SelectedDeviceStatuscondition = "";
			btnopen.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
			btnclose.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
			openBtnSelected.Visible = false;
			@@ -1248,6 +1240,7 @@
			Width = Application.GetRealWidth(600),
			TextAlignment = TextAlignment.CenterLeft,
			TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
			TextSize = 14,
			};
			timeoutrowlayout.AddChidren(btntimeout);

			@@ -1262,7 +1255,7 @@
			timeoutrowlayout.AddChidren(timeoutBtnSelected);
			EventHandler<MouseEventArgs> timeoutclick = (sender, e) =>
			{
			SelectedDeviceStatuscondition = "no";
			SelectedDeviceStatuscondition = "";
			btnopen.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
			btnclose.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
			openBtnSelected.Visible = false;
			@@ -1281,7 +1274,6 @@
			#endregion
			}
			break;

			case 40:
			{
			devicefra.Y = Application.GetRealHeight(1920 - 140 - 160 - 20 - 50);
			@@ -1321,7 +1313,6 @@
			openrowlayout.LineColor = ZigbeeColor.Current.LogicBackgroundColor;
			}
			break;

			case 277:
			{
			devicefra.Y = Application.GetRealHeight(1920 - 140 - 160 - 20 - 50);
			@@ -1408,6 +1399,7 @@
			TextAlignment = TextAlignment.CenterLeft,
			TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
			Text = Language.StringByID(MyInternationalizationString.OnOffSwitch) + common.DeviceEpoint.ToString(),
			TextSize = 14,
			//SelectedBackgroundColor = 0xfffe5e00,
			};
			buttonRow.AddChidren(button);
			@@ -1437,11 +1429,10 @@
			case DeviceType.DoorLock:
			{


			flMain.RemoveFromParent();
			var memberList = new MemberList();
			UserView.HomePage.Instance.AddChidren(memberList);
			UserView.HomePage.Instance.PageIndex += 1;
			MemberList.action += () => { flMain.RemoveFromParent(); };
			MemberList.edit = false;
			memberList.Show(common);
			}
			@@ -1460,24 +1451,30 @@
			TextAlignment = TextAlignment.CenterLeft,
			X = Application.GetRealWidth(80),
			Y = timetype.Bottom + Application.GetRealHeight(70),
			TextSize = 14,
			};
			devicefra.AddChidren(Btntemperaturevalue);

			var horizontalSeekBarVol = new HorizontalSeekBar
			var horizontalSeekBarVol = new DiyImageSeekBar
			{
			Width = Application.GetRealWidth(920),
			Height = Application.GetRealHeight(80),
			Radius = (uint)Application.GetRealHeight(25),
			Y = timetype.Bottom + Application.GetRealHeight(70 + 60 + 70),
			X = Application.GetRealWidth(80),
			ProgressColor = ZigbeeColor.Current.LogicProgressColorSelected,
			Max = 100,
			SleepTime = 1000,
			ThumbRadius = 9,
			Width = Application.GetRealWidth(920),
			Height = Application.GetRealHeight(160),
			IsProgressTextShow = false,//显示百分比
			IsClickable = true,//进度条是否滑动
			ProgressBarColor = ZigbeeColor.Current.LogicProgressColorSelected,//选中进度条颜色
			ThumbImagePath = "ZigeeLogic/progressbtn_2.png",//进度条按钮图标
			ThumbImageHeight = Application.GetRealHeight(56),//进度条按钮图标的高度（默认正方形：宽和高一样）
			ProgressTextColor = ZigbeeColor.Current.LogicBtnCancelColor,//进度条原颜色
			//ProgressTextSize = 13,//显示百分比字体大小
			SeekBarViewHeight = Application.GetRealHeight(10),//进度条的高度
			};
			devicefra.AddChidren(horizontalSeekBarVol);
			horizontalSeekBarVol.MouseUpEventHandler += (sender, e) =>

			EventHandler<int> progressclick = (sender, e) =>
			{

			SelectedDeviceStatuscondition = "TemperatureSensor";
			if (temperatureSensor.SensorDiv == 1)
			{
			@@ -1491,8 +1488,10 @@
			Btntemperaturevalue.Text = current + "<" + horizontalSeekBarVol.Progress.ToString() + "%";
			dictionary(deviceConditionsInfo, "AttriButeData1", horizontalSeekBarVol.Progress.ToString());//温度值
			}
			};

			};
			horizontalSeekBarVol.OnProgressChangedEvent += progressclick;
			horizontalSeekBarVol.OnStopTrackingTouchEvent += progressclick;


			if (temperatureSensor.SensorDiv == 1)
			@@ -1547,7 +1546,7 @@
			{
			var alert = new Alert(Language.StringByID(MyInternationalizationString.Prompt),
			Language.StringByID(MyInternationalizationString.selectdevicestatuscondition),
			Language.StringByID(MyInternationalizationString.complete));
			Language.StringByID(MyInternationalizationString.confrim));
			alert.Show();
			return;
			}