Bläddra i källkod

add telcom get version delay

shayne_lo 6 månader sedan
förälder
incheckning
bc0444996d

+ 4 - 4
ApiTest/Properties/AssemblyInfo.cs

@@ -50,7 +50,7 @@ using System.Windows;
 //
 // 您可以指定所有的值,也可以使用 '*' 將組建和修訂編號
 // 設為預設,如下所示:
-// [assembly: AssemblyVersion("1.13.4.0")]
-[assembly: AssemblyVersion("1.13.4.0")]
-[assembly: AssemblyFileVersion("1.13.4.0")]
-[assembly: AssemblyInformationalVersion("a7e8d90")]
+// [assembly: AssemblyVersion("1.13.5.0")]
+[assembly: AssemblyVersion("1.13.5.0")]
+[assembly: AssemblyFileVersion("1.13.5.0")]
+[assembly: AssemblyInformationalVersion("eddba60")]

+ 16 - 2
AwInitilizer/Procedure/FourGenModuleCheckProcedure.cs

@@ -129,8 +129,22 @@ namespace AwInitilizer.Procedure.FourGenModuleCheck
             //LogWriter.Report(LogEvent.FourgenSocketConnect, "success");
 
             //var fourthGenModuleVersion = await serialPortocol.GetFourGenModuleVersion();
-            var getfourthGenModuleVersion = await EvApi.GetTelcomModemFwRev();
-            var fourthGenModuleVersion = getfourthGenModuleVersion.Result;
+            string fourthGenModuleVersion = null;
+            EvApiResult<string> getfourthGenModuleVersion = null;
+            int retryCnt = 0;
+            do
+            {
+                getfourthGenModuleVersion = await EvApi.GetTelcomModemFwRev();
+                fourthGenModuleVersion = getfourthGenModuleVersion.Result;
+
+                if (!string.IsNullOrEmpty(fourthGenModuleVersion) || retryCnt >= 5)
+                {
+                    break;
+                }
+                await Task.Delay(TimeSpan.FromMinutes(2));
+                retryCnt++;
+            }
+            while (true);
             //LogWriter.Report(LogEvent.FourgenModuleVersion, fourthGenModuleVersion);
 
             if (string.IsNullOrEmpty(fourthGenModuleVersion))

+ 4 - 4
AwInitilizer/Properties/AssemblyInfo.cs

@@ -31,7 +31,7 @@ using System.Runtime.InteropServices;
 //
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.13.4.0")]
-[assembly: AssemblyVersion("1.13.4.0")]
-[assembly: AssemblyFileVersion("1.13.4.0")]
-[assembly: AssemblyInformationalVersion("a7e8d90")]
+// [assembly: AssemblyVersion("1.13.5.0")]
+[assembly: AssemblyVersion("1.13.5.0")]
+[assembly: AssemblyFileVersion("1.13.5.0")]
+[assembly: AssemblyInformationalVersion("eddba60")]

+ 4 - 4
ConfigEditor/Properties/AssemblyInfo.cs

@@ -50,7 +50,7 @@ using System.Windows;
 //
 // 您可以指定所有的值,也可以使用 '*' 將組建和修訂編號
 // 設為預設,如下所示:
-// [assembly: AssemblyVersion("1.13.4.0")]
-[assembly: AssemblyVersion("1.13.4.0")]
-[assembly: AssemblyFileVersion("1.13.4.0")]
-[assembly: AssemblyInformationalVersion("a7e8d90")]
+// [assembly: AssemblyVersion("1.13.5.0")]
+[assembly: AssemblyVersion("1.13.5.0")]
+[assembly: AssemblyFileVersion("1.13.5.0")]
+[assembly: AssemblyInformationalVersion("eddba60")]

+ 4 - 4
CsuWebApiLib/Properties/AssemblyInfo.cs

@@ -31,7 +31,7 @@ using System.Runtime.InteropServices;
 //
 // 您可以指定所有的值,也可以使用 '*' 將組建和修訂編號
 // 設為預設,如下所示:
-// [assembly: AssemblyVersion("1.13.4.0")]
-[assembly: AssemblyVersion("1.13.4.0")]
-[assembly: AssemblyFileVersion("1.13.4.0")]
-[assembly: AssemblyInformationalVersion("a7e8d90")]
+// [assembly: AssemblyVersion("1.13.5.0")]
+[assembly: AssemblyVersion("1.13.5.0")]
+[assembly: AssemblyFileVersion("1.13.5.0")]
+[assembly: AssemblyInformationalVersion("eddba60")]

+ 4 - 4
Editor/Properties/AssemblyInfo.cs

@@ -50,7 +50,7 @@ using System.Windows;
 //
 // 您可以指定所有的值,也可以使用 '*' 將組建和修訂編號
 // 設為預設,如下所示:
-// [assembly: AssemblyVersion("1.13.4.0")]
-[assembly: AssemblyVersion("1.13.4.0")]
-[assembly: AssemblyFileVersion("1.13.4.0")]
-[assembly: AssemblyInformationalVersion("a7e8d90")]
+// [assembly: AssemblyVersion("1.13.5.0")]
+[assembly: AssemblyVersion("1.13.5.0")]
+[assembly: AssemblyFileVersion("1.13.5.0")]
+[assembly: AssemblyInformationalVersion("eddba60")]

+ 1 - 1
GitVersion.yml

@@ -1,6 +1,6 @@
 assembly-versioning-scheme: MajorMinorPatch
 assembly-informational-format: '{ShortSha}'
-next-version: 1.13.5
+next-version: 1.13.6
 branches: {}
 ignore:
   sha: []

+ 4 - 4
InitializerModel/Properties/AssemblyInfo.cs

@@ -31,7 +31,7 @@ using System.Runtime.InteropServices;
 //
 // 您可以指定所有的值,也可以使用 '*' 將組建和修訂編號
 // 設為預設,如下所示:
-// [assembly: AssemblyVersion("1.13.4.0")]
-[assembly: AssemblyVersion("1.13.4.0")]
-[assembly: AssemblyFileVersion("1.13.4.0")]
-[assembly: AssemblyInformationalVersion("a7e8d90")]
+// [assembly: AssemblyVersion("1.13.5.0")]
+[assembly: AssemblyVersion("1.13.5.0")]
+[assembly: AssemblyFileVersion("1.13.5.0")]
+[assembly: AssemblyInformationalVersion("eddba60")]

+ 3 - 3
Initilizer/AssemblyInfo.cs

@@ -9,7 +9,7 @@
                                               // app, or any theme specific resource dictionaries)
 )]
 
-[assembly: AssemblyVersion("1.13.4.0")]
-[assembly: AssemblyFileVersion("1.13.4.0")]
-[assembly: AssemblyInformationalVersion("a7e8d90")]
+[assembly: AssemblyVersion("1.13.5.0")]
+[assembly: AssemblyFileVersion("1.13.5.0")]
+[assembly: AssemblyInformationalVersion("eddba60")]
 

+ 4 - 4
MesAdaptor/Properties/AssemblyInfo.cs

@@ -31,7 +31,7 @@ using System.Runtime.InteropServices;
 //
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.13.4.0")]
-[assembly: AssemblyVersion("1.13.4.0")]
-[assembly: AssemblyFileVersion("1.13.4.0")]
-[assembly: AssemblyInformationalVersion("a7e8d90")]
+// [assembly: AssemblyVersion("1.13.5.0")]
+[assembly: AssemblyVersion("1.13.5.0")]
+[assembly: AssemblyFileVersion("1.13.5.0")]
+[assembly: AssemblyInformationalVersion("eddba60")]