From 95a3204c5812663ebeeb1b39517e33695d4b6b20 Mon Sep 17 00:00:00 2001 From: khyati_vyas Date: Mon, 26 Apr 2021 16:38:47 +0530 Subject: [PATCH] added curation data method --- .../viewmodel/MainViewModel.java | 71 +++++++++++++++---- 1 file changed, 59 insertions(+), 12 deletions(-) diff --git a/app/src/main/java/com/scenera/nicesecurityapplib/viewmodel/MainViewModel.java b/app/src/main/java/com/scenera/nicesecurityapplib/viewmodel/MainViewModel.java index 63d1879..5a88b30 100755 --- a/app/src/main/java/com/scenera/nicesecurityapplib/viewmodel/MainViewModel.java +++ b/app/src/main/java/com/scenera/nicesecurityapplib/viewmodel/MainViewModel.java @@ -214,7 +214,7 @@ public void onFailure(Call call, Throwable t) { getAppControlObject(pHelper.getAppSecurityObject(),activity, Constants.Method.GET_NODE_LIST, new ArrayList(),"","", 0, false, false, - false, new ArrayList(), "", "","", ""); + false, new ArrayList(), "", "","", "","", ""); } }catch (Exception et){ et.printStackTrace(); @@ -313,7 +313,7 @@ public void onFailure(Call 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; } @@ -401,12 +401,58 @@ public void onFailure(Call 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> 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 call = api.getSceneMarks("Bearer "+ accessToken, sceneMarkURI); + + call.enqueue(new Callback() { + @Override + public void onResponse(Call call, retrofit2.Response 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 call, Throwable t) { + Utils.removeCustomProgressDialog(); + Log.i("onFailure", "---->>>> " + t.toString()); + } + }); + return alertLiveData; + }else { + getAppControlObject(pHelper.getAppSecurityObject(),activity, + Constants.Method.GET_CURATION_LIVE, new ArrayList(),"","", + 0, false, false, + false, new ArrayList(), "", + sceneMarkURI, "", "", deviceName, deviceTimeZone); + } + return null; + } + /** Get NiceItemTypes List **/ public MutableLiveData> getNiceItemTypesList(AppCompatActivity activity) { @@ -457,7 +503,7 @@ public void onFailure(Call> call, Throwable t) { getAppControlObject(pHelper.getAppSecurityObject(),activity, Constants.Method.GET_NICEITEMTYPES_LIST, new ArrayList(),"","", 0, false, false, - false, new ArrayList(), "", "","", ""); + false, new ArrayList(), "", "","", "","", ""); } return niceItemTypesLiveData; } @@ -500,7 +546,7 @@ public void onFailure(Call call, Throwable t) { Constants.Method.GET_LIVE_SCENEMARKS, new ArrayList(),"","", 0, false, false, false, new ArrayList(), "", - sceneMarkURI, "", ""); + sceneMarkURI, "", "","", ""); } return sceneMarkResponseLive; } @@ -584,7 +630,7 @@ public void onFailure(Call call, Throwable t) { Constants.Method.GET_PRIVACY_OBJECT, new ArrayList(),"","", 0, false, false, false, new ArrayList(), "", - "", currentDate, sceneEncryptionKeyID); + "", currentDate, sceneEncryptionKeyID,"", ""); } } /** get AppControlObject to refresh the token when expires **/ @@ -664,7 +710,8 @@ private void getAppControlObject(AppSecurityObjectResponse appSecurityObject, AppCompatActivity activity, int method, ArrayList nodeIds,String startTime, String endTime, int pageLength, boolean returnNiceItemTypes, boolean returnSceneMarksDates, boolean returnPage, ArrayList 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(); @@ -725,11 +772,11 @@ public void onResponse(Call call, retrofit2.Response call, retrofit2.Response