~wjc/HomeApp.git

old mode 100755 new mode 100644

			@@ -38,7 +38,7 @@
			/// 收藏按钮
			/// </summary>
			private Button collectionBtn;


			/// <summary>
			/// 开关
			/// </summary>
			@@ -47,7 +47,7 @@
			/// 滑条
			/// </summary>
			private WaveSeekBar levelSeekBar;



			private Button StatuBtn;
			/// <summary>
			@@ -185,7 +185,7 @@
			break;
			}
			}


			}
			}
			catch (Exception ex)
			@@ -196,7 +196,7 @@
			}
			else if (typeTag == "OnlineStatusChange")
			{


			}
			}

			@@ -422,29 +422,31 @@
			levelSeekBar.WaveColor = ZigbeeColor.Current.GXCWaveSeekBarUnSelectedColor;
			}

			levelSeekBar.OnStartTrackingTouchEvent += (sender, e) =>
			{
			OnProgressButtonMove(levelSeekBar.Progress);
			levelSeekBar.IsProgressTextShow = false;
			ProgressBtn.Visible = true;
			};

			levelSeekBar.OnStopTrackingTouchEvent += (sender, e) =>
			{
			ProgressBtn.Visible = false;
			levelSeekBar.IsProgressTextShow = true;
			};

			levelSeekBar.OnProgressChangedEvent += (send2, e2) =>
			levelSeekBar.OnStartTrackingTouchEvent += (sender, e) =>
			{
			OnProgressButtonMove(levelSeekBar.Progress);
			levelSeekBar.IsProgressTextShow = false;
			ProgressBtn.Visible = true;
			};

			levelSeekBar.OnStopTrackingTouchEvent += (sender, e) =>
			{
			ProgressBtn.Visible = false;
			levelSeekBar.IsProgressTextShow = true;
			};

			levelSeekBar.OnProgressChangedEvent += (send2, e2) =>
			{

			OnProgressButtonMove(e2);

			//判断是否300ms屏蔽
			if (levelSeekBar.IsProgressChangeDelay()) return;

			dimmableLight.SetLevel((int)(levelSeekBar.Progress * MaxLevel / 100.0));
			};
			OnProgressButtonMove(e2);

			//判断是否300ms屏蔽
			if (levelSeekBar.IsProgressChangeDelay()) return;

			dimmableLight.SetLevel((int)(levelSeekBar.Progress * MaxLevel / 100.0));
			};

			InitProgressBtn(itemView);

			InitProgressBtn(itemView);

			@@ -501,31 +503,31 @@
			itemView.AddChidren(roomName);
			}

			/// <summary>
			/// OnProgressButtonMove
			/// </summary>
			private void OnProgressButtonMove(int mProgress)
			{
			ProgressBtn.Y = ProgressBtnY + levelSeekBar.NowProgressY;
			ProgressBtn.Text = mProgress + "%";
			}

			/// <summary>
			/// 添加进度按钮
			/// </summary>
			/// <summary>
			/// OnProgressButtonMove
			/// </summary>
			private void OnProgressButtonMove(int mProgress)
			{
			ProgressBtn.Y = ProgressBtnY + levelSeekBar.NowProgressY;
			ProgressBtn.Text = mProgress + "%";
			}

			/// <summary>
			/// 添加进度按钮
			/// </summary>
			private void InitProgressBtn(FrameLayout layout)
			{
			ProgressBtnY = levelSeekBar.Y - Application.GetMinReal(154);
			ProgressBtn = new Button()
			{
			Y = ProgressBtnY,
			Width = Application.GetMinReal(135),
			Height = Application.GetMinReal(104),
			UnSelectedImagePath = "Item/ProgressBubbles.png",
			Visible = false,
			Gravity = Gravity.CenterHorizontal
			};
			layout.AddChidren(ProgressBtn);
			{
			ProgressBtnY = levelSeekBar.Y - Application.GetMinReal(154);
			ProgressBtn = new Button()
			{
			Y = ProgressBtnY,
			Width = Application.GetMinReal(135),
			Height = Application.GetMinReal(104),
			UnSelectedImagePath = "Item/ProgressBubbles.png",
			Visible = false,
			Gravity = Gravity.CenterHorizontal
			};
			layout.AddChidren(ProgressBtn);
			}

			#endregion