zoulei 1 ano atrás
pai
commit
575d7321af

+ 0 - 1
XdCxRhDW.App/Controllers/PosController.cs

@@ -12,7 +12,6 @@ using XdCxRhDW.Repostory;
 using System.IO;
 using XdCxRhDW.Entity;
 using XdCxRhDW.Api;
-using XdCxRhDw.Dto;
 using XdCxRhDW.WebApi;
 using DPP_YH_Core.Extensions;
 using XdCxRhDW.App.Model;

+ 1 - 2
XdCxRhDW.App/Controllers/TxController.cs

@@ -9,9 +9,8 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using System.Web.Http;
-using XdCxRhDw.Dto;
-using XdCxRhDW.Api;
 using XdCxRhDW.Dto;
+using XdCxRhDW.Api;
 using XdCxRhDW.Entity;
 using XdCxRhDW.Repostory;
 using XdCxRhDW.WebApi;

+ 1 - 2
XdCxRhDW.App/Controllers/XlController.cs

@@ -9,9 +9,8 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using System.Web.Http;
-using XdCxRhDw.Dto;
-using XdCxRhDW.Api;
 using XdCxRhDW.Dto;
+using XdCxRhDW.Api;
 using XdCxRhDW.Entity;
 using XdCxRhDW.Repostory;
 using XdCxRhDW.WebApi;

+ 1 - 2
XdCxRhDW.App/CorTools/XlCalculateForm.cs

@@ -13,9 +13,8 @@ using System.IO;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using XdCxRhDw.Dto;
-using XdCxRhDW.App.Model;
 using XdCxRhDW.Dto;
+using XdCxRhDW.App.Model;
 using XdCxRhDW.Entity;
 using XdCxRhDW.Repostory;
 

+ 1 - 2
XdCxRhDW.App/EditForms/X2D1PosParamEditor.cs

@@ -9,9 +9,8 @@ using System.Drawing;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using XdCxRhDw.Dto;
-using XdCxRhDW.Api;
 using XdCxRhDW.Dto;
+using XdCxRhDW.Api;
 using XdCxRhDW.Entity;
 using XdCxRhDW.Repostory;
 

+ 0 - 1
XdCxRhDW.App/EditForms/X2PosParamEditor.cs

@@ -24,7 +24,6 @@ using XdCxRhDW.Dto;
 using XdCxRhDW.Repostory;
 using XdCxRhDW.Entity;
 using XdCxRhDW.Api;
-using XdCxRhDw.Dto;
 
 namespace XdCxRhDW.App.EditForms
 {

+ 0 - 1
XdCxRhDW.App/ExtensionsDev/GridControlEx.cs

@@ -659,7 +659,6 @@ public static class GridControlEx
     /// <param name="meunImage">菜单图标</param>
     /// <param name="action">菜单要执行的事件,参数为绑定的数据源</param>
     /// <param name="showWithNoneDataRow">内容区没有元素时是否显示此菜单,默认显示</param>
-    /// <param name="existMenu">如果GirdControl行元素已经存在PopupMenu,则需要传入存在的PopupMenu)</param>
     /// <returns></returns>
     public static GridControl AddContentMenu<T>(this GridControl grid, string menuText, SvgImage meunImage,
         Action<List<T>> action, bool showWithNoneDataRow = true)

+ 0 - 1
XdCxRhDW.App/ExtensionsDev/MapControlEx.cs

@@ -788,7 +788,6 @@ public static class MapControlEx
     /// 使用WMS图源
     /// </summary>
     /// <param name="ctrl"></param>
-    /// <param name="wmsURI">such as http://ows.mundialis.de/services/service</param>
     /// <param name="wmsType"></param>
     /// <param name="layerName"></param>
     /// <returns></returns>

+ 48 - 1
XdCxRhDW.App/Localizer/ChsLocalizer.cs

@@ -1,4 +1,7 @@
-using DevExpress.XtraBars.Docking2010;
+using DevExpress.Map.Localization;
+using DevExpress.Utils.Filtering.Internal;
+using DevExpress.Utils.Localization;
+using DevExpress.XtraBars.Docking2010;
 using DevExpress.XtraBars.Localization;
 using DevExpress.XtraEditors;
 using DevExpress.XtraEditors.Controls;
@@ -9,6 +12,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using System.Windows;
 
 namespace XdCxRhDW
 {
@@ -33,8 +37,51 @@ namespace XdCxRhDW
 
             //Control
             Localizer.Active = new ChsControlLocalizer();
+
+            XtraLocalizer.QueryLocalizedString += XtraLocalizer_QueryLocalizedString;
+        }
+
+        private static void XtraLocalizer_QueryLocalizedString(object sender, XtraLocalizer.QueryLocalizedStringEventArgs e)
+        {
+            if (e.StringIDType == typeof(StringId))
+            {
+                if ((StringId)e.StringID == StringId.FilterShowAll)
+                {
+                    e.Value = "(全选)";
+                }
+
+            }
+            else if (e.StringIDType == typeof(GridStringId))
+            {
+
+            }
+            else if (e.StringIDType == typeof(BarString))
+            {
+            }
+            else if (e.StringIDType == typeof(DocumentManagerStringId))
+            {
+
+            }
+            else if (e.StringIDType == typeof(LayoutStringId))
+            {
+            }
+            else if (e.StringIDType == typeof(MapStringId))
+            {
+            }
+            else if (e.StringIDType == typeof(FilteringLocalizerStringId))
+            {
+
+            }
+            else if (e.StringIDType == typeof(FilterUIElementLocalizerStringId))
+            {
+            }
+            else
+            {
+            }
         }
 
+
+
     }
     class ChsControlLocalizer : Localizer
     {

+ 1 - 1
XdCxRhDW.App/Program.cs

@@ -115,7 +115,7 @@ namespace XdCxRhDW
             if (Debugger.IsAttached)
             {
                 //DevExpress23.2以上版本查看未本地化的资源
-                //DevExpress.Utils.Localization.XtraLocalizer.EnableTraceSource();
+                DevExpress.Utils.Localization.XtraLocalizer.EnableTraceSource();
             }
             if (IsRunningAsAdmin())
             {

+ 1 - 1
XdCxRhDW.App/Properties/Resources.Designer.cs

@@ -8,7 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace XdCxRhDW.App.App.Properties {
+namespace XdCxRhDW.App.Properties {
     using System;
     
     

+ 0 - 1
XdCxRhDW.App/UserControl/CtrlHome.cs

@@ -39,7 +39,6 @@ using DPP_YH_Core.Extensions;
 using static DevExpress.Utils.Drawing.Helpers.NativeMethods;
 using DevExpress.Utils.Filtering;
 using DevExpress.Data.Svg;
-using XdCxRhDw.Dto;
 
 namespace XdCxRhDW.App.UserControl
 {

+ 1 - 1
XdCxRhDW.TaskServer/MySqlTools.cs

@@ -2,7 +2,7 @@
 using System;
 using System.Data;
 
-namespace XdCxRhDw
+namespace XdCxRhDW.TaskServer
 {
     public static class MySqlTools
     {

+ 1 - 1
XdCxRhDW.TaskServer/Task/HistoryTaskI.cs

@@ -8,7 +8,7 @@ using System.IO;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using XdCxRhDw;
+using XdCxRhDW;
 using XdCxRhDW.Dto;
 
 namespace XdCxRhDW.TaskServer.Task

+ 1 - 1
XdCxRhDW.TaskServer/Task/X2D1Task.cs

@@ -9,7 +9,7 @@ using System.Security.Policy;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
-using XdCxRhDw;
+using XdCxRhDW;
 using XdCxRhDW.Dto;
 using ZstdSharp.Unsafe;
 

+ 1 - 0
XdCxRhDW.TaskServer/XdCxRhDW.TaskServer.csproj

@@ -40,6 +40,7 @@
     <Reference Include="DevExpress.Data.Desktop.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
     <Reference Include="DevExpress.Data.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
     <Reference Include="DevExpress.Drawing.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.Map.v23.2.Core, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
     <Reference Include="DevExpress.Printing.v23.2.Core, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
     <Reference Include="DevExpress.Utils.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
     <Reference Include="DevExpress.XtraBars.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />

+ 1 - 1
XdCxRhDw.Dto/SatEphResDto.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace XdCxRhDw.Dto
+namespace XdCxRhDW.Dto
 {
     /// <summary>
     /// 星历推算结果模型