0319

XdCxRhDW.App/CorTools/DetectToolForm.cs

@@ -57,8 +57,8 @@ namespace XdCxRhDW.App.CorTools
                     gridView1.RefreshData();
                     foreach (var item in gridSource)
                     {
-                        var file1 = HttpHelper.UploadFile(btnFile1.Text, baseUrl + "File/UploadFileAsync");
-                        var file2 = HttpHelper.UploadFile(btnFile2.Text, baseUrl + "File/UploadFileAsync");
+                        var file1 = await HttpHelper.UploadFileAsync(btnFile1.Text, baseUrl + "File/UploadFileAsync");
+                        var file2 = await HttpHelper.UploadFileAsync(btnFile2.Text, baseUrl + "File/UploadFileAsync");
                         XcorrStruct xItem = null;
                         try
                         {
@@ -141,43 +141,45 @@ namespace XdCxRhDW.App.CorTools
             dto.dmcType = dmcType;
             layoutControl1.Enabled = false;
             gridSource.Clear();
-            await Task.Run(async () =>
+            try
             {
-                try
+                dto.file1 = await HttpHelper.UploadFileAsync(btnFile1.Text, baseUrl + "File/UploadFileAsync");
+                dto.fsHz = double.Parse(tefs.Text) * 1e6;
+                var dmcResult = await HttpHelper.PostRequestAsync<IEnumerable<DetectResDto>>(baseUrl + "DetectCg/DetectCalc", dto);
+                if (dmcResult.code == 200)
                 {
-                    dto.file1 = HttpHelper.UploadFile(btnFile1.Text, baseUrl + "File/UploadFileAsync");
-                    dto.fsHz = double.Parse(tefs.Text) * 1e6;
-                    var dmcResult = await HttpHelper.PostRequestAsync<IEnumerable<DetectResDto>>(baseUrl + "DetectCg/DetectCalc", dto);
-                    if (dmcResult.code == 200)
+                    foreach (var dmcItem in dmcResult.data)
                     {
-
-
-                        foreach (var dmcItem in dmcResult.data)
+                        DateTime? sigTime = null;
+                        if (!string.IsNullOrWhiteSpace(txtFileTime.Text))
                         {
-                            DateTime? sigTime = null;
-                            if (!string.IsNullOrWhiteSpace(txtFileTime.Text))
-                            {
-                                sigTime = txtFileTime.DateTime.AddSeconds(dmcItem.Start / dto.fsHz);
-                            }
-                            gridSource.Add(new CafResult()
-                            {
-                                file1 = btnFile1.Text,
-                                file2 = btnFile2.Text,
-                                smpstart = dmcItem.Start,
-                                smplen = dmcItem.Length,
-                                SigTime = sigTime,
-                                tm = dmcItem.TimeMs,
-                            });
+                            sigTime = txtFileTime.DateTime.AddSeconds(dmcItem.Start / dto.fsHz);
                         }
+                        gridSource.Add(new CafResult()
+                        {
+                            file1 = btnFile1.Text,
+                            file2 = btnFile2.Text,
+                            smpstart = dmcItem.Start,
+                            smplen = dmcItem.Length,
+                            SigTime = sigTime,
+                            tm = dmcItem.TimeMs,
+                            SigType = dmcItem.SigType,
+                            UserName = dmcItem.UserName,
+                        });
                     }
-                    WriteIni();
                 }
-                catch (Exception ex)
+                else
                 {
-                    Serilog.Log.Error(ex, "信号检测出错");
-                    DxHelper.MsgBoxHelper.ShowError($"信号检测出错");
+                    Serilog.Log.Error(dmcResult.msg);
+                    DxHelper.MsgBoxHelper.ShowError(dmcResult.msg);
                 }
-            });
+                WriteIni();
+            }
+            catch (Exception ex)
+            {
+                Serilog.Log.Error(ex, "信号检测出错");
+                DxHelper.MsgBoxHelper.ShowError($"信号检测出错");
+            }
             gridView1.RefreshData();
             layoutControl1.Enabled = true;
         }
@@ -186,31 +188,28 @@ namespace XdCxRhDW.App.CorTools
             if (!ValidateFiles(btnFile1.Text, btnFile2.Text)) return;
             XcorrStruct xItem = new XcorrStruct();
             layoutControl1.Enabled = false;
-            await Task.Run(() =>
+
+            try
             {
-                try
-                {
-                    xItem.file1 = HttpHelper.UploadFile(btnFile1.Text, baseUrl + "File/UploadFileAsync");
-                    xItem.file2 = HttpHelper.UploadFile(btnFile2.Text, baseUrl + "File/UploadFileAsync");
-                    xItem.smpCount = int.Parse(teCount.Text);
-                    xItem.samplingRate = Convert.ToInt32(double.Parse(tefs.Text) * 1e6);
-                    xItem.dtCenter = int.Parse(teCenter.Text);
-                    xItem.dtRange = int.Parse(teRange.Text);
-                    xItem.dfRange = int.Parse(teDfRange.Text);
-                    xItem.smpStart = int.Parse(tePos.Text);
-                    xItem.snrThreshold = int.Parse(teSnr.Text);
-                   
+                xItem.file1 = await HttpHelper.UploadFileAsync(btnFile1.Text, baseUrl + "File/UploadFileAsync");
+                xItem.file2 = await HttpHelper.UploadFileAsync(btnFile2.Text, baseUrl + "File/UploadFileAsync");
+                xItem.smpCount = int.Parse(teCount.Text);
+                xItem.samplingRate = Convert.ToInt32(double.Parse(tefs.Text) * 1e6);
+                xItem.dtCenter = int.Parse(teCenter.Text);
+                xItem.dtRange = int.Parse(teRange.Text);
+                xItem.dfRange = int.Parse(teDfRange.Text);
+                xItem.smpStart = int.Parse(tePos.Text);
+                xItem.snrThreshold = int.Parse(teSnr.Text);
 
-                }
-                catch (Exception ex)
-                {
-                    Serilog.Log.Error(ex, "CPU文件参估参数错误");
-                    DxHelper.MsgBoxHelper.ShowError($"CPU文件参估参数错误");
-                    return;
-                }
-                WriteIni();
 
-            });
+            }
+            catch (Exception ex)
+            {
+                Serilog.Log.Error(ex, "CPU文件参估参数错误");
+                DxHelper.MsgBoxHelper.ShowError($"CPU文件参估参数错误");
+                return;
+            }
+            WriteIni();
             gridSource.Clear();
 
             try
@@ -233,12 +232,13 @@ namespace XdCxRhDW.App.CorTools
                         df = result.data.Df,
                         snr = result.data.Snr,
                         tm = result.data.TimeMs,
-                        SigTime= sigTime,
+                        SigTime = sigTime,
                     });
-                    this.BeginInvoke(new Action(() => gridView1.FocusedRowHandle = gridSource.Count - 1));
+                    gridView1.FocusedRowHandle = gridSource.Count - 1;
                 }
                 else
                 {
+                    Serilog.Log.Error(result.msg);
                     DxHelper.MsgBoxHelper.ShowError(result.msg);
                 }
             }
@@ -314,6 +314,8 @@ namespace XdCxRhDW.App.CorTools
             {
                 ckIBS.Checked = false;
                 ckKY.Checked = false;
+                UserName.Visible = true;
+                sigType.Visible = true;
             }
             layoutControl1.BestFit();
         }
@@ -329,6 +331,8 @@ namespace XdCxRhDW.App.CorTools
 
                 chkDama.Checked = false;
                 ckKY.Checked = false;
+                UserName.Visible = false;
+                sigType.Visible = false;
             }
             layoutControl1.BestFit();
         }
@@ -343,6 +347,8 @@ namespace XdCxRhDW.App.CorTools
             {
                 ckIBS.Checked = false;
                 chkDama.Checked = false;
+                UserName.Visible = false;
+                sigType.Visible = false;
             }
             layoutControl1.BestFit();
         }

XdCxRhDW.App/CorTools/DetectToolForm.designer.cs

@@ -28,16 +28,6 @@
         /// </summary>
         private void InitializeComponent()
         {
-            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();
-            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions6 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject21 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject22 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject23 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject24 = new DevExpress.Utils.SerializableAppearanceObject();
             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();
@@ -53,7 +43,18 @@
             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.txtFileTime = new DevExpress.XtraEditors.DateEdit();
             this.btnCalc = new DevExpress.XtraEditors.SimpleButton();
             this.chkDama = new DevExpress.XtraEditors.CheckEdit();
             this.btnCheck = new DevExpress.XtraEditors.SimpleButton();
@@ -64,9 +65,11 @@
             this.snr = new DevExpress.XtraGrid.Columns.GridColumn();
             this.smpstart = new DevExpress.XtraGrid.Columns.GridColumn();
             this.smplen = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.tm = new DevExpress.XtraGrid.Columns.GridColumn();
             this.file1 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.file2 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.sigType = new DevExpress.XtraGrid.Columns.GridColumn();
             this.tePos = new DevExpress.XtraEditors.TextEdit();
             this.teCount = new DevExpress.XtraEditors.TextEdit();
             this.btnFile1 = new DevExpress.XtraEditors.ButtonEdit();
@@ -96,11 +99,12 @@
             this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutItemDrawImage = new DevExpress.XtraLayout.LayoutControlItem();
-            this.txtFileTime = new DevExpress.XtraEditors.DateEdit();
             this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.UserName = new DevExpress.XtraGrid.Columns.GridColumn();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).BeginInit();
             this.layoutControl1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.txtFileTime.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtFileTime.Properties.CalendarTimeProperties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.chkDama.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gcCheckCgRes)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
@@ -132,8 +136,6 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutItemDrawImage)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtFileTime.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtFileTime.Properties.CalendarTimeProperties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
             this.SuspendLayout();
             // 
@@ -166,6 +168,20 @@
             this.layoutControl1.TabIndex = 0;
             this.layoutControl1.Text = "layoutControl1";
             // 
+            // txtFileTime
+            // 
+            this.txtFileTime.EditValue = null;
+            this.txtFileTime.Location = new System.Drawing.Point(58, 57);
+            this.txtFileTime.Name = "txtFileTime";
+            this.txtFileTime.Properties.AutoHeight = false;
+            this.txtFileTime.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.txtFileTime.Properties.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.txtFileTime.Size = new System.Drawing.Size(80, 23);
+            this.txtFileTime.StyleController = this.layoutControl1;
+            this.txtFileTime.TabIndex = 20;
+            // 
             // btnCalc
             // 
             this.btnCalc.Location = new System.Drawing.Point(899, 31);
@@ -216,6 +232,7 @@
             this.gridView1.Appearance.Row.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Near;
             this.gridView1.ColumnPanelRowHeight = 0;
             this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+            this.UserName,
             this.dt,
             this.df,
             this.snr,
@@ -224,7 +241,8 @@
             this.gridColumn1,
             this.tm,
             this.file1,
-            this.file2});
+            this.file2,
+            this.sigType});
             this.gridView1.DetailHeight = 169;
             this.gridView1.FooterPanelHeight = 0;
             this.gridView1.GridControl = this.gcCheckCgRes;
@@ -249,7 +267,7 @@
             this.dt.MinWidth = 22;
             this.dt.Name = "dt";
             this.dt.Visible = true;
-            this.dt.VisibleIndex = 4;
+            this.dt.VisibleIndex = 5;
             this.dt.Width = 109;
             // 
             // df
@@ -259,7 +277,7 @@
             this.df.MinWidth = 22;
             this.df.Name = "df";
             this.df.Visible = true;
-            this.df.VisibleIndex = 5;
+            this.df.VisibleIndex = 7;
             this.df.Width = 109;
             // 
             // snr
@@ -269,7 +287,7 @@
             this.snr.MinWidth = 22;
             this.snr.Name = "snr";
             this.snr.Visible = true;
-            this.snr.VisibleIndex = 6;
+            this.snr.VisibleIndex = 8;
             this.snr.Width = 83;
             // 
             // smpstart
@@ -279,7 +297,7 @@
             this.smpstart.MinWidth = 22;
             this.smpstart.Name = "smpstart";
             this.smpstart.Visible = true;
-            this.smpstart.VisibleIndex = 2;
+            this.smpstart.VisibleIndex = 3;
             this.smpstart.Width = 90;
             // 
             // smplen
@@ -289,9 +307,17 @@
             this.smplen.MinWidth = 22;
             this.smplen.Name = "smplen";
             this.smplen.Visible = true;
-            this.smplen.VisibleIndex = 3;
+            this.smplen.VisibleIndex = 4;
             this.smplen.Width = 90;
             // 
+            // gridColumn1
+            // 
+            this.gridColumn1.Caption = "信号时间";
+            this.gridColumn1.FieldName = "SigTime";
+            this.gridColumn1.Name = "gridColumn1";
+            this.gridColumn1.Visible = true;
+            this.gridColumn1.VisibleIndex = 6;
+            // 
             // tm
             // 
             this.tm.Caption = "耗时(ms)";
@@ -299,7 +325,7 @@
             this.tm.MinWidth = 22;
             this.tm.Name = "tm";
             this.tm.Visible = true;
-            this.tm.VisibleIndex = 7;
+            this.tm.VisibleIndex = 9;
             this.tm.Width = 69;
             // 
             // file1
@@ -309,7 +335,7 @@
             this.file1.MinWidth = 22;
             this.file1.Name = "file1";
             this.file1.Visible = true;
-            this.file1.VisibleIndex = 1;
+            this.file1.VisibleIndex = 2;
             this.file1.Width = 165;
             // 
             // file2
@@ -319,9 +345,17 @@
             this.file2.MinWidth = 22;
             this.file2.Name = "file2";
             this.file2.Visible = true;
-            this.file2.VisibleIndex = 0;
+            this.file2.VisibleIndex = 1;
             this.file2.Width = 127;
             // 
+            // sigType
+            // 
+            this.sigType.Caption = "信号类型";
+            this.sigType.FieldName = "SigType";
+            this.sigType.Name = "sigType";
+            this.sigType.Visible = true;
+            this.sigType.VisibleIndex = 10;
+            // 
             // tePos
             // 
             this.tePos.EditValue = "0";
@@ -408,7 +442,7 @@
             this.tefs.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
             this.tefs.Name = "tefs";
             this.tefs.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "MHz", -1, false, true, false, editorButtonImageOptions5, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject17, serializableAppearanceObject18, serializableAppearanceObject19, serializableAppearanceObject20, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "MHz", -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.tefs.Size = new System.Drawing.Size(88, 23);
             this.tefs.StyleController = this.layoutControl1;
             this.tefs.TabIndex = 6;
@@ -420,7 +454,7 @@
             this.teCenter.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
             this.teCenter.Name = "teCenter";
             this.teCenter.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "us", -1, false, true, false, editorButtonImageOptions6, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject21, serializableAppearanceObject22, serializableAppearanceObject23, serializableAppearanceObject24, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+            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.teCenter.Size = new System.Drawing.Size(76, 23);
             this.teCenter.StyleController = this.layoutControl1;
             this.teCenter.TabIndex = 7;
@@ -432,7 +466,7 @@
             this.teRange.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
             this.teRange.Name = "teRange";
             this.teRange.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)});
+            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.teRange.Size = new System.Drawing.Size(54, 23);
             this.teRange.StyleController = this.layoutControl1;
             this.teRange.TabIndex = 8;
@@ -444,7 +478,7 @@
             this.teDfRange.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
             this.teDfRange.Name = "teDfRange";
             this.teDfRange.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "Hz", -1, false, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "Hz", -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.teDfRange.Size = new System.Drawing.Size(52, 23);
             this.teDfRange.StyleController = this.layoutControl1;
             this.teDfRange.TabIndex = 11;
@@ -456,7 +490,7 @@
             this.teSnr.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
             this.teSnr.Name = "teSnr";
             this.teSnr.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "dB", -1, false, true, false, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "dB", -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.teSnr.Size = new System.Drawing.Size(64, 23);
             this.teSnr.StyleController = this.layoutControl1;
             this.teSnr.TabIndex = 14;
@@ -677,20 +711,6 @@
             this.layoutItemDrawImage.TextSize = new System.Drawing.Size(0, 0);
             this.layoutItemDrawImage.TextVisible = false;
             // 
-            // txtFileTime
-            // 
-            this.txtFileTime.EditValue = null;
-            this.txtFileTime.Location = new System.Drawing.Point(58, 57);
-            this.txtFileTime.Name = "txtFileTime";
-            this.txtFileTime.Properties.AutoHeight = false;
-            this.txtFileTime.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.txtFileTime.Properties.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.txtFileTime.Size = new System.Drawing.Size(80, 23);
-            this.txtFileTime.StyleController = this.layoutControl1;
-            this.txtFileTime.TabIndex = 20;
-            // 
             // layoutControlItem13
             // 
             this.layoutControlItem13.Control = this.txtFileTime;
@@ -702,13 +722,13 @@
             this.layoutControlItem13.TextSize = new System.Drawing.Size(48, 14);
             this.layoutControlItem13.TextToControlDistance = 5;
             // 
-            // gridColumn1
+            // UserName
             // 
-            this.gridColumn1.Caption = "信号时间";
-            this.gridColumn1.FieldName = "SigTime";
-            this.gridColumn1.Name = "gridColumn1";
-            this.gridColumn1.Visible = true;
-            this.gridColumn1.VisibleIndex = 4;
+            this.UserName.Caption = "用户";
+            this.UserName.FieldName = "UserName";
+            this.UserName.Name = "UserName";
+            this.UserName.Visible = true;
+            this.UserName.VisibleIndex = 0;
             // 
             // DetectToolForm
             // 
@@ -724,6 +744,8 @@
             this.Load += new System.EventHandler(this.MainForm_Load);
             ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).EndInit();
             this.layoutControl1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.txtFileTime.Properties.CalendarTimeProperties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtFileTime.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.chkDama.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gcCheckCgRes)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
@@ -755,8 +777,6 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutItemDrawImage)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtFileTime.Properties.CalendarTimeProperties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtFileTime.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
             this.ResumeLayout(false);
 
@@ -811,5 +831,7 @@
         private DevExpress.XtraEditors.DateEdit txtFileTime;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
+        private DevExpress.XtraGrid.Columns.GridColumn sigType;
+        private DevExpress.XtraGrid.Columns.GridColumn UserName;
     }
 }

XdCxRhDW.App/DxHelper/SvgHelper.cs

@@ -132,9 +132,10 @@ namespace DxHelper
             ms.Dispose();
             return svg;
         }
-        public static SvgImage CreateMarkDot()
+        public static SvgImage CreateMarkDot(string color = "#F12233", int width = 24, int height = 24)
         {
-            string xml = $"<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox='0 0 32 32'>" + "<path class=\"Blue\" d=\"M6,8c0,1.1-0.9,2-2,2c-1.1,0-2-0.9-2-2s0.9-2,2-2C5.1,6,6,6.9,6,8z M10,22c-1.1,0-2,0.9-2,2s0.9,2,2,2c1.1,0,2-0.9,2-2S11.1,22,10,22z M18,16c-1.1,0-2,0.9-2,2s0.9,2,2,2c1.1,0,2-0.9,2-2S19.1,16,18,16z M22,8c-1.1,0-2,0.9-2,2c0,1.1,0.9,2,2,2c1.1,0,2-0.9,2-2C24,8.9,23.1,8,22,8z M28,4c-1.1,0-2,0.9-2,2s0.9,2,2,2c1.1,0,2-0.9,2-2S29.1,4,28,4z\"/><path class=\"Yellow\" d=\"M8,18c0,1.1-0.9,2-2,2c-1.1,0-2-0.9-2-2s0.9-2,2-2C7.1,16,8,16.9,8,18z M12,10c-1.1,0-2,0.9-2,2s0.9,2,2,2c1.1,0,2-0.9,2-2S13.1,10,12,10z M4,26c-1.1,0-2,0.9-2,2s0.9,2,2,2c1.1,0,2-0.9,2-2S5.1,26,4,26z M20,2c-1.1,0-2,0.9-2,2s0.9,2,2,2\r\n\tc1.1,0,2-0.9,2-2S21.1,2,20,2z M28,12c-1.1,0-2,0.9-2,2s0.9,2,2,2c1.1,0,2-0.9,2-2S29.1,12,28,12z\"/>"
+            string xml = $"<svg xmlns=\"http://www.w3.org/2000/svg\" width='{width}px' height='{height}px' viewBox='0 0 32 32'>" 
+                + $"<path fill='{color}' d=\"M6,8c0,1.1-0.9,2-2,2c-1.1,0-2-0.9-2-2s0.9-2,2-2C5.1,6,6,6.9,6,8z M10,22c-1.1,0-2,0.9-2,2s0.9,2,2,2c1.1,0,2-0.9,2-2S11.1,22,10,22z M18,16c-1.1,0-2,0.9-2,2s0.9,2,2,2c1.1,0,2-0.9,2-2S19.1,16,18,16z M22,8c-1.1,0-2,0.9-2,2c0,1.1,0.9,2,2,2c1.1,0,2-0.9,2-2C24,8.9,23.1,8,22,8z M28,4c-1.1,0-2,0.9-2,2s0.9,2,2,2c1.1,0,2-0.9,2-2S29.1,4,28,4z\"/><path class=\"Yellow\" d=\"M8,18c0,1.1-0.9,2-2,2c-1.1,0-2-0.9-2-2s0.9-2,2-2C7.1,16,8,16.9,8,18z M12,10c-1.1,0-2,0.9-2,2s0.9,2,2,2c1.1,0,2-0.9,2-2S13.1,10,12,10z M4,26c-1.1,0-2,0.9-2,2s0.9,2,2,2c1.1,0,2-0.9,2-2S5.1,26,4,26z M20,2c-1.1,0-2,0.9-2,2s0.9,2,2,2\r\n\tc1.1,0,2-0.9,2-2S21.1,2,20,2z M28,12c-1.1,0-2,0.9-2,2s0.9,2,2,2c1.1,0,2-0.9,2-2S29.1,12,28,12z\"/>"
                 + "</svg>";
             MemoryStream ms = new MemoryStream(Encoding.UTF8.GetBytes(xml));
             var svg = SvgLoader.LoadFromStream(ms);

XdCxRhDW.App/EditForms/X2D1DTOParamEditor.cs

@@ -42,6 +42,7 @@ namespace XdCxRhDW.App.EditForms
             txtsatStation.EditValueChanged += TxtsatStation_EditValueChanged;
             txtcdbStation.EditValueChanged += TxtcdbStation_EditValueChanged;
             txtRefLocation.EditValueChanged += TxtRefLocation_EditValueChanged;
+
         }
 
         private void TxtRefLocation_EditValueChanged(object sender, EventArgs e)
@@ -103,7 +104,17 @@ namespace XdCxRhDW.App.EditForms
                 txtRefLocation.Properties.ReadOnly = true;
                 this.txtRefLocation.Text = $"{0},{0}";
             }
-            
+            //double tarLon = 46, tarLat = 24;
+            //double recLon = 45.9, recLat = 23.9;
+            //var tarEcef = PhysicsHelper.GeoToEcef((tarLon, tarLat, 0));
+            //var recEcef = PhysicsHelper.GeoToEcef((recLon, recLat, 0));
+            //var xl1Ecef = (cg.MainX.Value, cg.MainY.Value, cg.MainZ.Value);
+            //var xl2Ecef = (cg.Adja1X.Value, cg.Adja1Y.Value, cg.Adja1Z.Value);
+            //var dt1 = PhysicsHelper.Dto(tarEcef, xl1Ecef, recEcef);
+            //var dt2 = PhysicsHelper.Dto(tarEcef, xl2Ecef, recEcef);
+            //var dto1 = (dt1 - dt2) * 1e6;
+            //var dt3 = PhysicsHelper.Dto(tarEcef, recEcef);
+            //var dto2 = (dt1 - dt3) * 1e6;
         }
 
         public bool CheckParam()

XdCxRhDW.App/EditForms/X2D1PosParamEditor.cs

@@ -20,6 +20,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Documents;
 using System.Windows.Forms;
+using System.Windows.Input;
 using XdCxRhDw.Dto;
 using XdCxRhDW.App.App.Properties;
 using XdCxRhDW.Core;
@@ -109,7 +110,17 @@ namespace XdCxRhDW.App.EditForms
                 txtRefLocation.Properties.ReadOnly = true;
                 this.txtRefLocation.Text = $"{0},{0}";
             }
-
+            //double tarLon = 46, tarLat = 24;
+            //double recLon = 45.9, recLat = 23.9;
+            //var tarEcef = PhysicsHelper.GeoToEcef((tarLon, tarLat, 0));
+            //var recEcef = PhysicsHelper.GeoToEcef((recLon, recLat, 0));
+            //var xl1Ecef = (cg.MainX.Value, cg.MainY.Value, cg.MainZ.Value);
+            //var xl2Ecef = (cg.Adja1X.Value, cg.Adja1Y.Value, cg.Adja1Z.Value);
+            //var dt1 = PhysicsHelper.Dto(tarEcef, xl1Ecef, recEcef);
+            //var dt2 = PhysicsHelper.Dto(tarEcef, xl2Ecef, recEcef);
+            //var dto1 = (dt1 - dt2) * 1e6;
+            //var dt3 = PhysicsHelper.Dto(tarEcef, recEcef);
+            //var dto2 = (dt1 - dt3) * 1e6;
         }
 
         public bool CheckParam()

XdCxRhDW.App/ExtensionsDev/MapControlEx.cs

@@ -235,6 +235,7 @@ public static class MapControlEx
             }
             else if (e.SelectedObject is MapCustomElement ele)
             {
+                if (ele.Tag.GetType() == typeof(string)) return;
                 var find = innerData.mMapStorageFixed.Items.Where(p => (p is MapCustomElement pp) && p != ele && pp.Location.Equals(ele.Location));
                 StringBuilder sb = new StringBuilder();
                 sb.Append(((object[])ele.Tag)[1]);
@@ -1851,8 +1852,7 @@ public static class MapControlEx
                 EnableSelection = DefaultBoolean.False,
                 Text = "",
                 ToolTipPattern = $"{frm.Caption}",
-                SvgImage = SvgHelper.CreatePentagram(),
-                SvgImageSize = new Size(32, 32),
+                SvgImage = SvgHelper.CreatePentagram("#F12233",24,24),
                 TextAlignment = DevExpress.XtraMap.TextAlignment.BottomCenter,
                 Tag = "DrawMarkDot"
             };

XdCxRhDW.Core/Api/检测Cpu参估/CafResult.cs

@@ -47,12 +47,22 @@ namespace XdCxRhDW.Core.Api
         /// <summary>
         /// 文件1
         /// </summary>
-        public String file1 { get; set; }
+        public string file1 { get; set; }
 
         /// <summary>
         /// 文件2
         /// </summary>
-        public String file2 { get; set; }
+        public string file2 { get; set; }
+
+        /// <summary>
+        /// 信号类型(只有DAMA有)
+        /// </summary>
+        public string SigType { get; set; }
+
+        /// <summary>
+        /// 用户名(只有DAMA有)
+        /// </summary>
+        public string UserName { get; set; }
 
         public int flag { get; set; }
 

XdCxRhDW.Core/HttpHelper.cs

@@ -13,22 +13,6 @@ namespace XdCxRhDW.Core
 {
     public class HttpHelper
     {
-        public static AjaxResult<T> PostRequest<T>(string url, object dto)
-        {
-            var content = new StringContent(JsonConvert.SerializeObject(dto), System.Text.Encoding.UTF8, "application/json");
-            var handler = new HttpClientHandler() { UseCookies = false };
-            HttpClient client = new HttpClient(handler);
-            client.Timeout = TimeSpan.FromSeconds(20);
-            var message = new HttpRequestMessage(HttpMethod.Post, url);
-            message.Content = content;
-
-            var response = client.SendAsync(message).Result;
-            response.EnsureSuccessStatusCode();
-            var result = response.Content.ReadAsStringAsync().Result;
-            var AjaxResult = JsonConvert.DeserializeObject<AjaxResult<T>>(result);
-            return AjaxResult;
-        }
-       
         public static async Task<AjaxResult<T>> PostRequestAsync<T>(string url, object dto)
         {
             var content = new StringContent(JsonConvert.SerializeObject(dto), System.Text.Encoding.UTF8, "application/json");
@@ -38,14 +22,14 @@ namespace XdCxRhDW.Core
             var message = new HttpRequestMessage(HttpMethod.Post, url);
             message.Content = content;
 
-            var response =await client.SendAsync(message);
+            var response = await client.SendAsync(message);
             response.EnsureSuccessStatusCode();
             var result = response.Content.ReadAsStringAsync().Result;
             var AjaxResult = JsonConvert.DeserializeObject<AjaxResult<T>>(result);
             return AjaxResult;
         }
 
-        public static string UploadFile(string localFile, string uploadUrl)
+        public static async Task<string> UploadFileAsync(string localFile, string uploadUrl, int timeoutSeconds = 30)
         {
             try
             {
@@ -57,13 +41,13 @@ namespace XdCxRhDW.Core
 
                 var handler = new HttpClientHandler() { UseCookies = false };
                 HttpClient client = new HttpClient(handler);
-                client.Timeout = TimeSpan.FromSeconds(20);
+                client.Timeout = TimeSpan.FromSeconds(timeoutSeconds);
                 var message = new HttpRequestMessage(HttpMethod.Post, uploadUrl);
                 message.Content = content;
 
-                var response = client.SendAsync(message).Result;
+                var response = await client.SendAsync(message);
                 response.EnsureSuccessStatusCode();
-                var result = response.Content.ReadAsStringAsync().Result;
+                var result = await response.Content.ReadAsStringAsync();
                 var AjaxResult = JsonConvert.DeserializeObject<AjaxResult<FileUploadResDto>>(result);
                 if (AjaxResult.code == 200)
                 {

XdCxRhDW.Sender/Form1.cs

@@ -514,7 +514,7 @@ namespace XdCxRhDW.Sender
         {
             X2D1NoParPosDto X2D1PosDto = new X2D1NoParPosDto()
             {
-                SigTime = new DateTime(2024, 1, 31, 17, 25, 23),
+                SigTime = DateTime.Now,
                 MainCode = 23467,
                 AdjaCode = 39206,
                 SxDto = -0.002198485309353 * 1e6,