1. fix logic flaw

2. remove old commanded out code
update to version v1.2.1

AwInitilizer/Converter/MesErrorCodeMaper.cs

@@ -144,6 +144,8 @@ namespace AwInitilizer.Converter
 
         public static MesErrorCode GetMesErrorCode(Procedure.VersionLog.VersionLogProcedure procedure)
         {
+            if (procedure.Error == Procedure.VersionLog.VersionLogProcedure.ErrorType.ReadVersionFail)
+                return MesErrorCode.ChargerConnectFail;
             return MesErrorCode.None;
         }
     }

AwInitilizer/Procedure/BasicInfoUpdateProcedure.cs

@@ -28,7 +28,7 @@ namespace AwInitilizer.Procedure.BasicInfoUpdate
         EvseConnect,
         ModelNameWrite,
         SerialNumberWrite,
-        RtcUpdate,
+        RtcWrite,
         SettingSave,
         RestartConnect,
         ModelNameRead,
@@ -47,7 +47,7 @@ namespace AwInitilizer.Procedure.BasicInfoUpdate
             {LogEvent.EvseConnect,"BaseUpdateSocketConnect" },
             {LogEvent.ModelNameWrite,"ModelNameWrite" },
             {LogEvent.SerialNumberWrite,"SerialNumberWrite" },
-            {LogEvent.RtcUpdate,"RtcUpdate" },
+            {LogEvent.RtcWrite,"RtcUpdate" },
             {LogEvent.SettingSave,"SettingSave" },
             {LogEvent.RestartConnect,"BaseUpdateSocketReConnect" },
             {LogEvent.ModelNameRead,"ModelNameRead" },
@@ -60,7 +60,7 @@ namespace AwInitilizer.Procedure.BasicInfoUpdate
             {LogEvent.EvseConnect,"EVSE connect {0}" },
             {LogEvent.ModelNameWrite,"Model Name write {0}" },
             {LogEvent.SerialNumberWrite,"Serial Number write {0}" },
-            {LogEvent.RtcUpdate,"RTC update {0}" },
+            {LogEvent.RtcWrite,"RTC time write {0}" },
             {LogEvent.SettingSave,"Setting save {0}" },
             {LogEvent.RestartConnect,"Evse reconnect after write {0}" },
             {LogEvent.ModelNameRead,"Model Name read {0}" },
@@ -87,9 +87,6 @@ namespace AwInitilizer.Procedure.BasicInfoUpdate
                 LogWriter.Report(LogEvent.EvseConnect, "fail");
                 Error = ErrorType.EvseConnectFail;
 
-                //LogPair.Add("BaseUpdateSocketConnect", "fail");
-                //InfoLog += "EVSE connect failed\n";
-                //ReportLog.Add("EVSE connect failed");
                 return false;
             }
 
@@ -99,18 +96,11 @@ namespace AwInitilizer.Procedure.BasicInfoUpdate
                 LogWriter.Report(LogEvent.ModelNameWrite, "fail");
                 Error = ErrorType.ModelNameWriteFail;
 
-                //LogPair.Add("ModelNameWrite", "fail");
-                //InfoLog += "Model Name update failed\n";
-                //Logger.Print("Model Name update Failed", isError: true);
-                //ReportLog.Add("Model Name update Failed");
                 return false;
             }
             else
             {
                 LogWriter.Report(LogEvent.ModelNameWrite, "success");
-
-                //LogPair.Add("ModelNameWrite", "success");
-                //Logger.Print("Model Name write Success");
             }
 
             if (!await serialPortocol.SetSerialNumber(UpdateData.SerialNumber))
@@ -118,39 +108,25 @@ namespace AwInitilizer.Procedure.BasicInfoUpdate
                 LogWriter.Report(LogEvent.SerialNumberWrite, "fail");
                 Error = ErrorType.SerialNumberWriteFail;
 
-                //LogPair.Add("SerialNumberWrite", "fail");
-                //InfoLog += "Serial Number update failed\n";
-                //Logger.Print("Serial Number update Failed", isError: true);
-                //ReportLog.Add("Serial Number update Failed");
                 return false;
             }
             else
             {
                 LogWriter.Report(LogEvent.SerialNumberWrite, "success");
-
-                //LogPair.Add("SerialNumberWrite", "success");
-                //Logger.Print("Serial Number write Success");
             }
 
             var setDateTime = DateTime.Now.ToUniversalTime();
 
             if (!await serialPortocol.SetUTCTime(setDateTime))
             {
-                LogWriter.Report(LogEvent.RtcUpdate, "fail");
+                LogWriter.Report(LogEvent.RtcWrite, "fail");
                 Error = ErrorType.RtcUpdateFail;
 
-                //LogPair.Add("RtcUpdate", "fail");
-                //InfoLog += "RTC update failed\n";
-                //Logger.Print("RTC update Failed", isError: true);
-                //ReportLog.Add("RTC update Failed");
                 return false;
             }
             else
             {
-                LogWriter.Report(LogEvent.RtcUpdate, "success");
-
-                //LogPair.Add("RtcUpdate", "success");
-                //Logger.Print("RTC update write Success");
+                LogWriter.Report(LogEvent.RtcWrite, "success");
             }
 
             if (!await serialPortocol.SettingChangeConfirm())
@@ -158,22 +134,15 @@ namespace AwInitilizer.Procedure.BasicInfoUpdate
                 LogWriter.Report(LogEvent.SettingSave, "fail");
                 Error = ErrorType.SettingSaveFail;
 
-                //LogPair.Add("SettingSave", "fail");
-                //InfoLog += "Setting save request failed\n";
-                //Logger.Print("Setting save Failed", isError: true);
-                //ReportLog.Add("Setting save request Failed");
                 return false;
             }
             else
             {
                 LogWriter.Report(LogEvent.SettingSave, "success");
-
-                //LogPair.Add("SettingSave", "success");
-                //Logger.Print("Setting save Success");
             }
 
             LogWriter.Log("Waiting EVSE reboot...");
-            //Logger.Print("Waiting EVSE reboot...");
+
             serialPortocol.Close();
             await Task.Delay(TimeSpan.FromMinutes(1));
 
@@ -182,45 +151,36 @@ namespace AwInitilizer.Procedure.BasicInfoUpdate
                 LogWriter.Report(LogEvent.RestartConnect, "fail");
                 Error = ErrorType.RestartConnectFail;
 
-                //LogPair.Add("BaseUpdateSocketReConnect", "fail");
-                //InfoLog += "EVSE not found after reboot\n";
-                //Logger.Print("EVSE reboot timeout", isError: true);
-                //ReportLog.Add("EVSE not found after reboot");
                 return false;
             }
 
             var receivedModelName = await serialPortocol.GetModelName();
             LogWriter.Report(LogEvent.ModelNameRead, receivedModelName);
-            //LogPair.Add("ModelNameRead", receivedModelName);
+
             if (string.IsNullOrEmpty(receivedModelName))
             {
                 LogWriter.Log("Model name get failed after reboot");
                 LogWriter.Log(serialPortocol.LatestErrorMessage, isDebugLog: true);
                 Error = ErrorType.ModelNameGetFail;
 
-                //InfoLog += "Model name get failed after reboot\n";
-                //Logger.Print("Model Name read Failed", isError: true);
-                //ReportLog.Add("Model name get failed after reboot");
                 return false;
             }
             else
             {
                 LogWriter.Log(string.Format("Read Model name : {0} , Expect:{1}", receivedModelName, UpdateData.ModelName));
-                //ReportLog.Add(string.Format("Read Model name : {0} , Expect:{1}", receivedModelName, UpdateData.ModelName));
-                //InfoLog += $"Get Updated Model Name { receivedModelName }\n";
+
                 if (receivedModelName != UpdateData.ModelName)
                 {
                     Error = ErrorType.ModelNameMismach;
-                    //InfoLog += "Updated Model Name Mismatched\n";
-                    //Logger.Print("Stored Model Name Mismatched", isError: true);
+
                     return false;
                 }
-                //Logger.Print("Model Name update Success");
+                LogWriter.Log("Model Name update Success");
             }
 
             var receivedSerialNumber = await serialPortocol.GetSerialNumber();
             LogWriter.Report(LogEvent.SerialNumberRead, receivedSerialNumber);
-            //LogPair.Add("SerialNumberRead", receivedSerialNumber);
+
             if (string.IsNullOrEmpty(receivedSerialNumber))
             {
                 LogWriter.Log("Serial number get failed after reboot");
@@ -228,59 +188,43 @@ namespace AwInitilizer.Procedure.BasicInfoUpdate
 
                 Error = ErrorType.SerialNumberGetFail;
 
-                //InfoLog += "Serial number get failed after reboot\n";
-                //InfoLog += serialPortocol.LatestNullMessage +"\n";
-                //Logger.Print("Stored Serial read Failed", isError: true);
-                //Logger.Print(serialPortocol.LatestNullMessage);
-                //ReportLog.Add("Serial number get failed after reboot");
                 return false;
             }
             else
             {
                 LogWriter.Log(string.Format("Read Serial number : {0} , Expect:{1}", receivedSerialNumber, UpdateData.SerialNumber));
-                //ReportLog.Add(string.Format("Read Serial number : {0} , Expect:{1}", receivedSerialNumber, UpdateData.SerialNumber));
-                //InfoLog += $"Get Updated serial number { receivedSerialNumber }\n";
+
                 if (receivedSerialNumber != UpdateData.SerialNumber)
                 {
                     Error = ErrorType.SerialNumberMismach;
 
-                    //InfoLog += "Updated serial number mismatched\n";
-                    //Logger.Print("Stored Serial Number Mismatched", isError: true);
                     return false;
                 }
-                //Logger.Print("Serial Number update Success");
+                LogWriter.Log("Serial Number update Success");
             }
 
             var receivedDateTime = await serialPortocol.GetUTCTime();
-            //LogPair.Add("RtcRead", receivedDateTime?.ToString("yyyyMMddHHmmss"));
             LogWriter.Report(LogEvent.RtcRead, receivedDateTime?.ToString("yyyyMMddHHmmss"));
+
             if (receivedDateTime == null)
             {
                 LogWriter.Log("UTC Time receive failed");
+                Error = ErrorType.EvseConnectFail;
 
-                //InfoLog += "UTC Time receive failed after reboot\n";
-                //Logger.Print("UTC Time receive failed", isError: true);
-                //ReportLog.Add("UTC Time receive failed after reboot");
                 return false;
             }
             else
             {
                 LogWriter.Log(string.Format("Read UTC time : {0} , CurrentTime:{1}", receivedDateTime?.ToString("yyyyMMddHHmmss"), DateTime.Now.ToUniversalTime().ToString("yyyyMMddHHmmss")));
-                //ReportLog.Add(string.Format("Read UTC time : {0} , CurrentTime:{1}", receivedDateTime?.ToString("yyyyMMddHHmmss"), DateTime.Now.ToUniversalTime().ToString("yyyyMMddHHmmss")));
-                //InfoLog += $"UTC Time received : {receivedDateTime.Value.ToString("yyyyMMddHHmmss")}\n";
+
                 var diff = receivedDateTime.Value - DateTime.Now.ToUniversalTime();
                 if (Math.Abs(diff.TotalSeconds) > 10)
                 {
                     Error = ErrorType.UtcTimeMismatch;
 
-                    //InfoLog += "Stored UTC time Mismatched\n";
-                    //Logger.Print("Stored UTC time Mismatched", isError: true);
                     return false;
                 }
-                else
-                {
-                    //Logger.Print("Model Name update Success");
-                }
+                LogWriter.Log("UTC Time update Success");
             }
 
             return true;

AwInitilizer/Procedure/ButtonStatusCheckPorcedure.cs

@@ -64,8 +64,6 @@ namespace AwInitilizer.Procedure.ButtonStatusCheck
             var response = await GetButtonStatus();
             if (response == null)
             {
-                //ReportLog.Add("EVSE connect failed");
-                //Logger.Print("EVSE connect failed", isError: true);
                 return false;
             }
 
@@ -109,22 +107,19 @@ namespace AwInitilizer.Procedure.ButtonStatusCheck
 
             if (status == null)
             {
-                //InfoLog += "Get Butoon state failed\n";
-                //Logger.Print("Get Butoon state failed");
                 return false;
             }
 
             LogWriter.Report(LogEvent.UnpressButtonTest, string.Format("{0}{1}{2}", status.Button1, status.Button2, status.EmergencyButton));
-            //InfoLog += "Unpress check result\n";
-            //InfoLog += $"Button1:{status.Button1},Button2:{status.Button2},EmgerncyButton:{status.EmergencyButton}\n";
-            //LogPair.Add("UnpressButtonTest", string.Format("{0}{1}{2}", status.Button1, status.Button2, status.EmergencyButton));
 
-            LogWriter.Log(string.Format("Button unpress test result : {0}, Expect:000",
-                string.Format("{0}{1}{2}", status.Button1, status.Button2, status.EmergencyButton)
-                ));
-            //ReportLog.Add(string.Format("Button unpress test result : {0}, Expect:000",
-            //    string.Format("{0}{1}{2}", status.Button1, status.Button2, status.EmergencyButton)
-            //    ));
+            LogWriter.Log(string.Format("Button unpress test result : {0}{1}{2}, Expect:000",
+                status.Button1, status.Button2, status.EmergencyButton));
+
+            LogWriter.Log(
+                string.Format("Button1:{0},Button2:{1},EmgerncyButton:{2}",
+                    GetBtnStatusString(status.Button1),
+                    GetBtnStatusString(status.Button2),
+                    GetBtnStatusString(status.EmergencyButton)));
 
             bool isAllMatched = true;
             if (status != null)
@@ -154,7 +149,6 @@ namespace AwInitilizer.Procedure.ButtonStatusCheck
                 if (isAllMatched)
                 {
                     LogWriter.Log("Unpress Check passed");
-                    //Logger.Print("Unpress Check passed");
                     return true;
                 }
                 else
@@ -164,8 +158,7 @@ namespace AwInitilizer.Procedure.ButtonStatusCheck
             }
             else
             {
-                LogWriter.Log("Get button press status Failed", isError: true);
-                //Logger.Print("Get button press status Failed", isError: true);
+                LogWriter.Log("Unpress Check: Get button press status Failed", isError: true);
                 return false;
             }
         }
@@ -179,9 +172,18 @@ namespace AwInitilizer.Procedure.ButtonStatusCheck
             ShowBtnPressRequestDialog(btnLang, imgUrl);
 
             var btnStatus = await WaitAndtGetPressBtn();
+            if(btnStatus == null)
+            {
+                return false;
+            }
+
             LogWriter.Report($"{btn}PressTest", string.Format("{0}{1}{2}", btnStatus.Button1, btnStatus.Button2, btnStatus.EmergencyButton));
-            LogWriter.Log($"Press check stage {btn} result");
-            LogWriter.Log($"Button1:{btnStatus.Button1},Button2:{btnStatus.Button2},EmgerncyButton:{btnStatus.EmergencyButton}\n");
+            LogWriter.Log($"Press check stage {btn} result:");
+            LogWriter.Log(
+                string.Format("Button1:{0},Button2:{1},EmgerncyButton:{2}",
+                    GetBtnStatusString(btnStatus.Button1),
+                    GetBtnStatusString(btnStatus.Button2),
+                    GetBtnStatusString(btnStatus.EmergencyButton)));
 
             DismisDialog();
             var btnStatusIsMatchedRequred = CheckBtnStatus(btnInt,btnStatus);

AwInitilizer/Procedure/FirmwareBundleUploadProcedure.cs

@@ -58,9 +58,6 @@ namespace AwInitilizer.Procedure.FirmwareBundleUpload
 
         internal override async Task<bool> Run()
         {
-            //wait restart
-            //Logger.Print("Waiting restart..");
-
             bool response = false;
             int pollingCnt = 0;
             for (pollingCnt = 0; pollingCnt < 56; pollingCnt++)
@@ -72,7 +69,6 @@ namespace AwInitilizer.Procedure.FirmwareBundleUpload
             }
 
             LogWriter.Log(string.Format("EVSE connet elapsed minute(s) : {0}, Expect:<14", pollingCnt * 0.25));
-            //ReportLog.Add(string.Format("EVSE connet elapsed minute(s) : {0}, Expect:<14", pollingCnt * 0.25));
 
             //timeout
             if (pollingCnt >= 56)
@@ -80,17 +76,13 @@ namespace AwInitilizer.Procedure.FirmwareBundleUpload
                 LogWriter.Report(LogEvent.UploadStartWait, "fail");
                 Error = ErrorType.StartWaitTimeout;
 
-                //Logger.Print("Wait restart timeout", isError: true);
-                //InfoLog += "Wait restart timeout\n";
-                //LogPair.Add($"UploadStartWait", "0");
                 return false;
             }
 
             LogWriter.Report(LogEvent.UploadStartWait, "success");
-            //LogPair.Add($"UploadStartWait", "1");
+
 
             //upload firmware
-            //return await UploadWithHttpWebRequest();
             bool result = false;
             for (int tryCnt = 0; tryCnt < 10; tryCnt++)
             {
@@ -203,20 +195,12 @@ namespace AwInitilizer.Procedure.FirmwareBundleUpload
             {
                 LogWriter.Report(LogEvent.FirmwareUpload,"success");
 
-                //InfoLog += $"get firmware update response {response.Content}\n";
-                //Logger.Print("Firmware Upload Complete", isError: false);
-                //LogPair.Add($"FirmwareUpload", "1");
                 return true;
             }
             else
             {
                 LogWriter.Report(LogEvent.FirmwareUpload, "fail");
 
-                //InfoLog += $"file upload failed";
-                //InfoLog += response.ErrorMessage;
-                //Logger.Print("Firmware Upload Failed", isError: true);
-                //Logger.Print(response.ErrorMessage,isError:true);
-                //LogPair.Add($"FirmwareUpload", "0");
                 return false;
             }
         }

AwInitilizer/Procedure/FirmwareCheckVersionProcedure.cs

@@ -52,8 +52,6 @@ namespace AwInitilizer.Procedure.FirmwareCheckVersion
         internal override async Task<bool> Run()
         {
             //wait restart
-            //Logger.Print("Waiting restart..");
-
             bool response = false;
             int pollingCnt = 0;
             await Task.Delay(TimeSpan.FromMinutes(2));
@@ -66,14 +64,12 @@ namespace AwInitilizer.Procedure.FirmwareCheckVersion
             }
 
             LogWriter.Log(string.Format("EVSE connet elapsed minute(s) : {0}, Expect:<16", (pollingCnt * 0.25) + 2));
-            //ReportLog.Add(string.Format("EVSE connet elapsed minute(s) : {0}, Expect:<16", (pollingCnt * 0.25) + 2));
 
             //timeout
             if (pollingCnt >= 56)
             {
                 Error = ErrorType.RestartTimeout;
-                //Logger.Print("Wait restart timeout", isError: true);
-                //InfoLog += "Wait restart timeout\n";
+
                 return false;
             }
 
@@ -86,8 +82,10 @@ namespace AwInitilizer.Procedure.FirmwareCheckVersion
             {
                 var checkResult = CheckModelbyList(model, versionPair);
                 if (!checkResult)
+                {
                     Error = ErrorType.VersionCheckFail;
                     return false;
+                }
             }
 
             return true;
@@ -105,7 +103,6 @@ namespace AwInitilizer.Procedure.FirmwareCheckVersion
             if (versionPair.Keys.Contains(model.Module))
             {
                 LogWriter.Log(string.Format("Read {0} version : {1} , Expect:{2}", model.Module, versionPair[model.Module], model.Version));
-                //ReportLog.Add(string.Format("Read {0} version : {1} , Expect:{2}", model.Module, versionPair[model.Module], model.Version));
 
                 bool isVersionMatched = false;
                 if (model.Module == "CsuRootFsFwRev")
@@ -120,19 +117,13 @@ namespace AwInitilizer.Procedure.FirmwareCheckVersion
                 if (isVersionMatched)
                 {
                     LogWriter.Report(logPairName,"success");
-                    //Logger.Print($"Model {model.Module} updated", isError: false);
-                    //InfoLog += $"{Name}:updated success\n";
-                    //if (!LogPair.Keys.Contains(logPairName))
-                    //    LogPair.Add(logPairName, "1");
+
                     return true;
                 }
                 else
                 {
                     LogWriter.Report(logPairName, "fail");
-                    //Logger.Print($"Model {model.Module} version mismatch", isError: true);
-                    //InfoLog += $"{model.Module}:Updated Version mismatched\n";
-                    //if (!LogPair.Keys.Contains(logPairName))
-                    //    LogPair.Add(logPairName, "0");
+
                     return false;
                 }
             }
@@ -146,10 +137,7 @@ namespace AwInitilizer.Procedure.FirmwareCheckVersion
                 //model name not found
                 LogWriter.Report(logPairName, "fail");
                 LogWriter.Log($"Model {model.Module} version not found");
-                //Logger.Print($"Model {model.Module} version not found", isError: true);
-                //InfoLog += $"Model {model.Module} version not found\n";
-                //if (!LogPair.Keys.Contains(logPairName))
-                //    LogPair.Add(logPairName, "0");
+
                 return false;
             }
         }
@@ -209,12 +197,6 @@ namespace AwInitilizer.Procedure.FirmwareCheckVersion
                 {
                     LogWriter.Log("Get Version Failed");
                     LogWriter.Log(e.Message, isDebugLog: true);
-                    //Logger.Print("Get Version Failed", isError: true);
-                    //Logger.Print(e.Message + "", isError: true);
-
-                    //InfoLog += "Get Version Failed\n";
-                    //InfoLog += e.Message;
-                    //InfoLog += "\n";
                 }
 
                 return null;

AwInitilizer/Procedure/FourGenModuleCheckProcedure.cs

@@ -70,8 +70,6 @@ namespace AwInitilizer.Procedure.FourGenModuleCheck
                 //if does not support 4G then end init
                 LogWriter.Log("4G not supported, skip procedure");
 
-                //InfoLog += "model name does not support 4g ,skip update process\n";
-                //ReportLog.Add("4G not supported, skip procedure");
                 return true;
             }
 
@@ -81,40 +79,34 @@ namespace AwInitilizer.Procedure.FourGenModuleCheck
                 LogWriter.Report(LogEvent.FourgenSocketConnect,"fail");
                 Error = ErrorType.ConnectFail;
 
-                //InfoLog += "EVSE connect failed\n";
-                //LogPair.Add("FourgenSocketConnect", "0");
-                //ReportLog.Add("EVSE connect failed");
                 return false;
             }
             LogWriter.Report(LogEvent.FourgenSocketConnect, "success");
 
             var fourthGenModuleVersion = await serialPortocol.GetFourGenModuleVersion();
             LogWriter.Report(LogEvent.FourgenModuleVersion, fourthGenModuleVersion);
-            //LogPair.Add("FourgenModuleVersion", fourthGenModuleVersion);
+            
             if (string.IsNullOrEmpty(fourthGenModuleVersion))
             {
                 Error = ErrorType.VersionReadFail;
                 LogWriter.Log("4G module version read error");
 
-                //InfoLog += "4G module version read error\n";
-                //Logger.Print("4G module version read error", isError: true);
-                //ReportLog.Add("4G module version read error");
                 return false;
             }
             else
             {
-                //InfoLog += $"Get 4G Module version :{fourthGenModuleVersion}\n";
-                //ReportLog.Add(string.Format("Read 4G Module version : {0} , Expect:{1}", fourthGenModuleVersion, UpdateData.FourGenModuleVersion));
+                LogWriter.Log(string.Format("Read 4G Module version : {0} , Expect:{1}", fourthGenModuleVersion, UpdateData.FourGenModuleVersion));
+
                 if (!fourthGenModuleVersion.ToLower().StartsWith(UpdateData.FourGenModuleVersion.ToLower()))
                 {
                     Error = ErrorType.VersionMismatch;
-                    //InfoLog += "4G module version not matched\n";
-                    //Logger.Print("4G module version not matched", isError: true);
+
                     return false;
                 }
             }
 
             var simstatus = await serialPortocol.GetSimStatus();
+
             if(simstatus == null)
             {
                 LogWriter.Report(LogEvent.SimStatus, "unknown");
@@ -131,24 +123,17 @@ namespace AwInitilizer.Procedure.FourGenModuleCheck
             if (simstatus == null)
             {
                 Error = ErrorType.SimStatusReadFail;
-                //InfoLog += "Get sim status failed\n";
-                //Logger.Print("Get sim status failed", isError: true);
-                //LogPair.Add("SimStatus", "ReadFail");
-                //ReportLog.Add("Get sim status failed");
+
                 return false;
             }
             else
             {
-                //LogPair.Add("SimStatus", simstatus.IsInstalled? "1":"0");
-                //InfoLog += $"iccidBytes,{BitConverter.ToString(simstatus.ICCID).Replace("-","")}\n";
-                //InfoLog += $"imsiBytes,{BitConverter.ToString(simstatus.IMSI).Replace("-", "")}\n";
+                LogWriter.Log(string.Format("Get Sim Status : {0} , Expect:{1}", simstatus.IsInstalled ? "installed" : "uninstalled", UpdateData.IsSimInsert ? "installed" : "uninstalled"));
 
                 if (simstatus.IsInstalled != UpdateData.IsSimInsert)
                 {
-                    LogWriter.Log(string.Format("Get Sim Status : {0} , Expect:{1}", simstatus.IsInstalled ? "installed" : "uninstalled", UpdateData.IsSimInsert ? "installed" : "uninstalled"));
                     Error = ErrorType.SimStatusMismatch;
-                    //ReportLog.Add(string.Format("Get Sim Status : {0} , Expect:{1}", simstatus.IsInstalled ? "installed" : "uninstalled", UpdateData.IsSimInsert ? "installed" : "uninstalled"));
-                    //Logger.Print("sim install status not matched", isError: true);
+
                     return false;
                 }
                 else
@@ -170,21 +155,14 @@ namespace AwInitilizer.Procedure.FourGenModuleCheck
                         LogWriter.Report(LogEvent.SimICCID, ICCIDstring);
                         LogWriter.Report(LogEvent.SimIMSI, IMSIstring);
 
-                        //LogPair.Add("SimICCID", ICCIDstring);
-                        //LogPair.Add("SimIMSI", IMSIstring);
-
-                        //ReportLog.Add(string.Format("Get Sim ICCID : {0} , Expect:{1}", ICCIDstring, UpdateData.ICCID));
-                        //ReportLog.Add(string.Format("Get Sim IMSI : {0} , Expect:{1}", IMSIstring, UpdateData.IMSI));
-
-                        //InfoLog += $"Get sim info, inserted:{simstatus.IsInstalled},ICCID:{ICCIDstring},IMSI:{IMSIstring}\n";
+                        LogWriter.Log(string.Format("Get Sim ICCID : {0} , Expect:{1}", ICCIDstring, UpdateData.ICCID));
+                        LogWriter.Log(string.Format("Get Sim IMSI : {0} , Expect:{1}", IMSIstring, UpdateData.IMSI));
 
                         if (ICCIDstring != UpdateData.ICCID)
                         {
                             LogWriter.Log("Sim card ICCID not match");
                             Error = ErrorType.IccidMistach;
 
-                            //Logger.Print("sim card ICCID not matched", isError: true);
-                            //InfoLog += $"Sim card ICCID not matched,{ICCIDstring}:{UpdateData.ICCID}\n";
                             return false;
                         }
 
@@ -193,30 +171,11 @@ namespace AwInitilizer.Procedure.FourGenModuleCheck
                             LogWriter.Log("Sim card IMSI not match");
                             Error = ErrorType.ImsiMistach;
 
-                            //Logger.Print("sim card IMSI not matched", isError: true);
-                            //InfoLog += $"Sim card IMSI not matched,{IMSIstring}:{UpdateData.IMSI}\n";
                             return false;
                         }
                     }
                     else
                     {
-                        //InfoLog += $"Get sim info, inserted:{simstatus.IsInstalled}\n";
-
-                        //if (!simstatus.ICCID.SequenceEqual(new byte[22]))
-                        //{
-                        //    InfoLog += $"ICCID not empty : { BitConverter.ToString(simstatus.ICCID).Replace("-", " ")}\n";
-                        //    ReportLog.Add("ICCID not empty");
-                        //    Logger.Print("sim card ICCID not empty", isError: true);
-                        //    return false;
-                        //}
-
-                        //if (!simstatus.IMSI.SequenceEqual(new byte[16]))
-                        //{
-                        //    InfoLog += $"IMSI not empty : { BitConverter.ToString(simstatus.IMSI).Replace("-", " ")}\n";
-                        //    ReportLog.Add("IMSI not empty");
-                        //    Logger.Print("sim card IMSI not empty", isError: true);
-                        //    return false;
-                        //}
                     }
                 }
 

AwInitilizer/Procedure/VersionLogProcedure.cs

@@ -44,10 +44,18 @@ namespace AwInitilizer.Procedure.VersionLog
             { "Connector2FwRev","Connector 2" },
         };
 
+        public enum ErrorType
+        {
+            None,
+            ReadVersionFail,
+        }
+
         public enum LogEvent
         {
         }
 
+        public ErrorType Error { get; set; } = ErrorType.None;
+
         private ProcedureLog.LogWriter<VersionLogProcedure, LogEvent> LogWriter;
 
         public VersionLogProcedure() : base()
@@ -76,6 +84,8 @@ namespace AwInitilizer.Procedure.VersionLog
             }
             else
             {
+                Error = ErrorType.ReadVersionFail;
+
                 return false;
             }
         }

AwInitilizer/Procedure/WifRssiCheckProcedure.cs

@@ -57,16 +57,11 @@ namespace AwInitilizer.Procedure.WifRssiCheck
         {
             if (!UpdateData.SystemID.ModelName.Network.ToString().Contains("WiFi"))
             {
-                //if does not support Wifi then end init
                 LogWriter.Log("Wifi not supported, skip procedure");
 
-                //InfoLog += "model name does not support Wifi ,skip check process\n";
-                //ReportLog.Add("Wifi not supported, skip procedure");
                 return true;
             }
 
-            LogWriter.Log("Connecting to EVSE");
-            //Logger.Print("Connecting to EVSE");
             var checkResult = await CheckWifiRssi();
             return checkResult;
         }
@@ -76,7 +71,9 @@ namespace AwInitilizer.Procedure.WifRssiCheck
             var rssi = await GetWifiRssi();
             LogWriter.Report(LogEvent.WifiRssi, rssi.ToString());
             if (rssi == 0)
+            {
                 return false;
+            }
             else
             {
                 var rssiCheckPass = rssi >= -80;
@@ -107,8 +104,6 @@ namespace AwInitilizer.Procedure.WifRssiCheck
                         // 將 StreamReader 所讀到的字元轉為 string
                         string request = reader.ReadToEnd();
                         LogWriter.Log($"GetResponse:{request}", isDebugLog: true);
-                        //InfoLog += $"GetResponse:{request}";
-                        //Logger.Print($"GetResponse:{request}", isError: false);
 
                         Regex rx_mode = new Regex("(WifiMode)\\\": ([0-9]*)");
                         var matches_mode = rx_mode.Matches(request);
@@ -154,7 +149,6 @@ namespace AwInitilizer.Procedure.WifRssiCheck
                             {
                                 if (int.TryParse(match.Groups[2].Value, out var rssiSignal))
                                 {
-                                    //LogPair.Add("WifiRssi", rssiSignal.ToString());
                                     return rssiSignal;
                                 }
                                 Error = ErrorType.WifiRssiDataNotFound;
@@ -171,16 +165,11 @@ namespace AwInitilizer.Procedure.WifRssiCheck
             }
             catch (Exception e)
             {
+                Error = ErrorType.WifiRssiDataNotFound;
+
                 LogWriter.Log("Get Wifi Rssi Failed");
                 LogWriter.Log(e.Message, isDebugLog: true);
 
-                //Logger.Print("Get Wifi Rssi Failed", isError: true);
-                //Logger.Print(e.Message + "", isError: true);
-
-                //InfoLog += "Get Wifi Rssi Failed\n";
-                //InfoLog += e.Message;
-                //InfoLog += "\n";
-
                 return 0;
             }
         }

AwInitilizer/ProcedureLog/LogWriter.cs

@@ -68,10 +68,7 @@ namespace AwInitilizer.ProcedureLog
 
         private void MesReport(string key,string value)
         {
-            if (source.LogPair.ContainsKey(key))
-                source.LogPair[key] = value;
-            else
-                source.LogPair.Add(key, value);
+            source.LogPair[key] = value;
         }
 
         private void WriteMyLog(string log)

GitVersion.yml

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