Merge branch 'Dev-Branch' into wjc

wjc

2023-06-05 a19e58425e44c8a83c3d1b23de292659c38a6b1e

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

@@ -67,13 +67,12 @@
                        logicView.btnSwitchIcon.IsSelected = false;
                        currLogic.enable = "false";
                    }
                    //Send.switchLogic(currLogic);
                    new System.Threading.Thread(() =>
                    {
                        try
                        {
                            //逻辑使能的命令
                            Send.Current.SwitchLogic(currLogic);
                            Send.Current.EnableLogic(currLogic);

                        }
                        catch { }
@@ -367,6 +366,7 @@
            //2-功能图标
            //3-云端图标
            //4-场景图标
            //5-地理围栏
            for (int i = 0; i < logic.input.Count; i++)
            {
                if (logic.input[i] == null)
@@ -396,9 +396,21 @@

                        }
                        break;
                    case 8:
                        {
                            iconInt = 5;

                        }
                        break;
                    case 10:
                        {
                            iconInt = 4;

                        }
                        break;
                    case 8:
                        {
                            iconInt = 5;

                        }
                        break;
@@ -512,6 +524,12 @@
                            strIcon = "LogicIcon/selectTheScene.png";
                        }
                        break;
                    case 5:
                        {

                            strIcon = "LogicIcon/selectlocation.png";
                        }
                        break;
                    case 11:
                        {
                            //分割条件和目标的图标