From 72be4f06a683de33ddd563c8447c39f7f17e5b7d Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 06 一月 2020 13:03:50 +0800
Subject: [PATCH] 合并代码

---
 ZigbeeApp/Shared/Phone/Device/Curtain/RollerShadeControl.cs |   77 +++++++++++++++++++++++++++++++++++---
 1 files changed, 71 insertions(+), 6 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/Device/Curtain/RollerShadeControl.cs b/ZigbeeApp/Shared/Phone/Device/Curtain/RollerShadeControl.cs
index 5d4d399..43b2ef0 100755
--- a/ZigbeeApp/Shared/Phone/Device/Curtain/RollerShadeControl.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Curtain/RollerShadeControl.cs
@@ -88,6 +88,10 @@
         /// ProgressBtnY
         /// </summary>
         int ProgressBtnY;
+        /// <summary>
+        /// ProgressBtnX
+        /// </summary>
+        int ProgressBtnX;
 
         #endregion
 
@@ -383,7 +387,8 @@
                 Gravity = Gravity.CenterHorizontal,
                 Text = device.CommonDevice.DeviceEpointName,
                 TextColor = ZigbeeColor.Current.GXCTextBlackColor,
-                TextSize = 15
+                TextSize = 15,
+                IsBold=true
             };
             itemView.AddChidren(deviceNameBtn);
 
@@ -394,7 +399,8 @@
                 Height = Application.GetRealHeight(60),
                 Gravity = Gravity.CenterHorizontal,
                 TextColor = ZigbeeColor.Current.GXCTextGrayColor,
-                Text = $"{Language.StringByID(R.MyInternationalizationString.Current)} {device.GetDeviceStatu()}"
+                Text = $"{Language.StringByID(R.MyInternationalizationString.Current)} {device.GetDeviceStatu()}",
+                TextSize = 10
             };
             itemView.AddChidren(StatuBtn);
 
@@ -458,7 +464,7 @@
             }
 
             SetCurtainType(itemView, (device.CommonDevice as Rollershade).WcdType);
-            
+
             var roomBG = new Button
             {
                 Y = Application.GetRealHeight(1178 - 50),
@@ -494,7 +500,8 @@
                 Height = Application.GetRealHeight(50),
                 Text = room.Name,
                 TextAlignment = TextAlignment.CenterLeft,
-                TextColor = ZigbeeColor.Current.GXCTextWhiteColor
+                TextColor = ZigbeeColor.Current.GXCTextWhiteColor,
+                TextSize = 12
             };
             itemView.AddChidren(roomName);
         }
@@ -647,7 +654,7 @@
             UserView.HomePage.Instance.AddChidren(detailInfo);
             UserView.HomePage.Instance.PageIndex += 1;
             detailInfo.Show(device, room);
-            detailInfo.action = () =>
+            detailInfo.EditAction = (d,r) =>
             {
                 Show(device, room);
             };
@@ -741,6 +748,7 @@
                 curtainSeekBar.Width = Application.GetRealWidth(570);
                 curtainSeekBar.Height = Application.GetRealHeight(513);
                 curtainSeekBar.Gravity = Gravity.CenterHorizontal;
+                curtainSeekBar.IsProgressTextShow = false;
                 curtainSeekBar.Progress = (device.CommonDevice as Rollershade).WcdCurrentPositionLiftPercentage;
                 layout.AddChidren(curtainSeekBar);
 
@@ -748,6 +756,29 @@
                 {
                     (device.CommonDevice as Rollershade).WcdGoToTiltValue(curtainSeekBar.Progress);
                 };
+
+                curtainSeekBar.OnStartTrackingTouchEvent += (sender, e) =>
+                {
+                    OnProgressButtonMoveForCurtain(curtainSeekBar.Progress);
+                    ProgressBtn.Visible = true;
+                };
+
+                curtainSeekBar.OnStopTrackingTouchEvent += (sender, e) =>
+                {
+                    ProgressBtn.Visible = false;
+                };
+
+                curtainSeekBar.OnProgressChangedEvent += (send2, e2) =>
+                {
+
+                    OnProgressButtonMoveForCurtain(e2);
+
+                    //鍒ゆ柇鏄惁300ms灞忚斀
+                    //if (curtainRollSeekBar.IsProgressChangeDelay()) return;
+
+                    //(device.CommonDevice as Rollershade).WcdGoToTiltValue(curtainRollSeekBar.Progress);
+                };
+                InitProgressBtnForCurtain(layout);
             }
         }
 
@@ -764,7 +795,10 @@
                 Height = Application.GetMinReal(104),
                 UnSelectedImagePath = "Item/ProgressBubbles.png",
                 Visible = false,
-                Gravity = Gravity.CenterHorizontal
+                Gravity = Gravity.CenterHorizontal,
+                TextSize=14,
+                IsBold=true,
+                TextColor=ZigbeeColor.Current.GXCTextWhiteColor
             };
             layout.AddChidren(ProgressBtn);
         }
@@ -778,6 +812,37 @@
             ProgressBtn.Text = mProgress + "%";
         }
 
+
+        /// <summary>
+        /// 娣诲姞杩涘害鎸夐挳
+        /// </summary>
+        private void InitProgressBtnForCurtain(FrameLayout layout)
+        {
+            ProgressBtnX = curtainSeekBar.X - Application.GetMinReal(20);
+            ProgressBtn = new Button()
+            {
+                X = ProgressBtnX,
+                Y = curtainSeekBar.Y + curtainSeekBar.Height / 2 - Application.GetMinReal(180),
+                Width = Application.GetMinReal(135),
+                Height = Application.GetMinReal(104),
+                UnSelectedImagePath = "Item/ProgressBubbles.png",
+                Visible = false,
+                TextSize = 14,
+                IsBold = true,
+                TextColor = ZigbeeColor.Current.GXCTextWhiteColor
+            };
+            layout.AddChidren(ProgressBtn);
+        }
+
+        /// <summary>
+        /// OnProgressButtonMove
+        /// </summary>
+        private void OnProgressButtonMoveForCurtain(int mProgress)
+        {
+            ProgressBtn.X = ProgressBtnX + curtainSeekBar.NowProgressX- Application.GetMinReal(5);
+            ProgressBtn.Text = mProgress + "%";
+        }
+
         #endregion
 
         #region 鈼� 鏀惰棌鍒颁富椤礯______________________

--
Gitblit v1.8.0