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

wxr

2020-12-02 e3ad42ffa2fa67c8f6cb4519ca626fa275c8947d

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

@@ -98,7 +98,7 @@
                Height = Application.GetMinRealAverage(40),
                SelectedImagePath = "Collection/CollectionIcon.png",
                UnSelectedImagePath = "Collection/CollectionGrayIcon.png",
                IsSelected = socketFunction.collection
                IsSelected = socketFunction.collect
            };
            controlView.AddChidren(btnCollection);