获取4G模块信息；升级核心库，支持reader.ReadFixedString(-1)获取剩余字符串

NewLifeX · Jan 24, 2024 · 2562514 · 2562514
1 parent 402831c
commit 2562514
Show file tree

Hide file tree

Showing 17 changed files with 72 additions and 31 deletions.
diff --git a/Samples/BuzzerTest/BuzzerTest.csproj b/Samples/BuzzerTest/BuzzerTest.csproj
@@ -21,7 +21,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="NewLife.IoT" Version="2.0.2023.1212-beta0413" />
+    <PackageReference Include="NewLife.IoT" Version="2.0.2024.101" />
   </ItemGroup>
 
 </Project>
diff --git a/Samples/DatabaseTest/DatabaseTest.csproj b/Samples/DatabaseTest/DatabaseTest.csproj
@@ -17,7 +17,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NewLife.XCode" Version="11.10.2023.1201" />
+    <PackageReference Include="NewLife.XCode" Version="11.10.2024.101" />
   </ItemGroup>
 
 </Project>
diff --git a/Samples/KeyTest/KeyTest.csproj b/Samples/KeyTest/KeyTest.csproj
@@ -21,7 +21,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="NewLife.IoT" Version="2.0.2023.1212-beta0413" />
+    <PackageReference Include="NewLife.IoT" Version="2.0.2024.101" />
   </ItemGroup>
 
 </Project>
diff --git a/Samples/LedTest/LedTest.csproj b/Samples/LedTest/LedTest.csproj
@@ -21,7 +21,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="NewLife.IoT" Version="2.0.2023.1212-beta0413" />
+    <PackageReference Include="NewLife.IoT" Version="2.0.2024.101" />
   </ItemGroup>
 
 </Project>
diff --git a/Samples/NetClientTest/NetClientTest.csproj b/Samples/NetClientTest/NetClientTest.csproj
@@ -17,7 +17,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NewLife.Core" Version="10.6.2023.1201" />
+    <PackageReference Include="NewLife.Core" Version="10.6.2024.101" />
   </ItemGroup>
 
 </Project>
diff --git a/Samples/NetServerTest/NetServerTest.csproj b/Samples/NetServerTest/NetServerTest.csproj
@@ -17,7 +17,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NewLife.Core" Version="10.6.2023.1201" />
+    <PackageReference Include="NewLife.Core" Version="10.6.2024.101" />
   </ItemGroup>
 
 </Project>
diff --git a/Samples/Serial2NetClientTest/Serial2NetClientTest.csproj b/Samples/Serial2NetClientTest/Serial2NetClientTest.csproj
@@ -17,7 +17,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NewLife.Core" Version="10.6.2023.1201" />
+    <PackageReference Include="NewLife.Core" Version="10.6.2024.101" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Samples/Serial2NetServerTest/Serial2NetServerTest.csproj b/Samples/Serial2NetServerTest/Serial2NetServerTest.csproj
@@ -17,7 +17,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NewLife.Core" Version="10.6.2023.1201" />
+    <PackageReference Include="NewLife.Core" Version="10.6.2024.101" />
   </ItemGroup>
 
 </Project>
diff --git a/Samples/SerialTest/SerialTest.csproj b/Samples/SerialTest/SerialTest.csproj
@@ -17,8 +17,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NewLife.Core" Version="10.6.2023.1201" />
-    <PackageReference Include="NewLife.IoT" Version="2.0.2023.1212-beta0413" />
+    <PackageReference Include="NewLife.Core" Version="10.6.2024.101" />
+    <PackageReference Include="NewLife.IoT" Version="2.0.2024.101" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Samples/UsbPowerTest/UsbPowerTest.csproj b/Samples/UsbPowerTest/UsbPowerTest.csproj
@@ -21,7 +21,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="NewLife.IoT" Version="2.0.2023.1212-beta0413" />
+    <PackageReference Include="NewLife.IoT" Version="2.0.2024.101" />
   </ItemGroup>
 
 </Project>
diff --git a/SmartA2/Net/ErrorCodes.cs b/SmartA2/Net/ErrorCodes.cs
@@ -0,0 +1,22 @@
+namespace SmartA2.Net;
+
+/// <summary>错误代码</summary>
+public enum ErrorCodes : UInt16
+{
+    /// <summary>成功</summary>
+    Success = 0,
+
+    Fail = 1,
+
+    执行过程信息输出 = 5,
+
+    参数错误 = 10,
+
+    当前模式错误 = 11,
+
+    Busy = 12,
+
+    模块复位中 = 13,
+
+    无此命令 = 20,
+}
diff --git a/SmartA2/Net/NetInfo.cs b/SmartA2/Net/NetInfo.cs
@@ -9,5 +9,9 @@ public class NetInfo
 
     public String ICCID { get; set; }
 
+    public String COPS { get; set; }
+
     public Int32 CSQ { get; set; }
+
+    public String LACCI { get; set; }
 }
diff --git a/SmartA2/Net/NetModule.cs b/SmartA2/Net/NetModule.cs
@@ -73,8 +73,11 @@ public NetResult Send(UInt16 cmd, Byte[] args)
         if (reader.ReadFixedString(3) != "HTR") return null;
 
         var cmd2 = reader.ReadUInt16();
-        var code = reader.ReadUInt16();
+        var code = (ErrorCodes)reader.ReadUInt16();
         var str = reader.ReadFixedString(-1);
+#if DEBUG
+        XTrace.WriteLine("cmd={0} code={1} message={2}", cmd2, code, str);
+#endif
 
         return new NetResult { Cmd = cmd2, Code = code, Message = str };
     }
@@ -167,13 +170,25 @@ public String GetState()
     /// <returns></returns>
     public NetInfo GetNetInfo()
     {
-        var inf = new NetInfo
-        {
-            IMEI = GetIMEI(),
-            IMSI = GetIMSI(),
-            ICCID = GetICCID(),
-            CSQ = GetCSQ().ToInt(),
-        };
+        var inf = new NetInfo();
+
+        inf.IMEI = GetIMEI();
+
+        Thread.Sleep(100);
+        inf.IMSI = GetIMSI();
+
+        Thread.Sleep(100);
+        inf.ICCID = GetICCID();
+
+        Thread.Sleep(100);
+        inf.COPS = GetCOPS();
+
+        Thread.Sleep(100);
+        inf.CSQ = GetCSQ().ToInt();
+
+        Thread.Sleep(100);
+        inf.LACCI = GetLACCI();
+
         return inf;
     }
     #endregion

diff --git a/SmartA2/Net/NetResult.cs b/SmartA2/Net/NetResult.cs
@@ -4,7 +4,7 @@ public class NetResult
 {
     public UInt16 Cmd { get; set; }
 
-    public UInt16 Code { get; set; }
+    public ErrorCodes Code { get; set; }
 
     public String Message { get; set; }
 }
diff --git a/SmartA2/SmartA2.csproj b/SmartA2/SmartA2.csproj
@@ -49,7 +49,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="NewLife.IoT" Version="2.0.2023.1212-beta0413" />
+    <PackageReference Include="NewLife.IoT" Version="2.0.2024.101" />
     <PackageReference Include="NewLife.ModbusRTU" Version="1.8.2023.1212-beta0414" />
   </ItemGroup>
 

diff --git a/Test/Program.cs b/Test/Program.cs
@@ -71,28 +71,28 @@ static void Test3()
 
     XTrace.WriteLine("Info:\t{0}", module.GetInfo());
 
-    //Thread.Sleep(1000);
+    Thread.Sleep(1000);
     XTrace.WriteLine("Version:\t{0}", module.GetVersion());
-    //Thread.Sleep(1000);
+    Thread.Sleep(1000);
     XTrace.WriteLine("State:\t{0}", module.GetState());
 
-    //Thread.Sleep(1000);
+    Thread.Sleep(1000);
     XTrace.WriteLine("IMEI:\t{0}", module.GetIMEI());
-    //Thread.Sleep(1000);
+    Thread.Sleep(1000);
     XTrace.WriteLine("IMSI:\t{0}", module.GetIMSI());
 
-    //Thread.Sleep(1000);
+    Thread.Sleep(1000);
     XTrace.WriteLine("CSQ:\t{0}", module.GetCSQ());
-    //Thread.Sleep(1000);
+    Thread.Sleep(1000);
     XTrace.WriteLine("COPS:\t{0}", module.GetCOPS());
 
-    //Thread.Sleep(1000);
+    Thread.Sleep(1000);
     XTrace.WriteLine("ICCID:\t{0}", module.GetICCID());
 
-    //Thread.Sleep(1000);
+    Thread.Sleep(1000);
     XTrace.WriteLine("LACCI:\t{0}", module.GetLACCI());
 
-    //Thread.Sleep(1000);
+    Thread.Sleep(1000);
     XTrace.WriteLine("LBS:\t{0}", module.GetLBS());
 
     module.Close();

diff --git a/XUnitTest/XUnitTest.csproj b/XUnitTest/XUnitTest.csproj
@@ -13,7 +13,7 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
     <PackageReference Include="NewLife.UnitTest" Version="1.0.2023.1204" />
     <PackageReference Include="System.Speech" Version="8.0.0" />
-    <PackageReference Include="xunit" Version="2.6.4" />
+    <PackageReference Include="xunit" Version="2.6.6" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.5.6">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>