check and fix return value when failed

AwInitilizer/Assist/EvApi.cs

@@ -99,8 +99,7 @@ namespace AwInitilizer.Assist
             }
 
             if (!result.Contains("Button1") ||
-                !result.Contains("Button2") ||
+                !result.Contains("Button2") )
-                !result.Contains("EmergencyButton"))
             {
                 return new EvApiResult<ButtonStatus>()
                 {
@@ -126,7 +125,7 @@ namespace AwInitilizer.Assist
             {
                 return new EvApiResult<Dictionary<string, string>>()
                 {
-                    Result = toReturn,
+                    Result = null,
                     Response = getResult.Msg,
                 };
             }
@@ -171,7 +170,7 @@ namespace AwInitilizer.Assist
             {
                 return new EvApiResult<string>()
                 {
-                    Result = string.Empty,
+                    Result = null,
                     Response = getResult.Msg,
                 };
             }
@@ -317,7 +316,7 @@ namespace AwInitilizer.Assist
             {
                 return new EvApiResult<Dictionary<int, string>>()
                 {
-                    Result = connectorStatusPair,
+                    Result = null,
                     Response = getResult.Msg
                 };
             }

AwInitilizer/Procedure/FirmwareCheckVersionProcedure.cs

@@ -77,6 +77,12 @@ namespace AwInitilizer.Procedure.FirmwareCheckVersion
             var versionPair = await GetVersion();
             var updatedList = UpdateData.FirmwareUpdateModels;
 
+            if (versionPair == null)
+            {
+                Error = ErrorType.VersionCheckFail;
+                return false;
+            }
+
             //check all version
             foreach (var model in updatedList)
             {

AwInitilizer/Procedure/FirmwareUpdateProcedure.cs

@@ -122,7 +122,8 @@ namespace AwInitilizer.Procedure
         internal virtual async Task<string> GetSpecificVersion()
         {
             var versions = await GetVersion();
-            if(!versions.ContainsKey(module))
+            if(versions == null ||
+                !versions.ContainsKey(module))
             {
                 return "";
             }

AwInitilizer/Procedure/RestarttoIdelProcedure.cs

@@ -108,22 +108,22 @@ namespace AwInitilizer.Procedure.RestarttoIdel
         {
             var statusPairs = await GetConnectorStatus();
             if (statusPairs is null)
+            {
                 return false;
-            else
+            }
+
+            foreach (var statusPair in statusPairs)
             {
-                foreach (var statusPair in statusPairs)
+                if (statusPair.Value != "1")
                 {
-                    if (statusPair.Value != "1")
+                    LogWriter.Log($"Connector {statusPair.Key} status not Idel");
-                    {
+
-                        LogWriter.Log($"Connector {statusPair.Key} status not Idel");
+                    return false;
-
+                    //InfoLog += $"Connector {matchIndex} status not Idel\n";
-                        return false;
+                    //Logger.Print($"Connector {matchIndex} status not Idel", isError: true);
-                        //InfoLog += $"Connector {matchIndex} status not Idel\n";
-                        //Logger.Print($"Connector {matchIndex} status not Idel", isError: true);
-                    }
                 }
-                return true;
             }
+            return true;
         }
 
         private async Task<Dictionary<int, string>> GetConnectorStatus()

AwInitilizer/Procedure/TelcomModemImeiRecordProcedure.cs

@@ -72,7 +72,7 @@ namespace AwInitilizer.Procedure.TelcomModemImeiRecord
                 {
                     Error = ErrorType.TelcomModemImeiNotFound;
                 }
-                return "";
+                return result.Result;
             }
             catch (Exception e)
             {

AwInitilizer/Procedure/VersionLogProcedure.cs

@@ -72,25 +72,22 @@ namespace AwInitilizer.Procedure.VersionLog
         internal override async Task<bool> Run()
         {
             var versionPair = await GetVersion();
-            if (versionPair != null)
+            if (versionPair == null)
-            {
-                foreach (var infoPair in versionPair)
-                {
-                    if (!excludeHeaderList.Contains(infoPair.Key))
-                    {
-                        var mesKey = GetMesReportKey(infoPair.Key);
-                        LogWriter.Report(mesKey, infoPair.Value);
-                        //LogPair.Add(infoPair.Key, infoPair.Value);
-                    }
-                }
-            }
-            else
             {
                 Error = ErrorType.ReadVersionFail;
-
                 return false;
             }
 
+            foreach (var infoPair in versionPair)
+            {
+                if (!excludeHeaderList.Contains(infoPair.Key))
+                {
+                    var mesKey = GetMesReportKey(infoPair.Key);
+                    LogWriter.Report(mesKey, infoPair.Value);
+                    //LogPair.Add(infoPair.Key, infoPair.Value);
+                }
+            }
+
 
             var assembly = System.Reflection.Assembly.GetExecutingAssembly();
             var version = assembly.GetName().Version.ToString();