add task return errcode in StnLogic

shockcao · shockcao · commit e0ba71ff484c · 2017-01-05T14:57:33.000+08:00
fix word spell error
diff --git a/mars/libraries/mars_android_sdk/src/main/java/com/tencent/mars/stn/StnLogic.java b/mars/libraries/mars_android_sdk/src/main/java/com/tencent/mars/stn/StnLogic.java
@@ -90,7 +90,7 @@ public Task(final int channelselect, final int cmdid, final String cgi, final Ar
 
     public static final int INVALID_TASK_ID = -1;
 
-    // ErrCmdType
+    // STN callback errType
     public static final int ectOK = 0;
     public static final int ectFalse = 1;
     public static final int ectDial = 2;
@@ -102,6 +102,27 @@ public Task(final int channelselect, final int cmdid, final String cgi, final Ar
     public static final int ectServer = 8;
     public static final int ectLocal = 9;
 
+    //STN callback errCode
+    public static final int FIRSTPKGTIMEOUT = -500;
+    public static final int PKGPKGTIMEOUT = -501;
+    public static final int READWRITETIMEOUT = -502;
+    public static final int TASKTIMEOUT = -503;
+
+    public static final int SOCKETNETWORKCHANGE = -10086;
+    public static final int SOCKETMAKESOCKETPREPARED = -10087;
+    public static final int SOCKETWRITENWITHNONBLOCK = -10088;
+    public static final int SOCKETREADONCE = -10089;
+    public static final int SOCKETSHUTDOWN = -10090;
+    public static final int SOCKETRECVERR = -10091;
+    public static final int SOCKETSENDERR = -10092;
+
+    public static final int HTTPSPLITHTTPHEADANDBODY = -10194;
+    public static final int HTTPPARSESTATUSLINE = -10195;
+
+    public static final int NETMSGXPHANDLEBUFFERERR = -10504;
+
+    public static final int DNSMAKESOCKETPREPARED = -10606;
+
     //reportConnectStatus
     //status
     public static final int NETWORK_UNKNOWN = -1;
@@ -125,6 +146,8 @@ public Task(final int channelselect, final int cmdid, final String cgi, final Ar
 
     public static int TASK_END_SUCCESS = 0;
 
+
+
     private static ICallBack callBack = null;
 
     /**
diff --git a/mars/libraries/mars_android_sdk/src/main/java/com/tencent/mars/xlog/Xlog.java b/mars/libraries/mars_android_sdk/src/main/java/com/tencent/mars/xlog/Xlog.java
@@ -27,6 +27,7 @@ static class XLoggerInfo {
 
 	public static void open(boolean isLoadLib, int level, int mode, String cacheDir, String logDir, String nameprefix) {
 		if (isLoadLib) {
+			System.loadLibrary("stlport_shared");
 			System.loadLibrary("marsxlog");
 		}
 
diff --git a/mars/stn/src/shortlink.cc b/mars/stn/src/shortlink.cc
@@ -225,7 +225,7 @@ SOCKET ShortLink::__RunConnect(ConnectProfile& _conn_profile) {
             __RunResponseError(kEctSocket, kEctSocketMakeSocketPrepared, _conn_profile, false);
         }
         else {
-        	_conn_profile.disconn_errtype = kEctCanceld;
+        	_conn_profile.disconn_errtype = kEctCanceled;
         	__UpdateProfile(_conn_profile);
         }
 
@@ -320,7 +320,7 @@ void ShortLink::__RunReadWrite(SOCKET _socket, int& _err_type, int& _err_code, C
 
 		if (breaker_.IsBreak()) {
 			xinfo2(TSF"user cancel, nread:%_, nwrite:%_", socket_nread(_socket), socket_nwrite(_socket)) >> group_close;
-        	_conn_profile.disconn_errtype = kEctCanceld;
+        	_conn_profile.disconn_errtype = kEctCanceled;
 			break;
 		}
 
diff --git a/mars/stn/stn.h b/mars/stn/stn.h
@@ -110,7 +110,7 @@ enum ErrCmdType {
 	kEctEnDecode = 7,
 	kEctServer = 8,
 	kEctLocal = 9,
-    kEctCanceld = 10,
+    kEctCanceled = 10,
 };
 
 //error code

Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,7 @@ static class XLoggerInfo {`
`27`	`27`
`28`	`28`	`public static void open(boolean isLoadLib, int level, int mode, String cacheDir, String logDir, String nameprefix) {`
`29`	`29`	`if (isLoadLib) {`
	`30`	`+ System.loadLibrary("stlport_shared");`
`30`	`31`	`System.loadLibrary("marsxlog");`
`31`	`32`	`}`
`32`	`33`
Original file line number	Diff line number	Diff line change
`@@ -225,7 +225,7 @@ SOCKET ShortLink::__RunConnect(ConnectProfile& _conn_profile) {`
`225`	`225`	`__RunResponseError(kEctSocket, kEctSocketMakeSocketPrepared, _conn_profile, false);`
`226`	`226`	`}`
`227`	`227`	`else {`
`228`		`- _conn_profile.disconn_errtype = kEctCanceld;`
	`228`	`+ _conn_profile.disconn_errtype = kEctCanceled;`
`229`	`229`	`__UpdateProfile(_conn_profile);`
`230`	`230`	`}`
`231`	`231`
`@@ -320,7 +320,7 @@ void ShortLink::__RunReadWrite(SOCKET _socket, int& _err_type, int& _err_code, C`
`320`	`320`
`321`	`321`	`if (breaker_.IsBreak()) {`
`322`	`322`	`xinfo2(TSF"user cancel, nread:%_, nwrite:%_", socket_nread(_socket), socket_nwrite(_socket)) >> group_close;`
`323`		`- _conn_profile.disconn_errtype = kEctCanceld;`
	`323`	`+ _conn_profile.disconn_errtype = kEctCanceled;`
`324`	`324`	`break;`
`325`	`325`	`}`
`326`	`326`