提交记录修改Core/Librarys/Logger.cs+1 −24看文件
修改Core/Librarys/SystemCommon.cs+25 −0看文件
| @@ -107,7 +107,7 @@ namespace Core.Librarys | ||
| 107 | 107 | |
| 108 | 108 | // tai版本号 |
| 109 | 109 | clientInfo.Add(FromatItem("Core Version", Assembly.GetExecutingAssembly().GetName().Version.ToString())); |
| 110 | 删除: clientInfo.Add(FromatItem("OS Name", GetWindowsVersionName())); | |
| 110 | 新增: clientInfo.Add(FromatItem("OS Name", SystemCommon.GetWindowsVersionName())); | |
| 111 | 111 | clientInfo.Add(FromatItem("Computer Type", GetComputerType())); |
| 112 | 112 | clientInfo.Add(FromatItem("Screen", GetScreenSize())); |
| 113 | 113 | clientInfo.Add("\r\n++++++++++++++++++++++++++++++++++++++++++++++++++\r\n\r\n"); |
| @@ -127,29 +127,6 @@ namespace Core.Librarys | ||
| 127 | 127 | { |
| 128 | 128 | return SystemInformation.VirtualScreen.Width + "*" + SystemInformation.VirtualScreen.Height; |
| 129 | 129 | } |
| 130 | 删除: private static string GetWindowsVersionName() | |
| 131 | 删除: { | |
| 132 | 删除: string name = string.Empty; | |
| 133 | 删除: try | |
| 134 | 删除: { | |
| 135 | 删除: ManagementObjectSearcher managementObjectSearcher = new ManagementObjectSearcher("SELECT * FROM Win32_OperatingSystem"); | |
| 136 | 删除: foreach (ManagementObject obj in managementObjectSearcher.Get()) | |
| 137 | 删除: { | |
| 138 | 删除: name = obj["Name"].ToString(); | |
| 139 | 删除: } | |
| 140 | 删除: | |
| 141 | 删除: if (!string.IsNullOrEmpty(name) && name.IndexOf("|") != -1) | |
| 142 | 删除: { | |
| 143 | 删除: name = name.Split('|')[0]; | |
| 144 | 删除: } | |
| 145 | 删除: } | |
| 146 | 删除: catch | |
| 147 | 删除: { | |
| 148 | 删除: return "[无法获取系统版本]"; | |
| 149 | 删除: } | |
| 150 | 删除: | |
| 151 | 删除: return name; | |
| 152 | 删除: } | |
| 153 | 130 | |
| 154 | 131 | /// <summary> |
| 155 | 132 | /// 获取电脑设备类型 |
| @@ -4,6 +4,7 @@ using System; | ||
| 4 | 4 | using System.Collections.Generic; |
| 5 | 5 | using System.IO; |
| 6 | 6 | using System.Linq; |
| 7 | 新增:using System.Management; | |
| 7 | 8 | using System.Text; |
| 8 | 9 | using System.Threading.Tasks; |
| 9 | 10 | |
| @@ -48,6 +49,30 @@ namespace Core.Librarys | ||
| 48 | 49 | return false; |
| 49 | 50 | } |
| 50 | 51 | |
| 52 | 新增: public static string GetWindowsVersionName() | |
| 53 | 新增: { | |
| 54 | 新增: string name = string.Empty; | |
| 55 | 新增: try | |
| 56 | 新增: { | |
| 57 | 新增: ManagementObjectSearcher managementObjectSearcher = new ManagementObjectSearcher("SELECT * FROM Win32_OperatingSystem"); | |
| 58 | 新增: foreach (ManagementObject obj in managementObjectSearcher.Get()) | |
| 59 | 新增: { | |
| 60 | 新增: name = obj["Name"].ToString(); | |
| 61 | 新增: } | |
| 62 | 新增: | |
| 63 | 新增: if (!string.IsNullOrEmpty(name) && name.IndexOf("|") != -1) | |
| 64 | 新增: { | |
| 65 | 新增: name = name.Split('|')[0]; | |
| 66 | 新增: } | |
| 67 | 新增: } | |
| 68 | 新增: catch | |
| 69 | 新增: { | |
| 70 | 新增: return "[无法获取系统版本]"; | |
| 71 | 新增: } | |
| 72 | 新增: | |
| 73 | 新增: return name; | |
| 74 | 新增: } | |
| 75 | 新增: | |
| 51 | 76 | |
| 52 | 77 | } |
| 53 | 78 | } |

