Merge branch 'release/自定义读写器功率'

JmpZbPrint/Properties/AssemblyInfo.cs

@@ -49,5 +49,5 @@ using System.Windows;
 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
 //通过使用 "*"，如下所示:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.2.19.11281")]
-[assembly: AssemblyFileVersion("1.2.20.01030")]
+[assembly: AssemblyVersion("1.2.22.02241")]
+[assembly: AssemblyFileVersion("1.2.22.02241")]

RepairService/UhfService.cs

@@ -10,6 +10,7 @@ using System.Configuration;
 using System.Data;
 using System.Diagnostics;
 using System.Globalization;
+using System.IO;
 using System.IO.Ports;
 using System.Linq;
 using System.Reflection;
@@ -500,8 +501,23 @@ namespace JmpUhfService
                 {
                     reader = type == 0 ? reader1 : reader2;
                     reader.InventoryStop();
-                    reader.SetPALevel(1);
-                    reader.SetTxPower(0, true, 24);
+
+                    var config = new ReaderConfig
+                    {
+                        PALevel = 2,
+                        Power = 24
+                    };
+                    var fileName = new FileInfo(Assembly.GetEntryAssembly()?.Location ?? "").Directory + "/ReaderConfig.json";
+                    if (!File.Exists(fileName))
+                    {
+                        File.WriteAllText(fileName, JsonConvert.SerializeObject(config));
+                    }
+                    else
+                    {
+                        config = JsonConvert.DeserializeObject<ReaderConfig>(File.ReadAllText(fileName));
+                    }
+                    reader.SetPALevel((byte)config.PALevel);
+                    reader.SetTxPower(0, true, config.Power);
 
                     reader.OnInventory += OnRadioInventory;
 
@@ -622,4 +638,17 @@ namespace JmpUhfService
         public IWebSocketConnection Connection { get; set; }
         public DateTime LinkDate { get; set; }
     }
+
+    public class ReaderConfig
+    {
+        /// <summary>
+        /// 天线使能
+        /// </summary>
+        public int PALevel { get; set; }
+        /// <summary>
+        /// 功率
+        /// </summary>
+        public int Power { get; set; }
+    }
+
 }