From 0b9a13e25c4c3f9001e0e8cb86d709506bfa908e Mon Sep 17 00:00:00 2001
From: pdone <617941447@qq.com>
Date: Tue, 18 Jun 2024 09:23:18 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0workflows=E3=80=81=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/build-and-release.yml       |  34 ++++++++++++++++++
 .github/workflows/test.yml                    |  24 +++++++++++++
 FreeControl/Main.Designer.cs                  |   1 +
 FreeControl/Main.cs                           |   5 ++-
 FreeControl/Main.resx                         |   4 +--
 .../Resources/en.FreeControl.resources.dll    | Bin 40960 -> 40960 bytes
 6 files changed, 65 insertions(+), 3 deletions(-)
 create mode 100644 .github/workflows/build-and-release.yml
 create mode 100644 .github/workflows/test.yml

diff --git a/.github/workflows/build-and-release.yml b/.github/workflows/build-and-release.yml
new file mode 100644
index 0000000..8a18eff
--- /dev/null
+++ b/.github/workflows/build-and-release.yml
@@ -0,0 +1,34 @@
+name: Build and Release
+
+on:
+  push:
+    tags: [ "v*.*.*" ]
+
+jobs:
+  build-and-release:
+    runs-on: windows-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Setup MSBuild
+        uses: microsoft/setup-msbuild@v2
+
+      - name: Restore NuGet Packages
+        run: nuget restore FreeControl.sln
+
+      - name: Build
+        run: |
+          msbuild FreeControl.sln /p:Configuration=Release /p:Platform="Any CPU" /p:OutputPath="../output"
+          $filePath = "./output/Freecontrol.exe"
+          $sha256Hash = (Get-FileHash -Algorithm SHA256 -Path $filePath).Hash
+          $sha256Hash > "./output/SHA256 $sha256Hash"
+
+      - uses: softprops/action-gh-release@v2
+        with:
+          files: |
+            ./output/FreeControl.exe
+            ./output/SHA256*
+          name: ${{ github.ref_name }}
+          draft: true
\ No newline at end of file
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
new file mode 100644
index 0000000..6c3f681
--- /dev/null
+++ b/.github/workflows/test.yml
@@ -0,0 +1,24 @@
+name: Test
+
+on:
+  push:
+    branches: [dev]
+  pull_request:
+    branches: [master]
+
+jobs:
+  test-build:
+    runs-on: windows-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Setup MSBuild
+        uses: microsoft/setup-msbuild@v2
+
+      - name: Restore NuGet Packages
+        run: nuget restore FreeControl.sln
+
+      - name: Build
+        run: msbuild FreeControl.sln /p:Configuration=Release /p:Platform="Any CPU" /p:OutputPath="output"
diff --git a/FreeControl/Main.Designer.cs b/FreeControl/Main.Designer.cs
index 1423696..7339870 100644
--- a/FreeControl/Main.Designer.cs
+++ b/FreeControl/Main.Designer.cs
@@ -569,6 +569,7 @@ private void InitializeComponent()
             // 
             // Main
             // 
+            this.AcceptButton = this.btnStart;
             this.AllowShowTitle = false;
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
             this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(140)))), ((int)(((byte)(140)))), ((int)(((byte)(140)))));
diff --git a/FreeControl/Main.cs b/FreeControl/Main.cs
index afa9342..fb0c016 100644
--- a/FreeControl/Main.cs
+++ b/FreeControl/Main.cs
@@ -409,7 +409,10 @@ private void StartButtonClick(object sender, EventArgs e)
                 // 设置标题
                 StartParameters.Add($"--window-title \"{Info.ScrcpyTitle}\"");
                 // 设置断开后锁定屏幕
-                StartParameters.Add("--power-off-on-close");
+                if (_Setting.PowerOffOnClose)
+                {
+                    StartParameters.Add("--power-off-on-close");
+                }
                 StartParameters.Add(_Setting.CustomArgs);
                 if (_Setting.AudioEnabled == false) StartParameters.Add(_Setting.GetDesc("AudioEnabled"));// 不转发音频
 
diff --git a/FreeControl/Main.resx b/FreeControl/Main.resx
index 516b892..ea051bd 100644
--- a/FreeControl/Main.resx
+++ b/FreeControl/Main.resx
@@ -151,7 +151,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADG
-        GgAAAk1TRnQBSQFMAgEBBAEAAXABAwFwAQMBHgEAAR4BAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAF4
+        GgAAAk1TRnQBSQFMAgEBBAEAAXgBAwF4AQMBHgEAAR4BAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAF4
         AwABPAMAAQEBAAEgBQABgAFw/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A
         /wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A
         /wD/AP8A/wD/AJ4AAzgBXQMaAf8DGgH/AxoB/wMaAf8DGgH/AxoB/wMaAf8DGgH/AxoB/wMaAf8DGgH/
@@ -232,7 +232,7 @@
         AXgDvwH/AzcBWggABAEDAgEDMAAEAQMCAQMIAAMHAQkDXgHtA2oB+QMPARQYAANNAZIDXgH7AxoB/wNE
         AXgDAgEDLAADEQEWA14B0gMaAf8DWgHpAyIBMSQAA00BkgNfAfsDvwH/A0QBeAMCAQMsAAMRARYDXgHS
         A78B/wNjAekDIgExHAADXQHOAxoB/wMbASYDUQGfAxoB/wMaAf8DWgHHAyUBNiAAAwMBBANJAYcDGgH/
-        AxoB/wNdAc8DKQE+A1ABnAN0Af4DMQFNFAADXwHOA78B/wMbASYDUQGfA78B/wO/Af8DWgHHAyUBNiAA
+        AxoB/wNdAc8DKQE+A1ABnAN1Af4DMQFNFAADXwHOA78B/wMbASYDUQGfA78B/wO/Af8DWgHHAyUBNiAA
         AwMBBANJAYcDvwH/A78B/wNdAc8DKQE+A1EBnAOAAf4DMQFNIAADHgEqA10B3wMaAf8DWwHQAxgBICQA
         AzkBXgNJAfYDGgH/A1UBrzAAAx4BKgNdAd8DvwH/A18B0AMYASAkAAM5AV4DYgH2A78B/wNVAa8kAAMc
         AScDSQH2AxoB/wMaAf8DXwHaA10ByQNgAfMDGgH/AxwBJxwAA10B3AMaAf8DYQHrA1sBzQNeAfsDGgH/
diff --git a/FreeControl/Resources/en.FreeControl.resources.dll b/FreeControl/Resources/en.FreeControl.resources.dll
index 7b04f032a8ba9065fe8fbd05a8c0035cc00ef0b2..9dab7f899d20aa07f7a14a38961c58c40b2c41e6 100644
GIT binary patch
delta 70
zcmV-M0J;Bwzyg540+5IVaqw_vv5fqeFLRC7zOad)MV{9K1C2L%od5{8dR$f+G~kI8
ci~l4#enpvt)(y)eJkhAU0@DCqv$vQ@2b4%4A^-pY

delta 70
zcmV-M0J;Bwzyg540+5IV+P3;-v5fqeFVbjg_eT3$NS$q_R(;r)qyPxFdR$f+G~kI8
cJ*m(|Qa4ylcv+1}XtH}{IzDM)v$vQ@2h+qLxBvhE