diff --git a/GSKMTOrange/build.gradle b/GSKMTOrange/build.gradle index 8981aea..992b4e6 100644 --- a/GSKMTOrange/build.gradle +++ b/GSKMTOrange/build.gradle @@ -21,20 +21,20 @@ android { targetSdkVersion 22 //For Egypt - /*versionCode 20 - versionName "3.2"*/ + /*versionCode 20 + versionName "3.2"*/ //For UAE /*versionCode 18 versionName "3.0"*/ //For Turkey - versionCode 19 - versionName "3.1" + /*versionCode 19 + versionName "3.1"*/ //For KSA - /*versionCode 21 - versionName "3.3"*/ + versionCode 21 + versionName "3.3" multiDexEnabled true diff --git a/GSKMTOrange/src/main/AndroidManifest.xml b/GSKMTOrange/src/main/AndroidManifest.xml index df65ef7..0130118 100644 --- a/GSKMTOrange/src/main/AndroidManifest.xml +++ b/GSKMTOrange/src/main/AndroidManifest.xml @@ -237,6 +237,7 @@ 0) { + if (validateData(question_list)) { - db.saveAuditQuestionAnswerData(question_list, store_id, categoryId); - finish(); - overridePendingTransition(R.anim.activity_back_in, R.anim.activity_back_out); - } - }) - .setNegativeButton(R.string.no, new DialogInterface.OnClickListener() { - public void onClick(DialogInterface dialog, int id) { - dialog.cancel(); - } - }); - AlertDialog alert = builder.create(); - alert.show(); - } else { - questionAdapter.notifyDataSetChanged(); - Snackbar.make(recyclerView, error_msg, Snackbar.LENGTH_SHORT).show(); + AlertDialog.Builder builder = new AlertDialog.Builder(AuditActivity.this); + builder.setMessage(R.string.title_activity_Want_save) + .setCancelable(false) + .setPositiveButton(R.string.yes, new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int id) { + + db.saveAuditQuestionAnswerData(question_list, store_id, categoryId); + finish(); + overridePendingTransition(R.anim.activity_back_in, R.anim.activity_back_out); + } + }) + .setNegativeButton(R.string.no, new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int id) { + dialog.cancel(); + } + }); + AlertDialog alert = builder.create(); + alert.show(); + } else { + questionAdapter.notifyDataSetChanged(); + Snackbar.make(recyclerView, error_msg, Snackbar.LENGTH_SHORT).show(); + } } + else { + Snackbar.make(recyclerView, getString(R.string.NodataAvailable), Snackbar.LENGTH_SHORT).show(); + } + } }); } @@ -472,7 +493,7 @@ public class AuditActivity extends AppCompatActivity { } else if (data.get(i).getCAMERA_ALLOW().equals("1") && data.get(i).getNO_OF_CAMERA().equals("2") && data.get(i).getCAM_IMAGE2().equals("")) { error_msg = getString(R.string.click_image); checkflag = false; - }else { + } else { checkflag = true; } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/DeliveryCallActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/DeliveryCallActivity.java index 0eb7ac0..68740ed 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/DeliveryCallActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/DeliveryCallActivity.java @@ -273,6 +273,8 @@ public class DeliveryCallActivity extends AppCompatActivity implements View.OnCl + "[OUT_TIME]" + _deliveryCallsList.get(i).getOut_time() + "[/OUT_TIME]" + "[IN_TIME_IMAGE]" + _deliveryCallsList.get(i).getIN_TIME_IMAGE() + "[/IN_TIME_IMAGE]" + "[OUT_TIME_IMAGE]" + _deliveryCallsList.get(i).getOUT_TIME_IMAGE()+ "[/OUT_TIME_IMAGE]" + + "[LATITUDE]" + _deliveryCallsList.get(i).getLATITUDE()+ "[/LATITUDE]" + + "[LONGITUDE]" + _deliveryCallsList.get(i).getLONGITUDE()+ "[/LONGITUDE]" + "[/DELIVERY_CALLS_DATA]"; final String delivery_xml = "[DATA]" + onXML + "[/DATA]"; diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/DeliveryCallAddStoreActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/DeliveryCallAddStoreActivity.java index 4801bd3..925586c 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/DeliveryCallAddStoreActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/DeliveryCallAddStoreActivity.java @@ -1,26 +1,49 @@ package cpm.com.gskmtorange.dailyentry; +import android.Manifest; +import android.app.Activity; +import android.app.AlertDialog; import android.content.ActivityNotFoundException; +import android.content.Context; +import android.content.DialogInterface; import android.content.Intent; +import android.content.IntentSender; import android.content.SharedPreferences; import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; +import android.location.Location; +import android.location.LocationManager; import android.net.Uri; import android.os.Build; import android.os.Bundle; import android.preference.PreferenceManager; import android.provider.MediaStore; +import android.provider.Settings; import android.support.design.widget.BaseTransientBottomBar; import android.support.design.widget.FloatingActionButton; import android.support.design.widget.Snackbar; +import android.support.v4.content.ContextCompat; import android.support.v7.app.AppCompatActivity; import android.support.v7.widget.Toolbar; import android.util.Log; import android.view.View; import android.widget.EditText; import android.widget.ImageView; +import android.widget.Toast; import com.crashlytics.android.Crashlytics; +import com.google.android.gms.common.ConnectionResult; +import com.google.android.gms.common.GooglePlayServicesUtil; +import com.google.android.gms.common.api.GoogleApiClient; +import com.google.android.gms.common.api.PendingResult; +import com.google.android.gms.common.api.ResultCallback; +import com.google.android.gms.common.api.Status; +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.location.LocationSettingsRequest; +import com.google.android.gms.location.LocationSettingsResult; +import com.google.android.gms.location.LocationSettingsStatusCodes; import java.io.File; import java.util.List; @@ -31,7 +54,7 @@ import cpm.com.gskmtorange.constant.CommonFunctions; import cpm.com.gskmtorange.constant.CommonString; import cpm.com.gskmtorange.xmlGetterSetter.DeliveryCallsGetterSetter; -public class DeliveryCallAddStoreActivity extends AppCompatActivity implements View.OnClickListener{ +public class DeliveryCallAddStoreActivity extends AppCompatActivity implements View.OnClickListener, GoogleApiClient.ConnectionCallbacks, GoogleApiClient.OnConnectionFailedListener, LocationListener { EditText et_customer, et_address; ImageView img_checkin, img_checkout; @@ -44,6 +67,22 @@ public class DeliveryCallAddStoreActivity extends AppCompatActivity implements V private GSKOrangeDB database; DeliveryCallsGetterSetter deliveryCallsData; + LocationManager locationManager; + boolean enabled; + private final static int PLAY_SERVICES_RESOLUTION_REQUEST = 1000; + + private LocationRequest mLocationRequest; + private static int UPDATE_INTERVAL = 500; // 5 sec + private static int FATEST_INTERVAL = 100; // 1 sec + private static int DISPLACEMENT = 5; // 10 meters + private static final int REQUEST_LOCATION = 1; + private Location mLastLocation; + + double lat = 0.0, lon = 0.0; + GoogleApiClient mGoogleApiClient; + private static final String TAG = DeliveryCallAddStoreActivity.class.getSimpleName(); + Context context; + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -54,6 +93,8 @@ public class DeliveryCallAddStoreActivity extends AppCompatActivity implements V database = new GSKOrangeDB(this); database.open(); + context = this; + et_customer = findViewById(R.id.et_customer_name); et_address = findViewById(R.id.et_address); img_checkin = findViewById(R.id.img_checkin); @@ -87,16 +128,23 @@ public class DeliveryCallAddStoreActivity extends AppCompatActivity implements V if(checkin_flag){ - DeliveryCallsGetterSetter deliveryCallsGetterSetter = new DeliveryCallsGetterSetter(); - deliveryCallsGetterSetter.setSTORE_NAME(name); - deliveryCallsGetterSetter.setADDRESS(address); - deliveryCallsGetterSetter.setIN_TIME_IMAGE(img_checkin_path); - deliveryCallsGetterSetter.setOUT_TIME_IMAGE(img_checkout_path); - deliveryCallsGetterSetter.setUPLOAD_STATUS(CommonString.KEY_CHECK_IN); - deliveryCallsGetterSetter.setVISIT_DATE(visit_date); - deliveryCallsGetterSetter.setIn_time(in_time); + if(lat == 0.0 || lon == 0.0){ - database.InsertDeliveryCalls(deliveryCallsGetterSetter); + } + else { + DeliveryCallsGetterSetter deliveryCallsGetterSetter = new DeliveryCallsGetterSetter(); + deliveryCallsGetterSetter.setSTORE_NAME(name); + deliveryCallsGetterSetter.setADDRESS(address); + deliveryCallsGetterSetter.setIN_TIME_IMAGE(img_checkin_path); + deliveryCallsGetterSetter.setOUT_TIME_IMAGE(img_checkout_path); + deliveryCallsGetterSetter.setUPLOAD_STATUS(CommonString.KEY_CHECK_IN); + deliveryCallsGetterSetter.setVISIT_DATE(visit_date); + deliveryCallsGetterSetter.setIn_time(in_time); + deliveryCallsGetterSetter.setLATITUDE(lat); + deliveryCallsGetterSetter.setLONGITUDE(lon); + + database.InsertDeliveryCalls(deliveryCallsGetterSetter); + } } else { @@ -114,6 +162,128 @@ public class DeliveryCallAddStoreActivity extends AppCompatActivity implements V }); str = CommonString.FILE_PATH; + + if (checkPlayServices()) { + + // Building the GoogleApi client + buildGoogleApiClient(); + + createLocationRequest(); + } + + /* locationManager = (LocationManager) getSystemService(Context.LOCATION_SERVICE); + enabled = locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER); + + if (!enabled) { + AlertDialog.Builder alertDialog = new AlertDialog.Builder( + DeliveryCallAddStoreActivity.this); + + // Setting Dialog Title + alertDialog.setTitle(getResources().getString(R.string.gps)); + + // Setting Dialog Message + alertDialog.setMessage(getResources().getString(R.string.gpsebale)); + + // Setting Positive "Yes" Button + alertDialog.setPositiveButton(getResources().getString(R.string.yes), + new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int which) { + + Intent intent = new Intent( + Settings.ACTION_LOCATION_SOURCE_SETTINGS); + startActivity(intent); + } + }); + + // Setting Negative "NO" Button + alertDialog.setNegativeButton(getResources().getString(R.string.no), + new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int which) { + // Write your code here to invoke NO event + + dialog.cancel(); + } + }); + + // Showing Alert Message + alertDialog.show(); + + }*/ + + // Create an instance of GoogleAPIClient. + if (mGoogleApiClient == null) { + mGoogleApiClient = new GoogleApiClient.Builder(this) + .addConnectionCallbacks(this) + .addOnConnectionFailedListener(this) + .addApi(LocationServices.API) + .build(); + } + } + + @Override + protected void onResume() { + super.onResume(); + + + checkgpsEnableDevice(); + // Resuming the periodic location updates + if (mGoogleApiClient.isConnected()) { + startLocationUpdates(); + } + } + + private boolean checkgpsEnableDevice() { + boolean flag = true; + if (!hasGPSDevice(context)) { + Toast.makeText(context, "Gps not Supported",Toast.LENGTH_SHORT).show(); + } + final LocationManager manager = (LocationManager) getSystemService(Context.LOCATION_SERVICE); + if (!manager.isProviderEnabled(LocationManager.GPS_PROVIDER) && hasGPSDevice(context)) { + enableLoc(); + flag = false; + } else if (manager.isProviderEnabled(LocationManager.GPS_PROVIDER) && hasGPSDevice(context)) { + flag = true; + } + return flag; + } + + private boolean hasGPSDevice(Context context) { + final LocationManager mgr = (LocationManager) context.getSystemService(Context.LOCATION_SERVICE); + if (mgr == null) + return false; + final List providers = mgr.getAllProviders(); + if (providers == null) + return false; + return providers.contains(LocationManager.GPS_PROVIDER); + } + + private void enableLoc() { + LocationRequest locationRequest = LocationRequest.create(); + locationRequest.setPriority(LocationRequest.PRIORITY_HIGH_ACCURACY); + locationRequest.setInterval(30 * 1000); + locationRequest.setFastestInterval(5 * 1000); + LocationSettingsRequest.Builder builder = new LocationSettingsRequest.Builder().addLocationRequest(locationRequest); + builder.setAlwaysShow(true); + if (mGoogleApiClient != null) { + PendingResult result = LocationServices.SettingsApi.checkLocationSettings(mGoogleApiClient, builder.build()); + result.setResultCallback(new ResultCallback() { + @Override + public void onResult(LocationSettingsResult result) { + final Status status = result.getStatus(); + switch (status.getStatusCode()) { + case LocationSettingsStatusCodes.RESOLUTION_REQUIRED: + try { + // Show the dialog by calling startResolutionForResult(), + // and check the result in onActivityResult(). + status.startResolutionForResult((Activity) context, REQUEST_LOCATION); + } catch (IntentSender.SendIntentException e) { + // Ignore the error. + } + break; + } + } + }); + } } protected boolean isValid(){ @@ -137,7 +307,7 @@ public class DeliveryCallAddStoreActivity extends AppCompatActivity implements V } } else if(img_checkout_path.equals("")){ - error_msg = getString(R.string.please_click) + " "+ getString(R.string.intime_image).toLowerCase(); + error_msg = getString(R.string.please_click) + " "+ getString(R.string.outtime_image).toLowerCase(); flag = false; } @@ -261,4 +431,128 @@ public class DeliveryCallAddStoreActivity extends AppCompatActivity implements V } } + + private boolean checkPlayServices() { + int resultCode = GooglePlayServicesUtil + .isGooglePlayServicesAvailable(this); + if (resultCode != ConnectionResult.SUCCESS) { + if (GooglePlayServicesUtil.isUserRecoverableError(resultCode)) { + GooglePlayServicesUtil.getErrorDialog(resultCode, this, + PLAY_SERVICES_RESOLUTION_REQUEST).show(); + } else { + Toast.makeText(getApplicationContext(), getResources().getString(R.string.notsuppoted) + , Toast.LENGTH_LONG) + .show(); + finish(); + } + return false; + } + return true; + } + + protected synchronized void buildGoogleApiClient() { + mGoogleApiClient = new GoogleApiClient.Builder(this) + .addConnectionCallbacks(this) + .addOnConnectionFailedListener(this) + .addApi(LocationServices.API).build(); + } + + + protected void createLocationRequest() { + mLocationRequest = new LocationRequest(); + mLocationRequest.setInterval(UPDATE_INTERVAL); + mLocationRequest.setFastestInterval(FATEST_INTERVAL); + mLocationRequest.setPriority(LocationRequest.PRIORITY_HIGH_ACCURACY); + mLocationRequest.setSmallestDisplacement(DISPLACEMENT); + } + + protected void startLocationUpdates() { + + + if (ContextCompat.checkSelfPermission(this, Manifest.permission.ACCESS_FINE_LOCATION) == PackageManager.PERMISSION_GRANTED + || ContextCompat.checkSelfPermission(this, Manifest.permission.ACCESS_COARSE_LOCATION) == PackageManager.PERMISSION_GRANTED) { + + LocationServices.FusedLocationApi.requestLocationUpdates(mGoogleApiClient, mLocationRequest, this); + + } + + } + + /** + * Stopping location updates + */ + protected void stopLocationUpdates() { + LocationServices.FusedLocationApi.removeLocationUpdates(mGoogleApiClient, this); + } + + @Override + public void onConnected(Bundle bundle) { + + mLastLocation = LocationServices.FusedLocationApi.getLastLocation(mGoogleApiClient); + + if (ContextCompat.checkSelfPermission(this, Manifest.permission.ACCESS_FINE_LOCATION) == PackageManager.PERMISSION_GRANTED + || ContextCompat.checkSelfPermission(this, Manifest.permission.ACCESS_COARSE_LOCATION) == PackageManager.PERMISSION_GRANTED) { + if (mLastLocation != null) { + lat = mLastLocation.getLatitude(); + lon = mLastLocation.getLongitude(); + + } + } + + + // if (mRequestingLocationUpdates) { + startLocationUpdates(); + // } + + // startLocationUpdates(); + } + + @Override + public void onConnectionSuspended(int i) { + mGoogleApiClient.connect(); + } + + + @Override + public void onConnectionFailed(ConnectionResult connectionResult) { + Log.i(TAG, "Connection failed: ConnectionResult.getErrorCode() = " + connectionResult.getErrorCode()); + } + + + protected void onStart() { + super.onStart();// ATTENTION: This was auto-generated to implement the App Indexing API. +// See https://g.co/AppIndexing/AndroidStudio for more information. + //client.connect(); + if (mGoogleApiClient != null) { + mGoogleApiClient.connect(); + } + // ATTENTION: This was auto-generated to implement the App Indexing API. + // See https://g.co/AppIndexing/AndroidStudio for more information. + // AppIndex.AppIndexApi.start(client, getIndexApiAction()); + } + + + @Override + protected void onStop() { + super.onStop();// ATTENTION: This was auto-generated to implement the App Indexing API. +// See https://g.co/AppIndexing/AndroidStudio for more information. + // AppIndex.AppIndexApi.end(client, getIndexApiAction()); + /* if (mGoogleApiClient.isConnected()) { + mGoogleApiClient.disconnect(); + }*/ + // ATTENTION: This was auto-generated to implement the App Indexing API. + // See https://g.co/AppIndexing/AndroidStudio for more information. + //client.disconnect(); + } + + @Override + protected void onPause() { + super.onPause(); + //stopLocationUpdates(); + } + + @Override + public void onLocationChanged(Location location) { + + } } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java index 285917c..d8fc4e0 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java @@ -171,6 +171,15 @@ public class StoreListActivity extends AppCompatActivity implements GoogleApiCli createLocationRequest(); } + // Create an instance of GoogleAPIClient. + if (mGoogleApiClient == null) { + mGoogleApiClient = new GoogleApiClient.Builder(this) + .addConnectionCallbacks(this) + .addOnConnectionFailedListener(this) + .addApi(LocationServices.API) + .build(); + } + } private boolean checkPlayServices() { diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreimageActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreimageActivity.java index c7e79de..250c642 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreimageActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreimageActivity.java @@ -196,6 +196,7 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic // Write your code here to invoke NO event dialog.cancel(); + finish(); } }); diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryListActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryListActivity.java index ca875a4..fea40d6 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryListActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryListActivity.java @@ -24,6 +24,7 @@ import android.widget.TextView; import java.util.ArrayList; import java.util.Collections; +import java.util.Iterator; import java.util.List; import java.util.Locale; @@ -31,6 +32,8 @@ import cpm.com.gskmtorange.Database.GSKOrangeDB; import cpm.com.gskmtorange.R; import cpm.com.gskmtorange.constant.CommonFunctions; import cpm.com.gskmtorange.constant.CommonString; +import cpm.com.gskmtorange.xmlGetterSetter.AdditionalQuestiongetterSetter; +import cpm.com.gskmtorange.xmlGetterSetter.AuditDataGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.CategoryGetterSetter; public class CategoryListActivity extends AppCompatActivity { @@ -158,12 +161,17 @@ public class CategoryListActivity extends AppCompatActivity { } } - if (flag) - if(db.getAuditCategoryWise(category_id,storeType_id).size()>0){ + if (flag){ - if(db.getAfterSaveAuditQuestionAnswerData(store_id, category_id).size() == 0){ - flag = false; + //changed on 23.10.2018 + ArrayList question_list = getAuditAfterDeletion(category_id); + if(question_list.size()>0){ + + if(db.getAfterSaveAuditQuestionAnswerData(store_id, category_id).size() == 0){ + flag = false; + + } } } @@ -198,6 +206,26 @@ public class CategoryListActivity extends AppCompatActivity { } + ArrayList getAuditAfterDeletion(String category_id){ + ArrayList question_list = db.getAuditCategoryWise(category_id,storeType_id); + + Iterator iterator = question_list.iterator(); + while (iterator.hasNext()) { + AuditDataGetterSetter item = iterator.next(); // must be called before you can call iterator.remove() + // Check condition + if (!item.getKEYACCOUNT_ID().equals("0") && !item.getKEYACCOUNT_ID().equals(keyAccount_id)) { + iterator.remove(); + } else if (!item.getCHECK_TYPE().equals("NA") && item.getCHECK_TYPE().equals("T2P")) { + + if (!db.isMappingT2PData(store_id, category_id)) { + iterator.remove(); + } + } + } + + return question_list; + } + @Override public boolean onCreateOptionsMenu(Menu menu) { // Inflate the menu; this adds items to the action bar if it is present. @@ -358,7 +386,7 @@ public class CategoryListActivity extends AppCompatActivity { } } - if(db.getAuditCategoryWise(category_id, storeType_id).size()>0){ + if(getAuditAfterDeletion(category_id).size()>0){ if(db.getAfterSaveAuditQuestionAnswerData(store_id, category_id).size() == 0){ flag_filled = false; diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/DeliveryCallsGetterSetter.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/DeliveryCallsGetterSetter.java index d98bece..6f41973 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/DeliveryCallsGetterSetter.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/DeliveryCallsGetterSetter.java @@ -5,6 +5,7 @@ import java.io.Serializable; public class DeliveryCallsGetterSetter implements Serializable{ String STORE_NAME, ADDRESS, IN_TIME_IMAGE, OUT_TIME_IMAGE, UPLOAD_STATUS, VISIT_DATE, id, in_time, out_time; + double LATITUDE, LONGITUDE; public String getSTORE_NAME() { return STORE_NAME; @@ -77,4 +78,20 @@ public class DeliveryCallsGetterSetter implements Serializable{ public void setOut_time(String out_time) { this.out_time = out_time; } + + public double getLATITUDE() { + return LATITUDE; + } + + public void setLATITUDE(double LATITUDE) { + this.LATITUDE = LATITUDE; + } + + public double getLONGITUDE() { + return LONGITUDE; + } + + public void setLONGITUDE(double LONGITUDE) { + this.LONGITUDE = LONGITUDE; + } } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlHandlers/XMLHandlers.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlHandlers/XMLHandlers.java index 0630737..16087f9 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlHandlers/XMLHandlers.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlHandlers/XMLHandlers.java @@ -1051,7 +1051,7 @@ public class XMLHandlers { if (xpp.getName().equals("NO_OF_CAMERA")) { st.setNO_OF_CAMERA(xpp.nextText()); } - if (xpp.getName().equals("TYPE")) { + if (xpp.getName().equals("QTYPE")) { st.setTYPE(xpp.nextText()); } } diff --git a/GSKMTOrange/src/main/res/layout/content_audit.xml b/GSKMTOrange/src/main/res/layout/content_audit.xml index 3dca8cb..6ef9438 100644 --- a/GSKMTOrange/src/main/res/layout/content_audit.xml +++ b/GSKMTOrange/src/main/res/layout/content_audit.xml @@ -26,11 +26,81 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="5dp" - android:layout_marginRight="5dp" - /> + android:layout_marginRight="5dp" /> + + + + + + + + + + + + + + + + + + + + -