From 46122af132dcf002b02d49e75d4c0e933416e2fd Mon Sep 17 00:00:00 2001
From: wangmi <wangmi@wangmideMacBook-Pro.local>
Date: Mon, 26 Dec 2016 22:39:09 +0800
Subject: [PATCH] update user list dist

---
 .idea/libraries/utdid4all_1_0_4.xml                      | 9 ---------
 qy/src/main/AndroidManifest.xml                          | 2 +-
 .../com/baidu/mapapi/overlayutil/OverlayManager.java     | 8 +++-----
 qy/src/main/java/com/qiyou/mb/android/QiYouConstant.java | 6 +++---
 .../main/java/com/qiyou/mb/android/ui/MainActivity.java  | 2 +-
 .../qiyou/mb/android/ui/fragments/WebList_fragment.java  | 5 +++--
 6 files changed, 11 insertions(+), 21 deletions(-)
 delete mode 100644 .idea/libraries/utdid4all_1_0_4.xml

diff --git a/.idea/libraries/utdid4all_1_0_4.xml b/.idea/libraries/utdid4all_1_0_4.xml
deleted file mode 100644
index d577ff2..0000000
--- a/.idea/libraries/utdid4all_1_0_4.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<component name="libraryTable">
-  <library name="utdid4all-1.0.4">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/qy/libs/utdid4all-1.0.4.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/qy/src/main/AndroidManifest.xml b/qy/src/main/AndroidManifest.xml
index 27b1a2c..4f52a53 100644
--- a/qy/src/main/AndroidManifest.xml
+++ b/qy/src/main/AndroidManifest.xml
@@ -161,7 +161,7 @@
 
 		<meta-data
 			android:name="UMENG_CHANNEL"
-			android:value="pp" >
+			android:value="i7lv" >
 		</meta-data>
 
 	      <activity android:name="com.umeng.socialize.view.ShareActivity"
diff --git a/qy/src/main/java/com/baidu/mapapi/overlayutil/OverlayManager.java b/qy/src/main/java/com/baidu/mapapi/overlayutil/OverlayManager.java
index 78c4064..5f7fded 100644
--- a/qy/src/main/java/com/baidu/mapapi/overlayutil/OverlayManager.java
+++ b/qy/src/main/java/com/baidu/mapapi/overlayutil/OverlayManager.java
@@ -1,7 +1,5 @@
 package com.baidu.mapapi.overlayutil;
 
-import android.util.Log;
-
 import com.baidu.mapapi.map.BaiduMap;
 import com.baidu.mapapi.map.BaiduMap.OnPolylineClickListener;
 import com.baidu.mapapi.map.MapStatusUpdateFactory;
@@ -82,13 +80,13 @@ public abstract class OverlayManager implements OnMarkerClickListener, OnPolylin
 	        	 try{
 	        		 mOverlayList.add(mBaiduMap.addOverlay(option));
 	        	  }catch(Exception e){
-	             	Log.e("com.qiyou", e.getStackTrace().toString());
+//	             	Log.e("com.qiyou", e.getStackTrace().toString());
 	             }
 	        }
          }catch(ConcurrentModificationException e){
-        	Log.e("com.qiyou", e.getMessage());
+//        	Log.e("com.qiyou", e.getMessage());
         }catch(Exception e){
-        	Log.e("com.qiyou", e.getMessage());
+//        	Log.e("com.qiyou", e.getMessage());
         } 
 //	   addLines();     
     }
diff --git a/qy/src/main/java/com/qiyou/mb/android/QiYouConstant.java b/qy/src/main/java/com/qiyou/mb/android/QiYouConstant.java
index e938c20..7ac33ba 100644
--- a/qy/src/main/java/com/qiyou/mb/android/QiYouConstant.java
+++ b/qy/src/main/java/com/qiyou/mb/android/QiYouConstant.java
@@ -9,13 +9,13 @@ public class QiYouConstant {
 
 //public final static String GG_API_KEY ="AIzaSyAnkLsprzJIbz_9EVOMcXvlPlxYtIfc0yg"; --office AIzaSyBygKp-tvHCRJFt19NJ2oyq0N6aCUCbKjU
 public final static String GG_API_KEY ="AIzaSyBAey0WNbuvc2WeEbCOsGEpp2WW0iw77u0";   
-//public final static String BASE_URL ="https://www.i7lv.net/";// "http://office:8080/qiyouji/"; //http://121.42.55.18:8080/qiyouji/
-public final static String BASE_URL ="https://www.i7lv.com/";//new website
+public final static String BASE_URL ="https://www.i7lv.net/";// "http://office:8080/qiyouji/"; //http://121.42.55.18:8080/qiyouji/
+//public final static String BASE_URL ="https://www.i7lv.com/";//new website
 public final static String BASE_MD_URL = BASE_URL;//+"upload/";
 public final static String BASE_STATIC_URL = BASE_URL +"staticmap/";
 public final static String TENCENT_APP_ID = "1104563148";
 // TODO Turn off when deploying.
-public static boolean DEVELOPER_MODE = false;
+public static boolean DEVELOPER_MODE = true;
 
 public static boolean  PLAYBACK_CAN_RECORD = false  /*DEVELOPER_MODE*/  ;
  
diff --git a/qy/src/main/java/com/qiyou/mb/android/ui/MainActivity.java b/qy/src/main/java/com/qiyou/mb/android/ui/MainActivity.java
index 4615bae..d6d5421 100644
--- a/qy/src/main/java/com/qiyou/mb/android/ui/MainActivity.java
+++ b/qy/src/main/java/com/qiyou/mb/android/ui/MainActivity.java
@@ -239,7 +239,7 @@ public class MainActivity extends Activity_qiyouBase {
 	    com.umeng.socialize.utils.Log.LOG = QiYouConstant.DEVELOPER_MODE; 
         String key ="550aa4e4fd98c5a25c000284" ; //old "4eaee02c527015373b000003"
 	   if (!QiYouConstant.DEVELOPER_MODE){
-		   UMAnalyticsConfig config = new  UMAnalyticsConfig(this,key , "pp");
+		   UMAnalyticsConfig config = new  UMAnalyticsConfig(this,key , "i7lv");
 		   MobclickAgent. startWithConfigure(config);
 		   MobclickAgent.openActivityDurationTrack(false);
 	   }
diff --git a/qy/src/main/java/com/qiyou/mb/android/ui/fragments/WebList_fragment.java b/qy/src/main/java/com/qiyou/mb/android/ui/fragments/WebList_fragment.java
index 54cef7f..072a949 100755
--- a/qy/src/main/java/com/qiyou/mb/android/ui/fragments/WebList_fragment.java
+++ b/qy/src/main/java/com/qiyou/mb/android/ui/fragments/WebList_fragment.java
@@ -2054,8 +2054,9 @@ public class WebList_fragment extends TrackMap_fragment/* TrackList_fragment *//
 					 * strUrls=ab.getQqAbulmUrl(); }
 					 */
 					t.put("urls", strUrls);
-				
-					String dist = ab.getLat() > 0 && QiYouConstant.PV_LAST_LAT > 0 ? Utils.getDistanceRange(0,ab.getLat(), ab.getLon()) : "--" ;  
+
+					String d = String.format("%.0f", Utils.getDistanceFromXtoY(ab.getLat(), ab.getLon(), QiYouConstant.PV_LAST_LAT, QiYouConstant.PV_LAST_LON)/1000);
+					String dist = ab.getLat() > 0 && QiYouConstant.PV_LAST_LAT > 0 ? d /*Utils.getDistanceRange(0,ab.getLat(), ab.getLon())*/ : "--" ;
 				    t.put("distrange",dist ) ;
 				    
 //					t.put("distrange",