Selaa lähdekoodia

fix 4G module version check
update to 1.1.1

Robert 4 vuotta sitten
vanhempi
commit
85678a54e7

+ 9 - 0
AwInitilizer/Assist/SerialPortocol.cs

@@ -251,6 +251,15 @@ namespace AwInitilizer.Assist
             return resultByte == 0x01;
         }
 
+        private string SimpleHexStringParser(byte[] parameter)
+        {
+            if (parameter == null)
+            {
+                return default;
+            }
+            return BitConverter.ToString(parameter).Replace("-", " ");
+        }
+
         private string SimpleStringParser(byte[] parameter)
         {
             if(parameter == null)

+ 1 - 1
AwInitilizer/MainWindow.xaml.cs

@@ -931,7 +931,7 @@ namespace AwInitilizer
             signinDialog.ShowDialog();
             this.Focus();
 
-            //SystemID.TryParse("DWWU301J0UD1PHD3000A001A0", out var systemID);
+            //SystemID.TryParse("DSWU601U0UD2PHD2111A001A0", out var systemID);
             //SystemIDScanReseived(systemID);
 
             if (signinDialog.DialogResult != true)

+ 1 - 1
AwInitilizer/Procedure/FourGenModuleCheckProcedure.cs

@@ -46,7 +46,7 @@ namespace AwInitilizer.Procedure
             {
                 InfoLog += $"Get 4G Module version :{fourthGenModuleVersion}\n";
                 ReportLog.Add(string.Format("Read 4G Module version : {0} , Expect:{1}", fourthGenModuleVersion, UpdateData.FourGenModuleVersion));
-                if (fourthGenModuleVersion != UpdateData.FourGenModuleVersion)
+                if (!fourthGenModuleVersion.ToLower().StartsWith(UpdateData.FourGenModuleVersion.ToLower()))
                 {
                     InfoLog += "4G module version not matched\n";
                     Logger.Print("4G module version not matched", isError: true);

+ 4 - 4
AwInitilizer/Properties/AssemblyInfo.cs

@@ -50,7 +50,7 @@ using System.Windows;
 //
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.1.0.0")]
-[assembly: AssemblyVersion("1.1.0.0")]
-[assembly: AssemblyFileVersion("1.1.0.0")]
-[assembly: AssemblyInformationalVersion("b93321b")]
+// [assembly: AssemblyVersion("1.1.1.0")]
+[assembly: AssemblyVersion("1.1.1.0")]
+[assembly: AssemblyFileVersion("1.1.1.0")]
+[assembly: AssemblyInformationalVersion("d93802b")]

+ 1 - 1
GitVersion.yml

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

+ 3 - 3
Initilizer/AssemblyInfo.cs

@@ -9,7 +9,7 @@
                                               // app, or any theme specific resource dictionaries)
 )]
 
-[assembly: AssemblyVersion("1.1.0.0")]
-[assembly: AssemblyFileVersion("1.1.0.0")]
-[assembly: AssemblyInformationalVersion("b93321b")]
+[assembly: AssemblyVersion("1.1.1.0")]
+[assembly: AssemblyFileVersion("1.1.1.0")]
+[assembly: AssemblyInformationalVersion("d93802b")]