From 2bec9c838d2d688025698de8ec1de401ffd7dd1f Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 11 八月 2020 14:13:55 +0800
Subject: [PATCH] 20200811

---
 HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPageBLL.cs |  133 ++++++++++++++++++++++++++------------------
 1 files changed, 78 insertions(+), 55 deletions(-)

diff --git a/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPageBLL.cs
index 6e2169f..70ba7eb 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPageBLL.cs
@@ -81,7 +81,10 @@
                 btnCurtainOpen.IsSelected = false;
                 curtain.on_off = "off";
                 curtain.openLevel = 0;
-                Control.Send(CommandType_A.write, curtain);
+                //Control.Send(CommandType_A.write, curtain);
+                System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
+                d.Add("on_off", curtain.on_off.ToString());
+                Control.SendWriteCommand(curtain, d);
             };
 
             btnCurtainStop.MouseDownEventHandler = (sender, e) => {
@@ -94,7 +97,10 @@
                 btnCurtainClose.IsSelected = false;
                 btnCurtainStop.IsSelected = false;
                 curtain.on_off = "stop";
-                Control.Send(CommandType_A.write, curtain);
+                //Control.Send(CommandType_A.write, curtain);
+                System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
+                d.Add("on_off", curtain.on_off.ToString());
+                Control.SendWriteCommand(curtain, d);
             };
 
             btnCurtainOpen.MouseUpEventHandler = (sender, e) => {
@@ -103,71 +109,82 @@
                 btnCurtainStop.IsSelected = false;
                 curtain.on_off = "on";
                 curtain.openLevel = 100;
-                Control.Send(CommandType_A.write, curtain);
+                //Control.Send(CommandType_A.write, curtain);
+                System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
+                d.Add("on_off", curtain.on_off.ToString());
+                Control.SendWriteCommand(curtain, d);
             };
 
             DateTime delayTime = DateTime.MinValue;
 
             btnMinusSignIcon.MouseLongEventHandler = (sender, e) => {
-                if (curtain.openLevel > 1)
-                {
-                    curtain.openLevel--;
-                    controlBar.Progress = curtainSeekBar.Progress = curtain.openLevel;
-                    delayTime = DateTime.Now;
-                    new System.Threading.Thread(() => {
-                        while (delayTime != DateTime.MaxValue)
-                        {
-                            System.Threading.Thread.Sleep(100);
-                            if ((DateTime.Now - delayTime).TotalSeconds > 1)
-                            {
-                                if (curtain.openLevel < 1)
-                                {
-                                    break;
-                                }
-                                curtain.openLevel--;
-                                Application.RunOnMainThread(() => {
-                                    controlBar.Progress = curtain.openLevel;
-                                });
-                            }
-                        }
-                    })
-                    { IsBackground = true }.Start();
-                }
+                //if (curtain.openLevel > 1)
+                //{
+                //    curtain.openLevel--;
+                //    controlBar.Progress = curtainSeekBar.Progress = curtain.openLevel;
+                //    delayTime = DateTime.Now;
+                //    new System.Threading.Thread(() => {
+                //        while (delayTime != DateTime.MaxValue)
+                //        {
+                //            System.Threading.Thread.Sleep(100);
+                //            if ((DateTime.Now - delayTime).TotalSeconds > 1)
+                //            {
+                //                if (curtain.openLevel < 1)
+                //                {
+                //                    break;
+                //                }
+                //                curtain.openLevel--;
+                //                Application.RunOnMainThread(() => {
+                //                    controlBar.Progress = curtain.openLevel;
+                //                });
+                //            }
+                //        }
+                //    })
+                //    { IsBackground = true }.Start();
+                //}
             };
             btnMinusSignIcon.MouseUpEventHandler = (sender, e) => {
                 delayTime = DateTime.MinValue;
-                Control.Send(CommandType_A.write, curtain);
+                //Control.Send(CommandType_A.write, curtain);
+                curtain.openLevel--;
+                System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
+                d.Add("openLevel", curtain.openLevel.ToString());
+                Control.SendWriteCommand(curtain, d);
             };
 
             btnPlusSgnIcon.MouseLongEventHandler = (sender, e) => {
-                if (curtain.openLevel > 1)
-                {
-                    curtain.openLevel++;
-                    controlBar.Progress = curtainSeekBar.Progress = curtain.openLevel;
-                    delayTime = DateTime.Now;
-                    new System.Threading.Thread(() => {
-                        while (delayTime != DateTime.MaxValue)
-                        {
-                            System.Threading.Thread.Sleep(100);
-                            if ((DateTime.Now - delayTime).TotalSeconds > 1)
-                            {
-                                if (curtain.openLevel > 99)
-                                {
-                                    break;
-                                }
-                                curtain.openLevel++;
-                                Application.RunOnMainThread(() => {
-                                    controlBar.Progress = curtain.openLevel;
-                                });
-                            }
-                        }
-                    })
-                    { IsBackground = true }.Start();
-                }
+                //if (curtain.openLevel > 1)
+                //{
+                //    curtain.openLevel++;
+                //    controlBar.Progress = curtainSeekBar.Progress = curtain.openLevel;
+                //    delayTime = DateTime.Now;
+                //    new System.Threading.Thread(() => {
+                //        while (delayTime != DateTime.MaxValue)
+                //        {
+                //            System.Threading.Thread.Sleep(100);
+                //            if ((DateTime.Now - delayTime).TotalSeconds > 1)
+                //            {
+                //                if (curtain.openLevel > 99)
+                //                {
+                //                    break;
+                //                }
+                //                curtain.openLevel++;
+                //                Application.RunOnMainThread(() => {
+                //                    controlBar.Progress = curtain.openLevel;
+                //                });
+                //            }
+                //        }
+                //    })
+                //    { IsBackground = true }.Start();
+                //}
             };
             btnPlusSgnIcon.MouseUpEventHandler = (sender, e) => {
                 delayTime = DateTime.MinValue;
-                Control.Send(CommandType_A.write, curtain);
+                //Control.Send(CommandType_A.write, curtain);
+                curtain.openLevel++;
+                System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
+                d.Add("openLevel", curtain.openLevel.ToString());
+                Control.SendWriteCommand(curtain, d);
             };
 
             curtainSeekBar.OnProgressChangedEvent = (sender, e) =>
@@ -179,7 +196,10 @@
                     {
                         delayTime = DateTime.Now;
                         curtain.openLevel = e;
-                        Control.Send(CommandType_A.write, curtain);
+                        //Control.Send(CommandType_A.write, curtain);
+                        System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
+                        d.Add("openLevel", curtain.openLevel.ToString());
+                        Control.SendWriteCommand(curtain, d);
                         curtain.refreshTime = DateTime.Now;
                     }
                 })
@@ -196,7 +216,10 @@
                     {
                         delayTime = DateTime.Now;
                         curtain.openLevel = e;
-                        Control.Send(CommandType_A.write, curtain);
+                        //Control.Send(CommandType_A.write, curtain);
+                        System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
+                        d.Add("openLevel", curtain.openLevel.ToString());
+                        Control.SendWriteCommand(curtain, d);
                         curtain.refreshTime = DateTime.Now;
                     }
                 })

--
Gitblit v1.8.0