数据库迁移

wells.liu

2020-07-13 9519d0962fb2772cce85653f53d140b8aa657ab2

 src/Bro.UI.Config/MainFrm.cs

@@ -74,10 +74,10 @@
            //});

            m_deserializeMenuFrm = new DeserializeDockContent(GetMenuFromPersistString);
            LoadLayoutFromXML(m_deserializeMenuFrm);

            m_deserializeDeviceRunFrm = new DeserializeDockContent(GetAllFormPersistString);
            _allMenuLoadDoneHandle.Set();

            //LoadLayoutFromXML(m_deserializeMenuFrm);
            //_allMenuLoadDoneHandle.Set();

            Text = SettingHelper.GetProgramDescription();
            string iconPath = SettingHelper.GetProgramIcon();
@@ -157,14 +157,20 @@
                CloseAllDeviceFrm();
                LoadDevices();

                foreach (var dock in dockPanelMain.Contents)
                try
                {
                    MenuFrmBase m = dock as MenuFrmBase;

                    if (m != null && m.Id != frmId)
                    foreach (var dock in dockPanelMain.Contents)
                    {
                        m.DownloadProcess(process);
                        MenuFrmBase m = dock as MenuFrmBase;

                        if (m != null && m.Id != frmId)
                        {
                            m.DownloadProcess(process);
                        }
                    }
                }
                catch (Exception ex)
                {
                }
            });
        }
@@ -254,13 +260,16 @@

        private void MainFrm_Load(object sender, EventArgs e)
        {
            LoadLayoutFromXML(m_deserializeMenuFrm);
            _allMenuLoadDoneHandle.Set();

            AdvancedPwdFrm.OnLoginOK = OnLoginOK;

            SpinWait wait = new SpinWait();
            while (_process == null)
            {
                wait.SpinOnce();
            }
            //SpinWait wait = new SpinWait();
            //while (_process == null)
            //{
            //    wait.SpinOnce();
            //}
            LoadLayoutFromXML(m_deserializeDeviceRunFrm);
        }

@@ -317,7 +326,7 @@

        private void OnLoginOK(bool isLogin)
        {
            IsLogin = true;
            IsLogin = isLogin;
        }
        #endregion

@@ -542,10 +551,10 @@

                dockFrm.Text = desc[2];

                if (_process != null)
                {
                    dockFrm.DownloadProcess(_process);
                }
                //if (_process != null)
                //{
                //    dockFrm.DownloadProcess(_process);
                //}

                dockFrm.SetLoginStatus(IsLogin);

@@ -580,10 +589,10 @@

                dockFrm.Text = desc[2];

                if (_process != null)
                {
                    dockFrm.DownloadProcess(_process);
                }
                //if (_process != null)
                //{
                //    dockFrm.DownloadProcess(_process);
                //}

                dockFrm.SetLoginStatus(IsLogin);