Merge pull request #74 from THU-ASTA/develop

Develop

Author: futrime

CHANGELOG.md

@@ -8,6 +8,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased]
 
 
+## [24.1.0-beta.7]
+## Fixed
+- Progress bar not being reset to zero when resetting the game
+- Failing to handle packages with packet ID 0x00
+
+## Changed
+- Update titles of error messages
+
+
 ## [24.1.0-beta.6]
 ## Added
 - Frame rate displaying by @Futrime

Source/MainWindow.cs

@@ -225,8 +225,8 @@ public MainWindow()
         if (!this._camera.IsOpened())
         {
             MessageBox.Show(
-                "No camera found!",
-                "Error",
+                "No camera is found!",
+                "Nahida said:",
                 MessageBoxButtons.OK,
                 MessageBoxIcon.Error
             );
@@ -711,7 +711,7 @@ private void Draw(ref Mat image)
             org: new Point2i(5, 30),
             fontFace: HersheyFonts.HersheySimplex,
             fontScale: 1,
-            color: new Scalar(102, 8, 116),
+            color: new Scalar(255, 0, 255),
             thickness: 2,
             bottomLeftOrigin: false,
             lineType: LineTypes.AntiAlias
@@ -772,6 +772,7 @@ private void RefreshMonitor(Image img)
         if (pictureBoxMonitor.Image != null)
         {
             pictureBoxMonitor.Image.Dispose();
+            pictureBoxMonitor.Image = null;
         }
 
         pictureBoxMonitor.Image = img;
@@ -916,6 +917,7 @@ private void buttonReset_Click(object sender, EventArgs e)
         this.labelScoreVehicleB.Text = "N/A";
         this.labelGameTime.Text = "N/A";
         this.labelGameHalf.Text = "Pre-match";
+        this.progressBarRemainingPowerRatio.Value = 0;
     }
 
     private void buttonFoul_Click(object sender, EventArgs e)

Source/PacketGetGameInformationHost.cs

@@ -111,15 +111,15 @@ public override byte[] GetBytes()
 
 
         // Gamestage 
-        BitConverter.GetBytes((byte)this._gameStage).CopyTo(data, currentIndex);
+        data[currentIndex] = ((byte)this._gameStage);
         currentIndex += 1;
 
         // Barrier
         if (this._barrierList.Count > 0xff)
         {
             throw new ArgumentException("Barrier length is larger than 0xff");
         }
-        BitConverter.GetBytes((byte)this._barrierList.Count).CopyTo(data, currentIndex);
+        data[currentIndex] = ((byte)this._barrierList.Count);
         currentIndex += 1;
 
         for (int i = 0; i < this._barrierList.Count; i++)
@@ -141,7 +141,7 @@ public override byte[] GetBytes()
         {
             throw new ArgumentException("Length of own charging piles is larger than 0xff");
         }
-        BitConverter.GetBytes((byte)this._ownChargingPiles.Count).CopyTo(data, currentIndex);
+        data[currentIndex] = ((byte)this._ownChargingPiles.Count);
         currentIndex += 1;
 
         for (int i = 0; i < this._ownChargingPiles.Count; i++)
@@ -158,8 +158,9 @@ public override byte[] GetBytes()
         {
             throw new ArgumentException("Length of opponent charging piles is larger than 0xff");
         }
-        BitConverter.GetBytes(this._opponentChargingPiles.Count).CopyTo(data, currentIndex);
-        currentIndex += 4;
+
+        data[currentIndex] = ((byte)this._opponentChargingPiles.Count);
+        currentIndex += 1; // ZYR FIXED BUG in 2022-11-9
 
         for (int i = 0; i < this._opponentChargingPiles.Count; i++)
         {

Source/PacketGetStatusHost.cs

@@ -38,7 +38,7 @@ public PacketGetStatusHost(
         Order latestPendingOrder
     )
     {
-        
+
 
         this._gameStatus = gameStatus;
         this._gameTime = gameTime;
@@ -146,11 +146,11 @@ public override byte[] GetBytes()
             case GameStatusType.Unstarted:
             case GameStatusType.Paused:
             case GameStatusType.Ended:
-                BitConverter.GetBytes((byte)0).CopyTo(data, index);
+                data[index] = ((byte)0);
                 break;
 
             case GameStatusType.Running:
-                BitConverter.GetBytes((byte)1).CopyTo(data, index);
+                data[index] = ((byte)1);
                 break;
 
             default:
@@ -185,7 +185,7 @@ public override byte[] GetBytes()
         {
             throw new ArgumentException("Length of orderInDeliveryList is larger than 0xff");
         }
-        BitConverter.GetBytes((byte)this._orderInDeliveryList.Count).CopyTo(data, index);
+        data[index] = ((byte)this._orderInDeliveryList.Count);
         index += 1;
         foreach (var order in this._orderInDeliveryList)
         {

Source/Program.cs

@@ -22,7 +22,7 @@ static void Main()
         {
             MessageBox.Show(
                 $"The file {e.FileName} is missing. Please check if you have extracted all files to the folder wherein the program locate.",
-                "Error",
+                "Nahida said:",
                 MessageBoxButtons.OK,
                 MessageBoxIcon.Error
             );
@@ -39,7 +39,7 @@ static void HandleUnhandledException(object sender, UnhandledExceptionEventArgs
         MessageBox.Show(
             "An unhandled exception occurred!\nPlease take a screenshot of this message and report to EDC Commitee!\n\n" +
             e.ExceptionObject.ToString(),
-            "Unexpected Exception",
+            "Nahida choked and said:",
             MessageBoxButtons.OK,
             MessageBoxIcon.Error
         );

Source/SettingsWindow.cs

@@ -127,7 +127,7 @@ private void ApplyConfig()
                 {
                     MessageBox.Show(
                         $"Cannot open the serial port: {vehicleConfig.SerialPort}",
-                        "Error",
+                        "Nahida said:",
                         MessageBoxButtons.OK,
                         MessageBoxIcon.Error
                     );
@@ -172,7 +172,7 @@ private void LoadConfig()
         {
             MessageBox.Show(
                 text: "No configuration file is found!",
-                caption: "Error",
+                caption: "Nahida said:",
                 MessageBoxButtons.OK,
                 MessageBoxIcon.Error
             );
@@ -254,7 +254,7 @@ private void SyncFormToConfig()
         {
             MessageBox.Show(
                 "Some parameters are invalid.",
-                "Error",
+                "Nahida said:",
                 MessageBoxButtons.OK,
                 MessageBoxIcon.Error
             );