lishuo/powerfun-unity
1
1 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev_lishuo' into dev_cyp

Browse Source
This commit is contained in:
Caiyanpeng committed 2021-04-30 17:46:06 +08:00
2 parents 333542a63a 48c5b161b1
commit f6a4ebda8c
29 files changed
+3526 -2755
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Assets/Scripts/Apis/ApiBase.cs
+21 -10
View File
@@ -74,22 +74,33 @@ namespace Assets.Scripts.Apis
//}
}
protected async Task<byte[]> GetAsync(string url)
{
AddLanguage();
//AddLanguage();
var _url = url;
if(_url.IndexOf("http") == -1)
if (_url.IndexOf("http") == -1)
{
_url = ConfigHelper.Host + url;
}
var httpResponseMessage = await httpClient.GetAsync(_url, HttpCompletionOption.ResponseContentRead).ConfigureAwait(false);
if (!httpResponseMessage.IsSuccessStatusCode)
{
return null;
}
byte[] data1 = await httpResponseMessage.Content.ReadAsByteArrayAsync().ConfigureAwait(false);
return data1;
//var httpResponseMessage = await httpClient.GetAsync(_url, HttpCompletionOption.ResponseContentRead).ConfigureAwait(false);
//if (!httpResponseMessage.IsSuccessStatusCode)
//{
// return null;
//}
//byte[] data1 = await httpResponseMessage.Content.ReadAsByteArrayAsync().ConfigureAwait(false);
//return data1;
//var request = UnityWebRequest.Get(_url);
//request.SetRequestHeader("Language", "en");
//yield return request.Send();
var client = new HttpClient(httpClientHandler);
client.DefaultRequestHeaders.Add("Language", "en");
client.DefaultRequestHeaders.UserAgent.Add(new ProductInfoHeaderValue("Unity", ConfigHelper.AppVersion));
var result = await client.GetByteArrayAsync(_url).ConfigureAwait(false);
return result;
}
protected async Task<byte[]> GetUrlAsync(string url)