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

POS_Sprint_2 #4

Merged
s426229 merged 12 commits from POS_Sprint_2 into develop 2020-12-14 19:27:10 +01:00
Conversation 0 Commits 12 Files Changed 31 +4 -3
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit c2c1cfe943 - Show all commits

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

@ -151,7 +151,7 @@ namespace Klient.Droid
using(var byteArrayContent = new ByteArrayContent(await stramContent.ReadAsByteArrayAsync())) using(var byteArrayContent = new ByteArrayContent(await stramContent.ReadAsByteArrayAsync()))
using(var formDataContent = new MultipartFormDataContent()) using(var formDataContent = new MultipartFormDataContent())
{ {
formDataContent.Add(byteArrayContent, "file", Guid.NewGuid() + ".jpg"); formDataContent.Add(byteArrayContent, "image", Guid.NewGuid() + ".jpg");
foreach (var content in formDataContent) foreach (var content in formDataContent)
{ {
content.Headers.ContentType = new System.Net.Http.Headers.MediaTypeHeaderValue(ContentResolver.GetType(photo.Data)); content.Headers.ContentType = new System.Net.Http.Headers.MediaTypeHeaderValue(ContentResolver.GetType(photo.Data));

3
Klient/Klient/Klient.Android/Resources/layout/ekranPoZdjeciu.xml
View File

@ -15,6 +15,7 @@
android:text="Wyślij zdjęcie" android:text="Wyślij zdjęcie"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:id="@+id/SendPhoto" /> android:id="@+id/SendPhoto"
android:onClick="SendPhoto"/>
</LinearLayout> </LinearLayout>

2
Serwer/Serwer.Api/Controllers/ImageController.cs
View File

@ -20,7 +20,7 @@ namespace Serwer.Api.Controllers
} }
[HttpPost("Process")] [HttpPost("Process")]
public async Task<IActionResult> Process(IFormFile image) public async Task<IActionResult> Process([FromForm]IFormFile image)
{ {
if(image == null) if(image == null)
{ {