diff --git a/app/src/main/java/com/example/cosmosclient/resources/UsersRest.java b/app/src/main/java/com/example/cosmosclient/resources/UsersRest.java index 205b4a2..608b4f8 100644 --- a/app/src/main/java/com/example/cosmosclient/resources/UsersRest.java +++ b/app/src/main/java/com/example/cosmosclient/resources/UsersRest.java @@ -17,5 +17,5 @@ @POST("users") @FormUrlEncoded - Call createUser(@Field("name") String name, @Field("pw") String pw, @Field("icon-image") String icon_image); + Call createUser(@Field("name") String name, @Field("pw") String pw, @Field("iconImage") String icon_image); } diff --git a/app/src/main/java/com/example/cosmosclient/views/MemberListActivity.java b/app/src/main/java/com/example/cosmosclient/views/MemberListActivity.java index d757753..d2ab01a 100644 --- a/app/src/main/java/com/example/cosmosclient/views/MemberListActivity.java +++ b/app/src/main/java/com/example/cosmosclient/views/MemberListActivity.java @@ -138,4 +138,4 @@ } }); } -} +} \ No newline at end of file diff --git a/app/src/main/java/com/example/cosmosclient/views/SignupActivity.java b/app/src/main/java/com/example/cosmosclient/views/SignupActivity.java index f449c15..5770dcc 100644 --- a/app/src/main/java/com/example/cosmosclient/views/SignupActivity.java +++ b/app/src/main/java/com/example/cosmosclient/views/SignupActivity.java @@ -40,7 +40,7 @@ private boolean cpwEnable; private Button MakeAccountButton; private ImageView iconChoice; - private String iconImageBase64 = null; + private String iconImageBase64; @Override protected void onCreate(Bundle savedInstanceState) { @@ -176,7 +176,7 @@ if (resultCode == RESULT_OK) { Uri resultUri = result.getUri(); //画面にトリミングした画像をセット - iconChoice.setImageURI(resultUri); + //iconChoice.setImageURI(resultUri); try { //UriからBitmapの取得 @@ -184,10 +184,19 @@ //画像をBase64に変換 ByteArrayOutputStream baos = new ByteArrayOutputStream(); - image.compress(Bitmap.CompressFormat.JPEG,100, baos); + Bitmap afterResizeBitmap = Bitmap.createScaledBitmap(image,50,50,true); + afterResizeBitmap.compress(Bitmap.CompressFormat.JPEG,70, baos); + byte[] b = baos.toByteArray(); String imageEncoded = Base64.encodeToString(b, Base64.DEFAULT); - iconImageBase64 = imageEncoded; + + if(imageEncoded.length() <= 2000){ + iconChoice.setImageBitmap(image); + iconImageBase64 = imageEncoded; + }else{ + Toast.makeText(SignupActivity.this, + "この画像は使用できません。\n別の画像を選択してください。",Toast.LENGTH_LONG).show(); + } }catch(IOException e){ e.printStackTrace(); }