diff --git a/app/src/main/java/com/example/cosmosclient/services/CosmosBackgroundService.java b/app/src/main/java/com/example/cosmosclient/services/CosmosBackgroundService.java index 4b9068d..36da15b 100644 --- a/app/src/main/java/com/example/cosmosclient/services/CosmosBackgroundService.java +++ b/app/src/main/java/com/example/cosmosclient/services/CosmosBackgroundService.java @@ -605,7 +605,7 @@ float[] distance = getDistance(NowLat, NowLon, e.getValue().get(i).getLocation().getLatitude(), e.getValue().get(i).getLocation().getLongitude()); // distance[0] = [2点間の距離] //50m圏外のFeatureを削除 - if (distance[0] > 50) { + if (distance[0] > 1000) { e.getValue().remove(i); } } diff --git a/app/src/main/java/com/example/cosmosclient/services/NotificationDone.java b/app/src/main/java/com/example/cosmosclient/services/NotificationDone.java index af55e7c..fcc18d5 100644 --- a/app/src/main/java/com/example/cosmosclient/services/NotificationDone.java +++ b/app/src/main/java/com/example/cosmosclient/services/NotificationDone.java @@ -44,19 +44,21 @@ } //引数で受け取ったリクエストを達成する - public void doneRequest(String gId, Request request){ - //Date型のフォーマット設定 - String deadline = null; - if (request.getDeadline() != null) { - deadline = String.format("%d-%02d-%02d %02d:%02d:%02d", request.getDeadline().getYear(), request.getDeadline().getMonth() + 1, request.getDeadline().getDate() + 1, 23, 59, 59); - } + public void doneRequest(final String gId, final Request request){ - final Call updateRequestCall = requestsService.updateRequest(gId, request.getrId(), request.getIssuer().getuId(), request.getProduct(), deadline, request.getLocation(), true, "token"); - Response response; - try { - response = updateRequestCall.execute(); - if (response.isSuccessful()) { - AddRequestsResponse result = response.body(); + + new Thread(new Runnable() { + public void run() { + String deadline = null; + //Date型のフォーマット設定 + if (request.getDeadline() != null) { + deadline = String.format("%d-%02d-%02d %02d:%02d:%02d", request.getDeadline().getYear(), request.getDeadline().getMonth() + 1, request.getDeadline().getDate() + 1, 23, 59, 59); + } final Call updateRequestCall = requestsService.updateRequest(gId, request.getrId(), request.getIssuer().getuId(), request.getProduct(), deadline, request.getLocation(), true, "token"); + Response response; + try { + response = updateRequestCall.execute(); + if (response.isSuccessful()) { + AddRequestsResponse result = response.body(); // Toast.makeText(RequestListActivity.this, "RequestListを達成しました", Toast.LENGTH_SHORT).show(); // requestList.removeRequests(selectedRequestList); // handler.post(new Runnable() { @@ -66,21 +68,24 @@ // AddRequestListTable(requestList); // } // }); - } else { - // onFailure - try { - System.out.println(response.errorBody().string()); + } else { + // onFailure + try { + System.out.println(response.errorBody().string()); + } catch (IOException e) { + e.printStackTrace(); + } + + //onFailureでキャッチできないエラーの処理 +// Toast.makeText(RequestListActivity.this, "通信エラー", Toast.LENGTH_SHORT).show(); + } } catch (IOException e) { e.printStackTrace(); - } - - //onFailureでキャッチできないエラーの処理 -// Toast.makeText(RequestListActivity.this, "通信エラー", Toast.LENGTH_SHORT).show(); - } - } catch (IOException e) { - e.printStackTrace(); // Toast.makeText(RequestListActivity.this, "RequestListの達成失敗しました", Toast.LENGTH_SHORT).show(); - } + } + } + }).start(); + } }