完善导航逻辑

WeiChat/build.gradle

@@ -112,14 +112,14 @@ dependencies {
     compile('com.facebook.stetho:stetho:1.4.1') {
         force = true
     }
-    compile 'de.hdodenhof:circleimageview:2.1.0'
-    compile 'com.alibaba:fastjson:1.2.24'
     compile project(':library-refreshlayout')
     compile files('src/main/jniLibs/pushservice-5.3.0.99.jar')
     compile files('libs/lite-orm-1.7.0.jar')
     compile files('libs/Msc.jar')
     compile files('libs/zhy_treeview.jar')
     compile 'com.alibaba:fastjson:1.2.24'
+    compile 'de.hdodenhof:circleimageview:2.1.0'
+    compile 'com.alibaba:fastjson:1.2.24'
     compile 'joda-time:joda-time:2.9.4'
     compile 'com.readystatesoftware.systembartint:systembartint:1.0.3'
     compile 'com.android.support:support-v4:22.2.1'
@@ -133,6 +133,7 @@ dependencies {
     compile 'cat.ereza:customactivityoncrash:1.5.0'
     compile 'se.emilsjolander:stickylistheaders:2.7.0'
     compile 'com.github.TonicArtos:StickyGridHeaders:1.0.1'
+    compile 'com.android.support.constraint:constraint-layout:1.0.2'
     testCompile 'junit:junit:4.12'
     androidTestCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5'
     debugCompile 'com.squareup.leakcanary:leakcanary-android:1.5'

WeiChat/src/main/AndroidManifest.xml

@@ -147,8 +147,8 @@
         <!-- 登录模块 -->
         <activity
             android:name=".ui.account.LoginActivity"
-            android:theme="@style/Theme.AppCompat.Light.NoActionBar"
             android:launchMode="singleTask"
+            android:theme="@style/Theme.AppCompat.Light.NoActionBar"
             android:windowSoftInputMode="adjustPan" />
         <activity android:name=".ui.account.LoginHistoryActivity" />
         <activity android:name=".ui.account.DataDownloadActivity" />
@@ -163,8 +163,9 @@
         <activity android:name=".ui.erp.activity.SaleDetailActivity" />
         <activity android:name=".ui.erp.activity.LeaveActivity" />
         <activity android:name=".ui.erp.activity.ExtraLeaveActivity" />
-        <activity android:name=".ui.erp.activity.WorkExtraActivity"
-            android:windowSoftInputMode="adjustPan"/>
+        <activity
+            android:name=".ui.erp.activity.WorkExtraActivity"
+            android:windowSoftInputMode="adjustPan" />
         <activity android:name=".ui.erp.activity.TravelActivity" />
         <activity android:name=".ui.erp.activity.CommonDocDetailsActivity" />
         <activity android:name=".ui.erp.activity.SaleSelectActivity" />
@@ -890,21 +891,24 @@
         <activity android:name=".ui.platform.pageforms.LeavePageActivity" />
         <activity android:name=".ui.erp.activity.oa.PlatDailyShowActivity" />
         <activity android:name=".ui.erp.activity.oa.PlatWDdetailyActivity" />
-        <activity android:name=".ui.platform.pageforms.TravelPageActivity"
-            android:windowSoftInputMode="adjustPan"/>
-        <activity android:name=".ui.platform.pageforms.FormDetailActivity"></activity>
-        <activity android:name=".ui.erp.activity.message.ProcessB2BActivity"></activity>
-        <activity android:name=".ui.platform.task.TaskB2BActivity"></activity>
-        <activity android:name=".ui.platform.task.TaskAddB2BActivity"></activity>
-        <activity android:name=".ui.platform.task.TaskDetailB2BActivity"></activity>
+        <activity
+            android:name=".ui.platform.pageforms.TravelPageActivity"
+            android:windowSoftInputMode="adjustPan" />
+        <activity android:name=".ui.platform.pageforms.FormDetailActivity" />
+        <activity android:name=".ui.erp.activity.message.ProcessB2BActivity" />
+        <activity android:name=".ui.platform.task.TaskB2BActivity" />
+        <activity android:name=".ui.platform.task.TaskAddB2BActivity" />
+        <activity android:name=".ui.platform.task.TaskDetailB2BActivity" />
         <activity
             android:name=".ui.erp.activity.PlatLeaveAddActivity"
             android:label="请假单"
-            android:windowSoftInputMode="adjustPan"/>
+            android:windowSoftInputMode="adjustPan" />
         <activity android:name=".ui.platform.activity.ChangeDealManActivity" />
-        <activity android:name=".ui.erp.activity.oa.NavigationActivity"
-            android:label="导航"/>
-        <activity android:name=".ui.platform.task.TaskAddErpActivity"/>
+        <activity
+            android:name=".ui.erp.activity.oa.NavigationActivity"
+            android:label="导航" />
+        <activity android:name=".ui.platform.task.TaskAddErpActivity" />
+        <activity android:name=".ui.erp.activity.oa.NavigationWebActivity"></activity>
     </application>
 
 </manifest>

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/circle/SendShuoshuoActivity.java

@@ -37,13 +37,10 @@ import com.xzjmyk.pm.activity.bean.Area;
 import com.xzjmyk.pm.activity.bean.UploadFileResult;
 import com.xzjmyk.pm.activity.helper.LoginHelper;
 import com.xzjmyk.pm.activity.helper.UploadService;
-import com.xzjmyk.pm.activity.ui.MainActivity;
 import com.xzjmyk.pm.activity.ui.account.LoginActivity;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.LocationMapActivity;
-import com.xzjmyk.pm.activity.ui.erp.activity.oa.WorkDailyShowActivity;
 import com.xzjmyk.pm.activity.ui.tool.MultiImagePreviewActivity;
-import com.xzjmyk.pm.activity.util.BaiduMapUtil;
 import com.xzjmyk.pm.activity.util.CameraUtil;
 import com.xzjmyk.pm.activity.util.DeviceInfoUtil;
 import com.xzjmyk.pm.activity.util.ProgressDialogUtil;

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

@@ -248,8 +248,6 @@ public class WebViewLoadActivity extends BaseActivity {
             Log.i("WebView", "onResume url=" +urlload+ postData);
             webView.getRefreshableView().postUrl(urlload, EncodingUtils.getBytes(postData, "base64"));
         }
-        
-      
     }
 
     // 根据通知收到的公司enuu与账套master

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

@@ -37,7 +37,7 @@ import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.JsonValidator;
 import com.xzjmyk.pm.activity.ui.erp.util.ListUtils;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
-import com.xzjmyk.pm.activity.util.BaiduMapUtil;
+import com.xzjmyk.pm.activity.ui.erp.util.oa.baidu.BaiduMapUtil;
 import com.xzjmyk.pm.activity.util.TimeUtils;
 import com.xzjmyk.pm.activity.view.ClearEditText;
 import com.xzjmyk.pm.activity.view.crouton.Style;

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

@@ -27,7 +27,7 @@ import com.xzjmyk.pm.activity.BdLocationHelper;
 import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
-import com.xzjmyk.pm.activity.util.BaiduMapUtil;
+import com.xzjmyk.pm.activity.ui.erp.util.oa.baidu.BaiduMapUtil;
 import com.xzjmyk.pm.activity.util.StringUtils;
 
 import java.util.List;

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

@@ -31,7 +31,7 @@ import com.xzjmyk.pm.activity.ui.erp.entity.EditChangeListener;
 import com.xzjmyk.pm.activity.ui.erp.util.ListUtils;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 import com.xzjmyk.pm.activity.ui.erp.view.EmptyLayout;
-import com.xzjmyk.pm.activity.util.BaiduMapUtil;
+import com.xzjmyk.pm.activity.ui.erp.util.oa.baidu.BaiduMapUtil;
 
 import java.text.DecimalFormat;
 import java.util.ArrayList;

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

@@ -44,7 +44,7 @@ import com.xzjmyk.pm.activity.ui.erp.presenter.imp.IMissionPresenter;
 import com.xzjmyk.pm.activity.ui.erp.util.ListUtils;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 import com.xzjmyk.pm.activity.ui.erp.util.baidu.OnGetDrivingRouteResult;
-import com.xzjmyk.pm.activity.util.BaiduMapUtil;
+import com.xzjmyk.pm.activity.ui.erp.util.oa.baidu.BaiduMapUtil;
 import com.xzjmyk.pm.activity.util.DisplayUtil;
 import com.xzjmyk.pm.activity.util.PreferenceUtils;
 import com.xzjmyk.pm.activity.util.TimeUtils;
@@ -54,7 +54,7 @@ import com.xzjmyk.pm.activity.wxapi.ApiUtils;
 
 import java.util.List;
 
-import static com.xzjmyk.pm.activity.util.BaiduMapUtil.getInstence;
+import static com.xzjmyk.pm.activity.ui.erp.util.oa.baidu.BaiduMapUtil.getInstence;
 
 
 public class MissionActivity extends OABaseActivity implements View.OnClickListener, IMission, MissionAdapter.OnitemClickListener {
@@ -280,13 +280,12 @@ public class MissionActivity extends OABaseActivity implements View.OnClickListe
                 if (model == null || model.getStatus() == 1) return;
                 intent = new Intent(ct, SelectRemarkActivity.class);
                 startActivityForResult(intent, 0x23);
+
                 break;
             case R.id.item_long_tv:
-                if (2 == 1) {
                     intent = new Intent(ct, NavigationActivity.class);
                     intent.putExtra("toLocation", model.getLatLng());
                     startActivityForResult(intent, 0x23);
-                }
                 break;
         }
     }

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

@@ -4,38 +4,44 @@ import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
+import android.net.Uri;
 import android.os.Bundle;
 import android.support.v4.content.LocalBroadcastManager;
+import android.view.Menu;
+import android.view.MenuItem;
 import android.widget.Toast;
 
 import com.baidu.mapapi.map.MapView;
 import com.baidu.mapapi.model.LatLng;
 import com.baidu.mapapi.search.core.SearchResult;
-import com.baidu.mapapi.search.route.BikingRouteResult;
 import com.baidu.mapapi.search.route.DrivingRoutePlanOption;
 import com.baidu.mapapi.search.route.DrivingRouteResult;
 import com.baidu.mapapi.search.route.OnGetRoutePlanResultListener;
 import com.baidu.mapapi.search.route.PlanNode;
 import com.baidu.mapapi.search.route.RoutePlanSearch;
-import com.baidu.mapapi.search.route.TransitRouteResult;
-import com.baidu.mapapi.search.route.WalkingRouteResult;
+import com.lidroid.xutils.ViewUtils;
+import com.lidroid.xutils.view.annotation.ViewInject;
 import com.xzjmyk.pm.activity.BdLocationHelper;
 import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
-import com.xzjmyk.pm.activity.util.BaiduMapUtil;
+import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
+import com.xzjmyk.pm.activity.ui.erp.util.LogUtil;
+import com.xzjmyk.pm.activity.ui.erp.util.oa.baidu.BaiduMapUtil;
+import com.xzjmyk.pm.activity.ui.erp.util.oa.baidu.OnGetRoutePlanResult;
 import com.xzjmyk.pm.activity.util.DrivingRouteOverlay;
 
-public class NavigationActivity extends BaseActivity {
+import java.io.File;
 
+public class NavigationActivity extends BaseActivity {
+    @ViewInject(R.id.baiduMap)
     private MapView baiduMap;
     private LatLng toLocation;
 
 
-    private BroadcastReceiver receiver = new BroadcastReceiver() {
+    private BroadcastReceiver upLocationReceiver = new BroadcastReceiver() {
         @Override
         public void onReceive(Context context, Intent intent) {
-//            loadMap();
         }
     };
 
@@ -43,30 +49,55 @@ public class NavigationActivity extends BaseActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_navigation);
-        baiduMap = (MapView) findViewById(R.id.baiduMap);
-        Intent intent = getIntent();
-        if (intent == null) new NullPointerException("intent is null");
-        toLocation = getIntent().getParcelableExtra("toLocation");
-        IntentFilter filter = new IntentFilter();
-        filter.addAction(BdLocationHelper.UPLOCATION_ACTION);
-        LocalBroadcastManager.getInstance(ct).registerReceiver(receiver, filter);
-        loadMap();
+        ViewUtils.inject(this);
+        initReceiver();
+
+    }
+
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.menu_navigation, menu);
+        return super.onCreateOptionsMenu(menu);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId() == R.id.other_map) {
+            //使用其他地图
+            userOtherMap();
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        initView();
     }
 
     @Override
     protected void onDestroy() {
         super.onDestroy();
-        LocalBroadcastManager.getInstance(ct).unregisterReceiver(receiver);
+        LocalBroadcastManager.getInstance(ct).unregisterReceiver(upLocationReceiver);
     }
 
-    private void loadMap() {
+    private void initReceiver() {
+        IntentFilter filter = new IntentFilter();
+        filter.addAction(BdLocationHelper.UPLOCATION_ACTION);
+        LocalBroadcastManager.getInstance(ct).registerReceiver(upLocationReceiver, filter);
+    }
+
+    private void initView() {
+        if (toLocation == null && getIntent() != null)
+            toLocation = getIntent().getParcelableExtra("toLocation");
         LatLng location = MyApplication.getInstance().getBdLocationHelper().getLocation();
         BaiduMapUtil.getInstence().setMapViewPoint(baiduMap, location);
-        driving(location, toLocation);
+        drawDriving(location, toLocation);
     }
 
-
-    private void driving(LatLng formLocation, LatLng toLocation) {
+    private void drawDriving(LatLng formLocation, LatLng toLocation) {
         //其中myLar myLon 是起点的经纬度  lat和lon是终点的经纬度
         RoutePlanSearch newInstance = RoutePlanSearch.newInstance();
         newInstance.setOnGetRoutePlanResultListener(listener);
@@ -81,18 +112,8 @@ public class NavigationActivity extends BaseActivity {
     }
 
 
-    private OnGetRoutePlanResultListener listener = new OnGetRoutePlanResultListener() {
-        @Override
-        public void onGetWalkingRouteResult(WalkingRouteResult walkingRouteResult) {
+    private OnGetRoutePlanResultListener listener = new OnGetRoutePlanResult() {
 
-        }
-
-        @Override
-        public void onGetTransitRouteResult(TransitRouteResult transitRouteResult) {
-
-        }
-
-        @Override
         public void onGetDrivingRouteResult(DrivingRouteResult result) {
             //驾车
             if (result == null || SearchResult.ERRORNO.RESULT_NOT_FOUND == result.error) {
@@ -107,10 +128,51 @@ public class NavigationActivity extends BaseActivity {
             overlay.zoomToSpan();
         }
 
-        @Override
-        public void onGetBikingRouteResult(BikingRouteResult bikingRouteResult) {
+    };
+
+
+    private void userOtherMap() {
+        userBaiduWebMap();
+//        if (isInstallBaidu()) {
+//            LogUtil.i("百度地图客户端已经安装");
+//            userBauduMap();
+//        } else {
+//            LogUtil.i("百度地图客户端没有安装");
+//            userBaiduWebMap();
+//        }
+    }
+
+    private boolean isInstallBaidu() {
+        return new File("/data/data/" + "com.baidu.BaiduMap").exists();
+    }
 
+    private boolean isInstallGaode() {
+        return new File("/data/data/" + "com.autonavi.minimap").exists();
+    }
+
+    private void userBauduMap() {
+        try {
+            Intent intent = new Intent();
+            intent.setData(Uri.parse("baidumap://map/navi?location=" + toLocation.latitude + "," + toLocation.longitude));
+            startActivity(intent);
+        } catch (Exception e) {
+            e.printStackTrace();
         }
-    };
+    }
+
+    private void userBaiduWebMap() {
+        LatLng location = MyApplication.getInstance().getBdLocationHelper().getLocation();
+        String url = "http://api.map.baidu.com/direction?" +
+                "origin=latlng:" + location.latitude + "," + location.longitude + "|name:起点" +
+                "&destination=latlng:" + toLocation.latitude + "," + toLocation.longitude + "|name:终点" +
+                "&mode=driving&region=深圳&output=html&src=com.xzjmyk.pm.activity";
+        String title = "导航";
+        LogUtil.i(url);
+        Intent intent=new Intent(ct,NavigationWebActivity.class);
+        intent.putExtra("title",title)
+        .putExtra("url",url);
+        startActivity(intent);
+    }
+
 
 }

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

@@ -0,0 +1,98 @@
+package com.xzjmyk.pm.activity.ui.erp.activity.oa;
+
+import android.content.Intent;
+import android.graphics.Bitmap;
+import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
+import android.view.View;
+import android.webkit.WebSettings;
+import android.webkit.WebView;
+import android.webkit.WebViewClient;
+import android.widget.ProgressBar;
+
+import com.handmark.pulltorefresh.library.PullToRefreshWebView;
+import com.lidroid.xutils.ViewUtils;
+import com.lidroid.xutils.view.annotation.ViewInject;
+import com.xzjmyk.pm.activity.R;
+import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
+
+public class NavigationWebActivity extends AppCompatActivity {
+    @ViewInject(R.id.loading_pb)
+    private ProgressBar loading_pb;
+    @ViewInject(R.id.webView)
+    private PullToRefreshWebView webView;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_navigation_web);
+        ViewUtils.inject(this);
+        initView();
+    }
+
+    private void initView() {
+        Intent intent = new Intent();
+        if (intent != null) {
+            String title = intent.getStringExtra("title");
+            if (!StringUtils.isEmpty(title))
+                getSupportActionBar().setTitle(title);
+            String url = intent.getStringExtra("url");
+            if (!StringUtils.isEmpty(url)) {
+                loadWebView(url);
+                webEvent();
+            }
+        }
+    }
+
+    private void loadWebView(String url) {
+        webView.getRefreshableView().getSettings().setJavaScriptEnabled(true);
+        webView.getRefreshableView().getSettings().setSupportZoom(true);
+        webView.getRefreshableView().getSettings().setBuiltInZoomControls(true);
+        webView.getRefreshableView().getSettings().setUseWideViewPort(true);
+        webView.getRefreshableView().getSettings().setDomStorageEnabled(true);
+        webView.getRefreshableView().getSettings().setLoadWithOverviewMode(true);
+        webView.getRefreshableView().getSettings().setDefaultTextEncodingName("utf-8");
+        webView.getRefreshableView().getSettings().setCacheMode(WebSettings.LOAD_NO_CACHE);
+        webView.getRefreshableView().clearCache(true);
+        webView.getRefreshableView().clearHistory();
+        webView.getRefreshableView().loadUrl(url);
+    }
+
+    private void webEvent() {
+        webView.getRefreshableView().setWebViewClient(new WebViewClient() {
+            public boolean shouldOverrideUrlLoading(WebView view, String url) {
+                view.loadUrl(url);
+                return true;
+            }
+
+            @Override
+            public void onPageStarted(WebView view, String url, Bitmap favicon) {
+                if (loading_pb.getVisibility() == View.GONE) {
+                    loading_pb.setVisibility(View.VISIBLE);
+                }
+            }
+
+            @Override
+            public void onPageFinished(WebView view, String url) {
+                if (loading_pb.getVisibility() == View.VISIBLE) {
+                    loading_pb.setVisibility(View.GONE);
+                }
+            }
+        });
+        webView.getRefreshableView().setWebChromeClient(new WebChromeClient());
+
+    }
+
+    public class WebChromeClient extends android.webkit.WebChromeClient {
+        @Override
+        public void onProgressChanged(WebView view, int newProgress) {
+            loading_pb.setProgress(newProgress);
+            if (newProgress == 100) {
+                loading_pb.setProgress(newProgress);
+                loading_pb.setVisibility(View.GONE);
+                webView.onRefreshComplete();
+            }
+            super.onProgressChanged(view, newProgress);
+        }
+    }
+}

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

@@ -30,7 +30,7 @@ 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.view.EmptyLayout;
 import com.xzjmyk.pm.activity.ui.tool.SingleImagePreviewActivity;
-import com.xzjmyk.pm.activity.util.BaiduMapUtil;
+import com.xzjmyk.pm.activity.ui.erp.util.oa.baidu.BaiduMapUtil;
 import com.xzjmyk.pm.activity.util.CalendarUtils;
 import com.xzjmyk.pm.activity.util.StringUtils;
 import com.xzjmyk.pm.activity.util.TimeUtils;

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

@@ -20,7 +20,7 @@ import com.xzjmyk.pm.activity.ui.erp.presenter.SearchPresenter;
 import com.xzjmyk.pm.activity.ui.erp.presenter.imp.ISearchView;
 import com.xzjmyk.pm.activity.ui.erp.util.ListUtils;
 import com.xzjmyk.pm.activity.ui.erp.view.EmptyLayout;
-import com.xzjmyk.pm.activity.util.BaiduMapUtil;
+import com.xzjmyk.pm.activity.ui.erp.util.oa.baidu.BaiduMapUtil;
 
 import java.util.List;
 

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

@@ -21,7 +21,7 @@ import com.xzjmyk.pm.activity.ui.erp.presenter.SelectAimPresenter;
 import com.xzjmyk.pm.activity.ui.erp.presenter.imp.ISelectAim;
 import com.xzjmyk.pm.activity.ui.erp.util.ListUtils;
 import com.xzjmyk.pm.activity.util.AndroidUtils;
-import com.xzjmyk.pm.activity.util.BaiduMapUtil;
+import com.xzjmyk.pm.activity.ui.erp.util.oa.baidu.BaiduMapUtil;
 import com.xzjmyk.pm.activity.view.ClearEditText;
 import com.xzjmyk.pm.activity.view.RecycleViewDivider;
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/adapter/MissionAdapter.java

@@ -14,7 +14,7 @@ import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.model.oa.MissionModel;
 import com.xzjmyk.pm.activity.ui.erp.util.ListUtils;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
-import com.xzjmyk.pm.activity.util.BaiduMapUtil;
+import com.xzjmyk.pm.activity.ui.erp.util.oa.baidu.BaiduMapUtil;
 
 import java.text.DecimalFormat;
 import java.util.List;

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

@@ -12,7 +12,7 @@ import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.erp.model.oa.SelectAimModel;
 import com.xzjmyk.pm.activity.ui.erp.util.ListUtils;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
-import com.xzjmyk.pm.activity.util.BaiduMapUtil;
+import com.xzjmyk.pm.activity.ui.erp.util.oa.baidu.BaiduMapUtil;
 
 import java.text.DecimalFormat;
 import java.util.List;

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

@@ -38,7 +38,7 @@ import com.xzjmyk.pm.activity.ui.erp.activity.oa.OutofficeActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.OutofficeSetActivity;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
-import com.xzjmyk.pm.activity.util.BaiduMapUtil;
+import com.xzjmyk.pm.activity.ui.erp.util.oa.baidu.BaiduMapUtil;
 import com.xzjmyk.pm.activity.util.StringUtils;
 import com.xzjmyk.pm.activity.util.TimeUtils;
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/presenter/MissionPresenter.java

@@ -21,7 +21,7 @@ import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 import com.xzjmyk.pm.activity.ui.erp.util.oa.AutoErpService;
 import com.xzjmyk.pm.activity.ui.erp.util.oa.HttpHandler;
 import com.xzjmyk.pm.activity.ui.erp.util.oa.WorkHandlerUtil;
-import com.xzjmyk.pm.activity.util.BaiduMapUtil;
+import com.xzjmyk.pm.activity.ui.erp.util.oa.baidu.BaiduMapUtil;
 import com.xzjmyk.pm.activity.util.PreferenceUtils;
 import com.xzjmyk.pm.activity.util.TimeUtils;
 import com.xzjmyk.pm.activity.wxapi.ApiConfig;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/presenter/SearchPresenter.java

@@ -14,7 +14,7 @@ import com.xzjmyk.pm.activity.ui.erp.model.oa.SearchLocationModel;
 import com.xzjmyk.pm.activity.ui.erp.presenter.imp.ISearchView;
 import com.xzjmyk.pm.activity.ui.erp.util.ListUtils;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
-import com.xzjmyk.pm.activity.util.BaiduMapUtil;
+import com.xzjmyk.pm.activity.ui.erp.util.oa.baidu.BaiduMapUtil;
 
 import java.util.ArrayList;
 import java.util.Collections;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/presenter/SelectAimPresenter.java

@@ -19,7 +19,7 @@ import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.ListUtils;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 import com.xzjmyk.pm.activity.ui.erp.util.oa.HttpHandler;
-import com.xzjmyk.pm.activity.util.BaiduMapUtil;
+import com.xzjmyk.pm.activity.ui.erp.util.oa.baidu.BaiduMapUtil;
 import com.xzjmyk.pm.activity.util.TimeUtils;
 import com.xzjmyk.pm.activity.wxapi.ApiConfig;
 import com.xzjmyk.pm.activity.wxapi.ApiPlatform;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/presenter/WorkPresenter.java

@@ -31,7 +31,7 @@ import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 import com.xzjmyk.pm.activity.ui.erp.util.oa.CommonInterface;
 import com.xzjmyk.pm.activity.ui.erp.util.oa.HttpHandler;
 import com.xzjmyk.pm.activity.ui.erp.util.oa.WorkHandlerUtil;
-import com.xzjmyk.pm.activity.util.BaiduMapUtil;
+import com.xzjmyk.pm.activity.ui.erp.util.oa.baidu.BaiduMapUtil;
 import com.xzjmyk.pm.activity.util.PreferenceUtils;
 import com.xzjmyk.pm.activity.util.TimeUtils;
 import com.xzjmyk.pm.activity.wxapi.ApiConfig;
@@ -45,7 +45,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import static com.xzjmyk.pm.activity.util.BaiduMapUtil.getInstence;
+import static com.xzjmyk.pm.activity.ui.erp.util.oa.baidu.BaiduMapUtil.getInstence;
 
 /**
  * 班次的管理器,先不处理数据库数据

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/presenter/imp/IMissionPresenter.java

@@ -20,4 +20,5 @@ public interface IMissionPresenter {
 
     void submit(List<MissionModel> models);
 
+
 }

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

@@ -29,14 +29,13 @@ import com.xzjmyk.pm.activity.ui.erp.model.oa.WorkModel;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.ListUtils;
 import com.xzjmyk.pm.activity.ui.erp.util.LogUtil;
-import com.xzjmyk.pm.activity.ui.erp.util.OACheckUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 import com.xzjmyk.pm.activity.ui.erp.util.baidu.OnGetDrivingRouteResult;
 import com.xzjmyk.pm.activity.ui.erp.util.oa.http.OAHttpHelper;
 import com.xzjmyk.pm.activity.ui.erp.util.oa.http.OnHttpResultListener;
 import com.xzjmyk.pm.activity.ui.erp.util.oa.http.Request;
 import com.xzjmyk.pm.activity.ui.tool.ThreadUtil;
-import com.xzjmyk.pm.activity.util.BaiduMapUtil;
+import com.xzjmyk.pm.activity.ui.erp.util.oa.baidu.BaiduMapUtil;
 import com.xzjmyk.pm.activity.util.MacAndIDUtil;
 import com.xzjmyk.pm.activity.util.PreferenceUtils;
 import com.xzjmyk.pm.activity.util.TimeUtils;

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

@@ -11,10 +11,6 @@ package com.xzjmyk.pm.activity.ui.erp.util.oa;
  */
 
 public class OAConfig {
-
-
-
-
     public static final String ARRAY_DATA = "ARRAY_DATA";//oa模块中通用调转页面专递的ParcelableArrayListExtra
     public static final String MODEL_DATA = "MODEL_DATA";//oa模块中通用调转页面专递的ParcelableExtra
     public static final String STRING_DATA = "STRING_DATA";//oa模块中通用调转页面专递的String

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

@@ -10,7 +10,7 @@ import com.xzjmyk.pm.activity.ui.erp.model.oa.WorkModel;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.ListUtils;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
-import com.xzjmyk.pm.activity.util.BaiduMapUtil;
+import com.xzjmyk.pm.activity.ui.erp.util.oa.baidu.BaiduMapUtil;
 import com.xzjmyk.pm.activity.util.PreferenceUtils;
 import com.xzjmyk.pm.activity.util.TimeUtils;
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/util/BaiduMapUtil.java → WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/util/oa/baidu/BaiduMapUtil.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.util;
+package com.xzjmyk.pm.activity.ui.erp.util.oa.baidu;
 
 import android.util.Log;
 
@@ -37,6 +37,7 @@ import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.db.dao.WorkLocationDao;
 import com.xzjmyk.pm.activity.ui.erp.model.oa.WorkLocationModel;
 import com.xzjmyk.pm.activity.ui.erp.util.ListUtils;
+import com.xzjmyk.pm.activity.util.StringUtils;
 
 import java.text.DecimalFormat;
 import java.util.List;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/util/oa/baidu/OnGetRoutePlanResult.java

@@ -0,0 +1,28 @@
+package com.xzjmyk.pm.activity.ui.erp.util.oa.baidu;
+
+import com.baidu.mapapi.search.route.BikingRouteResult;
+import com.baidu.mapapi.search.route.OnGetRoutePlanResultListener;
+import com.baidu.mapapi.search.route.TransitRouteResult;
+import com.baidu.mapapi.search.route.WalkingRouteResult;
+
+/**
+ * Created by Bitliker on 2017/4/13.
+ */
+
+public abstract class OnGetRoutePlanResult implements OnGetRoutePlanResultListener {
+    @Override
+    public void onGetWalkingRouteResult(WalkingRouteResult walkingRouteResult) {
+        //走路
+    }
+
+    @Override
+    public void onGetTransitRouteResult(TransitRouteResult transitRouteResult) {
+        //公交
+    }
+
+
+    @Override
+    public void onGetBikingRouteResult(BikingRouteResult bikingRouteResult) {
+        //自行车
+    }
+}

WeiChat/src/main/res/layout/activity_navigation_web.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <ProgressBar
+        android:id="@+id/loading_pb"
+        style="?android:attr/progressBarStyleHorizontal"
+        android:layout_width="fill_parent"
+        android:layout_height="5dip"
+        android:animationResolution="100"
+        android:indeterminate="false"
+        android:indeterminateDuration="500"
+        android:indeterminateOnly="false"
+        android:max="100"
+        android:progressDrawable="@drawable/webview_progress_bar"></ProgressBar>
+
+    <com.handmark.pulltorefresh.library.PullToRefreshWebView
+        android:id="@+id/webView"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/linen" />
+</LinearLayout>

WeiChat/src/main/res/menu/menu_navigation.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item
+        android:id="@+id/other_map"
+        android:title="@string/other_map"
+        app:showAsAction="always" />
+</menu>

WeiChat/src/main/res/values/strings.xml

@@ -134,6 +134,7 @@
     <string name="activity_mission_set">外勤设置</string>
     <string name="activity_mission_plan">外勤计划</string>
     <string name="too_long_to_http">网络请求超时，请检查网络或稍后重试</string>
+    <string name="other_map">使用其他地图</string>
     <string name="add_mission_plan">+增加外勤计划</string>
     <string name="current_time">当前时间</string>
     <string name="signin_ok">签到成功</string>

build.gradle

@@ -7,7 +7,7 @@ buildscript {
         maven { url "https://jitpack.io" }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.0'
+        classpath 'com.android.tools.build:gradle:2.3.0'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.0'
     }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Wed Sep 14 14:23:32 CST 2016
+#Thu Apr 13 10:30:54 CST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip