整理代码

DigitalPlatform · Apr 4, 2019 · 6a72ab4 · 6a72ab4
1 parent fdc7e70
commit 6a72ab4
Show file tree

Hide file tree

Showing 13 changed files with 142 additions and 47 deletions.
diff --git a/RfidCenter/App.config b/RfidCenter/App.config
@@ -1,6 +1,36 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
+  <configSections>
+    <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
+    <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
+    <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net" />
+  </configSections>
     <startup> 
         <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
     </startup>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="Google.Protobuf" publicKeyToken="a7d26565bac4d604" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-3.6.0.0" newVersion="3.6.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+
+  <log4net>
+    <appender name="myLogAppender" type="log4net.Appender.RollingFileAppender">
+      <file type="log4net.Util.PatternString" value="%property{LogFileName}" />
+      <staticLogFileName value="false" />
+      <rollingStyle value="Date" />
+      <datePattern value="yyyyMMdd'.txt'" />
+      <appendToFile value="true" />
+      <layout type="log4net.Layout.PatternLayout">
+        <conversionPattern value="%level %logger %date{ISO8601} - %message%newline" />
+      </layout>
+    </appender>
+    <logger name="driver1">
+      <level value="Info"></level>
+      <appender-ref ref="myLogAppender" />
+    </logger>
+  </log4net>
 </configuration>
diff --git a/RfidCenter/MainForm.Designer.cs b/RfidCenter/MainForm.Designer.cs
diff --git a/RfidCenter/MainForm.cs b/RfidCenter/MainForm.cs
@@ -26,6 +26,7 @@
 using DigitalPlatform.IO;
 using DigitalPlatform.Text;
 using System.Speech.Synthesis;
+using log4net;
 
 namespace RfidCenter
 {
@@ -68,7 +69,15 @@ private void Form1_Load(object sender, EventArgs e)
             }
 
             ClientInfo.Initial("rfidcenter");
-
+            {
+                Driver1Manager.Log = LogManager.GetLogger("main", "driver1");
+                /*
+                _log = LogManager.GetLogger("main",
+                    product_name
+                    // "fingerprintcenter"
+                    );
+                    */
+            }
             ClearHtml();
 
             // 显示版本号
@@ -1403,5 +1412,17 @@ private void MenuItem_writePassword_Click(object sender, EventArgs e)
             ERROR1:
             MessageBox.Show(this, strError);
         }
+
+        private void MenuItem_openUserFolder_Click(object sender, EventArgs e)
+        {
+            try
+            {
+                System.Diagnostics.Process.Start(ClientInfo.UserDir);
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show(this, ExceptionUtil.GetAutoText(ex));
+            }
+        }
     }
 }
diff --git a/RfidCenter/MainForm.resx b/RfidCenter/MainForm.resx
@@ -120,9 +120,6 @@
   <metadata name="toolStrip_server.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>697, 17</value>
   </metadata>
-  <metadata name="toolStrip_server.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>697, 17</value>
-  </metadata>
   <metadata name="statusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>897, 17</value>
   </metadata>

diff --git a/RfidCenter/RfidCenter.csproj b/RfidCenter/RfidCenter.csproj
@@ -30,7 +30,7 @@
     <SuiteName>dp2 V3</SuiteName>
     <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
     <WebPage>publish.htm</WebPage>
-    <ApplicationRevision>15</ApplicationRevision>
+    <ApplicationRevision>17</ApplicationRevision>
     <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>
@@ -119,6 +119,9 @@
     <Prefer32Bit>true</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="log4net, Version=2.0.8.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
+      <HintPath>..\packages\log4net.2.0.8\lib\net45-full\log4net.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Runtime.Remoting" />
@@ -167,6 +170,7 @@
       <DependentUpon>Resources.resx</DependentUpon>
     </Compile>
     <None Include="dp2003.pfx" />
+    <None Include="packages.config" />
     <None Include="Properties\app.manifest" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
@@ -179,7 +183,9 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
-    <None Include="App.config" />
+    <None Include="App.config">
+      <SubType>Designer</SubType>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\DigitalPlatform.CirculationClient\DigitalPlatform.CirculationClient.csproj">

diff --git a/RfidCenter/packages.config b/RfidCenter/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="log4net" version="2.0.8" targetFramework="net461" />
+</packages>
diff --git a/RfidDrivers.First/Driver1.cs b/RfidDrivers.First/Driver1.cs
@@ -12,6 +12,7 @@
 using DigitalPlatform;
 using DigitalPlatform.RFID;
 using DigitalPlatform.Text;
+using log4net;
 
 namespace RfidDrivers.First
 {
@@ -90,7 +91,8 @@ NormalResult OpenAllReaders()
 
                 OpenReaderResult result = OpenReader(reader.DriverName,
                     reader.Type,
-                    reader.SerialNumber);
+                    reader.SerialNumber,
+                    null);
                 reader.Result = result;
                 reader.ReaderHandle = result.ReaderHandle;
 
@@ -403,13 +405,18 @@ private List<Reader> EnumComReader(string driver_name)
             //if ((driver.m_commTypeSupported & RFIDLIB.rfidlib_def.COMMTYPE_USB_EN) > 0)
             {
                 UInt32 nCOMCnt = RFIDLIB.rfidlib_reader.COMPort_Enum();
+
+                Driver1Manager.Log?.Debug($"COMPort_Enum() return [{nCOMCnt}]");
+
                 for (uint i = 0; i < nCOMCnt; i++)
                 {
                     StringBuilder comName = new StringBuilder();
                     comName.Append('\0', 64);
                     RFIDLIB.rfidlib_reader.COMPort_GetEnumItem(i, comName, (UInt32)comName.Capacity);
                     // comName);
 
+                    Driver1Manager.Log?.Debug($"COMPort_Enum() {i}: comName=[{comName.ToString()}]");
+
                     Reader reader = new Reader
                     {
                         Type = "COM",
@@ -1514,9 +1521,13 @@ static bool GetDriverName(string product_id,
         // 填充驱动类型和设备型号
         NormalResult FillReaderInfo(Reader reader)
         {
-            var result = OpenReader("",
+            StringBuilder debugInfo = new StringBuilder();
+            var result = OpenReader(reader.DriverName,  // "",
                 reader.Type,
-                reader.SerialNumber);
+                reader.SerialNumber,
+                debugInfo);
+            Driver1Manager.Log?.Debug($"FillReaderInfo() OpenReader() return [{result.ToString()}]");
+
             try
             {
                 int iret;
@@ -1529,8 +1540,10 @@ NormalResult FillReaderInfo(Reader reader)
                 nSize = (UInt32)devInfor.Capacity;
                 iret = RFIDLIB.rfidlib_reader.RDR_GetReaderInfor(result.ReaderHandle, 0, devInfor, ref nSize);
                 if (iret != 0)
-                    return new NormalResult { Value = -1, ErrorInfo = "GetReaderInfo() error" };
-
+                {
+                    Driver1Manager.Log?.Debug($"RDR_GetReaderInfor() return [{iret}], debugInfo={debugInfo.ToString()}");
+                    return new NormalResult { Value = -1, ErrorInfo = $"GetReaderInfo() error, iret=[{iret}], debugInfo={debugInfo.ToString()}" };
+                }
                 string dev_info = devInfor.ToString();
                 string[] parts = dev_info.Split(new char[] { ';' });
                 if (parts.Length < 3)
@@ -1631,36 +1644,30 @@ string BuildConnectionString(string readerDriverName,
 #endif
         }
 
-
-
         OpenReaderResult OpenReader(string driver_name,
             string type,
-            string serial_number)
+            string serial_number,
+            StringBuilder debugInfo)
         {
-            //Lock();
-            try
-            {
-                UIntPtr hreader = UIntPtr.Zero;
-                var iret = RFIDLIB.rfidlib_reader.RDR_Open(
-                    BuildConnectionString(driver_name,
-                    type,
-                    serial_number),
-                    ref hreader);
-                if (iret != 0)
-                    return new OpenReaderResult
-                    {
-                        Value = -1,
-                        ErrorInfo = $"OpenReader error, return: {iret}",
-                        ErrorCode = GetErrorCode(iret, hreader)
-                    };
-
+            UIntPtr hreader = UIntPtr.Zero;
+            string connection_string = BuildConnectionString(driver_name,
+                type,
+                serial_number);
+            if (debugInfo != null)
+                debugInfo.Append($"driver_name=[{driver_name}],type=[{type}],serial_number=[{serial_number}],connect_string=[{connection_string}]");
+
+            var iret = RFIDLIB.rfidlib_reader.RDR_Open(
+                connection_string,
+                ref hreader);
+            if (iret != 0)
+                return new OpenReaderResult
+                {
+                    Value = -1,
+                    ErrorInfo = $"OpenReader error, return: {iret}",
+                    ErrorCode = GetErrorCode(iret, hreader)
+                };
 
-                return new OpenReaderResult { ReaderHandle = hreader };
-            }
-            finally
-            {
-                //Unlock();
-            }
+            return new OpenReaderResult { ReaderHandle = hreader };
         }
 
         NormalResult CloseReader(object reader_handle)
@@ -3225,4 +3232,12 @@ public class ReadConfigResult : NormalResult
         public uint CfgNo { get; set; }
         public byte[] Bytes { get; set; }
     }
+
+    /// <summary>
+    /// Driver1 函数库全局参数
+    /// </summary>
+    public static class Driver1Manager
+    {
+        public static ILog Log { get; set; }
+    }
 }
diff --git a/RfidDrivers.First/RfidDrivers.First.csproj b/RfidDrivers.First/RfidDrivers.First.csproj
@@ -67,6 +67,9 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="log4net, Version=2.0.8.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
+      <HintPath>..\packages\log4net.2.0.8\lib\net45-full\log4net.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />
@@ -101,5 +104,8 @@
   <ItemGroup>
     <Content Include="DeviceList.xml" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
diff --git a/RfidDrivers.First/packages.config b/RfidDrivers.First/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="log4net" version="2.0.8" targetFramework="net461" />
+</packages>