SuperCom-3.3

【一、新增功能】统一官方提示功能【二、优化修复】优化稳定性及健壮性多余提示消息自动合并优化一些UI
SuperStudio · Apr 11, 2023 · a1d33e0 · a1d33e0
1 parent 1232d69
commit a1d33e0
Show file tree

Hide file tree

Showing 19 changed files with 103 additions and 231 deletions.
diff --git a/SuperCom.Test/测试用例/SuperCom-3.3.xlsx b/SuperCom.Test/测试用例/SuperCom-3.3.xlsx
diff --git a/SuperCom.Test/测试用例/测试用例.xlsx b/SuperCom.Test/测试用例/测试用例.xlsx
diff --git a/SuperCom/Config/ConfigManager.cs b/SuperCom/Config/ConfigManager.cs
@@ -8,7 +8,7 @@ public static class ConfigManager
     {
         public const string SQLITE_DATA_PATH = "user_data.sqlite";
 
-        public const string RELEASE_DATE = "2023-03-26";
+        public const string RELEASE_DATE = "2023-04-11";
         public static Main Main { get; set; }
         public static CommonSettings CommonSettings { get; set; }
         public static Settings Settings { get; set; }

diff --git a/SuperCom/Config/UrlManager.cs b/SuperCom/Config/UrlManager.cs
@@ -28,6 +28,7 @@ public static class UrlManager
         private static string PluginBasePath = "SuperPlugins";
         public static string FeedbackUrl = "https://github.com/SuperStudio/SuperCom/issues";
         public static string HelpUrl = "https://github.com/SuperStudio/SuperCom/wiki";
+        public const string NOTICE_URL = "https://superstudio.github.io/SuperCom-Upgrade/notice.json";
 
         public static int GetRemoteIndex()
         {

diff --git a/SuperCom/Config/WindowConfig/Main.cs b/SuperCom/Config/WindowConfig/Main.cs
@@ -45,6 +45,7 @@ public static Main CreateInstance()
         public string OpeningPorts { get; set; }
 
         public string CustomBaudRates { get; set; }
+        public string LatestNotice { get; set; }
         public bool UseDefaultBaudRate { get; set; }
         public long CommandsSelectIndex { get; set; }
 

diff --git a/SuperCom/CustomWindows/About.xaml b/SuperCom/CustomWindows/About.xaml
diff --git a/SuperCom/CustomWindows/About.xaml.cs b/SuperCom/CustomWindows/About.xaml.cs
diff --git a/SuperCom/Logger/Logger.cs b/SuperCom/Logger/Logger.cs
@@ -0,0 +1,29 @@
+using SuperUtils.Framework.Logger;
+using SuperUtils.IO;
+using System;
+using System.IO;
+
+namespace SuperCom
+{
+    public class Logger : AbstractLogger
+    {
+        public static string FilePath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "app.log");
+        private Logger() { }
+
+        public static Logger Instance { get; }
+
+
+
+        static Logger()
+        {
+            Instance = new Logger();
+            Instance.LogLevel = Level.Debug;
+        }
+
+        public override void LogPrint(string str)
+        {
+            Console.Write(str);
+            FileHelper.TryAppendToFile(FilePath, str);
+        }
+    }
+}
diff --git a/SuperCom/MainWindow.xaml b/SuperCom/MainWindow.xaml
@@ -20,6 +20,8 @@
     ContentRendered="mainWindow_ContentRendered"
     Foreground="{DynamicResource Window.Foreground}"
     Icon="pack://application:,,,/Resources/Ico/Icon_64.png"
+    MenuAlign="Left"
+    MenuMargin="200 0 0 0"
     ShowThemeSelector="True"
     TitleHeight="30"
     TitleMargin="5 0"
@@ -1346,12 +1348,15 @@
 
                 <Grid Grid.Column="2">
                     <Grid.RowDefinitions>
+                        <RowDefinition Height="auto" />
                         <RowDefinition Height="auto" />
                         <RowDefinition Height="*" />
                     </Grid.RowDefinitions>
 
+                    <super:NoticeViewer x:Name="noticeViewer" Grid.Row="0" />
+
                     <StackPanel
-                        Grid.RowSpan="2"
+                        Grid.RowSpan="3"
                         HorizontalAlignment="Center"
                         VerticalAlignment="Center"
                         Orientation="Vertical"
@@ -1404,7 +1409,7 @@
 
                     <!--  选项 tabitem 栏  -->
                     <ScrollViewer
-                        Grid.Row="0"
+                        Grid.Row="1"
                         HorizontalScrollBarVisibility="Auto"
                         PreviewMouseWheel="PortTab_PreviewMouseWheel"
                         VerticalScrollBarVisibility="Hidden">
@@ -1576,7 +1581,7 @@
                     </ScrollViewer>
                     <ItemsControl
                         Name="itemsControl"
-                        Grid.Row="1"
+                        Grid.Row="2"
                         Background="Transparent"
                         ItemsSource="{Binding PortTabItems}">
                         <ItemsControl.ItemsPanel>
@@ -2596,6 +2601,7 @@
                                                         VerticalAlignment="Stretch"
                                                         AcceptsReturn="False"
                                                         Background="Transparent"
+                                                        TextWrapping="Wrap"
                                                         BorderThickness="0"
                                                         CaretBrush="{DynamicResource Window.Foreground}"
                                                         ContextMenu="{StaticResource TextBoxContextMenu}"
@@ -2605,14 +2611,15 @@
                                                         Text="{Binding WriteData, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                                                         TextChanged="SendTextBox_TextChanged" />
 
-                                                    <ToggleButton
+                                                    <!--<ToggleButton
                                                         Margin="0"
                                                         Padding="5"
                                                         HorizontalAlignment="Left"
                                                         VerticalAlignment="Bottom"
                                                         Click="ToggleButton_Click"
                                                         Opacity="0.8"
-                                                        Style="{StaticResource FlatToggleButton}">
+                                                        Style="{StaticResource FlatToggleButton}"
+                                                        ToolTip="文本框过长时换行显示">
                                                         <Viewbox
                                                             Width="15"
                                                             Height="auto"
@@ -2624,7 +2631,7 @@
                                                                 <Path Data="M896 160C896 177.664 881.664 192 864 192l-768 0C78.336 192 64 177.664 64 160l0 0C64 142.336 78.336 128 96 128l768 0C881.664 128 896 142.336 896 160L896 160zM896 352C896 334.336 881.664 320 864 320l-768 0C78.336 320 64 334.336 64 352l0 0C64 369.664 78.336 384 96 384l768 0C881.664 384 896 369.664 896 352L896 352zM384 736C384 718.336 369.664 704 352 704l-256 0C78.336 704 64 718.336 64 736l0 0C64 753.664 78.336 768 96 768l256 0C369.664 768 384 753.664 384 736L384 736zM735.168 512 732.8 512 599.232 512 96 512C78.336 512 64 526.336 64 544S78.336 576 96 576l503.232 0 133.568 0 2.368 0c52.928 0 96 43.072 96 96s-43.072 96-96 96L568.96 768l0-2.112L568.576 765.888l64.128-64.128c12.8-12.8 12.8-33.664 0-46.528-12.864-12.864-33.6-12.864-46.528 0l-120.192 120.192c-6.208 6.208-9.6 14.592-9.6 23.296 0 8.704 3.456 17.024 9.6 23.232l120.192 120.128c12.864 12.736 33.6 12.736 46.528 0 12.864-12.864 12.864-33.6 0-46.592L569.024 832l166.208 0c88.256 0 160-71.744 160-160S823.424 512 735.168 512z" Fill="{DynamicResource Window.Foreground}" />
                                                             </Viewbox>
                                                         </Viewbox>
-                                                    </ToggleButton>
+                                                    </ToggleButton>-->
                                                 </Grid>
                                             </Border>
 
@@ -2731,7 +2738,7 @@
                                                     Background="Transparent"
                                                     IsChecked="{Binding AddNewLineWhenWrite, Mode=TwoWay}"
                                                     Style="{StaticResource FlatToggleButton}"
-                                                    ToolTip="加回车换行">
+                                                    ToolTip="发送时加回车换行">
                                                     <Viewbox
                                                         Width="20"
                                                         Height="auto"