Merge branch 'CJL' into ez-test

hxb

2021-03-05 84fa7c9665d9bed9aef79237be9c5eb57c49f13d

 HDL_ON/UI/UI2/FuntionControlView/Electrical/SocketPageBLL.cs

@@ -38,7 +38,7 @@
            actionRefresh = () => {
                btnFunctionName.Text = btnFunctionName_Out.Text = socketFunction.name;
                btnFromFloor_Out.Text = btnFromFoorAndRoom.Text = socketFunction.GetRoomListName();
                socketFunction.SaveFunctionData(true);
                socketFunction.UpdataFuncitonInfo();
            };
        }

@@ -49,7 +49,7 @@
        {
            btnCollection.MouseUpEventHandler += (sender, e) => {
                btnCollection.IsSelected = socketFunction.collect = btnCollection_Out.IsSelected = !btnCollection.IsSelected;
                socketFunction.SaveFunctionData(true);
                socketFunction.CollectFunction();
            };
        }