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

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

@@ -53,11 +53,14 @@ public class MapChallengeActivity extends Activity {
         btnMap4 = findViewById(R.id.btn_map_4);
         btnMap5 = findViewById(R.id.btn_map_5);
         btnMap6 = findViewById(R.id.btn_map_6);
+
     }
 
     void login(){
         Map<String, String> params = new HashMap<>();
-        ApiHttpClient.get(ApiUrl.login, new CSMHttpCallback() {
+        params.put("ptcmobile",name);
+        params.put("ptcpswd",pwd);
+        ApiHttpClient.get(ApiUrl.login,params, new CSMHttpCallback() {
             @Override
             protected void onSuccess(String jsonStr) {
 

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

@@ -75,6 +75,14 @@ public class ApiHttpClient {
         return partUrl;
     }
 
+    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);
+        }
+        return partUrl;
+    }
+
     public static void get(String partUrl, CSMHttpCallback callback) {
         OkHttpUtils
                 .get()
@@ -87,7 +95,7 @@ public class ApiHttpClient {
     public static void get(String partUrl, Map<String, String> params,CSMHttpCallback callback) {
         OkHttpUtils
                 .get()
-                .url(getAbsoluteApiUrl(partUrl))
+                .url(getAbsoluteApiUrl(partUrl,params))
                 .headers(headers)
                 .build()
                 .execute(callback);

app/src/main/java/com/xunao/effectdemo/utils/TimeZoneUtil.java

@@ -0,0 +1,35 @@
+package com.xunao.effectdemo.utils;
+
+import java.util.Date;
+import java.util.TimeZone;
+
+public class TimeZoneUtil {
+
+	/**
+	 * 判断用户的设备时区是否为东八区（中国） 2014年7月31日
+	 * @return
+	 */
+	public static boolean isInEasternEightZones() {
+		boolean defaultVaule = true;
+		if (TimeZone.getDefault() == TimeZone.getTimeZone("GMT+08"))
+			defaultVaule = true;
+		else
+			defaultVaule = false;
+		return defaultVaule;
+	}
+
+	/**
+	 * 根据不同时区，转换时间 2014年7月31日
+	 * @param
+	 * @return
+	 */
+	public static Date transformTime(Date date, TimeZone oldZone, TimeZone newZone) {
+		Date finalDate = null;
+		if (date != null) {
+			int timeOffset = oldZone.getOffset(date.getTime())
+					- newZone.getOffset(date.getTime());
+			finalDate = new Date(date.getTime() - timeOffset);
+		}
+		return finalDate;
+	}
+}