删除中国德国服务器，新增杏聆荟服务器

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

@@ -62,6 +62,7 @@
   "Login": "Login",
   "CreateAndLogin": "Register&Login",
   "Disconnect": "Disconnect",
+  "FlyinsonoServer": "Flyinsono server",
   "CloudServerInChina": "China server",
   "CloudServerInGermany": "Germany server",
   "CloudServerByCustom": "Add server",

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

@@ -62,6 +62,7 @@
   "Login": "登录",
   "CreateAndLogin": "创建并登录",
   "Disconnect": "断开连接",
+  "FlyinsonoServer": "杏聆荟服务器",
   "CloudServerInChina": "中国服务器",
   "CloudServerInGermany": "德国服务器",
   "CloudServerByCustom": "自定义服务器",

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

@@ -77,7 +77,7 @@
                        class="layui-input" />
             </div>
         </div>
-        <div class="layui-form-item" lay-filter="Account">
+        <div class="layui-form-item is-hide" lay-filter="Account">
             <label class="layui-form-label" data-content="Account"></label>
             <div class="layui-input-block">
                 <input type="text"
@@ -88,7 +88,7 @@
                        class="layui-input" />
             </div>
         </div>
-        <div class="layui-form-item" lay-filter="Password">
+        <div class="layui-form-item is-hide" lay-filter="Password">
             <label class="layui-form-label" data-content="Password"></label>
             <div class="layui-inline">
                 <input type="password"
@@ -128,8 +128,6 @@
         const { $api, $t, $regExp, $loading } = runtime;
         const { form, layer } = layui;
         const formFilter = "FormServerLogin";
-        const CHINA_SERVER_ADDRESS = "cloud.xinglinghui.com:9096";
-        const GERMARY_SERVER_ADDRESS = "cloud.flyinsono.com:9096";
         this.onload = async function () {
             form.verify({
                 server_address: function (value, item) {
@@ -203,14 +201,13 @@
                     ServerPort: data.Port
                 });
             }
-            let accountInput = form.find(formFilter, "AccountInput");
-            if (data.DongleId == data.Account) {
-                accountInput.val("");
+            let account = form.find(formFilter, "Account");
+            let password = form.find(formFilter, "Password");
+            if (data.IsLoginWithAccountAndPassword) {
+                account.show();
+                password.show();
             }
-
-            if (!data.IsLoginWithAccountAndPassword) {
-                let account = form.find(formFilter, "Account");
-                let password = form.find(formFilter, "Password");
+            else {
                 account.hide();
                 password.hide();
             }
@@ -219,23 +216,12 @@
         }
 
         async function initServerNodeSelect() {
-            let res = await $api("server", "GetServerList");
+            let res = await $api("server", "GetServerList",);
             if (!res.IsSuccess) return;
             let options = [];
-            options.push(
-                `<option value="${CHINA_SERVER_ADDRESS}" data-content="CloudServerInChina">${$t(
-                    "CloudServerInChina"
-                )}</option>`
-            );
-            options.push(
-                `<option value="${GERMARY_SERVER_ADDRESS}" data-content="CloudServerInGermany">${$t(
-                    "CloudServerInGermany"
-                )}</option>`
-            );
             res.Data.forEach((x) => {
-                if (CHINA_SERVER_ADDRESS !== x && GERMARY_SERVER_ADDRESS !== x) {
-                    options.push(`<option value="${x}">${x}</option>`);
-                }
+                options.push(`<option value="${x.Host}:${x.Port}">${$t(x.DisplayName)}</option>`);
+
             });
             options.push(
                 `<option value="custom" data-content="CloudServerByCustom">${$t(

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

@@ -41,7 +41,6 @@ namespace Vinno.FIS.Sonopost.Features.Config
                         Servers = new List<FISServerInfo>
                         {
                             new FISServerInfo("cloud.xinglinghui.com", 9096, true),
-                            new FISServerInfo("cloud.flyinsono.com", 9096, true),
                         },
                     },
                     DicomSetting = new DicomSetting

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

@@ -41,5 +41,7 @@ namespace Vinno.FIS.Sonopost.Managers.Interfaces
         /// <param name="address"></param>
         /// <param name="port"></param>
         bool ChangeServer(string address, int port);
+
+        FISServerInfo GetFasterServerInfo();
     }
 }

Vinno.FIS.Sonopost/Managers/NetworkManager.cs

@@ -85,7 +85,7 @@ namespace Vinno.FIS.Sonopost.Managers
             _deviceManager.WifiModuleInserted += OnWifiModuleInserted;
             _deviceManager.NetworkAddressChanged += OnNetworkAddressChanged;
             RefreshAllNetworks();
-            _timingRefreshInterval = 5;
+            _timingRefreshInterval = 10;
             StartTimerRefreshTask();
             AutoReconnectWifi();
         }

Vinno.FIS.Sonopost/Managers/TerminalClientManager.cs

@@ -99,6 +99,11 @@ namespace Vinno.FIS.Sonopost.Managers
             return DeviceTestResult.CanNotConnect;
         }
 
+        public FISServerInfo GetFasterServerInfo()
+        {
+            return _fisConnectionService.GetFasterServer(true);
+        }
+
         public bool LogOff()
         {
             try

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

@@ -154,8 +154,7 @@ namespace Vinno.FIS.Sonopost.WebApi.Controllers
         [WebApiAction]
         public Result CheckIsLogon()
         {
-            bool logged = LoginManager.LoginStatus == DeviceStatus.Logon;
-            return Result.Success(logged);
+            return Result.Success(LoginManager.LoginStatus == DeviceStatus.Logon);
         }
 
         /// <summary>
@@ -165,8 +164,18 @@ namespace Vinno.FIS.Sonopost.WebApi.Controllers
         [WebApiAction]
         public Result GetServerList()
         {
-            var serverList = SonopostUserDefinedSettings.Instance.ServerSetting.Servers.Select(x => x.ToString());
-            return Result.Success(serverList);
+            if (LoginManager.LoginStatus != DeviceStatus.Logon)
+            {
+                var fasterServer = TerminalClientManager.GetFasterServerInfo();
+                if (fasterServer != null && SonopostUserDefinedSettings.Instance.ServerSetting.Servers.FirstOrDefault(x => x.IsDefault).ToString() != fasterServer.ToString())
+                {
+                    var defaultServer = SonopostUserDefinedSettings.Instance.ServerSetting.Servers.FirstOrDefault(x => x.IsDefault);
+                    defaultServer.Host = fasterServer.Host;
+                    defaultServer.Port = fasterServer.Port;
+                    ConfigManager.Save();
+                }
+            }
+            return Result.Success(SonopostUserDefinedSettings.Instance.ServerSetting.Servers);
         }
 
         /// <summary>

Vinno.vCloud.Common.FIS/AfterSales/AfterSalesV2.cs

@@ -338,34 +338,6 @@ namespace Vinno.vCloud.Common.FIS.AfterSales
                 var remoteMaintenanceInfo = new RemoteMaintenanceInfo(RemoteMaintenanceType.ExecuteSystemSetting, _master?.UserId, parameters);
                 OnRemoteMaintenanceEvent(remoteMaintenanceInfo);
             }
-            else if (sendCommandToDeviceNotification.ActionType == "FlushDNS")
-            {
-                var parameters = new List<AdditionParameter>
-                {
-                    new AdditionParameter("ActionType","string","FlushDNS"),
-                };
-                var getResultFromServerRequest = new GetResultFromServerRequest
-                {
-                    ResultCode = sendCommandToDeviceNotification.ResultCode,
-                    Token = _token,
-                };
-                var systemSettingString = JsonRpcHelper.GetResultFromServer(_deviceService, getResultFromServerRequest);
-                var sendCommandToDeviceRequest = JsonConvert.DeserializeObject<SendCommandToDeviceRequest>(systemSettingString);
-                var systemSetting = DTOConverter.ConvertSystemSettingInfoDTOToSystemSettingInfo(sendCommandToDeviceRequest.Settings);
-                string content;
-                using (var stream = new MemoryStream())
-                {
-                    var xml = new XmlSerializer(systemSetting.GetType());
-                    xml.Serialize(stream, systemSetting);
-                    stream.Position = 0;
-                    var sr = new StreamReader(stream);
-                    content = sr.ReadToEnd();
-                    sr.Dispose();
-                }
-                parameters.Add(new AdditionParameter("Args", "string", content));
-                var remoteMaintenanceInfo = new RemoteMaintenanceInfo(RemoteMaintenanceType.ExecuteSystemSetting, _master?.UserId, parameters);
-                OnRemoteMaintenanceEvent(remoteMaintenanceInfo);
-            }
             else if (sendCommandToDeviceNotification.ActionType == "ClearRemedicalCache")
             {
                 var parameters = new List<AdditionParameter>
@@ -450,7 +422,6 @@ namespace Vinno.vCloud.Common.FIS.AfterSales
                     };
                     remoteMaintenanceInfo = new RemoteMaintenanceInfo(RemoteMaintenanceType.ExecutePrinterSetting, _master?.UserId, parameters);
                     OnRemoteMaintenanceEvent(remoteMaintenanceInfo);
-
                     break;
 
                 case DevicePrinterEnum.InstallPrinterDrive: