地图更新

XCoder/CrazyCoder.csproj

@@ -66,13 +66,13 @@
     <Content Include="数据库命名规范.txt" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="NewLife.Map" Version="2.2.2022.1201" />
-    <PackageReference Include="NewLife.ModbusRTU" Version="1.6.2022.1209-beta0513" />
+    <PackageReference Include="NewLife.Map" Version="2.3.2022.1213-beta1540" />
+    <PackageReference Include="NewLife.ModbusRTU" Version="1.6.2022.1213-beta0753" />
     <PackageReference Include="System.Speech" Version="7.0.0" />
     <PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0" />
     <PackageReference Include="Microsoft.VisualBasic" Version="10.3.0" />
     <PackageReference Include="NewLife.Core">
-      <Version>10.1.2022.1210-beta0436</Version>
+      <Version>10.1.2022.1213-beta0750</Version>
     </PackageReference>
     <PackageReference Include="NewLife.MQTT">
       <Version>1.2.2022.1201</Version>
@@ -84,10 +84,10 @@
       <Version>5.0.2022.1201</Version>
     </PackageReference>
     <PackageReference Include="NewLife.Stardust">
-      <Version>2.5.2022.1206-beta0251</Version>
+      <Version>2.5.2022.1213-beta0750</Version>
     </PackageReference>
     <PackageReference Include="NewLife.XCode">
-      <Version>11.5.2022.1201</Version>
+      <Version>11.5.2022.1212-beta1503</Version>
     </PackageReference>
     <PackageReference Include="SSH.NET">
       <Version>2020.0.2</Version>

XCoder/Program.cs

@@ -2,6 +2,7 @@
 using System.Text;
 using NewLife;
 using NewLife.Log;
+using NewLife.Model;
 using NewLife.Threading;
 using Stardust;
 
@@ -46,6 +47,8 @@ static class Program
 
         XTrace.WriteLine("初始化服务端地址：{0}", server);
 
+        var star = new StarFactory();
+
         var client = new StarClient(server)
         {
             Code = set.Code,

XCoder/Yun/FrmMap.cs

@@ -3,6 +3,7 @@ using System.Reflection;
 using NewLife;
 using NewLife.Data;
 using NewLife.Log;
+using NewLife.Model;
 using NewLife.Reflection;
 using NewLife.Serialization;
 using NewLife.Yun;
@@ -15,6 +16,7 @@ public partial class FrmMap : Form, IXForm
 {
     /// <summary>业务日志输出</summary>
     ILog BizLog;
+    Dictionary<String, Map> _cache = new();
 
     #region 窗体
     public FrmMap()
@@ -105,10 +107,19 @@ public partial class FrmMap : Form, IXForm
 
         SaveConfig();
         var cfg = Setting;
+        var provider = ObjectContainer.Provider;
 
-        var map = type.CreateInstance() as NewLife.Yun.Map;
-        map.Log = XTrace.Log;
-        map.CoordType = cfg.Coordtype;
+        if (!_cache.TryGetValue(type.Name, out var map))
+        {
+            //var map = Map.Create(type.Name) as Map;
+            map = type.GetConstructor(new[] { typeof(IServiceProvider) }) != null ?
+               type.CreateInstance(provider) as Map :
+               type.CreateInstance() as Map;
+            map.Log = XTrace.Log;
+            map.CoordType = cfg.Coordtype;
+
+            _cache.Add(type.Name, map);
+        }
 
         if (map is BaiduMap bmap)
             bmap.AppKey = "C73357a276668f8b0563d3f936475007";
@@ -169,6 +180,7 @@ public partial class FrmMap : Form, IXForm
                     var ps = new Dictionary<String, Object>();
                     if (mps.Any(k => k.Name.EqualIgnoreCase("address"))) ps["address"] = addr;
                     if (mps.Any(k => k.Name.EqualIgnoreCase("city"))) ps["city"] = cfg.City;
+                    if (mps.Any(k => k.Name.EqualIgnoreCase("point"))) ps["point"] = point;
 
                     var task = map.InvokeWithParams(method, ps) as Task;
                     await task;