Update to scrcpy 2.1.1(x64)

Author: pdone

FreeControl/DLL/ICSharpCode.SharpZipLib.dll

@@ -66,6 +66,9 @@
   <PropertyGroup>
     <ManifestCertificateThumbprint>6D93BF546206628F86A07C83939C359B342D910D</ManifestCertificateThumbprint>
   </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationManifest>app.manifest</ApplicationManifest>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="SunnyUI, Version=2.2.6.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -143,6 +146,7 @@
       <SubType>Designer</SubType>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
+    <None Include="app.manifest" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
@@ -155,7 +159,7 @@
     <EmbeddedResource Include="SetProt.bat" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="Resources\scrcpy-win64-v1.25.zip" />
+    <None Include="Resources\scrcpy-win64-v2.1.1.zip" />
     <None Include="Resources\Setting.png" />
   </ItemGroup>
   <ItemGroup>
@@ -165,15 +169,12 @@
     <None Include="Resources\pcm.ico" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="DLL\ICSharpCode.SharpZipLib.dll" />
-    <Content Include="DLL\Newtonsoft.Json.dll" />
     <Content Include="Resources\Home_Dark.png" />
     <None Include="Resources\SunnyUI.Common.dll" />
     <None Include="Resources\SunnyUI.dll" />
     <Content Include="Resources\Setting_Dark.png" />
     <None Include="Resources\shortcut_zh.jpg" />
     <None Include="Resources\shortcut_en.jpg" />
-    <None Include="DLL\SunnyUI.dll" />
   </ItemGroup>
   <ItemGroup>
     <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">

FreeControl/DLL/Newtonsoft.Json.dll

@@ -13,6 +13,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using System.Windows.Forms;
+using System.Windows.Forms.Design;
 
 namespace FreeControl
 {
@@ -26,7 +27,7 @@ public partial class Main : UIForm
         /// <summary>
         /// scrcpy版本
         /// </summary>
-        public static readonly string ScrcpyVersion = "scrcpy-win64-v1.25";
+        public static readonly string ScrcpyVersion = "scrcpy-win64-v2.1.1";
         /// <summary>
         /// scrcpy路径
         /// </summary>
@@ -72,7 +73,7 @@ public static string UserDataPath
         {
             get
             {
-                return Path.Combine(System.Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "Free Control");
+                return Path.Combine(System.Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "FreeControl");
             }
         }
         /// <summary>
@@ -126,14 +127,24 @@ public static void SetUserData(Setting userData)
         /// </summary>
         public void InitPdone()
         {
+            //获取程序集信息
+            Assembly asm = Assembly.GetExecutingAssembly();
+            FileVersionInfo fvi = FileVersionInfo.GetVersionInfo(asm.Location);
             //获取用户配置数据
             _Setting = GetUserData();
             //adb路径
             ADB.ADBPath = $@"{ScrcpyPath}";
             //增加adb执行文件系统变量
             ADB.AddEnvironmentPath(ScrcpyPath);
+            //是否重新加载资源包
+            bool reload = false;
+            if (_Setting.Version != fvi.ProductVersion)
+            {
+                reload = true;
+                _Setting.Version = fvi.ProductVersion;
+            }
             //提取资源
-            ExtractResource();
+            ExtractResource(reload);
 
             #region 事件绑定
             //退出时保存用户配置数据
@@ -181,8 +192,6 @@ public void InitPdone()
             #endregion
 
             #region 设置标题和图标
-            Assembly asm = Assembly.GetExecutingAssembly();
-            FileVersionInfo fvi = FileVersionInfo.GetVersionInfo(asm.Location);
             Text = $"Free Control v{fvi.ProductVersion}";
             lbTitle.Visible = false;
             lbTitle.Text = Text;
@@ -234,18 +243,21 @@ public void InitPdone()
         /// <summary>
         /// 提取内置资源
         /// </summary>
-        private void ExtractResource()
+        private void ExtractResource(bool reload = false)
         {
             string tempFileName = "temp.zip";
+            if (reload)
+            {
+                Directory.Delete(ScrcpyPath, true);
+            }
             if (!Directory.Exists(ScrcpyPath))
             {
                 Directory.CreateDirectory(ScrcpyPath);
-                File.WriteAllBytes(ScrcpyPath + tempFileName, Properties.Resources.scrcpy_win64_v1_25);
+                File.WriteAllBytes(ScrcpyPath + tempFileName, Properties.Resources.scrcpy_win64_v2_1_1);
                 //解压缩
                 ZipFile.ExtractToDirectory(ScrcpyPath + tempFileName, UserDataPath);
                 //解压完成删除压缩包
                 File.Delete(ScrcpyPath + tempFileName);
-
             }
         }
 

FreeControl/DLL/SunnyUI.dll

@@ -10,7 +10,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Pdone Technology Ltd.")]
 [assembly: AssemblyProduct("Free Control")]
-[assembly: AssemblyCopyright("Copyright © 2023 pdoner.cn")]
+[assembly: AssemblyCopyright("Copyright © 2023 awaw.cc")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -33,5 +33,5 @@
 //通过使用 "*"，如下所示:
 // [assembly: AssemblyVersion("1.0.*")]
 //[assembly: AssemblyVersion("1.0.0")]
-[assembly: AssemblyFileVersion("1.5.1")]
-[assembly: AssemblyVersion("1.5.1")]
+[assembly: AssemblyFileVersion("1.6.0")]
+[assembly: AssemblyVersion("1.6.0")]

FreeControl/FreeControl.csproj

@@ -121,8 +121,8 @@
   <data name="pcm" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\pcm.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="scrcpy_win64_v1_25" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\scrcpy-win64-v1.25.zip;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  <data name="scrcpy_win64_v2_1_1" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\scrcpy-win64-v2.1.1.zip;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="shortcut_en" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\shortcut_en.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>