Merge branch 'developer' of https://gitlab.com/Arisono/SkWeiChat-Baidu into draft

WeiChat/src/main/java/com/xzjmyk/pm/activity/bean/oa/OABean.java

@@ -40,19 +40,12 @@ public class OABean implements Parcelable {
     private String vp_custcode;//联系人编号
     private String nichestep;//沟通阶段
     private String vp_contact;//联系人
+    private String vp_cucontact;//联系人
 
 
     public OABean() {
     }
 
-    public String getVp_contact() {
-        return vp_contact;
-    }
-
-    public void setVp_contact(String vp_contact) {
-        this.vp_contact = vp_contact;
-    }
-
     public int getType() {
         return type;
     }
@@ -261,6 +254,22 @@ public class OABean implements Parcelable {
         this.nichestep = nichestep;
     }
 
+    public String getVp_contact() {
+        return vp_contact;
+    }
+
+    public void setVp_contact(String vp_contact) {
+        this.vp_contact = vp_contact;
+    }
+
+    public String getVp_cucontact() {
+        return vp_cucontact;
+    }
+
+    public void setVp_cucontact(String vp_cucontact) {
+        this.vp_cucontact = vp_cucontact;
+    }
+
     protected OABean(Parcel in) {
         type = in.readInt();
         startdate = in.readString();
@@ -289,6 +298,7 @@ public class OABean implements Parcelable {
         vp_custcode = in.readString();
         nichestep = in.readString();
         vp_contact = in.readString();
+        vp_cucontact = in.readString();
     }
 
     @Override
@@ -320,6 +330,7 @@ public class OABean implements Parcelable {
         dest.writeString(vp_custcode);
         dest.writeString(nichestep);
         dest.writeString(vp_contact);
+        dest.writeString(vp_cucontact);
     }
 
     @Override

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/VisitReportAddActivity.java

@@ -128,7 +128,7 @@ public class VisitReportAddActivity extends BaseActivity implements View.OnClick
             tv_date_start.setText(bean.getStartdate() == null ? "未填写" : bean.getStartdate());
             tv_date_end.setText(bean.getEnddate() == null ? "未填写" : bean.getEnddate());
             tv_customer_login.setText(bean.getClient() == null ? "未填写" : bean.getClient());
-            tv_linksman_login.setText(bean.getVp_contact() == null ? "未填写" : bean.getVp_contact());
+            tv_linksman_login.setText(StringUtils.isEmpty(bean.getVp_contact()) ? (StringUtils.isEmpty(bean.getVp_cucontact()) ? "未填写" : bean.getVp_cucontact()) : bean.getVp_contact());
             tv_address_login.setText(bean.getAddress() == null ? "未填写" : bean.getAddress());
             tv_visit_theme.setText(bean.getRemark() == null ? "未填写" : bean.getRemark());
             tv_visit_steps.setText(bean.getNichestep() == null ? "" : bean.getNichestep());

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/AlarmaActivity.java

@@ -37,7 +37,6 @@ public class AlarmaActivity extends BaseActivity implements View.OnClickListener
 
     private boolean isAlarm;//判断是否为提醒
     private boolean isAuto;//判断是否为自动
-
     private AlarmManage manage;
 
     @Override

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/fragment/SigninFragment.java

@@ -126,6 +126,7 @@ public class SigninFragment extends EasyFragment implements View.OnClickListener
                         companyY = Double.parseDouble(jsonObject.containsKey("latitude") ? (StringUtils.isEmpty(jsonObject.getString("latitude")) ? "0" : jsonObject.getString("latitude")) : "0");
                         CommonUtil.setSharedPreferences(ct, "companyX", (float) companyX);
                         CommonUtil.setSharedPreferences(ct, "companyY", (float) companyY);
+                        CommonUtil.setSharedPreferences(ct, "distance",  companyDistance);
                         unoffice_mm.setText(setDistance());
                     }
                     if (jsonObject.getBoolean("success")) {

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/net/ViewUtil.java

@@ -347,8 +347,7 @@ public class ViewUtil {
         Map<String, String> params = new HashMap<String, String>();
         params.put("j_username", phone);
         params.put("j_password", password);
-        startNetThread(url, params, handler, Constants.SUCCESS_B2B, null, null,
-                "post");
+        startNetThread(url, params, handler, Constants.SUCCESS_B2B, null, null, "post");
     }
 
 
@@ -392,7 +391,7 @@ public class ViewUtil {
                         boolean isNetHas = CommonUtil.isNetWorkConnected(ct);
                         if (isNetHas)
                             ToastMessage(MyApplication.getInstance(), "系统内部错误！", Style.holoRedLight, 3000);
-                     }
+                    }
                     break;
                 default:
                     break;
@@ -518,23 +517,23 @@ public class ViewUtil {
 //                                        for (int j2 = 0; j2 < erpEntities.size(); j2++) {
 //                                            if (text.toString().equals(
 //                                                    erpEntities.get(j2).getName())) {
-                                             
-                                                LoginEntity entity = erpEntities
-                                                        .get(which);
-                                                erp_phone = phone;
-                                                erp_password = password;
-                                                erp_username = entity.getAccount();
-                                                erp_master = entity.getMaster();
-                                                erp_baseurl = entity.getWebsite();
-                                                erp_company = entity.getName();
-                                                erp_uu = String.valueOf(entity
-                                                        .getEnuu());
-                                                erp_masterId = String.valueOf(entity.getMasterId());
-                                                LoginERPTask(entity.getWebsite(),
-                                                        entity.getMaster(), phone, password);
-                                                //清除账套列表缓存
-                                                CommonUtil.clearSharedPreferences(ct, "erp_masterlist");
-                                                
+
+                                        LoginEntity entity = erpEntities
+                                                .get(which);
+                                        erp_phone = phone;
+                                        erp_password = password;
+                                        erp_username = entity.getAccount();
+                                        erp_master = entity.getMaster();
+                                        erp_baseurl = entity.getWebsite();
+                                        erp_company = entity.getName();
+                                        erp_uu = String.valueOf(entity
+                                                .getEnuu());
+                                        erp_masterId = String.valueOf(entity.getMasterId());
+                                        LoginERPTask(entity.getWebsite(),
+                                                entity.getMaster(), phone, password);
+                                        //清除账套列表缓存
+                                        CommonUtil.clearSharedPreferences(ct, "erp_masterlist");
+
 //                                            }
 //                                        }
                                     }

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/util/alarm/AlarmReceiver.java

@@ -108,31 +108,45 @@ public class AlarmReceiver extends BroadcastReceiver {
         form.put("cl_phone", MyApplication.getInstance().mLoginUser.getTelephone());
         form.put("cl_emcode", CommonUtil.getSharedPreferences(ct, "erp_username"));
         form.put("cl_emname", MyApplication.getInstance().mLoginUser.getNickName());
+        boolean isp = isPlay(ct, form);
+        if (!isp) return;//不符合打卡
+        String formStore = StringUtils.mapToJson(form);
+        param.put("caller", "CardLog");
+        param.put("formStore", formStore);
+        String url = CommonUtil.getSharedPreferences(ct, "erp_baseurl") + "mobile/saveCardLog.action";
+        param.put("emcode", CommonUtil.getSharedPreferences(ct, "erp_username"));
+        LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
+        headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
+        ViewUtil.httpSendRequest(ct, url, param, handler, headers, 0x11, null, null, "get");
+    }
+
+    private boolean isPlay(Context ct, Map<String, Object> form) {
         try {
+            //判断是否符合打卡
             BdLocationHelper helper = MyApplication.getInstance().getBdLocationHelper();
             form.put("cl_address", helper.getAddress());
             form.put("cl_location", helper.getName());
             double companyX = CommonUtil.getSharedPreferencesfloat(ct, "companyX", 0);
             double companyY = CommonUtil.getSharedPreferencesfloat(ct, "companyY", 0);
+            int comDistance = CommonUtil.getSharedPreferencesInt(ct, "distance", 0);
             double latitude = helper.getLatitude();
             double longitude = helper.getLongitude();
             String distance = BaiduMapUtil.getInstence().getDistance(companyX, companyY, latitude, longitude);
-            form.put("cl_distance", distance);
+            if (comDistance < Float.valueOf(distance)) {//规定地址<实际地址  不符合
+                helper.requestLocation();//当不符合时候提交定位，并不执行打卡签到
+                return false;
+            } else {
+                form.put("cl_distance", distance);
+                return true;
+            }
         } catch (NullPointerException e) {
-
+            return false;
         } catch (SQLException e) {
-
+            return false;
         }
-        String formStore = StringUtils.mapToJson(form);
-        param.put("caller", "CardLog");
-        param.put("formStore", formStore);
-        String url = CommonUtil.getSharedPreferences(ct, "erp_baseurl") + "mobile/saveCardLog.action";
-        param.put("emcode", CommonUtil.getSharedPreferences(ct, "erp_username"));
-        LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
-        headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
-        ViewUtil.httpSendRequest(ct, url, param, handler, headers, 0x11, null, null, "get");
     }
 
+
     //获取打卡记录 date:yyyy-MM-dd
     private void loadLog() {
         String date = TimeUtils.s_long_2_str(System.currentTimeMillis());

WeiChat/src/main/java/com/xzjmyk/pm/activity/util/MacAndIDUtil.java

@@ -3,7 +3,6 @@ package com.xzjmyk.pm.activity.util;
 import android.content.Context;
 import android.net.wifi.WifiInfo;
 import android.net.wifi.WifiManager;
-import android.util.Log;
 
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
@@ -39,7 +38,7 @@ public class MacAndIDUtil {
 
 
     private boolean legitimateMac(String mac) {
-        return !mac.contains("00:00:00");
+        return !StringUtils.isEmpty(mac) && !mac.contains("00:00:00");
     }
 
     /*通过wifiInfo获取ip*/

WeiChat/src/main/java/com/xzjmyk/pm/activity/volley/StringJsonObjectRequest.java

@@ -28,248 +28,244 @@ import java.util.zip.GZIPInputStream;
 
 /**
  * 通过字符串参数集，请求json参数，并序列号为JsonModel对象
- * @author dty
- * 
+ *
  * @param <T>
+ * @author dty
  */
 public class StringJsonObjectRequest<T> extends Request<String> {
 
-	private Listener<T> mListener;
-	private Class<T> mClazz;
-	private Map<String, String> mParams;
-	private boolean mGzipEnable = false;
-	private boolean mHmacEnable = false;
-	/**
-	 *
-	 * 请求方式post
-	 *
-	 * @param url
-	 *            url地址
-	 * @param listener
-	 */
-	public StringJsonObjectRequest(String url, ErrorListener errorListener, Listener<T> listener, Class<T> clazz, Map<String, String> params) {
-		this(Method.POST, url, errorListener, listener, clazz, params);
-	}
+    private Listener<T> mListener;
+    private Class<T> mClazz;
+    private Map<String, String> mParams;
+    private boolean mGzipEnable = false;
+    private boolean mHmacEnable = false;
+
+    /**
+     * 请求方式post
+     *
+     * @param url      url地址
+     * @param listener
+     */
+    public StringJsonObjectRequest(String url, ErrorListener errorListener, Listener<T> listener, Class<T> clazz, Map<String, String> params) {
+        this(Method.POST, url, errorListener, listener, clazz, params);
+    }
+
+    /**
+     * @param method   请求方式，post或者get
+     * @param url      url地址
+     * @param listener
+     */
+    public StringJsonObjectRequest(int method, String url, ErrorListener errorListener, Listener<T> listener, Class<T> clazz,
+                                   Map<String, String> params) {
+        super(method, url, errorListener);
+        mListener = listener;
+        mClazz = clazz;
+        mParams = params;
+        if (method == Method.GET) {
+            spliceGetUrl();
+        }
+    }
+
+    /**
+     * @param method   请求方式，post或者get   是否启用Hmac加密
+     * @param url      url地址
+     * @param listener
+     */
+    public StringJsonObjectRequest(int method, String url, ErrorListener errorListener, Listener<T> listener, Class<T> clazz,
+                                   Map<String, String> params, boolean mHmacEnable) {
+        super(method, url, errorListener);
+        mListener = listener;
+        mClazz = clazz;
+        mParams = params;
+        this.mHmacEnable = mHmacEnable;
+        if (method == Method.GET) {
+            spliceGetUrl();
+        }
+    }
 
-	/**
-	 *
-	 * @param method
-	 *            请求方式，post或者get
-	 * @param url
-	 *            url地址
-	 * @param listener
-	 */
-	public StringJsonObjectRequest(int method, String url, ErrorListener errorListener, Listener<T> listener, Class<T> clazz,
-								   Map<String, String> params) {
-		super(method, url, errorListener);
-		mListener = listener;
-		mClazz = clazz;
-		mParams = params;
-		if (method == Method.GET) {
-			spliceGetUrl();
-		}
-	}
+    public void setGzipEnable(boolean eanble) {
+        mGzipEnable = eanble;
+    }
 
-	/**
-	 * @param method   请求方式，post或者get   是否启用Hmac加密
-	 * @param url      url地址
-	 * @param listener
-	 */
-	public StringJsonObjectRequest(int method, String url, ErrorListener errorListener, Listener<T> listener, Class<T> clazz,
-								   Map<String, String> params, boolean mHmacEnable) {
-		super(method, url, errorListener);
-		mListener = listener;
-		mClazz = clazz;
-		mParams = params;
-		this.mHmacEnable = mHmacEnable;
-		if (method == Method.GET) {
-			spliceGetUrl();
-		}
-	}
+    /**
+     * @注释：是否加密
+     */
+    public void setmHmacEnable(boolean mHmacEnable) {
+        this.mHmacEnable = mHmacEnable;
+    }
 
-	public void setGzipEnable(boolean eanble) {
-		mGzipEnable = eanble;
-	}
+    /* Post 参数设置 */
+    @Override
+    protected Map<String, String> getParams() throws AuthFailureError {
+        if (getMethod() != Method.POST && getMethod() != Method.PUT) {
+            return null;
+        }
+        if (FastVolley.DEBUG) {
+            Log.d(FastVolley.TAG, "url:" + getUrl());
+            if (mParams != null) {
+                for (String key : mParams.keySet()) {
+                    Log.d(FastVolley.TAG, "key:" + key + " ------  " + "value:" + mParams.get(key));
+                }
+            }
+        }
+        return mParams;
+    }
 
-	/**
-	 * @注释：是否加密
-	 */
-	public void setmHmacEnable(boolean mHmacEnable) {
-		this.mHmacEnable = mHmacEnable;
-	}
-	/* Post 参数设置 */
-	@Override
-	protected Map<String, String> getParams() throws AuthFailureError {
-		if (getMethod() != Method.POST && getMethod() != Method.PUT) {
-			return null;
-		}
-		if (FastVolley.DEBUG) {
-			Log.d(FastVolley.TAG, "url:" + getUrl());
-			if (mParams != null) {
-				for (String key : mParams.keySet()) {
-					Log.d(FastVolley.TAG, "key:" + key + " ------  " + "value:" + mParams.get(key));
-				}
-			}
-		}
-		return mParams;
-	}
+    @Override
+    public Map<String, String> getHeaders() throws AuthFailureError {
+        if (mGzipEnable) {
+            Map<String, String> headers = new HashMap<String, String>();
+            headers.put("Charset", "UTF-8");
+            headers.put("Content-Type", "application/x-javascript");
+            headers.put("Accept-Encoding", "gzip,deflate");
+            if (mParams != null) {
+                headers.put("Cookie", "JSESSIONID=" + mParams.get("sessionId"));
+                Log.i("downloadCompanysContact", "JSESSIONID=" + mParams.get("sessionId"));
+            }
 
-	@Override
-	public Map<String, String> getHeaders() throws AuthFailureError {
-		if (mGzipEnable) {
-			Map<String, String> headers = new HashMap<String, String>();
-			headers.put("Charset", "UTF-8");
-			headers.put("Content-Type", "application/x-javascript");
-			headers.put("Accept-Encoding", "gzip,deflate");
-			if (mParams!=null) {
-				headers.put("Cookie", "JSESSIONID=" + mParams.get("sessionId"));
-				Log.i("downloadCompanysContact", "JSESSIONID=" + mParams.get("sessionId"));
-			}
-			
-			//headers.put("Accept-Encoding", "gzip,deflate");
-			return headers;
-		} else {
-			return super.getHeaders();
-		}
-	}
+            //headers.put("Accept-Encoding", "gzip,deflate");
+            return headers;
+        } else {
+            return super.getHeaders();
+        }
+    }
 
-	/* Get 参数拼接 */
-	private void spliceGetUrl() {
-		if (mParams != null && mParams.size() > 0) {
-			String url = getUrl();
-			if (TextUtils.isEmpty(url)) {
-				return;
-			}
-			if (url != null && !url.contains("?")) {
-				url += "?";
-			}
-			String param = url;
-			for (String key : mParams.keySet()) {
-				param += (key + "=" + mParams.get(key) + "&");
-			}
+    /* Get 参数拼接 */
+    private void spliceGetUrl() {
+        if (mParams != null && mParams.size() > 0) {
+            String url = getUrl();
+            if (TextUtils.isEmpty(url)) {
+                return;
+            }
+            if (url != null && !url.contains("?")) {
+                url += "?";
+            }
+            String param = url;
+            for (String key : mParams.keySet()) {
+                param += (key + "=" + mParams.get(key) + "&");
+            }
 
-			if (mHmacEnable) {//是否加密
-				param += "_timestamp=" + System.currentTimeMillis();
-				param += "&_signature=" + HmacUtils.encode(param);
-				Log.i("HmacHttp", "url:" + param);
-			} else {
-				param = param.substring(0, param.length() - 1);// 去掉最后一个&
-			}
-			setUrl(param);
-		}
-	}
+            if (mHmacEnable) {//是否加密
+                param += "_timestamp=" + System.currentTimeMillis();
+                param += "&_signature=" + HmacUtils.encode(param);
+                Log.i("HmacHttp", "url:" + param);
+            } else {
+                param = param.substring(0, param.length() - 1);// 去掉最后一个&
+            }
+            setUrl(param);
+        }
+    }
 
-	@Override
-	protected void deliverResponse(String arg0) {
-		Log.i("deliverResponse", "result deliverResponse:" + arg0);
-		if (mListener == null) {
-			return;
-		}
-		if (FastVolley.DEBUG) {
-			Log.d(FastVolley.TAG, "StringJsonRequest deliverResponse:" + arg0);
-		}
+    @Override
+    protected void deliverResponse(String arg0) {
+        Log.i("deliverResponse", "result deliverResponse:" + arg0);
+        if (mListener == null) {
+            return;
+        }
+        if (FastVolley.DEBUG) {
+            Log.d(FastVolley.TAG, "StringJsonRequest deliverResponse:" + arg0);
+        }
 
-		if (TextUtils.isEmpty(arg0)) {
-			deliverError(new VolleyError(new NetworkError()));
-			return;
-		}
-		ObjectResult<T> result = new ObjectResult<T>();
-		result.setResultData(arg0);
-		try {
-			JSONObject jsonObject = JSON.parseObject(arg0);//解析json有异常的风险
-			result.setResultCode(jsonObject.getIntValue(Result.RESULT_CODE));
-			result.setResultMsg(jsonObject.getString(Result.RESULT_MSG));
+        if (TextUtils.isEmpty(arg0)) {
+            deliverError(new VolleyError(new NetworkError()));
+            return;
+        }
+        ObjectResult<T> result = new ObjectResult<T>();
+        result.setResultData(arg0);
+        try {
+            JSONObject jsonObject = JSON.parseObject(arg0);//解析json有异常的风险
+            result.setResultCode(jsonObject.getIntValue(Result.RESULT_CODE));
+            result.setResultMsg(jsonObject.getString(Result.RESULT_MSG));
 //			开始解析数据
-			if (!mClazz.equals(Void.class)) {
-				String data = jsonObject.getString(Result.DATA);
-				if (!TextUtils.isEmpty(data)) {
-					if (mClazz.equals(String.class) || mClazz.getSuperclass().equals(Number.class)) {// String
-																										// 类型或者基本数据类型（Integer）
-						result.setData(castValue(mClazz, data));
-					} else {
-						result.setData(JSON.parseObject(data, mClazz));
-					}
+            if (!mClazz.equals(Void.class)) {
+                String data = jsonObject.getString(Result.DATA);
+                if (!TextUtils.isEmpty(data)) {
+                    if (mClazz.equals(String.class) || mClazz.getSuperclass().equals(Number.class)) {// String
+                        result.setData(castValue(mClazz, data));
+                    } else {
+                        result.setData(JSON.parseObject(data, mClazz));
+                    }
 
-				}
-			}
+                }
+            }
 
-		} catch (Exception e) {
-			e.printStackTrace();
-			Log.i("exception", "JSON解析异常");
-		}
+        } catch (Exception e) {
+            e.printStackTrace();
+            Log.i("exception", "JSON解析异常");
+        }
 
-		mListener.onResponse(result);
-	}
+        mListener.onResponse(result);
+    }
 
-	private T castValue(Class<T> clazz, String data) {
-		try {
-			Constructor<T> constructor = clazz.getConstructor(String.class);
-			return constructor.newInstance(data);
-		} catch (NoSuchMethodException e) {
-			e.printStackTrace();
-		} catch (InstantiationException e) {
-			e.printStackTrace();
-		} catch (IllegalAccessException e) {
-			e.printStackTrace();
-		} catch (IllegalArgumentException e) {
-			e.printStackTrace();
-		} catch (InvocationTargetException e) {
-			e.printStackTrace();
-		}
-		return null;
-	}
+    private T castValue(Class<T> clazz, String data) {
+        try {
+            Constructor<T> constructor = clazz.getConstructor(String.class);
+            return constructor.newInstance(data);
+        } catch (NoSuchMethodException e) {
+            e.printStackTrace();
+        } catch (InstantiationException e) {
+            e.printStackTrace();
+        } catch (IllegalAccessException e) {
+            e.printStackTrace();
+        } catch (IllegalArgumentException e) {
+            e.printStackTrace();
+        } catch (InvocationTargetException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
 
-	@Override
-	protected Response<String> parseNetworkResponse(NetworkResponse response) {
-		Log.i("parseNetworkResponse", "result parseNetworkResponse:" + new String(response.data));
-		String parsed;
-		try {
-			if (mGzipEnable) {
-				parsed = getRealString(response.data);
-			} else {
-				parsed = new String(response.data, HttpHeaderParser.parseCharset(response.headers));
-			}
-		} catch (UnsupportedEncodingException e) {
-			parsed = new String(response.data);
-		}
-		return Response.success(parsed, HttpHeaderParser.parseCacheHeaders(response));
-	}
+    @Override
+    protected Response<String> parseNetworkResponse(NetworkResponse response) {
+        Log.i("parseNetworkResponse", "result parseNetworkResponse:" + new String(response.data));
+        String parsed;
+        try {
+            if (mGzipEnable) {
+                parsed = getRealString(response.data);
+            } else {
+                parsed = new String(response.data, HttpHeaderParser.parseCharset(response.headers));
+            }
+        } catch (UnsupportedEncodingException e) {
+            parsed = new String(response.data);
+        }
+        return Response.success(parsed, HttpHeaderParser.parseCacheHeaders(response));
+    }
 
-	private int getShort(byte[] data) {
-		return (data[0] << 8) | data[1] & 0xFF;
-	}
+    private int getShort(byte[] data) {
+        return (data[0] << 8) | data[1] & 0xFF;
+    }
 
-	/**
-	 * GZip解压缩
-	 */
-	private String getRealString(byte[] data) {
-		byte[] h = new byte[2];
-		h[0] = (data)[0];
-		h[1] = (data)[1];
-		int head = getShort(h);
-		boolean t = head == 0x1f8b;
-		InputStream in;
-		StringBuilder sb = new StringBuilder();
-		try {
-			ByteArrayInputStream bis = new ByteArrayInputStream(data);
-			if (t) {
-				in = new GZIPInputStream(bis);
-			} else {
-				in = bis;
-			}
-			BufferedReader r = new BufferedReader(new InputStreamReader(in), 1000);
-			for (String line = r.readLine(); line != null; line = r.readLine()) {
-				sb.append(line);
-			}
-			in.close();
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return sb.toString();
-	}
+    /**
+     * GZip解压缩
+     */
+    private String getRealString(byte[] data) {
+        byte[] h = new byte[2];
+        h[0] = (data)[0];
+        h[1] = (data)[1];
+        int head = getShort(h);
+        boolean t = head == 0x1f8b;
+        InputStream in;
+        StringBuilder sb = new StringBuilder();
+        try {
+            ByteArrayInputStream bis = new ByteArrayInputStream(data);
+            if (t) {
+                in = new GZIPInputStream(bis);
+            } else {
+                in = bis;
+            }
+            BufferedReader r = new BufferedReader(new InputStreamReader(in), 1000);
+            for (String line = r.readLine(); line != null; line = r.readLine()) {
+                sb.append(line);
+            }
+            in.close();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return sb.toString();
+    }
 
-	public interface Listener<T> {
-		void onResponse(ObjectResult<T> result);
-	}
+    public interface Listener<T> {
+        void onResponse(ObjectResult<T> result);
+    }
 
 }