fix naming error wifi IMEI to TelcomModemImei

AwInitilizer/Initilizer.csproj

@@ -99,7 +99,7 @@
     <Compile Include="Procedure\FirmwareCheckVersionProcedure.cs" />
     <Compile Include="Procedure\FirmwareUploadProcedure.cs" />
     <Compile Include="Procedure\VersionLogProcedure.cs" />
-    <Compile Include="Procedure\WifImeiRecordProcedure.cs" />
+    <Compile Include="Procedure\TelcomModemImeiRecordProcedure.cs" />
     <Compile Include="Procedure\WifRssiCheckProcedure.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Resx\AppResources.Designer.cs">

AwInitilizer/MainWindow.xaml.cs

@@ -623,7 +623,7 @@ namespace AwInitilizer
             procedures.Add(new Procedure.BasicInfoUpdate.BasicInfoUpdateProcedure());
             procedures.Add(new Procedure.FourGenModuleCheck.FourGenModuleCheckProcedure());
             procedures.Add(new Procedure.WifRssiCheck.WifRssiCheckProcedure());
-            procedures.Add(new Procedure.WifImeiRecord.WifImeiRecordProcedure());
+            procedures.Add(new Procedure.TelcomModemImeiRecord.TelcomModemImeiRecordProcedure());
             procedures.Add(new Procedure.FirmwareBundleUpload.FirmwareFtpUploadProcedure());
             procedures.Add(new Procedure.FirmwareCheckVersion.FirmwareCheckVersionProcedure());
             procedures.Add(new Procedure.ButtonStatusCheck.ButtonStatusCheckPorcedure());

AwInitilizer/Procedure/WifImeiRecordProcedure.cs → AwInitilizer/Procedure/TelcomModemImeiRecordProcedure.cs

@@ -8,37 +8,37 @@ using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 
-namespace AwInitilizer.Procedure.WifImeiRecord
+namespace AwInitilizer.Procedure.TelcomModemImeiRecord
 {
     public enum ErrorType
     {
         None,
-        WifiImeiNotFound,
+        TelcomModemImeiNotFound,
     }
 
     public enum LogEvent
     {
-        WifiImei
+        TelcomModemImei
     }
 
-    public class WifImeiRecordProcedure : ProcedureBase
+    public class TelcomModemImeiRecordProcedure : ProcedureBase
     {
         private readonly static Dictionary<LogEvent, string> ReportDict = new Dictionary<LogEvent, string>()
         {
-            { LogEvent.WifiImei, "WifiRssi" }
+            { LogEvent.TelcomModemImei, "TelcomModemImei" }
         };
         
         private readonly static Dictionary<LogEvent, string> LogDict = new Dictionary<LogEvent, string>()
         {
-            { LogEvent.WifiImei, "Get Wifi IMEI : {0}" }
+            { LogEvent.TelcomModemImei, "Get TelcomModem IMEI : {0}" }
         };
 
-        public WifImeiRecordProcedure() : base()
+        public TelcomModemImeiRecordProcedure() : base()
         {
-            Name = "WiFi IMEI record";
-            Content = "read and upload WIFI IMEI";
+            Name = "TelcomModem IMEI record";
+            Content = "read and upload TelcomModem IMEI";
 
-            LogWriter = new ProcedureLog.LogWriter<WifImeiRecordProcedure, LogEvent>(this)
+            LogWriter = new ProcedureLog.LogWriter<TelcomModemImeiRecordProcedure, LogEvent>(this)
             {
                 ReportPair = ReportDict,
                 LogPair = LogDict
@@ -46,23 +46,23 @@ namespace AwInitilizer.Procedure.WifImeiRecord
         }
 
         public ErrorType Error { get; set; } = ErrorType.None;
-        private ProcedureLog.LogWriter<WifImeiRecordProcedure, LogEvent> LogWriter;
+        private ProcedureLog.LogWriter<TelcomModemImeiRecordProcedure, LogEvent> LogWriter;
 
         internal override async Task<bool> Run()
         {
-            if (!UpdateData.SystemID.ModelName.Network.Description.Contains("WiFi"))
+            if (!UpdateData.SystemID.ModelName.Network.Description.Contains("4G"))
             {
-                LogWriter.Log("Wifi not supported, skip procedure");
+                LogWriter.Log("TelcomModem not supported, skip procedure");
 
                 return true;
             }
 
-            var imei = await GetWifiImei();
-            LogWriter.Report(LogEvent.WifiImei, imei);
+            var imei = await GetTelcomModemImei();
+            LogWriter.Report(LogEvent.TelcomModemImei, imei);
             return string.IsNullOrEmpty(imei);
         }
 
-        internal async Task<string> GetWifiImei()
+        internal async Task<string> GetTelcomModemImei()
         {
             try
             {
@@ -88,7 +88,7 @@ namespace AwInitilizer.Procedure.WifImeiRecord
                             var match = matches[0];
                             if (match.Groups.Count != 3)
                             {
-                                Error = ErrorType.WifiImeiNotFound;
+                                Error = ErrorType.TelcomModemImeiNotFound;
                                 return "";
                             }
                             else
@@ -97,13 +97,13 @@ namespace AwInitilizer.Procedure.WifImeiRecord
                                 {
                                     return imei;
                                 }
-                                Error = ErrorType.WifiImeiNotFound;
+                                Error = ErrorType.TelcomModemImeiNotFound;
                                 return "";
                             }
                         }
                         else
                         {
-                            Error = ErrorType.WifiImeiNotFound;
+                            Error = ErrorType.TelcomModemImeiNotFound;
                             return "";
                         }
                     }
@@ -111,9 +111,9 @@ namespace AwInitilizer.Procedure.WifImeiRecord
             }
             catch (Exception e)
             {
-                Error = ErrorType.WifiImeiNotFound;
+                Error = ErrorType.TelcomModemImeiNotFound;
 
-                LogWriter.Log("Get Wifi IMEI Failed");
+                LogWriter.Log("Get TelcomModem IMEI Failed");
                 LogWriter.Log(e.Message, isDebugLog: true);
 
                 return "";

AwInitilizer/Properties/AssemblyInfo.cs

@@ -34,4 +34,4 @@ using System.Runtime.InteropServices;
 // [assembly: AssemblyVersion("1.7.0.0")]
 [assembly: AssemblyVersion("1.7.0.0")]
 [assembly: AssemblyFileVersion("1.7.0.0")]
-[assembly: AssemblyInformationalVersion("1bdf159")]
+[assembly: AssemblyInformationalVersion("abcc1fa")]

GitVersion.yml

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

Initilizer/AssemblyInfo.cs

@@ -11,5 +11,5 @@
 
 [assembly: AssemblyVersion("1.7.0.0")]
 [assembly: AssemblyFileVersion("1.7.0.0")]
-[assembly: AssemblyInformationalVersion("1bdf159")]
+[assembly: AssemblyInformationalVersion("abcc1fa")]
 

MesAdaptor/Properties/AssemblyInfo.cs

@@ -34,4 +34,4 @@ using System.Runtime.InteropServices;
 // [assembly: AssemblyVersion("1.7.0.0")]
 [assembly: AssemblyVersion("1.7.0.0")]
 [assembly: AssemblyFileVersion("1.7.0.0")]
-[assembly: AssemblyInformationalVersion("1bdf159")]
+[assembly: AssemblyInformationalVersion("abcc1fa")]