Merge branch 'wxr6' into wxr4

wxr

2021-07-05 1ee407dd57a7273ef6b686ac25a40d4199f5bce9

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

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

                try
                {
                    if (view == null || scrolView == null || updataFunction == null)
@@ -111,7 +110,12 @@
                                        #endregion
                                        case FunctionCategory.Curtain:
                                            #region 窗帘更新
                                            var percent = updataFunction.GetAttrState(FunctionAttributeKey.OnOff) == "off" ? 0 : 100;
                                            var onoffString = updataFunction.GetAttrState(FunctionAttributeKey.OnOff);
                                            if (onoffString == "stop")
                                            {
                                                return;
                                            }
                                            var percent = onoffString == "off" ? 0 : 100;
                                            if(updataFunction.GetAttributes().Contains(FunctionAttributeKey.Percent))
                                            {
                                                string percentString = updataFunction.GetAttrState(FunctionAttributeKey.Percent);