fix: 自定义数据的hex不显示的bug

chenxuuu · Jun 12, 2024 · 4cd2ba9 · 4cd2ba9
1 parent 62b1726
commit 4cd2ba9
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/llcom/Pages/DataShowPage.xaml.cs b/llcom/Pages/DataShowPage.xaml.cs
@@ -218,10 +218,10 @@ public DataShow(byte[] data, DateTime time, bool sent)
                         2 => Tools.Global.Byte2Hex(temp, " ", len),
                         _ => Tools.Global.Byte2Readable(temp, len),
                     };
+                    //同时显示模式时，才显示小字hex
+                    if (Tools.Global.setting.showHexFormat == 0)
+                        HexText = "\nHex: " + Tools.Global.Byte2Hex(temp, " ", len);
                 }
-                //同时显示模式时，才显示小字hex
-                if (Tools.Global.setting.showHexFormat == 0)
-                    HexText = "\nHex: " + Tools.Global.Byte2Hex(temp, " ", len);
             }
 
             public DataShow(string title, byte[] data, DateTime time, SolidColorBrush color)
@@ -239,13 +239,14 @@ public DataShow(string title, byte[] data, DateTime time, SolidColorBrush color)
                         2 => Tools.Global.Byte2Hex(temp, " ", len),
                         _ => Tools.Global.Byte2Readable(temp, len),
                     };
+                    //同时显示模式时，才显示小字hex
+                    if (Tools.Global.setting.showHexFormat == 0)
+                        HexText = "\nHex: " + Tools.Global.Byte2Hex(temp, " ", len);
                 }
-                //同时显示模式时，才显示小字hex
-                if (Tools.Global.setting.showHexFormat == 0)
-                    HexText = "\nHex: " + Tools.Global.Byte2Hex(temp, " ", len);
 
                 RawTitle = title;
                 RawTextColor = color;
+                HexTextColor = color;
             }
         }
     }

diff --git a/llcom/Properties/AssemblyInfo.cs b/llcom/Properties/AssemblyInfo.cs
@@ -51,7 +51,7 @@
 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
 //通过使用 "*"，如下所示:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.1.3.4")]
-[assembly: AssemblyFileVersion("1.1.3.4")]
+[assembly: AssemblyVersion("1.1.3.5")]
+[assembly: AssemblyFileVersion("1.1.3.5")]
 [assembly: NeutralResourcesLanguage("zh-CN")]