第一个可编译版本

DW5S.App/CorTools/GpuCalcForm.cs

@@ -21,11 +21,18 @@ using System.Windows.Forms;
 using DW5S.KxcApi;
 using DW5S.DTO;
 using DW5S.Repostory;
+using Microsoft.Extensions.Logging;
 
 namespace DW5S.App.CorTools
 {
     public partial class GpuCalcForm : DevExpress.XtraEditors.XtraForm
     {
+        [Autowired]
+        private readonly ILogger logger;
+
+        [Autowired]
+        private readonly UnitOfWork unitOfWork;
+
         static readonly string inifile = Path.Combine(Application.StartupPath, "parGpu.ini");
         List<GpuCafResult> gridSource = new List<GpuCafResult>();
 
@@ -64,8 +71,9 @@ namespace DW5S.App.CorTools
             catch (Exception ex)
             {
                 layoutControl1.Enabled = true;
-                DW5S.Framework.LogHelper.Error(ex.Message, ex);
-                DxHelper.MsgBoxHelper.ShowError(ex.Message);
+                string msg = "GPU参估上传文件异常";
+                logger.LogError(ex,msg);
+                DxHelper.MsgBoxHelper.ShowError(msg);
                 return;
             }
             var samplingRate = double.Parse(txtfs.Text) * 1e6;
@@ -110,19 +118,15 @@ namespace DW5S.App.CorTools
                 }
                 else
                 {
-                    DW5S.Framework.LogHelper.Error(result.msg);
+                    logger.LogError(result.msg);
                     DxHelper.MsgBoxHelper.ShowError(result.msg);
                 }
             }
-            catch (TaskCanceledException)
-            {
-                DW5S.Framework.LogHelper.Warning("GPU文件参估Http接口调用超时");
-                DxHelper.MsgBoxHelper.ShowInfo("GPU文件参估Http接口调用超时");
-            }
             catch (Exception ex)
             {
-                DW5S.Framework.LogHelper.Error("GPU文件参估出错", ex);
-                DxHelper.MsgBoxHelper.ShowError("GPU文件参估出错");
+                string msg = "GPU文件参估出错";
+                logger.LogError(ex,msg);
+                DxHelper.MsgBoxHelper.ShowError(msg);
             }
             gridView1.RefreshData();
             layoutControl1.Enabled = true;

DW5S.App/DW5S.App.csproj

@@ -20,6 +20,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\DW5S.Basic\01.DW5S.Basic.csproj" />
+    <ProjectReference Include="..\DW5S.Controller\08.DW5S.Controller.csproj" />
     <ProjectReference Include="..\DW5S.DTO\02.DW5S.DTO.csproj" />
     <ProjectReference Include="..\DW5S.Entity\03.DW5S.Entity.csproj" />
     <ProjectReference Include="..\DW5S.KxcApi\06.DW5S.KxcApi.csproj" />

DW5S.App/EditForms/PosTimeEditor.cs

@@ -39,10 +39,10 @@ namespace DW5S.App.EditForms
         private void SatEditor_Load(object sender, EventArgs e)
         {
             this.Size = new Size(200, 240);
-            if (cache.ContainsKey(tsk.ID))
+            if (cache.ContainsKey(tsk.Id))
             {
-                txtStartTime.DateTime = cache[tsk.ID].Item1;
-                txtEndTime.DateTime = cache[tsk.ID].Item2;
+                txtStartTime.DateTime = cache[tsk.Id].Item1;
+                txtEndTime.DateTime = cache[tsk.Id].Item2;
             }
             else
             {
@@ -77,10 +77,10 @@ namespace DW5S.App.EditForms
             }
             if (cache.Count >= 50)
                 cache.Remove(cache.First().Key);
-            if (cache.ContainsKey(tsk.ID))
-                cache[tsk.ID] = (start, end);
+            if (cache.ContainsKey(tsk.Id))
+                cache[tsk.Id] = (start, end);
             else
-                cache.Add(tsk.ID, (start, end));
+                cache.Add(tsk.Id, (start, end));
             this.DialogResult = DialogResult.OK;
         }
     }

DW5S.App/EditForms/RHDTOParamEditor.Designer.cs

@@ -1,699 +0,0 @@
-namespace DW5S.App.EditForms
-{
-    partial class RHDTOParamEditor
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.components = new System.ComponentModel.Container();
-            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions3 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject9 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject10 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject11 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject12 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions4 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject13 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject14 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject15 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject16 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions5 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject17 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject18 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject19 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject20 = new DevExpress.Utils.SerializableAppearanceObject();
-            this.layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
-            this.ucEphXYZAdaj = new DW5S.App.UserControl.UCEphXYZ();
-            this.ucEphXYZMain = new DW5S.App.UserControl.UCEphXYZ();
-            this.txtSigTime = new DevExpress.XtraEditors.DateEdit();
-            this.txtDtoSx = new DevExpress.XtraEditors.ButtonEdit();
-            this.txtDtoCdb = new DevExpress.XtraEditors.ButtonEdit();
-            this.txtYbMain = new DevExpress.XtraEditors.ButtonEdit();
-            this.txtYbAdja = new DevExpress.XtraEditors.ButtonEdit();
-            this.txtsatStation = new DevExpress.XtraEditors.TextEdit();
-            this.txtcdbStation = new DevExpress.XtraEditors.TextEdit();
-            this.txtRefLocation = new DevExpress.XtraEditors.TextEdit();
-            this.btnDtoLine = new DevExpress.XtraEditors.SimpleButton();
-            this.btnEphCalc = new DevExpress.XtraEditors.SimpleButton();
-            this.btnPos = new DevExpress.XtraEditors.SimpleButton();
-            this.txtCxLocation = new DevExpress.XtraEditors.TextEdit();
-            this.txtcxFx = new DevExpress.XtraEditors.ButtonEdit();
-            this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
-            this.emptySpaceItem3 = new DevExpress.XtraLayout.EmptySpaceItem();
-            this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.itemSigTime = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.txtPosRes = new DevExpress.XtraLayout.SimpleLabelItem();
-            this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.emptySpaceItem1 = new DevExpress.XtraLayout.EmptySpaceItem();
-            this.dxErrorProvider = new DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider(this.components);
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).BeginInit();
-            this.layoutControl1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.txtSigTime.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtSigTime.Properties.CalendarTimeProperties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtDtoSx.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtDtoCdb.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtYbMain.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtYbAdja.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtsatStation.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtcdbStation.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtRefLocation.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtCxLocation.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtcxFx.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem3)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.itemSigTime)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtPosRes)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.dxErrorProvider)).BeginInit();
-            this.SuspendLayout();
-            // 
-            // layoutControl1
-            // 
-            this.layoutControl1.Controls.Add(this.ucEphXYZAdaj);
-            this.layoutControl1.Controls.Add(this.ucEphXYZMain);
-            this.layoutControl1.Controls.Add(this.txtSigTime);
-            this.layoutControl1.Controls.Add(this.txtDtoSx);
-            this.layoutControl1.Controls.Add(this.txtDtoCdb);
-            this.layoutControl1.Controls.Add(this.txtYbMain);
-            this.layoutControl1.Controls.Add(this.txtYbAdja);
-            this.layoutControl1.Controls.Add(this.txtsatStation);
-            this.layoutControl1.Controls.Add(this.txtcdbStation);
-            this.layoutControl1.Controls.Add(this.txtRefLocation);
-            this.layoutControl1.Controls.Add(this.btnDtoLine);
-            this.layoutControl1.Controls.Add(this.btnEphCalc);
-            this.layoutControl1.Controls.Add(this.btnPos);
-            this.layoutControl1.Controls.Add(this.txtCxLocation);
-            this.layoutControl1.Controls.Add(this.txtcxFx);
-            this.layoutControl1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.layoutControl1.Location = new System.Drawing.Point(0, 0);
-            this.layoutControl1.Name = "layoutControl1";
-            this.layoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(831, 101, 650, 400);
-            this.layoutControl1.Root = this.Root;
-            this.layoutControl1.Size = new System.Drawing.Size(685, 367);
-            this.layoutControl1.TabIndex = 0;
-            this.layoutControl1.Text = "layoutControl1";
-            // 
-            // ucEphXYZAdaj
-            // 
-            this.ucEphXYZAdaj.Location = new System.Drawing.Point(12, 244);
-            this.ucEphXYZAdaj.Name = "ucEphXYZAdaj";
-            this.ucEphXYZAdaj.Padding = new System.Windows.Forms.Padding(0, 2, 0, 0);
-            this.ucEphXYZAdaj.Size = new System.Drawing.Size(661, 44);
-            this.ucEphXYZAdaj.TabIndex = 14;
-            // 
-            // ucEphXYZMain
-            // 
-            this.ucEphXYZMain.Location = new System.Drawing.Point(12, 196);
-            this.ucEphXYZMain.Name = "ucEphXYZMain";
-            this.ucEphXYZMain.Size = new System.Drawing.Size(661, 44);
-            this.ucEphXYZMain.TabIndex = 13;
-            // 
-            // txtSigTime
-            // 
-            this.txtSigTime.EditValue = null;
-            this.txtSigTime.Location = new System.Drawing.Point(12, 167);
-            this.txtSigTime.Name = "txtSigTime";
-            this.txtSigTime.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.txtSigTime.Properties.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.txtSigTime.Properties.DisplayFormat.FormatString = "yyyy-MM-dd HH:mm:ss";
-            this.txtSigTime.Properties.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime;
-            this.txtSigTime.Properties.EditFormat.FormatString = "yyyy-MM-dd HH:mm:ss";
-            this.txtSigTime.Properties.EditFormat.FormatType = DevExpress.Utils.FormatType.DateTime;
-            this.txtSigTime.Properties.MaskSettings.Set("mask", "yyyy-MM-dd HH:mm:ss");
-            this.txtSigTime.Size = new System.Drawing.Size(659, 20);
-            this.txtSigTime.StyleController = this.layoutControl1;
-            this.txtSigTime.TabIndex = 9;
-            // 
-            // txtDtoSx
-            // 
-            this.txtDtoSx.Location = new System.Drawing.Point(445, 75);
-            this.txtDtoSx.MaximumSize = new System.Drawing.Size(0, 20);
-            this.txtDtoSx.Name = "txtDtoSx";
-            this.txtDtoSx.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "us", -1, false, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
-            this.txtDtoSx.Properties.NullValuePrompt = "必需";
-            this.txtDtoSx.Size = new System.Drawing.Size(228, 20);
-            this.txtDtoSx.StyleController = this.layoutControl1;
-            this.txtDtoSx.TabIndex = 6;
-            // 
-            // txtDtoCdb
-            // 
-            this.txtDtoCdb.Location = new System.Drawing.Point(12, 121);
-            this.txtDtoCdb.MaximumSize = new System.Drawing.Size(0, 20);
-            this.txtDtoCdb.Name = "txtDtoCdb";
-            this.txtDtoCdb.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "us", -1, false, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
-            this.txtDtoCdb.Properties.NullValuePrompt = "必需";
-            this.txtDtoCdb.Size = new System.Drawing.Size(223, 20);
-            this.txtDtoCdb.StyleController = this.layoutControl1;
-            this.txtDtoCdb.TabIndex = 6;
-            // 
-            // txtYbMain
-            // 
-            this.txtYbMain.Location = new System.Drawing.Point(239, 121);
-            this.txtYbMain.MaximumSize = new System.Drawing.Size(0, 20);
-            this.txtYbMain.Name = "txtYbMain";
-            this.txtYbMain.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "us", -1, false, true, false, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
-            this.txtYbMain.Size = new System.Drawing.Size(198, 20);
-            this.txtYbMain.StyleController = this.layoutControl1;
-            this.txtYbMain.TabIndex = 6;
-            // 
-            // txtYbAdja
-            // 
-            this.txtYbAdja.Location = new System.Drawing.Point(443, 121);
-            this.txtYbAdja.MaximumSize = new System.Drawing.Size(0, 20);
-            this.txtYbAdja.Name = "txtYbAdja";
-            this.txtYbAdja.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "us", -1, false, true, false, editorButtonImageOptions4, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject13, serializableAppearanceObject14, serializableAppearanceObject15, serializableAppearanceObject16, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
-            this.txtYbAdja.Size = new System.Drawing.Size(230, 20);
-            this.txtYbAdja.StyleController = this.layoutControl1;
-            this.txtYbAdja.TabIndex = 6;
-            // 
-            // txtsatStation
-            // 
-            this.txtsatStation.EditValue = "";
-            this.txtsatStation.Location = new System.Drawing.Point(14, 29);
-            this.txtsatStation.MaximumSize = new System.Drawing.Size(0, 20);
-            this.txtsatStation.Name = "txtsatStation";
-            this.txtsatStation.Properties.AutoHeight = false;
-            this.txtsatStation.Size = new System.Drawing.Size(221, 20);
-            this.txtsatStation.StyleController = this.layoutControl1;
-            this.txtsatStation.TabIndex = 10;
-            this.txtsatStation.ToolTip = "经度纬度之间用英文逗号隔开";
-            // 
-            // txtcdbStation
-            // 
-            this.txtcdbStation.EditValue = "";
-            this.txtcdbStation.Location = new System.Drawing.Point(239, 29);
-            this.txtcdbStation.MaximumSize = new System.Drawing.Size(0, 20);
-            this.txtcdbStation.Name = "txtcdbStation";
-            this.txtcdbStation.Properties.AutoHeight = false;
-            this.txtcdbStation.Size = new System.Drawing.Size(200, 20);
-            this.txtcdbStation.StyleController = this.layoutControl1;
-            this.txtcdbStation.TabIndex = 10;
-            this.txtcdbStation.ToolTip = "经度纬度之间用英文逗号隔开";
-            // 
-            // txtRefLocation
-            // 
-            this.txtRefLocation.EditValue = "";
-            this.txtRefLocation.Location = new System.Drawing.Point(443, 29);
-            this.txtRefLocation.MaximumSize = new System.Drawing.Size(0, 20);
-            this.txtRefLocation.Name = "txtRefLocation";
-            this.txtRefLocation.Properties.AutoHeight = false;
-            this.txtRefLocation.Size = new System.Drawing.Size(228, 20);
-            this.txtRefLocation.StyleController = this.layoutControl1;
-            this.txtRefLocation.TabIndex = 10;
-            this.txtRefLocation.ToolTip = "经度纬度之间用英文逗号隔开";
-            // 
-            // btnDtoLine
-            // 
-            this.btnDtoLine.Location = new System.Drawing.Point(465, 299);
-            this.btnDtoLine.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
-            this.btnDtoLine.Name = "btnDtoLine";
-            this.btnDtoLine.Size = new System.Drawing.Size(96, 22);
-            this.btnDtoLine.StyleController = this.layoutControl1;
-            this.btnDtoLine.TabIndex = 12;
-            this.btnDtoLine.Text = "时差线";
-            this.btnDtoLine.Click += new System.EventHandler(this.btnDtoLine_Click);
-            // 
-            // btnEphCalc
-            // 
-            this.btnEphCalc.Location = new System.Drawing.Point(357, 299);
-            this.btnEphCalc.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
-            this.btnEphCalc.Name = "btnEphCalc";
-            this.btnEphCalc.Size = new System.Drawing.Size(96, 22);
-            this.btnEphCalc.StyleController = this.layoutControl1;
-            this.btnEphCalc.TabIndex = 12;
-            this.btnEphCalc.Text = "重新计算星历";
-            this.btnEphCalc.ToolTip = "根据信号时间使用匹配的双行根重新推算星历";
-            this.btnEphCalc.Click += new System.EventHandler(this.btnEphCalc_Click);
-            // 
-            // btnPos
-            // 
-            this.btnPos.Location = new System.Drawing.Point(575, 299);
-            this.btnPos.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
-            this.btnPos.Name = "btnPos";
-            this.btnPos.Size = new System.Drawing.Size(96, 22);
-            this.btnPos.StyleController = this.layoutControl1;
-            this.btnPos.TabIndex = 12;
-            this.btnPos.Text = "手动定位";
-            this.btnPos.Click += new System.EventHandler(this.btnPos_Click);
-            // 
-            // txtCxLocation
-            // 
-            this.txtCxLocation.EditValue = "";
-            this.txtCxLocation.Location = new System.Drawing.Point(12, 75);
-            this.txtCxLocation.MaximumSize = new System.Drawing.Size(0, 20);
-            this.txtCxLocation.Name = "txtCxLocation";
-            this.txtCxLocation.Properties.AutoHeight = false;
-            this.txtCxLocation.Size = new System.Drawing.Size(221, 20);
-            this.txtCxLocation.StyleController = this.layoutControl1;
-            this.txtCxLocation.TabIndex = 10;
-            this.txtCxLocation.ToolTip = "经度纬度之间用英文逗号隔开";
-            // 
-            // txtcxFx
-            // 
-            this.txtcxFx.Location = new System.Drawing.Point(239, 75);
-            this.txtcxFx.MaximumSize = new System.Drawing.Size(0, 20);
-            this.txtcxFx.Name = "txtcxFx";
-            this.txtcxFx.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "° ", -1, false, true, false, editorButtonImageOptions5, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject17, serializableAppearanceObject18, serializableAppearanceObject19, serializableAppearanceObject20, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
-            this.txtcxFx.Size = new System.Drawing.Size(200, 20);
-            this.txtcxFx.StyleController = this.layoutControl1;
-            this.txtcxFx.TabIndex = 6;
-            // 
-            // Root
-            // 
-            this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
-            this.Root.GroupBordersVisible = false;
-            this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
-            this.emptySpaceItem3,
-            this.layoutControlItem6,
-            this.layoutControlItem14,
-            this.layoutControlItem9,
-            this.layoutControlItem10,
-            this.itemSigTime,
-            this.layoutControlItem17,
-            this.layoutControlItem4,
-            this.layoutControlItem3,
-            this.layoutControlItem5,
-            this.layoutControlItem7,
-            this.layoutControlItem1,
-            this.txtPosRes,
-            this.layoutControlItem11,
-            this.layoutControlItem12,
-            this.layoutControlItem2,
-            this.layoutControlItem8,
-            this.emptySpaceItem1});
-            this.Root.Name = "Root";
-            this.Root.Size = new System.Drawing.Size(685, 367);
-            this.Root.TextVisible = false;
-            // 
-            // emptySpaceItem3
-            // 
-            this.emptySpaceItem3.AllowHotTrack = false;
-            this.emptySpaceItem3.Location = new System.Drawing.Point(0, 280);
-            this.emptySpaceItem3.Name = "emptySpaceItem3";
-            this.emptySpaceItem3.Size = new System.Drawing.Size(345, 33);
-            this.emptySpaceItem3.TextSize = new System.Drawing.Size(0, 0);
-            // 
-            // layoutControlItem6
-            // 
-            this.layoutControlItem6.Control = this.txtDtoCdb;
-            this.layoutControlItem6.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
-            this.layoutControlItem6.CustomizationFormText = "轨道经度";
-            this.layoutControlItem6.Location = new System.Drawing.Point(0, 92);
-            this.layoutControlItem6.MaxSize = new System.Drawing.Size(0, 51);
-            this.layoutControlItem6.MinSize = new System.Drawing.Size(54, 46);
-            this.layoutControlItem6.Name = "layoutControlItem6";
-            this.layoutControlItem6.Size = new System.Drawing.Size(227, 46);
-            this.layoutControlItem6.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
-            this.layoutControlItem6.Text = "主星超短时差";
-            this.layoutControlItem6.TextLocation = DevExpress.Utils.Locations.Top;
-            this.layoutControlItem6.TextSize = new System.Drawing.Size(72, 14);
-            // 
-            // layoutControlItem14
-            // 
-            this.layoutControlItem14.Control = this.txtsatStation;
-            this.layoutControlItem14.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
-            this.layoutControlItem14.CustomizationFormText = "参考站经纬度";
-            this.layoutControlItem14.Location = new System.Drawing.Point(0, 0);
-            this.layoutControlItem14.MaxSize = new System.Drawing.Size(0, 46);
-            this.layoutControlItem14.MinSize = new System.Drawing.Size(77, 46);
-            this.layoutControlItem14.Name = "layoutControlItem14";
-            this.layoutControlItem14.Size = new System.Drawing.Size(227, 46);
-            this.layoutControlItem14.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
-            this.layoutControlItem14.Spacing = new DevExpress.XtraLayout.Utils.Padding(2, 0, 0, 0);
-            this.layoutControlItem14.Text = "接收站经纬度";
-            this.layoutControlItem14.TextLocation = DevExpress.Utils.Locations.Top;
-            this.layoutControlItem14.TextSize = new System.Drawing.Size(72, 14);
-            // 
-            // layoutControlItem9
-            // 
-            this.layoutControlItem9.Control = this.txtcdbStation;
-            this.layoutControlItem9.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
-            this.layoutControlItem9.CustomizationFormText = "参考站经纬度";
-            this.layoutControlItem9.Location = new System.Drawing.Point(227, 0);
-            this.layoutControlItem9.MaxSize = new System.Drawing.Size(0, 46);
-            this.layoutControlItem9.MinSize = new System.Drawing.Size(77, 46);
-            this.layoutControlItem9.Name = "layoutControlItem9";
-            this.layoutControlItem9.Size = new System.Drawing.Size(204, 46);
-            this.layoutControlItem9.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
-            this.layoutControlItem9.Text = "超短波经纬度";
-            this.layoutControlItem9.TextLocation = DevExpress.Utils.Locations.Top;
-            this.layoutControlItem9.TextSize = new System.Drawing.Size(72, 14);
-            // 
-            // layoutControlItem10
-            // 
-            this.layoutControlItem10.Control = this.txtRefLocation;
-            this.layoutControlItem10.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
-            this.layoutControlItem10.CustomizationFormText = "参考站经纬度";
-            this.layoutControlItem10.Location = new System.Drawing.Point(431, 0);
-            this.layoutControlItem10.MaxSize = new System.Drawing.Size(0, 46);
-            this.layoutControlItem10.MinSize = new System.Drawing.Size(77, 46);
-            this.layoutControlItem10.Name = "layoutControlItem10";
-            this.layoutControlItem10.Size = new System.Drawing.Size(234, 46);
-            this.layoutControlItem10.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
-            this.layoutControlItem10.Spacing = new DevExpress.XtraLayout.Utils.Padding(0, 2, 0, 0);
-            this.layoutControlItem10.Text = "参考站经纬度";
-            this.layoutControlItem10.TextLocation = DevExpress.Utils.Locations.Top;
-            this.layoutControlItem10.TextSize = new System.Drawing.Size(72, 14);
-            // 
-            // itemSigTime
-            // 
-            this.itemSigTime.Control = this.txtSigTime;
-            this.itemSigTime.Location = new System.Drawing.Point(0, 138);
-            this.itemSigTime.MaxSize = new System.Drawing.Size(0, 46);
-            this.itemSigTime.MinSize = new System.Drawing.Size(76, 46);
-            this.itemSigTime.Name = "itemSigTime";
-            this.itemSigTime.Size = new System.Drawing.Size(665, 46);
-            this.itemSigTime.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
-            this.itemSigTime.Spacing = new DevExpress.XtraLayout.Utils.Padding(0, 2, 0, 0);
-            this.itemSigTime.Text = "信号时间";
-            this.itemSigTime.TextLocation = DevExpress.Utils.Locations.Top;
-            this.itemSigTime.TextSize = new System.Drawing.Size(72, 14);
-            // 
-            // layoutControlItem17
-            // 
-            this.layoutControlItem17.Control = this.btnDtoLine;
-            this.layoutControlItem17.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
-            this.layoutControlItem17.CustomizationFormText = "layoutControlItem1";
-            this.layoutControlItem17.Location = new System.Drawing.Point(445, 280);
-            this.layoutControlItem17.MaxSize = new System.Drawing.Size(110, 0);
-            this.layoutControlItem17.MinSize = new System.Drawing.Size(110, 33);
-            this.layoutControlItem17.Name = "layoutControlItem17";
-            this.layoutControlItem17.Padding = new DevExpress.XtraLayout.Utils.Padding(10, 2, 9, 2);
-            this.layoutControlItem17.Size = new System.Drawing.Size(110, 33);
-            this.layoutControlItem17.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
-            this.layoutControlItem17.Spacing = new DevExpress.XtraLayout.Utils.Padding(0, 2, 0, 0);
-            this.layoutControlItem17.Text = "layoutControlItem1";
-            this.layoutControlItem17.TextSize = new System.Drawing.Size(0, 0);
-            this.layoutControlItem17.TextVisible = false;
-            // 
-            // layoutControlItem4
-            // 
-            this.layoutControlItem4.Control = this.ucEphXYZMain;
-            this.layoutControlItem4.Location = new System.Drawing.Point(0, 184);
-            this.layoutControlItem4.MaxSize = new System.Drawing.Size(0, 48);
-            this.layoutControlItem4.MinSize = new System.Drawing.Size(166, 48);
-            this.layoutControlItem4.Name = "layoutControlItem4";
-            this.layoutControlItem4.Size = new System.Drawing.Size(665, 48);
-            this.layoutControlItem4.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
-            this.layoutControlItem4.TextSize = new System.Drawing.Size(0, 0);
-            this.layoutControlItem4.TextVisible = false;
-            // 
-            // layoutControlItem3
-            // 
-            this.layoutControlItem3.Control = this.ucEphXYZAdaj;
-            this.layoutControlItem3.Location = new System.Drawing.Point(0, 232);
-            this.layoutControlItem3.MaxSize = new System.Drawing.Size(0, 48);
-            this.layoutControlItem3.MinSize = new System.Drawing.Size(166, 48);
-            this.layoutControlItem3.Name = "layoutControlItem3";
-            this.layoutControlItem3.Size = new System.Drawing.Size(665, 48);
-            this.layoutControlItem3.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
-            this.layoutControlItem3.TextSize = new System.Drawing.Size(0, 0);
-            this.layoutControlItem3.TextVisible = false;
-            // 
-            // layoutControlItem5
-            // 
-            this.layoutControlItem5.Control = this.btnEphCalc;
-            this.layoutControlItem5.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
-            this.layoutControlItem5.CustomizationFormText = "layoutControlItem1";
-            this.layoutControlItem5.Location = new System.Drawing.Point(345, 280);
-            this.layoutControlItem5.MaxSize = new System.Drawing.Size(100, 33);
-            this.layoutControlItem5.MinSize = new System.Drawing.Size(100, 33);
-            this.layoutControlItem5.Name = "layoutControlItem5";
-            this.layoutControlItem5.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 9, 2);
-            this.layoutControlItem5.Size = new System.Drawing.Size(100, 33);
-            this.layoutControlItem5.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
-            this.layoutControlItem5.Text = "layoutControlItem1";
-            this.layoutControlItem5.TextSize = new System.Drawing.Size(0, 0);
-            this.layoutControlItem5.TextVisible = false;
-            // 
-            // layoutControlItem7
-            // 
-            this.layoutControlItem7.Control = this.txtYbMain;
-            this.layoutControlItem7.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
-            this.layoutControlItem7.CustomizationFormText = "轨道经度";
-            this.layoutControlItem7.Location = new System.Drawing.Point(227, 92);
-            this.layoutControlItem7.MaxSize = new System.Drawing.Size(0, 46);
-            this.layoutControlItem7.MinSize = new System.Drawing.Size(54, 46);
-            this.layoutControlItem7.Name = "layoutControlItem7";
-            this.layoutControlItem7.Size = new System.Drawing.Size(204, 46);
-            this.layoutControlItem7.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
-            this.layoutControlItem7.Spacing = new DevExpress.XtraLayout.Utils.Padding(0, 2, 0, 0);
-            this.layoutControlItem7.Text = "样本主星时差";
-            this.layoutControlItem7.TextLocation = DevExpress.Utils.Locations.Top;
-            this.layoutControlItem7.TextSize = new System.Drawing.Size(72, 14);
-            // 
-            // layoutControlItem1
-            // 
-            this.layoutControlItem1.Control = this.btnPos;
-            this.layoutControlItem1.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
-            this.layoutControlItem1.CustomizationFormText = "layoutControlItem1";
-            this.layoutControlItem1.Location = new System.Drawing.Point(555, 280);
-            this.layoutControlItem1.MaxSize = new System.Drawing.Size(110, 33);
-            this.layoutControlItem1.MinSize = new System.Drawing.Size(110, 33);
-            this.layoutControlItem1.Name = "layoutControlItem1";
-            this.layoutControlItem1.Padding = new DevExpress.XtraLayout.Utils.Padding(10, 2, 9, 2);
-            this.layoutControlItem1.Size = new System.Drawing.Size(110, 33);
-            this.layoutControlItem1.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
-            this.layoutControlItem1.Spacing = new DevExpress.XtraLayout.Utils.Padding(0, 2, 0, 0);
-            this.layoutControlItem1.TextSize = new System.Drawing.Size(0, 0);
-            this.layoutControlItem1.TextVisible = false;
-            // 
-            // txtPosRes
-            // 
-            this.txtPosRes.AllowHotTrack = false;
-            this.txtPosRes.Location = new System.Drawing.Point(0, 313);
-            this.txtPosRes.MaxSize = new System.Drawing.Size(0, 24);
-            this.txtPosRes.MinSize = new System.Drawing.Size(126, 24);
-            this.txtPosRes.Name = "txtPosRes";
-            this.txtPosRes.Size = new System.Drawing.Size(665, 24);
-            this.txtPosRes.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
-            this.txtPosRes.Text = " ";
-            this.txtPosRes.TextSize = new System.Drawing.Size(72, 14);
-            // 
-            // layoutControlItem11
-            // 
-            this.layoutControlItem11.Control = this.txtCxLocation;
-            this.layoutControlItem11.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
-            this.layoutControlItem11.CustomizationFormText = "参考站经纬度";
-            this.layoutControlItem11.Location = new System.Drawing.Point(0, 46);
-            this.layoutControlItem11.MaxSize = new System.Drawing.Size(0, 46);
-            this.layoutControlItem11.MinSize = new System.Drawing.Size(77, 46);
-            this.layoutControlItem11.Name = "layoutControlItem11";
-            this.layoutControlItem11.Size = new System.Drawing.Size(227, 46);
-            this.layoutControlItem11.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
-            this.layoutControlItem11.Spacing = new DevExpress.XtraLayout.Utils.Padding(0, 2, 0, 0);
-            this.layoutControlItem11.Text = "测向站经纬度";
-            this.layoutControlItem11.TextLocation = DevExpress.Utils.Locations.Top;
-            this.layoutControlItem11.TextSize = new System.Drawing.Size(72, 14);
-            // 
-            // layoutControlItem12
-            // 
-            this.layoutControlItem12.Control = this.txtcxFx;
-            this.layoutControlItem12.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
-            this.layoutControlItem12.CustomizationFormText = "轨道经度";
-            this.layoutControlItem12.Location = new System.Drawing.Point(227, 46);
-            this.layoutControlItem12.MaxSize = new System.Drawing.Size(0, 51);
-            this.layoutControlItem12.MinSize = new System.Drawing.Size(54, 46);
-            this.layoutControlItem12.Name = "layoutControlItem12";
-            this.layoutControlItem12.Size = new System.Drawing.Size(204, 46);
-            this.layoutControlItem12.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
-            this.layoutControlItem12.Text = "测向方向值";
-            this.layoutControlItem12.TextLocation = DevExpress.Utils.Locations.Top;
-            this.layoutControlItem12.TextSize = new System.Drawing.Size(72, 14);
-            // 
-            // layoutControlItem2
-            // 
-            this.layoutControlItem2.Control = this.txtDtoSx;
-            this.layoutControlItem2.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
-            this.layoutControlItem2.CustomizationFormText = "轨道经度";
-            this.layoutControlItem2.Location = new System.Drawing.Point(431, 46);
-            this.layoutControlItem2.MaxSize = new System.Drawing.Size(0, 46);
-            this.layoutControlItem2.MinSize = new System.Drawing.Size(54, 46);
-            this.layoutControlItem2.Name = "layoutControlItem2";
-            this.layoutControlItem2.Size = new System.Drawing.Size(234, 46);
-            this.layoutControlItem2.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
-            this.layoutControlItem2.Spacing = new DevExpress.XtraLayout.Utils.Padding(2, 0, 0, 0);
-            this.layoutControlItem2.Text = "双星时差";
-            this.layoutControlItem2.TextLocation = DevExpress.Utils.Locations.Top;
-            this.layoutControlItem2.TextSize = new System.Drawing.Size(72, 14);
-            // 
-            // layoutControlItem8
-            // 
-            this.layoutControlItem8.Control = this.txtYbAdja;
-            this.layoutControlItem8.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
-            this.layoutControlItem8.CustomizationFormText = "轨道经度";
-            this.layoutControlItem8.Location = new System.Drawing.Point(431, 92);
-            this.layoutControlItem8.MaxSize = new System.Drawing.Size(0, 46);
-            this.layoutControlItem8.MinSize = new System.Drawing.Size(54, 46);
-            this.layoutControlItem8.Name = "layoutControlItem8";
-            this.layoutControlItem8.Size = new System.Drawing.Size(234, 46);
-            this.layoutControlItem8.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
-            this.layoutControlItem8.Text = "样本邻星时差";
-            this.layoutControlItem8.TextLocation = DevExpress.Utils.Locations.Top;
-            this.layoutControlItem8.TextSize = new System.Drawing.Size(72, 14);
-            // 
-            // emptySpaceItem1
-            // 
-            this.emptySpaceItem1.AllowHotTrack = false;
-            this.emptySpaceItem1.Location = new System.Drawing.Point(0, 337);
-            this.emptySpaceItem1.MaxSize = new System.Drawing.Size(0, 10);
-            this.emptySpaceItem1.MinSize = new System.Drawing.Size(10, 10);
-            this.emptySpaceItem1.Name = "emptySpaceItem1";
-            this.emptySpaceItem1.Size = new System.Drawing.Size(665, 10);
-            this.emptySpaceItem1.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
-            this.emptySpaceItem1.TextSize = new System.Drawing.Size(0, 0);
-            // 
-            // dxErrorProvider
-            // 
-            this.dxErrorProvider.ContainerControl = this;
-            // 
-            // RHDTOParamEditor
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.Controls.Add(this.layoutControl1);
-            this.Name = "RHDTOParamEditor";
-            this.Size = new System.Drawing.Size(685, 367);
-            this.Load += new System.EventHandler(this.X2D1DTOParamEditor_Load);
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).EndInit();
-            this.layoutControl1.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.txtSigTime.Properties.CalendarTimeProperties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtSigTime.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtDtoSx.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtDtoCdb.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtYbMain.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtYbAdja.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtsatStation.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtcdbStation.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtRefLocation.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtCxLocation.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtcxFx.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem3)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.itemSigTime)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtPosRes)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.dxErrorProvider)).EndInit();
-            this.ResumeLayout(false);
-
-        }
-
-        #endregion
-
-        private DevExpress.XtraLayout.LayoutControl layoutControl1;
-        private DevExpress.XtraLayout.LayoutControlGroup Root;
-        private DevExpress.XtraEditors.DateEdit txtSigTime;
-        private DevExpress.XtraLayout.LayoutControlItem itemSigTime;
-        private DevExpress.XtraEditors.ButtonEdit txtDtoSx;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
-        private DevExpress.XtraEditors.ButtonEdit txtDtoCdb;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
-        private DevExpress.XtraEditors.ButtonEdit txtYbMain;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
-        private DevExpress.XtraEditors.ButtonEdit txtYbAdja;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
-        private DevExpress.XtraEditors.TextEdit txtsatStation;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
-        private DevExpress.XtraEditors.TextEdit txtcdbStation;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
-        private DevExpress.XtraEditors.TextEdit txtRefLocation;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
-        private DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider dxErrorProvider;
-        private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem3;
-        private DevExpress.XtraEditors.SimpleButton btnDtoLine;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
-        private UserControl.UCEphXYZ ucEphXYZAdaj;
-        private UserControl.UCEphXYZ ucEphXYZMain;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
-        private DevExpress.XtraEditors.SimpleButton btnEphCalc;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
-        private DevExpress.XtraEditors.SimpleButton btnPos;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
-        private DevExpress.XtraLayout.SimpleLabelItem txtPosRes;
-        private DevExpress.XtraEditors.TextEdit txtCxLocation;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
-        private DevExpress.XtraEditors.ButtonEdit txtcxFx;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
-        private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem1;
-    }
-}

DW5S.App/EditForms/RHDTOParamEditor.cs

@@ -1,355 +0,0 @@
-using DevExpress.XtraMap;
-using DxHelper;
-using ExtensionsDev;
-using System;
-using System.CodeDom;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using DW5S.KxcApi;
-using DW5S.DTO;
-using DW5S.Entity;
-using DW5S.Repostory;
-using Microsoft.Extensions.Logging;
-
-namespace DW5S.App.EditForms
-{
-    public partial class RHDTOParamEditor : DevExpress.XtraEditors.XtraUserControl
-    {
-        [Autowired]
-        private readonly ILogger logger;
-
-        [Autowired]
-        private readonly UnitOfWork unitOfWork;
-
-        private MapControl mapControl1;
-        private PosRes info;
-        private CgRes cg;
-        private List<SatInfo> listSat;
-        public RHDTOParamEditor(PosRes info, MapControl mapControl)
-        {
-            InitializeComponent();
-            this.info = info;
-            itemSigTime.Text = $"{itemSigTime.Text}";
-            this.layoutControl1.UseDefault();
-            txtSigTime.UseDefault();
-            this.Text = $"{info.PosResType.GetEnumDisplayName()}时差参数";
-            this.listSat = new List<SatInfo>();
-            this.mapControl1 = mapControl;
-        }
-
-        private async void X2D1DTOParamEditor_Load(object sender, EventArgs e)
-        {
-            StationRes station = null;
-            CxRes cx = null;
-            var repsSat = unitOfWork.Of<SatInfo>();
-            listSat.AddRange(await repsSat.GetAllAsync());
-            var repsCg = unitOfWork.Of<CgRes>();
-            cg = await repsCg.FirstOrDefaultAsync(m => m.Id == info.CgResID);
-            var repsCx = unitOfWork.Of<CxRes>();
-            cx = await repsCx.FirstOrDefaultAsync(m => m.Id == info.CxResID);
-            var repsStation = unitOfWork.Of<StationRes>();
-            station = await repsStation.FirstOrDefaultAsync(m => m.Id == info.StationResID);
-            if (cg != null)
-            {
-                this.txtDtoSx.Text = $"{cg.Dto1.Value}";
-                this.txtDtoCdb.Text = $"{cg.DtoCdb.Value}";
-                this.txtYbMain.Text = $"{cg.YbMainDto.Value}";
-                this.txtYbAdja.Text = $"{cg.YbAdja1Dto.Value}";
-
-                this.txtSigTime.EditValue = info.SigTime;
-                ucEphXYZMain.SetXYZ("主星", cg.MainCode, (cg.MainX, cg.MainY, cg.MainZ), Color.Black);
-                ucEphXYZAdaj.SetXYZ("邻星", cg.Adja1Code, (cg.Adja1X, cg.Adja1Y, cg.Adja1Z), Color.Black);
-            }
-            if (cx != null)
-            {
-                this.txtcxFx.Text = $"{cx.Fx}";
-            }
-            if (station != null)
-            {
-                this.txtsatStation.Text = $"{station.SatTxLon},{station.SatTxLat}";
-                this.txtcdbStation.Text = $"{station.CdbTxLon},{station.CdbTxLat}";
-                this.txtRefLocation.Text = $"{station.RefLon},{station.RefLat}";
-                this.txtCxLocation.Text = $"{station.CxLon},{station.CxLat}";
-            }
-
-        }
-
-        public bool CheckParam()
-        {
-            dxErrorProvider.ClearErrors();
-            if (!txtsatStation.CheckLonLat(dxErrorProvider, "接收站"))
-            {
-                return false;
-            }
-            if (!txtcdbStation.CheckLonLat(dxErrorProvider, "超短波"))
-            {
-                return false;
-            }
-            if (!txtRefLocation.CheckLonLat(dxErrorProvider, "参考站"))
-            {
-                return false;
-            }
-            if (!txtDtoSx.CheckDouble(dxErrorProvider, "双星时差"))
-            {
-                return false;
-            }
-            if (!txtDtoCdb.CheckDouble(dxErrorProvider, "主星超短时差"))
-            {
-                return false;
-            }
-            if (!txtYbMain.CheckDouble(dxErrorProvider, "样本主星时差"))
-            {
-                return false;
-            }
-            if (!txtYbAdja.CheckDouble(dxErrorProvider, "样本邻星时差"))
-            {
-                return false;
-            }
-            if (!ucEphXYZMain.CheckEphXYZ(dxErrorProvider))
-            {
-                return false;
-            }
-            if (!ucEphXYZAdaj.CheckEphXYZ(dxErrorProvider))
-            {
-                return false;
-            }
-            return true;
-        }
-        public bool CheckPosParam()
-        {
-            dxErrorProvider.ClearErrors();
-            if (!txtsatStation.CheckLonLat(dxErrorProvider, "接收站"))
-            {
-                return false;
-            }
-            if (!txtcdbStation.CheckLonLat(dxErrorProvider, "超短波"))
-            {
-                return false;
-            }
-            if (!txtRefLocation.CheckLonLat(dxErrorProvider, "参考站"))
-            {
-                return false;
-            }
-            if (!txtCxLocation.CheckLonLat(dxErrorProvider, "测向站"))
-            {
-                return false;
-            }
-            if (!txtcxFx.CheckDouble(dxErrorProvider, "测向方向值"))
-            {
-                return false;
-            }
-            if (!txtDtoSx.CheckDouble(dxErrorProvider, "双星时差"))
-            {
-                return false;
-            }
-            if (!txtDtoCdb.CheckDouble(dxErrorProvider, "主星超短时差"))
-            {
-                return false;
-            }
-            if (!txtYbMain.CheckDouble(dxErrorProvider, "样本主星时差"))
-            {
-                return false;
-            }
-            if (!txtYbAdja.CheckDouble(dxErrorProvider, "样本邻星时差"))
-            {
-                return false;
-            }
-            if (!ucEphXYZMain.CheckEphXYZ(dxErrorProvider))
-            {
-                return false;
-            }
-            if (!ucEphXYZAdaj.CheckEphXYZ(dxErrorProvider))
-            {
-                return false;
-            }
-            return true;
-        }
-
-        private void btnDtoLine_Click(object sender, EventArgs e)
-        {
-            if (!CheckParam()) { return; }
-            try
-            {
-
-                var MsAnt = txtsatStation.GetLonLat();
-                var CDBAnt = txtcdbStation.GetLonLat();
-                var RefGeod = txtRefLocation.GetLonLat();
-
-                var DtoSx = Convert.ToDouble(this.txtDtoSx.Text);
-                var DtoCdb = Convert.ToDouble(this.txtDtoCdb.Text);
-                var YbMainDto = Convert.ToDouble(this.txtYbMain.Text);
-                var YbAdja1Dto = Convert.ToDouble(this.txtYbAdja.Text);
-
-
-                double[] msEph = ucEphXYZMain.EphXYZ();
-                double[] NsEph = ucEphXYZAdaj.EphXYZ();
-
-                DtoLineXdOption dtoLineXd = new DtoLineXdOption();
-                dtoLineXd.MsEph = msEph;
-                dtoLineXd.MsAnt = MsAnt;
-                dtoLineXd.CDBAnt = CDBAnt;
-                dtoLineXd.RefGeod = RefGeod;
-                dtoLineXd.xdDto = DtoCdb;
-                dtoLineXd.RefDto = YbMainDto;
-                dtoLineXd.PosLon = info.PosLon;
-                dtoLineXd.PosLat = info.PosLat;
-
-                DtoLineTwoStartOption twoStartOption = new DtoLineTwoStartOption();
-                twoStartOption.MsEph = msEph;
-                twoStartOption.NsEph = NsEph;
-                twoStartOption.MsAnt = MsAnt;
-                twoStartOption.NsAnt = MsAnt;
-                twoStartOption.RefGeod = RefGeod;
-                twoStartOption.TargetDto = DtoSx;
-                twoStartOption.RefDto = YbMainDto - YbAdja1Dto;
-                twoStartOption.PosLon = info.PosLon;
-                twoStartOption.PosLat = info.PosLat;
-                var msat = listSat.FirstOrDefault(m => m.SatCode == cg.MainCode.Value)?.Sat;
-                if (string.IsNullOrWhiteSpace(msat)) msat = cg.MainCode.Value.ToString();
-                var nsat = listSat.FirstOrDefault(m => m.SatCode == cg.Adja1Code.Value)?.Sat;
-                if (string.IsNullOrWhiteSpace(nsat)) nsat = cg.Adja1Code.Value.ToString();
-
-                var xdDtoLine = DrawDtoLineHelper.DtoLineXdNew(dtoLineXd);
-                List<MapPolyline> polylines = new List<MapPolyline>();
-                foreach (var dtoLine in xdDtoLine)
-                {
-                    var mapline = mapControl1.GetLine($"[{msat},超短{CDBAnt[0]}°]时差线", dtoLine.dtoLinePoints, true);
-                    if (mapline == null)
-                    {
-                        continue;
-                    }
-                    polylines.Add(mapline);
-                }
-                mapControl1.DrawDtoLine(polylines);
-
-                var tsDtoLine = DrawDtoLineHelper.DtoLine2XStart(twoStartOption);
-                mapControl1.DrawDtoLine($"[{msat},{nsat}]时差线", tsDtoLine);
-
-
-            }
-            catch (Exception ex)
-            {
-                string msg = $"绘制{info.PosResType.GetEnumDisplayName()}时差线失败.PosID={info.Id},SigTime={info.SigTime}";
-                logger.LogError(ex, msg);
-                DxHelper.MsgBoxHelper.ShowError(msg);
-            }
-        }
-
-        private async void btnEphCalc_Click(object sender, EventArgs e)
-        {
-            dxErrorProvider.ClearErrors();
-            if (this.txtSigTime.DateTime == DateTime.MinValue)
-            {
-                dxErrorProvider.SetError(txtSigTime, "信号时间不能为空!");
-                return;
-            }
-            var sigTime = this.txtSigTime.DateTime;
-            var repsXl = unitOfWork.Of<XlInfo>() as XlRepository;
-            try
-            {
-
-                var mainxlInfo = await repsXl.GetLatestAsync(cg.MainCode.Value, sigTime);
-                if (mainxlInfo == null)
-                {
-                    DxHelper.MsgBoxHelper.ShowWarning($"卫星:{cg.MainCode.Value}未找到对应的星历信息,请导入星历");
-                    return;
-                }
-                var XlCalcDto = new XlCalcDto() { tleStr = mainxlInfo.TwoLine, SigTime = sigTime };
-                var maineph = await HttpHelper.PostRequestAsync<SatEphResDto>(SysConfig.GetUrl("Xl/Calc"), XlCalcDto);
-                ucEphXYZMain.SetXYZ("主星", cg.MainCode.Value, (maineph.data.X, maineph.data.Y, maineph.data.Z), Color.Red);
-
-                var adjaxlInfo = await repsXl.GetLatestAsync(cg.Adja1Code.Value, sigTime);
-                if (adjaxlInfo == null)
-                {
-                    DxHelper.MsgBoxHelper.ShowWarning($"卫星:{cg.Adja1Code.Value}未找到对应的星历信息,请导入星历");
-                    return;
-                }
-                XlCalcDto = new XlCalcDto() { tleStr = adjaxlInfo.TwoLine, SigTime = sigTime };
-                var adjaeph = await HttpHelper.PostRequestAsync<SatEphResDto>(SysConfig.GetUrl("Xl/Calc"), XlCalcDto);
-                ucEphXYZAdaj.SetXYZ("邻星", cg.Adja1Code.Value, (adjaeph.data.X, adjaeph.data.Y, adjaeph.data.Z), Color.Red);
-            }
-            catch (Exception ex)
-            {
-                string msg = $"手动推算{info.PosResType.GetEnumDisplayName()}星历失败,SigTime={sigTime}";
-                logger.LogError(ex, msg);
-                DxHelper.MsgBoxHelper.ShowError(msg);
-            }
-
-
-        }
-
-        private void btnPos_Click(object sender, EventArgs e)
-        {
-            if (!CheckPosParam()) { return; }
-            txtPosRes.Text = " ";
-            try
-            {
-
-                var MsAnt = txtsatStation.GetLonLat();
-                var CDBAnt = txtcdbStation.GetLonLat();
-                var RefGeod = txtRefLocation.GetLonLat();
-                var cxStation = txtCxLocation.GetLonLat();
-
-                var DtoSx = Convert.ToDouble(this.txtDtoSx.Text);
-                var DtoCdb = Convert.ToDouble(this.txtDtoCdb.Text);
-                var YbMainDto = Convert.ToDouble(this.txtYbMain.Text);
-                var YbAdja1Dto = Convert.ToDouble(this.txtYbAdja.Text);
-
-                var cxFx = Convert.ToDouble(this.txtcxFx.Text);
-
-                double[] msEph = ucEphXYZMain.EphXYZ();
-                double[] nsEph = ucEphXYZAdaj.EphXYZ();
-
-                var sigTime = txtSigTime.DateTime;
-                var StationRes = new StationRes()
-                {
-                    SatTxLon = MsAnt[0],
-                    SatTxLat = MsAnt[1],
-                    CdbTxLon = CDBAnt[0],
-                    CdbTxLat = CDBAnt[1],
-                    CxLon = cxStation[0],
-                    CxLat = cxStation[1],
-                    RefLon = RefGeod[0],
-                    RefLat = RefGeod[1],
-                };
-
-
-                var cgRes = new CgRes()
-                {
-                    SigTime = sigTime,
-                    Dto1 = DtoSx,
-                    DtoCdb = DtoCdb,
-                    YbMainDto = YbMainDto,
-                    YbAdja1Dto = YbAdja1Dto,
-                    MainCode = cg.MainCode.Value,
-                    Adja1Code = cg.Adja1Code.Value,
-                    MainX = msEph[0],
-                    MainY = msEph[1],
-                    MainZ = msEph[2],
-                    Adja1X = nsEph[0],
-                    Adja1Y = nsEph[1],
-                    Adja1Z = nsEph[2],
-                };
-                var rhcxRes = new CxRes()
-                {
-                    SigTime = sigTime,
-                    Fx = cxFx,
-                };
-                var res = PosApi.RH_Pos(cgRes, StationRes, rhcxRes, false);
-                this.txtPosRes.Text = $"{info.PosResType.GetEnumDisplayName()}定位点:[{res[0]:f4},{res[1]:f4}] 镜像点:[{res[3]:f4},{res[4]:f4}]";
-
-            }
-            catch (Exception ex)
-            {
-                string msg = $"{info.PosResType.GetEnumDisplayName()}手动定位失败.PosID={info.Id},SigTime={info.SigTime}";
-                logger.LogError(ex, msg);
-                DxHelper.MsgBoxHelper.ShowError(msg);
-            }
-        }
-    }
-}

DW5S.App/EditForms/RHDTOParamEditor.resx

@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <metadata name="dxErrorProvider.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
-</root>

DW5S.App/EditForms/TargetEditor.cs

@@ -14,11 +14,17 @@ using System.Windows.Documents;
 using System.Windows.Forms;
 using DW5S.Entity;
 using DW5S.Repostory;
+using Microsoft.Extensions.Logging;
 
 namespace DW5S.App.EditForms
 {
     public partial class TargetEditor : DevExpress.XtraEditors.XtraForm
     {
+        [Autowired]
+        private readonly ILogger logger;
+
+        [Autowired]
+        private readonly UnitOfWork unitOfWork;
         public TargetInfo info;
 
         List<TargetInfo> infos;
@@ -41,15 +47,13 @@ namespace DW5S.App.EditForms
             if (this.Text == "编辑目标" && info != null)
             {
                 this.txtTarName.Text = info.TargetName;
-               var clolrRes = ColorTranslator.FromHtml(info.TargeColor);
+                var clolrRes = ColorTranslator.FromHtml(info.TargeColor);
                 this.txtTarColor.EditValue = clolrRes;
             }
             infos = new List<TargetInfo>();
-            using (RHDWContext db = new RHDWContext())
-            {
-                var res =await db.TargetInfos.ToListAsync();
-                infos.AddRange(res);
-            }
+            var repsTarget = unitOfWork.Of<TargetInfo>();
+            var res = await repsTarget.GetAllAsync();
+            infos.AddRange(res);
         }
 
         private void btnCancel_Click(object sender, EventArgs e)
@@ -60,26 +64,27 @@ namespace DW5S.App.EditForms
         {
             try
             {
-                string tarName=txtTarName.Text.Trim();
+                string tarName = txtTarName.Text.Trim();
                 if (string.IsNullOrWhiteSpace(tarName))
                 {
                     DxHelper.MsgBoxHelper.ShowError($"目标名称不能为空!");
                     return;
                 }
-                if (infos.Any(i => i.ID != info.ID && i.TargetName == tarName))
+                if (infos.Any(i => i.Id != info.Id && i.TargetName == tarName))
                 {
 
                     DxHelper.MsgBoxHelper.ShowError($"目标名称[{tarName}]已经存在!");
                     return;
                 }
                 info.TargetName = tarName;
-                info.TargeColor=ColorTranslator.ToHtml(txtTarColor.Color);
+                info.TargeColor = ColorTranslator.ToHtml(txtTarColor.Color);
                 this.DialogResult = DialogResult.OK;
             }
             catch (Exception ex)
             {
-                DW5S.Framework.LogHelper.Error("编辑目标信息出错", ex);
-                DxHelper.MsgBoxHelper.ShowError("编辑目标信息出错");
+                string msg = "编辑目标信息出错";
+                logger.LogError(ex, msg);
+                DxHelper.MsgBoxHelper.ShowError(msg);
             }
         }
     }

DW5S.App/EditForms/TaskHistoryTimeEditor.cs

@@ -14,6 +14,7 @@ using System.Windows.Documents;
 using System.Windows.Forms;
 using DW5S.Entity;
 using DW5S.Repostory;
+using Microsoft.Extensions.Logging;
 
 namespace DW5S.App.EditForms
 {
@@ -38,10 +39,10 @@ namespace DW5S.App.EditForms
         }
         private void SatEditor_Load(object sender, EventArgs e)
         {
-            if (cache.ContainsKey(tsk.ID))
+            if (cache.ContainsKey(tsk.Id))
             {
-                txtStartTime.DateTime = cache[tsk.ID].Item1;
-                txtEndTime.DateTime = cache[tsk.ID].Item2;
+                txtStartTime.DateTime = cache[tsk.Id].Item1;
+                txtEndTime.DateTime = cache[tsk.Id].Item2;
             }
             else
             {
@@ -66,10 +67,10 @@ namespace DW5S.App.EditForms
             }
             if (cache.Count >= 50)
                 cache.Remove(cache.First().Key);
-            if (cache.ContainsKey(tsk.ID))
-                cache[tsk.ID] = (start, end);
+            if (cache.ContainsKey(tsk.Id))
+                cache[tsk.Id] = (start, end);
             else
-                cache.Add(tsk.ID, (start, end));
+                cache.Add(tsk.Id, (start, end));
             this.DialogResult = DialogResult.OK;
         }
     }

DW5S.App/ExtensionsDev/DateEditExtension.cs

@@ -14,14 +14,7 @@ namespace ExtensionsDev
     {
         public static DateEdit UseDefault(this DateEdit ctrl, string nullPrompt = "", string format = "yyyy-MM-dd HH:mm:ss")
         {
-            if (string.IsNullOrWhiteSpace(nullPrompt)&& SysConfig.Config!=null)
-            {
-                if (SysConfig.Config==null) return ctrl;
-                ctrl.Properties.NullValuePrompt = SysConfig.Config.TimeZoneUTC;
-                ctrl.ToolTip= SysConfig.Config.TimeZoneUTC;
-            }
-            else
-                ctrl.Properties.NullValuePrompt = nullPrompt;
+            ctrl.Properties.NullValuePrompt = nullPrompt;
             ctrl.Properties.AllowNullInput = DevExpress.Utils.DefaultBoolean.True;
             ctrl.Properties.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime;
             ctrl.Properties.EditFormat.FormatType = DevExpress.Utils.FormatType.DateTime;

DW5S.App/FindRef/PosWithRefFind.cs

@@ -7,12 +7,20 @@ using System.Threading.Tasks;
 using DW5S.DTO;
 using DW5S.Entity;
 using DW5S.Repostory;
+using Microsoft.Extensions.Logging;
+using static DevExpress.Xpo.Helpers.AssociatedCollectionCriteriaHelper;
 
 namespace DW5S.App
 {
 
     public class PosWithRefFind
     {
+        [Autowired]
+        private readonly ILogger logger;
+
+        [Autowired]
+        private readonly UnitOfWork unitOfWork;
+
         /// <summary>
         /// 任务编号
         /// </summary>
@@ -83,7 +91,7 @@ namespace DW5S.App
                     }
                     catch (Exception ex)
                     {
-                        await LogHelper.Error($"【启动任务[{this._taskId}]目标取参考信号缓存异常{ex.Message}", ex);
+                        logger.LogError(ex, $"启动任务[{this._taskId}]目标取参考信号缓存异常");
                     }
 
                 }
@@ -222,7 +230,7 @@ namespace DW5S.App
                     var result = await HttpHelper.PostRequestAsync<PosResDto>(SysConfig.GetUrl("Pos/PosX2D1NoParAsync"), dto22);
                     if (result.code != 200)
                     {
-                        await LogHelper.Error($"找参考任务{dto.TaskID}-{dto.SigTime:yyyy-MM-dd HH:mm:ss}两星一地无参定位失败{result.msg}");
+                        logger.LogError($"找参考任务{dto.TaskID}-{dto.SigTime:yyyy-MM-dd HH:mm:ss}两星一地无参定位失败{result.msg}");
 
                     }
                     else
@@ -236,8 +244,7 @@ namespace DW5S.App
                     var result = await HttpHelper.PostRequestAsync<PosResDto>(SysConfig.GetUrl("Pos/PosX2D1NoXlNoParAsync"), dto);
                     if (result.code != 200)
                     {
-                        await LogHelper.Error($"找参考任务{dto.TaskID}-{dto.SigTime:yyyy-MM-dd HH:mm:ss}两星一地无参定位失败{result.msg}");
-
+                        logger.LogError($"找参考任务{dto.TaskID}-{dto.SigTime:yyyy-MM-dd HH:mm:ss}两星一地无参定位失败{result.msg}");
                     }
                     else
                     {
@@ -248,7 +255,7 @@ namespace DW5S.App
             }
             catch (Exception ex)
             {
-                await LogHelper.Error($"找参考任务{dto.TaskID}-{dto.SigTime:yyyy-MM-dd HH:mm:ss}两星一地无参定位失败{ex.Message}");
+                logger.LogError(ex, $"找参考任务{dto.TaskID}-{dto.SigTime:yyyy-MM-dd HH:mm:ss}两星一地无参定位失败");
             }
 
         }
@@ -323,7 +330,7 @@ namespace DW5S.App
                     var result = await HttpHelper.PostRequestAsync<PosResDto>(SysConfig.GetUrl("Pos/PosX2D1Async"), dto22);
                     if (result.code != 200)
                     {
-                        await LogHelper.Error($"找参考任务{dto.TaskID}-{dto.SigTime:yyyy-MM-dd HH:mm:ss}两星一地定位失败{result.msg}");
+                        logger.LogError($"找参考任务{dto.TaskID}-{dto.SigTime:yyyy-MM-dd HH:mm:ss}两星一地定位失败{result.msg}");
                     }
                     else
                     {
@@ -335,7 +342,7 @@ namespace DW5S.App
                     var result = await HttpHelper.PostRequestAsync<PosResDto>(SysConfig.GetUrl("Pos/PosX2D1NoXlAsync"), dto);
                     if (result.code != 200)
                     {
-                        await LogHelper.Error($"找参考任务{dto.TaskID}-{dto.SigTime:yyyy-MM-dd HH:mm:ss}两星一地定位失败{result.msg}");
+                        logger.LogError($"找参考任务{dto.TaskID}-{dto.SigTime:yyyy-MM-dd HH:mm:ss}两星一地定位失败{result.msg}");
                     }
                     else
                     {
@@ -345,7 +352,7 @@ namespace DW5S.App
             }
             catch (Exception ex)
             {
-                await LogHelper.Error($"找参考任务{dto.TaskID}-{dto.SigTime:yyyy-MM-dd HH:mm:ss}两星一地定位失败{ex.Message}");
+                logger.LogError(ex, $"找参考任务{dto.TaskID}-{dto.SigTime:yyyy-MM-dd HH:mm:ss}两星一地定位失败");
             }
         }
         public async Task ClearCacheAsync(int taskID)
@@ -357,11 +364,11 @@ namespace DW5S.App
                     TaskTarCache.Instance.ClearCache(taskID);
                     TaskRefCache.Instance.ClearCache(taskID);
                 });
-                await LogHelper.Info($"【停止任务[{this._taskId}]目标取参考信号缓存");
             }
             catch (Exception ex)
             {
-                await LogHelper.Error($"【清除任务[{taskID}]目标参考信号缓存异常{ex.Message}", ex);
+                string msg = "清除任务[{taskID}]目标参考信号缓存异常";
+                logger.LogError(ex, msg);
             }
 
 
@@ -376,11 +383,11 @@ namespace DW5S.App
                     TaskTarCache.Instance.ClearAll();
                     TaskRefCache.Instance.ClearAll();
                 });
-                await LogHelper.Info($"【停止所有任务目标取参考信号缓存");
             }
             catch (Exception ex)
             {
-                await LogHelper.Error($"【清除所有目标参考信号缓存异常{ex.Message}", ex);
+                string msg = "清除所有目标参考信号缓存异常";
+                logger.LogError(ex, msg);
             }
 
         }

DW5S.App/LogHelper.cs

@@ -1,94 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using DW5S.DTO;
-using DW5S.Entity;
-using DW5S.Repostory;
-
-namespace DW5S.App
-{
-    public static class LogHelper
-    {
-        public static async Task Info(string msg)
-        {
-            var pro = Process.GetCurrentProcess();
-            try
-            {
-                using (RHDWLogContext db = new RHDWLogContext())
-                {
-                    LogRes res = new LogRes()
-                    {
-                        LogTime = DateTime.Now,
-                        Module = pro.ProcessName,
-                        LogType = EnumLogType.Info,
-                        Msg = msg,
-                    };
-                    db.LogRes.Add(res);
-                    await db.SaveChangesAsync();
-                }
-            }
-            catch (Exception ex)
-            {
-                DW5S.Framework.LogHelper.Error("日志信息写入异常", ex);
-            }
-            DW5S.Framework.LogHelper.Info(msg);
-        }
-        public static async Task Warning(string msg, Exception ex = null)
-        {
-            var pro = Process.GetCurrentProcess();
-            try
-            {
-                using (RHDWLogContext db = new RHDWLogContext())
-                {
-                    LogRes res = new LogRes()
-                    {
-                        LogTime = DateTime.Now,
-                        Module = pro.ProcessName,
-                        LogType = EnumLogType.Warning,
-                        Msg = msg,
-                    };
-                    db.LogRes.Add(res);
-                    await db.SaveChangesAsync();
-                }
-            }
-            catch (Exception arg)
-            {
-                DW5S.Framework.LogHelper.Error("日志信息写入异常", arg);
-            }
-            DW5S.Framework.LogHelper.Warning(msg, ex);
-        }
-        public static async Task Error(string msg, Exception ex = null)
-        {
-            if (ex != null && ex.GetType() == typeof(AggregateException))
-            {
-                var iex = (ex as AggregateException).InnerExceptions.FirstOrDefault();
-                if (iex != null)
-                    ex = iex;
-            }
-            var pro = Process.GetCurrentProcess();
-            try
-            {
-                using (RHDWLogContext db = new RHDWLogContext())
-                {
-                    LogRes res = new LogRes()
-                    {
-                        LogTime = DateTime.Now,
-                        Module = pro.ProcessName,
-                        LogType = EnumLogType.Error,
-                        Msg = msg,
-                    };
-                    db.LogRes.Add(res);
-                    await db.SaveChangesAsync();
-                }
-            }
-            catch (Exception arg)
-            {
-                DW5S.Framework.LogHelper.Error("日志信息写入异常", arg);
-            }
-            DW5S.Framework.LogHelper.Error(msg, ex);
-        }
-    }
-}

DW5S.App/Model/ModelPosRes.cs

@@ -26,7 +26,7 @@ namespace DW5S.App.Model
 
         public override int GetHashCode()
         {
-            return $"ModelPosRes_{TaskInfoID}_{ID}".GetHashCode();
+            return $"ModelPosRes_{TaskInfoID}_{Id}".GetHashCode();
         }
     }
 }

DW5S.App/PopupControl/ShowCgCtrl.cs

@@ -48,86 +48,83 @@ namespace DW5S.App.PopupControl
 
             sats = (await repsSat.GetAllAsync()).ToList();
             List<ModelCg> list = new List<ModelCg>();
-            using (RHDWPartContext db = RHDWPartContext.GetContext(posItem.SigTime))
-            {
-                if (db == null) return;
-                var cgEntity = db.CgRes.Where(p => p.ID == posItem.CgResID).FirstOrDefault();
-                if (cgEntity == null) return;
+            var repsCg = unitOfWork.Of<CgRes>();
+            var cgEntity = await repsCg.FirstOrDefaultAsync(p => p.Id == posItem.CgResID);
+            if (cgEntity == null) return;
 
-                //主邻1
-                if (cgEntity.Adja1Code != null)
+            //主邻1
+            if (cgEntity.Adja1Code != null)
+            {
+                ModelCg item = new ModelCg()
                 {
-                    ModelCg item = new ModelCg()
-                    {
-                        ID = cgEntity.ID,
-                        CreateTime = cgEntity.CreateTime,
-                        UpdateTime = cgEntity.UpdateTime,
-                        SigTime = cgEntity.SigTime,
-                        Dto = cgEntity.Dto1,
-                        Dfo = cgEntity.Dfo1,
-                        Snr = cgEntity.Snr1,
-                        MainSat = cgEntity.MainCode?.ToString(),
-                        AdjaSat = cgEntity.Adja1Code.ToString(),
-                        CgType = 0,
-                    };
+                    Id = cgEntity.Id,
+                    CreateTime = cgEntity.CreateTime,
+                    UpdateTime = cgEntity.UpdateTime,
+                    SigTime = cgEntity.SigTime,
+                    Dto = cgEntity.Dto1,
+                    Dfo = cgEntity.Dfo1,
+                    Snr = cgEntity.Snr1,
+                    MainSat = cgEntity.MainCode?.ToString(),
+                    AdjaSat = cgEntity.Adja1Code.ToString(),
+                    CgType = 0,
+                };
 
-                    var find = sats.Find(p => p.SatCode == cgEntity.MainCode.Value);
-                    if (find != null)
-                        item.MainSat = find.Sat;
-                    find = sats.Find(p => p.SatCode == cgEntity.Adja1Code.Value);
-                    if (find != null)
-                        item.AdjaSat = find.Sat;
-                    list.Add(item);
-                }
-                //主邻2
-                if (cgEntity.Adja2Code != null)
+                var find = sats.Find(p => p.SatCode == cgEntity.MainCode.Value);
+                if (find != null)
+                    item.MainSat = find.Sat;
+                find = sats.Find(p => p.SatCode == cgEntity.Adja1Code.Value);
+                if (find != null)
+                    item.AdjaSat = find.Sat;
+                list.Add(item);
+            }
+            //主邻2
+            if (cgEntity.Adja2Code != null)
+            {
+                ModelCg item = new ModelCg()
                 {
-                    ModelCg item = new ModelCg()
-                    {
-                        Id = cgEntity.ID,
-                        CreateTime = cgEntity.CreateTime,
-                        UpdateTime = cgEntity.UpdateTime,
-                        SigTime = cgEntity.SigTime,
-                        Dto = cgEntity.Dto2,
-                        Dfo = cgEntity.Dfo2,
-                        Snr = cgEntity.Snr2,
-                        MainSat = cgEntity.MainCode?.ToString(),
-                        AdjaSat = cgEntity.Adja2Code.ToString(),
-                        CgType = 1,
-                    };
+                    Id = cgEntity.Id,
+                    CreateTime = cgEntity.CreateTime,
+                    UpdateTime = cgEntity.UpdateTime,
+                    SigTime = cgEntity.SigTime,
+                    Dto = cgEntity.Dto2,
+                    Dfo = cgEntity.Dfo2,
+                    Snr = cgEntity.Snr2,
+                    MainSat = cgEntity.MainCode?.ToString(),
+                    AdjaSat = cgEntity.Adja2Code.ToString(),
+                    CgType = 1,
+                };
 
-                    var find = sats.Find(p => p.SatCode == cgEntity.MainCode.Value);
-                    if (find != null)
-                        item.MainSat = find.Sat;
-                    find = sats.Find(p => p.SatCode == cgEntity.Adja2Code.Value);
-                    if (find != null)
-                        item.AdjaSat = find.Sat;
-                    list.Add(item);
-                }
-                //超短
-                if (cgEntity.DtoCdb != null)
+                var find = sats.Find(p => p.SatCode == cgEntity.MainCode.Value);
+                if (find != null)
+                    item.MainSat = find.Sat;
+                find = sats.Find(p => p.SatCode == cgEntity.Adja2Code.Value);
+                if (find != null)
+                    item.AdjaSat = find.Sat;
+                list.Add(item);
+            }
+            //超短
+            if (cgEntity.DtoCdb != null)
+            {
+                ModelCg item = new ModelCg()
                 {
-                    ModelCg item = new ModelCg()
-                    {
-                        Id = cgEntity.ID,
-                        CreateTime = cgEntity.CreateTime,
-                        UpdateTime = cgEntity.UpdateTime,
-                        SigTime = cgEntity.SigTime,
-                        Dto = cgEntity.DtoCdb,
-                        Dfo = cgEntity.DfoCdb,
-                        Snr = cgEntity.SnrCdb,
-                        MainSat = cgEntity.MainCode?.ToString(),
-                        AdjaSat = "超短站",
-                        CgType = 2,
-                    };
-
-                    var find = sats.Find(p => p.SatCode == cgEntity.MainCode.Value);
-                    if (find != null)
-                        item.MainSat = find.Sat;
-                    list.Add(item);
-                }
+                    Id = cgEntity.Id,
+                    CreateTime = cgEntity.CreateTime,
+                    UpdateTime = cgEntity.UpdateTime,
+                    SigTime = cgEntity.SigTime,
+                    Dto = cgEntity.DtoCdb,
+                    Dfo = cgEntity.DfoCdb,
+                    Snr = cgEntity.SnrCdb,
+                    MainSat = cgEntity.MainCode?.ToString(),
+                    AdjaSat = "超短站",
+                    CgType = 2,
+                };
 
+                var find = sats.Find(p => p.SatCode == cgEntity.MainCode.Value);
+                if (find != null)
+                    item.MainSat = find.Sat;
+                list.Add(item);
             }
+
             this.listCg.Clear();
             this.listCg.AddRange(list);
         }
@@ -137,22 +134,18 @@ namespace DW5S.App.PopupControl
             var cgItem = e.Row as ModelCg;
             if (cgItem != null)
             {
-                using (RHDWPartContext db = RHDWPartContext.GetContext(cgItem.SigTime))
+                var repsCgXgf = unitOfWork.Of<CgXgfRes>();
+
+                var data = await repsCgXgf.FindAsync(p => p.CgResID == cgItem.Id && p.CgType == cgItem.CgType);
+                listXgf.AddRange(data.Select(p => new ModelCgXgf
                 {
-                    if (db != null)
-                    {
-                        var data = await db.CgXgfRes.Where(p => p.CgResID == cgItem.ID && p.CgType == cgItem.CgType).ToListAsync();
-                        listXgf.AddRange(data.Select(p => new ModelCgXgf
-                        {
-                            Id = p.ID,
-                            Dto = p.Dto,
-                            Dfo = p.Dfo,
-                            Snr = p.Snr,
-                            CreateTime = p.CreateTime,
-                            UpdateTime = p.UpdateTime,
-                        }));
-                    }
-                }
+                    Id = p.Id,
+                    Dto = p.Dto,
+                    Dfo = p.Dfo,
+                    Snr = p.Snr,
+                    CreateTime = p.CreateTime,
+                    UpdateTime = p.UpdateTime,
+                }));
                 //查询相关峰结果
             }
             this.gridView2.RefreshData();

DW5S.App/PopupControl/ShowCheckCtrl.Designer.cs

@@ -50,7 +50,6 @@
             this.gridView1.GridControl = this.gridShowCheck;
             this.gridView1.Name = "gridView1";
             this.gridView1.CustomDrawEmptyForeground += new DevExpress.XtraGrid.Views.Base.CustomDrawEventHandler(this.gridView1_CustomDrawEmptyForeground);
-            this.gridView1.CustomColumnDisplayText += new DevExpress.XtraGrid.Views.Base.CustomColumnDisplayTextEventHandler(this.gridView1_CustomColumnDisplayText);
             // 
             // ShowCheckCtrl
             // 

DW5S.App/PopupControl/ShowCheckCtrl.cs

@@ -13,11 +13,18 @@ using System.Windows.Forms;
 using DW5S.App.Model;
 using DW5S.Entity;
 using DW5S.Repostory;
+using Microsoft.Extensions.Logging;
 
 namespace DW5S.App.PopupControl
 {
     public partial class ShowCheckCtrl : DevExpress.XtraEditors.XtraUserControl
     {
+        [Autowired]
+        private readonly ILogger logger;
+
+        [Autowired]
+        private readonly UnitOfWork unitOfWork;
+
         PosRes posItem;
         List<CheckRes> list = new List<CheckRes>();
         public ShowCheckCtrl()
@@ -34,12 +41,9 @@ namespace DW5S.App.PopupControl
         {
             if (posItem.CheckResID == null)//没有检测结果
                 return;
-            using (RHDWPartContext db = RHDWPartContext.GetContext(posItem.SigTime))
-            {
-                if (db == null) return;
-                var items = await db.CheckRes.Where(p => p.ID == posItem.CheckResID).ToListAsync();
-                this.list.AddRange(items);
-            }
+            var repsCheck = unitOfWork.Of<CheckRes>();
+            var items = await repsCheck.FindAsync(p => p.Id == posItem.CheckResID);
+            this.list.AddRange(items);
             gridView1.RefreshData();
         }
 
@@ -55,11 +59,5 @@ namespace DW5S.App.PopupControl
                 e.Appearance.DrawString(e.Cache, txt, new Rectangle(x, y, s.Width, s.Height));
             }
         }
-
-        private void gridView1_CustomColumnDisplayText(object sender, DevExpress.XtraGrid.Views.Base.CustomColumnDisplayTextEventArgs e)
-        {
-            if (e.Value == null)
-                e.DisplayText = "--";
-        }
     }
 }

DW5S.App/PopupControl/ShowCxCtrl.cs

@@ -13,11 +13,18 @@ using System.Windows.Forms;
 using DW5S.App.Model;
 using DW5S.Entity;
 using DW5S.Repostory;
+using Microsoft.Extensions.Logging;
 
 namespace DW5S.App.PopupControl
 {
     public partial class ShowCxCtrl : DevExpress.XtraEditors.XtraUserControl
     {
+        [Autowired]
+        private readonly ILogger logger;
+
+        [Autowired]
+        private readonly UnitOfWork unitOfWork;
+
         PosRes posItem;
         List<CxRes> list = new List<CxRes>();
         public ShowCxCtrl()
@@ -32,12 +39,9 @@ namespace DW5S.App.PopupControl
         }
         private async void ShowCxCtrl_Load(object sender, EventArgs e)
         {
-            using (RHDWPartContext db = RHDWPartContext.GetContext(posItem.SigTime))
-            {
-                if (db == null) return;
-                var items = await db.CxRes.Where(p => p.ID == posItem.CxResID).ToListAsync();
-                this.list.AddRange(items);
-            }
+            var repsCx = unitOfWork.Of<CxRes>();
+            var items =await repsCx.FindAsync(p => p.Id == posItem.CxResID);
+            this.list.AddRange(items);
             gridView1.RefreshData();
         }
     }

DW5S.App/UserControl/CtrlHome.cs

@@ -250,7 +250,7 @@ namespace DW5S.App.UserControl
                    }
                    catch (Exception ex)
                    {
-                       _ = LogHelper.Error("刷新定位点出错", ex);
+                       logger.LogError(ex, "刷新定位点出错");
                    }
                    finally
                    {
@@ -992,8 +992,6 @@ namespace DW5S.App.UserControl
                     DxHelper.PopupHelper.ShowPopup(X2Dfofrm, layoutControl1, 600);
                     break;
                 case EnumPosResType.RH:
-                    RHDTOParamEditor Rhfrm = new RHDTOParamEditor(item, mapControl1);
-                    DxHelper.PopupHelper.ShowPopup(Rhfrm, layoutControl1, 600);
                     break;
                 default:
                     break;
@@ -1034,9 +1032,6 @@ namespace DW5S.App.UserControl
                         DxHelper.PopupHelper.ShowPopup(x2DFGdopParam, layoutControl1, 600);
                         break;
                     case EnumPosResType.RH:
-                        RHGDOPParam rhGdopParam = new RHGDOPParam(item);
-                        rhGdopParam.mapControl1 = mapControl1;
-                        DxHelper.PopupHelper.ShowPopup(rhGdopParam, layoutControl1, 600);
                         break;
                     default:
                         break;

DW5S.App/UserControl/CtrlRecTx.cs

@@ -9,11 +9,18 @@ using System.Windows.Forms;
 using DW5S.App.EditForms;
 using DW5S.Entity;
 using DW5S.Repostory;
+using Microsoft.Extensions.Logging;
 
 namespace DW5S.App.UserControl
 {
     public partial class CtrlRecTx : DevExpress.XtraEditors.XtraUserControl
     {
+        [Autowired]
+        private readonly ILogger logger;
+
+        [Autowired]
+        private readonly UnitOfWork unitOfWork;
+
         readonly List<TxInfo> list = new List<TxInfo>();
         public CtrlRecTx()
         {
@@ -27,16 +34,15 @@ namespace DW5S.App.UserControl
                     .UseAddAsync(Add)
                     .UseEditAsync<TxInfo>(Edit)
                     .UseDeleteAsync<TxInfo>(Delete);
-                using (var db = new RHDWContext())
-                {
-                    var items = await db.RecTxInfos.OrderBy(p => p.Name).ToListAsync();
-                    list.AddRange(items);
-                }
+                var repsTx = unitOfWork.Of<TxInfo>();
+                var items = await repsTx.FindAsync(p=>p.TxType== EnumTxType.Rec,p=>p.Name);
+                list.AddRange(items);
             }
             catch (Exception ex)
             {
-                await LogHelper.Error("查询接收站信息异常", ex);
-                DxHelper.MsgBoxHelper.ShowError("查询接收站信息异常");
+                string msg = "查询接收站信息异常";
+                logger.LogError(ex, msg);
+                DxHelper.MsgBoxHelper.ShowError(msg);
             }
         }
 
@@ -57,8 +63,9 @@ namespace DW5S.App.UserControl
             }
             catch (Exception ex)
             {
-                DW5S.Framework.LogHelper.Error("添加接收站信息异常", ex);
-                DxHelper.MsgBoxHelper.ShowError("添加接收站信息异常");
+                string msg = "添加接收站信息异常";
+                logger.LogError(ex, msg);
+                DxHelper.MsgBoxHelper.ShowError(msg);
                 return null;
             }
         }
@@ -83,8 +90,9 @@ namespace DW5S.App.UserControl
             }
             catch (Exception ex)
             {
-                DW5S.Framework.LogHelper.Error("保存接收站信息异常", ex);
-                DxHelper.MsgBoxHelper.ShowError("保存接收站信息异常");
+                string msg = "保存接收站信息异常";
+                logger.LogError(ex, msg);
+                DxHelper.MsgBoxHelper.ShowError(msg);
                 return null;
             }
         }
@@ -93,19 +101,17 @@ namespace DW5S.App.UserControl
         {
             try
             {
-                var ids = list.Select(p => p.ID);
-                using (RHDWContext db = new RHDWContext())
-                {
-                    var delItems = await db.RecTxInfos.Where(p => ids.Contains(p.ID)).ToListAsync();
-                    db.RecTxInfos.RemoveRange(delItems);
-                    await db.SaveChangesAsync();
-                }
+                var repsTx = unitOfWork.Of<TxInfo>();
+                await repsTx.DeleteAsync(list);
+                await unitOfWork.SaveAsync();
                 return true;
             }
             catch (Exception ex)
             {
-                DW5S.Framework.LogHelper.Error("删除接收站信息异常", ex);
-                DxHelper.MsgBoxHelper.ShowError("删除接收站信息异常");
+
+                string msg = "删除接收站信息异常";
+                logger.LogError(ex, msg);
+                DxHelper.MsgBoxHelper.ShowError(msg);
                 return false;
             }
         }

DW5S.App/UserControl/CtrlSat.cs

@@ -40,8 +40,9 @@ namespace DW5S.App.UserControl
             }
             catch (Exception ex)
             {
-                await LogHelper.Error("查询卫星信息异常", ex);
-                DxHelper.MsgBoxHelper.ShowError("查询卫星信息异常");
+                string msg = "查询卫星信息异常";
+                logger.LogError(ex, msg);
+                DxHelper.MsgBoxHelper.ShowError(msg);
             }
         }
 

DW5S.App/UserControl/CtrlTarget.cs

@@ -16,11 +16,18 @@ using System.Windows.Forms;
 using DW5S.App.EditForms;
 using DW5S.Entity;
 using DW5S.Repostory;
+using Microsoft.Extensions.Logging;
 
 namespace DW5S.App.UserControl
 {
     public partial class CtrlTarget : DevExpress.XtraEditors.XtraUserControl
     {
+        [Autowired]
+        private readonly ILogger logger;
+
+        [Autowired]
+        private readonly UnitOfWork unitOfWork;
+
         readonly List<TargetInfo> list = new List<TargetInfo>();
         public CtrlTarget()
         {
@@ -33,17 +40,16 @@ namespace DW5S.App.UserControl
                 gridTar.UseDefault(list).UseMultiSelect().UseRowNumber()
                     .UseAddAsync(Add).UseEditAsync<TargetInfo>(Edit).UseDeleteAsync<TargetInfo>(Del);
 
-                using (RHDWContext db = new RHDWContext())
-                {
-                    var res = db.TargetInfos.OrderBy(p => p.TargetName).OrderBy(p => p.TargetName);
-                    list.AddRange(await res.ToListAsync());
-                }
+                var repsTarget = unitOfWork.Of<TargetInfo>();
+                var res = await repsTarget.GetAllAsync(p => p.TargetName);
+                list.AddRange(res);
                 gridView1.RefreshData();
             }
             catch (Exception ex)
             {
-                DW5S.Framework.LogHelper.Error("查询目标信息异常", ex);
-                DxHelper.MsgBoxHelper.ShowError("查询目标信息异常");
+                string msg = "查询目标信息异常";
+                logger.LogError(ex, msg);
+                DxHelper.MsgBoxHelper.ShowError(msg);
             }
         }
 
@@ -54,17 +60,16 @@ namespace DW5S.App.UserControl
                 TargetEditor frm = new TargetEditor();
                 if (frm.ShowDialog() != DialogResult.OK) return null;
                 var addItem = frm.info;
-                using (RHDWContext db = new RHDWContext())
-                {
-                    db.TargetInfos.Add(addItem);
-                    await db.SaveChangesAsync();
-                }
+                var repsTarget = unitOfWork.Of<TargetInfo>();
+                await repsTarget.AddOrUpdateAsync(addItem);
+                await unitOfWork.SaveAsync();
                 return addItem;
             }
             catch (Exception ex)
             {
-                DW5S.Framework.LogHelper.Error("添加目标信息异常", ex);
-                DxHelper.MsgBoxHelper.ShowError("添加目标信息异常");
+                string msg = "";
+                logger.LogError(ex, msg);
+                DxHelper.MsgBoxHelper.ShowError(msg);
                 return null;
             }
         }
@@ -75,20 +80,20 @@ namespace DW5S.App.UserControl
                 TargetEditor frm = new TargetEditor(editItem);
                 if (frm.ShowDialog() != DialogResult.OK) return null;
                 editItem = frm.info;
-                using (RHDWContext db = new RHDWContext())
-                {
-                    var find = await db.TargetInfos.Where(p => p.ID == editItem.ID).FirstOrDefaultAsync();
-                    find.TargetName = editItem.TargetName;
-                    find.TargeColor = editItem.TargeColor;
-                    find.UpdateTime = DateTime.Now;
-                    await db.SaveChangesAsync();
-                }
+                var repsTarget = unitOfWork.Of<TargetInfo>();
+                var find = await repsTarget.FirstOrDefaultAsync(p => p.Id == editItem.Id);
+                find.TargetName = editItem.TargetName;
+                find.TargeColor = editItem.TargeColor;
+                find.UpdateTime = DateTime.Now;
+                await repsTarget.AddOrUpdateAsync(find);
+                await unitOfWork.SaveAsync();
                 return editItem;
             }
             catch (Exception ex)
             {
-                DW5S.Framework.LogHelper.Error("保存目标信息异常", ex);
-                DxHelper.MsgBoxHelper.ShowError("保存目标信息异常");
+                string msg = "保存目标信息异常";
+                logger.LogError(ex, msg);
+                DxHelper.MsgBoxHelper.ShowError(msg);
                 return null;
             }
         }
@@ -96,20 +101,17 @@ namespace DW5S.App.UserControl
         {
             try
             {
-
-                var ids = list.Select(p => p.ID);
-                using (RHDWContext db = new RHDWContext())
-                {
-                    var delItems = await db.TargetInfos.Where(p => ids.Contains(p.ID)).ToListAsync();
-                    db.TargetInfos.RemoveRange(delItems);
-                    await db.SaveChangesAsync();
-                }
+                var ids = list.Select(p => p.Id);
+                var repsTarget = unitOfWork.Of<TargetInfo>();
+                await repsTarget.DeleteAsync(list);
+                await unitOfWork.SaveAsync();
                 return true;
             }
             catch (Exception ex)
             {
-                DW5S.Framework.LogHelper.Error("删除目标信息异常", ex);
-                DxHelper.MsgBoxHelper.ShowError("删除目标信息异常");
+                string msg = "删除目标信息异常";
+                logger.LogError(ex,msg);
+                DxHelper.MsgBoxHelper.ShowError(msg);
                 return false;
             }
         }

DW5S.App/UserControl/CtrlXl.cs

@@ -13,11 +13,20 @@ using DW5S.App.CorTools;
 using DW5S.DTO;
 using DW5S.Entity;
 using DW5S.Repostory;
+using Microsoft.Extensions.Logging;
+using static DevExpress.Xpo.Helpers.AssociatedCollectionCriteriaHelper;
 
 namespace DW5S.App.UserControl
 {
     public partial class CtrlXl : DevExpress.XtraEditors.XtraUserControl
     {
+        [Autowired]
+        private readonly ILogger logger;
+
+        [Autowired]
+        private readonly UnitOfWork unitOfWork;
+
+
         List<XlInfo> list = new List<XlInfo>();
         int maxCount = 0;
         int maxPage = 0;
@@ -28,15 +37,15 @@ namespace DW5S.App.UserControl
             InitializeComponent();
             this.layoutControl1.UseDefault();
             btnOpen.UseChooseFile().UseDoubleClickToSelectAll();
-            var sat = XlRepository.GetAllSat().Result;
-            txtSat.UseDefault("不限制", true).SetData(sat, nameof(SatInfo.Sat));
+
         }
 
         private async void TxtSat_EditValueChanged(object sender, EventArgs e)
         {
             var sat = txtSat.EditValue as SatInfo;
             satCode = sat?.SatCode;
-            this.maxCount = await XlRepository.GetCount(satCode);
+            var repsXl = unitOfWork.Of<XlInfo>() as XlRepository;
+            this.maxCount = await repsXl.GetCount(satCode);
             var countPerPage = Convert.ToInt32(txtCountPerPage.Text);
             this.maxPage = maxCount / countPerPage;
             if (maxCount % countPerPage != 0)
@@ -49,6 +58,10 @@ namespace DW5S.App.UserControl
 
         private async void CtrlXl_Load(object sender, EventArgs e)
         {
+            var repsXl = unitOfWork.Of<XlInfo>() as XlRepository;
+            var sat = await repsXl.GetAllSat();
+            txtSat.UseDefault("不限制", true).SetData(sat, nameof(SatInfo.Sat));
+
             gridXl.UseDefault(list).UseRowNumber().UseDeleteAsync<XlInfo>(Del)
                 .UseClearAsync<XlInfo>(Clear).UseExportXlsx()
             .AddMenu("星历推算", SvgHelper.LoadFromFile("Image\\XlCalc.svg"), () =>
@@ -83,7 +96,8 @@ namespace DW5S.App.UserControl
         {
             try
             {
-                this.maxCount = await XlRepository.GetCount(satCode);
+                var repsXl = unitOfWork.Of<XlInfo>() as XlRepository;
+                this.maxCount = await repsXl.GetCount(satCode);
                 var countPerPage = Convert.ToInt32(txtCountPerPage.Text);
                 this.maxPage = maxCount / countPerPage;
                 if (maxCount % countPerPage != 0)
@@ -92,13 +106,15 @@ namespace DW5S.App.UserControl
             }
             catch (Exception ex)
             {
-                await LogHelper.Error("加载星历信息异常", ex);
-                DxHelper.MsgBoxHelper.ShowError("加载星历信息异常");
+                string msg = "加载星历信息异常";
+                logger.LogError(ex, msg);
+                DxHelper.MsgBoxHelper.ShowError(msg);
             }
         }
         private async Task LoadPageData(int currentPage)
         {
-            var dtResult = await XlRepository.GetPageAsync(currentPage, Convert.ToInt32(txtCountPerPage.Text), satCode);
+            var repsXl = unitOfWork.Of<XlInfo>() as XlRepository;
+            var dtResult = await repsXl.GetPageAsync(currentPage, Convert.ToInt32(txtCountPerPage.Text), satCode);
             list.Clear();
             list.AddRange(dtResult);
             gridView1.RefreshData();
@@ -116,7 +132,6 @@ namespace DW5S.App.UserControl
             this.layoutControl1.Enabled = false;
             if (string.IsNullOrEmpty(btnOpen.Text))
             {
-                DW5S.Framework.LogHelper.Warning($"请选择星历文件");
                 DxHelper.MsgBoxHelper.ShowInfo($"请选择星历文件");
                 this.layoutControl1.Enabled = true;
                 return;
@@ -129,8 +144,9 @@ namespace DW5S.App.UserControl
             catch (Exception ex)
             {
                 layoutControl1.Enabled = true;
-                DW5S.Framework.LogHelper.Error(ex.Message, ex);
-                DxHelper.MsgBoxHelper.ShowError(ex.Message);
+                string msg = "上传星历文件异常";
+                logger.LogError(ex, msg);
+                DxHelper.MsgBoxHelper.ShowError(msg);
                 return;
             }
             try
@@ -144,19 +160,15 @@ namespace DW5S.App.UserControl
                 }
                 else
                 {
-                    DW5S.Framework.LogHelper.Error(result.msg);
-                    DxHelper.MsgBoxHelper.ShowError($"星历导入失败,{result.msg}!");
+                    logger.LogError(result.msg);
+                    DxHelper.MsgBoxHelper.ShowError(result.msg);
                 }
             }
-            catch (TaskCanceledException)
-            {
-                DW5S.Framework.LogHelper.Warning($"星历导入超时");
-                DxHelper.MsgBoxHelper.ShowInfo($"星历导入超时");
-                return;
-            }
             catch (Exception ex)
             {
-                DW5S.Framework.LogHelper.Error("星历导入异常", ex);
+                string msg = "星历导入异常";
+                logger.LogError(ex, msg);
+                DxHelper.MsgBoxHelper.ShowError(msg);
             }
             this.layoutControl1.Enabled = true;
 
@@ -168,20 +180,17 @@ namespace DW5S.App.UserControl
             try
             {
                 this.Enabled = false;
-                var ids = list.Select(p => p.ID);
-                using (RHDWContext db = new RHDWContext())
-                {
-                    var delItems = await db.XlInfos.Where(p => ids.Contains(p.ID)).ToListAsync();
-                    db.XlInfos.RemoveRange(delItems);
-                    await db.SaveChangesAsync();
-                }
+                var repsXl = unitOfWork.Of<XlInfo>();
+                await repsXl.DeleteAsync(list);
+                await unitOfWork.SaveAsync();
                 await LoadData(1);
                 return true;
             }
             catch (Exception ex)
             {
-                DW5S.Framework.LogHelper.Error("删除选中的星历时异常", ex);
-                DxHelper.MsgBoxHelper.ShowError("删除选中的星历时异常");
+                string msg = "删除选中的星历时异常";
+                logger.LogError(ex, msg);
+                DxHelper.MsgBoxHelper.ShowError(msg);
                 return false;
             }
             finally
@@ -191,29 +200,20 @@ namespace DW5S.App.UserControl
         }
         private async Task<bool> Clear(List<XlInfo> list)
         {
-
             try
             {
                 this.Enabled = false;
-                using (RHDWContext db = new RHDWContext())
-                {
-                    if (satCode == null)
-                    {
-                        db.XlInfos.RemoveRange(db.XlInfos);
-                    }
-                    else
-                    {
-                        db.XlInfos.RemoveRange(db.XlInfos.Where(p => p.SatCode == satCode.Value));
-                    }
-                    await db.SaveChangesAsync();
-                }
+                var repsXl = unitOfWork.Of<XlInfo>();
+                await repsXl.DeleteAsync(list);
+                await unitOfWork.SaveAsync();
                 await LoadData(1);
                 return true;
             }
             catch (Exception ex)
             {
-                DW5S.Framework.LogHelper.Error("清空星历时异常", ex);
-                DxHelper.MsgBoxHelper.ShowError("清空星历时异常");
+                string msg = "清空星历时异常";
+                logger.LogError(ex, msg);
+                DxHelper.MsgBoxHelper.ShowError(msg);
                 return false;
             }
             finally

DW5S.App/UserControl/RHGDOPParam.Designer.cs

@@ -1,462 +0,0 @@
-namespace DW5S.App.UserControl
-{
-    partial class RHGDOPParam
-    {
-        /// <summary> 
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary> 
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Component Designer generated code
-
-        /// <summary> 
-        /// Required method for Designer support - do not modify 
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.components = new System.ComponentModel.Container();
-            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
-            this.layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
-            this.ucEphXYZAdja = new DW5S.App.UserControl.UCEphXYZParam();
-            this.ucEphXYZMain = new DW5S.App.UserControl.UCEphXYZParam();
-            this.btnOK = new DevExpress.XtraEditors.SimpleButton();
-            this.txtCapTime = new DevExpress.XtraEditors.DateEdit();
-            this.txtStationLocation1 = new DevExpress.XtraEditors.TextEdit();
-            this.txtRefLocation1 = new DevExpress.XtraEditors.TextEdit();
-            this.txtDtousErr1 = new DevExpress.XtraEditors.ButtonEdit();
-            this.txtSatLocErr1 = new DevExpress.XtraEditors.ButtonEdit();
-            this.btnClose = new DevExpress.XtraEditors.SimpleButton();
-            this.btnEphCalc = new DevExpress.XtraEditors.SimpleButton();
-            this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
-            this.itemSigTime = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.emptySpaceItem1 = new DevExpress.XtraLayout.EmptySpaceItem();
-            this.emptySpaceItem2 = new DevExpress.XtraLayout.EmptySpaceItem();
-            this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.dxErrorProvider = new DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider(this.components);
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).BeginInit();
-            this.layoutControl1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.txtCapTime.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtCapTime.Properties.CalendarTimeProperties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtStationLocation1.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtRefLocation1.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtDtousErr1.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtSatLocErr1.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.itemSigTime)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem2)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.dxErrorProvider)).BeginInit();
-            this.SuspendLayout();
-            // 
-            // layoutControl1
-            // 
-            this.layoutControl1.Controls.Add(this.ucEphXYZAdja);
-            this.layoutControl1.Controls.Add(this.ucEphXYZMain);
-            this.layoutControl1.Controls.Add(this.btnOK);
-            this.layoutControl1.Controls.Add(this.txtCapTime);
-            this.layoutControl1.Controls.Add(this.txtStationLocation1);
-            this.layoutControl1.Controls.Add(this.txtRefLocation1);
-            this.layoutControl1.Controls.Add(this.txtDtousErr1);
-            this.layoutControl1.Controls.Add(this.txtSatLocErr1);
-            this.layoutControl1.Controls.Add(this.btnClose);
-            this.layoutControl1.Controls.Add(this.btnEphCalc);
-            this.layoutControl1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.layoutControl1.Location = new System.Drawing.Point(0, 0);
-            this.layoutControl1.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
-            this.layoutControl1.Name = "layoutControl1";
-            this.layoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(993, 379, 650, 400);
-            this.layoutControl1.Root = this.Root;
-            this.layoutControl1.Size = new System.Drawing.Size(484, 530);
-            this.layoutControl1.TabIndex = 0;
-            this.layoutControl1.Text = "layoutControl1";
-            // 
-            // ucEphXYZAdja
-            // 
-            this.ucEphXYZAdja.Location = new System.Drawing.Point(2, 94);
-            this.ucEphXYZAdja.Name = "ucEphXYZAdja";
-            this.ucEphXYZAdja.Size = new System.Drawing.Size(480, 88);
-            this.ucEphXYZAdja.TabIndex = 15;
-            // 
-            // ucEphXYZMain
-            // 
-            this.ucEphXYZMain.Location = new System.Drawing.Point(2, 2);
-            this.ucEphXYZMain.Name = "ucEphXYZMain";
-            this.ucEphXYZMain.Size = new System.Drawing.Size(480, 88);
-            this.ucEphXYZMain.TabIndex = 14;
-            // 
-            // btnOK
-            // 
-            this.btnOK.Location = new System.Drawing.Point(330, 410);
-            this.btnOK.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
-            this.btnOK.Name = "btnOK";
-            this.btnOK.Size = new System.Drawing.Size(150, 22);
-            this.btnOK.StyleController = this.layoutControl1;
-            this.btnOK.TabIndex = 12;
-            this.btnOK.Text = "确定";
-            this.btnOK.Click += new System.EventHandler(this.btnOK_Click);
-            // 
-            // txtCapTime
-            // 
-            this.txtCapTime.EditValue = null;
-            this.txtCapTime.Location = new System.Drawing.Point(4, 203);
-            this.txtCapTime.Margin = new System.Windows.Forms.Padding(2);
-            this.txtCapTime.MaximumSize = new System.Drawing.Size(0, 22);
-            this.txtCapTime.MinimumSize = new System.Drawing.Size(0, 22);
-            this.txtCapTime.Name = "txtCapTime";
-            this.txtCapTime.Properties.AutoHeight = false;
-            this.txtCapTime.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.txtCapTime.Properties.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.txtCapTime.Size = new System.Drawing.Size(476, 22);
-            this.txtCapTime.StyleController = this.layoutControl1;
-            this.txtCapTime.TabIndex = 8;
-            // 
-            // txtStationLocation1
-            // 
-            this.txtStationLocation1.EditValue = "";
-            this.txtStationLocation1.Location = new System.Drawing.Point(4, 246);
-            this.txtStationLocation1.Margin = new System.Windows.Forms.Padding(2);
-            this.txtStationLocation1.MaximumSize = new System.Drawing.Size(0, 22);
-            this.txtStationLocation1.MinimumSize = new System.Drawing.Size(0, 22);
-            this.txtStationLocation1.Name = "txtStationLocation1";
-            this.txtStationLocation1.Properties.AutoHeight = false;
-            this.txtStationLocation1.Size = new System.Drawing.Size(476, 22);
-            this.txtStationLocation1.StyleController = this.layoutControl1;
-            this.txtStationLocation1.TabIndex = 11;
-            this.txtStationLocation1.ToolTip = "经度纬度之间用英文逗号隔开";
-            // 
-            // txtRefLocation1
-            // 
-            this.txtRefLocation1.EditValue = "";
-            this.txtRefLocation1.Location = new System.Drawing.Point(4, 289);
-            this.txtRefLocation1.Margin = new System.Windows.Forms.Padding(2);
-            this.txtRefLocation1.MaximumSize = new System.Drawing.Size(0, 22);
-            this.txtRefLocation1.MinimumSize = new System.Drawing.Size(0, 22);
-            this.txtRefLocation1.Name = "txtRefLocation1";
-            this.txtRefLocation1.Properties.AutoHeight = false;
-            this.txtRefLocation1.Size = new System.Drawing.Size(476, 22);
-            this.txtRefLocation1.StyleController = this.layoutControl1;
-            this.txtRefLocation1.TabIndex = 10;
-            this.txtRefLocation1.ToolTip = "经度纬度之间用英文逗号隔开";
-            // 
-            // txtDtousErr1
-            // 
-            this.txtDtousErr1.EditValue = "";
-            this.txtDtousErr1.Location = new System.Drawing.Point(4, 332);
-            this.txtDtousErr1.Margin = new System.Windows.Forms.Padding(2);
-            this.txtDtousErr1.MaximumSize = new System.Drawing.Size(0, 22);
-            this.txtDtousErr1.MinimumSize = new System.Drawing.Size(0, 22);
-            this.txtDtousErr1.Name = "txtDtousErr1";
-            this.txtDtousErr1.Properties.AutoHeight = false;
-            this.txtDtousErr1.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "us", -1, false, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
-            this.txtDtousErr1.Size = new System.Drawing.Size(476, 22);
-            this.txtDtousErr1.StyleController = this.layoutControl1;
-            this.txtDtousErr1.TabIndex = 6;
-            this.txtDtousErr1.ToolTip = "时差误差";
-            // 
-            // txtSatLocErr1
-            // 
-            this.txtSatLocErr1.EditValue = "";
-            this.txtSatLocErr1.Location = new System.Drawing.Point(4, 376);
-            this.txtSatLocErr1.Margin = new System.Windows.Forms.Padding(2);
-            this.txtSatLocErr1.MaximumSize = new System.Drawing.Size(0, 22);
-            this.txtSatLocErr1.MinimumSize = new System.Drawing.Size(0, 22);
-            this.txtSatLocErr1.Name = "txtSatLocErr1";
-            this.txtSatLocErr1.Properties.AutoHeight = false;
-            this.txtSatLocErr1.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "m", -1, false, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
-            this.txtSatLocErr1.Size = new System.Drawing.Size(476, 22);
-            this.txtSatLocErr1.StyleController = this.layoutControl1;
-            this.txtSatLocErr1.TabIndex = 6;
-            this.txtSatLocErr1.ToolTip = "星历位置误差";
-            // 
-            // btnClose
-            // 
-            this.btnClose.Location = new System.Drawing.Point(173, 410);
-            this.btnClose.Margin = new System.Windows.Forms.Padding(2);
-            this.btnClose.Name = "btnClose";
-            this.btnClose.Size = new System.Drawing.Size(153, 22);
-            this.btnClose.StyleController = this.layoutControl1;
-            this.btnClose.TabIndex = 13;
-            this.btnClose.Text = "关闭";
-            this.btnClose.Click += new System.EventHandler(this.btnClose_Click);
-            // 
-            // btnEphCalc
-            // 
-            this.btnEphCalc.Location = new System.Drawing.Point(4, 410);
-            this.btnEphCalc.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
-            this.btnEphCalc.Name = "btnEphCalc";
-            this.btnEphCalc.Size = new System.Drawing.Size(165, 22);
-            this.btnEphCalc.StyleController = this.layoutControl1;
-            this.btnEphCalc.TabIndex = 12;
-            this.btnEphCalc.Text = "星历推算";
-            this.btnEphCalc.Click += new System.EventHandler(this.btnEphCalc_Click);
-            // 
-            // Root
-            // 
-            this.Root.GroupBordersVisible = false;
-            this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
-            this.itemSigTime,
-            this.layoutControlItem14,
-            this.layoutControlItem13,
-            this.layoutControlItem4,
-            this.layoutControlItem5,
-            this.layoutControlItem1,
-            this.emptySpaceItem1,
-            this.emptySpaceItem2,
-            this.layoutControlItem3,
-            this.layoutControlItem6,
-            this.layoutControlItem7,
-            this.layoutControlItem2});
-            this.Root.Name = "Root";
-            this.Root.Size = new System.Drawing.Size(484, 530);
-            this.Root.TextVisible = false;
-            // 
-            // itemSigTime
-            // 
-            this.itemSigTime.Control = this.txtCapTime;
-            this.itemSigTime.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
-            this.itemSigTime.Location = new System.Drawing.Point(0, 184);
-            this.itemSigTime.Name = "itemSigTime";
-            this.itemSigTime.Size = new System.Drawing.Size(484, 43);
-            this.itemSigTime.Spacing = new DevExpress.XtraLayout.Utils.Padding(2, 2, 0, 0);
-            this.itemSigTime.Text = "信号时间";
-            this.itemSigTime.TextLocation = DevExpress.Utils.Locations.Top;
-            this.itemSigTime.TextSize = new System.Drawing.Size(72, 14);
-            // 
-            // layoutControlItem14
-            // 
-            this.layoutControlItem14.Control = this.txtRefLocation1;
-            this.layoutControlItem14.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
-            this.layoutControlItem14.Location = new System.Drawing.Point(0, 270);
-            this.layoutControlItem14.Name = "layoutControlItem14";
-            this.layoutControlItem14.Size = new System.Drawing.Size(484, 43);
-            this.layoutControlItem14.Spacing = new DevExpress.XtraLayout.Utils.Padding(2, 2, 0, 0);
-            this.layoutControlItem14.Text = "参考站经纬度";
-            this.layoutControlItem14.TextLocation = DevExpress.Utils.Locations.Top;
-            this.layoutControlItem14.TextSize = new System.Drawing.Size(72, 14);
-            // 
-            // layoutControlItem13
-            // 
-            this.layoutControlItem13.Control = this.txtStationLocation1;
-            this.layoutControlItem13.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
-            this.layoutControlItem13.Location = new System.Drawing.Point(0, 227);
-            this.layoutControlItem13.Name = "layoutControlItem13";
-            this.layoutControlItem13.Size = new System.Drawing.Size(484, 43);
-            this.layoutControlItem13.Spacing = new DevExpress.XtraLayout.Utils.Padding(2, 2, 0, 0);
-            this.layoutControlItem13.Text = "超短站经纬度";
-            this.layoutControlItem13.TextLocation = DevExpress.Utils.Locations.Top;
-            this.layoutControlItem13.TextSize = new System.Drawing.Size(72, 14);
-            // 
-            // layoutControlItem4
-            // 
-            this.layoutControlItem4.Control = this.txtDtousErr1;
-            this.layoutControlItem4.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
-            this.layoutControlItem4.CustomizationFormText = "低轨卫星X";
-            this.layoutControlItem4.Location = new System.Drawing.Point(0, 313);
-            this.layoutControlItem4.Name = "layoutControlItem4";
-            this.layoutControlItem4.Size = new System.Drawing.Size(484, 44);
-            this.layoutControlItem4.Spacing = new DevExpress.XtraLayout.Utils.Padding(2, 2, 0, 0);
-            this.layoutControlItem4.Text = "时差误差";
-            this.layoutControlItem4.TextLocation = DevExpress.Utils.Locations.Top;
-            this.layoutControlItem4.TextSize = new System.Drawing.Size(72, 14);
-            // 
-            // layoutControlItem5
-            // 
-            this.layoutControlItem5.Control = this.txtSatLocErr1;
-            this.layoutControlItem5.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
-            this.layoutControlItem5.CustomizationFormText = "低轨卫星X";
-            this.layoutControlItem5.Location = new System.Drawing.Point(0, 357);
-            this.layoutControlItem5.Name = "layoutControlItem5";
-            this.layoutControlItem5.Size = new System.Drawing.Size(484, 44);
-            this.layoutControlItem5.Spacing = new DevExpress.XtraLayout.Utils.Padding(2, 2, 0, 0);
-            this.layoutControlItem5.Text = "星历位置误差";
-            this.layoutControlItem5.TextLocation = DevExpress.Utils.Locations.Top;
-            this.layoutControlItem5.TextSize = new System.Drawing.Size(72, 14);
-            // 
-            // layoutControlItem1
-            // 
-            this.layoutControlItem1.Control = this.btnOK;
-            this.layoutControlItem1.Location = new System.Drawing.Point(328, 401);
-            this.layoutControlItem1.Name = "layoutControlItem1";
-            this.layoutControlItem1.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 9, 2);
-            this.layoutControlItem1.Size = new System.Drawing.Size(156, 33);
-            this.layoutControlItem1.Spacing = new DevExpress.XtraLayout.Utils.Padding(0, 2, 0, 0);
-            this.layoutControlItem1.TextSize = new System.Drawing.Size(0, 0);
-            this.layoutControlItem1.TextVisible = false;
-            // 
-            // emptySpaceItem1
-            // 
-            this.emptySpaceItem1.AllowHotTrack = false;
-            this.emptySpaceItem1.Location = new System.Drawing.Point(0, 434);
-            this.emptySpaceItem1.Name = "emptySpaceItem1";
-            this.emptySpaceItem1.Size = new System.Drawing.Size(484, 72);
-            this.emptySpaceItem1.TextSize = new System.Drawing.Size(0, 0);
-            // 
-            // emptySpaceItem2
-            // 
-            this.emptySpaceItem2.AllowHotTrack = false;
-            this.emptySpaceItem2.Location = new System.Drawing.Point(0, 506);
-            this.emptySpaceItem2.MaxSize = new System.Drawing.Size(0, 24);
-            this.emptySpaceItem2.MinSize = new System.Drawing.Size(104, 24);
-            this.emptySpaceItem2.Name = "emptySpaceItem2";
-            this.emptySpaceItem2.Size = new System.Drawing.Size(484, 24);
-            this.emptySpaceItem2.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
-            this.emptySpaceItem2.TextSize = new System.Drawing.Size(0, 0);
-            // 
-            // layoutControlItem3
-            // 
-            this.layoutControlItem3.Control = this.ucEphXYZMain;
-            this.layoutControlItem3.Location = new System.Drawing.Point(0, 0);
-            this.layoutControlItem3.MaxSize = new System.Drawing.Size(0, 92);
-            this.layoutControlItem3.MinSize = new System.Drawing.Size(190, 92);
-            this.layoutControlItem3.Name = "layoutControlItem3";
-            this.layoutControlItem3.Size = new System.Drawing.Size(484, 92);
-            this.layoutControlItem3.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
-            this.layoutControlItem3.TextSize = new System.Drawing.Size(0, 0);
-            this.layoutControlItem3.TextVisible = false;
-            // 
-            // layoutControlItem6
-            // 
-            this.layoutControlItem6.Control = this.ucEphXYZAdja;
-            this.layoutControlItem6.Location = new System.Drawing.Point(0, 92);
-            this.layoutControlItem6.MaxSize = new System.Drawing.Size(0, 92);
-            this.layoutControlItem6.MinSize = new System.Drawing.Size(190, 92);
-            this.layoutControlItem6.Name = "layoutControlItem6";
-            this.layoutControlItem6.Size = new System.Drawing.Size(484, 92);
-            this.layoutControlItem6.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
-            this.layoutControlItem6.TextSize = new System.Drawing.Size(0, 0);
-            this.layoutControlItem6.TextVisible = false;
-            // 
-            // layoutControlItem7
-            // 
-            this.layoutControlItem7.Control = this.btnEphCalc;
-            this.layoutControlItem7.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
-            this.layoutControlItem7.CustomizationFormText = "layoutControlItem1";
-            this.layoutControlItem7.Location = new System.Drawing.Point(0, 401);
-            this.layoutControlItem7.Name = "layoutControlItem7";
-            this.layoutControlItem7.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 9, 2);
-            this.layoutControlItem7.Size = new System.Drawing.Size(171, 33);
-            this.layoutControlItem7.Spacing = new DevExpress.XtraLayout.Utils.Padding(2, 0, 0, 0);
-            this.layoutControlItem7.Text = "layoutControlItem1";
-            this.layoutControlItem7.TextSize = new System.Drawing.Size(0, 0);
-            this.layoutControlItem7.TextVisible = false;
-            // 
-            // layoutControlItem2
-            // 
-            this.layoutControlItem2.Control = this.btnClose;
-            this.layoutControlItem2.Location = new System.Drawing.Point(171, 401);
-            this.layoutControlItem2.Name = "layoutControlItem2";
-            this.layoutControlItem2.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 9, 2);
-            this.layoutControlItem2.Size = new System.Drawing.Size(157, 33);
-            this.layoutControlItem2.TextSize = new System.Drawing.Size(0, 0);
-            this.layoutControlItem2.TextVisible = false;
-            // 
-            // dxErrorProvider
-            // 
-            this.dxErrorProvider.ContainerControl = this;
-            // 
-            // X2D1GDOPParam
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.Controls.Add(this.layoutControl1);
-            this.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
-            this.Name = "X2D1GDOPParam";
-            this.Size = new System.Drawing.Size(484, 530);
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).EndInit();
-            this.layoutControl1.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.txtCapTime.Properties.CalendarTimeProperties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtCapTime.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtStationLocation1.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtRefLocation1.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtDtousErr1.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtSatLocErr1.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.itemSigTime)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem2)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.dxErrorProvider)).EndInit();
-            this.ResumeLayout(false);
-
-        }
-
-        #endregion
-        private DevExpress.XtraLayout.LayoutControl layoutControl1;
-        private DevExpress.XtraEditors.DateEdit txtCapTime;
-        private DevExpress.XtraEditors.TextEdit txtStationLocation1;
-        private DevExpress.XtraEditors.TextEdit txtRefLocation1;
-        private DevExpress.XtraEditors.ButtonEdit txtDtousErr1;
-        private DevExpress.XtraEditors.ButtonEdit txtSatLocErr1;
-        private DevExpress.XtraLayout.LayoutControlGroup Root;
-        private DevExpress.XtraLayout.LayoutControlItem itemSigTime;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
-        private DevExpress.XtraEditors.SimpleButton btnOK;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
-        private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem1;
-        private DevExpress.XtraEditors.SimpleButton btnClose;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
-        private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem2;
-        private UCEphXYZParam ucEphXYZMain;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
-        private UCEphXYZParam ucEphXYZAdja;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
-        private DevExpress.XtraEditors.SimpleButton btnEphCalc;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
-        private DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider dxErrorProvider;
-    }
-}

DW5S.App/UserControl/RHGDOPParam.cs

@@ -1,220 +0,0 @@
-using DevExpress.XtraMap;
-using ExtensionsDev;
-using System;
-using System.Data;
-using System.Linq;
-using System.Collections.Generic;
-using DxHelper;
-using DW5S.Repostory;
-using DW5S.Entity;
-using DW5S.KxcApi;
-using System.Drawing;
-using DevExpress.Utils.About;
-using DevExpress.XtraEditors.DXErrorProvider;
-using DW5S.DTO;
-using System.Configuration;
-
-
-namespace DW5S.App.UserControl
-{
-    public partial class RHGDOPParam : DevExpress.XtraEditors.XtraUserControl
-    {
-        public MapControl mapControl1;
-        public GDOP融合接口 Model => new GDOP融合接口()
-        {
-            EphMain = ucEphXYZMain.EphParam(),
-            EphAdja = ucEphXYZAdja.EphParam(),
-            CapTime = txtCapTime.DateTime,
-            CDBStation = txtStationLocation1.GetLonLat(),
-            RefStation = txtRefLocation1.GetLonLat(),
-            DtousErr = Convert.ToDouble(txtDtousErr1.Text),
-            SatLocErr = Convert.ToDouble(txtSatLocErr1.Text),
-        };
-
-        private EnumPosResType PosResType;
-        public RHGDOPParam(PosRes item)
-        {
-            InitializeComponent();
-            this.layoutControl1.UseDefault();
-            txtCapTime.UseDefault();
-            txtStationLocation1.UseDoubleClickToSelectAll();
-            txtRefLocation1.UseDoubleClickToSelectAll();
-            this.txtCapTime.DateTime = item.SigTime;
-            this.txtDtousErr1.EditValue = 1;
-            this.txtSatLocErr1.EditValue = 10000;
-            PosResType = item.PosResType;
-
-            using (RHDWPartContext db = RHDWPartContext.GetContext(item.SigTime))
-            {
-                var cg = db?.CgRes.Where(m => m.ID == item.CgResID).FirstOrDefault();
-                var station = db?.StationRes.Where(m => m.ID == item.StationResID).FirstOrDefault();
-                if (station != null)
-                {
-                    this.txtStationLocation1.Text = $"{station.CdbTxLon},{station.CdbTxLat}";
-                    this.txtRefLocation1.Text = $"{station.RefLon},{station.RefLat}";
-                }
-
-                if (cg != null)
-                {
-                    var mainEph = (cg.MainX, cg.MainY, cg.MainZ, cg.MainVx, cg.MainVy, cg.MainVz);
-                    ucEphXYZMain.SetParam($"主星", cg.MainCode, mainEph, Color.Black);
-
-                    var adjaEph = (cg.Adja1X, cg.Adja1Y, cg.Adja1Z, cg.Adja1Vx, cg.Adja1Vy, cg.Adja1Vz);
-                    ucEphXYZAdja.SetParam($"邻星", cg.Adja1Code, adjaEph, Color.Black);
-
-                }
-            }
-
-        }
-
-
-        private bool ParamValidate()
-        {
-            dxErrorProvider.ClearErrors();
-            if (!ucEphXYZMain.CheckEph(dxErrorProvider))
-            {
-                return false;
-            }
-            if (!ucEphXYZAdja.CheckEph(dxErrorProvider))
-            {
-                return false;
-            }
-            if (!txtStationLocation1.CheckLonLat(dxErrorProvider, "超短波"))
-            {
-                return false;
-            }
-            if (!txtRefLocation1.CheckLonLat(dxErrorProvider, "参考站"))
-            {
-                return false;
-            }
-            if (!txtDtousErr1.CheckDouble(dxErrorProvider, "时差误差"))
-            {
-                return false;
-            }
-            if (!txtSatLocErr1.CheckDouble(dxErrorProvider, "星历位置误差"))
-            {
-                return false;
-            }
-            return true;
-        }
-
-        private void btnOK_Click(object sender, EventArgs e)
-        {
-            if (!ParamValidate()) { return; }
-            try
-            {
-                mapControl1.ClearMap();
-                var data = GdopHelper.Gdop2Sat1DByXyzNew(Model.EphMain, Model.EphAdja, Model.CDBStation
-                  , Model.DtousErr, Model.SatLocErr, Model.RefStation);
-                if (data.Count == 0)
-                {
-                    DxHelper.MsgBoxHelper.ShowInfo($"绘制{PosResType.GetEnumDisplayName()}GDOP没有{GdopParam.误差配置.误差距离km.Max()}公里以内的误差!");
-                    return;
-                }
-                List<MapPolyline> polylines = new List<MapPolyline>();
-                for (int i = 0; i < data.Count; i++)
-                {
-                    var errLins = data[i];
-                    var mapline = mapControl1.GetLine(errLins.ErrDistanceKm, errLins.MapDots);
-                    if (mapline == null)
-                    {
-                        continue;
-                    }
-                    polylines.Add(mapline);
-                }
-                mapControl1.DrawDtoLine(polylines);
-            }
-            catch (Exception ex)
-            {
-                DxHelper.MsgBoxHelper.ShowError($"绘制{PosResType.GetEnumDisplayName()}GDOP失败,{ex.Message}");
-            }
-        }
-        private void btnClose_Click(object sender, EventArgs e)
-        {
-            DxHelper.PopupHelper.HidePopup(this);
-        }
-        private async void btnEphCalc_Click(object sender, EventArgs e)
-        {
-            dxErrorProvider.ClearErrors();
-            if (txtCapTime.DateTime == DateTime.MinValue)
-            {
-                dxErrorProvider.SetError(txtCapTime, "信号时间不能为空!");
-                return;
-            }
-            var sigTime = txtCapTime.DateTime;
-            try
-            {
-                var mainCode = ucEphXYZMain.GetSatCode();
-                var adjaCode = ucEphXYZAdja.GetSatCode();
-
-                var mainxlInfo = await XlRepository.GetLatestAsync(mainCode, sigTime);
-                if (mainxlInfo == null)
-                {
-                    DxHelper.MsgBoxHelper.ShowWarning($"卫星:{mainCode}未找到对应的星历信息,请导入星历");
-                    return;
-                }
-                var XlCalcDto = new XlCalcDto() { tleStr = mainxlInfo.TwoLine, SigTime = sigTime };
-                var maineph = await HttpHelper.PostRequestAsync<SatEphResDto>(SysConfig.GetUrl("Xl/Calc"), XlCalcDto);
-                ucEphXYZMain.SetParam("主星", mainCode, (maineph.data.X, maineph.data.Y, maineph.data.Z, maineph.data.VX, maineph.data.VY, maineph.data.VZ), Color.Red);
-
-                var adjaxlInfo = await XlRepository.GetLatestAsync(adjaCode, sigTime);
-                if (adjaxlInfo == null)
-                {
-                    DxHelper.MsgBoxHelper.ShowWarning($"卫星:{adjaCode}未找到对应的星历信息,请导入星历");
-                    return;
-                }
-                XlCalcDto = new XlCalcDto() { tleStr = adjaxlInfo.TwoLine, SigTime = sigTime };
-                var adjaeph = await HttpHelper.PostRequestAsync<SatEphResDto>(SysConfig.GetUrl("Xl/Calc"), XlCalcDto);
-                ucEphXYZAdja.SetParam("邻星", adjaCode, (adjaeph.data.X, adjaeph.data.Y, adjaeph.data.Z, adjaeph.data.VX, adjaeph.data.VY, adjaeph.data.VZ), Color.Red);
-            }
-            catch (Exception ex)
-            {
-                DW5S.Framework.LogHelper.Error($"手动推算{PosResType.GetEnumDisplayName()}星历失败,SigTime={sigTime}", ex);
-                DxHelper.MsgBoxHelper.ShowError($"手动推算{PosResType.GetEnumDisplayName()}星历失败,{ex.Message}");
-            }
-        }
-    }
-    public class GDOP融合接口
-    {
-        /// <summary>
-        /// 主星x y z vx vy vz
-        /// </summary>
-        public double[] EphMain { get; set; }
-
-        /// <summary>
-        /// 邻星x y z vx vy vz
-        /// </summary>
-        public double[] EphAdja { get; set; }
-
-        /// <summary>
-        /// 采集时刻
-        /// </summary>
-        public DateTime CapTime { get; set; }
-
-        /// <summary>
-        /// 超短接收站-经度 纬度 高度
-        /// </summary>
-        public double[] CDBStation { get; set; }
-
-        /// <summary>
-        /// 参考站位置-经度 纬度 高度
-        /// </summary>
-        public double[] RefStation { get; set; }
-
-        /// <summary>
-        /// 时差误差(单位us)
-        /// </summary>
-        public double DtousErr { get; set; } = 1;
-
-        /// <summary>
-        /// 星历位置误差(单位米)
-        /// </summary>
-        public double SatLocErr { get; set; } = 10000;
-
-        /// <summary>
-        /// 定位类型
-        /// </summary>
-        public EnumPosResType PosResType { get; set; }
-
-    }
-}

DW5S.App/UserControl/RHGDOPParam.resx

@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <metadata name="dxErrorProvider.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
-</root>

DW5S.Basic/MD5Helper.cs

@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Security.Cryptography;
+using System.Text;
+using System.Threading.Tasks;
+
+public class MD5Helper
+{
+    public static string StrToMD5(string str)
+    {
+        MD5 md5 = MD5.Create();
+
+        byte[] c = System.Text.Encoding.Default.GetBytes(str);
+
+        byte[] b = md5.ComputeHash(c);//用来计算指定数组的hash值
+
+        //将每一个字节数组中的元素都tostring，在转成16进制
+        string newStr = null;
+        for (int i = 0; i < b.Length; i++)
+        {
+            newStr += b[i].ToString("X2");  //ToString(param);//传入不同的param可以转换成不同的效果
+        }
+        return newStr;
+    }
+}