111

Service/CheckServer/App.config

@@ -11,7 +11,7 @@
 		<add key="PosPlatformAddr" value="http://127.0.0.1:8091" />
 
 		<!--使用老板本检测=1,使用新版本检测=2,老板本无结果时使用新版本=3-->
-		<add key="DamaVersion" value="1"/>
+		<add key="DamaVersion" value="2"/>
 
 	</appSettings>
 	<startup>

XdCxRhDW.App/EditForms/X2D1DTOParamEditor.cs

@@ -100,24 +100,52 @@ namespace XdCxRhDW.App.EditForms
                 this.txtRefLocation.Text = $"{0},{0}";
             }
 
-            //txtsatStation.Text = "43.7,12.9";
-            //txtcdbStation.Text = "43.7,12.9";
-            //txtDtoSx.Text = "6348.6030";
-            //txtDtoCdb.Text = "246616.0330";
-            //ucEphXYZMain.SetXYZ("a",1,(11265194.9906, 40486056.6399, -2055810.5412),Color.Red);
-            //ucEphXYZAdaj.SetXYZ("b",1,(25525328.3455, 33539987.1755, -49504.0378),Color.Red);
-
-            //double tarLon = 46, tarLat = 24;
-            //double recLon = 45.9, recLat = 23.9;
+            txtsatStation.Text = "43.7,12.9";
+            txtcdbStation.Text = "43.7,12.9";
+            txtDtoSx.Text = "6348.6030";
+            txtDtoCdb.Text = "246616.0330";
+            ucEphXYZMain.SetXYZ("a", 1, (11265194.9906, 40486056.6399, -2055810.5412), Color.Red);
+            ucEphXYZAdaj.SetXYZ("b", 1, (25525328.3455, 33539987.1755, -49504.0378), Color.Red);
+
+            //double tarLon = 43.065, tarLat = 11.519;
+            //double recLon = 45, recLat = 13;
             //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 xl1 = (14074005d, 39760440d, -15578d);
+            //var xl2 = (17150792d, 38524581d, -27470d);
+            //var xl3 = (25371296d, 33674065d, -21642);
+
+            ////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, xl1, recEcef);
+            //var dt2 = PhysicsHelper.Dto(tarEcef, xl2, recEcef);
+            //var dt3 = PhysicsHelper.Dto(tarEcef, xl3, recEcef);
+
             //var dto1 = (dt1 - dt2) * 1e6;
-            //var dt3 = PhysicsHelper.Dto(tarEcef, recEcef);
             //var dto2 = (dt1 - dt3) * 1e6;
+            //var res=PosApi.X3_PosNoRef(new CgRes()
+            //{
+            //    Dto1 = dto1,
+            //    Dto2 = dto2,
+            //    Snr1 = 16,
+            //    Snr2 = 19,
+            //    MainCode = 1,
+            //    Adja1Code = 2,
+            //    Adja2Code = 3,
+            //    MainX = xl1.Item1,
+            //    MainY = xl1.Item2,
+            //    MainZ = xl1.Item3,
+            //    Adja1X = xl2.Item1,
+            //    Adja1Y = xl2.Item2,
+            //    Adja1Z = xl2.Item3,
+            //    Adja2X = xl3.Item1,
+            //    Adja2Y = xl3.Item2,
+            //    Adja2Z = xl3.Item3,
+            //}, new StationRes()
+            //{
+            //    SatTxLon = recLon,
+            //    SatTxLat = recLat,
+            //});
         }
 
 

XdCxRhDW.App/ExtensionsDev/MapControlEx.cs

@@ -1066,6 +1066,7 @@ public static class MapControlEx
         ctrl.MaxZoomLevel = 20;
         return ctrl;
     }
+
     /// <summary>
     /// 使用WMS图源
     /// </summary>
@@ -3051,7 +3052,8 @@ public static class MapControlEx
                         {
                             suffix = ".jpg";
                         }
-                        imgUrl = $"{HttpServerAddr}/{LayerName}/{zoomLevel}/{tilePositionX}/{-tilePositionY}{suffix}";
+                        int maxY=(int)Math.Pow(2, zoomLevel);
+                        imgUrl = $"{HttpServerAddr}/{LayerName}/{zoomLevel}/{tilePositionX}/{maxY-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.cs

@@ -133,7 +133,13 @@ namespace XdCxRhDW.App.UserControl
                     res.MapType = txtMapType.SelectedIndex;
                     if (txtMapType.SelectedIndex != 0)
                     {
-                        res.WmtsSource = (EnumWmtsSource)txtWmtsSource.EditValue;
+                        var wmtsSource= (EnumWmtsSource)txtWmtsSource.EditValue;
+                        if (!mapChanged)
+                        {
+                            mapChanged = res.WmtsSource != wmtsSource;
+                        }
+                        res.WmtsSource = wmtsSource;
+
                         EnumMapLayerType layerType = EnumMapLayerType.None;
                         for (int i = 0; i < txtLayer.Items.Count; i++)
                         {