下班

2021-07-02 17:50:06 +08:00
parent 3804064af8
commit 9b9d08a594
10 changed files with 94 additions and 367 deletions
--- a/Control/UserControls/PannelCard/LeftCardControl.xaml
+++ b/Control/UserControls/PannelCard/LeftCardControl.xaml
@@ -130,7 +130,8 @@
                                        <Path Fill="#5D7092" Data="M921.6 0a102.4 102.4 0 0 1 102.4 102.4v819.2a102.4 102.4 0 0 1-102.4 102.4H102.4a102.4 102.4 0 0 1-102.4-102.4V102.4a102.4 102.4 0 0 1 102.4-102.4h819.2z m0 66.56H102.4a35.84 35.84 0 0 0-35.5328 30.976L66.56 102.4v819.2a35.84 35.84 0 0 0 30.976 35.5328L102.4 957.44h819.2a35.84 35.84 0 0 0 35.5328-30.976L957.44 921.6V102.4a35.84 35.84 0 0 0-30.976-35.5328L921.6 66.56z"/>
                                    </Canvas>
                                </Button>-->
-                                <TextBlock Text="&#xe606;" Style="{StaticResource MyIcon}"/>
+                                <!--<TextBlock Text="&#xe606;" Style="{StaticResource MyIcon}"/>-->
+                                <TextBlock Text="&#xe614;" FontFamily="/#IconFont" FontSize="40"/>
                                <TextBlock Text="{Binding MenuName}"
                                           VerticalAlignment="Center"
                                           IsVisibleChanged="MenuWhenVisibilityChanged"
--- a/Control/Windows/ConfigWindow.xaml
+++ b/Control/Windows/ConfigWindow.xaml
@@ -80,7 +80,7 @@
                            hc:IconElement.Width="18"
                            HorizontalAlignment="Right"
                            />-->
-                            <TextBlock Text="&#xe70b;" Style="{StaticResource MyIcon}"/>
+                            <TextBlock Text="&#xe614;" FontFamily="pack://application:,,,/Fonts/#IconFont" FontSize="40"/>
                        </hc:SideMenuItem.Icon>
                    </hc:SideMenuItem>

--- a/Fonts/iconfont.css
+++ b/Fonts/iconfont.css
--- a/Fonts/iconfont.js
+++ b/Fonts/iconfont.js
--- a/Fonts/iconfont.json
+++ b/Fonts/iconfont.json
@@ -1,219 +0,0 @@
-{
-  "id": "2491374",
-  "name": "GeekIcon",
-  "font_family": "iconfont",
-  "css_prefix_text": "icon-",
-  "description": "",
-  "glyphs": [
-    {
-      "icon_id": "13160269",
-      "name": "会话",
-      "font_class": "huihua",
-      "unicode": "e614",
-      "unicode_decimal": 58900
-    },
-    {
-      "icon_id": "14236852",
-      "name": "文件夹",
-      "font_class": "wenjianjia1",
-      "unicode": "e62e",
-      "unicode_decimal": 58926
-    },
-    {
-      "icon_id": "15416685",
-      "name": "文件夹",
-      "font_class": "wenjianjia2",
-      "unicode": "e606",
-      "unicode_decimal": 58886
-    },
-    {
-      "icon_id": "15711148",
-      "name": "系统",
-      "font_class": "xitong3",
-      "unicode": "e621",
-      "unicode_decimal": 58913
-    },
-    {
-      "icon_id": "18058019",
-      "name": "游戏",
-      "font_class": "game",
-      "unicode": "e681",
-      "unicode_decimal": 59009
-    },
-    {
-      "icon_id": "19977025",
-      "name": "系统",
-      "font_class": "xitong4",
-      "unicode": "e63e",
-      "unicode_decimal": 58942
-    },
-    {
-      "icon_id": "20017778",
-      "name": "人-翻墙",
-      "font_class": "ren-fanqiang",
-      "unicode": "e88c",
-      "unicode_decimal": 59532
-    },
-    {
-      "icon_id": "1250",
-      "name": "其它",
-      "font_class": "qita",
-      "unicode": "e600",
-      "unicode_decimal": 58880
-    },
-    {
-      "icon_id": "397886",
-      "name": "开发，代码",
-      "font_class": "kaifa",
-      "unicode": "e618",
-      "unicode_decimal": 58904
-    },
-    {
-      "icon_id": "511314",
-      "name": "打开会话",
-      "font_class": "dakaihuihua",
-      "unicode": "e64a",
-      "unicode_decimal": 58954
-    },
-    {
-      "icon_id": "791886",
-      "name": "会话",
-      "font_class": "huihua-copy",
-      "unicode": "e647",
-      "unicode_decimal": 58951
-    },
-    {
-      "icon_id": "1033987",
-      "name": "游戏",
-      "font_class": "iconfontyouxihudong",
-      "unicode": "e636",
-      "unicode_decimal": 58934
-    },
-    {
-      "icon_id": "1119109",
-      "name": "系统",
-      "font_class": "xitong",
-      "unicode": "e601",
-      "unicode_decimal": 58881
-    },
-    {
-      "icon_id": "1137788",
-      "name": "系统",
-      "font_class": "xitong1",
-      "unicode": "e67c",
-      "unicode_decimal": 59004
-    },
-    {
-      "icon_id": "1159887",
-      "name": "下载",
-      "font_class": "xiazai",
-      "unicode": "e617",
-      "unicode_decimal": 58903
-    },
-    {
-      "icon_id": "1629872",
-      "name": "文件夹",
-      "font_class": "icon-test",
-      "unicode": "e60e",
-      "unicode_decimal": 58894
-    },
-    {
-      "icon_id": "2006733",
-      "name": "会话",
-      "font_class": "xinxi",
-      "unicode": "e640",
-      "unicode_decimal": 58944
-    },
-    {
-      "icon_id": "2418266",
-      "name": "下载",
-      "font_class": "xiazai1",
-      "unicode": "e674",
-      "unicode_decimal": 58996
-    },
-    {
-      "icon_id": "2742683",
-      "name": "游戏",
-      "font_class": "youxi",
-      "unicode": "e680",
-      "unicode_decimal": 59008
-    },
-    {
-      "icon_id": "3879214",
-      "name": "网络",
-      "font_class": "wangluo",
-      "unicode": "e611",
-      "unicode_decimal": 58897
-    },
-    {
-      "icon_id": "3903356",
-      "name": "开发",
-      "font_class": "kaifa-",
-      "unicode": "e609",
-      "unicode_decimal": 58889
-    },
-    {
-      "icon_id": "7055665",
-      "name": "网络",
-      "font_class": "wangluo1",
-      "unicode": "e735",
-      "unicode_decimal": 59189
-    },
-    {
-      "icon_id": "8802631",
-      "name": "系统",
-      "font_class": "xitong2",
-      "unicode": "e648",
-      "unicode_decimal": 58952
-    },
-    {
-      "icon_id": "9712640",
-      "name": "下载",
-      "font_class": "xiazai2",
-      "unicode": "e6af",
-      "unicode_decimal": 59055
-    },
-    {
-      "icon_id": "9783461",
-      "name": "开发设计",
-      "font_class": "kaifasheji",
-      "unicode": "e613",
-      "unicode_decimal": 58899
-    },
-    {
-      "icon_id": "9924353",
-      "name": "其它",
-      "font_class": "qita1",
-      "unicode": "e60b",
-      "unicode_decimal": 58891
-    },
-    {
-      "icon_id": "9974441",
-      "name": "网络",
-      "font_class": "wangluo2",
-      "unicode": "e70b",
-      "unicode_decimal": 59147
-    },
-    {
-      "icon_id": "10294636",
-      "name": "开发",
-      "font_class": "developer",
-      "unicode": "e651",
-      "unicode_decimal": 58961
-    },
-    {
-      "icon_id": "11121465",
-      "name": "开发套件",
-      "font_class": "kaifataojian",
-      "unicode": "e63a",
-      "unicode_decimal": 58938
-    },
-    {
-      "icon_id": "11759969",
-      "name": "文件夹",
-      "font_class": "wenjianjia",
-      "unicode": "e7c2",
-      "unicode_decimal": 59330
-    }
-  ]
-}
--- a/GeekDesk.csproj
+++ b/GeekDesk.csproj
@@ -37,6 +37,9 @@
    <WarningLevel>4</WarningLevel>
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
  </PropertyGroup>
+  <PropertyGroup>
+    <StartupObject>GeekDesk.SvgToGeometry</StartupObject>
+  </PropertyGroup>
  <ItemGroup>
    <Reference Include="Apex.WinForms, Version=1.6.0.0, Culture=neutral, PublicKeyToken=98d06957926c086d, processorArchitecture=MSIL">
      <HintPath>packages\SharpShellTools.2.2.0.0\lib\Apex.WinForms.dll</HintPath>
@@ -56,8 +59,11 @@
    <Reference Include="GlobalHotKey, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
      <HintPath>packages\GlobalHotKey.1.1.0\lib\GlobalHotKey.dll</HintPath>
    </Reference>
-    <Reference Include="HandyControl, Version=3.1.0.0, Culture=neutral, PublicKeyToken=45be8712787a1e5b, processorArchitecture=MSIL">
-      <HintPath>packages\HandyControl.3.1.0\lib\net452\HandyControl.dll</HintPath>
+    <Reference Include="HandyControl, Version=3.2.0.0, Culture=neutral, PublicKeyToken=45be8712787a1e5b, processorArchitecture=MSIL">
+      <HintPath>packages\HandyControl.3.2.0\lib\net472\HandyControl.dll</HintPath>
+    </Reference>
+    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
    </Reference>
    <Reference Include="ServerManager, Version=2.2.0.0, Culture=neutral, processorArchitecture=x86">
      <HintPath>packages\SharpShellTools.2.2.0.0\lib\ServerManager.exe</HintPath>
@@ -148,6 +154,7 @@
    <Compile Include="EditTextBlock\EditableTextBlock.cs" />
    <Compile Include="EditTextBlock\EditableTextBlockAdorner.cs" />
    <Compile Include="Converts\HideTypeConvert.cs" />
+    <Compile Include="SvgToGeometry.cs" />
    <Compile Include="Task\BacklogTask.cs" />
    <Compile Include="Util\CommonCode.cs" />
    <Compile Include="Util\ConsoleManager.cs" />
@@ -254,8 +261,12 @@
      <Generator>ResXFileCodeGenerator</Generator>
      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
    </EmbeddedResource>
-    <Resource Include="Fonts\iconfont.ttf" />
-    <None Include="Fonts\iconfont.json" />
+    <Resource Include="Fonts\iconfont.ttf">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Resource>
+    <Resource Include="iconfont.ttf">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Resource>
    <None Include="packages.config" />
    <None Include="Properties\Settings.settings">
      <Generator>SettingsSingleFileGenerator</Generator>
@@ -273,8 +284,6 @@
    <Resource Include="Resource\Image\WindowLogo.png" />
  </ItemGroup>
  <ItemGroup>
-    <Content Include="Fonts\iconfont.css" />
-    <Content Include="Fonts\iconfont.js" />
    <Resource Include="Resource\Image\CompleteLogo.png" />
  </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
--- a/Resource/Dictionary/Geometry.xaml
+++ b/Resource/Dictionary/Geometry.xaml
@@ -1,6 +1,6 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:local="clr-namespace:GeekDesk.Resource.Dictionary">
+                    >

    <Geometry x:Key="About">
        M512 992C246.912 992 32 777.088 32 512 32 246.912 246.912 32 512 32c265.088 0 480 214.912 480 480 0 265.088-214.912 480-480 480z m-59.072-512v236.32a54.144 54.144 0 1 0 108.288 0V480a54.144 54.144 0 1 0-108.288 0z m53.76-226.464c-14.72 0-27.232 4.544-37.568 15.136-11.04 9.856-16.192 22.72-16.192 38.656 0 15.136 5.152 28 16.192 38.624 10.336 10.592 22.848 15.904 37.6 15.904a57.6 57.6 0 0 0 39.04-15.168c10.304-10.592 15.456-23.456 15.456-39.36s-5.12-28.8-15.456-38.656c-10.304-10.56-23.584-15.136-39.04-15.136z
--- a/SvgToGeometry.cs
+++ b/SvgToGeometry.cs
@@ -0,0 +1,73 @@
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Security.Cryptography;
+using System.Text;
+using System.Threading.Tasks;
+using System.Xml;
+
+namespace GeekDesk
+{
+    class SvgToGeometry
+    {
+        static void Main(string[] args)
+        {
+            XmlDocument xmlDoc = new XmlDocument();
+            xmlDoc.XmlResolver = null;
+            XmlReaderSettings settings = new XmlReaderSettings();
+            settings.IgnoreComments = true;//忽略文档里面的注释
+            settings.DtdProcessing = DtdProcessing.Parse;
+            XmlReader reader = XmlReader.Create("D:\\下载文件\\font_2642707_zjdi9qttb38\\iconfont.svg", settings);
+            xmlDoc.Load(reader);
+
+            XmlNodeList nodeList =  xmlDoc.SelectNodes("/svg/defs/font/glyph");
+
+            string jsonFilePath = "D:\\下载文件\\font_2642707_zjdi9qttb38\\iconfont.json";
+            JObject jo = ReadJson(jsonFilePath);
+            JArray ja = JArray.Parse(jo["glyphs"].ToString());
+
+            string value;
+
+            for (int i=0; i<nodeList.Count; i++)
+            {
+                value = nodeList[i].Attributes["d"].Value;
+                
+            }
+
+            foreach (XmlNode xmlNode in nodeList)
+            {
+                value = xmlNode.Attributes["d"].Value;
+                Console.WriteLine(value);
+
+               
+                
+            }
+        }
+
+        public static JObject ReadJson(string filePath)
+        {
+            using (System.IO.StreamReader file = System.IO.File.OpenText(filePath))
+            {
+                using (JsonTextReader reader = new JsonTextReader(file))
+                {
+                    JObject o = (JObject)JToken.ReadFrom(reader);
+                    return o;
+                }
+            }
+        }
+
+        public static string GetMd5Str(string ConvertString)
+        {
+            MD5CryptoServiceProvider md5 = new MD5CryptoServiceProvider();
+            string t2 = BitConverter.ToString(md5.ComputeHash(UTF8Encoding.Default.GetBytes(ConvertString)), 4, 8);
+            t2 = t2.Replace("-", "");
+
+            t2 = t2.ToLower();
+
+            return t2;
+        }
+    }
+}
--- a/iconfont.ttf
+++ b/iconfont.ttf
--- a/packages.config
+++ b/packages.config
@@ -2,8 +2,9 @@
 <packages>
  <package id="CommonServiceLocator" version="2.0.6" targetFramework="net452" requireReinstallation="true" />
  <package id="GlobalHotKey" version="1.1.0" targetFramework="net472" />
-  <package id="HandyControl" version="3.1.0" targetFramework="net452" requireReinstallation="true" />
+  <package id="HandyControl" version="3.2.0" targetFramework="net472" />
  <package id="MvvmLightLibs" version="5.4.1.1" targetFramework="net472" />
+  <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net472" />
  <package id="SharpShell" version="2.7.2" targetFramework="net472" />
  <package id="SharpShellTools" version="2.2.0.0" targetFramework="net472" />
  <package id="System.Drawing.Common" version="6.0.0-preview.3.21201.4" targetFramework="net472" />