Skip to content

Commit

Permalink
scenemarkManifest eventtypes added
Browse files Browse the repository at this point in the history
  • Loading branch information
@vyaskhyati
vyaskhyati committed Nov 8, 2021
1 parent 46b3227 commit 4448ddc
Show file tree
Hide file tree
Showing 4 changed files with 151 additions and 12 deletions.
10 changes: 10 additions & 0 deletions app/src/main/java/com/scenera/nicesecurityapplib/interfaces/ServiceInterfaces.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@


import com.scenera.nicesecurityapplib.models.response.AddFaceResponse;
import com.scenera.nicesecurityapplib.models.response.AllItemTypesResponse;
import com.scenera.nicesecurityapplib.models.response.AppConrolObjectResponse;
import com.scenera.nicesecurityapplib.models.response.EncryptedCMFResponse;
import com.scenera.nicesecurityapplib.models.response.GetDevicesResponse;
Expand Down Expand Up @@ -44,6 +45,15 @@ Call<ArrayList<String>> getNiceItemTypes(@Header("Authorization") String auth,

}

public interface GetAllTypeList {

@Headers("Content-Type:application/json")
@GET("/{Version}/"+ Constants.ServiceType.GET_ALL_TYPES_LIST)
Call<AllItemTypesResponse> getAllTypes(@Header("Authorization") String auth,
@Path("Version") String version);

}

public interface GetAppControlObject {

@Headers("Content-Type:application/json")
Expand Down
34 changes: 34 additions & 0 deletions app/src/main/java/com/scenera/nicesecurityapplib/models/response/AllItemTypesResponse.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
package com.scenera.nicesecurityapplib.models.response;

import com.google.gson.annotations.Expose;
import com.google.gson.annotations.SerializedName;

import java.util.ArrayList;
import java.util.Map;

public class AllItemTypesResponse {

@SerializedName("NICEItemTypes")
@Expose
private ArrayList<String> nICEItemTypes;

@SerializedName("EventTypes")
@Expose
private ArrayList<String> eventTypes;

public ArrayList<String> getnICEItemTypes() {
return nICEItemTypes;
}

public void setnICEItemTypes(ArrayList<String> nICEItemTypes) {
this.nICEItemTypes = nICEItemTypes;
}

public ArrayList<String> getEventTypes() {
return eventTypes;
}

public void setEventTypes(ArrayList<String> eventTypes) {
this.eventTypes = eventTypes;
}
}
3 changes: 3 additions & 0 deletions app/src/main/java/com/scenera/nicesecurityapplib/utilities/Constants.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ public static class ServiceType {
public static final String DELETE_DEVICE_TOKEN = "deletedevicetoken";
public static final String GET_PRIVACY_OBJECT = "GetPrivacyObject";
public static final String GET_NICE_ITEM_TYPES_LIST = "GetNICEItemTypes";
public static final String GET_ALL_TYPES_LIST = "getalltypes";

/*********** SceneMarks CMF Version 1.02*********/
// public static final String GET_SCENEMARK_MANIFEST_CMF = "GetSceneMarkManifestCMF";
Expand Down Expand Up @@ -187,6 +188,7 @@ public static class Params {
public static final String START_TIME = "StartTime";
public static final String END_TIME = "EndTime";
public static final String NICE_ITEM_TYPES = "ListNICEItemTypes";
public static final String EVENT_TYPES = "ListEventTypes";
public static final String CONTINUATION_TOKEN = "ContinuationToken";

public static final String NICE_LINK_APP = "niceLinkApp";
Expand Down Expand Up @@ -283,6 +285,7 @@ public static class Method {
public static final int GET_SCENEMARKS_MANIFEST = 1;
public static final int GET_EVENT_DATES = 2;
public static final int GET_NICEITEMTYPES_LIST = 3;
public static final int GET_ALLTYPES_LIST = 12;
public static final int GET_LIVE_SCENEMARKS = 4;
public static final int GET_CURATION_LIVE = 5;
public static final int ADD_TOKEN_TO_SERVER = 6;
Expand Down
116 changes: 104 additions & 12 deletions app/src/main/java/com/scenera/nicesecurityapplib/viewmodel/MainViewModel.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
import com.scenera.nicesecurityapplib.models.data.NodeList;
import com.scenera.nicesecurityapplib.models.data.PersonFace;
import com.scenera.nicesecurityapplib.models.response.AddFaceResponse;
import com.scenera.nicesecurityapplib.models.response.AllItemTypesResponse;
import com.scenera.nicesecurityapplib.models.response.AppConrolObjectResponse;
import com.scenera.nicesecurityapplib.models.response.AppSecurityObjectResponse;
import com.scenera.nicesecurityapplib.models.response.EncryptedCMFResponse;
Expand All @@ -36,6 +37,7 @@
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Base64;
import java.util.Collection;
import java.util.Date;
import java.util.HashMap;

Expand Down Expand Up @@ -73,7 +75,9 @@ public class MainViewModel extends ViewModel {
private MutableLiveData<SceneMarkResponseCMF> sceneMarkResponseLive;

private MutableLiveData<ArrayList<String>> niceItemTypesLiveData;
private MutableLiveData<AllItemTypesResponse> allTypesLiveData;
private ArrayList<String> niceItemTypes;
private ArrayList<String> eventTypes;

private MutableLiveData<ArrayList<NodeList>> nodeListLiveData;
private ArrayList<NodeList> nodeList;
Expand All @@ -100,9 +104,11 @@ public MainViewModel() {
sceneMarkResponseLive = new MutableLiveData<>();

sceneMarkResponse = new SceneMarkResponseCMF();
allTypesLiveData = new MutableLiveData();

niceItemTypesLiveData = new MutableLiveData<>();
niceItemTypes = new ArrayList<String>();
eventTypes = new ArrayList<String>();

nodeListLiveData = new MutableLiveData<>();
nodeList = new ArrayList<>();
Expand Down Expand Up @@ -133,6 +139,11 @@ public MutableLiveData<ArrayList<String>> getNiceItemTypes() {
Log.d(TAG,"getNiceItemTypesMutableLiveData: " + niceItemTypesLiveData);
return niceItemTypesLiveData;
}
/** get AllTypes List **/
public MutableLiveData<AllItemTypesResponse> getAllTypes() {
Log.d(TAG,"getNiceItemTypesMutableLiveData: " + allTypesLiveData);
return allTypesLiveData;
}

/** get SceneMarksManifest **/
public MutableLiveData<GetSceneMarkManifestResponse> getSceneMarkManifestLiveData() {
Expand Down Expand Up @@ -231,7 +242,7 @@ public void onFailure(Call<GetDevicesResponse> call, Throwable t) {
getAppControlObject(pHelper.getAppSecurityObject(),activity,
Constants.Method.GET_NODE_LIST, new ArrayList<String>(),"","",
0, false, false,
false, new ArrayList<String>(), "", "","", "","", "");
false, new ArrayList<String>(),new ArrayList<String>(), "", "","", "","", "");
}
}catch (Exception et){
et.printStackTrace();
Expand All @@ -242,7 +253,7 @@ public void onFailure(Call<GetDevicesResponse> call, Throwable t) {
/** get SceneMarksManifest **/
public MutableLiveData<GetSceneMarkManifestResponse> getSceneMarksManifest(AppCompatActivity activity, ArrayList<String> nodeIds,String startTime, String endTime,
int pageLength, boolean returnNiceItemTypes, boolean returnSceneMarksDates,
boolean returnPage, ArrayList<String> niceItemList, String continuationToken) {
boolean returnPage, ArrayList<String> niceItemList, ArrayList<String> eventList,String continuationToken) {
pHelper = PreferenceHelper.getInstance(activity);
if(isTokenNotExpired()) {
JSONObject jsonObject = new JSONObject();
Expand Down Expand Up @@ -270,6 +281,17 @@ public MutableLiveData<GetSceneMarkManifestResponse> getSceneMarksManifest(AppCo
JSONArray niceItemArray = new JSONArray();
jsonObject.put(Constants.Params.NICE_ITEM_TYPES, niceItemArray);
}
/*Filter by EVENT_TYPES*/
if (eventList.size() > 0) {
JSONArray eventItemArray = new JSONArray();
for (int i = 0; i < eventList.size(); i++) {
eventItemArray.put(eventList.get(i));
}
jsonObject.put(Constants.Params.EVENT_TYPES, eventItemArray);
} else {
JSONArray eventItemArray = new JSONArray();
jsonObject.put(Constants.Params.EVENT_TYPES, eventItemArray);
}
AppLog.Log("continuationTokenMain=> ", continuationToken);
jsonObject.put(Constants.Params.CONTINUATION_TOKEN, continuationToken);
AppLog.Log("jsonObject => ", jsonObject.toString());
Expand Down Expand Up @@ -330,15 +352,15 @@ public void onFailure(Call<GetSceneMarkManifestResponse> call, Throwable t) {
getAppControlObject(pHelper.getAppSecurityObject(),activity,
Constants.Method.GET_SCENEMARKS_MANIFEST, nodeIds,startTime,endTime,
pageLength, returnNiceItemTypes, returnSceneMarksDates,
returnPage, niceItemList, continuationToken, "","", "", "", "");
returnPage, niceItemList, eventList, continuationToken, "","", "", "", "");
}
return sceneMarkManifestLiveData;
}

/** Get Event Dates For SceneMarks for selected month..**/
public MutableLiveData<ArrayList<String>> getEventDates(AppCompatActivity activity, ArrayList<String> nodeIds,String startTime, String endTime,
int pageLength, boolean returnNiceItemTypes, boolean returnSceneMarksDates,
boolean returnPage, ArrayList<String> niceItemList, String continuationToken) {
boolean returnPage, ArrayList<String> niceItemList, ArrayList<String> eventList, String continuationToken) {
pHelper = PreferenceHelper.getInstance(activity);
if (isTokenNotExpired()) {
JSONObject jsonObject = new JSONObject();
Expand Down Expand Up @@ -366,6 +388,18 @@ public MutableLiveData<ArrayList<String>> getEventDates(AppCompatActivity activi
JSONArray niceItemArray = new JSONArray();
jsonObject.put(Constants.Params.NICE_ITEM_TYPES, niceItemArray);
}

/*Filter by EVENT_TYPES*/
if (eventList.size() > 0) {
JSONArray eventItemArray = new JSONArray();
for (int i = 0; i < eventList.size(); i++) {
eventItemArray.put(eventList.get(i));
}
jsonObject.put(Constants.Params.EVENT_TYPES, eventItemArray);
} else {
JSONArray eventItemArray = new JSONArray();
jsonObject.put(Constants.Params.EVENT_TYPES, eventItemArray);
}
AppLog.Log("continuationTokenMain=> ", continuationToken);
jsonObject.put(Constants.Params.CONTINUATION_TOKEN, continuationToken);
AppLog.Log("jsonObject => ", jsonObject.toString());
Expand Down Expand Up @@ -418,7 +452,7 @@ public void onFailure(Call<GetSceneMarkManifestResponse> call, Throwable t) {
getAppControlObject(pHelper.getAppSecurityObject(),activity,
Constants.Method.GET_SCENEMARKS_MANIFEST, nodeIds,startTime,endTime,
pageLength, returnNiceItemTypes, returnSceneMarksDates,
returnPage, niceItemList, continuationToken, "","", "", "", "");
returnPage, niceItemList, eventList, continuationToken, "","", "", "", "");
return null;
}
}
Expand Down Expand Up @@ -481,7 +515,7 @@ public void onFailure(Call<SceneMarkResponseCMF> call, Throwable t) {
getAppControlObject(pHelper.getAppSecurityObject(),activity,
Constants.Method.GET_CURATION_LIVE, new ArrayList<String>(),"","",
0, false, false,
false, new ArrayList<String>(), "",
false, new ArrayList<String>(),new ArrayList<String>(), "",
sceneMarkURI, "", "", deviceName, deviceTimeZone);
}
return null;
Expand Down Expand Up @@ -537,11 +571,66 @@ public void onFailure(Call<ArrayList<String>> call, Throwable t) {
getAppControlObject(pHelper.getAppSecurityObject(),activity,
Constants.Method.GET_NICEITEMTYPES_LIST, new ArrayList<String>(),"","",
0, false, false,
false, new ArrayList<String>(), "", "","", "","", "");
false, new ArrayList<String>(),new ArrayList<String>(), "", "","", "","", "");
}
return niceItemTypesLiveData;
}

/** Get NiceItemTypes List **/
public MutableLiveData<AllItemTypesResponse> getAllTypesList(AppCompatActivity activity) {

pHelper = PreferenceHelper.getInstance(activity);

if(isTokenNotExpired()) {
String accessToken = pHelper.getAppControlObject().getPayload().getDataEndPoints().get(0).getNetEndPointAppControl().getSchemeAppControlObject().get(0).getAccessToken();
String authority = "https://" + pHelper.getAppControlObject().getPayload().getDataEndPoints().get(0).getNetEndPointAppControl().getSchemeAppControlObject().get(0).getAuthority();

niceItemTypes.clear();

ServiceInterfaces.GetAllTypeList api = ApiClient.getClient(activity, authority).create(ServiceInterfaces.GetAllTypeList.class);

Call<AllItemTypesResponse> call = api.getAllTypes("Bearer " + accessToken,
pHelper.getAppControlObject().getPayload().getControlEndPoints().get(0).getNetEndPointAppControl().getAPIVersion());

call.enqueue(new Callback<AllItemTypesResponse>() {
@Override
public void onResponse(Call<AllItemTypesResponse> call, retrofit2.Response<AllItemTypesResponse> response) {

Log.i("url", "AllItemTypes URL------->>>> " + response.raw().request().url());
if (!response.equals("{}") && response != null && response.body() != null) {
if (response.body() != null) {

Log.d("AllItemTypesList==> ", response.body() + "");

niceItemTypes.addAll(response.body().getnICEItemTypes());
eventTypes.addAll(response.body().getEventTypes());
allTypesLiveData.setValue(response.body());

}
} else {
Utils.removeCustomProgressDialog();

}
}

@Override
public void onFailure(Call<AllItemTypesResponse> call, Throwable t) {
t.printStackTrace();
Utils.removeCustomProgressDialog();
Log.i("onFailure", "EventDatesResponse ---->>>> " + t.toString());

}
});
}else {
getAppControlObject(pHelper.getAppSecurityObject(),activity,
Constants.Method.GET_ALLTYPES_LIST, new ArrayList<String>(),"","",
0, false, false,
false, new ArrayList<String>(),new ArrayList<String>(), "", "","", "","", "");
}
return allTypesLiveData;
}


/** get LiveSceneMarks from SceneMarksManifest **/
public MutableLiveData<SceneMarkResponseCMF> getLiveSceneMarks(AppCompatActivity activity, String sceneMarkURI) {
pHelper = PreferenceHelper.getInstance(activity);
Expand Down Expand Up @@ -579,7 +668,7 @@ public void onFailure(Call<SceneMarkResponseCMF> call, Throwable t) {
getAppControlObject(pHelper.getAppSecurityObject(),activity,
Constants.Method.GET_LIVE_SCENEMARKS, new ArrayList<String>(),"","",
0, false, false,
false, new ArrayList<String>(), "",
false, new ArrayList<String>(),new ArrayList<String>(), "",
sceneMarkURI, "", "","", "");
}
return sceneMarkResponseLive;
Expand Down Expand Up @@ -713,7 +802,7 @@ public void onFailure(Call<EncryptedCMFResponse> call, Throwable t) {
getAppControlObject(pHelper.getAppSecurityObject(),activity,
Constants.Method.GET_PRIVACY_OBJECT, new ArrayList<String>(),"","",
0, false, false,
false, new ArrayList<String>(), "",
false, new ArrayList<String>(),new ArrayList<String>(), "",
"", currentDate, sceneEncryptionKeyID,"", "");
}
}
Expand Down Expand Up @@ -804,7 +893,7 @@ private boolean isTokenNotExpired(){
private void getAppControlObject(AppSecurityObjectResponse appSecurityObject,
AppCompatActivity activity, int method, ArrayList<String> nodeIds,String startTime, String endTime,
int pageLength, boolean returnNiceItemTypes, boolean returnSceneMarksDates,
boolean returnPage, ArrayList<String> niceItemList, String continuationToken,
boolean returnPage, ArrayList<String> niceItemList, ArrayList<String> eventList,String continuationToken,
String sceneMarkURI, String currentDateString, String sceneEncryptionKeyID,
String deviceName, String deviceTimeZone) {
Utils.showCustomProgressDialog(activity, "", false);
Expand Down Expand Up @@ -896,16 +985,19 @@ public void onResponse(Call<EncryptedCMFResponse> call, retrofit2.Response<Encry
case Constants.Method.GET_SCENEMARKS_MANIFEST:
getSceneMarksManifest(activity, nodeIds, startTime, endTime,
pageLength, returnNiceItemTypes, returnSceneMarksDates,
returnPage, niceItemList, continuationToken);
returnPage, niceItemList,eventList, continuationToken);
break;
case Constants.Method.GET_EVENT_DATES:
getEventDates(activity, nodeIds, startTime, endTime,
pageLength, returnNiceItemTypes, returnSceneMarksDates,
returnPage, niceItemList, continuationToken);
returnPage, niceItemList, eventList, continuationToken);
break;
case Constants.Method.GET_NICEITEMTYPES_LIST:
getNiceItemTypesList(activity);
break;
case Constants.Method.GET_ALLTYPES_LIST:
getAllTypesList(activity);
break;
case Constants.Method.GET_LIVE_SCENEMARKS:
getLiveSceneMarks(activity, sceneMarkURI);
break;
Expand Down

0 comments on commit 4448ddc

Please sign in to comment.