Browse Source

彻底解决百度地图无法定位顽疾问题;

Arison 9 years ago
parent
commit
f382dbefb3

+ 1 - 1
WeiChat/build.gradle

@@ -8,7 +8,7 @@ android {
     }
     signingConfigs {
         config {
-            storeFile file('D:/config/applicationsignname[20150409]')
+            storeFile file('C:/Users/Arison/Desktop/applicationsignname[20150409]')
             storePassword '13237658359'
             keyAlias 'jie-20150409'
             keyPassword '13237658359'

+ 2 - 2
WeiChat/src/main/AndroidManifest.xml

@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="com.xzjmyk.pm.activity"
-    android:versionCode="56"
-    android:versionName="5.5.1">
+    android:versionCode="57"
+    android:versionName="5.5.2">
 
     <uses-sdk
         android:minSdkVersion="11"

+ 3 - 0
WeiChat/src/main/java/com/xzjmyk/pm/activity/BdLocationHelper.java

@@ -52,6 +52,7 @@ public class BdLocationHelper {
         option.SetIgnoreCacheException(false);//可选,默认false,设置是否收集CRASH信息,默认收集
         option.setEnableSimulateGps(true);//可选,默认false,设置是否需要过滤gps仿真结果,默认需要
         option.setNeedDeviceDirect(false);
+        option.disableCache(false);
         mLocationClient.setLocOption(option);
         requestLocation();//重新定位
     }
@@ -67,11 +68,13 @@ public class BdLocationHelper {
         if (!mLocationClient.isStarted()) {
             mFaildCount = 0;
             mLocationClient.start();
+            Log.i("roamaer", "requestLocation:开始定位!" );
         } else {
             int scanSpan = mLocationClient.getLocOption().getScanSpan();
             if (scanSpan < 1000) {
                 mLocationClient.getLocOption().setScanSpan(5000);
             }
+            Log.i("roamaer", "requestLocation:setScanSpan!" );
         }
     }
 

+ 1 - 2
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/WebViewCommActivity.java

@@ -11,7 +11,6 @@ import android.view.MenuItem;
 import android.view.View;
 import android.webkit.CookieManager;
 import android.webkit.CookieSyncManager;
-import android.webkit.WebSettings;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
 import android.widget.ImageView;
@@ -118,7 +117,7 @@ public class WebViewCommActivity extends BaseActivity {
                 login(this);
         }
         webView.getRefreshableView().getSettings().setJavaScriptEnabled(true);
-        webView.getRefreshableView().getSettings().setCacheMode(WebSettings.LOAD_NO_CACHE); //设置 缓存模式
+      //  webView.getRefreshableView().getSettings().setCacheMode(WebSettings.LOAD_NO_CACHE); //设置 缓存模式
         webView.getRefreshableView().getSettings().setDomStorageEnabled(true);
         webView.getRefreshableView().getSettings().setDatabaseEnabled(true);
         webView.getRefreshableView().getSettings().setAppCacheEnabled(true);

+ 24 - 21
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/WebViewLoadActivity.java

@@ -1,24 +1,5 @@
 package com.xzjmyk.pm.activity.ui.erp.activity;
 
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.http.util.EncodingUtils;
-
-import com.handmark.pulltorefresh.library.PullToRefreshWebView;
-import com.xzjmyk.pm.activity.ui.erp.model.LoginEntity;
-import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
-import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.ui.MainActivity;
-import com.xzjmyk.pm.activity.ui.base.BaseActivity;
-import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
-import com.xzjmyk.pm.activity.ui.erp.util.Blowfish;
-import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
-import com.xzjmyk.pm.activity.ui.erp.util.Constants;
-import com.xzjmyk.pm.activity.ui.erp.util.FlexJsonUtil;
-
 import android.annotation.SuppressLint;
 import android.content.Intent;
 import android.os.Bundle;
@@ -32,6 +13,26 @@ import android.webkit.WebViewClient;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
+import com.alibaba.fastjson.JSON;
+import com.handmark.pulltorefresh.library.PullToRefreshWebView;
+import com.xzjmyk.pm.activity.R;
+import com.xzjmyk.pm.activity.ui.MainActivity;
+import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+import com.xzjmyk.pm.activity.ui.erp.model.LoginEntity;
+import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
+import com.xzjmyk.pm.activity.ui.erp.util.Blowfish;
+import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
+import com.xzjmyk.pm.activity.ui.erp.util.Constants;
+import com.xzjmyk.pm.activity.ui.erp.util.FlexJsonUtil;
+import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
+
+import org.apache.http.util.EncodingUtils;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 /**
  * @注释:链接网址
  */
@@ -227,7 +228,8 @@ public class WebViewLoadActivity extends BaseActivity {
     private void updateCompany(String uu, String master) {
         String json = CommonUtil.getSharedPreferences(this, "loginJson");
         System.out.println("login json=" + json);
-        List<LoginEntity> logMsg = FlexJsonUtil.fromJsonArray(json, LoginEntity.class);
+        List<LoginEntity> logMsg = JSON.parseArray(json, LoginEntity.class);
+               // FlexJsonUtil.fromJsonArray(json, LoginEntity.class);
         for (int i = 0; i < logMsg.size(); i++) {
             LoginEntity entity = logMsg.get(i);
             if ((String.valueOf(entity.getEnuu())).equals(uu)) {
@@ -257,7 +259,8 @@ public class WebViewLoadActivity extends BaseActivity {
     private void updateCompanyByMasterId(String masterId, String master) {
         String json = CommonUtil.getSharedPreferences(this, "loginJson");
         System.out.println("login json=" + json);
-        List<LoginEntity> logMsg = FlexJsonUtil.fromJsonArray(json, LoginEntity.class);
+        List<LoginEntity> logMsg =  JSON.parseArray(json, LoginEntity.class);
+                
         for (int i = 0; i < logMsg.size(); i++) {
             LoginEntity entity = logMsg.get(i);
             if ((String.valueOf(entity.getMasterId())).equals(masterId)) {

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/me/FeedbackActivity.java

@@ -481,7 +481,7 @@ public class FeedbackActivity extends BaseActivity  implements View.OnClickListe
     String cb_code;
     private void commit(){
         if (!StringUtils.isEmpty(mTextEdit.getText().toString())) {
-            String url = "http://218.17.158.219:8099/ERP/mobile/Commentsback_mobile.action";
+            String url = "http://218.18.115.198:8888/ERP/mobile/Commentsback_mobile.action";
 
             String formStore = "{\n" +
                     " \"cb_code\":\"" + cb_code + "\",\n" +

+ 3 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/fragment/SigninFragment.java

@@ -39,6 +39,7 @@ import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 import com.xzjmyk.pm.activity.ui.tool.ThreadUtil;
 import com.xzjmyk.pm.activity.util.BaiduMapUtil;
 import com.xzjmyk.pm.activity.util.CalendarUtils;
+import com.xzjmyk.pm.activity.util.DateFormatUtil;
 import com.xzjmyk.pm.activity.util.TimeUtils;
 import com.xzjmyk.pm.activity.view.crouton.Crouton;
 import com.xzjmyk.pm.activity.view.wheel.OASigninPicker;
@@ -290,7 +291,7 @@ public class SigninFragment extends EasyFragment implements View.OnClickListener
                 try {
                     while (isRunable) {
                         locationHelper.requestLocation();
-                        Thread.sleep(5000);
+                        Thread.sleep(10000);
                     }
                 } catch (InterruptedException e) {
                     e.printStackTrace();
@@ -308,6 +309,7 @@ public class SigninFragment extends EasyFragment implements View.OnClickListener
 
     private void setBaiduLocation() {
         if (onActivityResult) return;
+        Log.i("roamer", "setBaiduLocation:地理位置信息更新" + DateFormatUtil.getStrDate4Date(new Date(), "yyyy-MM-dd HH:mm:ss"));
         longitude = MyApplication.getInstance().getBdLocationHelper().getLongitude();
         latitude = MyApplication.getInstance().getBdLocationHelper().getLatitude();
         loaction = MyApplication.getInstance().getBdLocationHelper().getName();