diff --git a/README.md b/README.md index a92da28..80d083f 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ This is the basic SDK for your own application if you want to make use of BboxAP 1 -jar file clone the depot and build -add **bboxapi-library-1.0-release.aar** to your lib folder of your project +add **bboxapi-library-1.1-release.aar** to your lib folder of your project add this line to your gradle dependencies ```` compile(name: 'bboxapi-debug', ext: 'aar') @@ -16,13 +16,13 @@ compile(name: 'bboxapi-debug', ext: 'aar') fr.bouyguestelecom.dev bboxapi - 1.0 + 1.1 pom ```` 3 -jcenter ```` -compile 'fr.bouyguestelecom.dev:bboxapi:1.0' +compile 'fr.bouyguestelecom.dev:bboxapi:1.1' ```` ### Prerequisites diff --git a/bboxapi/bboxapi.iml b/bboxapi/bboxapi.iml index ea70f87..9a57405 100644 --- a/bboxapi/bboxapi.iml +++ b/bboxapi/bboxapi.iml @@ -77,18 +77,27 @@ + + + + + + + + + - + diff --git a/bboxapi/build.gradle b/bboxapi/build.gradle index 18baa43..0b046eb 100644 --- a/bboxapi/build.gradle +++ b/bboxapi/build.gradle @@ -3,14 +3,14 @@ apply plugin: 'com.github.dcendents.android-maven' apply plugin: 'com.jfrog.bintray' android { - compileSdkVersion 23 - buildToolsVersion "23.0.3" + compileSdkVersion 25 + buildToolsVersion "25.0.2" defaultConfig { minSdkVersion 14 targetSdkVersion 25 - versionCode 1 - versionName "1.0" + versionCode 2 + versionName "1.1" } buildTypes { release { diff --git a/bboxapi/src/main/java/tv/bouyguestelecom/fr/bboxapilibrary/Bbox.java b/bboxapi/src/main/java/tv/bouyguestelecom/fr/bboxapilibrary/Bbox.java index 44ba904..89e5281 100644 --- a/bboxapi/src/main/java/tv/bouyguestelecom/fr/bboxapilibrary/Bbox.java +++ b/bboxapi/src/main/java/tv/bouyguestelecom/fr/bboxapilibrary/Bbox.java @@ -640,28 +640,19 @@ public void onFailure(Request request, int errorCode) { @Override public String addListener(String ip, final String appId, IBboxMedia iBboxMedia) { - if (mWebSocket == null) { mWebSocket = new WebSocket(ip, appId); - } - return mWebSocket.addNotifChannelListener(iBboxMedia); } @Override public String addListener(String ip, String appId, IBboxApplication iBboxApplication) { - if (mWebSocket == null) { mWebSocket = new WebSocket(ip, appId); - } - return mWebSocket.addNotifApplication(iBboxApplication); } @Override public String addListener(String ip, String appId, IBboxMessage iBboxMessage) { - if (mWebSocket == null) { mWebSocket = new WebSocket(ip, appId); - } - return mWebSocket.addNotifMessage(iBboxMessage); } diff --git a/bboxapi/src/main/java/tv/bouyguestelecom/fr/bboxapilibrary/ws/WebSocket.java b/bboxapi/src/main/java/tv/bouyguestelecom/fr/bboxapilibrary/ws/WebSocket.java index c49dd3e..1b0ff6e 100644 --- a/bboxapi/src/main/java/tv/bouyguestelecom/fr/bboxapilibrary/ws/WebSocket.java +++ b/bboxapi/src/main/java/tv/bouyguestelecom/fr/bboxapilibrary/ws/WebSocket.java @@ -98,7 +98,6 @@ public void onMessage(String message) { } } - if (obj.get("resourceId").toString().contains("Iot")) { MessageResource messageResource = new MessageResource(obj.getJSONObject("body").get("source").toString(),