+ Теперь Android приложение совместимо с новым сервером

funcid · Jan 5, 2020 · c38b50f · c38b50f
1 parent 24b89a6
commit c38b50f
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 9 deletions.
diff --git a/AndroidClient/WeatherClient/.idea/caches/build_file_checksums.ser b/AndroidClient/WeatherClient/.idea/caches/build_file_checksums.ser
diff --git a/AndroidClient/WeatherClient/.idea/misc.xml b/AndroidClient/WeatherClient/.idea/misc.xml
diff --git a/AndroidClient/WeatherClient/app/release/Weather Client.apk b/AndroidClient/WeatherClient/app/release/Weather Client.apk
diff --git a/AndroidClient/WeatherClient/app/release/app-release.apk b/AndroidClient/WeatherClient/app/release/app-release.apk
diff --git a/AndroidClient/WeatherClient/app/src/main/java/ru/func/weatherclient/MapsActivity.java b/AndroidClient/WeatherClient/app/src/main/java/ru/func/weatherclient/MapsActivity.java
@@ -49,7 +49,7 @@ protected void onCreate(Bundle savedInstanceState) {
     @Override
     public void onMapReady(GoogleMap googleMap) {
         mMap = googleMap;
-        LatLng startLocation = new LatLng(55.860408, 37.639443);
+        LatLng startLocation = new LatLng(55, 37);
         markerList.add(mMap.addMarker(
                 new MarkerOptions()
                         .position(startLocation)
@@ -81,7 +81,7 @@ public void run() {
                         else if (secondsTemp == delayUpdate || waitUpdater > -3) {
                             secondsTemp = 1;
                             Request request = new Request.Builder()
-                                    .url("http://func-weather.herokuapp.com/?mobile=true")
+                                    .url("http://func-weather.herokuapp.com/mobile")
                                     .build();
                             new OkHttpClient().newCall(request)
                                     .enqueue(new Callback() {
@@ -90,11 +90,8 @@ public void onFailure(final Call call, IOException e) {
                                         }
 
                                         @Override
-                                        public void onResponse(Call call, final Response response) {
-                                            try {
-                                                lines = response.body().string().split("#");
-                                            } catch (Exception ignored) {
-                                            }
+                                        public void onResponse(Call call, final Response response) throws IOException{
+                                            lines = response.body().string().split("#");
                                         }
                                     });
                             for (Marker marker : markerList)
@@ -113,7 +110,7 @@ public void onResponse(Call call, final Response response) {
                                                 Float.parseFloat(cords[1])
                                         );
                                         nearData = splited[1]
-                                                .replace("temp=", "")
+                                                .replace("temperature=", "")
                                                 .replace(";pressure=", "C° ")
                                                 .replace(";humidity=", "torr ")
                                                 + "%";