Skip to content

Commit

Permalink
added curation data method
Browse files Browse the repository at this point in the history
  • Loading branch information
vyaskhyati committed Apr 26, 2021
1 parent 3896a58 commit 95a3204
Showing 1 changed file with 59 additions and 12 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,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>(), "", "","", "","", "");
}
}catch (Exception et){
et.printStackTrace();
Expand Down Expand Up @@ -313,7 +313,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, continuationToken, "","", "", "", "");
}
return sceneMarkManifestLiveData;
}
Expand Down Expand Up @@ -401,12 +401,58 @@ 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, continuationToken, "","", "", "", "");
return null;
}
}


/** get LiveSceneMarks from SceneMarksManifest api V1.02**/
public MutableLiveData<ArrayList<SceneMarkResponseCMF>> getCurationLive(AppCompatActivity activity, String sceneMarkURI, final String deviceName, String deviceTimeZone) {
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();
ServiceInterfaces.GetSceneMarks api = ApiClient.getClient(activity,authority).create(ServiceInterfaces.GetSceneMarks.class);
Call<SceneMarkResponseCMF> call = api.getSceneMarks("Bearer "+ accessToken, sceneMarkURI);

call.enqueue(new Callback<SceneMarkResponseCMF>() {
@Override
public void onResponse(Call<SceneMarkResponseCMF> call, retrofit2.Response<SceneMarkResponseCMF> response) {
Log.i("url", "---->>> getSceneMarks" + response.raw().request().url());

if (response.body() != null && response.body().getDetectedObjects().size() > 0) {

Log.i("response body", "---->>>> " + response.body());
response.body().setDeviceName(deviceName);
response.body().setDeviceTimeZone(deviceTimeZone);

alertArrayList.add(response.body());
alertLiveData.setValue(alertArrayList);

}else{
Utils.removeCustomProgressDialog();
// Utils.showAlert(activity, activity.getResources().getString(R.string.text_error_no_scenemarks));
}
}
@Override
public void onFailure(Call<SceneMarkResponseCMF> call, Throwable t) {
Utils.removeCustomProgressDialog();
Log.i("onFailure", "---->>>> " + t.toString());
}
});
return alertLiveData;
}else {
getAppControlObject(pHelper.getAppSecurityObject(),activity,
Constants.Method.GET_CURATION_LIVE, new ArrayList<String>(),"","",
0, false, false,
false, new ArrayList<String>(), "",
sceneMarkURI, "", "", deviceName, deviceTimeZone);
}
return null;
}

/** Get NiceItemTypes List **/
public MutableLiveData<ArrayList<String>> getNiceItemTypesList(AppCompatActivity activity) {

Expand Down Expand Up @@ -457,7 +503,7 @@ 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>(), "", "","", "","", "");
}
return niceItemTypesLiveData;
}
Expand Down Expand Up @@ -500,7 +546,7 @@ public void onFailure(Call<SceneMarkResponseCMF> call, Throwable t) {
Constants.Method.GET_LIVE_SCENEMARKS, new ArrayList<String>(),"","",
0, false, false,
false, new ArrayList<String>(), "",
sceneMarkURI, "", "");
sceneMarkURI, "", "","", "");
}
return sceneMarkResponseLive;
}
Expand Down Expand Up @@ -584,7 +630,7 @@ public void onFailure(Call<GetPrivaceObjectResponse> call, Throwable t) {
Constants.Method.GET_PRIVACY_OBJECT, new ArrayList<String>(),"","",
0, false, false,
false, new ArrayList<String>(), "",
"", currentDate, sceneEncryptionKeyID);
"", currentDate, sceneEncryptionKeyID,"", "");
}
}
/** get AppControlObject to refresh the token when expires **/
Expand Down Expand Up @@ -664,7 +710,8 @@ 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,
String sceneMarkURI, String currentDateString, String sceneEncryptionKeyID) {
String sceneMarkURI, String currentDateString, String sceneEncryptionKeyID,
String deviceName, String deviceTimeZone) {
Utils.showCustomProgressDialog(activity, "", false);

Date today = new Date();
Expand Down Expand Up @@ -725,11 +772,11 @@ public void onResponse(Call<AppConrolObjectResponse> call, retrofit2.Response<Ap
pageLength, returnNiceItemTypes, returnSceneMarksDates,
returnPage, niceItemList, continuationToken);
break;
/* case Constants.Method.GET_EVENT_DATES:
getSceneMarksManifest(activity, nodeIds, startTime, endTime,
case Constants.Method.GET_EVENT_DATES:
getEventDates(activity, nodeIds, startTime, endTime,
pageLength, returnNiceItemTypes, returnSceneMarksDates,
returnPage, niceItemList, continuationToken);
break;*/
break;
case Constants.Method.GET_NICEITEMTYPES_LIST:
getNiceItemTypesList(activity);
break;
Expand All @@ -742,9 +789,9 @@ public void onResponse(Call<AppConrolObjectResponse> call, retrofit2.Response<Ap
case Constants.Method.GET_PRIVACY_OBJECT:
getPrivacyObject(activity, currentDateString, sceneEncryptionKeyID);
break;
/* case Constants.Method.GET_CURATION_LIVE:
case Constants.Method.GET_CURATION_LIVE:
getCurationLive(activity, sceneMarkURI, deviceName, deviceTimeZone);
break;*/
break;
}

}
Expand Down

0 comments on commit 95a3204

Please sign in to comment.