From 1bf0f9c38b08e535fc6c6de2269e2f3ca2f6175d Mon Sep 17 00:00:00 2001 From: liufei Date: Mon, 13 Dec 2021 12:07:42 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Update.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Update.json b/Update.json index 12d423d..848889a 100644 --- a/Update.json +++ b/Update.json @@ -2,7 +2,7 @@ "title": "版本更新", "subTitle": "V2.3.20 正式版", "msgTitle": "本次更新内容如下", - "msg": "['一个小更新, 修复了一部分bug并增加了部分功能','修复无法修改菜单图标的bug','修复图标锯齿状bug','修复热键不支持Alt的bug','增加鼠标中键呼出功能','界面美化等','最后去给我点个star呗']", + "msg": "['一个小更新, 修复了一部分bug并增加了部分功能','修复无法修改菜单图标的bug','修复图标锯齿状bug','修复热键不支持Alt的bug','增加鼠标中键呼出功能','增加隐藏托盘图标功能','界面美化等','最后去给我点个star呗']", "githubUrl": "https://github.com/Demo-Liu/GeekDesk/releases", "giteeUrl": "https://gitee.com/demo_liu/GeekDesk/releases", "version": "2.3.20" From f96a76e6fb2722500c267b2b0e798a235f9b057d Mon Sep 17 00:00:00 2001 From: liufei Date: Mon, 13 Dec 2021 12:18:13 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BC=96=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 22 +++++++++++++--------- Update.json | 8 ++++---- Update.json.bak | 14 +++++++------- Util/HttpUtil.cs | 4 ++-- 4 files changed, 26 insertions(+), 22 deletions(-) diff --git a/README.md b/README.md index c800f08..9bfe89d 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,16 @@ -# GeekDesk -灏忓阀銆佺編瑙傜殑妗岄潰蹇熷惎鍔ㄧ鐞嗗伐鍏 - +# GeekDesk 鏋佸妗岄潰 +灏忓阀銆**缇庤**鐨勬闈㈠揩閫熷惎鍔ㄧ鐞嗗伐鍏 + +璋堜竴璋堝仛GeekDesk鐨勫師鍥: + +鐩墠鐨勫競鍦轰笂涔熸湁涓閮ㄥ垎妗岄潰鍥炬爣绠＄悊宸ュ叿, 浣嗘槸**鐣岄潰濂界偣鐨勬敹璐**, **鍏嶈垂鐨勭晫闈㈠樊** +**windows11**閮芥潵浜, 闅鹃亾杩樿鐢ㄧ晫闈㈠仠鐣欏湪**win7鏃朵唬**鐨勮蒋浠跺悧 + +鎵浠ュ氨钀岀敓浜嗗仛杩欐杞欢鐨勬兂娉, **鍏嶈垂 / 缇庤 / 楂樺害瀹氬埗鍖** 鏄粠GeekDesk璇炵敓寮濮嬪氨鏈夌殑闇姹傚拰鏂瑰悜, 鏈潵涔熶細鍚戠潃杩欎簺鏂瑰悜鍙戝睍 +鐩墠GeekDesk鍙湁涓涓汉鍦ㄥ紑鍙, 澶у濡傛灉鏈夊ソ鐨勫缓璁篃鍙互鎻怚ssue + +鍙﹀濡傛灉浣犲枩娆 GeekDesk鐨勮瘽, 鎴栬鍙互涓轰綔鑰呰喘涔伴槻鑴辨礂鍙戞按 + WYdfmR.jpg ## 寮鍙戞鏋 - wpf - .net 4.7.2 @@ -34,9 +44,3 @@ ## LICENSE - 杩欐槸涓汉寮鍙戠殑绋嬪簭,浠讳綍浜哄彲浠绘剰淇敼鍜屽厤璐逛娇鐢(鏈仛杈冨ぇ鍔熻兘鎬ф敼鍔ㄤ笉鍏佽淇敼璧炶祻鐮,閲嶆柊淇敼鍙戝竷闇娉ㄦ槑鍑哄) - 鍟嗙敤闇鑱旂郴浣滆 - - - ### 浣涚郴璧炶祻 - 鎴戠煡閬撴病浜鸿禐璧忎絾鎴戣繕鏄鏀句笂鏉 - - WYdfmR.jpg diff --git a/Update.json b/Update.json index 9e527a5..848889a 100644 --- a/Update.json +++ b/Update.json @@ -1,8 +1,8 @@ { - "title": "鐗堟湰鏇存柊", - "subTitle": "V2.3.20 姝ｅ紡鐗", - "msgTitle": "鏈鏇存柊鍐呭濡備笅", - "msg": "['涓涓皬鏇存柊, 淇浜嗕竴閮ㄥ垎bug骞跺鍔犱簡閮ㄥ垎鍔熻兘','淇鏃犳硶淇敼鑿滃崟鍥炬爣鐨刡ug','淇鍥炬爣閿娇鐘禸ug','淇鐑敭涓嶆敮鎸丄lt鐨刡ug','澧炲姞榧犳爣涓敭鍛煎嚭鍔熻兘','澧炲姞闅愯棌鎵樼洏鍥炬爣鍔熻兘','鐣岄潰缇庡寲绛','鏈鍚庡幓缁欐垜鐐逛釜star鍛']", + "title": "版本更新", + "subTitle": "V2.3.20 正式版", + "msgTitle": "本次更新内容如下", + "msg": "['一个小更新, 修复了一部分bug并增加了部分功能','修复无法修改菜单图标的bug','修复图标锯齿状bug','修复热键不支持Alt的bug','增加鼠标中键呼出功能','增加隐藏托盘图标功能','界面美化等','最后去给我点个star呗']", "githubUrl": "https://github.com/Demo-Liu/GeekDesk/releases", "giteeUrl": "https://gitee.com/demo_liu/GeekDesk/releases", "version": "2.3.20" diff --git a/Update.json.bak b/Update.json.bak index e918fb7..9e527a5 100644 --- a/Update.json.bak +++ b/Update.json.bak @@ -1,9 +1,9 @@ { - "title" : "鐗堟湰鏇存柊", - "subTitle" : "V2.3 姝ｅ紡鐗", - "msgTitle" : "鏈鏇存柊鍐呭濡備笅", - "msg" : "['杈圭紭鍚搁檮鍔熻兘','绐楀彛娣″叆娣″嚭鍔ㄧ敾','寰呭姙浠诲姟蹇嵎閿(榛樿Ctrl+Shift+Q)','鍙抽敭浠诲姟鏍忓浘鏍囨墦寮绋嬪簭鐩綍鑿滃崟']", - "githubUrl" : "https://github.com/Demo-Liu/GeekDesk/releases/tag", - "giteeUrl" : "https://gitee.com/demo_liu/GeekDesk/releases", - "version": "2.3" + "title": "鐗堟湰鏇存柊", + "subTitle": "V2.3.20 姝ｅ紡鐗", + "msgTitle": "鏈鏇存柊鍐呭濡備笅", + "msg": "['涓涓皬鏇存柊, 淇浜嗕竴閮ㄥ垎bug骞跺鍔犱簡閮ㄥ垎鍔熻兘','淇鏃犳硶淇敼鑿滃崟鍥炬爣鐨刡ug','淇鍥炬爣閿娇鐘禸ug','淇鐑敭涓嶆敮鎸丄lt鐨刡ug','澧炲姞榧犳爣涓敭鍛煎嚭鍔熻兘','澧炲姞闅愯棌鎵樼洏鍥炬爣鍔熻兘','鐣岄潰缇庡寲绛','鏈鍚庡幓缁欐垜鐐逛釜star鍛']", + "githubUrl": "https://github.com/Demo-Liu/GeekDesk/releases", + "giteeUrl": "https://gitee.com/demo_liu/GeekDesk/releases", + "version": "2.3.20" } \ No newline at end of file diff --git a/Util/HttpUtil.cs b/Util/HttpUtil.cs index c6cd2d8..165b51f 100644 --- a/Util/HttpUtil.cs +++ b/Util/HttpUtil.cs @@ -17,12 +17,12 @@ namespace GeekDesk.Util ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12; //鍒涘缓Web璁块棶瀵 璞 HttpWebRequest myRequest = (HttpWebRequest)WebRequest.Create(url); - myRequest.ContentType = "text/plain; charset=gbk"; + myRequest.ContentType = "text/plain; charset=utf-8"; //閫氳繃Web璁块棶瀵硅薄鑾峰彇鍝嶅簲鍐呭 HttpWebResponse myResponse = (HttpWebResponse)myRequest.GetResponse(); //閫氳繃鍝嶅簲鍐呭娴佸垱寤篠treamReader瀵硅薄锛屽洜涓篠treamReader鏇撮珮绾ф洿蹇 - StreamReader reader = new StreamReader(myResponse.GetResponseStream(), Encoding.GetEncoding("gbk")); + StreamReader reader = new StreamReader(myResponse.GetResponseStream(), Encoding.GetEncoding("utf-8")); string returnStr = reader.ReadToEnd();//鍒╃敤StreamReader灏卞彲浠ヤ粠鍝嶅簲鍐呭浠庡ご璇诲埌灏 reader.Close(); myResponse.Close();