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

wei

2020-12-11 37dc5f07121946aa03ce96030a9f400af032367d

 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);