s426229/Poszukiwacz
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

develop #10

Merged
s426229 merged 80 commits from develop into master 2021-01-27 18:32:19 +01:00
Conversation 0 Commits 80 Files Changed 87 +3 -6
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 41c703bb6d - Show all commits

9
Klient/Klient/Klient.Android/MainActivity.cs
View File

@ -295,22 +295,20 @@ namespace Klient.Droid
if (response.StatusCode == HttpStatusCode.OK) if (response.StatusCode == HttpStatusCode.OK)
{ {
var jsonString = await response.Content.ReadAsStringAsync(); var jsonString = await response.Content.ReadAsStringAsync();
dynamic jsonObject = JsonConvert.DeserializeObject(jsonString);
FindViewById<TextView>(Resource.Id.ErrorPhoto).Text = "Przesłano zdjęcie!"; FindViewById<TextView>(Resource.Id.ErrorPhoto).Text = "Przesłano zdjęcie!";
SetContentView(Resource.Layout.ekranZLinkami); SetContentView(Resource.Layout.ekranZLinkami);
var second_response = await client.GetAsync("http://10.0.2.2:5001/api/Search", jsonObject.response); var second_response = await client.GetAsync($"http://10.0.2.2:5001/api/Search/{jsonString}");
if (second_response.StatusCode == HttpStatusCode.OK) if (second_response.StatusCode == HttpStatusCode.OK)
{ {
var second_jsonString = await response.Content.ReadAsStringAsync(); var second_jsonString = await response.Content.ReadAsStringAsync();
dynamic second_jsonObject = JsonConvert.DeserializeObject(second_jsonString);
List<SearchResult> fullLink = JsonConvert.DeserializeObject<List<SearchResult>>(second_jsonObject); List<SearchResult> fullLink = JsonConvert.DeserializeObject<List<SearchResult>>(second_jsonString);
int end = 10; int end = 10;
if (fullLink.Count < 10) end = fullLink.Count; if (fullLink.Count < 10) end = fullLink.Count;
for (int i = 0; i < end; i++) for (int i = 0; i < end; i++)
{ {
FindViewById<TextView>(Resource.Id.links).Text = FindViewById<TextView>(Resource.Id.links).Text + fullLink[i].Title + ": " + fullLink[i].Link + "\n\n"; FindViewById<TextView>(Resource.Id.links).Text = FindViewById<TextView>(Resource.Id.links).Text + fullLink[i].title + ": " + fullLink[i].link + "\n\n";
} }
} }
else else
@ -348,7 +346,6 @@ namespace Klient.Droid
if(second_response.StatusCode == HttpStatusCode.OK) if(second_response.StatusCode == HttpStatusCode.OK)
{ {
var second_jsonString = await second_response.Content.ReadAsStringAsync(); var second_jsonString = await second_response.Content.ReadAsStringAsync();
List<SearchResult> fullLink = JsonConvert.DeserializeObject<List<SearchResult>>(second_jsonString); List<SearchResult> fullLink = JsonConvert.DeserializeObject<List<SearchResult>>(second_jsonString);
int end = 10; int end = 10;