Merge branch 'master' into WJC

陈嘉乐

2020-12-01 4a5e9d0447aae9b264a98ea1f4c95417d0f4aa91

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

@@ -59,6 +59,7 @@
            {
                btnFunctionName.Text = btnFunctionName_Out.Text = curtain.name;
                btnFromFloor_Out.Text = btnFromFoorAndRoom.Text = curtain.GetRoomListName();
                curtain.SaveFunctionData();
            };
        }
        /// <summary>
@@ -68,7 +69,7 @@
        {
            btnCollection.MouseUpEventHandler += (sender, e) =>
            {
                btnCollection.IsSelected = curtain.collection = btnCollection_Out.IsSelected = !btnCollection.IsSelected;
                btnCollection.IsSelected = curtain.collect = btnCollection_Out.IsSelected = !btnCollection.IsSelected;
                curtain.SaveFunctionData();
            };
        }