默认端口改为443，LanguageSetting修改，

Vinno.FIS.Sonopost/Common/SonopostConstants.cs

@@ -41,7 +41,7 @@
         public const string NewIndiaServer = "bom.flyinsono.com:80";
         public const string NewIndiaServerHost = "bom.flyinsono.com";
 
-        public const int CurrentSonopostUserDefinedSettingVersion = 0;
+        public const int CurrentSonopostUserDefinedSettingVersion = 1;
 
         /// <summary>
         /// Original dicom folder.

Vinno.FIS.Sonopost/Features/Config/LanguageSetting.cs

@@ -0,0 +1,11 @@
+using Vinno.FIS.Sonopost.Features.Oled;
+
+namespace Vinno.FIS.Sonopost.Features.Config
+{
+    internal class LanguageSetting
+    {
+        public Language OLedLanguage { get; set; }
+
+        public Language PageLanguage { get; set; }
+    }
+}

Vinno.FIS.Sonopost/Features/Config/OledSetting.cs

@@ -1,9 +0,0 @@
-using Vinno.FIS.Sonopost.Features.Oled;
-
-namespace Vinno.FIS.Sonopost.Features.Config
-{
-    internal class OledSetting
-    {
-        public Language Language { get; set; }
-    }
-}

Vinno.FIS.Sonopost/Features/Config/PageSetting.cs

@@ -1,9 +0,0 @@
-using Vinno.FIS.Sonopost.Features.Oled;
-
-namespace Vinno.FIS.Sonopost.Features.Config
-{
-    internal class PageSetting
-    {
-        public Language Language { get; set; }
-    }
-}

Vinno.FIS.Sonopost/Features/Config/SonopostUserDefinedSettingInfo.cs

@@ -18,8 +18,7 @@ namespace Vinno.FIS.Sonopost.Features.Config
 
         public HardwareSetting HardwareSetting { get; set; }
 
-        public OledSetting OledSetting { get; set; }
-        public PageSetting PageSetting { get; set; }
+        public LanguageSetting LanguageSetting { get; set; }
 
         public CaptureSetting CaptureSetting { get; set; }
 
@@ -65,6 +64,8 @@ namespace Vinno.FIS.Sonopost.Features.Config
                 }
                 if (Instance.Version < SonopostConstants.CurrentSonopostUserDefinedSettingVersion)
                 {
+                    UpgradeSettingFrom0To1();
+                    Instance.Save();
                 }
                 return true;
             }
@@ -74,6 +75,19 @@ namespace Vinno.FIS.Sonopost.Features.Config
             return false;
         }
 
+        private static void UpgradeSettingFrom0To1()
+        {
+            if (Instance.Version == 0)
+            {
+                Instance.LanguageSetting = new LanguageSetting
+                {
+                    OLedLanguage = Language.Chinese,
+                    PageLanguage = Language.English,
+                };
+                Instance.Version = 1;
+            }
+        }
+
         internal void Reset()
         {
             InitInstance();
@@ -86,14 +100,14 @@ namespace Vinno.FIS.Sonopost.Features.Config
             {
                 ServerSetting = new ServerSetting
                 {
-                    DefaultServer = new ServerInfoSetting(SonopostConstants.NewHongkongServerHost, 80, true, SonopostConstants.FlyinsonoServerName),
+                    DefaultServer = new ServerInfoSetting(SonopostConstants.NewHongkongServerHost, 443, true, SonopostConstants.FlyinsonoServerName),
                     Servers = new List<ServerInfoSetting>
                     {
-                        new ServerInfoSetting(SonopostConstants.NewHongkongServerHost, 80, true, SonopostConstants.FlyinsonoServerName),
-                        new ServerInfoSetting(SonopostConstants.NewChinaServerHost, 80, true, ""),
-                        new ServerInfoSetting(SonopostConstants.NewGermanyServerHost, 80, true, ""),
-                        new ServerInfoSetting(SonopostConstants.NewHongkongServerHost, 80, true, ""),
-                        new ServerInfoSetting(SonopostConstants.NewIndiaServerHost, 80, true, ""),
+                        new ServerInfoSetting(SonopostConstants.NewHongkongServerHost, 443, true, SonopostConstants.FlyinsonoServerName),
+                        new ServerInfoSetting(SonopostConstants.NewChinaServerHost, 443, true, ""),
+                        new ServerInfoSetting(SonopostConstants.NewGermanyServerHost, 443, true, ""),
+                        new ServerInfoSetting(SonopostConstants.NewHongkongServerHost, 443, true, ""),
+                        new ServerInfoSetting(SonopostConstants.NewIndiaServerHost, 443, true, ""),
                     },
                 },
                 DicomSetting = new DicomSetting
@@ -113,13 +127,10 @@ namespace Vinno.FIS.Sonopost.Features.Config
                     VideoDeviceInfoList = new List<FISVideoDeviceInfo>(),
                     MicDeviceInfo = new FISMicDeviceInfo(),
                 },
-                OledSetting = new OledSetting
-                {
-                    Language = Language.Chinese,
-                },
-                PageSetting = new PageSetting
+                LanguageSetting = new LanguageSetting
                 {
-                    Language = Language.Chinese,
+                    PageLanguage = Language.Chinese,
+                    OLedLanguage = Language.Chinese,
                 },
                 CaptureSetting = new CaptureSetting
                 {

Vinno.FIS.Sonopost/Managers/OledManager.cs

@@ -28,13 +28,13 @@ namespace Vinno.FIS.Sonopost.Managers
         public OledManager()
         {
             _configManager = AppManager.Instance.GetManager<IConfigManager>();
-            OledMessages.Init();
             Init();
-            CurrentLanguage = SonopostUserDefinedSettings.Instance.OledSetting.Language;
+            CurrentLanguage = SonopostUserDefinedSettings.Instance.LanguageSetting.OLedLanguage;
         }
 
         private void Init()
         {
+            OledMessages.Init();
             Task.Run(() =>
             {
                 string commName = string.Empty;
@@ -329,7 +329,7 @@ namespace Vinno.FIS.Sonopost.Managers
         {
             if (language != CurrentLanguage)
             {
-                SonopostUserDefinedSettings.Instance.OledSetting.Language = language;
+                SonopostUserDefinedSettings.Instance.LanguageSetting.OLedLanguage = language;
                 _configManager.Save();
                 CurrentLanguage = language;
                 ShowStatus(_currentStatus);

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

@@ -80,7 +80,7 @@
     <Compile Include="Common\EnumFootToggleKey.cs" />
     <Compile Include="Common\EnumKeyboardKey.cs" />
     <Compile Include="Features\Config\CaptureSetting.cs" />
-    <Compile Include="Features\Config\PageSetting.cs" />
+    <Compile Include="Features\Config\LanguageSetting.cs" />
     <Compile Include="Features\Config\ServerInfoSetting.cs" />
     <Compile Include="Features\Dicom\VidInfo.cs" />
     <Compile Include="Helpers\DirectoryHelper.cs" />
@@ -142,7 +142,6 @@
     <Compile Include="Features\Config\DicomSetting.cs" />
     <Compile Include="Features\Config\HardwareSetting.cs" />
     <Compile Include="Features\Config\NetworkSetting.cs" />
-    <Compile Include="Features\Config\OledSetting.cs" />
     <Compile Include="Features\Config\ServerSetting.cs" />
     <Compile Include="Features\Config\SonopostSystemSettingInfo.cs" />
     <Compile Include="Features\Config\SonopostUserDefinedSettingInfo.cs" />

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

@@ -151,6 +151,11 @@ namespace Vinno.FIS.Sonopost.WebApi.Controllers
                     ConfigManager.RefreshFlyinsonoServer(newFlyinsonoServer);
                     flyinsonoServer.Host = fasterServer.Host;
                     flyinsonoServer.Port = fasterServer.Port;
+                    if (SonopostUserDefinedSettings.Instance.ServerSetting.DefaultServer.DisplayName == SonopostConstants.FlyinsonoServerName && SonopostUserDefinedSettings.Instance.ServerSetting.DefaultServer.ToString() != fasterServer.ToString())
+                    {
+                        SonopostUserDefinedSettings.Instance.ServerSetting.DefaultServer.Host = fasterServer.Host;
+                        SonopostUserDefinedSettings.Instance.ServerSetting.DefaultServer.Port = fasterServer.Port;
+                    }
                     ConfigManager.Save();
                 }
             }

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

@@ -95,7 +95,7 @@ namespace Vinno.FIS.Sonopost.WebApi.Controllers
         [WebApiAction]
         public Result GetPageLanguage()
         {
-            switch (SonopostUserDefinedSettings.Instance.PageSetting.Language)
+            switch (SonopostUserDefinedSettings.Instance.LanguageSetting.PageLanguage)
             {
                 case Language.English:
                     return Result.Success("en-us");
@@ -120,11 +120,11 @@ namespace Vinno.FIS.Sonopost.WebApi.Controllers
             }
             if (request.Language.ToLower() == "en-us")
             {
-                SonopostUserDefinedSettings.Instance.PageSetting.Language = Language.English;
+                SonopostUserDefinedSettings.Instance.LanguageSetting.PageLanguage = Language.English;
             }
             else
             {
-                SonopostUserDefinedSettings.Instance.PageSetting.Language = Language.Chinese;
+                SonopostUserDefinedSettings.Instance.LanguageSetting.PageLanguage = Language.Chinese;
             }
             ConfigManager.Save();
             return Result.Success();
@@ -144,12 +144,12 @@ namespace Vinno.FIS.Sonopost.WebApi.Controllers
             }
             if (request.Language.ToLower() == "en-us")
             {
-                SonopostUserDefinedSettings.Instance.PageSetting.Language = Language.English;
+                SonopostUserDefinedSettings.Instance.LanguageSetting.PageLanguage = Language.English;
                 OledManager.SetLanguage(Language.English);
             }
             else
             {
-                SonopostUserDefinedSettings.Instance.PageSetting.Language = Language.Chinese;
+                SonopostUserDefinedSettings.Instance.LanguageSetting.PageLanguage = Language.Chinese;
                 OledManager.SetLanguage(Language.Chinese);
             }
             ConfigManager.Save();