Bladeren bron

现场提交

lixiang 2 jaren geleden
bovenliggende
commit
fdec3cda1a

+ 3 - 1
Venus/Venus_RT/Devices/AdTecRF.cs

@@ -761,6 +761,8 @@ namespace Venus_RT.Devices
 
             _timerQueryStatus.Start(QUERY_INTERVAL);
             this.SendCmd(AdTecMatchMessage.START_QUERY);
+
+            //LOG.Write(eEvent.ERR_RF, Module, "Initialize done.");
             return true;
         }
 
@@ -870,7 +872,7 @@ namespace Venus_RT.Devices
                 {
                     // BYTE 3,4; bit 7
                     string s0 = sItem1.Substring(2 + S3_HEAD_LENGTH, 2);
-                    ushort status0 = Convert.ToUInt16(s0);
+                    ushort status0 = Convert.ToUInt16(s0, 16);
                     byte[] a1 = BitConverter.GetBytes(status0);
 
                     BitArray ba1 = new BitArray(a1);

+ 1 - 2
Venus/Venus_Themes/Converters/IntToBoolConverter.cs

@@ -11,8 +11,7 @@ namespace Venus_Themes.Converters
     {
         public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
         {
-
-            if ((int)value == 1)
+            if ((int)value == 2)
             {
                 return true;
             }

+ 1 - 1
Venus/Venus_Themes/Converters/IntToBoolConverter2.cs

@@ -12,7 +12,7 @@ namespace Venus_Themes.Converters
         public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
         {
 
-            if ((int)value == 2)
+            if ((int)value == 1)
             {
                 return true;
             }