Browse Source

fix wifi result judge

shayne_lo 6 months ago
parent
commit
eddba601c5

+ 4 - 4
ApiTest/Properties/AssemblyInfo.cs

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

+ 1 - 0
AwInitilizer/MainWindow.xaml.cs

@@ -312,6 +312,7 @@ namespace AwInitilizer
 
             //if (updateData.SystemID != null &&
             //    updateData.SystemID.ModelName.Network.Description.Contains("4G"))
+            //if (updateData.SystemID.ModelName.Type.Code != "DD")
             if (updateData.SystemID != null &&
                 updateData.SystemID.ModelName.GetTelecomCnt() > 0)
             {

+ 7 - 0
AwInitilizer/Procedure/FourGenModuleCheckProcedure.cs

@@ -80,6 +80,13 @@ namespace AwInitilizer.Procedure.FourGenModuleCheck
 
         internal override async Task<bool> Run()
         {
+            //if (UpdateData.SystemID.ModelName.Type.Code == "DD")
+            //{
+            //    LogWriter.Log("4G not supported, skip procedure");
+
+            //    return true;
+            //}
+
             //if (!UpdateData.SystemID.ModelName.Network.Description.Contains("4G"))
             //if (!UpdateData.SystemID.ModelName.Network.SupportTelecom)
             if (UpdateData.SystemID.ModelName.GetTelecomCnt() == 0)

+ 1 - 1
AwInitilizer/Procedure/WifRssiCheckProcedure.cs

@@ -67,7 +67,7 @@ namespace AwInitilizer.Procedure.WifRssiCheck
             }
 
             var updateWifiConfigResult = await SetWifiConfig();
-            if (updateWifiConfigResult)
+            if (!updateWifiConfigResult)
             {
                 LogWriter.Log("set wifi to station failed");
                 return false;

+ 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.3.0")]
-[assembly: AssemblyVersion("1.13.3.0")]
-[assembly: AssemblyFileVersion("1.13.3.0")]
-[assembly: AssemblyInformationalVersion("07c2118")]
+// [assembly: AssemblyVersion("1.13.4.0")]
+[assembly: AssemblyVersion("1.13.4.0")]
+[assembly: AssemblyFileVersion("1.13.4.0")]
+[assembly: AssemblyInformationalVersion("a7e8d90")]

+ 4 - 4
ConfigEditor/Properties/AssemblyInfo.cs

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

+ 4 - 4
CsuWebApiLib/Properties/AssemblyInfo.cs

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

+ 4 - 4
Editor/Properties/AssemblyInfo.cs

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

+ 1 - 1
GitVersion.yml

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

+ 4 - 4
InitializerModel/Properties/AssemblyInfo.cs

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

+ 3 - 3
Initilizer/AssemblyInfo.cs

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

+ 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.3.0")]
-[assembly: AssemblyVersion("1.13.3.0")]
-[assembly: AssemblyFileVersion("1.13.3.0")]
-[assembly: AssemblyInformationalVersion("07c2118")]
+// [assembly: AssemblyVersion("1.13.4.0")]
+[assembly: AssemblyVersion("1.13.4.0")]
+[assembly: AssemblyFileVersion("1.13.4.0")]
+[assembly: AssemblyInformationalVersion("a7e8d90")]