fix onTaskEnd callback without param error

update sdk version to 1.1.4
jayronlou · Jan 11, 2017 · 969c71d · 969c71d
1 parent 9128d6b
commit 969c71d
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 13 deletions.
diff --git a/mars/libraries/mars_android_sdk/gradle.properties b/mars/libraries/mars_android_sdk/gradle.properties
@@ -3,7 +3,7 @@ PROJ_GROUP=com.tencent.mars
 # 库的ID
 PROJ_ARTIFACTID=mars-core
 # 库的版本
-PROJ_VERSION=1.1.3
+PROJ_VERSION=1.1.4
 ### 最后 gradle引用的形式就是 $PROJ_GROUP:$PROJ_ARTIFACTID:$PROJ_VERSION
 
 # 库名

diff --git a/...ndroid/marsSampleChat/app/src/main/java/com/tencent/mars/sample/ConversationActivity.java b/...ndroid/marsSampleChat/app/src/main/java/com/tencent/mars/sample/ConversationActivity.java
@@ -220,7 +220,7 @@ public void onPostDecode(Main.ConversationListResponse response) {
             }
 
             @Override
-            public void onTaskEnd() {
+            public void onTaskEnd(int errType, int errCode) {
                 runOnUiThread(new Runnable() {
 
                     @Override

diff --git a/...ndroid/marsSampleChat/app/src/main/java/com/tencent/mars/sample/chat/TextMessageTask.java b/...ndroid/marsSampleChat/app/src/main/java/com/tencent/mars/sample/chat/TextMessageTask.java
@@ -72,13 +72,12 @@ public void onPostDecode(Chat.SendMessageResponse response) {
     }
 
     @Override
-    public void onTaskEnd() {
+    public void onTaskEnd(int errType, int errCode) {
         if (callback == null) {
             callback = onError;
         }
 
         uiHandler.post(callback);
-        super.onTaskEnd();
     }
 
     public TextMessageTask onOK(Runnable onOK) {

diff --git a/samples/android/marsSampleChat/build.gradle b/samples/android/marsSampleChat/build.gradle
@@ -23,7 +23,7 @@ subprojects {
 
 ext {
     GROUP = 'com.tencent.mars.sample'
-    VERSION_NAME_PREFIX = '1.1.3'
+    VERSION_NAME_PREFIX = '1.1.4'
     VERSION_NAME_SUFFIX = '' // '-SNAPSHOT'
 
     minSdkVersion = 16

diff --git a/samples/android/marsSampleChat/wrapper/gradle.properties b/samples/android/marsSampleChat/wrapper/gradle.properties
@@ -7,7 +7,7 @@ PROJ_GROUP=com.tencent.mars
 # 库的ID
 PROJ_ARTIFACTID=mars-wrapper
 # 库的版本
-PROJ_VERSION=1.1.3
+PROJ_VERSION=1.1.4
 ### 最后 gradle引用的形式就是 $PROJ_GROUP:$PROJ_ARTIFACTID:$PROJ_VERSION
 
 # 库名

diff --git a/...pleChat/wrapper/src/main/aidl/com/tencent/mars/sample/wrapper/remote/MarsTaskWrapper.aidl b/...pleChat/wrapper/src/main/aidl/com/tencent/mars/sample/wrapper/remote/MarsTaskWrapper.aidl
@@ -11,5 +11,5 @@ interface MarsTaskWrapper {
 
     int buf2resp(in byte[] buf);
 
-    void onTaskEnd();
+    void onTaskEnd(in int errType, in int errCode);
 }
diff --git a/...hat/wrapper/src/main/java/com/tencent/mars/sample/wrapper/remote/AbstractTaskWrapper.java b/...hat/wrapper/src/main/java/com/tencent/mars/sample/wrapper/remote/AbstractTaskWrapper.java
@@ -48,10 +48,7 @@ public Bundle getProperties() {
     }
 
     @Override
-    public void onTaskEnd() {
-        // TODO: Running in client, need to complete onTaskEnd if service connection break
-        // Nothing to do by defaults
-    }
+    public abstract void onTaskEnd(int errType, int errCode);
 
     public AbstractTaskWrapper setHttpRequest(String host, String path) {
         properties.putString(MarsTaskProperty.OPTIONS_HOST, ("".equals(host) ? null : host));

diff --git a/...leChat/wrapper/src/main/java/com/tencent/mars/sample/wrapper/remote/MarsServiceProxy.java b/...leChat/wrapper/src/main/java/com/tencent/mars/sample/wrapper/remote/MarsServiceProxy.java
@@ -161,7 +161,7 @@ private void cancelSpecifiedTaskWrapper(MarsTaskWrapper marsTaskWrapper) {
         if (queue.remove(marsTaskWrapper)) {
             // Remove from queue, not exec yet, call MarsTaskWrapper::onTaskEnd
             try {
-                marsTaskWrapper.onTaskEnd();
+                marsTaskWrapper.onTaskEnd(-1, -1);
 
             } catch (RemoteException e) {
                 // Called in client, ignore RemoteException

diff --git a/...leChat/wrapper/src/main/java/com/tencent/mars/sample/wrapper/service/MarsServiceStub.java b/...leChat/wrapper/src/main/java/com/tencent/mars/sample/wrapper/service/MarsServiceStub.java
@@ -233,7 +233,7 @@ public int onTaskEnd(int taskID, Object userContext, int errType, int errCode) {
         }
 
         try {
-            wrapper.onTaskEnd();
+            wrapper.onTaskEnd(errType, errCode);
 
         } catch (RemoteException e) {
             e.printStackTrace();