From 452e8cef1c740d18ee398be6971d9952e41dbd4a Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 12 四月 2023 16:11:50 +0800
Subject: [PATCH] 1
---
HDL_ON/Common/ImageUtlis.cs | 81 ++++++++++++++++++++++++++++++++++------
1 files changed, 68 insertions(+), 13 deletions(-)
diff --git a/HDL_ON/Common/ImageUtlis.cs b/HDL_ON/Common/ImageUtlis.cs
index 3b3a486..87c0daf 100644
--- a/HDL_ON/Common/ImageUtlis.cs
+++ b/HDL_ON/Common/ImageUtlis.cs
@@ -3,6 +3,9 @@
using HDL_ON.DAL.Server;
using System.IO;
using HDL_ON.Common;
+using System.Collections.Generic;
+using System.Text;
+using System.Security.Cryptography;
namespace HDL_ON
{
@@ -160,6 +163,17 @@
}
return "";
}
+ /// <summary>
+ /// 鑾峰彇鍦烘櫙榛樿鍥惧簱鍒楄〃
+ /// </summary>
+ /// <returns></returns>
+ public ResponsePackNew GetSceneDefaultIconList()
+ {
+ var d = new Dictionary<string, object>();
+ var requestJson = HttpUtil.GetSignRequestJson(d);
+ var revertObj = HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_GetSceneDefaultIconList, requestJson);
+ return revertObj;
+ }
/// <summary>
/// 閫氳繃鍥剧墖璺緞涓嬭浇鍥剧墖
@@ -167,19 +181,26 @@
/// </summary>
public byte[] GetImageDownloadUrl(string imageKey)
{
- var requestJson = HttpUtil.GetSignRequestJson(new GetImageUrlObj()
+ if (imageKey.StartsWith("https:"))
{
- imageKey = imageKey,
- });
- var revertObj = HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_GetImageUrl, requestJson);
- if (revertObj.Code == StateCode.SUCCESS)
+ return HttpUtil.HttpsDownload(imageKey);
+ }
+ else
{
- if (revertObj.Data != null)
+ var requestJson = HttpUtil.GetSignRequestJson(new GetImageUrlObj()
{
- if (!string.IsNullOrEmpty(revertObj.Data.ToString()))
+ imageKey = imageKey,
+ });
+ var revertObj = HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_GetImageUrl, requestJson);
+ if (revertObj.Code == StateCode.SUCCESS)
+ {
+ if (revertObj.Data != null)
{
- var url = revertObj.Data.ToString();
- return HttpUtil.HttpsDownload(url);
+ if (!string.IsNullOrEmpty(revertObj.Data.ToString()))
+ {
+ var url = revertObj.Data.ToString();
+ return HttpUtil.HttpsDownload(url);
+ }
}
}
}
@@ -260,7 +281,6 @@
if (imageView != null)
{
imageView.ImageBytes = imageBytes;
- //Utlis.WriteLine("imageKey 鍔犺浇浜戠涓嬭浇鍥剧墖鎴愬姛");
}
});
}
@@ -282,6 +302,34 @@
}
}
+
+ string strKey = "abcdefgh";//娉ㄦ剰锛氳繖閲岀殑瀵嗛挜sKey蹇呴』鑳借浆涓�8涓猙yte锛屽嵆杈撳叆瀵嗛挜涓�8鍗婅涓瓧绗︽垨鑰�4涓叏瑙掑瓧绗︽垨鑰�4涓眽瀛楃殑瀛楃涓�
+ string strIV = "ijklmnop";
+
+ // 鍔犲瘑
+ private string Encrypt(string _strQ)
+ {
+ byte[] buffer = Encoding.UTF8.GetBytes(_strQ);
+ MemoryStream ms = new MemoryStream();
+ DESCryptoServiceProvider des = new DESCryptoServiceProvider();
+ CryptoStream encStream = new CryptoStream(ms, des.CreateEncryptor(Encoding.UTF8.GetBytes(strKey), Encoding.UTF8.GetBytes(strIV)), CryptoStreamMode.Write);
+ encStream.Write(buffer, 0, buffer.Length);
+ encStream.FlushFinalBlock();
+ return Convert.ToBase64String(ms.ToArray());
+ }
+
+ // 瑙ｅ瘑
+ private string Decrypt(string _strQ)
+ {
+ byte[] buffer = Convert.FromBase64String(_strQ);
+ MemoryStream ms = new MemoryStream();
+ DESCryptoServiceProvider des = new DESCryptoServiceProvider();
+ CryptoStream encStream = new CryptoStream(ms, des.CreateDecryptor(Encoding.UTF8.GetBytes(strKey), Encoding.UTF8.GetBytes(strIV)), CryptoStreamMode.Write);
+ encStream.Write(buffer, 0, buffer.Length);
+ encStream.FlushFinalBlock();
+ return Encoding.UTF8.GetString(ms.ToArray());
+ }
+
/// <summary>
/// 2020-12-03
/// 妫�娴嬪姞杞藉浘鐗�
@@ -294,6 +342,13 @@
{
try
{
+ var imageUrl = imageKey;
+
+ if (imageUrl.StartsWith("http"))
+ {
+ imageKey = Encrypt(imageKey).Replace("/","123");
+ }
+
//1.鏈湴榛樿鍥惧簱鍥剧墖锛岀洿鎺ュ姞杞芥湰鍦�
if (imageKey.Contains("Classification/Room/Roombg") || imageKey.Contains("Intelligence/Gallery/scenebg"))
{
@@ -321,7 +376,7 @@
//2.2 鏈湴娌＄紦瀛橈紝寮�鍚嚎绋嬩簯绔笅杞界劧鍚庣紦瀛�
System.Threading.Tasks.Task.Run(() =>
{
- byte[] imageBytes = GetImageDownloadUrl(imageKey);
+ byte[] imageBytes = GetImageDownloadUrl(imageUrl);
if (imageBytes != null)
{
WriteFileByBytes(imageKey, imageBytes);
@@ -331,14 +386,14 @@
if (frameLayout != null)
{
frameLayout.BackgroundImagePath = imageKey;
- //Utlis.WriteLine("imageKey 鍔犺浇浜戠涓嬭浇鍥剧墖鎴愬姛");
+ Utlis.WriteLine("imageKey 鍔犺浇浜戠涓嬭浇鍥剧墖鎴愬姛");
}
});
}
else
{
//2.4 涓嬭浇鏄惁锛屾槸鍚︿娇鐢ㄩ粯璁ゅ浘鐗�
- //Utlis.WriteLine("imageKey 鍔犺浇浜戠鍥剧墖澶辫触");
+ Utlis.WriteLine("imageKey 鍔犺浇浜戠鍥剧墖澶辫触");
}
});
}
--
Gitblit v1.8.0