20210302-1

wei

2021-03-02 64390bc739286477167e186f1f2b40a27a73a9a5

 HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPageBLL.cs

@@ -19,23 +19,13 @@
                    return;
                if (uCurtain.spk == bodyView.curtain.spk && uCurtain.sid == bodyView.curtain.sid)
                {
                    if (uCurtain.trait_on_off.curValue.ToString() == "stop")
                    var percentString = uCurtain.GetAttrState(FunctionAttributeKey.Percent);
                    if (percentString != null)
                    {
                        bodyView.btnCurtainOpen.IsSelected = false;
                        bodyView.btnCurtainClose.IsSelected = false;
                        bodyView.btnCurtainStop.IsSelected = true;
                    }
                    else if (uCurtain.trait_on_off.curValue.ToString() == "on")
                    {
                        bodyView.btnCurtainOpen.IsSelected = true;
                        bodyView.btnCurtainClose.IsSelected = false;
                        bodyView.btnCurtainStop.IsSelected = false;
                    }
                    else if (uCurtain.trait_on_off.curValue.ToString() == "off")
                    {
                        bodyView.btnCurtainOpen.IsSelected = false;
                        bodyView.btnCurtainClose.IsSelected = true;
                        bodyView.btnCurtainStop.IsSelected = false;
                        int percent = 0;
                        int.TryParse(percentString, out percent);
                        bodyView.btnCurtainOpen.IsSelected = percent > 0;
                        bodyView.btnCurtainClose.IsSelected = percent == 0;
                    }
                    try
                    {
@@ -146,11 +136,15 @@
        {
            btnCurtainClose.MouseUpEventHandler = (sender, e) =>
            {
                btnCurtainClose.IsSelected = true;
                btnCurtainOpen.IsSelected = false;
                btnCurtainStop.IsSelected = false;
                //new System.Threading.Thread(() => {
                //    System.Threading.Thread.Sleep(2000);
                //    Application.RunOnMainThread(() => {
                //        btnCurtainClose.IsSelected = false;
                //    });
                //})
                //{ IsBackground = true }.Start();
                curtain.trait_on_off.curValue = "off";
                curtain.percent = 100;
                curtain.percent = 0;
                System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
                d.Add(FunctionAttributeKey.OnOff, curtain.trait_on_off.curValue.ToString());
                DriverLayer.Control.Ins.SendWriteCommand(curtain, d);
@@ -159,31 +153,55 @@

            btnCurtainStop.MouseUpEventHandler = (sender, e) =>
            {
              
                btnCurtainStop.IsSelected = true;
                btnCurtainClose.IsSelected = false;
                btnCurtainOpen.IsSelected = false;
                onCurtainAnimation = false;
                new System.Threading.Thread(() =>
                {
                    System.Threading.Thread.Sleep(2000);
                    Application.RunOnMainThread(() =>
                    {
                        btnCurtainStop.IsSelected = false;
                    });
                })
                { IsBackground = true }.Start();
                curtain.trait_on_off.curValue = "stop";
                System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
                d.Add(FunctionAttributeKey.OnOff, curtain.trait_on_off.curValue.ToString());
                DriverLayer.Control.Ins.SendWriteCommand(curtain, d);
                onCurtainAnimation = false;
            };

            btnCurtainOpen.MouseUpEventHandler = (sender, e) =>
            {

                btnCurtainClose.IsSelected = false;
                btnCurtainStop.IsSelected = false;
                btnCurtainOpen.IsSelected = true;
                //new System.Threading.Thread(() => {
                //    System.Threading.Thread.Sleep(2000);
                //    Application.RunOnMainThread(() => {
                //        btnCurtainOpen.IsSelected = false;
                //    });
                //})
                //{ IsBackground = true }.Start();
                curtain.trait_on_off.curValue = "on";
                curtain.percent = 0;
                curtain.percent = 100;
                System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
                d.Add(FunctionAttributeKey.OnOff, curtain.trait_on_off.curValue.ToString());
                DriverLayer.Control.Ins.SendWriteCommand(curtain, d);
                CurtainAnimation(curtain.percent);
            };


            btnCurtainStop.MouseDownEventHandler = (sender, e) =>
            {
                btnCurtainStop.IsSelected = true;
            };
            btnCurtainOpen.MouseDownEventHandler = (sender, e) =>
            {
                btnCurtainOpen.IsSelected = true;
                btnCurtainClose.IsSelected = false;
            };
            btnCurtainClose.MouseDownEventHandler = (sender, e) =>
            {
                btnCurtainClose.IsSelected = true;
                btnCurtainOpen.IsSelected = false;
            };

            //btnMinusSignIcon.MouseUpEventHandler = (sender, e) =>
            //{
            //    curtain.percent--;