11

XdCxRhDW.App/App.config

@@ -13,10 +13,10 @@
 		<add key="LocalIP" value="" />
 
 		<!--自采集地图源URL-->
-		<add key="ZCJ_URL" value="http://192.168.0.1:12338/static/source/assets/textures"/>
+		<add key="ZCJ_URL" value="http://192.168.1.7:12338/static/source/assets/textures"/>
 
 		<!--数据中心地图源URL-->
-		<add key="SJZX_URL" value="http://192.168.1.2:5889/MapServer"/>
+		<add key="SJZX_URL" value="http://192.168.1.7:5889/MapServer"/>
 
 	</appSettings>
 	<startup>

XdCxRhDW.App/ExtensionsDev/MapControlEx.cs

@@ -855,12 +855,80 @@ public static class MapControlEx
     /// <returns></returns>
     public static MapControl UseWMTS(this MapControl ctrl, string url, EnumWmtsSource source, EnumMapLayerType layerType)
     {
-        var provider = new HttpMapDataProvider();
-        var tileSource = provider.TileSource as HttpTileSource;
-        tileSource.HttpServerAddr = url;
-        tileSource.WmtsSource = source;
-        tileSource.LayerType = layerType;
-        ctrl.GetImageLayer().DataProvider = provider;
+        //var provider = new HttpMapDataProvider();
+        //var tileSource = provider.TileSource as HttpTileSource;
+        //tileSource.HttpServerAddr = url;
+        //tileSource.WmtsSource = source;
+        //tileSource.LayerType = layerType;
+        //ctrl.GetImageLayer().DataProvider = provider;
+        if (source == EnumWmtsSource.SJZX)
+        {
+            if (layerType.HasFlag(EnumMapLayerType.SatMap))
+            {
+                var provider = new HttpMapDataProvider();
+                var tileSource = provider.TileSource as HttpTileSource;
+                tileSource.HttpServerAddr = url;
+                tileSource.WmtsSource = source;
+                tileSource.LayerType = layerType;
+                tileSource.LayerName = "satellite";
+                ImageLayer satelliteImageLayer = new ImageLayer();
+                ctrl.Layers.Add(satelliteImageLayer);
+                satelliteImageLayer.DataProvider = provider;
+                //ctrl.GetImageLayer().DataProvider = provider;
+            }
+            if (layerType.HasFlag(EnumMapLayerType.RoadMap) || layerType.HasFlag(EnumMapLayerType.XZQH_Map))
+            {
+                var provider = new HttpMapDataProvider();
+                var tileSource = provider.TileSource as HttpTileSource;
+                tileSource.HttpServerAddr = url;
+                tileSource.WmtsSource = source;
+                tileSource.LayerType = layerType;
+                tileSource.LayerName = "electron";
+                ImageLayer electronImageLayer = new ImageLayer();
+                ctrl.Layers.Add(electronImageLayer);
+                electronImageLayer.DataProvider = provider;
+            }
+        }
+        else
+        {
+            if (layerType.HasFlag(EnumMapLayerType.SatMap))
+            {
+                var provider = new HttpMapDataProvider();
+                var tileSource = provider.TileSource as HttpTileSource;
+                tileSource.HttpServerAddr = url;
+                tileSource.WmtsSource = source;
+                tileSource.LayerType = layerType;
+                tileSource.LayerName = "NaturalEarthII";
+                ImageLayer naturalEarthIIImageLayer = new ImageLayer();
+                ctrl.Layers.Add(naturalEarthIIImageLayer);
+                naturalEarthIIImageLayer.DataProvider = provider;
+                //ctrl.GetImageLayer().DataProvider = provider;
+            }
+            if (layerType.HasFlag(EnumMapLayerType.RoadMap))
+            {
+                var provider = new HttpMapDataProvider();
+                var tileSource = provider.TileSource as HttpTileSource;
+                tileSource.HttpServerAddr = url;
+                tileSource.WmtsSource = source;
+                tileSource.LayerType = layerType;
+                tileSource.LayerName = "roadmap-final";
+                ImageLayer roadmapIImageLayer = new ImageLayer();
+                ctrl.Layers.Add(roadmapIImageLayer);
+                roadmapIImageLayer.DataProvider = provider;
+            }
+            if (layerType.HasFlag(EnumMapLayerType.XZQH_Map))
+            {
+                var provider = new HttpMapDataProvider();
+                var tileSource = provider.TileSource as HttpTileSource;
+                tileSource.HttpServerAddr = url;
+                tileSource.WmtsSource = source;
+                tileSource.LayerType = layerType;
+                tileSource.LayerName = "overlay-final";
+                ImageLayer overlayImageLayer = new ImageLayer();
+                ctrl.Layers.Add(overlayImageLayer);
+                overlayImageLayer.DataProvider = provider;
+            }
+        }
         ctrl.MinZoomLevel = 3;
         ctrl.MaxZoomLevel = 20;
         return ctrl;
@@ -2566,6 +2634,7 @@ public static class MapControlEx
         public string HttpServerAddr { get; set; }
         public EnumWmtsSource WmtsSource { get; set; }
         public EnumMapLayerType LayerType { get; set; }
+        public string LayerName { get; set; }
         public GoogleMapType MapType { get; set; } = GoogleMapType.Normal;
 
         internal static double CalculateTotalImageSize(double zoomLevel)
@@ -2588,52 +2657,19 @@ public static class MapControlEx
                 if (zoomLevel <= maxZoomLevel)
                 {
                     string imgUrl = string.Empty;
-                    // imgUrl = $"{HttpServerAddr}/{(int)MapType}/{zoomLevel}/{tilePositionX}/{tilePositionY}";
-                    string layerName=string.Empty;
                     if (WmtsSource == EnumWmtsSource.SJZX)
                     {
-                        //if (LayerType == EnumMapLayerType.SatMap)
-                        //    layerName = "satellite";
-                        //else
-                        //    layerName = "electron";
-                        if (LayerType.HasFlag(EnumMapLayerType.SatMap))
-                        {
-                            layerName = "satellite";
-                        }
-                        if (LayerType.HasFlag(EnumMapLayerType.RoadMap)|| LayerType.HasFlag(EnumMapLayerType.XZQH_Map))
-                        {
-                            layerName = "electron";
-                        }
-                        imgUrl = $"{HttpServerAddr}?lyr={layerName}&x={tilePositionX}&y={tilePositionY}&z={zoomLevel}";
+                      
+                        imgUrl = $"{HttpServerAddr}?lyr={LayerName}&x={tilePositionX}&y={tilePositionY}&z={zoomLevel}";
                     }
                     else
                     {
                         string suffix = ".png";
-                        if (LayerType.HasFlag(EnumMapLayerType.SatMap))
+                        if (LayerType == EnumMapLayerType.SatMap)
                         {
                             suffix = ".jpg";
-                            layerName = "NaturalEarthII";
                         }
-                        if (LayerType.HasFlag(EnumMapLayerType.RoadMap))
-                        {
-
-                        }
-                        if (LayerType.HasFlag(EnumMapLayerType.XZQH_Map))
-                        {
-
-                        }
-                        //if (LayerType == EnumMapLayerType.SatMap)
-                        //{
-                        //    suffix = ".jpg";
-                        //    layerName = "NaturalEarthII";
-                        //}
-                        //else if (LayerType == EnumMapLayerType.RoadMap)
-                        //    layerName = "roadmap-final";
-                        //else
-                        //    layerName = "overlay-final";
-                        imgUrl = $"{HttpServerAddr}/{layerName}/{zoomLevel}/{tilePositionX}/{tilePositionY}{suffix}";
-
-
+                        imgUrl = $"{HttpServerAddr}/{LayerName}/{zoomLevel}/{tilePositionX}/{tilePositionY}{suffix}";
                     }
                     //string imgUrl = string.Format("http://192.168.0.214:58089/{0}/{1}/{2}/{3}", (int)GoogleMapType.Normal, zoomLevel, tilePositionX, tilePositionY);
                     Uri u = new Uri(imgUrl);

XdCxRhDW.App/UserControl/CtrlSysSettings.Designer.cs

@@ -29,13 +29,14 @@ namespace XdCxRhDW.App.UserControl
         /// </summary>
         private void InitializeComponent()
         {
-            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 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();
             this.tablePanel1 = new DevExpress.Utils.Layout.TablePanel();
             this.layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
+            this.txtLayer = new DevExpress.XtraEditors.CheckedListBoxControl();
             this.txtMapType = new DevExpress.XtraEditors.RadioGroup();
             this.btnSave = new DevExpress.XtraEditors.SimpleButton();
             this.txtHttpPort = new DevExpress.XtraEditors.TextEdit();
@@ -51,12 +52,12 @@ namespace XdCxRhDW.App.UserControl
             this.emptySpaceItem1 = new DevExpress.XtraLayout.EmptySpaceItem();
             this.emptySpaceItem2 = new DevExpress.XtraLayout.EmptySpaceItem();
             this.itemWmtsSource = new DevExpress.XtraLayout.LayoutControlItem();
-            this.txtLayer = new DevExpress.XtraEditors.CheckedListBoxControl();
             this.itemMapLayer = new DevExpress.XtraLayout.LayoutControlItem();
             ((System.ComponentModel.ISupportInitialize)(this.tablePanel1)).BeginInit();
             this.tablePanel1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).BeginInit();
             this.layoutControl1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.txtLayer)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtMapType.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtHttpPort.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtXLDirectory.Properties)).BeginInit();
@@ -71,7 +72,6 @@ namespace XdCxRhDW.App.UserControl
             ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.itemWmtsSource)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtLayer)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.itemMapLayer)).BeginInit();
             this.SuspendLayout();
             // 
@@ -113,6 +113,17 @@ namespace XdCxRhDW.App.UserControl
             this.layoutControl1.TabIndex = 0;
             this.layoutControl1.Text = "layoutControl1";
             // 
+            // txtLayer
+            // 
+            this.txtLayer.CheckOnClick = true;
+            this.txtLayer.Location = new System.Drawing.Point(12, 296);
+            this.txtLayer.MultiColumn = true;
+            this.txtLayer.Name = "txtLayer";
+            this.txtLayer.SelectionMode = System.Windows.Forms.SelectionMode.MultiSimple;
+            this.txtLayer.Size = new System.Drawing.Size(372, 23);
+            this.txtLayer.StyleController = this.layoutControl1;
+            this.txtLayer.TabIndex = 12;
+            // 
             // txtMapType
             // 
             this.txtMapType.EditValue = 0;
@@ -165,7 +176,7 @@ namespace XdCxRhDW.App.UserControl
             this.txtYDPZThreshold.Name = "txtYDPZThreshold";
             this.txtYDPZThreshold.Properties.AutoHeight = false;
             this.txtYDPZThreshold.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, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
             this.txtYDPZThreshold.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
             this.txtYDPZThreshold.Properties.MaskSettings.Set("MaskManagerSignature", "allowNull=False");
             this.txtYDPZThreshold.Properties.MaskSettings.Set("mask", "f0");
@@ -303,16 +314,6 @@ namespace XdCxRhDW.App.UserControl
             this.itemWmtsSource.TextSize = new System.Drawing.Size(96, 14);
             this.itemWmtsSource.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
             // 
-            // txtLayer
-            // 
-            this.txtLayer.Location = new System.Drawing.Point(12, 296);
-            this.txtLayer.MultiColumn = true;
-            this.txtLayer.Name = "txtLayer";
-            this.txtLayer.SelectionMode = System.Windows.Forms.SelectionMode.MultiSimple;
-            this.txtLayer.Size = new System.Drawing.Size(372, 23);
-            this.txtLayer.StyleController = this.layoutControl1;
-            this.txtLayer.TabIndex = 12;
-            // 
             // itemMapLayer
             // 
             this.itemMapLayer.Control = this.txtLayer;
@@ -342,6 +343,7 @@ namespace XdCxRhDW.App.UserControl
             this.tablePanel1.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).EndInit();
             this.layoutControl1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.txtLayer)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtMapType.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtHttpPort.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtXLDirectory.Properties)).EndInit();
@@ -356,7 +358,6 @@ namespace XdCxRhDW.App.UserControl
             ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.itemWmtsSource)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtLayer)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.itemMapLayer)).EndInit();
             this.ResumeLayout(false);