Explorar o código

add handle duplicate version

Robert %!s(int64=4) %!d(string=hai) anos
pai
achega
5668e8739b

+ 9 - 4
AwInitilizer/Procedure/FirmwareCheckVersionProcedure.cs

@@ -58,7 +58,9 @@ namespace AwInitilizer.Procedure
                     continue;
                 }
 
-                if(versionPair.Keys.Contains(model.Module))
+                var logPairNmae = $"{model.Module}VersionCheck";
+
+                if (versionPair.Keys.Contains(model.Module))
                 {
                     ReportLog.Add(string.Format("Read {0} version : {1} , Expect:{2}", model.Module, versionPair[model.Module], model.Version));
 
@@ -76,13 +78,15 @@ namespace AwInitilizer.Procedure
                     {
                         Logger.Print($"Model {model.Module} updated", isError: false);
                         InfoLog += $"{Name}:updated success\n";
-                        LogPair.Add($"{model.Module}VersionCheck", "1");
+                        if (!LogPair.Keys.Contains(logPairNmae))
+                            LogPair.Add(logPairNmae, "1");
                     }
                     else
                     {
                         Logger.Print($"Model {model.Module} version mismatch", isError: true);
                         InfoLog += $"{model.Module}:Updated Version mismatched\n";
-                        LogPair.Add($"{model.Module}VersionCheck", "0");
+                        if (!LogPair.Keys.Contains(logPairNmae))
+                            LogPair.Add(logPairNmae, "0");
                         return false;
                     }
                 }
@@ -91,7 +95,8 @@ namespace AwInitilizer.Procedure
                     //model name not found
                     Logger.Print($"Model {model.Module} version not found", isError: true);
                     InfoLog += $"Model {model.Module} version not found\n";
-                    LogPair.Add($"{model.Module}VersionCheck", "0");
+                    if (!LogPair.Keys.Contains(logPairNmae))
+                        LogPair.Add(logPairNmae, "0");
                     return false;
                 }
             }

+ 43 - 0
fixDuplicateModel.patch

@@ -0,0 +1,43 @@
+diff --git a/AwInitilizer/Procedure/FirmwareCheckVersionProcedure.cs b/AwInitilizer/Procedure/FirmwareCheckVersionProcedure.cs
+index 3036a9b..24ab0ed 100644
+--- a/AwInitilizer/Procedure/FirmwareCheckVersionProcedure.cs
++++ b/AwInitilizer/Procedure/FirmwareCheckVersionProcedure.cs
+@@ -58,7 +58,9 @@ namespace AwInitilizer.Procedure
+                     continue;
+                 }
+ 
+-                if(versionPair.Keys.Contains(model.Module))
++                var logPairNmae = $"{model.Module}VersionCheck";
++
++                if (versionPair.Keys.Contains(model.Module))
+                 {
+                     ReportLog.Add(string.Format("Read {0} version : {1} , Expect:{2}", model.Module, versionPair[model.Module], model.Version));
+ 
+@@ -76,13 +78,15 @@ namespace AwInitilizer.Procedure
+                     {
+                         Logger.Print($"Model {model.Module} updated", isError: false);
+                         InfoLog += $"{Name}:updated success\n";
+-                        LogPair.Add($"{model.Module}VersionCheck", "1");
++                        if (!LogPair.Keys.Contains(logPairNmae))
++                            LogPair.Add(logPairNmae, "1");
+                     }
+                     else
+                     {
+                         Logger.Print($"Model {model.Module} version mismatch", isError: true);
+                         InfoLog += $"{model.Module}:Updated Version mismatched\n";
+-                        LogPair.Add($"{model.Module}VersionCheck", "0");
++                        if (!LogPair.Keys.Contains(logPairNmae))
++                            LogPair.Add(logPairNmae, "0");
+                         return false;
+                     }
+                 }
+@@ -91,7 +95,8 @@ namespace AwInitilizer.Procedure
+                     //model name not found
+                     Logger.Print($"Model {model.Module} version not found", isError: true);
+                     InfoLog += $"Model {model.Module} version not found\n";
+-                    LogPair.Add($"{model.Module}VersionCheck", "0");
++                    if (!LogPair.Keys.Contains(logPairNmae))
++                        LogPair.Add(logPairNmae, "0");
+                     return false;
+                 }
+             }