Skip to content

Commit 2e45b42

Browse files
pdonepdone
committed
更新至scrcpy2.4
增加退出时锁屏 启用UHID特性优化中文输入体验
1 parent 6ce3688 commit 2e45b42

10 files changed

Lines changed: 51 additions & 24 deletions

File tree

‎FreeControl/FreeControl.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@
283283
</EmbeddedResource>
284284
<EmbeddedResource Include="SetProt.bat" />
285285
<None Include="packages.config" />
286-
<None Include="Resources\scrcpy-win64-v2.3.1.zip" />
286+
<None Include="Resources\scrcpy-win64-v2.4.zip" />
287287
<None Include="Update.en.md" />
288288
<None Include="Update.md" />
289289
</ItemGroup>

‎FreeControl/Main.Designer.cs‎

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎FreeControl/Main.cs‎

Lines changed: 27 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public partial class Main : UIForm
2525
/// <summary>
2626
/// scrcpy版本
2727
/// </summary>
28-
public static readonly string ScrcpyVersion = "scrcpy-win64-v2.3.1";
28+
public static readonly string ScrcpyVersion = "scrcpy-win64-v2.4";
2929
/// <summary>
3030
/// scrcpy路径
3131
/// </summary>
@@ -266,6 +266,10 @@ public void InitPdone()
266266
cbxShowTouches.ValueChanged += CommonCbx_ValueChanged;
267267
cbxReadOnly.ValueChanged += CommonCbx_ValueChanged;
268268
cbxAudioEnabled.ValueChanged += cbxAudioEnabled_ValueChanged;
269+
270+
uiLabel4.DoubleClick += (sender, e) => Process.Start(Logger.path);
271+
uiLabel3.DoubleClick += (sender, e) => Process.Start(UserDataPath);
272+
269273
#endregion
270274

271275
#region 设置标题和图标
@@ -338,7 +342,7 @@ private void ExtractResource(bool reload = false)
338342
if (!Directory.Exists(ScrcpyPath))
339343
{
340344
Directory.CreateDirectory(ScrcpyPath);
341-
File.WriteAllBytes(ScrcpyPath + tempFileName, Properties.Resources.scrcpy_win64_v2_3_1);
345+
File.WriteAllBytes(ScrcpyPath + tempFileName, Properties.Resources.scrcpy_win64_v2_4);
342346
// 解压缩
343347
ZipFile.ExtractToDirectory(ScrcpyPath + tempFileName, UserDataPath);
344348
// 解压完成删除压缩包
@@ -404,10 +408,9 @@ private void StartButtonClick(object sender, EventArgs e)
404408
}
405409
// 设置标题
406410
StartParameters.Add($"--window-title \"{Info.ScrcpyTitle}\"");
407-
// 设置为文本注入
408-
StartParameters.Add($"--prefer-text");
409-
// 设置为按键注入
410-
// StartParameters.Add($"--raw-key-events");
411+
// 设置断开后锁定屏幕
412+
StartParameters.Add("--power-off-on-close");
413+
StartParameters.Add(_Setting.CustomArgs);
411414
if (_Setting.AudioEnabled == false) StartParameters.Add(_Setting.GetDesc("AudioEnabled"));// 不转发音频
412415

413416
// 其他参数
@@ -514,14 +517,8 @@ private void RunScrcpy()
514517
}
515518
}
516519
};
517-
scrcpy.ErrorDataReceived += (ss, ee) =>
518-
{
519-
if (ee.Data.IsNotNull())
520-
{
521-
Logger.Info($"{ee.Data}", "scrcpy");
522-
}
523-
};
524-
scrcpy.Exited += (ss, ee) =>
520+
521+
void exitHandle()
525522
{
526523
SetUserData(_Setting);// 关闭scrcpy后保存一下配置文件
527524
if (_Setting.EnableSwitchIME && _Setting.IME != 0 && _Setting.IMEOrigin.IsNotNull())
@@ -533,7 +530,20 @@ private void RunScrcpy()
533530
ButtonHandle(false);
534531
LoadHistoryIPs(true);
535532
ShowMessage(I18n.msgExit);
533+
}
534+
535+
scrcpy.ErrorDataReceived += (ss, ee) =>
536+
{
537+
if (ee.Data.IsNotNull())
538+
{
539+
Logger.Info($"{ee.Data}", "scrcpy");
540+
if (ee.Data.Contains("ERROR"))
541+
{
542+
exitHandle();
543+
}
544+
}
536545
};
546+
scrcpy.Exited += (ss, ee) => exitHandle();
537547
scrcpy.BeginErrorReadLine();
538548
scrcpy.BeginOutputReadLine();
539549

@@ -767,6 +777,9 @@ private void ComboMbps_SelectedValueChanged(object sender, EventArgs e)
767777
case 5:
768778
_Setting.BitRate = "-b 4M";
769779
break;
780+
case 6:
781+
_Setting.BitRate = "-b 1M";
782+
break;
770783
default:
771784
_Setting.BitRate = "";
772785
break;

‎FreeControl/Main.resx‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@
151151
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
152152
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
153153
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADG
154-
GgAAAk1TRnQBSQFMAgEBBAEAAWgBAwFoAQMBHgEAAR4BAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAF4
154+
GgAAAk1TRnQBSQFMAgEBBAEAAXABAwFwAQMBHgEAAR4BAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAF4
155155
AwABPAMAAQEBAAEgBQABgAFw/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A
156156
/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A
157157
/wD/AP8A/wD/AJ4AAzgBXQMaAf8DGgH/AxoB/wMaAf8DGgH/AxoB/wMaAf8DGgH/AxoB/wMaAf8DGgH/
@@ -232,7 +232,7 @@
232232
AXgDvwH/AzcBWggABAEDAgEDMAAEAQMCAQMIAAMHAQkDXgHtA2oB+QMPARQYAANNAZIDXgH7AxoB/wNE
233233
AXgDAgEDLAADEQEWA14B0gMaAf8DWgHpAyIBMSQAA00BkgNfAfsDvwH/A0QBeAMCAQMsAAMRARYDXgHS
234234
A78B/wNjAekDIgExHAADXQHOAxoB/wMbASYDUQGfAxoB/wMaAf8DWgHHAyUBNiAAAwMBBANJAYcDGgH/
235-
AxoB/wNdAc8DKQE+A1ABnANzAf4DMQFNFAADXwHOA78B/wMbASYDUQGfA78B/wO/Af8DWgHHAyUBNiAA
235+
AxoB/wNdAc8DKQE+A1ABnAN0Af4DMQFNFAADXwHOA78B/wMbASYDUQGfA78B/wO/Af8DWgHHAyUBNiAA
236236
AwMBBANJAYcDvwH/A78B/wNdAc8DKQE+A1EBnAOAAf4DMQFNIAADHgEqA10B3wMaAf8DWwHQAxgBICQA
237237
AzkBXgNJAfYDGgH/A1UBrzAAAx4BKgNdAd8DvwH/A18B0AMYASAkAAM5AV4DYgH2A78B/wNVAa8kAAMc
238238
AScDSQH2AxoB/wMaAf8DXwHaA10ByQNgAfMDGgH/AxwBJxwAA10B3AMaAf8DYQHrA1sBzQNeAfsDGgH/
@@ -827,6 +827,9 @@
827827
<data name="comboMbps.Items5" xml:space="preserve">
828828
<value>4Mbps</value>
829829
</data>
830+
<data name="comboMbps.Items6" xml:space="preserve">
831+
<value>1Mbps</value>
832+
</data>
830833
<data name="comboMbps.Location" type="System.Drawing.Point, System.Drawing">
831834
<value>496, 50</value>
832835
</data>

‎FreeControl/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,5 +33,5 @@
3333
//通过使用 "*"，如下所示:
3434
// [assembly: AssemblyVersion("1.0.*")]
3535
//[assembly: AssemblyVersion("1.0.0")]
36-
[assembly: AssemblyFileVersion("1.6.9")]
37-
[assembly: AssemblyVersion("1.6.9")]
36+
[assembly: AssemblyFileVersion("1.7.0")]
37+
[assembly: AssemblyVersion("1.7.0")]

‎FreeControl/Properties/Resources.Designer.cs‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎FreeControl/Properties/Resources.resx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,8 +124,8 @@
124124
<data name="pcm" type="System.Resources.ResXFileRef, System.Windows.Forms">
125125
<value>..\Resources\pcm.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
126126
</data>
127-
<data name="scrcpy_win64_v2_3_1" type="System.Resources.ResXFileRef, System.Windows.Forms">
128-
<value>..\Resources\scrcpy-win64-v2.3.1.zip;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
127+
<data name="scrcpy_win64_v2_4" type="System.Resources.ResXFileRef, System.Windows.Forms">
128+
<value>..\Resources\scrcpy-win64-v2.4.zip;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
129129
</data>
130130
<data name="shortcut_en" type="System.Resources.ResXFileRef, System.Windows.Forms">
131131
<value>..\Resources\shortcut_en.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>

‎FreeControl/Resources/en.FreeControl.resources.dll‎

0 Bytes
Binary file not shown.

FreeControl/Resources/scrcpy-win64-v2.3.1.zip renamed to FreeControl/Resources/scrcpy-win64-v2.4.zip

5.77 MB
Binary file not shown.

‎FreeControl/Setting.cs‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -206,5 +206,15 @@ public List<string> ControllerButton
206206
/// 心跳间隔 单位：毫秒
207207
/// </summary>
208208
public int Heartbeat { get; set; } = 60000;
209+
210+
/// <summary>
211+
/// 退出时锁屏
212+
/// </summary>
213+
public bool PowerOffOnClose { get; set; } = true;
214+
215+
/// <summary>
216+
/// 自定义参数
217+
/// </summary>
218+
public string CustomArgs { get; set; } = "--keyboard=uhid";
209219
}
210220
}

0 commit comments

Comments
 (0)