diff --git a/.idea/misc.xml b/.idea/misc.xml index ce729fb..9b3af12 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -17,7 +17,7 @@ - + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 299c5f8..bc3d70f 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -20,10 +20,11 @@ tools:targetApi="31" android:usesCleartextTraffic="true"> - tools:targetApi="31"> + android:exported="true" + android:label="@string/title_activity_shop_create"> + > getAccountPosts( + @Path("uid") String uid + ); + + @DELETE("shops/{sid}/posts/{uid}/{pid}") + Call deletePost( + @Path("sid") String sid, + + @Path("uid") String uid, + @Path("pid") String pid, + @Field("token") String token + ); } diff --git a/app/src/main/java/com/example/nemophila/viewmodels/PostsViewModel.java b/app/src/main/java/com/example/nemophila/viewmodels/PostsViewModel.java index 4614381..30199fe 100644 --- a/app/src/main/java/com/example/nemophila/viewmodels/PostsViewModel.java +++ b/app/src/main/java/com/example/nemophila/viewmodels/PostsViewModel.java @@ -34,7 +34,7 @@ this.accountPostsLiveData = new MutableLiveData<>(); this.shopPostsLiveData = new MutableLiveData<>(); this.retrofit = new Retrofit.Builder() - .baseUrl("http://nitta-lab-www.is.konan-u.ac.jp/Nemophila/") + .baseUrl("http://nitta-lab-www.is.konan-u.ac.jp/nemophila/") .addConverterFactory(JacksonConverterFactory.create()) .build(); this.postsRest = retrofit.create(PostsRest.class); @@ -93,8 +93,10 @@ //PostJsonからPostを作成し,それをLiveDataにセット public void getShopPosts(String sid) { + System.out.println("通信前" + postJson.get(0)); ArrayList posts = new ArrayList<>(); getShopPostJson(sid); + System.out.println("通信after" + postJson); for(PostJson pj: postJson) { Post post = new Post(pj); posts.add(post); @@ -121,6 +123,7 @@ @Override public void onFailure(Call> call, Throwable t) { System.out.println("networkError"); + System.out.println(t); //通信エラー } }); diff --git a/app/src/main/res/layout/activity_shop_create.xml b/app/src/main/res/layout/activity_shop_create.xml index 6480277..d8a164f 100644 --- a/app/src/main/res/layout/activity_shop_create.xml +++ b/app/src/main/res/layout/activity_shop_create.xml @@ -6,4 +6,16 @@ android:layout_height="match_parent" tools:context=".ShopCreateActivity"> + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 02aafa7..d95b0d2 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -8,6 +8,7 @@ SignUpActivity TestActivity GpsActivity + ShopCreateActivity UserName Make a new Account Password