Merge remote-tracking branch 'origin/CJL-NEW'

wxr

2020-12-02 e3ad42ffa2fa67c8f6cb4519ca626fa275c8947d

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

@@ -18,6 +18,7 @@
            actionRefresh = () => {
                btnFunctionName.Text = btnFunctionName_Out.Text = tv.name;
                btnFromFloor_Out.Text = btnFromFoorAndRoom.Text = tv.GetRoomListName();
                tv.SaveFunctionData();
            };
        }

@@ -27,7 +28,7 @@
        void LoadCollectionEvent()
        {
            btnCollection.MouseUpEventHandler += (sender, e) => {
                btnCollection.IsSelected = tv.collection = btnCollection_Out.IsSelected = !btnCollection.IsSelected;
                btnCollection.IsSelected = tv.collect = btnCollection_Out.IsSelected = !btnCollection.IsSelected;
                tv.SaveFunctionData();
            };
        }