箩筐地图路径规划

app/build.gradle

@@ -37,8 +37,8 @@ android {
         applicationId "com.arpa.hndahesudintocctmsdriver"
         minSdkVersion 24
         targetSdkVersion 30
-        versionCode 68
+        versionCode 67
-        versionName "3.3.8"
+        versionName "3.3.7"
         flavorDimensions "CHANNEL_VALUE"
         flavorDimensions "app_icon"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -228,5 +228,6 @@ dependencies {
     implementation 'com.github.getActivity:XToast:8.2'
 
     implementation project(path: ':mylibrary')
+    implementation 'com.lk.mapsdk:sdk-full:2.3.7'
 
 }

app/src/main/AndroidManifest.xml

@@ -2,6 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="com.arpa.hndahesudintocctmsdriver">
+
     <uses-permission android:name="android.permission.CALL_PHONE" />
     <!-- 白名单 -->
     <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
@@ -14,6 +15,8 @@
     <!--播音-->
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <!-- 地图截屏图片保存等 -->
+    <uses-permission android:name="android.permission.READ_MEDIA_PERMISSION" />
     <!-- 极光 -->
     <uses-permission android:name="android.permission.GET_ACCOUNTS" />
     <uses-permission android:name="android.permission.READ_PROFILE" />
@@ -66,19 +69,24 @@
             android:name="com/alct/mdp"
             android:required="false" />
 
+        <meta-data
+            android:name="com.lk.lbsapi.API_KEY"
+            android:value="EE1721986040968235494A762772C95410D9881BB10790FC0BCRFNPFKW4K6697" />
+
+
         <activity
             android:name="com.arpa.hndahesudintocctmsdriver.ui.MainActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:exported="true"
             android:launchMode="singleTop"
-            android:screenOrientation="portrait" ></activity>
+            android:screenOrientation="portrait"></activity>
 
         <activity
             android:name="com.arpa.hndahesudintocctmsdriver.ui.wallet.WithdrawalActivity"
             android:screenOrientation="portrait" />
         <activity
             android:name="com.arpa.hndahesudintocctmsdriver.ui.wallet.UpBankActivity"
-            android:screenOrientation="portrait"/>
+            android:screenOrientation="portrait" />
         <activity
             android:name="com.arpa.hndahesudintocctmsdriver.ui.home.OrderAllActivity"
             android:screenOrientation="portrait" />
@@ -93,11 +101,11 @@
             android:screenOrientation="portrait" />
         <activity
             android:name="com.arpa.hndahesudintocctmsdriver.ui.auth.PhotoCarActivity"
-            android:windowSoftInputMode="adjustPan|stateHidden"
+            android:screenOrientation="portrait"
-            android:screenOrientation="portrait"  />
+            android:windowSoftInputMode="adjustPan|stateHidden" />
         <activity
             android:name="com.arpa.hndahesudintocctmsdriver.ui.auth.VehicleAuthActivity"
-            android:screenOrientation="portrait"/>
+            android:screenOrientation="portrait" />
         <activity
             android:name="com.arpa.hndahesudintocctmsdriver.ui.home.shangchuan.ShangChuangImgActivity"
             android:screenOrientation="portrait">
@@ -142,13 +150,13 @@
         </activity>
         <activity
             android:name="com.arpa.hndahesudintocctmsdriver.ui.home.shangchuan.GetShangChuanActivity"
-            android:screenOrientation="portrait"/>
+            android:screenOrientation="portrait" />
         <activity
             android:name="com.arpa.hndahesudintocctmsdriver.ui.auth.AuthQualificationActivity"
-            android:screenOrientation="portrait"/>
+            android:screenOrientation="portrait" />
         <activity
             android:name="com.arpa.hndahesudintocctmsdriver.ui.home.OrderListActivity"
-            android:screenOrientation="portrait"/>
+            android:screenOrientation="portrait" />
         <activity
             android:name="com.arpa.hndahesudintocctmsdriver.ui.home.HuoYunDelActivity"
             android:screenOrientation="portrait">
@@ -161,14 +169,14 @@
         </activity>
         <activity
             android:name="com.arpa.hndahesudintocctmsdriver.ui.auth.CertificatesActivity"
-            android:windowSoftInputMode="adjustPan|stateHidden"
+            android:screenOrientation="portrait"
-            android:screenOrientation="portrait"/>
+            android:windowSoftInputMode="adjustPan|stateHidden" />
         <activity
             android:name="com.arpa.hndahesudintocctmsdriver.ui.auth.AddCarSuccActivity"
-            android:screenOrientation="portrait"/>
+            android:screenOrientation="portrait" />
         <activity
             android:name="com.arpa.hndahesudintocctmsdriver.ui.login.LoginActivity"
-            android:screenOrientation="portrait"/>
+            android:screenOrientation="portrait" />
         <activity
             android:name="com.arpa.hndahesudintocctmsdriver.ui.login.WelcomeActivity"
             android:exported="true"
@@ -192,10 +200,10 @@
         </activity>
         <activity
             android:name="com.arpa.hndahesudintocctmsdriver.ui.home.drivercircle.VideoReleaseActivity"
-            android:screenOrientation="portrait"/>
+            android:screenOrientation="portrait" />
         <activity
             android:name="com.arpa.hndahesudintocctmsdriver.ui.home.shangchuan.WebPDFActivity"
-            android:screenOrientation="portrait"/>
+            android:screenOrientation="portrait" />
         <activity
             android:name="com.arpa.hndahesudintocctmsdriver.ui.home.StartYunDanActivity"
             android:screenOrientation="portrait">
@@ -203,13 +211,13 @@
         </activity>
         <activity
             android:name="com.arpa.hndahesudintocctmsdriver.ui.home.drivercircle.HomePageActivity"
-            android:screenOrientation="portrait"/>
+            android:screenOrientation="portrait" />
         <activity
             android:name="com.arpa.hndahesudintocctmsdriver.ui.alert.VehicleChoiceActivity"
-            android:screenOrientation="portrait"/>
+            android:screenOrientation="portrait" />
         <activity
             android:name="com.arpa.hndahesudintocctmsdriver.ui.home.shangchuan.OrderComplaintActivity"
-            android:screenOrientation="portrait"/>
+            android:screenOrientation="portrait" />
         <activity
             android:name="com.arpa.hndahesudintocctmsdriver.ui.web.WebActivity"
             android:screenOrientation="portrait"
@@ -266,7 +274,7 @@
         <meta-data
             android:name="com.amap.api.v2.apikey"
             android:value="${GAODEKEY}" />
-<!--            android:value="702eaa84675618b8eb69298d9fd42ca3" />-->
+        <!--            android:value="702eaa84675618b8eb69298d9fd42ca3" />-->
 
         <service android:name="com.amap.api.location.APSService"></service>
 
@@ -362,10 +370,11 @@
 
         <activity
             android:name=".H5Activity"
-            android:screenOrientation="portrait"
+            android:launchMode="singleTask"
-            android:launchMode="singleTask">
+            android:screenOrientation="portrait">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
+
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
 

app/src/main/java/com/arpa/hndahesudintocctmsdriver/App.java

@@ -23,6 +23,9 @@ import com.arpa.hndahesudintocctmsdriver.util.sp.SPUtil;
 import com.gyf.cactus.Cactus;
 import com.gyf.cactus.callback.CactusBackgroundCallback;
 import com.gyf.cactus.callback.CactusCallback;
+import com.lk.mapsdk.base.mapapi.initializer.InitializerOptions;
+import com.lk.mapsdk.base.mapapi.initializer.SDKInitializer;
+import com.lk.mapsdk.base.mapapi.model.CoordType;
 import com.tencent.bugly.crashreport.CrashReport;
 import com.umeng.commonsdk.UMConfigure;
 
@@ -49,6 +52,18 @@ public class App extends Application {
         CommonBaseLibrary.getInstance().init(this, Api.BASE_URL);
         CrashReport.initCrashReport(getApplicationContext(), "0fa55ffad8", false);
         String state = SPUtil.getSP(con, "state_data", "authorization_state");
+
+        InitializerOptions options = new InitializerOptions();
+        // 设置是否使用Https网络请求,默认使用
+        options.setHttpsEnable(true);
+        // 设置坐标系,默认GCJ02
+        options.setCoordType(CoordType.GCJ02);
+        // SDK 初始化
+        SDKInitializer.initialization(getApplicationContext(), options);
+
+        // Log 开关使能
+        SDKInitializer.setLogEnable(true);
+
         if ("1".equals(state)) {
             try {
                 Context context = getApplicationContext();

app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/HomeFragment.java

@@ -901,26 +901,16 @@ public class HomeFragment extends BaseFragment {
 
     public void initAlct() {
         PermissionX.init(getActivity())
-                .permissions(Manifest.permission.ACCESS_FINE_LOCATION,
+                .permissions(Manifest.permission.WRITE_EXTERNAL_STORAGE,
-                        Manifest.permission.ACCESS_COARSE_LOCATION,
-                        Manifest.permission.ACCESS_BACKGROUND_LOCATION,
-                        Manifest.permission.WRITE_EXTERNAL_STORAGE,
                         Manifest.permission.READ_EXTERNAL_STORAGE,
-                        Manifest.permission.CALL_PHONE,
+                        Manifest.permission.RECORD_AUDIO)
-                        Manifest.permission.RECORD_AUDIO,
-                        Manifest.permission.CAMERA)
                 .request((allGranted, grantedList, deniedList) -> {
-                    boolean isHasLocation = false;
+                    if (allGranted) {
-                    boolean isHasStor = false;
+
-                    for (int i = 0; i < grantedList.size(); i++) {
+                    } else {
-                        if (grantedList.get(i).equals(Manifest.permission.ACCESS_FINE_LOCATION)){
+
-                            isHasLocation = true;
                     }
-                        if (grantedList.get(i).equals(Manifest.permission.WRITE_EXTERNAL_STORAGE)){
+                });
-                            isHasStor = true;
-                        }
-                    }
-                    if (isHasLocation&&isHasStor){
         ALProcess.verification(con);
         MDPLocationCollectionManager.getInvoices(con, 10, 1, new OnDownloadResultListener() {
             @Override
@@ -933,17 +923,6 @@ public class HomeFragment extends BaseFragment {
                 Log.e("--失败信息--", s + s1);
             }
         });
-                    }else {
-                        if (!isHasLocation){
-                            Toast.makeText(con, "开启权限失败,请在应用设置-权限-定位-始终允许", Toast.LENGTH_SHORT).show();
-                            return;
-                        }
-                        if (!isHasStor){
-                            Toast.makeText(con, "开启权限失败,请在应用设置-权限-媒体与文件-仅媒体", Toast.LENGTH_SHORT).show();
-                        }
-                    }
-                });
-
     }
 
     private MyLocationStyle myLocationStyle;//地图定位样式

app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/HuoYunDelActivity.java

@@ -4,20 +4,13 @@ import android.Manifest;
 import android.app.Activity;
 import android.content.Intent;
 import android.net.Uri;
-import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
 import android.text.Html;
-import android.text.Layout;
 import android.text.TextUtils;
-import android.text.method.HideReturnsTransformationMethod;
-import android.text.method.PasswordTransformationMethod;
 import android.util.Log;
-import android.view.inputmethod.EditorInfo;
 import android.widget.Button;
-import android.widget.CheckBox;
-import android.widget.CompoundButton;
 import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.TextView;
@@ -207,8 +200,6 @@ public class HuoYunDelActivity extends BaseAppCompatActivity {
                     //2021/02/27记，类型声明错误
                     ImageButton return_btn = v.findViewById(R.id.return_btn);
                     ImageButton xuan = v.findViewById(R.id.xuan);
-                    CheckBox checkBox = v.findViewById(R.id.cb);
-                    TextView totalFreight = v.findViewById(R.id.totalFreight);
                     ImageButton btnFp = v.findViewById(R.id.btnFp);
                     TextView effectiveTime = v.findViewById(R.id.effectiveTime);
                     TextView check_contract = v.findViewById(R.id.check_contract);
@@ -219,15 +210,6 @@ public class HuoYunDelActivity extends BaseAppCompatActivity {
                     return_btn.setOnClickListener(v16 -> {
                         finish();
                     });
-                    totalFreight.setText("****");
-                    checkBox.setOnCheckedChangeListener((buttonView, isChecked) -> {
-                        if (isChecked){
-                            totalFreight.setText(hyd.getData().getTotalFreight());
-                        }else{
-                            totalFreight.setText("****");
-                        }
-//                        totalFreight.setTransformationMethod(isChecked? HideReturnsTransformationMethod.getInstance(): PasswordTransformationMethod.getInstance());
-                    });
 //                    String textSource = "同意在符合相关税务机关要求的情况下代开<font color='#ff0000'>增值税发票</font>";
                     String textSource = "公司已对运输合同条款充分解释说明，本人已充分理解、认可并签署；同意符合税务机关要求下<font color='#ff0000'>代开增值税发票</font>，产生的增值税及附加税本人承担。";
                     tvZzs.setText(Html.fromHtml(textSource));

app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/StartYunDanActivity.java

@@ -17,31 +17,14 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.core.widget.NestedScrollView;
 
+
 import com.amap.api.location.AMapLocation;
 import com.amap.api.location.AMapLocationClient;
 import com.amap.api.location.AMapLocationClientOption;
 import com.amap.api.location.AMapLocationListener;
-import com.amap.api.maps.AMap;
-import com.amap.api.maps.CameraUpdateFactory;
 import com.amap.api.maps.LocationSource;
-import com.amap.api.maps.MapView;
-import com.amap.api.maps.model.BitmapDescriptorFactory;
-import com.amap.api.maps.model.LatLng;
-import com.amap.api.maps.model.LatLngBounds;
-import com.amap.api.maps.model.MarkerOptions;
-import com.amap.api.maps.model.PolylineOptions;
-
-import com.amap.api.services.core.AMapException;
 import com.amap.api.services.core.LatLonPoint;
-import com.amap.api.services.route.BusRouteResult;
-import com.amap.api.services.route.DrivePath;
-import com.amap.api.services.route.DriveRouteResult;
-import com.amap.api.services.route.DriveStep;
-import com.amap.api.services.route.RideRouteResult;
 import com.amap.api.services.route.RouteSearch;
-import com.amap.api.services.route.WalkRouteResult;
-import com.arpa.hndahesudintocctmsdriver.util.alert.CustomDialog;
-import com.arpa.hndahesudintocctmsdriver.util.alert.ToastUtil;
 import com.bumptech.glide.Glide;
 import com.dahe.mylibrary.utils.TimeUtil;
 import com.dahe.mylibrary.utils.ToastUtils;
@@ -68,13 +51,33 @@ import com.arpa.hndahesudintocctmsdriver.util.statusbar.StateStyleUtil;
 import com.arpa.hndahesudintocctmsdriver.util.view.BaseActivity;
 import com.arpa.hndahesudintocctmsdriver.util.view.BaseRecyclerView;
 import com.arpa.hndahesudintocctmsdriver.util.view.ScoreView;
+import com.lk.mapsdk.base.mapapi.initializer.InitializerOptions;
+import com.lk.mapsdk.base.mapapi.initializer.SDKInitializer;
+import com.lk.mapsdk.base.mapapi.model.CoordType;
+import com.lk.mapsdk.base.mapapi.model.LatLng;
+import com.lk.mapsdk.base.mapapi.model.LatLngBounds;
+import com.lk.mapsdk.map.mapapi.annotation.Marker;
+import com.lk.mapsdk.map.mapapi.annotation.Polyline;
+import com.lk.mapsdk.map.mapapi.annotation.options.MarkerOptions;
+import com.lk.mapsdk.map.mapapi.annotation.options.PolylineOptions;
+import com.lk.mapsdk.map.mapapi.annotation.util.BitmapDescriptorFactory;
+import com.lk.mapsdk.map.mapapi.camera.MapStatusUpdateFactory;
+import com.lk.mapsdk.map.mapapi.map.LKMap;
+import com.lk.mapsdk.map.mapapi.map.MapView;
+import com.lk.mapsdk.map.platform.style.layers.Property;
+import com.lk.mapsdk.route.mapapi.base.AutoInfo;
+import com.lk.mapsdk.route.mapapi.base.DrivingCostingOptionsInfo;
+import com.lk.mapsdk.route.mapapi.base.LocationsInfo;
+import com.lk.mapsdk.route.mapapi.driving.DrivingRoutePlan;
+import com.lk.mapsdk.route.mapapi.driving.DrivingRoutePlanOptions;
+import com.lk.mapsdk.route.mapapi.driving.DrivingRoutePlanResult;
+import com.lk.mapsdk.route.mapapi.driving.OnDrivingRoutePlanListener;
 
 import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
-import java.util.function.Predicate;
 
 public class StartYunDanActivity extends BaseActivity {
 
@@ -84,7 +87,7 @@ public class StartYunDanActivity extends BaseActivity {
 
     private String TAG = "StartYunDanActivity";
     private NestedScrollView bottomSheet;
-    private MapView map;
+    private MapView mapView;
     private BaseRecyclerView brv;
     private AlphaAnimation mShowAnim, mHiddenAmin;//控件的显示和隐藏动画
     private LinearLayout protect;
@@ -111,9 +114,6 @@ public class StartYunDanActivity extends BaseActivity {
                     Log.e("-运单-", CacheGroup.cacheList.get(HuoYuanFragmengt.START_ORDER));
                     sob = gson.fromJson(CacheGroup.cacheList.get(HuoYuanFragmengt.START_ORDER), StartOrderBean.class);
                     wnb = gson.fromJson(CacheGroup.cacheList.get(GET_EVALUTE), WNewsBean.class);
-                    if (!isFinishing() && customDialog != null && customDialog.isShowing()) {
-                        customDialog.dismiss();
-                    }
                     if (sob.getCode() == 200 && sob.getData() != null) {
                         id = sob.getData().getWaybillId();
                         initView(null);
@@ -149,7 +149,6 @@ public class StartYunDanActivity extends BaseActivity {
     }
 
     private UserBean ub;
-    private AMap aMap;
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
@@ -157,6 +156,10 @@ public class StartYunDanActivity extends BaseActivity {
         StateStyleUtil.stateTextColor(this);
         setContentView(R.layout.activity_yundan_start);
         con = this;
+        mapView = findViewById(R.id.map);
+        mapView.onCreate(savedInstanceState);
+        mLKMap = mapView.getMap();
+        initMap();
         id = getIntent().getExtras().getInt("id");
         brv = findViewById(R.id.brv);
         protect = findViewById(R.id.protect);
@@ -166,12 +169,10 @@ public class StartYunDanActivity extends BaseActivity {
         mBottomSheetBehavior.setHideable(false);
         mBottomSheetBehavior.setState(BottomSheetBehavior.STATE_EXPANDED);
         //mBottomSheetBehavior.set
-        map = findViewById(R.id.map);
+
-        map.onCreate(savedInstanceState);
+
-        if (aMap == null) {
+//        initLoaction();
-            aMap = map.getMap();
+
-            initLoaction();
-        }
         Log.e("--id--", "" + id);
         String userdata = SPUtil.getSP(con, "data", "userdata");
         if (!userdata.equals("")) {
@@ -207,30 +208,6 @@ public class StartYunDanActivity extends BaseActivity {
                     initStartBody(v);
                     break;
                 case R.layout.item_yundan_yunxing:
-                    LinearLayout llMoney = v.findViewById(R.id.llMoney);
-                    if (!sob.getData().getWaybillStatus().equals("已装货")
-                            && !sob.getData().getWaybillStatus().equals("待装货")
-                            && !sob.getData().getWaybillStatus().equals("待接单")) {
-                        if (sob.getData().getWaybillStatus().equals("已装货")) {
-                            StartOrderBean.DataDTO.WayChildrenDTO mySdw = new StartOrderBean.DataDTO.WayChildrenDTO();
-                            for (int i = 0; i < sob.getData().getWayChildren().size(); i++) {
-                                StartOrderBean.DataDTO.WayChildrenDTO sdw = sob.getData().getWayChildren().get(i);
-                                if (sdw.getType() == 1) {
-                                    mySdw = sdw;
-                                    break;
-                                }
-                            }
-                            if (mySdw.getStatus() == 3) {
-                                llMoney.setVisibility(View.GONE);
-                            } else {
-                                llMoney.setVisibility(View.VISIBLE);
-                            }
-                        } else {
-                            llMoney.setVisibility(View.VISIBLE);
-                        }
-                    } else {
-                        llMoney.setVisibility(View.GONE);
-                    }
                     ImageView head_img = v.findViewById(R.id.head_img);
                     if (ub != null && ub.getData() != null && !ub.getData().getHeadportraitUrl().equals("")) {
                         Glide.with(con).load(ub.getData().getHeadportraitUrl()).into(head_img);
@@ -344,7 +321,8 @@ public class StartYunDanActivity extends BaseActivity {
             }
             initZX(upkey, v15, position, o, 1);
         });
-        search();
+//        search();
+        doSearch();
     }
 
     public void initZX(boolean key, View v, int position, Object o, int type) {
@@ -475,16 +453,12 @@ public class StartYunDanActivity extends BaseActivity {
         return str;
     }
 
-    private CustomDialog customDialog;
-
     @Override
     protected void onResume() {
         super.onResume();
-        if (map != null) {
+        if (mapView != null) {
-            map.onResume();
+            mapView.onResume();
         }
-        customDialog = new CustomDialog(con, "网络请求中...");
-        customDialog.show();
         hyr.startOrder(id);
         hyr.getEvaluate(id);
     }
@@ -492,223 +466,352 @@ public class StartYunDanActivity extends BaseActivity {
     @Override
     protected void onPause() {
         super.onPause();
-        if (map != null) {
+        if (mapView != null) {
-            map.onPause();
+            mapView.onPause();
         }
     }
 
     @Override
     protected void onDestroy() {
         super.onDestroy();
-        if (map != null) {
+        if (mapView != null) {
-            map.onDestroy();
+            mapView.onDestroy();
         }
     }
 
     @Override
     protected void onSaveInstanceState(@NonNull @NotNull Bundle outState) {
         super.onSaveInstanceState(outState);
-        map.onSaveInstanceState(outState);
+        mapView.onSaveInstanceState(outState);
     }
 
     LocationSource.OnLocationChangedListener mListener;
     AMapLocationClient mlocationClient;
     AMapLocationClientOption mLocationOption;
 
-    public void initLoaction() {
+//    public void initLoaction() {
-        // 设置定位监听
+//        // 设置定位监听
-        aMap.setLocationSource(new LocationSource() {
+//        aMap.setLocationSource(new LocationSource() {
-            @Override
+//            @Override
-            public void activate(OnLocationChangedListener onLocationChangedListener) {
+//            public void activate(OnLocationChangedListener onLocationChangedListener) {
-                mListener = onLocationChangedListener;
+//                mListener = onLocationChangedListener;
-                if (mlocationClient == null) {
+//                if (mlocationClient == null) {
-                    //初始化定位
+//                    //初始化定位
-                    try {
-                        mlocationClient = new AMapLocationClient(con);
-                    } catch (Exception e) {
-                        e.printStackTrace();
-                    }
-                    //初始化定位参数
-                    mLocationOption = new AMapLocationClientOption();
-                    //设置定位回调监听
-                    mlocationClient.setLocationListener(new AMapLocationListener() {
-                        @Override
-                        public void onLocationChanged(AMapLocation aMapLocation) {
-                            if (mListener != null && aMapLocation != null) {
-                                if (aMapLocation != null
-                                        && aMapLocation.getErrorCode() == 0) {
-                                    mListener.onLocationChanged(aMapLocation);// 显示系统小蓝点
-                                } else {
-                                    String errText = "定位失败," + aMapLocation.getErrorCode() + ": " + aMapLocation.getErrorInfo();
-                                    Log.e("AmapErr", errText);
-                                }
-                            }
-                        }
-                    });
-                    //设置为高精度定位模式
-                    mLocationOption.setLocationMode(AMapLocationClientOption.AMapLocationMode.Hight_Accuracy);
-                    // mLocationOption.setLocationMode(AMapLocationClientOption.AMapLocationMode.Battery_Saving);
-                    //设置定位模式为AMapLocationMode.Device_Sensors，仅设备模式。
-                    //mLocationOption.setLocationMode(AMapLocationClientOption.AMapLocationMode.Device_Sensors);
-                    //获取一次定位结果：
-                    //该方法默认为false。
-                    mLocationOption.setOnceLocation(true);
-                    //获取最近3s内精度最高的一次定位结果：
-                    //设置setOnceLocationLatest(boolean b)接口为true，启动定位时SDK会返回最近3s内精度最高的一次定位结果。如果设置其为true，setOnceLocation(boolean b)接口也会被设置为true，反之不会，默认为false。
-                    mLocationOption.setOnceLocationLatest(true);
-                    //设置是否返回地址信息（默认返回地址信息）
-                    mLocationOption.setNeedAddress(true);
-                    //设置是否允许模拟位置,默认为true，允许模拟位置
-                    mLocationOption.setMockEnable(true);
-                    //单位是毫秒，默认30000毫秒，建议超时时间不要低于8000毫秒。
-                    mLocationOption.setHttpTimeOut(20000);
-                    //关闭缓存机制
-                    mLocationOption.setLocationCacheEnable(false);
-                    //设置定位参数
-                    mlocationClient.setLocationOption(mLocationOption);
-                    // 此方法为每隔固定时间会发起一次定位请求，为了减少电量消耗或网络流量消耗，
-                    // 注意设置合适的定位时间的间隔（最小间隔支持为2000ms），并且在合适时间调用stopLocation()方法来取消定位请求
-                    // 在定位结束后，在合适的生命周期调用onDestroy()方法
-                    // 在单次定位情况下，定位无论成功与否，都无需调用stopLocation()方法移除请求，定位sdk内部会移除
-                    mlocationClient.startLocation();//启动定位
-                }
-            }
-
-            @Override
-            public void deactivate() {
-                mListener = null;
-                if (mlocationClient != null) {
-                    mlocationClient.stopLocation();
-                    mlocationClient.onDestroy();
-                }
-                mlocationClient = null;
-            }
-        });
-        // 设置为true表示显示定位层并可触发定位，false表示隐藏定位层并不可触发定位，默认是false
-        aMap.setMyLocationEnabled(true);
-//        ld=new LocationGDUtil(con,hd);
-//        ld.onCreate();
-    }
-
-
-    private RouteSearch mRouteSearch;//路线查询器
-    private List<LatLonPoint> lists = new ArrayList<>();
-
-
-    public void search() {
 //                    try {
-//            AMapLocationClient.updatePrivacyShow(con,true,true);
+//                        mlocationClient = new AMapLocationClient(con);
-//            AMapLocationClient.updatePrivacyAgree(con,true);
+//                    } catch (Exception e) {
-        mRouteSearch = new RouteSearch(this);
-//        } catch (AMapException e) {
 //                        e.printStackTrace();
 //                    }
-        //设置数据回调监听器
+//                    //初始化定位参数
-        mRouteSearch.setRouteSearchListener(new OnRouteSearchListener());
+//                    mLocationOption = new AMapLocationClientOption();
-        //设置开始位置坐标点(注意经纬度不能写反,会报错1800(只能规划到中国区域里的地图路线))
+//                    //设置定位回调监听
-        LatLonPoint startPoint = new LatLonPoint(Double.parseDouble(sob.getData().getWayChildren().get(0).getLatitude()),
+//                    mlocationClient.setLocationListener(new AMapLocationListener() {
-                Double.parseDouble(sob.getData().getWayChildren().get((0)).getLongitude()));
+//                        @Override
-        //设置目的地坐标点
+//                        public void onLocationChanged(AMapLocation aMapLocation) {
-        LatLonPoint endPoint = new LatLonPoint(Double.parseDouble(sob.getData().getWayChildren().get((sob.getData().getWayChildren().size() - 1)).getLatitude()),
+//                            if (mListener != null && aMapLocation != null) {
-                Double.parseDouble(sob.getData().getWayChildren().get((sob.getData().getWayChildren().size() - 1)).getLongitude()));
+//                                if (aMapLocation != null
-        //查询信息对象
+//                                        && aMapLocation.getErrorCode() == 0) {
-        for (int i = 0; i < sob.getData().getWayChildren().size(); i++) {
+//                                    mListener.onLocationChanged(aMapLocation);// 显示系统小蓝点
-            if (i != 0 && i != (sob.getData().getWayChildren().size() - 1)) {
+//                                } else {
-                LatLonPoint sp = new LatLonPoint(Double.parseDouble(sob.getData().getWayChildren().get(i).getLatitude()),
+//                                    String errText = "定位失败," + aMapLocation.getErrorCode() + ": " + aMapLocation.getErrorInfo();
-                        Double.parseDouble(sob.getData().getWayChildren().get((i)).getLongitude()));
+//                                    Log.e("AmapErr", errText);
-                lists.add(sp);
+//                                }
-            }
+//                            }
-        }
+//                        }
-        RouteSearch.FromAndTo fromAndTo = new RouteSearch.FromAndTo(startPoint, endPoint);
+//                    });
-        //设置搜索参数 1.fromAndTo 路径的起点终点  2.路径规划的策略(这里是驾车模式,具体看高德API) 3.途
+//                    //设置为高精度定位模式
-        //经点，可选 4.避让区域，可选， 5.避让道路 ,可选
+//                    mLocationOption.setLocationMode(AMapLocationClientOption.AMapLocationMode.Hight_Accuracy);
-        RouteSearch.DriveRouteQuery query = new
+//                    // mLocationOption.setLocationMode(AMapLocationClientOption.AMapLocationMode.Battery_Saving);
-                RouteSearch.DriveRouteQuery(fromAndTo, RouteSearch.DRIVING_SINGLE_DEFAULT, lists, null, "");
+//                    //设置定位模式为AMapLocationMode.Device_Sensors，仅设备模式。
-        //开始异步查询
+//                    //mLocationOption.setLocationMode(AMapLocationClientOption.AMapLocationMode.Device_Sensors);
-        mRouteSearch.calculateDriveRouteAsyn(query);
+//                    //获取一次定位结果：
+//                    //该方法默认为false。
+//                    mLocationOption.setOnceLocation(true);
+//                    //获取最近3s内精度最高的一次定位结果：
+//                    //设置setOnceLocationLatest(boolean b)接口为true，启动定位时SDK会返回最近3s内精度最高的一次定位结果。如果设置其为true，setOnceLocation(boolean b)接口也会被设置为true，反之不会，默认为false。
+//                    mLocationOption.setOnceLocationLatest(true);
+//                    //设置是否返回地址信息（默认返回地址信息）
+//                    mLocationOption.setNeedAddress(true);
+//                    //设置是否允许模拟位置,默认为true，允许模拟位置
+//                    mLocationOption.setMockEnable(true);
+//                    //单位是毫秒，默认30000毫秒，建议超时时间不要低于8000毫秒。
+//                    mLocationOption.setHttpTimeOut(20000);
+//                    //关闭缓存机制
+//                    mLocationOption.setLocationCacheEnable(false);
+//                    //设置定位参数
+//                    mlocationClient.setLocationOption(mLocationOption);
+//                    // 此方法为每隔固定时间会发起一次定位请求，为了减少电量消耗或网络流量消耗，
+//                    // 注意设置合适的定位时间的间隔（最小间隔支持为2000ms），并且在合适时间调用stopLocation()方法来取消定位请求
+//                    // 在定位结束后，在合适的生命周期调用onDestroy()方法
+//                    // 在单次定位情况下，定位无论成功与否，都无需调用stopLocation()方法移除请求，定位sdk内部会移除
+//                    mlocationClient.startLocation();//启动定位
+//                }
+//            }
+//
+//            @Override
+//            public void deactivate() {
+//                mListener = null;
+//                if (mlocationClient != null) {
+//                    mlocationClient.stopLocation();
+//                    mlocationClient.onDestroy();
+//                }
+//                mlocationClient = null;
+//            }
+//        });
+//        // 设置为true表示显示定位层并可触发定位，false表示隐藏定位层并不可触发定位，默认是false
+////        aMap.setMyLocationEnabled(true);
+////        ld=new LocationGDUtil(con,hd);
+////        ld.onCreate();
+//    }
+
+    private void initMap(){
+        // 通过InitializerOptions指定初始化配置参数
+        InitializerOptions options = new InitializerOptions();
+        // 设置是否使用Https网络请求,默认使用
+//        options.setIsHttpsEnable(true);
+        // 设置坐标系,默认GCJ02
+//        options.setCoorType(CoordType.GCJ02);
+
+        SDKInitializer.initialization(getApplicationContext(),options);
     }
 
+    private DrivingRoutePlanOptions drivingRoutePlanOptions;
+    private List<LocationsInfo> locationsInfos;
 
-    class OnRouteSearchListener implements RouteSearch.OnRouteSearchListener {
+    private List<Polyline> polylines = new ArrayList<>();
+    private List<Marker> markers = new ArrayList<>();
+
+    private LKMap mLKMap;
+
+    private void doSearch() {
+        DrivingRoutePlan search = new DrivingRoutePlan();
+
+        drivingRoutePlanOptions = new DrivingRoutePlanOptions();
+        locationsInfos = new ArrayList<>();
+        // 设置开始坐标
+        LocationsInfo origin = new LocationsInfo();
+        origin.setLat(Double.parseDouble(sob.getData().getWayChildren().get(0).getLatitude()));
+        origin.setLon(Double.parseDouble(sob.getData().getWayChildren().get((0)).getLongitude()));
+        // 设置结束坐标
+        LocationsInfo dest = new LocationsInfo();
+        dest.setLat(Double.parseDouble(sob.getData().getWayChildren().get((sob.getData().getWayChildren().size() - 1)).getLatitude()));
+        dest.setLon(Double.parseDouble(sob.getData().getWayChildren().get((sob.getData().getWayChildren().size() - 1)).getLongitude()));
+        locationsInfos.add(origin);
+        locationsInfos.add(dest);
+        drivingRoutePlanOptions.setLocations(locationsInfos);
+        AutoInfo autoInfo = new AutoInfo();
+        DrivingCostingOptionsInfo drivingCostingOptionsInfo = new DrivingCostingOptionsInfo();
+        drivingCostingOptionsInfo.setAuto(autoInfo);
+        drivingRoutePlanOptions.setDrivingCostingOptions(drivingCostingOptionsInfo);
+
+        search.drivingRoutePlanRequest(drivingRoutePlanOptions, new OnDrivingRoutePlanListener() {
 
             @Override
-        public void onBusRouteSearched(BusRouteResult busRouteResult, int i) {
+            public void onGetDrivingRoutePlanResult(DrivingRoutePlanResult routePlanResult) {
-
+                addRoutePlanLine(routePlanResult);
+                addRouteMarker();
+            }
+        });
+    }
+
+    /**
+     * 添加线路规划路线
+     *
+     * @param routePlanResult
+     */
+    private void addRoutePlanLine(DrivingRoutePlanResult routePlanResult) {
+        if (routePlanResult == null) {
+            Toast.makeText(this, "没有检索到结果", Toast.LENGTH_LONG).show();
+            return;
+        }
+
+        if (routePlanResult.getRouteInfos() == null || routePlanResult.getRouteInfos().isEmpty()) {
+            Toast.makeText(this, "没有检索到结果", Toast.LENGTH_LONG).show();
+            return;
         }
 
-        @Override
-        public void onDriveRouteSearched(DriveRouteResult driveRouteResult, int rCode) {
-            if (rCode == 1000) {//获取规划路线成功,获取到的是了,路线坐标点的集合
-                List<DrivePath> paths = driveRouteResult.getPaths();
-                //创建存储坐标点的集合
         List<LatLng> latLngs = new ArrayList<>();
-                //遍历获取规划的所有路线坐标点
+        List<LatLng> all = new ArrayList<>();
-                for (DrivePath mDrivePath : paths) {
+        mLKMap.removeOverlay(polylines);
-                    for (DriveStep mDriveStep : mDrivePath.getSteps()) {
+        polylines.clear();
-                        for (LatLonPoint mLatLonPoint : mDriveStep.getPolyline()) {
+
-                            latLngs.add(new
+        if (routePlanResult.getRouteInfos().size()>0){
-                                    LatLng(mLatLonPoint.getLatitude(), mLatLonPoint.getLongitude()));
+            latLngs.clear();
+            latLngs.addAll(routePlanResult.getRouteInfos().get(0).getGeometry());
+            PolylineOptions options = new PolylineOptions();
+            options.width(8f)
+                    .joinStyle(Property.LINE_JOIN_ROUND)
+                    .points(latLngs)
+                    .color(getResources().getColor(R.color.theme_color));
+            all.addAll(latLngs);
+            polylines.add((Polyline) mLKMap.addOverlay(options));
         }
+
+
+
+
+//        for (int i = 0;i < routePlanResult.getRouteInfos().size();i ++){
+//            latLngs.clear();
+//            latLngs.addAll(routePlanResult.getRouteInfos().get(i).getGeometry());
+//            PolylineOptions options = new PolylineOptions();
+//            if(i == routePlanResult.getRouteInfos().size() - 1){
+//                options.width(8f)
+////                        .pattern(BitmapDescriptorFactory.fromResource(R.drawable.icon_roud_type))
+//                        .joinStyle(Property.LINE_JOIN_ROUND)
+//                        .points(latLngs)
+//                        .color(getResources().getColor(R.color.theme_color));
+//            }else{
+//                options.width(8f)
+////                        .joinStyle(Property.LINE_JOIN_ROUND)
+//                        .points(latLngs)
+//                        .color(getResources().getColor(R.color.theme_color));
+//            }
+//            all.addAll(latLngs);
+//            polylines.add((Polyline) mLKMap.addOverlay(options));
+//        }
+        mLKMap.setMapStatus(MapStatusUpdateFactory.buildUpdateByLatLngBounds(new LatLngBounds(all),100,100,100,100));
     }
-                }
+
-                //先清除一下,避免重复显示
+    /**
-                aMap.clear();
+     * 添加起始点标记
-                //绘制起始位置和目的地marker
+     */
-                aMap.addMarker(new MarkerOptions()
+    private void addRouteMarker() {
+        mLKMap.removeOverlay(markers);
+        markers.clear();
+        MarkerOptions originOptions = new MarkerOptions()
+                .position(new LatLng(locationsInfos.get(0).getLat(),locationsInfos.get(0).getLon()))
                 .icon(BitmapDescriptorFactory.fromResource(R.mipmap.qi))
-                        .position(new LatLng(Double.parseDouble(sob.getData().getWayChildren().get(0).getLatitude()),
+                .iconGravity(Property.ICON_ANCHOR_BOTTOM)
-                                Double.parseDouble(sob.getData().getWayChildren().get(0).getLongitude()))));
+                .iconScale(0.5f);
-                for (int i = 0; i < sob.getData().getWayChildren().size(); i++) {
+        markers.add((Marker) mLKMap.addOverlay(originOptions));
-                    if (i != 0 && i != (sob.getData().getWayChildren().size() - 1)) {
+
-                        StartOrderBean.DataDTO.WayChildrenDTO sdw = sob.getData().getWayChildren().get(i);
+        MarkerOptions destinationOptions = new MarkerOptions()
-                        int icon = 0;
+                .position(new LatLng(locationsInfos.get(1).getLat(),locationsInfos.get(1).getLon()))
-                        if (sdw.getType() == 1) {
-                            icon = R.mipmap.z_loc;
-                        } else {
-                            icon = R.mipmap.x_loc;
-                        }
-                        aMap.addMarker(new MarkerOptions()
-                                .icon(BitmapDescriptorFactory.fromResource(icon))
-                                .position(new LatLng(Double.parseDouble(sdw.getLatitude()), Double.parseDouble(sdw.getLongitude()))));
-                    }
-                }
-                aMap.addMarker(new MarkerOptions()
                 .icon(BitmapDescriptorFactory.fromResource(R.mipmap.zhong))
-                        .position(new LatLng(Double.parseDouble(sob.getData().getWayChildren().get((sob.getData().getWayChildren().size() - 1)).getLatitude()),
+                .iconGravity(Property.ICON_ANCHOR_BOTTOM)
-                                Double.parseDouble(sob.getData().getWayChildren().get((sob.getData().getWayChildren().size() - 1)).getLongitude()))));
+                .iconScale(0.5f);
-                //绘制规划路径路线
+        markers.add((Marker) mLKMap.addOverlay(destinationOptions));
-                aMap.addPolyline(new PolylineOptions()
-                        //路线坐标点的集合
-                        .addAll(latLngs)
-                        //线的宽度
-                        .width(8)
-                        .color(getResources().getColor(R.color.theme_color)));
-                //设置画线的颜色
-
-                //显示完整包含所有marker地图路线
-                LatLngBounds.Builder builder = LatLngBounds.builder();
-                for (int i = 0; i < latLngs.size(); i++) {
-                    builder.include(latLngs.get(i));
-                }
-                //显示全部marker,第二个参数是四周留空宽度
-                aMap.moveCamera(CameraUpdateFactory.newLatLngBounds(builder.build(), 200));
-                LatLng latLng = new LatLng(Double.parseDouble(sob.getData().getWayChildren().get(0).getLatitude()),
-                        Double.parseDouble(sob.getData().getWayChildren().get((0)).getLongitude()));//构造一个位置
-                aMap.moveCamera(CameraUpdateFactory.newLatLngZoom(latLng, 6));
-            }
     }
 
-        @Override
-        public void onWalkRouteSearched(WalkRouteResult walkRouteResult, int i) {
 
-        }
+//    private RouteSearch mRouteSearch;//路线查询器
+//    private List<LatLonPoint> lists = new ArrayList<>();
 
-        @Override
-        public void onRideRouteSearched(RideRouteResult rideRouteResult, int i) {
 
-        }
+//    public void search() {
+////        try {
+////            AMapLocationClient.updatePrivacyShow(con,true,true);
+////            AMapLocationClient.updatePrivacyAgree(con,true);
+//        mRouteSearch = new RouteSearch(this);
+////        } catch (AMapException e) {
+////            e.printStackTrace();
+////        }
+//        //设置数据回调监听器
+//        mRouteSearch.setRouteSearchListener(new OnRouteSearchListener());
+//        //设置开始位置坐标点(注意经纬度不能写反,会报错1800(只能规划到中国区域里的地图路线))
+//        LatLonPoint startPoint = new LatLonPoint(Double.parseDouble(sob.getData().getWayChildren().get(0).getLatitude()),
+//                Double.parseDouble(sob.getData().getWayChildren().get((0)).getLongitude()));
+//        //设置目的地坐标点
+//        LatLonPoint endPoint = new LatLonPoint(Double.parseDouble(sob.getData().getWayChildren().get((sob.getData().getWayChildren().size() - 1)).getLatitude()),
+//                Double.parseDouble(sob.getData().getWayChildren().get((sob.getData().getWayChildren().size() - 1)).getLongitude()));
+//        //查询信息对象
+//        for (int i = 0; i < sob.getData().getWayChildren().size(); i++) {
+//            if (i != 0 && i != (sob.getData().getWayChildren().size() - 1)) {
+//                LatLonPoint sp = new LatLonPoint(Double.parseDouble(sob.getData().getWayChildren().get(i).getLatitude()),
+//                        Double.parseDouble(sob.getData().getWayChildren().get((i)).getLongitude()));
+//                lists.add(sp);
+//            }
+//        }
+//        RouteSearch.FromAndTo fromAndTo = new RouteSearch.FromAndTo(startPoint, endPoint);
+//        //设置搜索参数 1.fromAndTo 路径的起点终点  2.路径规划的策略(这里是驾车模式,具体看高德API) 3.途
+//        //经点，可选 4.避让区域，可选， 5.避让道路 ,可选
+//        RouteSearch.DriveRouteQuery query = new
+//                RouteSearch.DriveRouteQuery(fromAndTo, RouteSearch.DRIVING_SINGLE_DEFAULT, lists, null, "");
+//        //开始异步查询
+//        mRouteSearch.calculateDriveRouteAsyn(query);
+//    }
 
-    }
+
+//    class OnRouteSearchListener implements RouteSearch.OnRouteSearchListener {
+//
+//        @Override
+//        public void onBusRouteSearched(BusRouteResult busRouteResult, int i) {
+//
+//        }
+//
+//        @Override
+//        public void onDriveRouteSearched(DriveRouteResult driveRouteResult, int rCode) {
+//            if (rCode == 1000) {//获取规划路线成功,获取到的是了,路线坐标点的集合
+//                List<DrivePath> paths = driveRouteResult.getPaths();
+//                //创建存储坐标点的集合
+//                List<LatLng> latLngs = new ArrayList<>();
+//                //遍历获取规划的所有路线坐标点
+//                for (DrivePath mDrivePath : paths) {
+//                    for (DriveStep mDriveStep : mDrivePath.getSteps()) {
+//                        for (LatLonPoint mLatLonPoint : mDriveStep.getPolyline()) {
+//                            latLngs.add(new
+//                                    LatLng(mLatLonPoint.getLatitude(), mLatLonPoint.getLongitude()));
+//                        }
+//                    }
+//                }
+//                //先清除一下,避免重复显示
+//                aMap.clear();
+//                //绘制起始位置和目的地marker
+//                aMap.addMarker(new MarkerOptions()
+//                        .icon(BitmapDescriptorFactory.fromResource(R.mipmap.qi))
+//                        .position(new LatLng(Double.parseDouble(sob.getData().getWayChildren().get(0).getLatitude()),
+//                                Double.parseDouble(sob.getData().getWayChildren().get(0).getLongitude()))));
+//                for (int i = 0; i < sob.getData().getWayChildren().size(); i++) {
+//                    if (i != 0 && i != (sob.getData().getWayChildren().size() - 1)) {
+//                        StartOrderBean.DataDTO.WayChildrenDTO sdw = sob.getData().getWayChildren().get(i);
+//                        int icon = 0;
+//                        if (sdw.getType() == 1) {
+//                            icon = R.mipmap.z_loc;
+//                        } else {
+//                            icon = R.mipmap.x_loc;
+//                        }
+//                        aMap.addMarker(new MarkerOptions()
+//                                .icon(BitmapDescriptorFactory.fromResource(icon))
+//                                .position(new LatLng(Double.parseDouble(sdw.getLatitude()), Double.parseDouble(sdw.getLongitude()))));
+//                    }
+//                }
+//                aMap.addMarker(new MarkerOptions()
+//                        .icon(BitmapDescriptorFactory.fromResource(R.mipmap.zhong))
+//                        .position(new LatLng(Double.parseDouble(sob.getData().getWayChildren().get((sob.getData().getWayChildren().size() - 1)).getLatitude()),
+//                                Double.parseDouble(sob.getData().getWayChildren().get((sob.getData().getWayChildren().size() - 1)).getLongitude()))));
+//                //绘制规划路径路线
+//                aMap.addPolyline(new PolylineOptions()
+//                        //路线坐标点的集合
+//                        .addAll(latLngs)
+//                        //线的宽度
+//                        .width(8)
+//                        .color(getResources().getColor(R.color.theme_color)));
+//                //设置画线的颜色
+//
+//                //显示完整包含所有marker地图路线
+//                LatLngBounds.Builder builder = LatLngBounds.builder();
+//                for (int i = 0; i < latLngs.size(); i++) {
+//                    builder.include(latLngs.get(i));
+//                }
+//                //显示全部marker,第二个参数是四周留空宽度
+//                aMap.moveCamera(CameraUpdateFactory.newLatLngBounds(builder.build(), 200));
+//                LatLng latLng = new LatLng(Double.parseDouble(sob.getData().getWayChildren().get(0).getLatitude()),
+//                        Double.parseDouble(sob.getData().getWayChildren().get((0)).getLongitude()));//构造一个位置
+//                aMap.moveCamera(CameraUpdateFactory.newLatLngZoom(latLng, 6));
+//            }
+//        }
+//
+//        @Override
+//        public void onWalkRouteSearched(WalkRouteResult walkRouteResult, int i) {
+//
+//        }
+//
+//        @Override
+//        public void onRideRouteSearched(RideRouteResult rideRouteResult, int i) {
+//
+//        }
+//
+//    }
 
     public void up_traffic() {
 //        ShippingNoteInfo[] snis=new ShippingNoteInfo[1];
@@ -730,4 +833,25 @@ public class StartYunDanActivity extends BaseActivity {
 //        });
     }
 
+
+    @Override
+    protected void onStart() {
+        super.onStart();
+        mapView.onStart();
+    }
+
+
+    @Override
+    protected void onStop() {
+        super.onStop();
+        mapView.onStop();
+    }
+
+
+    @Override
+    public void onLowMemory() {
+        super.onLowMemory();
+        mapView.onDestroy();
+    }
+
 }

app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/login/WelcomeActivity.java

@@ -140,8 +140,8 @@ public class WelcomeActivity extends BaseAppCompatActivity {
             new XPopup.Builder(con)
                     .dismissOnBackPressed(false)
                     .dismissOnTouchOutside(false)
-                    .asCustom(new AgreementAlert(con, "http://agreement.dahehuoyun.com/currency/#/",
+                    .asCustom(new AgreementAlert(con, "https://agreement.dahehuoyun.com/currency/#/",
-                            "http://agreement.dahehuoyun.com/rule/serviceAgreement/dist/index.html#/", hd))
+                            "https://agreement.dahehuoyun.com/rule/serviceAgreement/dist/index.html#/", hd))
                     .show();
         }
         Glide.with(con)

app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/my/MyFragment.java

@@ -24,7 +24,6 @@ import com.arpa.hndahesudintocctmsdriver.parts.ConfigParts;
 import com.arpa.hndahesudintocctmsdriver.parts.StartOrderParts;
 import com.arpa.hndahesudintocctmsdriver.parts.UserParts;
 import com.arpa.hndahesudintocctmsdriver.ui.business.BusinessActivity;
-import com.arpa.hndahesudintocctmsdriver.util.PicturlUtil;
 import com.bumptech.glide.Glide;
 import com.google.gson.Gson;
 import com.lxj.xpopup.XPopup;

app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/my/SetupActivity.java

@@ -73,9 +73,9 @@ public class SetupActivity extends BaseActivity {
         ConfigBean cb= ConfigParts.getConfigParts(con);
         if(cb!=null){
 //            url1=cb.getData().getUserUrl();
-            url1="http://agreement.dahehuoyun.com/rule/serviceAgreement/dist/index.html#/";
+            url1="https://agreement.dahehuoyun.com/rule/serviceAgreement/dist/index.html#/";
 //            url2=cb.getData().getPrivateUrl();
-            url2="http://agreement.dahehuoyun.com/currency/#/";
+            url2="https://agreement.dahehuoyun.com/currency/#/";
             kefu=cb.getData().getServiceMobile();
             url3=cb.getData().getSecurityUrl();
         }
@@ -123,12 +123,12 @@ public class SetupActivity extends BaseActivity {
             r8.setOnClickListener(v12 -> {
                 Intent in=new Intent(con,WebActivity.class);
                 in.putExtra("title","交易规则");
-                in.putExtra("url","http://agreement.dahehuoyun.com/rule/transactionRules/dist/index.html#/");
+                in.putExtra("url","https://agreement.dahehuoyun.com/rule/transactionRules/dist/index.html#/");
                 startActivity(in);
             });
             r6.setOnClickListener(v12 -> {
-                String[] title={"平台客服:"+kefu};
+                String[] title={"平台客服:"+kefu,"银行客服:95528","技术咨询:13460042961"};
-                String[] value={kefu};
+                String[] value={kefu,"95528","13460042961"};
                 new XPopup.Builder(con)
                         .isDarkTheme(false)
                         .isDestroyOnDismiss(true) //对于只使用一次的弹窗，推荐设置这个

app/src/main/res/drawable/select_eye.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/icon_eye_open" android:state_checked="true"></item>
-    <item android:drawable="@drawable/icon_eye_close" android:state_checked="false"></item>
-    <item android:drawable="@drawable/icon_eye_close"></item>
-</selector>

app/src/main/res/layout/activity_yundan_start.xml

@@ -4,7 +4,12 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto">
-    <com.amap.api.maps.MapView
+<!--    <com.amap.api.maps.MapView-->
+<!--        android:id="@+id/map"-->
+<!--        android:layout_width="match_parent"-->
+<!--        android:layout_height="match_parent"/>-->
+
+    <com.lk.mapsdk.map.mapapi.map.MapView
         android:id="@+id/map"
         android:layout_width="match_parent"
         android:layout_height="match_parent"/>

app/src/main/res/layout/huoyuan_xq.xml

@@ -1,54 +1,47 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/huoyuan_xq"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="#fff"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:orientation="vertical">
+    android:orientation="vertical"
-
+    android:id="@+id/huoyuan_xq"
+    android:background="#fff">
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@color/theme_color"
         android:orientation="vertical">
-
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
             android:paddingBottom="@dimen/dp_20">
-
             <RelativeLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_68">
-
                 <ImageButton
+                    android:layout_marginLeft="@dimen/dp_38"
                     android:id="@+id/return_btn"
                     android:layout_width="@dimen/dp_21"
                     android:layout_height="@dimen/dp_18"
-                    android:layout_marginLeft="@dimen/dp_38"
                     android:background="@null"
                     android:scaleType="fitXY"
                     android:src="@mipmap/return_btn" />
-
                 <ImageButton
+                    android:layout_marginRight="@dimen/dp_38"
                     android:layout_width="@dimen/dp_18"
                     android:layout_height="@dimen/dp_18"
-                    android:layout_alignParentRight="true"
-                    android:layout_marginRight="@dimen/dp_38"
-                    android:background="@null"
-                    android:scaleType="fitXY"
                     android:src="@mipmap/share2"
-                    android:visibility="gone" />
+                    android:layout_alignParentRight="true"
+                    android:scaleType="fitXY"
+                    android:background="@null"
+                    android:visibility="gone"/>
             </RelativeLayout>
-
             <RelativeLayout
+                android:layout_marginTop="@dimen/dp_8"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                android:layout_height="wrap_content">
-                android:layout_marginTop="@dimen/dp_8">
-
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -56,102 +49,73 @@
                     android:text="货源详情"
                     android:textColor="#fff"
                     android:textSize="@dimen/sp_23" />
-
                 <TextView
+                    android:layout_marginTop="@dimen/dp_11"
+                    android:layout_marginRight="@dimen/dp_37"
+                    android:layout_alignParentRight="true"
                     android:id="@+id/huozhu"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_alignParentRight="true"
-                    android:layout_marginTop="@dimen/dp_11"
-                    android:layout_marginRight="@dimen/dp_37"
                     android:text="联系货主"
                     android:textColor="#fff"
                     android:textSize="@dimen/sp_13" />
-
                 <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentRight="true"
                     android:layout_marginTop="@dimen/dp_11"
                     android:layout_marginRight="@dimen/dp_37"
+                    android:layout_alignParentRight="true"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
                     android:text="拒绝"
                     android:textColor="#fff"
                     android:textSize="@dimen/sp_15"
-                    android:visibility="gone" />
+                    android:visibility="gone"/>
             </RelativeLayout>
-
             <LinearLayout
+                android:layout_marginTop="@dimen/dp_38"
+                android:layout_marginLeft="@dimen/dp_38"
+                android:layout_marginRight="@dimen/dp_38"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="@dimen/dp_38"
-                android:layout_marginTop="@dimen/dp_38"
-                android:layout_marginRight="@dimen/dp_38"
                 android:orientation="vertical">
 
-                <LinearLayout
-                    android:layout_gravity="center"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:gravity="center"
-                    android:orientation="horizontal">
-
                 <TextView
                     android:id="@+id/totalFreight"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center"
-                        android:text="****"
+                    android:text="0000"
                     android:textColor="#ffffffff"
                     android:textSize="@dimen/sp_40" />
-
-                    <CheckBox
-                        android:id="@+id/cb"
-                        android:layout_width="@dimen/dp_30"
-                        android:layout_height="@dimen/dp_30"
-                        android:layout_marginLeft="@dimen/dp_10"
-                        android:layout_marginTop="@dimen/dp_3"
-                        android:button="@null"
-                        android:checked="false"
-                        android:drawableStart="@drawable/select_eye"
-                        android:gravity="center">
-
-                    </CheckBox>
-
-
-                </LinearLayout>
-
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_gravity="center"
                     android:text="净赚运费(元)"
                     android:textColor="#ffffffff"
-                    android:textSize="@dimen/sp_13" />
+                    android:textSize="@dimen/sp_13"
-
+                    android:layout_gravity="center"
+                    />
                 <View
+                    android:layout_marginTop="@dimen/dp_16"
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/dp_1"
-                    android:layout_marginTop="@dimen/dp_16"
+                    android:background="#EFEFEF"/>
-                    android:background="#EFEFEF" />
-
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/dp_28"
                     android:orientation="horizontal">
-
                     <RelativeLayout
                         android:layout_width="@dimen/dp_0"
                         android:layout_height="match_parent"
                         android:layout_weight="1">
-
                         <TextView
+                            android:layout_marginLeft="@dimen/dp_5"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:layout_centerVertical="true"
-                            android:layout_marginLeft="@dimen/dp_5"
                             android:text="预估里程(km)"
                             android:textColor="#ffffffff"
-                            android:textSize="@dimen/sp_12" />
+                            android:textSize="@dimen/sp_12"
+                            android:layout_centerVertical="true"
+                            />
 
                         <TextView
                             android:id="@+id/distance"
@@ -164,12 +128,10 @@
                             android:textColor="#ffffffff"
                             android:textSize="@dimen/sp_12" />
                     </RelativeLayout>
-
                     <View
                         android:layout_width="@dimen/dp_1"
                         android:layout_height="wrap_content"
-                        android:background="#EFEFEF" />
+                        android:background="#EFEFEF"/>
-
                     <RelativeLayout
                         android:layout_width="@dimen/dp_0"
                         android:layout_height="match_parent"
@@ -196,17 +158,14 @@
                             android:textSize="@dimen/sp_12" />
                     </RelativeLayout>
                 </LinearLayout>
-
                 <View
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/dp_1"
-                    android:background="#EFEFEF" />
+                    android:background="#EFEFEF"/>
-
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/dp_28"
                     android:orientation="horizontal">
-
                     <RelativeLayout
                         android:layout_width="@dimen/dp_0"
                         android:layout_height="match_parent"
@@ -232,12 +191,10 @@
                             android:textColor="#ffffffff"
                             android:textSize="@dimen/sp_12" />
                     </RelativeLayout>
-
                     <View
                         android:layout_width="@dimen/dp_1"
                         android:layout_height="wrap_content"
-                        android:background="#EFEFEF" />
+                        android:background="#EFEFEF"/>
-
                     <RelativeLayout
                         android:layout_width="@dimen/dp_0"
                         android:layout_height="match_parent"
@@ -267,67 +224,59 @@
                             android:textSize="@dimen/sp_12" />
                     </RelativeLayout>
                 </LinearLayout>
-
                 <View
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/dp_1"
-                    android:background="#EFEFEF" />
+                android:background="#EFEFEF"/>
-
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/dp_28"
                     android:orientation="horizontal">
-
                         <TextView
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_centerVertical="true"
-                        android:layout_gravity="center"
                             android:layout_marginLeft="@dimen/dp_5"
                             android:text="运输要求:"
                             android:textColor="#ffffffff"
-                        android:textSize="@dimen/sp_12" />
+                            android:textSize="@dimen/sp_12"
+                            android:layout_gravity="center"/>
 
                         <TextView
+                            android:layout_marginLeft="@dimen/dp_7"
                             android:id="@+id/requirement"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                        android:layout_gravity="center"
-                        android:layout_marginLeft="@dimen/dp_7"
                             android:layout_marginRight="@dimen/dp_5"
                             android:text=""
                             android:textColor="#ffffffff"
-                        android:textSize="@dimen/sp_12" />
+                            android:textSize="@dimen/sp_12"
+                            android:layout_gravity="center"/>
                 </LinearLayout>
-
                 <View
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/dp_1"
-                    android:background="#EFEFEF" />
+                    android:background="#EFEFEF"/>
             </LinearLayout>
     </LinearLayout>
     </LinearLayout>
-
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@drawable/bg_bai"
+        android:orientation="vertical"
-        android:orientation="vertical">
+        android:background="@drawable/bg_bai">
-
         <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
             android:layout_marginLeft="@dimen/dp_39"
             android:layout_marginTop="@dimen/dp_17"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
             android:orientation="horizontal">
-
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="货源单号:"
                 android:textColor="#333333"
                 android:textSize="@dimen/sp_13" />
-
             <TextView
                 android:id="@+id/orderNum"
                 android:layout_width="wrap_content"
@@ -336,48 +285,42 @@
                 android:textColor="#333333"
                 android:textSize="@dimen/sp_13" />
         </LinearLayout>
-
         <androidx.cardview.widget.CardView
+            android:layout_marginLeft="@dimen/dp_15"
+            android:layout_marginRight="@dimen/dp_15"
+            android:layout_marginTop="@dimen/dp_15"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/dp_15"
-            android:layout_marginTop="@dimen/dp_15"
-            android:layout_marginRight="@dimen/dp_15"
-            app:cardBackgroundColor="#fff"
             app:cardCornerRadius="@dimen/dp_14"
+            app:cardBackgroundColor="#fff"
             app:cardElevation="@dimen/dp_0">
-
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical">
-
                 <com.arpa.hndahesudintocctmsdriver.util.view.BaseRecyclerView
                     android:id="@+id/zhuang_rv1"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content" />
-
                 <com.arpa.hndahesudintocctmsdriver.util.view.BaseRecyclerView
                     android:id="@+id/zhuang_rv2"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content" />
             </LinearLayout>
         </androidx.cardview.widget.CardView>
-
         <RelativeLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/dp_17">
-
             <TextView
                 android:id="@+id/car"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_centerVertical="true"
                 android:layout_marginLeft="@dimen/dp_39"
                 android:text="选择车辆"
                 android:textColor="#ff000000"
-                android:textSize="@dimen/sp_13" />
+                android:textSize="@dimen/sp_13"
+                android:layout_centerVertical="true"/>
 
             <ImageButton
                 android:id="@+id/xuanze"
@@ -385,8 +328,8 @@
                 android:layout_height="@dimen/dp_29"
                 android:layout_alignParentRight="true"
                 android:layout_marginRight="@dimen/dp_38"
-                android:background="@null"
                 android:padding="@dimen/dp_5"
+                android:background="@null"
                 android:scaleType="fitXY"
                 android:src="@mipmap/add1" />
         </RelativeLayout>
@@ -403,37 +346,39 @@
                 android:layout_height="@dimen/dp_25"
                 android:layout_gravity="center"
                 android:layout_marginLeft="@dimen/dp_38"
-                android:background="@null"
                 android:padding="@dimen/dp_5"
+                android:background="@null"
                 android:scaleType="fitXY"
                 android:src="@mipmap/no_xuan" />
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center"
                 android:layout_marginLeft="@dimen/dp_7"
                 android:text="同意并签署"
                 android:textColor="#000000"
-                android:textSize="@dimen/sp_13" />
+                android:textSize="@dimen/sp_13"
+                android:layout_gravity="center"/>
 
             <TextView
                 android:id="@+id/check_contract"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center"
                 android:text="《运输合同》"
                 android:textColor="@color/theme_color_news"
-                android:textSize="@dimen/sp_13" />
+                android:textSize="@dimen/sp_13"
+                android:layout_gravity="center"/>
 
         </LinearLayout>
 
         <RelativeLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/dp_7">
+            android:layout_marginTop="@dimen/dp_7"
+            >
 
             <ImageButton
+                android:visibility="invisible"
                 android:id="@+id/btnFp"
                 android:layout_width="@dimen/dp_25"
                 android:layout_height="@dimen/dp_25"
@@ -442,39 +387,38 @@
                 android:background="@null"
                 android:padding="@dimen/dp_5"
                 android:scaleType="fitXY"
-                android:src="@mipmap/no_xuan"
+                android:src="@mipmap/no_xuan" />
-                android:visibility="invisible" />
 
             <TextView
+                android:layout_toRightOf="@+id/btnFp"
                 android:id="@+id/tvZzs"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center"
                 android:layout_marginLeft="@dimen/dp_7"
-                android:layout_toRightOf="@+id/btnFp"
                 android:text="同意在符合相关税务机关要求的情况下代开增值税发票"
                 android:textColor="#000000"
-                android:textSize="@dimen/sp_13" />
+                android:textSize="@dimen/sp_13"
+                android:layout_gravity="center"/>
 
             <TextView
+                android:visibility="gone"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center"
                 android:text="增值税发票"
                 android:textColor="@color/red"
                 android:textSize="@dimen/sp_13"
-                android:visibility="gone" />
+                android:layout_gravity="center"/>
 
         </RelativeLayout>
 
         <Button
+            android:layout_marginLeft="@dimen/dp_38"
+            android:layout_marginRight="@dimen/dp_38"
             android:id="@+id/confirm_btn"
             android:layout_width="match_parent"
             android:layout_height="@dimen/dp_38"
             android:layout_gravity="center"
-            android:layout_marginLeft="@dimen/dp_38"
             android:layout_marginTop="@dimen/dp_12"
-            android:layout_marginRight="@dimen/dp_38"
             android:layout_marginBottom="@dimen/dp_60"
             android:background="@drawable/bg_btn"
             android:text="确认接单"

app/src/main/res/layout/item_huoyuan.xml

@@ -99,7 +99,7 @@
 
                         <TextView
                             android:id="@+id/loadingAddress"
-                            android:layout_width="wrap_content"
+                            android:layout_width="@dimen/dp_120"
                             android:layout_height="wrap_content"
                             android:layout_gravity="center"
                             android:layout_marginLeft="@dimen/dp_5"
@@ -125,7 +125,7 @@
 
                         <TextView
                             android:id="@+id/receiverAddress"
-                            android:layout_width="wrap_content"
+                            android:layout_width="@dimen/dp_120"
                             android:layout_height="wrap_content"
                             android:layout_gravity="center"
                             android:layout_marginLeft="@dimen/dp_5"
@@ -140,7 +140,6 @@
                 </LinearLayout>
 
                 <LinearLayout
-                    android:visibility="gone"
                     android:layout_marginRight="@dimen/dp_10"
                     android:layout_alignParentRight="true"
                     android:layout_width="wrap_content"

app/src/main/res/layout/item_huoyuan_deal.xml

@@ -123,7 +123,6 @@
                     </LinearLayout>
                 </LinearLayout>
                 <LinearLayout
-                    android:visibility="gone"
                     android:layout_marginRight="@dimen/dp_10"
                     android:layout_alignParentRight="true"
                     android:layout_width="wrap_content"

app/src/main/res/layout/item_yundan_yunxing.xml

@@ -52,7 +52,6 @@
                         />
                 </LinearLayout>
                 <LinearLayout
-                    android:id="@+id/llMoney"
                     android:layout_marginTop="@dimen/dp_5"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"

build.gradle

@@ -12,6 +12,7 @@ buildscript {
         maven {
             url 'https://maven.aliyun.com/repository/releases'
         }
+        maven { url 'http://lbs-sdk.luokuang.com/repository/maven-releases/' }
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:4.2.2'
@@ -31,6 +32,7 @@ allprojects {
         maven {
             url 'https://maven.aliyun.com/repository/releases'
         }
+        maven { url 'http://lbs-sdk.luokuang.com/repository/maven-releases/' }
     }
 }