Update

Author: pdone

FreeControl/FreeControl.csproj

@@ -151,7 +151,7 @@
     <EmbeddedResource Include="SetProt.bat" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="Resources\scrcpy-win32-v1.17.zip" />
+    <None Include="Resources\scrcpy-win32-v1.18.zip" />
     <None Include="Resources\Setting.png" />
   </ItemGroup>
   <ItemGroup>
@@ -163,6 +163,8 @@
   <ItemGroup>
     <Content Include="DLL\ICSharpCode.SharpZipLib.dll" />
     <Content Include="Resources\Home_Dark.png" />
+    <None Include="Resources\SunnyUI.Common.dll" />
+    <None Include="Resources\SunnyUI.dll" />
     <None Include="DLL\Newtonsoft.Json.dll" />
     <Content Include="Resources\Setting_Dark.png" />
     <None Include="Resources\shortcut_zh.jpg" />

FreeControl/Main.Designer.cs

@@ -75,7 +75,7 @@ public void SetUserData(Setting userData)
         /// <summary>
         /// scrcpy版本
         /// </summary>
-        public static string scrcpyVersion = "scrcpy_win32_v1_17";
+        public static string scrcpyVersion = "scrcpy_win32_v1_18";
 
         /// <summary>
         /// scrcpy路径
@@ -86,6 +86,7 @@ public void InitPdone()
         {
 
             setting = GetUserData();
+            Size = new Size(658, 340);
 
             Application.ApplicationExit += (sender, e) =>
             {
@@ -106,6 +107,9 @@ public void InitPdone()
             #region 设置标题
             Assembly asm = Assembly.GetExecutingAssembly();
             FileVersionInfo fvi = FileVersionInfo.GetVersionInfo(asm.Location);
+            //Text = $"Free Control v{fvi.ProductVersion}";
+            //ledTitle.Enabled = false;
+            //ledTitle.Visible = false;
             ledTitle.Text = $"Free Control v{fvi.ProductVersion}";
             ledTitle.CharCount = 19;
             ledTitle.MouseDown += (sender, e) => DragWindow();
@@ -122,14 +126,15 @@ public void InitPdone()
             tabHome.ImageIndex = 0;
             tabSetting.ImageIndex = 2;
             #endregion
-
             #region 设置深色模式
             switchDarkMode.ValueChanged += (object sender, bool value) =>
             {
                 var tabBackColor = Color.Transparent;
+                var foreColor = Color.Transparent;
                 if (value)
                 {
                     tabBackColor = Color.FromArgb(24, 24, 24);
+                    foreColor = Color.FromArgb(192, 192, 192);
                     UIStyles.SetStyle(UIStyle.Black);
                     tabHome.BackColor = tabBackColor;
                     tabSetting.BackColor = tabBackColor;
@@ -143,6 +148,7 @@ public void InitPdone()
                 else
                 {
                     tabBackColor = Color.FromArgb(242, 242, 244);
+                    foreColor = Color.FromArgb(48, 48, 48);
                     UIStyles.SetStyle(UIStyle.Gray);
                     tabHome.BackColor = tabBackColor;
                     tabSetting.BackColor = tabBackColor;
@@ -153,17 +159,40 @@ public void InitPdone()
                     tabHome.ImageIndex = 0;
                     tabSetting.ImageIndex = 2;
 
+                    navTab.TabSelectedColor = tabBackColor;
                     navTab.TabSelectedForeColor = Color.FromArgb(140, 140, 140);
                     navTab.TabSelectedHighColor = Color.FromArgb(140, 140, 140);
+                    navTab.TabBackColor = Color.FromArgb(222, 222, 222);
+
                 }
+
+                tbxAddress.FillDisableColor = tabBackColor;
+                tbxPort.FillDisableColor = tabBackColor;
+                tbxAddress.ForeDisableColor = foreColor;
+                tbxPort.ForeDisableColor = foreColor;
+
+                tbxAddress.FillColor = tabBackColor;
+                tbxPort.FillColor = tabBackColor;
+                tbxAddress.ForeColor = foreColor;
+                tbxPort.ForeColor = foreColor;
+
             };
             #endregion
 
             #region 切换tab事件
             navTab.SelectedIndexChanged += (object sender, EventArgs e) =>
             {
-
-
+                switch (navTab.SelectedIndex)
+                {
+                    case 0:
+                        Size = new Size(658, 340);
+                        break;
+                    case 1:
+                        Size = new Size(658, 470);
+                        break;
+                    default:
+                        break;
+                }
             };
             navTab.SelectTab(0);
             #endregion
@@ -172,11 +201,14 @@ public void InitPdone()
             rbtnPx.SelectedIndex = setting.PXIndex;
             rbtnMbps.SelectedIndex = setting.BitRateIndex;
             rbtnMaxFPS.SelectedIndex = setting.MaxFPSIndex;
+            rbtnShortcuts.SelectedIndex = setting.ShortcutsIndex;
             switchDarkMode.Active = setting.DarkMode;
             tbxAddress.Text = setting.IPAddress;
             tbxPort.Text = setting.Port;
-            tbxAddress.Enabled = !setting.UseWireless;
-            tbxPort.Enabled = !setting.UseWireless;
+            //tbxAddress.Enabled = !setting.UseWireless;
+            //tbxPort.Enabled = !setting.UseWireless;
+            updownHeight.Value = setting.WindowHeight;
+            updownWidth.Value = setting.WindowWidth;
 
             #region 复选框默认值   
             cbxUseWireless.Checked = setting.UseWireless;
@@ -190,12 +222,15 @@ public void InitPdone()
             cbxHideBorder.Checked = setting.HideBorder;
             cbxFullScreen.Checked = setting.FullScreen;
             cbxTopMost.Checked = setting.TopMost;
+            cbxShowTouches.Checked = setting.ShowTouches;
+            cbxReadOnly.Checked = setting.ReadOnly;
             #endregion
 
             #region 参数设置事件
             rbtnPx.ValueChanged += RbtnPx_ValueChanged;
             rbtnMbps.ValueChanged += RbtnMbps_ValueChanged;
             rbtnMaxFPS.ValueChanged += RbtnMaxFPS_ValueChanged;
+            rbtnShortcuts.ValueChanged += RbtnShortcuts_ValueChanged;
 
             cbxUseWireless.ValueChanged += CbxUseWireless_ValueChanged;
             cbxUseLog.ValueChanged += CbxUseLog_ValueChanged; ;
@@ -213,6 +248,17 @@ public void InitPdone()
             cbxHideBorder.ValueChanged += CommonCbx_ValueChanged;
             cbxFullScreen.ValueChanged += CommonCbx_ValueChanged;
             cbxTopMost.ValueChanged += CommonCbx_ValueChanged;
+            cbxShowTouches.ValueChanged += CommonCbx_ValueChanged;
+            cbxReadOnly.ValueChanged += CommonCbx_ValueChanged;
+
+            updownHeight.ValueChanged += (sender, e) =>
+            {
+                setting.WindowHeight = updownHeight.Value;
+            };
+            updownWidth.ValueChanged += (sender, e) =>
+            {
+                setting.WindowWidth = updownWidth.Value;
+            };
             #endregion
 
             #endregion
@@ -222,7 +268,7 @@ public void InitPdone()
             if (!Directory.Exists(scrcpyPath))
             {
                 Directory.CreateDirectory(scrcpyPath);
-                File.WriteAllBytes(scrcpyPath + tempFileName, Properties.Resources.scrcpy_win32_v1_17);
+                File.WriteAllBytes(scrcpyPath + tempFileName, Properties.Resources.scrcpy_win32_v1_18);
                 if (SharpZip.UnpackFiles(scrcpyPath + tempFileName, scrcpyPath))
                 {
                     File.Delete(scrcpyPath + tempFileName);
@@ -236,19 +282,25 @@ public void InitPdone()
             #region 启动按钮
             btnStart.Click += (sender, e) =>
             {
-  
+
                 if (setting.UseWireless &&
                 (string.IsNullOrWhiteSpace(setting.IPAddress) || string.IsNullOrWhiteSpace(setting.Port)))
                 {
                     UIMessageTip.ShowWarning(sender as Control, "IP地址或者端口号没有填写，无法启动 -.-!", 1500);
                     return;
                 }
                 LogHelper.Info("starting...");
-                var paramlist = $" {setting.BitRate} {setting.PX} {setting.MaxFPS} {setting.OtherParam} ";
+                var paramlist = $" {setting.BitRate} {setting.PX} {setting.MaxFPS} {setting.Shortcuts} {setting.OtherParam} ";
                 //设置屏幕高度 800
-                paramlist += "--window-height 800 ";
-                //设置快捷键 左Crtl
-                paramlist += "--shortcut-mod=lctrl ";
+                if (setting.WindowHeight > 0)
+                {
+                    paramlist += $"--window-height {setting.WindowHeight} ";
+                }
+                if (setting.WindowWidth > 0)
+                {
+                    paramlist += $"--window-width {setting.WindowWidth} ";
+                }
+
                 //设置标题
                 paramlist += $"--window-title \"{ledTitle.Text}\" ";
 
@@ -276,7 +328,7 @@ public void InitPdone()
                     UseShellExecute = false,//不使用操作系统使用的shell启动进程 
                     RedirectStandardOutput = true,//将输出信息重定向
                 });
- 
+
                 this.Hide();
                 LogHelper.Info("scrcpy running...");
                 LogHelper.Info(scrcpy.StandardOutput.ReadToEnd());
@@ -289,7 +341,6 @@ public void InitPdone()
             #endregion
         }
 
-
         private void CbxUseLog_ValueChanged(object sender, bool value)
         {
             setting.UseLog = value;
@@ -299,8 +350,38 @@ private void CbxUseLog_ValueChanged(object sender, bool value)
         private void CbxUseWireless_ValueChanged(object sender, bool value)
         {
             setting.UseWireless = value;
-            tbxAddress.Enabled = !value;
-            tbxPort.Enabled = !value;
+            //tbxAddress.Enabled = !value;
+            //tbxPort.Enabled = !value;
+
+            var foreColor = Color.Transparent;
+            var tabBackColor = Color.Transparent;
+
+            var tempColor = Color.Transparent;
+            if (setting.DarkMode)
+            {
+                tabBackColor = Color.FromArgb(24, 24, 24);
+                foreColor = Color.FromArgb(192, 192, 192);
+            }
+            else
+            {
+                tabBackColor = Color.FromArgb(242, 242, 244);
+                foreColor = Color.FromArgb(48, 48, 48);
+            }
+
+            if (setting.UseWireless)
+            {
+                tbxAddress.FillDisableColor = tabBackColor;
+                tbxPort.FillDisableColor = tabBackColor;
+                tbxAddress.ForeDisableColor = foreColor;
+                tbxPort.ForeDisableColor = foreColor;
+            }
+            else
+            {
+                tbxAddress.FillColor = tabBackColor;
+                tbxPort.FillColor = tabBackColor;
+                tbxAddress.ForeColor = foreColor;
+                tbxPort.ForeColor = foreColor;
+            }
         }
 
         private void TbxAddress_TextChanged(object sender, EventArgs e)
@@ -336,6 +417,7 @@ private void CommonCbx_ValueChanged(object sender, bool value)
                     setting.KeepAwake = value;
                     //保持唤醒与镜像模式不可同时启用
                     setting.ReadOnly = !value;
+                    cbxReadOnly.Checked = !value;
                     break;
                 case "全帧渲染":
                     command = setting.GetDesc("AllFPS") + " ";
@@ -359,6 +441,10 @@ private void CommonCbx_ValueChanged(object sender, bool value)
                     command = setting.GetDesc("TopMost") + " ";
                     setting.TopMost = value;
                     break;
+                case "显示触摸":
+                    command = setting.GetDesc("ShowTouches") + " ";
+                    setting.ShowTouches = value;
+                    break;
             }
             LogHelper.Info(temp.Text + ":" + value);
             if (value)
@@ -371,6 +457,24 @@ private void CommonCbx_ValueChanged(object sender, bool value)
             }
         }
 
+        private void RbtnShortcuts_ValueChanged(object sender, int index, string text)
+        {
+            switch (index)
+            {
+                case 1:
+                    setting.Shortcuts = "lctrl+lalt";
+                    break;
+                case 2:
+                    setting.Shortcuts = "lalt";
+                    break;
+                default:
+                    setting.Shortcuts = "lctrl";
+                    break;
+            }
+            setting.Shortcuts = $"{setting.GetDesc("Shortcuts")}={setting.Shortcuts}";
+            setting.ShortcutsIndex = index;
+        }
+
         private void RbtnMaxFPS_ValueChanged(object sender, int index, string text)
         {
             switch (index)
@@ -469,18 +573,15 @@ public void DragWindow()
         }
         #endregion
 
-        private void uiLinkLabel1_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
-        {
-            System.Diagnostics.Process.Start("https://baike.baidu.com/item/USB%E8%B0%83%E8%AF%95%E6%A8%A1%E5%BC%8F/5035286#2");
-        }
-
         private void uiLabel2_Click(object sender, EventArgs e)
         {
             Form shortcut = new Form()
             {
                 AutoSize = true,
                 StartPosition = FormStartPosition.CenterScreen,
                 FormBorderStyle = FormBorderStyle.FixedToolWindow,
+                MinimizeBox = false,
+                MaximizeBox = false,
             };
             shortcut.KeyPress += (senderr, ee) =>
             {
@@ -498,6 +599,11 @@ private void uiLabel2_Click(object sender, EventArgs e)
             shortcut.ShowDialog();
         }
 
+        private void uiLinkLabel1_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
+        {
+            System.Diagnostics.Process.Start("https://baike.baidu.com/item/USB%E8%B0%83%E8%AF%95%E6%A8%A1%E5%BC%8F/5035286#2");
+        }
+
         private void uiLinkLabel2_Click(object sender, EventArgs e)
         {
             if (UIMessageBox.Show("1、使用数据线将手机连接电脑\n2、手机开启调试模式\n3、程序将使用adb tcpip 5555命令修改无线调试端口号\n4、点击确定后若看到一只狗头，则表示设置端口号成功", "请确认", setting.DarkMode ? UIStyle.Black : UIStyle.Gray, UIMessageBoxButtons.OKCancel, false))
@@ -514,6 +620,11 @@ private void uiLinkLabel2_Click(object sender, EventArgs e)
                 }
             }
         }
+
+        private void uiLinkLabel3_LinkClicked(object sender, EventArgs e)
+        {
+            System.Diagnostics.Process.Start("https://github.com/pdone/FreeControl/issues");
+        }
     }
 
     public static class Utilitys