Merge branch 'wxr6' into newBranch1

wxr

2021-07-05 4f8fc4fe0a7d6f73c3a06e6f924a4a2615b090d7

 HDL_ON/UI/UI2/3-Intelligence/Automation/AddTarget.cs

@@ -46,7 +46,7 @@
            LogicView.SelectTypeView delayView = new LogicView.SelectTypeView();
            delayView.frameLayout.Y = sceneView.frameLayout.Bottom;
            delayView.btnText.TextID = StringId.delayLogic;
            delayView.btnIcon.UnSelectedImagePath = "LogicIcon/delayed.png";
            delayView.btnIcon.UnSelectedImagePath = "LogicIcon/time.png";
            //viewLayout.AddChidren(delayView.FLayoutView());
            #endregion