From 0fd9a00818e7286e649e260f737ad52c6e29ca6f 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/test.yml | 32 ++++++++++++++++++++++++++++++++ FreeControl/Main.Designer.cs | 1 + FreeControl/Main.cs | 5 ++++- FreeControl/Main.resx | 4 ++-- 4 files changed, 39 insertions(+), 3 deletions(-) create mode 100644 .github/workflows/test.yml diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml new file mode 100644 index 0000000..e202119 --- /dev/null +++ b/.github/workflows/test.yml @@ -0,0 +1,32 @@ +name: Test + +on: + push: + branches: [dev] + pull_request: + branches: [master] + +jobs: + build: + runs-on: windows-latest + env: + PRJ_NAME: FreeControl + + 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" + + - name: Upload artifact + uses: actions/upload-artifact@v2 + with: + name: $PRJ_NAME + path: $PRJ_NAME\output\$PRJ_NAME.exe 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/