Merge branch 'NewFilePath'

wxr

2020-12-16 23ee4f8c373f9abecf079ef9d4297d8b6cd8d5e6

 HDL_ON/Common/ImageUtlis.cs

@@ -162,6 +162,7 @@

        /// <summary>
        /// 通过图片路径下载图片
        /// 针对住宅，使用住宅域名服务器
        /// </summary>
        public byte[] GetImageDownloadUrl(string imageKey)
        {
@@ -170,6 +171,31 @@
                imageKey = imageKey,
            });
            var revertObj = HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_GetImageUrl, requestJson);
            if (revertObj.Code == StateCode.SUCCESS)
            {
                if (revertObj.Data != null)
                {
                    if (!string.IsNullOrEmpty(revertObj.Data.ToString()))
                    {
                        var url = revertObj.Data.ToString();
                        return HttpUtil.HttpsDownload(url);
                    }
                }
            }
            return null;
        }

        /// <summary>
        /// 通过图片路径下载图片
        /// 针对用户头像指定用户路径等
        /// </summary>
        public byte[] GetImageDownloadUrlWithRegionUrl(string imageKey, string regionUrl)
        {
            var requestJson = HttpUtil.GetSignRequestJson(new GetImageUrlObj()
            {
                imageKey = imageKey,
            });
            var revertObj = HttpUtil.RequestHttpsPost(NewAPI.API_POST_GetImageUrl, requestJson, regionUrl);
            if (revertObj.Code == StateCode.SUCCESS)
            {
                if (revertObj.Data != null)
@@ -326,40 +352,42 @@
            }
        }

        /// <summary>
      /// 获取拼接用户头像的ImageKey规则
      /// </summary>
      /// <returns></returns>
      public string GetHeadImageKey(string userId)
        {
            return "ON" + "_" + userId + "_" + HEADIMAGE;
        }
        //      /// <summary>
        ///// 获取拼接用户头像的ImageKey规则
        ///// </summary>
        ///// <returns></returns>
        //public string GetHeadImageKey(string userId)
        //      {
        //          return "ON" + "_" + userId + "_" + HEADIMAGE;
        //      }

        /// <summary>
        /// 生成头像上传规则参数
        /// </summary>
        /// <returns></returns>
        public UploadImageObj GetHeadImageUploadKeyObj(string userId)
        {
            return new UploadImageObj()
            {
                prefix = "ON",
                uid = userId,
                fileName = HEADIMAGE,
            };
        }
        ///// <summary>
        ///// 生成头像上传规则参数
        ///// </summary>
        ///// <returns></returns>
        //public UploadImageObj GetHeadImageUploadKeyObj(string userId)
        //{
        //    return new UploadImageObj()
        //    {
        //        prefix = "Icon" + Utlis.GetTimestamp(),
        //        uid = userId,
        //        fileName = HEADIMAGE,
        //    };
        //}

        /// <summary>
        /// 下载用户头像
        /// </summary>
        /// <param name="userId"></param>
        /// <param name="ignoreCache">是否忽略缓存</param>
        /// <param name="imageKey"></param>
        /// <param name="ignoreCache">忽略缓存</param>
        /// <param name="regionUrl">指定服务器域名,传空为使用当前用户地址</param>
        /// <returns></returns>
        public byte[] DownHeadImage(string userId, bool ignoreCache = false)
        public byte[] DownHeadImageByImageKey(string imageKey, bool ignoreCache = false, string regionUrl = "")
        {
            try
            {
                var imageKey = GetHeadImageKey(userId);
                if (string.IsNullOrEmpty(imageKey)) return null;
                
                byte[] imageBytes;
                if (!ignoreCache && Exists(imageKey))
                {
@@ -369,7 +397,7 @@
                else
                {
                    //云端下载
                    imageBytes = GetImageDownloadUrl(imageKey);
                    imageBytes = GetImageDownloadUrlWithRegionUrl(imageKey, regionUrl);
                    if(imageBytes != null)
                    {
                        //保存到本地