Revert "11"

This reverts commit 619204423b011c9d2eb3342539b5df147567e62e.

DW5S.App/DW5S.App.csproj

@@ -33,9 +33,6 @@
     <Compile Update="EditForms\AdChannelEditor.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Update="EditForms\TaskTemplate.cs">
-      <SubType>Form</SubType>
-    </Compile>
     <Compile Update="EditForms\StationEditor.cs">
       <SubType>Form</SubType>
     </Compile>

DW5S.App/EditForms/TaskTemplate.Designer.cs

@@ -1,158 +0,0 @@
-namespace DW5S.App.EditForms
-{
-    partial class TaskTemplate
-    {
-        /// <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()
-        {
-            layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
-            btnOk = new DevExpress.XtraEditors.SimpleButton();
-            btnCancle = new DevExpress.XtraEditors.SimpleButton();
-            Root = new DevExpress.XtraLayout.LayoutControlGroup();
-            layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
-            layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
-            radioGroup1 = new DevExpress.XtraEditors.RadioGroup();
-            layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
-            ((System.ComponentModel.ISupportInitialize)layoutControl1).BeginInit();
-            layoutControl1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)Root).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)layoutControlItem6).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)layoutControlItem7).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)radioGroup1.Properties).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)layoutControlItem8).BeginInit();
-            SuspendLayout();
-            // 
-            // layoutControl1
-            // 
-            layoutControl1.Controls.Add(radioGroup1);
-            layoutControl1.Controls.Add(btnOk);
-            layoutControl1.Controls.Add(btnCancle);
-            layoutControl1.Dock = System.Windows.Forms.DockStyle.Fill;
-            layoutControl1.Location = new System.Drawing.Point(0, 0);
-            layoutControl1.Name = "layoutControl1";
-            layoutControl1.Root = Root;
-            layoutControl1.Size = new System.Drawing.Size(244, 233);
-            layoutControl1.TabIndex = 0;
-            layoutControl1.Text = "layoutControl1";
-            // 
-            // btnOk
-            // 
-            btnOk.Location = new System.Drawing.Point(123, 199);
-            btnOk.Name = "btnOk";
-            btnOk.Size = new System.Drawing.Size(109, 22);
-            btnOk.StyleController = layoutControl1;
-            btnOk.TabIndex = 7;
-            btnOk.Text = "确定";
-            btnOk.Click += btnOk_Click;
-            // 
-            // btnCancle
-            // 
-            btnCancle.Location = new System.Drawing.Point(12, 199);
-            btnCancle.Name = "btnCancle";
-            btnCancle.Size = new System.Drawing.Size(107, 22);
-            btnCancle.StyleController = layoutControl1;
-            btnCancle.TabIndex = 6;
-            btnCancle.Text = "取消";
-            btnCancle.Click += btnCancle_Click;
-            // 
-            // Root
-            // 
-            Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
-            Root.GroupBordersVisible = false;
-            Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem6, layoutControlItem7, layoutControlItem8 });
-            Root.Name = "Root";
-            Root.Size = new System.Drawing.Size(244, 233);
-            Root.TextVisible = false;
-            // 
-            // layoutControlItem6
-            // 
-            layoutControlItem6.Control = btnCancle;
-            layoutControlItem6.Location = new System.Drawing.Point(0, 187);
-            layoutControlItem6.Name = "layoutControlItem6";
-            layoutControlItem6.Size = new System.Drawing.Size(111, 26);
-            layoutControlItem6.TextSize = new System.Drawing.Size(0, 0);
-            layoutControlItem6.TextVisible = false;
-            // 
-            // layoutControlItem7
-            // 
-            layoutControlItem7.Control = btnOk;
-            layoutControlItem7.Location = new System.Drawing.Point(111, 187);
-            layoutControlItem7.Name = "layoutControlItem7";
-            layoutControlItem7.Size = new System.Drawing.Size(113, 26);
-            layoutControlItem7.TextSize = new System.Drawing.Size(0, 0);
-            layoutControlItem7.TextVisible = false;
-            // 
-            // radioGroup1
-            // 
-            radioGroup1.Location = new System.Drawing.Point(12, 12);
-            radioGroup1.Name = "radioGroup1";
-            radioGroup1.Properties.Columns = 1;
-            radioGroup1.Properties.Items.AddRange(new DevExpress.XtraEditors.Controls.RadioGroupItem[] { new DevExpress.XtraEditors.Controls.RadioGroupItem(0, "无模板"), new DevExpress.XtraEditors.Controls.RadioGroupItem(1, "三星定位任务模板"), new DevExpress.XtraEditors.Controls.RadioGroupItem(2, "两星一地定位任务模板"), new DevExpress.XtraEditors.Controls.RadioGroupItem(3, "星地测向融合定位任务模板") });
-            radioGroup1.Size = new System.Drawing.Size(220, 183);
-            radioGroup1.StyleController = layoutControl1;
-            radioGroup1.TabIndex = 8;
-            // 
-            // layoutControlItem8
-            // 
-            layoutControlItem8.Control = radioGroup1;
-            layoutControlItem8.Location = new System.Drawing.Point(0, 0);
-            layoutControlItem8.Name = "layoutControlItem8";
-            layoutControlItem8.Size = new System.Drawing.Size(224, 187);
-            layoutControlItem8.TextSize = new System.Drawing.Size(0, 0);
-            layoutControlItem8.TextVisible = false;
-            // 
-            // TaskTemplate
-            // 
-            AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
-            AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            ClientSize = new System.Drawing.Size(244, 233);
-            Controls.Add(layoutControl1);
-            FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
-            Name = "TaskTemplate";
-            Text = "RecEditor";
-            Load += CdbEditor_Load;
-            ((System.ComponentModel.ISupportInitialize)layoutControl1).EndInit();
-            layoutControl1.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)Root).EndInit();
-            ((System.ComponentModel.ISupportInitialize)layoutControlItem6).EndInit();
-            ((System.ComponentModel.ISupportInitialize)layoutControlItem7).EndInit();
-            ((System.ComponentModel.ISupportInitialize)radioGroup1.Properties).EndInit();
-            ((System.ComponentModel.ISupportInitialize)layoutControlItem8).EndInit();
-            ResumeLayout(false);
-        }
-
-        #endregion
-
-        private DevExpress.XtraLayout.LayoutControl layoutControl1;
-        private DevExpress.XtraLayout.LayoutControlGroup Root;
-        private DevExpress.XtraEditors.SimpleButton btnOk;
-        private DevExpress.XtraEditors.SimpleButton btnCancle;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
-        private DevExpress.XtraEditors.RadioGroup radioGroup1;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
-    }
-}

DW5S.App/EditForms/TaskTemplate.cs

@@ -1,46 +0,0 @@
-using DevExpress.Utils.About;
-using DW5S.Entity;
-using DW5S.Repostory;
-using DW5S.Service;
-using DW5S.ViewModel;
-using ExtensionsDev;
-using Serilog;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-
-namespace DW5S.App.EditForms
-{
-    public partial class TaskTemplate : DevExpress.XtraEditors.XtraForm
-    {
-        public int SelectedTemplate { get; set; }
-        public TaskTemplate()
-        {
-            InitializeComponent();
-            this.layoutControl1.UseDefault();
-            this.StartPosition = FormStartPosition.CenterParent;
-        }
-
-        private async void CdbEditor_Load(object sender, EventArgs e)
-        {
-
-        }
-
-        private void btnOk_Click(object sender, EventArgs e)
-        {
-            SelectedTemplate = this.radioGroup1.SelectedIndex;
-            this.DialogResult = DialogResult.OK;
-        }
-
-        private void btnCancle_Click(object sender, EventArgs e)
-        {
-            this.DialogResult = DialogResult.Cancel;
-        }
-    }
-}

DW5S.App/EditForms/TaskTemplate.resx

@@ -1,120 +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>
-</root>

DW5S.App/MainForm.cs

@@ -54,7 +54,6 @@ namespace DW5S
             InitializeComponent();
             ribbon.UseDefault();
             tabbedView1.UseDefault();
-            barTaskTemp.Visibility = BarItemVisibility.Never;
             ctrlTypes.Add("任务模版", typeof(CtrlTaskTemplate));
             ctrlTypes.Add("任务管理", typeof(CtrlHome)); 
             ctrlTypes.Add("采集结果", typeof(CtrlAdRes));