diff --git a/.idea/modules.xml b/.idea/modules.xml index 16d9e6f..b8f9d19 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -6,11 +6,7 @@ -<<<<<<< HEAD - - -======= ->>>>>>> 014d818825fd94f700009be5c4b7fbb651b44e81 + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 62daa92..7de94db 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -3,12 +3,9 @@ apply plugin: 'com.android.application' android { compileSdkVersion 29 defaultConfig { - applicationId "com.crime_mapping.electrothon.sos" -<<<<<<< HEAD - minSdkVersion 26 -======= + applicationId "com.crime_mapping.sih2020.sos" + minSdkVersion 16 ->>>>>>> 014d818825fd94f700009be5c4b7fbb651b44e81 targetSdkVersion 29 versionCode 1 versionName "1.0" @@ -30,14 +27,12 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) // implementation 'androidx.appcompat:appcompat:1.0.0' -<<<<<<< HEAD + //retrofit implementation 'com.squareup.retrofit2:retrofit:2.4.0' implementation 'com.squareup.retrofit2:converter-gson:2.2.0' -======= ->>>>>>> 014d818825fd94f700009be5c4b7fbb651b44e81 implementation(name: 'sinch-android-rtc', version: '+', ext: 'aar') implementation 'androidx.constraintlayout:constraintlayout:1.1.3' implementation 'com.google.android.material:material:1.0.0' @@ -79,7 +74,7 @@ dependencies { implementation 'com.google.android.material:material:1.3.0-alpha01' implementation 'com.google.android.gms:play-services-maps:17.0.0' implementation 'com.google.android.gms:play-services-location:17.0.0' - + implementation 'com.google.maps.android:android-maps-utils:2.0.3' // implementation 'androidx.appcompat:appcompat:1.0.0' // implementation(name: 'sinch-android-rtc', version: '+', ext: 'aar') // implementation 'androidx.constraintlayout:constraintlayout:1.1.3' @@ -87,6 +82,7 @@ dependencies { // implementation 'org.greenrobot:eventbus:3.1.1' // implementation 'androidx.legacy:legacy-support-v4:1.0.0' + implementation 'com.squareup.okhttp3:logging-interceptor:3.9.0' } diff --git a/app/src/androidTest/java/com/crime_mapping/electrothon/sos/ExampleInstrumentedTest.java b/app/src/androidTest/java/com/crime_mapping/sih2020/sos/ExampleInstrumentedTest.java similarity index 94% rename from app/src/androidTest/java/com/crime_mapping/electrothon/sos/ExampleInstrumentedTest.java rename to app/src/androidTest/java/com/crime_mapping/sih2020/sos/ExampleInstrumentedTest.java index 17248ce..6a55a2d 100644 --- a/app/src/androidTest/java/com/crime_mapping/electrothon/sos/ExampleInstrumentedTest.java +++ b/app/src/androidTest/java/com/crime_mapping/sih2020/sos/ExampleInstrumentedTest.java @@ -1,4 +1,4 @@ -package com.crime_mapping.electrothon.sos; +package com.crime_mapping.sih2020.sos; import android.content.Context; import androidx.test.platform.app.InstrumentationRegistry; diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 5c74fad..dc624d3 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,7 +1,9 @@ + package="com.crime_mapping.sih2020.sos"> + + @@ -24,7 +26,7 @@ - + - + @@ -55,18 +57,18 @@ android:value="@string/google_maps_key" /> - + - - - + + + @@ -74,17 +76,17 @@ - - - + + + - + \ No newline at end of file diff --git a/app/src/main/java/com/crime_mapping/electrothon/sos/AboutActivity.java b/app/src/main/java/com/crime_mapping/sih2020/sos/AboutActivity.java similarity index 87% rename from app/src/main/java/com/crime_mapping/electrothon/sos/AboutActivity.java rename to app/src/main/java/com/crime_mapping/sih2020/sos/AboutActivity.java index 8dd7b2e..6b21847 100644 --- a/app/src/main/java/com/crime_mapping/electrothon/sos/AboutActivity.java +++ b/app/src/main/java/com/crime_mapping/sih2020/sos/AboutActivity.java @@ -1,4 +1,4 @@ -package com.crime_mapping.electrothon.sos; +package com.crime_mapping.sih2020.sos; import android.os.Bundle; diff --git a/app/src/main/java/com/crime_mapping/electrothon/sos/CameraPreview.java b/app/src/main/java/com/crime_mapping/sih2020/sos/CameraPreview.java similarity index 97% rename from app/src/main/java/com/crime_mapping/electrothon/sos/CameraPreview.java rename to app/src/main/java/com/crime_mapping/sih2020/sos/CameraPreview.java index 53a20e8..d08e792 100644 --- a/app/src/main/java/com/crime_mapping/electrothon/sos/CameraPreview.java +++ b/app/src/main/java/com/crime_mapping/sih2020/sos/CameraPreview.java @@ -1,4 +1,4 @@ -package com.crime_mapping.electrothon.sos; +package com.crime_mapping.sih2020.sos; import android.content.Context; import android.hardware.Camera; diff --git a/app/src/main/java/com/crime_mapping/electrothon/sos/Constants.java b/app/src/main/java/com/crime_mapping/sih2020/sos/Constants.java similarity index 67% rename from app/src/main/java/com/crime_mapping/electrothon/sos/Constants.java rename to app/src/main/java/com/crime_mapping/sih2020/sos/Constants.java index c3997d2..e8db2f8 100644 --- a/app/src/main/java/com/crime_mapping/electrothon/sos/Constants.java +++ b/app/src/main/java/com/crime_mapping/sih2020/sos/Constants.java @@ -1,4 +1,4 @@ -package com.crime_mapping.electrothon.sos; +package com.crime_mapping.sih2020.sos; public class Constants { public static final String PHONE_NUMBER = "phoneNumber"; diff --git a/app/src/main/java/com/crime_mapping/electrothon/sos/CustomLocationListAdapter.java b/app/src/main/java/com/crime_mapping/sih2020/sos/CustomLocationListAdapter.java similarity index 98% rename from app/src/main/java/com/crime_mapping/electrothon/sos/CustomLocationListAdapter.java rename to app/src/main/java/com/crime_mapping/sih2020/sos/CustomLocationListAdapter.java index 213737b..87d1f93 100644 --- a/app/src/main/java/com/crime_mapping/electrothon/sos/CustomLocationListAdapter.java +++ b/app/src/main/java/com/crime_mapping/sih2020/sos/CustomLocationListAdapter.java @@ -1,4 +1,4 @@ -package com.crime_mapping.electrothon.sos; +package com.crime_mapping.sih2020.sos; import android.content.Context; import android.view.LayoutInflater; diff --git a/app/src/main/java/com/crime_mapping/sih2020/sos/Data.java b/app/src/main/java/com/crime_mapping/sih2020/sos/Data.java new file mode 100644 index 0000000..8f8a537 --- /dev/null +++ b/app/src/main/java/com/crime_mapping/sih2020/sos/Data.java @@ -0,0 +1,59 @@ +package com.crime_mapping.sih2020.sos; + +public class Data { + + private String precautions; + + private double x; + + private String description; + + private double y; + + public String getPrecautions () + { + return precautions; + } + + public void setPrecautions (String precautions) + { + this.precautions = precautions; + } + + public double getX () + { + return x; + } + + public void setX (double x) + { + this.x = x; + } + + public String getDescription () + { + return description; + } + + public void setDescription (String description) + { + this.description = description; + } + + public double getY () + { + return y; + } + + public void setY (double y) + { + this.y = y; + } + + public Data(String precautions, double x, String description, double y) { + this.precautions = precautions; + this.x = x; + this.description = description; + this.y = y; + } +} diff --git a/app/src/main/java/com/crime_mapping/electrothon/sos/FirebaseLocationData.java b/app/src/main/java/com/crime_mapping/sih2020/sos/FirebaseLocationData.java similarity index 97% rename from app/src/main/java/com/crime_mapping/electrothon/sos/FirebaseLocationData.java rename to app/src/main/java/com/crime_mapping/sih2020/sos/FirebaseLocationData.java index 8124a6b..cbe4cb3 100644 --- a/app/src/main/java/com/crime_mapping/electrothon/sos/FirebaseLocationData.java +++ b/app/src/main/java/com/crime_mapping/sih2020/sos/FirebaseLocationData.java @@ -1,4 +1,4 @@ -package com.crime_mapping.electrothon.sos; +package com.crime_mapping.sih2020.sos; public class FirebaseLocationData { String email; diff --git a/app/src/main/java/com/crime_mapping/electrothon/sos/GpsTracker.java b/app/src/main/java/com/crime_mapping/sih2020/sos/GpsTracker.java similarity index 99% rename from app/src/main/java/com/crime_mapping/electrothon/sos/GpsTracker.java rename to app/src/main/java/com/crime_mapping/sih2020/sos/GpsTracker.java index 59f984f..f3ee630 100644 --- a/app/src/main/java/com/crime_mapping/electrothon/sos/GpsTracker.java +++ b/app/src/main/java/com/crime_mapping/sih2020/sos/GpsTracker.java @@ -1,4 +1,4 @@ -package com.crime_mapping.electrothon.sos; +package com.crime_mapping.sih2020.sos; import android.Manifest; import android.app.AlertDialog; diff --git a/app/src/main/java/com/crime_mapping/electrothon/sos/IncommingCallActivity.java b/app/src/main/java/com/crime_mapping/sih2020/sos/IncommingCallActivity.java similarity index 99% rename from app/src/main/java/com/crime_mapping/electrothon/sos/IncommingCallActivity.java rename to app/src/main/java/com/crime_mapping/sih2020/sos/IncommingCallActivity.java index 57d3eba..6b4d4db 100644 --- a/app/src/main/java/com/crime_mapping/electrothon/sos/IncommingCallActivity.java +++ b/app/src/main/java/com/crime_mapping/sih2020/sos/IncommingCallActivity.java @@ -1,4 +1,4 @@ -package com.crime_mapping.electrothon.sos; +package com.crime_mapping.sih2020.sos; import android.animation.ObjectAnimator; import android.animation.ValueAnimator; diff --git a/app/src/main/java/com/crime_mapping/sih2020/sos/LatLong.java b/app/src/main/java/com/crime_mapping/sih2020/sos/LatLong.java new file mode 100644 index 0000000..57ebbde --- /dev/null +++ b/app/src/main/java/com/crime_mapping/sih2020/sos/LatLong.java @@ -0,0 +1,27 @@ +package com.crime_mapping.sih2020.sos; + +public class LatLong { + + double lat , lng; + + public LatLong(double lat, double lng) { + this.lat = lat; + this.lng = lng; + } + + public double getLat() { + return lat; + } + + public void setLat(double lat) { + this.lat = lat; + } + + public double getLng() { + return lng; + } + + public void setLng(double lng) { + this.lng = lng; + } +} diff --git a/app/src/main/java/com/crime_mapping/electrothon/sos/LocationListActivity.java b/app/src/main/java/com/crime_mapping/sih2020/sos/LocationListActivity.java similarity index 99% rename from app/src/main/java/com/crime_mapping/electrothon/sos/LocationListActivity.java rename to app/src/main/java/com/crime_mapping/sih2020/sos/LocationListActivity.java index db07db6..6475ace 100644 --- a/app/src/main/java/com/crime_mapping/electrothon/sos/LocationListActivity.java +++ b/app/src/main/java/com/crime_mapping/sih2020/sos/LocationListActivity.java @@ -1,4 +1,4 @@ -package com.crime_mapping.electrothon.sos; +package com.crime_mapping.sih2020.sos; import android.content.Intent; import android.os.Bundle; diff --git a/app/src/main/java/com/crime_mapping/electrothon/sos/Login.java b/app/src/main/java/com/crime_mapping/sih2020/sos/Login.java similarity index 92% rename from app/src/main/java/com/crime_mapping/electrothon/sos/Login.java rename to app/src/main/java/com/crime_mapping/sih2020/sos/Login.java index 8411b71..960cef9 100644 --- a/app/src/main/java/com/crime_mapping/electrothon/sos/Login.java +++ b/app/src/main/java/com/crime_mapping/sih2020/sos/Login.java @@ -1,4 +1,4 @@ -package com.crime_mapping.electrothon.sos; +package com.crime_mapping.sih2020.sos; import android.os.Bundle; diff --git a/app/src/main/java/com/crime_mapping/electrothon/sos/LoginActivity.java b/app/src/main/java/com/crime_mapping/sih2020/sos/LoginActivity.java similarity index 99% rename from app/src/main/java/com/crime_mapping/electrothon/sos/LoginActivity.java rename to app/src/main/java/com/crime_mapping/sih2020/sos/LoginActivity.java index 6e68db7..c20e57c 100644 --- a/app/src/main/java/com/crime_mapping/electrothon/sos/LoginActivity.java +++ b/app/src/main/java/com/crime_mapping/sih2020/sos/LoginActivity.java @@ -1,4 +1,4 @@ -package com.crime_mapping.electrothon.sos; +package com.crime_mapping.sih2020.sos; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; diff --git a/app/src/main/java/com/crime_mapping/electrothon/sos/MainActivity.java b/app/src/main/java/com/crime_mapping/sih2020/sos/MainActivity.java similarity index 92% rename from app/src/main/java/com/crime_mapping/electrothon/sos/MainActivity.java rename to app/src/main/java/com/crime_mapping/sih2020/sos/MainActivity.java index 2cc7adc..c67271f 100644 --- a/app/src/main/java/com/crime_mapping/electrothon/sos/MainActivity.java +++ b/app/src/main/java/com/crime_mapping/sih2020/sos/MainActivity.java @@ -1,4 +1,4 @@ -package com.crime_mapping.electrothon.sos; +package com.crime_mapping.sih2020.sos; import android.Manifest; import android.animation.ObjectAnimator; @@ -7,6 +7,7 @@ import android.app.NotificationChannel; import android.app.NotificationManager; import android.app.PendingIntent; +import android.bluetooth.BluetoothAdapter; import android.content.Context; import android.content.DialogInterface; import android.content.Intent; @@ -47,6 +48,9 @@ import androidx.core.app.NotificationManagerCompat; import androidx.core.content.ContextCompat; +import com.crime_mapping.sih2020.sos.api.ApiClient; +import com.crime_mapping.sih2020.sos.api.ApiInterface; +import com.crime_mapping.sih2020.sos.api.Crime; import com.google.android.gms.common.ConnectionResult; import com.google.android.gms.common.api.GoogleApiClient; import com.google.android.gms.location.FusedLocationProviderClient; @@ -90,7 +94,12 @@ import java.util.Timer; import java.util.TimerTask; -import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK; +import okhttp3.OkHttpClient; +import okhttp3.logging.HttpLoggingInterceptor; +import retrofit2.Callback; +import retrofit2.Response; +import retrofit2.Retrofit; +import retrofit2.converter.gson.GsonConverterFactory; public class MainActivity extends AppCompatActivity implements GoogleApiClient.ConnectionCallbacks, GoogleApiClient.OnConnectionFailedListener, LocationListener, OnMapReadyCallback,View.OnClickListener, SensorEventListener { private GoogleMap mMap; @@ -156,7 +165,7 @@ public class MainActivity extends AppCompatActivity implements GoogleApiClient.C private static final int PERMISSION_REQUEST_CODE = 200; private Camera mCamera; //to store path of each image - String file_path; + String file_path,file_path1; private CameraPreview mCameraPreview; private StorageReference mStorageRef; @@ -175,7 +184,7 @@ public class MainActivity extends AppCompatActivity implements GoogleApiClient.C private SensorManager mSensorManager; private Sensor mProximity; private View mCallingBlacksreen; - + Retrofit retrofit; @Override @@ -197,8 +206,9 @@ protected void onStop() { // myRef.removeEventListener(childEventListener); // Log.d(TAG, "onStop: ChildEventListener Removed"); // } - + startService(new Intent(this, SinchService.class)); if (isServiceBackground && FirebaseAuth.getInstance().getCurrentUser() != null) { + startService(new Intent(this, MyService.class)); Log.d(TAG, "onStop: starting service"); } @@ -406,27 +416,11 @@ public void onCancelled(DatabaseError databaseError) { //for camera things if (checkPermission()) { -// setContentView(R.layout.activity_main); mCamera = getCameraInstance(); mCameraPreview = new CameraPreview(this, mCamera); FrameLayout preview = (FrameLayout) findViewById(R.id.camera_preview); preview.addView(mCameraPreview); -// Button captureButton = (Button) findViewById(R.id.button_capture); -// captureButton.setOnClickListener(new View.OnClickListener() { -// @Override -// public void onClick(View v) { -// -// Timer timer = new Timer(); -// timer.schedule(new TimerTask() { -// @Override -// public void run() { -// mCamera.startPreview(); -// mCamera.takePicture(null, null, mPicture); -// } -// }, 0, 5000); -// } -// }); } else { requestPermission(); } @@ -486,19 +480,71 @@ public boolean onOptionsItemSelected(MenuItem item) { public void startSos(View view) { - if (ActivityCompat.checkSelfPermission(this, Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED && ActivityCompat.checkSelfPermission(this, Manifest.permission.ACCESS_COARSE_LOCATION) != PackageManager.PERMISSION_GRANTED) { - // TODO: Consider calling - // ActivityCompat#requestPermissions - // here to request the missing permissions, and then overriding - // public void onRequestPermissionsResult(int requestCode, String[] permissions, - // int[] grantResults) - // to handle the case where the user grants the permission. See the documentation - // for ActivityCompat#requestPermissions for more details. - ActivityCompat.requestPermissions(MainActivity.this, - new String[]{Manifest.permission.ACCESS_FINE_LOCATION}, - MY_PERMISSIONS_REQUEST_ACCESS_FINE_LOCATION); - return; - } + Toast.makeText(this,"hitted",Toast.LENGTH_LONG).show(); + ApiInterface apiInterface = ApiClient.getApiClient().create(ApiInterface.class); + retrofit2.Call calllatest; + calllatest = apiInterface.send_sos("0.0000", "0.000", "7355497420"); + calllatest.enqueue(new Callback() { + @Override + public void onResponse(retrofit2.Call call, Response response) { + Log.e("call", call.request().url().toString()); + Log.e("responnse", String.valueOf(response)); + Log.d("notified","alert"); + Toast.makeText(MainActivity.this,"SOS sent successfully",Toast.LENGTH_LONG).show(); + + + BluetoothAdapter mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter(); + if (!mBluetoothAdapter.isEnabled()){ + mBluetoothAdapter.enable(); + } + + } + + @Override + public void onFailure(retrofit2.Call call, Throwable t) { + + } + }); + + +// if (ActivityCompat.checkSelfPermission(this, Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED && ActivityCompat.checkSelfPermission(this, Manifest.permission.ACCESS_COARSE_LOCATION) != PackageManager.PERMISSION_GRANTED) { +// // TODO: Consider calling +// // ActivityCompat#requestPermissions +// // here to request the missing permissions, and then overriding +// // public void onRequestPermissionsResult(int requestCode, String[] permissions, +// // int[] grantResults) +// // to handle the case where the user grants the permission. See the documentation +// // for ActivityCompat#requestPermissions for more details. +// ActivityCompat.requestPermissions(MainActivity.this, +// new String[]{Manifest.permission.ACCESS_FINE_LOCATION}, +// MY_PERMISSIONS_REQUEST_ACCESS_FINE_LOCATION); +// return; +// } + + + + /////////////////////// +// ApiInterface apiInterface = ApiClient.getApiClient().create(ApiInterface.class); +// retrofit2.Call calllatest; +// calllatest = apiInterface.send_sos("23.005", "73.222", "7355497420"); +// calllatest.enqueue(new Callback() { +// @Override +// public void onResponse(retrofit2.Call call, Response response) { +// Log.e("call", call.request().url().toString()); +// Log.e("responnse", String.valueOf(response)); +// +// } +// +// @Override +// public void onFailure(retrofit2.Call call, Throwable t) { +// Log.e("responnse", String.valueOf(t)); +// } +// }); + + + ///////////////////////// + + // mFusedLocationProviderClient.getLastLocation() // .addOnCompleteListener(this, new OnCompleteListener() { // @Override @@ -515,20 +561,20 @@ public void startSos(View view) { // } // } // }); - - LocationManager lm = (LocationManager) getSystemService(LOCATION_SERVICE); - lastLocationGpsProvider = lm.getLastKnownLocation(LocationManager.GPS_PROVIDER); +// +// LocationManager lm = (LocationManager) getSystemService(LOCATION_SERVICE); +// lastLocationGpsProvider = lm.getLastKnownLocation(LocationManager.GPS_PROVIDER); //write data to firebase - if (lastLocationGpsProvider != null) - updateUserLocationToFirebase(lastLocationGpsProvider); - else { - lastLocationGpsProvider = LocationServices.FusedLocationApi.getLastLocation(gac); - if (lastLocationGpsProvider != null) - updateUserLocationToFirebase(lastLocationGpsProvider); - } +// if (lastLocationGpsProvider != null) +// updateUserLocationToFirebase(lastLocationGpsProvider); +// else { +// lastLocationGpsProvider = LocationServices.FusedLocationApi.getLastLocation(gac); +// if (lastLocationGpsProvider != null) +// updateUserLocationToFirebase(lastLocationGpsProvider); +// } // Toast.makeText(this, "GPS location without google client\n"+lm.getLastKnownLocation(LocationManager.GPS_PROVIDER).toString(), Toast.LENGTH_SHORT).show(); @@ -713,6 +759,7 @@ public void onCancelled(@NonNull DatabaseError databaseError) { }); // Toast.makeText(this,"services started...",Toast.LENGTH_SHORT).show(); + startService(new Intent(this, SinchService.class)); Intent i = new Intent(this, MyService.class); startService(i); } @@ -1273,4 +1320,6 @@ public void onSinchLogging(SinchStatus.SinchLogger sinchLogger){ finish(); } } + + } diff --git a/app/src/main/java/com/crime_mapping/electrothon/sos/MapsActivity.java b/app/src/main/java/com/crime_mapping/sih2020/sos/MapsActivity.java similarity index 56% rename from app/src/main/java/com/crime_mapping/electrothon/sos/MapsActivity.java rename to app/src/main/java/com/crime_mapping/sih2020/sos/MapsActivity.java index 33ff5ee..c92a7a1 100644 --- a/app/src/main/java/com/crime_mapping/electrothon/sos/MapsActivity.java +++ b/app/src/main/java/com/crime_mapping/sih2020/sos/MapsActivity.java @@ -1,20 +1,27 @@ -package com.crime_mapping.electrothon.sos; +package com.crime_mapping.sih2020.sos; import android.content.Context; import android.content.SharedPreferences; +import android.location.Location; import android.os.Bundle; import android.util.Log; +import android.view.View; +import android.widget.TextView; import android.widget.Toast; import androidx.annotation.NonNull; import androidx.fragment.app.FragmentActivity; +import com.google.android.gms.common.api.GoogleApiClient; +import com.google.android.gms.location.LocationRequest; import com.google.android.gms.maps.CameraUpdate; import com.google.android.gms.maps.CameraUpdateFactory; import com.google.android.gms.maps.GoogleMap; import com.google.android.gms.maps.OnMapReadyCallback; import com.google.android.gms.maps.SupportMapFragment; +import com.google.android.gms.maps.model.BitmapDescriptorFactory; import com.google.android.gms.maps.model.LatLng; +import com.google.android.gms.maps.model.Marker; import com.google.android.gms.maps.model.MarkerOptions; import com.google.firebase.database.DataSnapshot; import com.google.firebase.database.DatabaseError; @@ -27,14 +34,22 @@ public class MapsActivity extends FragmentActivity implements OnMapReadyCallback private static final String TAG = "MapsActivity"; private GoogleMap mMap; - + LatLng latLng; Double latitude, longitude; String name, time; - + MarkerOptions markerOptions; double l1, l2; SharedPreferences preferences; SharedPreferences.Editor editor; + GoogleMap mGoogleMap; + SupportMapFragment mapFrag; + LocationRequest mLocationRequest; + GoogleApiClient mGoogleApiClient; + Location mLastLocation; + Marker mCurrLocationMarker=null; + TextView tv_loc; + private static View view; @Override protected void onCreate(Bundle savedInstanceState) { @@ -57,11 +72,54 @@ public void onDataChange(@NonNull DataSnapshot dataSnapshot) { l1 = Double.valueOf(dataSnapshot.child(no).child("Latitude").getValue().toString()); l2 = Double.valueOf(dataSnapshot.child(no).child("Longitude").getValue().toString()); Log.d("latlon", "" + l1 + l2); +// latLng = new LatLng(l1,l2); +// markerOptions = new MarkerOptions().position(latLng); +// mMap.addMarker(markerOptions); +// mMap.moveCamera(CameraUpdateFactory.newLatLng(latLng)); +// mMap.animateCamera(CameraUpdateFactory.zoomTo((float) 14)); } else { Toast.makeText(MapsActivity.this, "No user have shared location with you.", Toast.LENGTH_SHORT).show(); } + + ////////////////////////////////////////////////// + double lattitude =l1; + double longitude = l2; + + //Place current location marker + latLng = new LatLng(lattitude, longitude); + +// CameraPosition cameraPosition = new CameraPosition.Builder() +// .target(latLng).zoom(14).build(); + + mMap.addMarker(new MarkerOptions() + .icon(BitmapDescriptorFactory.defaultMarker(BitmapDescriptorFactory.HUE_YELLOW)) + .position(latLng) + .title("I am here!") + .zIndex(20)); + + mMap.moveCamera(CameraUpdateFactory.newLatLng(latLng)); + mMap.animateCamera(CameraUpdateFactory.zoomTo((float) 14)); +// mMap.animateCamera(CameraUpdateFactory +// .newCameraPosition(cameraPosition)); + +// if(mCurrLocationMarker!=null){ +// mCurrLocationMarker.setPosition(latLng); +// }else{ +// mCurrLocationMarker = mMap.addMarker(new MarkerOptions() +// .position(latLng) +// .title("I am here")); +// } +// +//// tv_loc.append("Lattitude: " + lattitude + " Longitude: " + longitude); +// mMap.animateCamera(CameraUpdateFactory.newLatLngZoom(latLng, 15)); + + //stop location updates +// if (mGoogleApiClient != null) { +// LocationServices.FusedLocationApi.removeLocationUpdates(mGoogleApiClient, this); +// } + } @Override @@ -88,9 +146,9 @@ public void onMapReady(GoogleMap googleMap) { // Add a marker in Sydney and move the camera - LatLng latLng = new LatLng(l1, l2); - MarkerOptions markerOptions = new MarkerOptions().position(latLng); - mMap.addMarker(markerOptions); + latLng = new LatLng(l1, l2); +// markerOptions = new MarkerOptions().position(latLng); +// mMap.addMarker(markerOptions); CameraUpdate cameraUpdate = CameraUpdateFactory.newLatLngZoom(latLng, 16); mMap.animateCamera(cameraUpdate); diff --git a/app/src/main/java/com/crime_mapping/electrothon/sos/MapsActivity2.java b/app/src/main/java/com/crime_mapping/sih2020/sos/MapsActivity2.java similarity index 52% rename from app/src/main/java/com/crime_mapping/electrothon/sos/MapsActivity2.java rename to app/src/main/java/com/crime_mapping/sih2020/sos/MapsActivity2.java index 3255e60..fd20f2a 100644 --- a/app/src/main/java/com/crime_mapping/electrothon/sos/MapsActivity2.java +++ b/app/src/main/java/com/crime_mapping/sih2020/sos/MapsActivity2.java @@ -1,27 +1,39 @@ -package com.crime_mapping.electrothon.sos; +package com.crime_mapping.sih2020.sos; import android.Manifest; import android.content.Intent; import android.content.pm.PackageManager; import android.graphics.Color; import android.os.Bundle; +import android.util.Log; -import androidx.annotation.NonNull; import androidx.core.app.ActivityCompat; import androidx.fragment.app.FragmentActivity; +import com.google.android.gms.maps.CameraUpdate; +import com.google.android.gms.maps.CameraUpdateFactory; import com.google.android.gms.maps.GoogleMap; import com.google.android.gms.maps.OnMapReadyCallback; import com.google.android.gms.maps.SupportMapFragment; -import com.google.android.gms.maps.model.Circle; -import com.google.android.gms.maps.model.CircleOptions; import com.google.android.gms.maps.model.LatLng; import com.google.android.gms.maps.model.MarkerOptions; -import com.google.firebase.database.DataSnapshot; -import com.google.firebase.database.DatabaseError; -import com.google.firebase.database.DatabaseReference; -import com.google.firebase.database.FirebaseDatabase; -import com.google.firebase.database.ValueEventListener; +import com.google.android.gms.maps.model.TileOverlay; +import com.google.android.gms.maps.model.TileOverlayOptions; +import com.google.maps.android.heatmaps.Gradient; +import com.google.maps.android.heatmaps.HeatmapTileProvider; + + +import java.util.ArrayList; +import java.util.List; + +import okhttp3.OkHttpClient; + +import okhttp3.logging.HttpLoggingInterceptor; +import retrofit2.Call; +import retrofit2.Callback; +import retrofit2.Response; +import retrofit2.Retrofit; +import retrofit2.converter.gson.GsonConverterFactory; public class MapsActivity2 extends FragmentActivity implements OnMapReadyCallback { @@ -31,11 +43,17 @@ public class MapsActivity2 extends FragmentActivity implements OnMapReadyCallbac double lat, lon; //lat,log,title String a, b, t; + Retrofit retrofit; + + List Pointslist = null; + private HeatmapTileProvider mProvider; + private TileOverlay mOverlay; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_maps2); + Pointslist = new ArrayList<>(); Intent intentt = getIntent(); a1 = intentt.getStringExtra("lat"); a2 = intentt.getStringExtra("lon"); @@ -45,6 +63,65 @@ protected void onCreate(Bundle savedInstanceState) { SupportMapFragment mapFragment = (SupportMapFragment) getSupportFragmentManager() .findFragmentById(R.id.map); mapFragment.getMapAsync(this); + + + } + + private void FetchCoordinates() { + OkHttpClient.Builder okhttpbuilder = new OkHttpClient.Builder(); + HttpLoggingInterceptor logging = new HttpLoggingInterceptor(); + logging.setLevel(HttpLoggingInterceptor.Level.BODY); + okhttpbuilder.addInterceptor(logging); + + Retrofit.Builder builder = new Retrofit.Builder() + .baseUrl("https://demo9608891.mockable.io/") + .addConverterFactory(GsonConverterFactory.create()); + + retrofit = builder.build(); + + SihApi sihApi = retrofit.create(SihApi.class); + Call> call = sihApi.getCoordinates(); + call.enqueue(new Callback>() { + @Override + public void onResponse(Call> call, Response> response) { + Log.e("response", "" + response.code()); + if (response.isSuccessful()) { + Log.e("responsee", "" + String.valueOf(response.body())); + List list = response.body(); + for (LatLong latLong : list) { + Pointslist.add(new LatLng(latLong.getLat(), latLong.getLng())); + Log.e("list", "" + latLong.getLat()); + } + addHeatMap(); + } + } + + @Override + public void onFailure(Call> call, Throwable t) { + Log.e("failed", "" + t.getMessage()); + } + }); + + } + + private void addHeatMap() { + int[] colors = { + Color.rgb(102, 225, 0), // green + Color.rgb(255, 0, 0) // red + }; + float[] startPoints = { + 0.2f, 1f + }; + Gradient gradient = new Gradient(colors, startPoints); + mProvider = new HeatmapTileProvider.Builder() + .data(Pointslist) + .gradient(gradient) + .radius(20) + .build(); + + mOverlay = mMap.addTileOverlay(new TileOverlayOptions().tileProvider(mProvider)); + + } @@ -71,23 +148,23 @@ public void onMapReady(GoogleMap googleMap) { // for ActivityCompat#requestPermissions for more details. return; } - mMap.setMyLocationEnabled(true); + /* DatabaseReference d1 = FirebaseDatabase.getInstance().getReference().child("spots"); d1.addValueEventListener(new ValueEventListener() { @Override public void onDataChange(@NonNull DataSnapshot dataSnapshot) { - for(DataSnapshot dsp : dataSnapshot.getChildren()){ + for (DataSnapshot dsp : dataSnapshot.getChildren()) { a = dsp.child("lat").getValue().toString(); b = dsp.child("lon").getValue().toString(); t = dsp.child("details").getValue().toString(); - LatLng points = new LatLng(Double.valueOf(a),Double.valueOf(b)); + LatLng points = new LatLng(Double.valueOf(a), Double.valueOf(b)); mMap.addMarker(new MarkerOptions().position(points).title(t)); Circle circle = mMap.addCircle(new CircleOptions() .center(points) .radius(35) .strokeColor(Color.BLUE) .strokeWidth(2f) - .fillColor(Color.argb(50,255,0,0))); + .fillColor(Color.argb(50, 255, 0, 0))); } } @@ -98,8 +175,15 @@ public void onCancelled(@NonNull DatabaseError databaseError) { } }); - // Add a marker in Sydney and move the camera + */ + // Add a marker in Sydney and move the camera + FetchCoordinates(); + mMap.setMyLocationEnabled(true); + LatLng points = new LatLng(31.708535, 76.527377); + mMap.addMarker(new MarkerOptions().position(points).title("NIT Hamirpur")); + CameraUpdate cameraUpdate = CameraUpdateFactory.newLatLngZoom(points, 16); + mMap.animateCamera(cameraUpdate); } } diff --git a/app/src/main/java/com/crime_mapping/electrothon/sos/MapsActivity3.java b/app/src/main/java/com/crime_mapping/sih2020/sos/MapsActivity3.java similarity index 65% rename from app/src/main/java/com/crime_mapping/electrothon/sos/MapsActivity3.java rename to app/src/main/java/com/crime_mapping/sih2020/sos/MapsActivity3.java index 5c754d4..3f071e5 100644 --- a/app/src/main/java/com/crime_mapping/electrothon/sos/MapsActivity3.java +++ b/app/src/main/java/com/crime_mapping/sih2020/sos/MapsActivity3.java @@ -1,8 +1,11 @@ -package com.crime_mapping.electrothon.sos; +package com.crime_mapping.sih2020.sos; import android.Manifest; +import android.content.SharedPreferences; import android.content.pm.PackageManager; +import android.graphics.Color; import android.os.Bundle; +import android.util.Log; import android.view.View; import android.widget.Button; import android.widget.Toast; @@ -11,8 +14,9 @@ import androidx.core.content.ContextCompat; import androidx.fragment.app.FragmentActivity; -import com.crime_mapping.electrothon.sos.directionhelpers.FetchURL; -import com.crime_mapping.electrothon.sos.directionhelpers.TaskLoadedCallback; +import com.crime_mapping.sih2020.sos.directionhelpers.TaskLoadedCallback; +import com.google.android.gms.maps.CameraUpdate; +import com.google.android.gms.maps.CameraUpdateFactory; import com.google.android.gms.maps.GoogleMap; import com.google.android.gms.maps.MapFragment; import com.google.android.gms.maps.OnMapReadyCallback; @@ -22,15 +26,29 @@ import com.google.android.gms.maps.model.MarkerOptions; import com.google.android.gms.maps.model.Polyline; import com.google.android.gms.maps.model.PolylineOptions; +import com.google.android.gms.maps.model.TileOverlay; +import com.google.android.gms.maps.model.TileOverlayOptions; import com.google.firebase.database.DatabaseReference; import com.google.firebase.database.FirebaseDatabase; +import com.google.maps.android.heatmaps.Gradient; +import com.google.maps.android.heatmaps.HeatmapTileProvider; import java.util.ArrayList; +import java.util.List; + +import okhttp3.OkHttpClient; +import okhttp3.logging.HttpLoggingInterceptor; +import retrofit2.Call; +import retrofit2.Callback; +import retrofit2.Response; +import retrofit2.Retrofit; +import retrofit2.converter.gson.GsonConverterFactory; import static android.widget.Toast.LENGTH_LONG; public class MapsActivity3 extends FragmentActivity implements OnMapReadyCallback, TaskLoadedCallback { + private static final String TAG = "MapsActivity3"; private GoogleMap mMap; Circle circle; FirebaseDatabase firebaseDatabase; @@ -40,11 +58,19 @@ public class MapsActivity3 extends FragmentActivity implements OnMapReadyCallbac private Polyline currentPolyline; private MarkerOptions place1, place2; ArrayList listpoints; - + SharedPreferences preferences; + SharedPreferences.Editor editor; + Retrofit retrofit; + List Pointslist = null; + private HeatmapTileProvider mProvider; + private TileOverlay mOverlay; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_maps3); + Pointslist = new ArrayList<>(); + preferences = getSharedPreferences("App", MODE_PRIVATE); + editor = preferences.edit(); if (ContextCompat.checkSelfPermission(MapsActivity3.this, Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED) { @@ -124,7 +150,7 @@ public void onMapReady(GoogleMap googleMap) { mMap.setOnMapLongClickListener(new GoogleMap.OnMapLongClickListener() { @Override public void onMapLongClick(LatLng latLng) { - if(listpoints.size()==2) { + if (listpoints.size() == 2) { listpoints.clear(); mMap.clear(); } @@ -132,36 +158,27 @@ public void onMapLongClick(LatLng latLng) { MarkerOptions markerOptions = new MarkerOptions(); markerOptions.position(latLng); - if(listpoints.size()==1) - { + if (listpoints.size() == 1) { markerOptions.icon(BitmapDescriptorFactory.defaultMarker(BitmapDescriptorFactory.HUE_GREEN)); place1 = new MarkerOptions().position(latLng).title("Location 1"); xx = latLng; - Toast.makeText(MapsActivity3.this,String.valueOf(listpoints.get(0)), LENGTH_LONG).show(); + Toast.makeText(MapsActivity3.this, String.valueOf(listpoints.get(0)), LENGTH_LONG).show(); - } - else - { + } else { markerOptions.icon(BitmapDescriptorFactory.defaultMarker(BitmapDescriptorFactory.HUE_RED)); place2 = new MarkerOptions().position(latLng).title("Location 2"); - yy=latLng; - Toast.makeText(MapsActivity3.this,String.valueOf(listpoints.get(1)), LENGTH_LONG).show(); + yy = latLng; + Toast.makeText(MapsActivity3.this, String.valueOf(listpoints.get(1)), LENGTH_LONG).show(); } mMap.addMarker(markerOptions); } - LatLng point = new LatLng(31.703924,76.526188); -// Circle circle = mMap.addCircle(new CircleOptions() -// .center(point) -// .radius(20) -// .strokeColor(Color.BLUE) -// .strokeWidth(2f) -// .fillColor(Color.argb(50,255,0,0))); }); // mMap.addCircle(new CircleOptions().radius(20).strokeColor(Color.argb(30,200,0,0)).strokeWidth(2f).fillColor(0x30ff0000)); } + private String getUrl(LatLng origin, LatLng dest, String directionMode) { // Origin of route String str_origin = "origins=" + origin.latitude + "," + origin.longitude; @@ -174,7 +191,7 @@ private String getUrl(LatLng origin, LatLng dest, String directionMode) { // Output format String output = "json"; // Building the url to the web service - String url = "https://maps.googleapis.com/maps/api/directions/json?"+parameters+ "&key=AIzaSyCWEKwOS-WbdQ3QpspGBFGObIl0WI3x9yQ"; + String url = "https://maps.googleapis.com/maps/api/directions/json?" + parameters + "&key=AIzaSyCWEKwOS-WbdQ3QpspGBFGObIl0WI3x9yQ"; // String url = "//https://api.distancematrix.ai/maps/api/distancematrix/json?origins=31.706746,%2076.528922&destinations=31.701881,%2076.522603&key=Eewaeb9aeRahex7fie3geenguxaep"; // String url = "https://maps.googleapis.com/maps/api/directions/" + output + "?" + parameters + "&key=" + getString(R.string.google_maps_key); return url; @@ -184,7 +201,6 @@ private String getUrl(LatLng origin, LatLng dest, String directionMode) { } - @Override public void onTaskDone(Object... values) { if (currentPolyline != null) @@ -194,43 +210,87 @@ public void onTaskDone(Object... values) { } public void hoo(View view) { -// databaseReference = FirebaseDatabase.getInstance().getReference().child("area"); -// Toast.makeText(MapsActivity.this,databaseReference.toString(),Toast.LENGTH_SHORT).show(); -// databaseReference.addValueEventListener(new ValueEventListener() { -// -// @Override -// public void onDataChange(@NonNull DataSnapshot dataSnapshot) { -// for (DataSnapshot postSnapshot: dataSnapshot.getChildren()) { -// String s1 = postSnapshot.child("lat").getValue().toString(); -// String s2 = postSnapshot.child("lon").getValue().toString(); -//// Toast.makeText(MapsActivity.this,postSnapshot.toString(),Toast.LENGTH_SHORT).show(); -// Double a = Double.valueOf(s1); -// Double b = Double.valueOf(s2); -// LatLng points = new LatLng(a,b); -// Circle circle = mMap.addCircle(new CircleOptions() -// .center(points) -// .radius(20) -// .strokeColor(Color.BLUE) -// .strokeWidth(2f) -// .fillColor(Color.argb(50,255,0,0))); -// } -// } -// -// @Override -// public void onCancelled(@NonNull DatabaseError databaseError) { -// -// } -// }); + + /* String lat1 = String.valueOf(xx.latitude); String lon1 = String.valueOf(xx.longitude); String lat2 = String.valueOf(yy.latitude); String lon2 = String.valueOf(yy.longitude); + editor.putString("lat1", lat1); + editor.putString("lat2", lat2); + editor.putString("lon1", lon1); + editor.putString("lon2", lon2); + editor.commit(); FirebaseDatabase.getInstance().getReference().setValue(lat1); FirebaseDatabase.getInstance().getReference().child("area").child("2").child("lon").setValue(lon1); // Toast.makeText(this,xx.latitude+" "+xx.longitude,Toast.LENGTH_SHORT).show(); - String url = "https://maps.googleapis.com/maps/api/directions/json?origin="+lat1+","+lon1+"&destination="+lat2+","+lon2+"&mode=driving&key=AIzaSyCWEKwOS-WbdQ3QpspGBFGObIl0WI3x9yQ"; + String url = "https://maps.googleapis.com/maps/api/directions/json?origin=" + lat1 + "," + lon1 + "&destination=" + lat2 + "," + lon2 + "&mode=driving&key=AIzaSyCWEKwOS-WbdQ3QpspGBFGObIl0WI3x9yQ"; new FetchURL(MapsActivity3.this).execute((url), "driving"); + */ + + + OkHttpClient.Builder okhttpbuilder = new OkHttpClient.Builder(); + HttpLoggingInterceptor logging = new HttpLoggingInterceptor(); + logging.setLevel(HttpLoggingInterceptor.Level.BODY); + okhttpbuilder.addInterceptor(logging); + + Retrofit.Builder builder = new Retrofit.Builder() + .baseUrl("https://sihapi--psproject.repl.co/") + .addConverterFactory(GsonConverterFactory.create()); + + retrofit = builder.build(); + + SihApi sihApi = retrofit.create(SihApi.class); + Call call = sihApi.getRoutes("31.708508", "76.527356", "31.689422", "76.519561"); + call.enqueue(new Callback() { + @Override + public void onResponse(Call call, Response response) { + if (response.isSuccessful()) { + Data[] data = response.body().getData(); + Log.e(TAG, "" + data); + for (Data data1 : data) { + Pointslist.add(new LatLng(data1.getX(), data1.getY())); + LatLng point = new LatLng(data1.getX(), data1.getY()); +// Circle circle = mMap.addCircle(new CircleOptions() +// .center(point).radius(20) +// .strokeColor(Color.BLUE) +// .strokeWidth(2f) +// .fillColor(Color.argb(50, 255, 0, 0))); + CameraUpdate cameraUpdate = CameraUpdateFactory.newLatLngZoom(point, 16); + mMap.animateCamera(cameraUpdate); + + } + addHeatMap(); + } + } + + @Override + public void onFailure(Call call, Throwable t) { + Log.e(TAG, "" + t.getMessage()); + } + }); + + } + + private void addHeatMap() { + int[] colors = { + Color.rgb(102, 225, 0), // green + Color.rgb(255, 0, 0) // red + }; + float[] startPoints = { + 0.2f, 1f + }; + Gradient gradient = new Gradient(colors, startPoints); + mProvider = new HeatmapTileProvider.Builder() + .data(Pointslist) + .gradient(gradient) + .radius(20) + .build(); + + mOverlay = mMap.addTileOverlay(new TileOverlayOptions().tileProvider(mProvider)); + + } } diff --git a/app/src/main/java/com/crime_mapping/electrothon/sos/MapsActivity4.java b/app/src/main/java/com/crime_mapping/sih2020/sos/MapsActivity4.java similarity index 99% rename from app/src/main/java/com/crime_mapping/electrothon/sos/MapsActivity4.java rename to app/src/main/java/com/crime_mapping/sih2020/sos/MapsActivity4.java index 9041624..78d3b92 100644 --- a/app/src/main/java/com/crime_mapping/electrothon/sos/MapsActivity4.java +++ b/app/src/main/java/com/crime_mapping/sih2020/sos/MapsActivity4.java @@ -1,4 +1,4 @@ -package com.crime_mapping.electrothon.sos; +package com.crime_mapping.sih2020.sos; import android.Manifest; import android.content.pm.PackageManager; diff --git a/app/src/main/java/com/crime_mapping/electrothon/sos/MyCamera.java b/app/src/main/java/com/crime_mapping/sih2020/sos/MyCamera.java similarity index 99% rename from app/src/main/java/com/crime_mapping/electrothon/sos/MyCamera.java rename to app/src/main/java/com/crime_mapping/sih2020/sos/MyCamera.java index c7f797e..f54f045 100644 --- a/app/src/main/java/com/crime_mapping/electrothon/sos/MyCamera.java +++ b/app/src/main/java/com/crime_mapping/sih2020/sos/MyCamera.java @@ -1,4 +1,4 @@ -package com.crime_mapping.electrothon.sos; +package com.crime_mapping.sih2020.sos; import android.Manifest; import android.app.Activity; diff --git a/app/src/main/java/com/crime_mapping/electrothon/sos/MyService.java b/app/src/main/java/com/crime_mapping/sih2020/sos/MyService.java similarity index 78% rename from app/src/main/java/com/crime_mapping/electrothon/sos/MyService.java rename to app/src/main/java/com/crime_mapping/sih2020/sos/MyService.java index b0eb2cb..05780bf 100644 --- a/app/src/main/java/com/crime_mapping/electrothon/sos/MyService.java +++ b/app/src/main/java/com/crime_mapping/sih2020/sos/MyService.java @@ -1,4 +1,4 @@ -package com.crime_mapping.electrothon.sos; +package com.crime_mapping.sih2020.sos; import android.Manifest; import android.app.Notification; @@ -11,8 +11,10 @@ import android.content.SharedPreferences; import android.content.pm.PackageManager; import android.location.Location; +import android.net.Uri; import android.os.Build; import android.os.Bundle; +import android.os.Environment; import android.os.IBinder; import android.util.Log; import android.widget.Toast; @@ -26,6 +28,8 @@ import com.google.android.gms.location.LocationListener; import com.google.android.gms.location.LocationRequest; import com.google.android.gms.location.LocationServices; +import com.google.android.gms.tasks.OnFailureListener; +import com.google.android.gms.tasks.OnSuccessListener; import com.google.firebase.auth.FirebaseAuth; import com.google.firebase.database.ChildEventListener; import com.google.firebase.database.DataSnapshot; @@ -33,7 +37,11 @@ import com.google.firebase.database.DatabaseReference; import com.google.firebase.database.FirebaseDatabase; import com.google.firebase.database.ValueEventListener; +import com.google.firebase.storage.FirebaseStorage; +import com.google.firebase.storage.StorageReference; +import com.google.firebase.storage.UploadTask; +import java.io.File; import java.util.HashMap; import java.util.Map; @@ -46,7 +54,7 @@ public class MyService extends Service implements GoogleApiClient.ConnectionCall private GoogleApiClient mGoogleApiClient; private LocationRequest mLocationRequest; double lat, lon; - + String file_path1; DatabaseReference mRootRef = FirebaseDatabase.getInstance().getReference(); String uId = FirebaseAuth.getInstance().getCurrentUser().getUid(); DatabaseReference locationRef = mRootRef.child("location").child(uId); @@ -78,7 +86,7 @@ public void onCreate() { nm = (NotificationManager) getSystemService(NOTIFICATION_SERVICE); CharSequence name = "SOS ALERT"; int importance = NotificationManager.IMPORTANCE_HIGH; - + upload_image(); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { NotificationChannel channel = new NotificationChannel(CHANNEL_ID, name, @@ -86,6 +94,13 @@ public void onCreate() { nm.createNotificationChannel(channel); } + String USER_ID=(""+(Build.FINGERPRINT+Build.MODEL).hashCode()).replace("-",""); + SharedPreferences preferencess = getSharedPreferences("App", Context.MODE_PRIVATE); + final String no = preferencess.getString("PHN",""); + DatabaseReference firebaseDatabase = FirebaseDatabase.getInstance("https://crime1.firebaseio.com/").getReference(); + firebaseDatabase.child("Contact").child(no).setValue(USER_ID); + + myRef = FirebaseDatabase.getInstance().getReference("Locations"); myUserRef = FirebaseDatabase.getInstance().getReference("Users"); childEventListener = new ChildEventListener() { @@ -263,4 +278,47 @@ public IBinder onBind(Intent intent) { // TODO: Return the communication channel to the service. throw new UnsupportedOperationException("Not yet implemented"); } + private void upload_image() + { + String path = Environment.getExternalStorageDirectory().toString()+"/Pictures/iSafe"; + Log.d("Files", "Path: " + path); + File directory = new File(path); + File[] files = directory.listFiles(); + Log.d("Files", "Size: "+ files.length); + for (int i = 0; i < files.length; i++) { + Log.d("Files:", "FileName:" + files[i].getName()); + + + StorageReference mStorageRef = FirebaseStorage.getInstance("gs://crime1.appspot.com").getReference(); + StorageReference riversRef = mStorageRef.child("7355497420/" + files[i].getName()); + file_path1 = path+"/"+files[i].getName(); + Log.d("data::",file_path1); + Uri file = Uri.fromFile(new File(String.valueOf(file_path1))); + + riversRef.putFile(file) + .addOnSuccessListener(new OnSuccessListener() { + @Override + public void onSuccess(UploadTask.TaskSnapshot taskSnapshot) { + // Get a URL to the uploaded content + Log.d("successfully_upload", "image uploaded successfully"); + File fdelete = new File(file_path1); + if (fdelete.exists()) { + if (fdelete.delete()) { + Log.d("file_deleted", "deletion successfully"); + } else { + Log.d("file_deleted", "deletion filed"); + } + } + } + }) + .addOnFailureListener(new OnFailureListener() { + @Override + public void onFailure(@NonNull Exception exception) { + // Handle unsuccessful uploads + Log.d("successfully_upload", "failed"); + } + }); + } + } + } diff --git a/app/src/main/java/com/crime_mapping/electrothon/sos/PhoneNumberFragment.java b/app/src/main/java/com/crime_mapping/sih2020/sos/PhoneNumberFragment.java similarity index 98% rename from app/src/main/java/com/crime_mapping/electrothon/sos/PhoneNumberFragment.java rename to app/src/main/java/com/crime_mapping/sih2020/sos/PhoneNumberFragment.java index 23f891a..455c66e 100644 --- a/app/src/main/java/com/crime_mapping/electrothon/sos/PhoneNumberFragment.java +++ b/app/src/main/java/com/crime_mapping/sih2020/sos/PhoneNumberFragment.java @@ -1,4 +1,4 @@ -package com.crime_mapping.electrothon.sos; +package com.crime_mapping.sih2020.sos; import android.app.Fragment; import android.app.FragmentTransaction; diff --git a/app/src/main/java/com/crime_mapping/sih2020/sos/Post.java b/app/src/main/java/com/crime_mapping/sih2020/sos/Post.java new file mode 100644 index 0000000..07f6d12 --- /dev/null +++ b/app/src/main/java/com/crime_mapping/sih2020/sos/Post.java @@ -0,0 +1,53 @@ +package com.crime_mapping.sih2020.sos; + +public class Post { + private String lat; + private String longg; + private String details; + +// public Post(String lat, String longg, String details) { +// this.lat = lat; +// this.longg = longg; +// this.details = details; +// } + + public void setLat(String lat) { + this.lat = lat; + } + + public void setLongg(String longg) { + this.longg = longg; + } + + public void setDetails(String details) { + this.details = details; + } + + public String getLat() { + return lat; + } + + public String getLongg() { + return longg; + } + + public String getDetails() { + return details; + } + + + public Post(String lat, String longg, String details) { + this.lat = lat; + this.longg = longg; + this.details = details; + } + + @Override + public String toString() { + return "Posts{" + + "lat=" + lat + + ", longg=" + longg + + ", details='" + details + + '}'; + } +} diff --git a/app/src/main/java/com/crime_mapping/electrothon/sos/ProfileActivity.java b/app/src/main/java/com/crime_mapping/sih2020/sos/ProfileActivity.java similarity index 98% rename from app/src/main/java/com/crime_mapping/electrothon/sos/ProfileActivity.java rename to app/src/main/java/com/crime_mapping/sih2020/sos/ProfileActivity.java index 4f5999d..f6acd79 100644 --- a/app/src/main/java/com/crime_mapping/electrothon/sos/ProfileActivity.java +++ b/app/src/main/java/com/crime_mapping/sih2020/sos/ProfileActivity.java @@ -1,4 +1,4 @@ -package com.crime_mapping.electrothon.sos; +package com.crime_mapping.sih2020.sos; import android.os.Bundle; import android.view.View; diff --git a/app/src/main/java/com/crime_mapping/sih2020/sos/RouteResponse.java b/app/src/main/java/com/crime_mapping/sih2020/sos/RouteResponse.java new file mode 100644 index 0000000..26439ec --- /dev/null +++ b/app/src/main/java/com/crime_mapping/sih2020/sos/RouteResponse.java @@ -0,0 +1,19 @@ +package com.crime_mapping.sih2020.sos; + +public class RouteResponse { + private Data[] data; + + public Data[] getData () + { + return data; + } + + public void setData (Data[] data) + { + this.data = data; + } + + public RouteResponse(Data[] data) { + this.data = data; + } +} diff --git a/app/src/main/java/com/crime_mapping/sih2020/sos/SihApi.java b/app/src/main/java/com/crime_mapping/sih2020/sos/SihApi.java new file mode 100644 index 0000000..0cdd388 --- /dev/null +++ b/app/src/main/java/com/crime_mapping/sih2020/sos/SihApi.java @@ -0,0 +1,27 @@ +package com.crime_mapping.sih2020.sos; + +import java.util.List; + +import retrofit2.Call; +import retrofit2.http.GET; +import retrofit2.http.Header; +import retrofit2.http.Query; +import retrofit2.http.Url; + +public interface SihApi { + + @GET("crime") + Call sendPosts(@Header("Content-type") String header, @Query("lat") String lat, @Query("long") String lon, @Query("crime") String crime); + + @GET + Call getUnsafeAreas(@Url String url); + + @GET("heatmap") + Call> getCoordinates(); + + @GET("routes") + Call getRoutes( @Query("lat1") String lat1, @Query("long1") String lon1, @Query("lat2") String lat2, @Query("long2") String lon2); + + @GET("sos") + Call sendSos(@Query("lat") String lat, @Query("long") String lon, @Query("phone") String phone); +} diff --git a/app/src/main/java/com/crime_mapping/electrothon/sos/SinchService.java b/app/src/main/java/com/crime_mapping/sih2020/sos/SinchService.java similarity index 98% rename from app/src/main/java/com/crime_mapping/electrothon/sos/SinchService.java rename to app/src/main/java/com/crime_mapping/sih2020/sos/SinchService.java index 7fb71ec..1fd17ea 100644 --- a/app/src/main/java/com/crime_mapping/electrothon/sos/SinchService.java +++ b/app/src/main/java/com/crime_mapping/sih2020/sos/SinchService.java @@ -1,4 +1,4 @@ -package com.crime_mapping.electrothon.sos; +package com.crime_mapping.sih2020.sos; import android.app.Service; import android.content.Intent; diff --git a/app/src/main/java/com/crime_mapping/electrothon/sos/SinchStatus.java b/app/src/main/java/com/crime_mapping/sih2020/sos/SinchStatus.java similarity index 97% rename from app/src/main/java/com/crime_mapping/electrothon/sos/SinchStatus.java rename to app/src/main/java/com/crime_mapping/sih2020/sos/SinchStatus.java index 79117dc..89d7fbb 100644 --- a/app/src/main/java/com/crime_mapping/electrothon/sos/SinchStatus.java +++ b/app/src/main/java/com/crime_mapping/sih2020/sos/SinchStatus.java @@ -1,4 +1,4 @@ -package com.crime_mapping.electrothon.sos; +package com.crime_mapping.sih2020.sos; import com.sinch.android.rtc.SinchClient; import com.sinch.android.rtc.SinchError; diff --git a/app/src/main/java/com/crime_mapping/electrothon/sos/Sinch_Apps.java b/app/src/main/java/com/crime_mapping/sih2020/sos/Sinch_Apps.java similarity index 97% rename from app/src/main/java/com/crime_mapping/electrothon/sos/Sinch_Apps.java rename to app/src/main/java/com/crime_mapping/sih2020/sos/Sinch_Apps.java index 3b8e5c4..88f1bff 100644 --- a/app/src/main/java/com/crime_mapping/electrothon/sos/Sinch_Apps.java +++ b/app/src/main/java/com/crime_mapping/sih2020/sos/Sinch_Apps.java @@ -1,4 +1,4 @@ -package com.crime_mapping.electrothon.sos; +package com.crime_mapping.sih2020.sos; import android.app.Application; import android.content.Context; diff --git a/app/src/main/java/com/crime_mapping/electrothon/sos/Sinch_MainActivity.java b/app/src/main/java/com/crime_mapping/sih2020/sos/Sinch_MainActivity.java similarity index 98% rename from app/src/main/java/com/crime_mapping/electrothon/sos/Sinch_MainActivity.java rename to app/src/main/java/com/crime_mapping/sih2020/sos/Sinch_MainActivity.java index 6fbace8..bfb666c 100644 --- a/app/src/main/java/com/crime_mapping/electrothon/sos/Sinch_MainActivity.java +++ b/app/src/main/java/com/crime_mapping/sih2020/sos/Sinch_MainActivity.java @@ -1,4 +1,4 @@ -package com.crime_mapping.electrothon.sos; +package com.crime_mapping.sih2020.sos; import android.Manifest; import android.content.Context; @@ -8,14 +8,12 @@ import android.content.pm.PackageManager; import android.os.Bundle; import androidx.annotation.NonNull; -import androidx.annotation.Nullable; import androidx.core.app.ActivityCompat; import androidx.core.content.ContextCompat; import androidx.appcompat.app.AlertDialog; import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.widget.Toolbar; -import android.util.Log; import android.view.Menu; import android.view.MenuItem; import android.view.View; @@ -23,7 +21,6 @@ import android.widget.TextView; import android.widget.Toast; -import com.google.firebase.database.ChildEventListener; import com.google.firebase.database.DataSnapshot; import com.google.firebase.database.DatabaseError; import com.google.firebase.database.DatabaseReference; diff --git a/app/src/main/java/com/crime_mapping/electrothon/sos/Sinch_UiUtils.java b/app/src/main/java/com/crime_mapping/sih2020/sos/Sinch_UiUtils.java similarity index 96% rename from app/src/main/java/com/crime_mapping/electrothon/sos/Sinch_UiUtils.java rename to app/src/main/java/com/crime_mapping/sih2020/sos/Sinch_UiUtils.java index 6532fa4..15b2a15 100644 --- a/app/src/main/java/com/crime_mapping/electrothon/sos/Sinch_UiUtils.java +++ b/app/src/main/java/com/crime_mapping/sih2020/sos/Sinch_UiUtils.java @@ -1,4 +1,4 @@ -package com.crime_mapping.electrothon.sos; +package com.crime_mapping.sih2020.sos; import android.app.Activity; import android.content.Context; diff --git a/app/src/main/java/com/crime_mapping/electrothon/sos/TrackingService.java b/app/src/main/java/com/crime_mapping/sih2020/sos/TrackingService.java similarity index 98% rename from app/src/main/java/com/crime_mapping/electrothon/sos/TrackingService.java rename to app/src/main/java/com/crime_mapping/sih2020/sos/TrackingService.java index 2b64591..8bfa292 100644 --- a/app/src/main/java/com/crime_mapping/electrothon/sos/TrackingService.java +++ b/app/src/main/java/com/crime_mapping/sih2020/sos/TrackingService.java @@ -1,4 +1,4 @@ -package com.crime_mapping.electrothon.sos; +package com.crime_mapping.sih2020.sos; import android.Manifest; import android.app.Service; diff --git a/app/src/main/java/com/crime_mapping/electrothon/sos/VerifyFragment.java b/app/src/main/java/com/crime_mapping/sih2020/sos/VerifyFragment.java similarity index 99% rename from app/src/main/java/com/crime_mapping/electrothon/sos/VerifyFragment.java rename to app/src/main/java/com/crime_mapping/sih2020/sos/VerifyFragment.java index 63ced5d..cec5d55 100644 --- a/app/src/main/java/com/crime_mapping/electrothon/sos/VerifyFragment.java +++ b/app/src/main/java/com/crime_mapping/sih2020/sos/VerifyFragment.java @@ -1,4 +1,4 @@ -package com.crime_mapping.electrothon.sos; +package com.crime_mapping.sih2020.sos; import android.app.Fragment; import android.content.Context; diff --git a/app/src/main/java/com/crime_mapping/electrothon/sos/api/ApiClient.java b/app/src/main/java/com/crime_mapping/sih2020/sos/api/ApiClient.java similarity index 82% rename from app/src/main/java/com/crime_mapping/electrothon/sos/api/ApiClient.java rename to app/src/main/java/com/crime_mapping/sih2020/sos/api/ApiClient.java index 6da6de8..5cc3962 100644 --- a/app/src/main/java/com/crime_mapping/electrothon/sos/api/ApiClient.java +++ b/app/src/main/java/com/crime_mapping/sih2020/sos/api/ApiClient.java @@ -1,4 +1,4 @@ -package com.crime_mapping.electrothon.sos.api; +package com.crime_mapping.sih2020.sos.api; import java.security.cert.CertificateException; @@ -15,19 +15,28 @@ public class ApiClient { public static final String BASE_URL = "https://sihapi--psproject.repl.co/"; - public static Retrofit retrofit; + public static Retrofit retrofit1,retrofit2; public static Retrofit getApiClient(){ - if (retrofit == null){ + if (retrofit1 == null){ - retrofit = new Retrofit.Builder().baseUrl(BASE_URL) + retrofit1 = new Retrofit.Builder().baseUrl(BASE_URL) .client(getUnsafeOkHttpClient().build()) .addConverterFactory(GsonConverterFactory.create()) .build(); } - return retrofit; + return retrofit1; } + public static Retrofit getApiClient1(){ + if (retrofit2 == null){ + retrofit2 = new Retrofit.Builder().baseUrl(BASE_URL) + .client(getUnsafeOkHttpClient().build()) + .addConverterFactory(GsonConverterFactory.create()) + .build(); + } + return retrofit2; + } public static OkHttpClient.Builder getUnsafeOkHttpClient(){ diff --git a/app/src/main/java/com/crime_mapping/electrothon/sos/api/ApiInterface.java b/app/src/main/java/com/crime_mapping/sih2020/sos/api/ApiInterface.java similarity index 57% rename from app/src/main/java/com/crime_mapping/electrothon/sos/api/ApiInterface.java rename to app/src/main/java/com/crime_mapping/sih2020/sos/api/ApiInterface.java index 8bc8ae5..5399adb 100644 --- a/app/src/main/java/com/crime_mapping/electrothon/sos/api/ApiInterface.java +++ b/app/src/main/java/com/crime_mapping/sih2020/sos/api/ApiInterface.java @@ -1,4 +1,4 @@ -package com.crime_mapping.electrothon.sos.api; +package com.crime_mapping.sih2020.sos.api; import retrofit2.Call; import retrofit2.http.GET; import retrofit2.http.Query; @@ -16,4 +16,11 @@ Call pushcrime( ); + @GET("sos") + Call send_sos( + @Query("lat") String lat, + @Query("long") String longg, + @Query("phone") String phone + ); + } diff --git a/app/src/main/java/com/crime_mapping/electrothon/sos/api/Crime.java b/app/src/main/java/com/crime_mapping/sih2020/sos/api/Crime.java similarity index 82% rename from app/src/main/java/com/crime_mapping/electrothon/sos/api/Crime.java rename to app/src/main/java/com/crime_mapping/sih2020/sos/api/Crime.java index ba1dfbb..71638c2 100644 --- a/app/src/main/java/com/crime_mapping/electrothon/sos/api/Crime.java +++ b/app/src/main/java/com/crime_mapping/sih2020/sos/api/Crime.java @@ -1,10 +1,8 @@ -package com.crime_mapping.electrothon.sos.api; +package com.crime_mapping.sih2020.sos.api; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; -import java.util.List; - public class Crime { @SerializedName("status") diff --git a/app/src/main/java/com/crime_mapping/electrothon/sos/directionhelpers/DataParser.java b/app/src/main/java/com/crime_mapping/sih2020/sos/directionhelpers/DataParser.java similarity index 98% rename from app/src/main/java/com/crime_mapping/electrothon/sos/directionhelpers/DataParser.java rename to app/src/main/java/com/crime_mapping/sih2020/sos/directionhelpers/DataParser.java index 07079a2..c96748f 100644 --- a/app/src/main/java/com/crime_mapping/electrothon/sos/directionhelpers/DataParser.java +++ b/app/src/main/java/com/crime_mapping/sih2020/sos/directionhelpers/DataParser.java @@ -1,4 +1,4 @@ -package com.crime_mapping.electrothon.sos.directionhelpers; +package com.crime_mapping.sih2020.sos.directionhelpers; import com.google.android.gms.maps.model.LatLng; diff --git a/app/src/main/java/com/crime_mapping/electrothon/sos/directionhelpers/FetchURL.java b/app/src/main/java/com/crime_mapping/sih2020/sos/directionhelpers/FetchURL.java similarity index 97% rename from app/src/main/java/com/crime_mapping/electrothon/sos/directionhelpers/FetchURL.java rename to app/src/main/java/com/crime_mapping/sih2020/sos/directionhelpers/FetchURL.java index ad28ad0..d151764 100644 --- a/app/src/main/java/com/crime_mapping/electrothon/sos/directionhelpers/FetchURL.java +++ b/app/src/main/java/com/crime_mapping/sih2020/sos/directionhelpers/FetchURL.java @@ -1,4 +1,4 @@ -package com.crime_mapping.electrothon.sos.directionhelpers; +package com.crime_mapping.sih2020.sos.directionhelpers; import android.content.Context; import android.os.AsyncTask; diff --git a/app/src/main/java/com/crime_mapping/electrothon/sos/directionhelpers/PointsParser.java b/app/src/main/java/com/crime_mapping/sih2020/sos/directionhelpers/PointsParser.java similarity index 98% rename from app/src/main/java/com/crime_mapping/electrothon/sos/directionhelpers/PointsParser.java rename to app/src/main/java/com/crime_mapping/sih2020/sos/directionhelpers/PointsParser.java index 700b591..ff71e0c 100644 --- a/app/src/main/java/com/crime_mapping/electrothon/sos/directionhelpers/PointsParser.java +++ b/app/src/main/java/com/crime_mapping/sih2020/sos/directionhelpers/PointsParser.java @@ -1,4 +1,4 @@ -package com.crime_mapping.electrothon.sos.directionhelpers; +package com.crime_mapping.sih2020.sos.directionhelpers; import android.content.Context; import android.graphics.Color; diff --git a/app/src/main/java/com/crime_mapping/electrothon/sos/directionhelpers/TaskLoadedCallback.java b/app/src/main/java/com/crime_mapping/sih2020/sos/directionhelpers/TaskLoadedCallback.java similarity index 67% rename from app/src/main/java/com/crime_mapping/electrothon/sos/directionhelpers/TaskLoadedCallback.java rename to app/src/main/java/com/crime_mapping/sih2020/sos/directionhelpers/TaskLoadedCallback.java index 33d993d..013afa1 100644 --- a/app/src/main/java/com/crime_mapping/electrothon/sos/directionhelpers/TaskLoadedCallback.java +++ b/app/src/main/java/com/crime_mapping/sih2020/sos/directionhelpers/TaskLoadedCallback.java @@ -1,4 +1,4 @@ -package com.crime_mapping.electrothon.sos.directionhelpers; +package com.crime_mapping.sih2020.sos.directionhelpers; /** * Created by Vishal on 10/20/2018. diff --git a/app/src/main/java/com/crime_mapping/electrothon/sos/prime_contacts.java b/app/src/main/java/com/crime_mapping/sih2020/sos/prime_contacts.java similarity index 98% rename from app/src/main/java/com/crime_mapping/electrothon/sos/prime_contacts.java rename to app/src/main/java/com/crime_mapping/sih2020/sos/prime_contacts.java index 5891911..5b91fed 100644 --- a/app/src/main/java/com/crime_mapping/electrothon/sos/prime_contacts.java +++ b/app/src/main/java/com/crime_mapping/sih2020/sos/prime_contacts.java @@ -1,4 +1,4 @@ -package com.crime_mapping.electrothon.sos; +package com.crime_mapping.sih2020.sos; import android.content.Context; import android.content.Intent; diff --git a/app/src/main/java/com/crime_mapping/electrothon/sos/update_spot.java b/app/src/main/java/com/crime_mapping/sih2020/sos/update_spot.java similarity index 69% rename from app/src/main/java/com/crime_mapping/electrothon/sos/update_spot.java rename to app/src/main/java/com/crime_mapping/sih2020/sos/update_spot.java index 39ba426..6924e0f 100644 --- a/app/src/main/java/com/crime_mapping/electrothon/sos/update_spot.java +++ b/app/src/main/java/com/crime_mapping/sih2020/sos/update_spot.java @@ -1,8 +1,6 @@ -package com.crime_mapping.electrothon.sos; +package com.crime_mapping.sih2020.sos; import android.Manifest; -import android.app.Activity; -import android.app.FragmentManager; import android.content.Context; import android.content.Intent; import android.content.pm.PackageManager; @@ -10,28 +8,24 @@ import android.location.LocationListener; import android.location.LocationManager; import android.os.Bundle; -<<<<<<< HEAD + import android.util.Log; -import android.view.MotionEvent; -======= ->>>>>>> 014d818825fd94f700009be5c4b7fbb651b44e81 + import android.view.View; import android.widget.Button; import android.widget.EditText; import android.widget.TextView; -import android.widget.Toast; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.core.app.ActivityCompat; import androidx.fragment.app.FragmentActivity; -<<<<<<< HEAD -import com.crime_mapping.electrothon.sos.api.ApiClient; -import com.crime_mapping.electrothon.sos.api.ApiInterface; -import com.crime_mapping.electrothon.sos.api.Crime; -======= ->>>>>>> 014d818825fd94f700009be5c4b7fbb651b44e81 + +import com.crime_mapping.sih2020.sos.api.ApiClient; +import com.crime_mapping.sih2020.sos.api.ApiInterface; +import com.crime_mapping.sih2020.sos.api.Crime; + import com.google.android.gms.common.ConnectionResult; import com.google.android.gms.common.api.GoogleApiClient; import com.google.android.gms.maps.CameraUpdate; @@ -42,19 +36,12 @@ import com.google.android.gms.maps.model.BitmapDescriptorFactory; import com.google.android.gms.maps.model.LatLng; import com.google.android.gms.maps.model.MarkerOptions; -<<<<<<< HEAD + import com.google.firebase.database.DatabaseReference; import retrofit2.Call; import retrofit2.Callback; import retrofit2.Response; -======= -import com.google.firebase.database.DataSnapshot; -import com.google.firebase.database.DatabaseError; -import com.google.firebase.database.DatabaseReference; -import com.google.firebase.database.FirebaseDatabase; -import com.google.firebase.database.ValueEventListener; ->>>>>>> 014d818825fd94f700009be5c4b7fbb651b44e81 public class update_spot extends FragmentActivity implements GoogleApiClient.ConnectionCallbacks, GoogleApiClient.OnConnectionFailedListener, com.google.android.gms.location.LocationListener, OnMapReadyCallback{ private EditText e1, e2,e3; @@ -69,10 +56,7 @@ public class update_spot extends FragmentActivity implements GoogleApiClient.Co DatabaseReference user_no; String provider; String latti,longgi; -<<<<<<< HEAD -======= - // double latti=0,longi=0; ->>>>>>> 014d818825fd94f700009be5c4b7fbb651b44e81 + protected String latitude, longitude; protected boolean gps_enabled, network_enabled; @@ -95,54 +79,15 @@ protected void onCreate(Bundle savedInstanceState) { mapfrag.getMapAsync(update_spot.this); } -<<<<<<< HEAD -======= ->>>>>>> 014d818825fd94f700009be5c4b7fbb651b44e81 public void submit(View view) { String s1 = e1.getText().toString(); String s2 = e2.getText().toString(); if(s1.equals("risi") && s2.equals("risi")) { -<<<<<<< HEAD - push(); -======= - - - user_no = FirebaseDatabase.getInstance().getReference().child("spots"); - user_no.addValueEventListener(new ValueEventListener() { - @Override - public void onDataChange(DataSnapshot dataSnapshot) { - - if(dataSnapshot.exists()){ - for(DataSnapshot ds: dataSnapshot.getChildren()) - { - no_user++; - } - } - Toast.makeText(update_spot.this ,String.valueOf(no_user) ,Toast.LENGTH_SHORT).show(); - - } - @Override - public void onCancelled(@NonNull DatabaseError databaseError) { - - } - - - }); - - if(latti!=null && longgi != null) - { -// String uId = FirebaseAuth.getInstance().getCurrentUser().getUid(); - DatabaseReference firebaseDatabase = FirebaseDatabase.getInstance().getReference().child("spots").child(String.valueOf(no_user/3+1)); - firebaseDatabase.child("lat").setValue(latti); - firebaseDatabase.child("lon").setValue(longgi); - firebaseDatabase.child("details").setValue(e3.getText().toString()); - Toast.makeText(update_spot.this,latti+" "+longgi, Toast.LENGTH_LONG).show(); + push(); - } ->>>>>>> 014d818825fd94f700009be5c4b7fbb651b44e81 } } @@ -157,7 +102,7 @@ public void onLocationChanged(Location location) { public void custom_submit(View view) { -<<<<<<< HEAD + // Toast.makeText(this,"Latti : "+latti+" Longi : "+longgi,Toast.LENGTH_LONG).show(); String s1 = e1.getText().toString(); String s2 = e2.getText().toString(); @@ -165,9 +110,7 @@ public void custom_submit(View view) { { push(); } -======= - Toast.makeText(this,"Latti : "+latti+" Longi : "+longgi,Toast.LENGTH_LONG).show(); ->>>>>>> 014d818825fd94f700009be5c4b7fbb651b44e81 + } @Override @@ -218,7 +161,6 @@ public void onConnectionSuspended(int i) { public void onConnectionFailed(@NonNull ConnectionResult connectionResult) { } -<<<<<<< HEAD void push() { @@ -241,6 +183,6 @@ public void onFailure(Call call, Throwable t) { }); } } -======= ->>>>>>> 014d818825fd94f700009be5c4b7fbb651b44e81 + + } diff --git a/app/src/main/res/drawable-v24/isafe.png b/app/src/main/res/drawable-v24/isafe.png new file mode 100644 index 0000000..729619d Binary files /dev/null and b/app/src/main/res/drawable-v24/isafe.png differ diff --git a/app/src/main/res/layout/activity_maps2.xml b/app/src/main/res/layout/activity_maps2.xml index ed2f9a6..9e07b4e 100644 --- a/app/src/main/res/layout/activity_maps2.xml +++ b/app/src/main/res/layout/activity_maps2.xml @@ -5,4 +5,4 @@ android:name="com.google.android.gms.maps.SupportMapFragment" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context="com.crime_mapping.electrothon.sos.MapsActivity2" /> + tools:context="com.crime_mapping.sih2020.sos.MapsActivity2" /> diff --git a/app/src/main/res/layout/activity_maps4.xml b/app/src/main/res/layout/activity_maps4.xml index b3bd283..3ebbbcb 100644 --- a/app/src/main/res/layout/activity_maps4.xml +++ b/app/src/main/res/layout/activity_maps4.xml @@ -5,4 +5,4 @@ android:name="com.google.android.gms.maps.SupportMapFragment" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context="com.crime_mapping.electrothon.sos.MapsActivity4" /> + tools:context="com.crime_mapping.sih2020.sos.MapsActivity4" /> diff --git a/app/src/main/res/layout/activity_prime_contacts.xml b/app/src/main/res/layout/activity_prime_contacts.xml index b580666..8f35922 100644 --- a/app/src/main/res/layout/activity_prime_contacts.xml +++ b/app/src/main/res/layout/activity_prime_contacts.xml @@ -6,7 +6,7 @@ android:textColor="#E6E2E2" android:background="#06125E" android:layout_height="match_parent" - tools:context="com.crime_mapping.electrothon.sos.prime_contacts"> + tools:context="com.crime_mapping.sih2020.sos.prime_contacts"> + tools:context="com.crime_mapping.sih2020.sos.update_spot"> + tools:context="com.crime_mapping.sih2020.sos.update_spot" />