From 1a75cdc68621deeade4bd794e27da19651c232b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E6=BD=87=E9=98=B3?= <wanna_zxy@yeah.net>
Date: Fri, 7 Jun 2024 17:29:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=BB=E5=BD=95=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CPF_Cef/AksVideoPlayer.cs | 9 ++-------
 CPF_Cef/FrmMain.cs        | 8 ++++----
 CPF_Cef/MainModel.cs      | 4 ++--
 3 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/CPF_Cef/AksVideoPlayer.cs b/CPF_Cef/AksVideoPlayer.cs
index 4d3db6b..1b1a9d9 100644
--- a/CPF_Cef/AksVideoPlayer.cs
+++ b/CPF_Cef/AksVideoPlayer.cs
@@ -25,6 +25,8 @@ namespace AKS.EnterpriseLibrary.WebBrowser
         private VideoView vplayer = null;
         public AksVideoPlayer(Window window, string _videoTitle,string _url)
         {
+            //注册gb2312
+            Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
             vplayer = new VideoView
             {
                 Name = "player",
@@ -40,13 +42,6 @@ namespace AKS.EnterpriseLibrary.WebBrowser
             window.Children.Add(this);
             mask.TransitionValue(a => a.Background, "0,0,0,100", TimeSpan.FromSeconds(0.3), null, AnimateMode.Linear);
             //this.TransitionValue(a => a.MarginTop, 100, TimeSpan.FromSeconds(0.3), new PowerEase { }, AnimateMode.EaseOut);
-            mask.MouseDown += Mask_MouseDown;
-
-        }
-
-        private void Mask_MouseDown(object sender, MouseButtonEventArgs e)
-        {
-            window.DragMove();
         }
 
         private Window window;
diff --git a/CPF_Cef/FrmMain.cs b/CPF_Cef/FrmMain.cs
index 5322c6c..760153b 100644
--- a/CPF_Cef/FrmMain.cs
+++ b/CPF_Cef/FrmMain.cs
@@ -18,10 +18,10 @@ namespace AKS.EnterpriseLibrary.WebBrowser
 {
     public class FrmMain : Window
     {
-        public int w = 1080;
-        public int h = 1920;
-        //public int h = 1080;
-        //public int w = 1920;
+        //public int w = 1080;
+        //public int h = 1920;
+        public int h = 1080;
+        public int w = 1920;
 
         protected override void InitializeComponent()
         {
diff --git a/CPF_Cef/MainModel.cs b/CPF_Cef/MainModel.cs
index 49bc0a3..8d800c8 100644
--- a/CPF_Cef/MainModel.cs
+++ b/CPF_Cef/MainModel.cs
@@ -57,7 +57,7 @@ namespace AKS.EnterpriseLibrary.WebBrowser
                         if (content != "ping" && !string.IsNullOrEmpty(content))
                         {
                             //检测服务是否启动
-                            //StartShll();
+                            StartShll();
                             //返回内容
                             string result = string.Empty;
                             content = Base64str2(content);
@@ -1183,7 +1183,7 @@ namespace AKS.EnterpriseLibrary.WebBrowser
                     //弹出光驱 eject /dev/cdrom
                     //刻录文件 wodim -v dev=/dev/cdrom blank=fast -data file1.txt file2.txt
                     //growisofs -Z /dev/cdrom -R -V "label" -iso-level 2 /path/to/files
-                    //growisofs -Z /dev/cdrom -R -V "VOLUME_LABEL" -iso-level 2 /path/to/files
+                    //growisofs -Z /dev/cdrom -R -V "Test" -iso-level 2 wwwroot
                 }
                 return "{\"timestamp\":\"" + Utils.GetTimestamp() + "\",\"keycode\":\"" + param.code + "\",\"message\":\"seccse\",\"code\":\"200\",\"status\":true,\"data\":\"" + "刻录成功" + "\"}";
             }