更新WingDll，当魔盒连接老版云服务，图像采集功能自动关闭，且无法打开。默认端口修改为443

FISSDK/FISIMPL/FISIMPL.cs

@@ -46,7 +46,7 @@ namespace FISIMPL
 
         internal static FISPlatform Platform { get; private set; }
 
-        internal static bool IsConnectWithOldServer { get; private set; }
+        public static bool IsConnectWithOldServer { get; private set; }
 
         public static string FISLogBasePath { get; private set; }
 

Vinno.FIS.Sonopost/Assets/wwwroot/lang/en-us.json

@@ -241,5 +241,6 @@
   "ConfirmReset": "Please confirm whether you want to restore factory settings?",
   "ConfirmDeleteSetting": "Please confirm whether you want to delete custom configuration? <br> If you select delete, the sonopost automatically restarts after the deletion is complete.",
   "Yes": "Yes",
-  "No": "No"
+  "No": "No",
+  "ServerNotSupport": "Current vCloud server doesn't support image capture function."
 }

Vinno.FIS.Sonopost/Assets/wwwroot/lang/zh-cn.json

@@ -241,5 +241,6 @@
   "ConfirmReset": "请确认是否要恢复出厂设置?",
   "ConfirmDeleteSetting": "请确认是否要删除自定义配置文件? <br> 若选择删除，删除完成后魔盒会自动重启。",
   "Yes": "是",
-  "No": "否"
+  "No": "否",
+  "ServerNotSupport": "当前云服务不支持图像采集功能"
 }

Vinno.FIS.Sonopost/Assets/wwwroot/pages/server/login.html

@@ -253,7 +253,7 @@
         function initServerNodeEvent() {
             form.on("select(ServerNode)", function (data) {
                 let ip = data.value;
-                let port = 9096;
+                let port = 443;
                 let serverName = "";
                 if (ip === "custom") {
                     $("#pageLogin .custom-server-item").show();

Vinno.FIS.Sonopost/Managers/Interfaces/ILoginManager.cs

@@ -14,6 +14,11 @@ namespace Vinno.FIS.Sonopost.Managers.Interfaces
         /// </summary>
         bool IsLoginWithAccountAndPassword { get; }
 
+        /// <summary>
+        /// 是否连接的是老版云服务
+        /// </summary>
+        bool IsConnectWithOldServer { get; }
+
         /// <summary>
         /// 当前登录状态
         /// </summary>

Vinno.FIS.Sonopost/Managers/LoginManager.cs

@@ -21,6 +21,7 @@ namespace Vinno.FIS.Sonopost.Managers
         private IVersionCheckManager _versionCheckManager;
         private ILiveVideoManager _liveVideoManager;
         private IOledManager _oledManager;
+        private IKeyBoardListenManager _keyBoardListenManager;
 
         public bool IsLoginWithAccountAndPassword { get; private set; }
 
@@ -30,6 +31,8 @@ namespace Vinno.FIS.Sonopost.Managers
         public string QRCodeString { get; private set; }
         public DeviceStatus DeviceStatus { get; private set; }
 
+        public bool IsConnectWithOldServer => FISIMPL.FISIMPL.IsConnectWithOldServer;
+
         public LoginManager()
         {
             _configManager = AppManager.Instance.GetManager<IConfigManager>();
@@ -46,6 +49,7 @@ namespace Vinno.FIS.Sonopost.Managers
             _liveVideoManager = AppManager.Instance.GetManager<ILiveVideoManager>();
             _versionCheckManager = AppManager.Instance.GetManager<IVersionCheckManager>();
             _oledManager = AppManager.Instance.GetManager<IOledManager>();
+            _keyBoardListenManager = AppManager.Instance.GetManager<IKeyBoardListenManager>();
         }
 
         private void OnFISDeviceStatusChanged(object sender, FISDeviceStatusInfo e)
@@ -84,7 +88,20 @@ namespace Vinno.FIS.Sonopost.Managers
                             _configManager.Save();
                         }
                         _liveVideoManager.UpdateDeviceResoution();
-                        _liveVideoManager.ChangeRealTimeCaptureSetting();
+                        if (IsConnectWithOldServer)
+                        {
+                            if (SonopostUserDefinedSettings.Instance.CaptureSetting.RealTimeCaptureEnabled)
+                            {
+                                SonopostUserDefinedSettings.Instance.CaptureSetting.RealTimeCaptureEnabled = false;
+                                _configManager.Save();
+                                _keyBoardListenManager.StopKeyBoardListen();
+                            }
+                        }
+                        else
+                        {
+                            _liveVideoManager.ChangeRealTimeCaptureSetting();
+
+                        }
                         _versionCheckManager.CheckVersion();
                         var organization = _connectionService.GetOrganizationName();
                         if (organization != _ultrasoundMachineInfo.Organizataion)

Vinno.FIS.Sonopost/Vinno.FIS.Sonopost.csproj

@@ -111,7 +111,6 @@
     <Compile Include="WebApi\Models\PhysicalUniqueIdRequest.cs" />
     <Compile Include="WebApi\Models\RainbowImageDetectSettingItem.cs" />
     <Compile Include="WebApi\Models\Result.cs" />
-    <Compile Include="WebApi\Models\ServerLoginInfoResult.cs" />
     <Compile Include="WebApi\Models\ServerLoginRequest.cs" />
     <Compile Include="WebApi\Models\ServerLoginResult.cs" />
     <Compile Include="WebApi\Models\ServerNodeRequest.cs" />

Vinno.FIS.Sonopost/WebApi/Controllers/DicomController.cs

@@ -195,6 +195,10 @@ namespace Vinno.FIS.Sonopost.WebApi.Controllers
             {
                 return Result.Fail("KeyBoardKeyConflict");
             }
+            if (LoginManager.IsConnectWithOldServer && captureSettingModel.CaptureEnabled)
+            {
+                return Result.Fail("ServerNotSupport");
+            }
             SonopostUserDefinedSettings.Instance.CaptureSetting.RealTimeCaptureEnabled = captureSettingModel.CaptureEnabled;
             SonopostUserDefinedSettings.Instance.CaptureSetting.ImageCaptureKeyForFootToogle = (EnumFootToggleKey)captureSettingModel.ImageCaptureForFootToggleKey;
             SonopostUserDefinedSettings.Instance.CaptureSetting.VideoCaptureKeyForFootToggle = (EnumFootToggleKey)captureSettingModel.VideoCaptureForFootToggleKey;

Vinno.FIS.Sonopost/WebApi/Controllers/ServerController.cs

@@ -108,7 +108,7 @@ namespace Vinno.FIS.Sonopost.WebApi.Controllers
             {
                 isExisted = true;
             }
-            var result = new ServerLoginInfoResult
+            var result = new ServerLoginResult2
             {
                 QRCodeString = LoginManager.QRCodeString,
                 UniqueId = LoginManager.UniqueId,

Vinno.FIS.Sonopost/WebApi/Models/ServerLoginInfoResult.cs

@@ -1,22 +0,0 @@
-namespace Vinno.FIS.Sonopost.WebApi.Models
-{
-    internal class ServerLoginInfoResult
-    {
-        public string QRCodeString { get; set; }
-        public string UniqueId { get; set; }
-        public string Address { get; set; }
-        public int Port { get; set; }
-        public string Account { get; set; }
-        public string Password { get; set; }
-
-        public bool IsLoginWithAccountAndPassword { get; set; }
-
-        public bool IsExisted { get; set; }
-
-        public string DongleId { get; set; }
-
-        public bool IsLogged { get => !string.IsNullOrWhiteSpace(UniqueId); }
-
-        public string VCloudServerName { get; set; }
-    }
-}

Vinno.FIS.Sonopost/WebApi/Models/ServerLoginResult.cs

@@ -6,4 +6,22 @@
 
         public string QRCodeString { get; set; }
     }
+
+    internal class ServerLoginResult2 : ServerLoginResult
+    {
+        public string Address { get; set; }
+        public int Port { get; set; }
+        public string Account { get; set; }
+        public string Password { get; set; }
+
+        public bool IsLoginWithAccountAndPassword { get; set; }
+
+        public bool IsExisted { get; set; }
+
+        public string DongleId { get; set; }
+
+        public bool IsLogged { get => !string.IsNullOrWhiteSpace(UniqueId); }
+
+        public string VCloudServerName { get; set; }
+    }
 }