From 46dee93ff58a4c50b23fd42ffa8db9bf612b497c Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 05 七月 2022 10:39:53 +0800
Subject: [PATCH] 梦幻帘对接完成

---
 HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainDreamPage.cs |   60 ++++++++++++++++++++++++++++++++++++------------------------
 1 files changed, 36 insertions(+), 24 deletions(-)

diff --git a/HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainDreamPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainDreamPage.cs
index 28e9b86..9602f7c 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainDreamPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainDreamPage.cs
@@ -33,6 +33,18 @@
         /// 杩涘害鍊�
         /// </summary>
         Button btnProgress;
+        /// <summary>
+        /// 瑙掑害鎺т欢闆�
+        /// </summary>
+        List<Button> buttons;
+        /// <summary>
+        /// 瑙掑害鏂囨湰鎸夐挳
+        /// </summary>
+        Button btnAngle;
+        /// <summary>
+        /// 瑙掑害婊戝姩鎺т欢
+        /// </summary>
+        DiyImageSeekBar angleBar;
 
 
         /// <summary>
@@ -158,7 +170,7 @@
             controlView.AddChidren(curtainSeekBar);
 
 
-            int angleValut = Convert.ToInt32(function.GetAttrState("angle"));
+            int angleValut = Convert.ToInt32(function.GetAttrState("angle")) - 90;
             var angleView = new FrameLayout()
             {
                 Gravity = Gravity.CenterHorizontal,
@@ -169,7 +181,7 @@
             };
             controlView.AddChidren(angleView);
 
-            List<Button> buttons = new List<Button>();
+            buttons = new List<Button>();
             for (int i = 0; i < 18; i++)
             {
                 var btn = new Button()
@@ -185,7 +197,7 @@
                 buttons.Add(btn);
             };
 
-            var btnAngle = new Button()
+            btnAngle = new Button()
             {
                 TextAlignment = TextAlignment.CenterRight,
                 TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
@@ -194,13 +206,14 @@
             };
             angleView.AddChidren(btnAngle);
 
-            var angleBar = new DiyImageSeekBar()
+            angleBar = new DiyImageSeekBar()
             {
                 Width = Application.GetRealWidth(220),
                 Height = Application.GetRealHeight(30),
-                SeekBarViewHeight = Application.GetRealHeight(0),
+                SeekBarViewHeight = Application.GetRealHeight(20),
+                SeekBarBackgroundColor = 0x00000000,
                 ThumbImagePath = "Public/ThumbImage2.png",
-                ThumbImageHeight = Application.GetRealHeight(20),
+                ThumbImageHeight = Application.GetRealHeight(40),
                 ProgressBarColor = 0x00000000,
                 ProgressTextColor = 0x00000000,
                 ProgressTextSize = 0,
@@ -211,26 +224,12 @@
             angleView.AddChidren(angleBar);
             angleBar.OnProgressChangedEvent = (sender, e) =>
             {
-                float angle = e;
-                btnAngle.Text = angle + "掳";
+                float angle = (e - 90);
+                btnAngle.Text = e + "掳";
                 foreach (var btn in buttons)
                 {
-                    btn.SetRotation(angle); Console.WriteLine(angle);
+                    btn.SetRotation(angle); 
                 }
-                //if (100 < (DateTime.Now - function.refreshTime).TotalMilliseconds)
-                //{
-                //    function.refreshTime = DateTime.Now;
-                //    foreach (var btn in buttons)
-                //    {
-                //        new System.Threading.Thread(() =>
-                //    {
-                //        Application.RunOnMainThread(() =>
-                //        {
-                //            btn.SetRotation(angle); Console.WriteLine(angle);
-                //        });
-                //    });
-                //    }
-                //}
             };
             angleBar.OnStopTrackingTouchEvent = (sende, e) =>
             {
@@ -305,7 +304,20 @@
                     {
                         if (!bodyView.onCurtainAnimation)
                         {
-                            bodyView.CurtainAnimation(Convert.ToInt32(updateTemp.GetAttrState(FunctionAttributeKey.Percent)));
+                            var percent = Convert.ToInt32(updateTemp.GetAttrState(FunctionAttributeKey.Percent));
+                            bodyView.CurtainAnimation(percent);
+                            bodyView.btnProgress.Text = percent + "%";
+
+                            var e = Convert.ToInt32( updateTemp.GetAttrState(FunctionAttributeKey.Angle));
+                            bodyView.angleBar.Progress = e;
+                            float angle = e - 90;
+                            bodyView.btnAngle.Text = (e - 0) + "掳";
+                            foreach (var btn in bodyView.buttons)
+                            {
+                                btn.SetRotation(angle);
+                            }
+
+
                         }
                     }
                     catch { }

--
Gitblit v1.8.0