Merge branch 'newBranch1' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project...

wei

2021-08-27 eda3fb873e59544ff36301b51e05aef64f87b0f9

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

@@ -195,15 +195,21 @@
                    {
                        list.Add(logic.name);
                    }
                    new LogicView.TipPopView().InputBox(StringId.editName, InpOrOutLogicMethod.GetLogicName(Logic.currlogic), StringId.nameNull, StringId.NameAlreadyExists, list, (logicName, view
                        ) =>
                    new LogicView.TipPopView().InputBox(StringId.editName, InpOrOutLogicMethod.GetLogicName(Logic.currlogic), StringId.nameNull, StringId.NameAlreadyExists, list, (logicName, view) =>
                    {
                        Logic.currlogic.name = logicName;
                        Logic.currlogic.sid = LogicMethod.NewSid();
                        Logic.currlogic.sid = LogicMethod.CurrLogicMethod.NewSid();
                        if (MainPage.NoLoginMode)
                        {
                            Logic.currlogic.userLogicId = Guid.NewGuid().ToString();
                            Logic.LogicList.Add(Logic.currlogic);
                            LogicMethod.CurrLogicMethod.RemoveAllView();
                            MainView.MainShow();
                            return;
                        }
                        loading.Start();
                        new System.Threading.Thread(() =>
                        {

                            try
                            {
                                //发送新加逻辑命令；
@@ -242,7 +248,7 @@
                                        }

                                        Logic.LogicList.Add(Logic.currlogic);
                                        LogicMethod.RemoveAllView();
                                        LogicMethod.CurrLogicMethod.RemoveAllView();
                                        MainView.MainShow();
                                    }
                                    else if (responsePackNew != null && responsePackNew.Code == "14005")
@@ -282,7 +288,7 @@
                                loading.Hide();
                                if (responsePackNew != null && responsePackNew.Code == "0")
                                {
                                    LogicMethod.RemoveAllView();
                                    LogicMethod.CurrLogicMethod.RemoveAllView();
                                    MainView.MainShow();
                                }
                                else if (responsePackNew != null && responsePackNew.Code == "14005")