Merge branch 'newBranch1' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project...

wei

2021-08-27 eda3fb873e59544ff36301b51e05aef64f87b0f9

 HDL_ON/UI/UI2/2-Classification/ClassificaitionPublicBLL.cs

@@ -18,7 +18,6 @@
        {
            Application.RunOnMainThread((Action)(() =>
            {

                try
                {
                    if (view == null || scrolView == null || updataFunction == null)
@@ -59,6 +58,7 @@
                                        case FunctionCategory.AC:
                                        case FunctionCategory.FloorHeat:
                                        case FunctionCategory.Electric:
                                        case FunctionCategory.AirFresh:
                                            #region 按钮状态更新
                                            if (cTag == updataFunction.sid + "_Switch")
                                            {
@@ -110,41 +110,45 @@
                                        #endregion
                                        case FunctionCategory.Curtain:
                                            #region 窗帘更新
                                            //var uCurtain = updataFunction as Curtain;
                                            var percentString = updataFunction.GetAttrState(FunctionAttributeKey.Percent);
                                            if (percentString != null)
                                            var onoffString = updataFunction.GetAttrState(FunctionAttributeKey.OnOff);
                                            if (onoffString == "stop")
                                            {
                                                int percent = 0;
                                                return;
                                            }
                                            var percent = onoffString == "off" ? 0 : 100;
                                            if(updataFunction.GetAttributes().Contains(FunctionAttributeKey.Percent))
                                            {
                                                string percentString = updataFunction.GetAttrState(FunctionAttributeKey.Percent);
                                                int.TryParse(percentString, out percent);
                                                if (percent == 0)
                                            }
                                            if (percent == 0)
                                            {
                                                if (cTag == updataFunction.sid + "_off")
                                                {
                                                    if (cTag == updataFunction.sid + "_off")
                                                    try
                                                    {
                                                        try
                                                        {
                                                            (fcView.GetChildren(j) as Button).IsSelected = true;
                                                        }
                                                        catch { }
                                                        (fcView.GetChildren(j) as Button).IsSelected = true;
                                                    }
                                                    else
                                                    {
                                                        (fcView.GetChildren(j) as Button).IsSelected = false;
                                                    }
                                                    catch { }
                                                }
                                                else
                                                {
                                                    if (cTag == updataFunction.sid + "_on")
                                                    (fcView.GetChildren(j) as Button).IsSelected = false;
                                                }
                                            }
                                            else
                                            {
                                                if (cTag == updataFunction.sid + "_on")
                                                {
                                                    try
                                                    {
                                                        try
                                                        {
                                                            (fcView.GetChildren(j) as Button).IsSelected = true;
                                                        }
                                                        catch { }
                                                        (fcView.GetChildren(j) as Button).IsSelected = true;
                                                    }
                                                    else
                                                    {
                                                        (fcView.GetChildren(j) as Button).IsSelected = false;
                                                    }
                                                    catch { }
                                                }
                                                else
                                                {
                                                    (fcView.GetChildren(j) as Button).IsSelected = false;
                                                }
                                            }
                                            #endregion