Browse Source

fix: update Bluetooth connection status feedback and improve method documentation

liuyuqi-dellpc 2 months ago
parent
commit
76b1dcf802
3 changed files with 46 additions and 45 deletions
  1. 1 2
      BLETool/BLEInfo.cs
  2. 4 2
      BLETool/MainForm.cs
  3. 41 41
      BLETool/Program.cs

+ 1 - 2
BLETool/BLEInfo.cs

@@ -12,6 +12,7 @@ namespace BLEComm
         /// <summary>
         /// <summary>
         ///     This enum assists in finding a string representation of a BT SIG assigned value for Service UUIDS
         ///     This enum assists in finding a string representation of a BT SIG assigned value for Service UUIDS
         ///     Reference: https://developer.bluetooth.org/gatt/services/Pages/ServicesHome.aspx
         ///     Reference: https://developer.bluetooth.org/gatt/services/Pages/ServicesHome.aspx
+        ///     枚举分别列出了蓝牙服务、特征和描述符的 UUID 值
         /// </summary>
         /// </summary>
         public enum GattNativeServiceUuid : ushort
         public enum GattNativeServiceUuid : ushort
         {
         {
@@ -250,7 +251,5 @@ namespace BLEComm
                 return "Empty data received";
                 return "Empty data received";
             }
             }
         }
         }
-
-
     }
     }
 }
 }

+ 4 - 2
BLETool/MainForm.cs

@@ -908,7 +908,8 @@ namespace BLETool
             if (sender.ConnectionStatus == BluetoothConnectionStatus.Disconnected && ble_Device.DeviceId != null)
             if (sender.ConnectionStatus == BluetoothConnectionStatus.Disconnected && ble_Device.DeviceId != null)
             {
             {
                 //log("Device disconnected");
                 //log("Device disconnected");
-                this.Invoke(new Action(() => {
+                this.Invoke(new Action(() =>
+                {
                     lab_connection.BackColor = Color.Red;
                     lab_connection.BackColor = Color.Red;
                     lab_connection.ForeColor = Color.White;
                     lab_connection.ForeColor = Color.White;
                     lab_connection.Text = "Disconnected...";
                     lab_connection.Text = "Disconnected...";
@@ -918,7 +919,8 @@ namespace BLETool
             else
             else
             {
             {
                 //log("Device connected");
                 //log("Device connected");
-                this.Invoke(new Action(() => {
+                this.Invoke(new Action(() =>
+                {
                     lab_connection.BackColor = Color.Green;
                     lab_connection.BackColor = Color.Green;
                     lab_connection.ForeColor = Color.White;
                     lab_connection.ForeColor = Color.White;
                     lab_connection.Text = "Connected";
                     lab_connection.Text = "Connected";

+ 41 - 41
BLETool/Program.cs

@@ -33,54 +33,54 @@ namespace BLETool
             }
             }
         }
         }
 
 
-    /// <summary>
-    /// 检测是否已经启动了一个Application实例
-    /// </summary>
-    /// <returns>返回进程id,没有启动返回null</returns>
-    private static Process RunningInstance()
-    {
-        Process current = Process.GetCurrentProcess();
-        // 获取当前本地计算机上指定的进程名称的所有进程
-        Process[] processes = Process.GetProcessesByName(current.ProcessName);
-        foreach (Process process in processes)
+        /// <summary>
+        /// 检测是否已经启动了一个Application实例
+        /// </summary>
+        /// <returns>返回进程id,没有启动返回null</returns>
+        private static Process RunningInstance()
         {
         {
-            // 忽略当前进程
-            if (process.Id != current.Id)
+            Process current = Process.GetCurrentProcess();
+            // 获取当前本地计算机上指定的进程名称的所有进程
+            Process[] processes = Process.GetProcessesByName(current.ProcessName);
+            foreach (Process process in processes)
             {
             {
-                if (Assembly.GetExecutingAssembly().Location.Replace("/", "\\") == current.MainModule.FileName)
+                // 忽略当前进程
+                if (process.Id != current.Id)
                 {
                 {
-                    return process;
+                    if (Assembly.GetExecutingAssembly().Location.Replace("/", "\\") == current.MainModule.FileName)
+                    {
+                        return process;
+                    }
                 }
                 }
             }
             }
+            // 如果没有其他同名进程存在,则返回 null
+            return null;
+        }
+        /// <summary>
+        /// 显示已运行的程序。
+        /// </summary>
+        public static void HandleRunningInstance(Process instance)
+        {
+            ShowWindowAsync(instance.MainWindowHandle, WS_SHOWNORMAL); //显示,可以注释掉
+            SetForegroundWindow(instance.MainWindowHandle);            //放到前端
         }
         }
-        // 如果没有其他同名进程存在,则返回 null
-        return null;
-    }
-    /// <summary>
-    /// 显示已运行的程序。
-    /// </summary>
-    public static void HandleRunningInstance(Process instance)
-    {
-        ShowWindowAsync(instance.MainWindowHandle, WS_SHOWNORMAL); //显示,可以注释掉
-        SetForegroundWindow(instance.MainWindowHandle);            //放到前端
-    }
 
 
-    /// <summary>
-    /// 该函数设置由不同线程产生的窗口的显示状态。
-    /// </summary>
-    /// <param name="hWnd">窗口句柄</param>
-    /// <param name="cmdShow">指定窗口如何显示。查看允许值列表,请查阅ShowWlndow函数的说明部分。</param>
-    /// <returns>如果函数原来可见,返回值为非零;如果函数原来被隐藏,返回值为零。</returns>
-    [DllImport("User32.dll")]
-    private static extern bool ShowWindowAsync(IntPtr hWnd, int cmdShow);
-    /// <summary>
-    /// 该函数将创建指定窗口的线程设置到前台,并且激活该窗口。键盘输入转向该窗口,并为用户改各种可视的记号。系统给创建前台窗口的线程分配的权限稍高于其他线程。
-    /// </summary>
-    /// <param name="hWnd">将被激活并被调入前台的窗口句柄。</param>
-    /// <returns>如果窗口设入了前台,返回值为非零;如果窗口未被设入前台,返回值为零。</returns>
-    [DllImport("User32.dll")]
-    private static extern bool SetForegroundWindow(IntPtr hWnd);
-    private const int WS_SHOWNORMAL = 1;
+        /// <summary>
+        /// 该函数设置由不同线程产生的窗口的显示状态。
+        /// </summary>
+        /// <param name="hWnd">窗口句柄</param>
+        /// <param name="cmdShow">指定窗口如何显示。查看允许值列表,请查阅ShowWlndow函数的说明部分。</param>
+        /// <returns>如果函数原来可见,返回值为非零;如果函数原来被隐藏,返回值为零。</returns>
+        [DllImport("User32.dll")]
+        private static extern bool ShowWindowAsync(IntPtr hWnd, int cmdShow);
+        /// <summary>
+        /// 该函数将创建指定窗口的线程设置到前台,并且激活该窗口。键盘输入转向该窗口,并为用户改各种可视的记号。系统给创建前台窗口的线程分配的权限稍高于其他线程。
+        /// </summary>
+        /// <param name="hWnd">将被激活并被调入前台的窗口句柄。</param>
+        /// <returns>如果窗口设入了前台,返回值为非零;如果窗口未被设入前台,返回值为零。</returns>
+        [DllImport("User32.dll")]
+        private static extern bool SetForegroundWindow(IntPtr hWnd);
+        private const int WS_SHOWNORMAL = 1;
 
 
     }
     }
 }
 }