Ats id added while listening TAGS

Author: samirapporio

ats-sdk/src/main/java/com/apporioinfolabs/ats_sdk/AtsTagListener.java

@@ -5,7 +5,7 @@
 public interface AtsTagListener {
     void onSuccess(String message); // 1
     void onFailed(String message);  // 2
-    void onAdd(Location location);  // 3
-    void onChange(Location location); // 4
-    void onRemove(Location location); // 5
+    void onAdd(Location location, String atsId);  // 3
+    void onChange(Location location, String atsId); // 4
+    void onRemove(Location location, String atsId); // 5
 }

ats-sdk/src/main/java/com/apporioinfolabs/ats_sdk/managers/SocketManager.java

@@ -284,7 +284,7 @@ public void call(Object... args) {
                         ModelResultChecker modelResultChecker = ATS.gson.fromJson(""+args[0],ModelResultChecker.class);
                         if(modelResultChecker.getResult() == 1){
                             ModelTagListener modelTagListener = ATS.gson.fromJson(""+args[0],ModelTagListener.class);
-                            handlerForAtsTagListener(""+modelResultChecker.getMessage(), atsTagListener,1);
+                            handlerForAtsTagListener(""+modelResultChecker.getMessage(),"", atsTagListener,1);
 
                             String tagListening = ATS.mBuilder.mApplication.getSharedPreferences(ATSConstants.PREFRENCES, Context.MODE_PRIVATE).getString(ATSConstants.KEYS.LISTEN_TAG,"NA");
                             if(!tagListening.equals("NA")){  mSocket.off(""+modelTagListener.getResponse().get(0).getUls()); }
@@ -296,28 +296,29 @@ public void call(Object... args) {
                             mSocket.on(modelTagListener.getResponse().get(0).getUls(), new Emitter.Listener() {
                                 @Override
                                 public void call(Object... args) {
+                                    Log.e(TAG , "&&  &&  "+args[0]);
                                     ModelEmitterbyTagData modelEmitterbyTagData = ATS.gson.fromJson(""+args[0],ModelEmitterbyTagData.class);
                                     if(modelEmitterbyTagData.getType().equals("ADD")){
-                                        handlerForAtsTagListener(""+modelEmitterbyTagData.getData(), atsTagListener,3);
+                                        handlerForAtsTagListener(""+modelEmitterbyTagData.getData(),modelEmitterbyTagData.getAts_id(), atsTagListener,3);
                                     }if(modelEmitterbyTagData.getType().equals("CHANGE")){
-                                        handlerForAtsTagListener(""+modelEmitterbyTagData.getData(), atsTagListener,4);
+                                        handlerForAtsTagListener(""+modelEmitterbyTagData.getData(),modelEmitterbyTagData.getAts_id(), atsTagListener,4);
                                     }if(modelEmitterbyTagData.getType().equals("REMOVE")){
-                                        handlerForAtsTagListener(""+modelEmitterbyTagData.getData(), atsTagListener,5);
+                                        handlerForAtsTagListener(""+modelEmitterbyTagData.getData(),modelEmitterbyTagData.getAts_id(), atsTagListener,5);
                                     }
 
                                 }
                             });
 
                         }else if(modelResultChecker.getResult() == 0){
-                            handlerForAtsTagListener(""+modelResultChecker.getMessage(), atsTagListener,2);
+                            handlerForAtsTagListener(""+modelResultChecker.getMessage(), "", atsTagListener,2);
                         }
                     }
                 });
             }else{
-                handlerForAtsTagListener("You are not connected with the server.", atsTagListener, 2);
+                handlerForAtsTagListener("You are not connected with the server.", "", atsTagListener, 2);
             }
         }catch (Exception e){
-            handlerForAtsTagListener("Exception: "+e.getMessage(), atsTagListener, 2);
+            handlerForAtsTagListener("Exception: "+e.getMessage(), "", atsTagListener, 2);
         }
     }
 
@@ -471,7 +472,7 @@ public void run() {
     }
 
 
-    private static void handlerForAtsTagListener(final String message , final AtsTagListener atsTagListener , int type){
+    private static void handlerForAtsTagListener(final String message, final String driverAtsid , final AtsTagListener atsTagListener , int type){
         if(type == 1){  // on success
             mHandler.post(new Runnable() {
                 @Override
@@ -498,7 +499,7 @@ public void run() {
                     location.setLongitude(Double.parseDouble(""+splitter[1]));
                     location.setAccuracy(Float.parseFloat(""+splitter[2]));
                     location.setBearing(Float.parseFloat(""+splitter[3]));
-                    atsTagListener.onAdd(location);
+                    atsTagListener.onAdd(location, ""+driverAtsid);
                 }
             });
 
@@ -512,7 +513,7 @@ public void run() {
                     location.setLongitude(Double.parseDouble(""+splitter[1]));
                     location.setAccuracy(Float.parseFloat(""+splitter[2]));
                     location.setBearing(Float.parseFloat(""+splitter[3]));
-                    atsTagListener.onChange(location);
+                    atsTagListener.onChange(location, ""+driverAtsid);
                 }
             });
 
@@ -526,7 +527,7 @@ public void run() {
                     location.setLongitude(Double.parseDouble(""+splitter[1]));
                     location.setAccuracy(Float.parseFloat(""+splitter[2]));
                     location.setBearing(Float.parseFloat(""+splitter[3]));
-                    atsTagListener.onRemove(location);
+                    atsTagListener.onRemove(location, ""+driverAtsid);
                 }
             });
 

ats-sdk/src/main/java/com/apporioinfolabs/ats_sdk/models/ModelEmitterbyTagData.java

@@ -4,11 +4,13 @@ public class ModelEmitterbyTagData {
 
     /**
      * type : CHANGE
-     * data : 28.4123607_77.0440434_26.633_239.1835_1584084003151_18_1_AAAA_5e4e21de577d8b1accd4f76f
+     * data : 28.4123757_77.0440817_17.54_0.0_1584094056507_6_1_AAAA_5e4e21de577d8b1accd4f76f
+     * ats_id : f3254a3671d22b88_com.apporio.secondapp
      */
 
     private String type;
     private String data;
+    private String ats_id;
 
     public String getType() {
         return type;
@@ -25,4 +27,12 @@ public String getData() {
     public void setData(String data) {
         this.data = data;
     }
+
+    public String getAts_id() {
+        return ats_id;
+    }
+
+    public void setAts_id(String ats_id) {
+        this.ats_id = ats_id;
+    }
 }