Merge branch 'master' of http://116.62.119.248:10082/cheng_zq/EffectDemo

app/src/main/java/com/xunao/effectdemo/activity/MapChallengeActivity.java

@@ -27,6 +27,11 @@ public class MapChallengeActivity extends Activity {
 
     private String name = "13004166772";
     private String pwd = "123890";
+    private String token = "MWIzYmVmOTdiYzI5Y2UwM2ZiOThlMTI3YjRmYWJlNzA=";
+    private String member_id = "61128";
+    private String maps_id = "185";
+    private String student_id = "180721";
+
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {

app/src/main/java/com/xunao/effectdemo/net/ApiHttpClient.java

@@ -78,9 +78,10 @@ public class ApiHttpClient {
     public static String getAbsoluteApiUrl(String partUrl,Map<String, String> params) {
         String url = null;
         for (String key:params.keySet()){
-            url = (url==null?"":(url+"&"))+key+":"+params.get(key);
+            url = (url==null?"":(url+"&"))+key+"="+params.get(key);
         }
-        return partUrl;
+        Log.e("MyTag","路径:"+url);
+        return partUrl+"?"+url;
     }
 
     public static void get(String partUrl, CSMHttpCallback callback) {

app/src/main/java/com/xunao/effectdemo/net/BaseBean.java

@@ -21,16 +21,16 @@ public class BaseBean implements Serializable {
         return baseBean;
     }
 
-    private String retCode;
+    private String error;
     private String retMsgJp;
     private String retMsgEn;
 
     public String getRetCode() {
-        return retCode;
+        return error;
     }
 
     public void setRetCode(String retCode) {
-        this.retCode = retCode;
+        this.error = retCode;
     }
 
     public String getRetMsgJp() {

app/src/main/java/com/xunao/effectdemo/net/CSMHttpCallback.java

@@ -50,7 +50,7 @@ public abstract class CSMHttpCallback extends Callback<String> {
         if (!TextUtils.isEmpty(response)) {
             if (response.contains("retCode")){
                 BaseBean baseBean = BaseBean.parse(response);
-                if (baseBean.getRetCode().equals("1000")) {
+                if (baseBean.getRetCode().equals("0")) {
                     onSuccess(response);
                 }else if(baseBean.getRetCode().equals("1007")||baseBean.getRetCode().equals("1005")){
                     onFail("1007");