首页权限优化

协议https无法打开，临时切回http
68版
2024-08-05 16:12:32 +08:00 · 2024-08-05 15:00:02 +08:00 · 2024-08-05 09:00:26 +08:00 · 2024-08-01 15:10:45 +08:00
22 changed files with 495 additions and 546 deletions
@@ -37,8 +37,8 @@ android {
        applicationId "com.arpa.hndahesudintocctmsdriver"
        minSdkVersion 24
        targetSdkVersion 30
-        versionCode 67
-        versionName "3.3.7"
+        versionCode 68
+        versionName "3.3.8"
        flavorDimensions "CHANNEL_VALUE"
        flavorDimensions "app_icon"
        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -228,6 +228,5 @@ dependencies {
    implementation 'com.github.getActivity:XToast:8.2'

    implementation project(path: ':mylibrary')
-    implementation 'com.lk.mapsdk:sdk-full:2.3.7'

 }
@@ -2,7 +2,6 @@
 <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" />
@@ -15,8 +14,6 @@
    <!--播音-->
    <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" />
@@ -69,24 +66,19 @@
            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" />
+            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" />
@@ -101,11 +93,11 @@
            android:screenOrientation="portrait" />
        <activity
            android:name="com.arpa.hndahesudintocctmsdriver.ui.auth.PhotoCarActivity"
-            android:screenOrientation="portrait"
-            android:windowSoftInputMode="adjustPan|stateHidden" />
+            android:windowSoftInputMode="adjustPan|stateHidden"
+            android:screenOrientation="portrait"  />
        <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">
@@ -150,13 +142,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">
@@ -169,14 +161,14 @@
        </activity>
        <activity
            android:name="com.arpa.hndahesudintocctmsdriver.ui.auth.CertificatesActivity"
-            android:screenOrientation="portrait"
-            android:windowSoftInputMode="adjustPan|stateHidden" />
+            android:windowSoftInputMode="adjustPan|stateHidden"
+            android:screenOrientation="portrait"/>
        <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"
@@ -200,10 +192,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">
@@ -211,13 +203,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"
@@ -231,7 +223,7 @@
        <activity
            android:name=".ui.news.NewActivity"
            android:screenOrientation="portrait"
-            android:windowSoftInputMode="stateAlwaysHidden" />
+             android:windowSoftInputMode="stateAlwaysHidden" />

        <service
            android:name="com.arpa.hndahesudintocctmsdriver.service.TrackService"
@@ -274,7 +266,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>

@@ -370,11 +362,10 @@

        <activity
            android:name=".H5Activity"
-            android:launchMode="singleTask"
-            android:screenOrientation="portrait">
+            android:screenOrientation="portrait"
+            android:launchMode="singleTask">
            <intent-filter>
                <action android:name="android.intent.action.VIEW" />
-
                <category android:name="android.intent.category.DEFAULT" />
                <category android:name="android.intent.category.BROWSABLE" />

@@ -23,9 +23,6 @@ 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;

@@ -52,18 +49,6 @@ 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();
@@ -901,28 +901,49 @@ public class HomeFragment extends BaseFragment {

    public void initAlct() {
        PermissionX.init(getActivity())
-                .permissions(Manifest.permission.WRITE_EXTERNAL_STORAGE,
+                .permissions(Manifest.permission.ACCESS_FINE_LOCATION,
+                        Manifest.permission.ACCESS_COARSE_LOCATION,
+                        Manifest.permission.ACCESS_BACKGROUND_LOCATION,
+                        Manifest.permission.WRITE_EXTERNAL_STORAGE,
                        Manifest.permission.READ_EXTERNAL_STORAGE,
-                        Manifest.permission.RECORD_AUDIO)
+                        Manifest.permission.CALL_PHONE,
+                        Manifest.permission.RECORD_AUDIO,
+                        Manifest.permission.CAMERA)
                .request((allGranted, grantedList, deniedList) -> {
-                    if (allGranted) {
-
-                    } else {
+                    boolean isHasLocation = false;
+                    boolean isHasStor = false;
+                    for (int i = 0; i < grantedList.size(); i++) {
+                        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
+                            public void onSuccess(Object o) {
+                                Log.e("--成功信息--", new Gson().toJson(o));
+                            }

+                            @Override
+                            public void onFailure(String s, String s1) {
+                                Log.e("--失败信息--", s + s1);
+                            }
+                        });
+                    }else {
+                        if (!isHasLocation){
+                            Toast.makeText(con, "开启权限失败,请在应用设置-权限-定位-始终允许", Toast.LENGTH_SHORT).show();
+                            return;
+                        }
+                        if (!isHasStor){
+                            Toast.makeText(con, "开启权限失败,请在应用设置-权限-媒体与文件-仅媒体", Toast.LENGTH_SHORT).show();
+                        }
                    }
                });
-        ALProcess.verification(con);
-        MDPLocationCollectionManager.getInvoices(con, 10, 1, new OnDownloadResultListener() {
-            @Override
-            public void onSuccess(Object o) {
-                Log.e("--成功信息--", new Gson().toJson(o));
-            }

-            @Override
-            public void onFailure(String s, String s1) {
-                Log.e("--失败信息--", s + s1);
-            }
-        });
    }

    private MyLocationStyle myLocationStyle;//地图定位样式
@@ -4,13 +4,20 @@ 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;
@@ -200,6 +207,8 @@ 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);
@@ -210,6 +219,15 @@ 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));
@@ -17,14 +17,31 @@ 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;
@@ -51,33 +68,13 @@ 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 {

@@ -87,7 +84,7 @@ public class StartYunDanActivity extends BaseActivity {

    private String TAG = "StartYunDanActivity";
    private NestedScrollView bottomSheet;
-    private MapView mapView;
+    private MapView map;
    private BaseRecyclerView brv;
    private AlphaAnimation mShowAnim, mHiddenAmin;//控件的显示和隐藏动画
    private LinearLayout protect;
@@ -114,6 +111,9 @@ 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,6 +149,7 @@ public class StartYunDanActivity extends BaseActivity {
    }

    private UserBean ub;
+    private AMap aMap;

    @Override
    protected void onCreate(@Nullable Bundle savedInstanceState) {
@@ -156,10 +157,6 @@ 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);
@@ -169,10 +166,12 @@ public class StartYunDanActivity extends BaseActivity {
        mBottomSheetBehavior.setHideable(false);
        mBottomSheetBehavior.setState(BottomSheetBehavior.STATE_EXPANDED);
        //mBottomSheetBehavior.set
-
-
-//        initLoaction();
-
+        map = findViewById(R.id.map);
+        map.onCreate(savedInstanceState);
+        if (aMap == null) {
+            aMap = map.getMap();
+            initLoaction();
+        }
        Log.e("--id--", "" + id);
        String userdata = SPUtil.getSP(con, "data", "userdata");
        if (!userdata.equals("")) {
@@ -208,6 +207,30 @@ 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);
@@ -321,8 +344,7 @@ public class StartYunDanActivity extends BaseActivity {
            }
            initZX(upkey, v15, position, o, 1);
        });
-//        search();
-        doSearch();
+        search();
    }

    public void initZX(boolean key, View v, int position, Object o, int type) {
@@ -453,12 +475,16 @@ public class StartYunDanActivity extends BaseActivity {
        return str;
    }

+    private CustomDialog customDialog;
+
    @Override
    protected void onResume() {
        super.onResume();
-        if (mapView != null) {
-            mapView.onResume();
+        if (map != null) {
+            map.onResume();
        }
+        customDialog = new CustomDialog(con, "网络请求中...");
+        customDialog.show();
        hyr.startOrder(id);
        hyr.getEvaluate(id);
    }
@@ -466,352 +492,223 @@ public class StartYunDanActivity extends BaseActivity {
    @Override
    protected void onPause() {
        super.onPause();
-        if (mapView != null) {
-            mapView.onPause();
+        if (map != null) {
+            map.onPause();
        }
    }

    @Override
    protected void onDestroy() {
        super.onDestroy();
-        if (mapView != null) {
-            mapView.onDestroy();
+        if (map != null) {
+            map.onDestroy();
        }
    }

    @Override
    protected void onSaveInstanceState(@NonNull @NotNull Bundle outState) {
        super.onSaveInstanceState(outState);
-        mapView.onSaveInstanceState(outState);
+        map.onSaveInstanceState(outState);
    }

    LocationSource.OnLocationChangedListener mListener;
    AMapLocationClient mlocationClient;
    AMapLocationClientOption mLocationOption;

-//    public void initLoaction() {
-//        // 设置定位监听
-//        aMap.setLocationSource(new LocationSource() {
-//            @Override
-//            public void activate(OnLocationChangedListener onLocationChangedListener) {
-//                mListener = onLocationChangedListener;
-//                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 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;
-
-    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() {
+    public void initLoaction() {
+        // 设置定位监听
+        aMap.setLocationSource(new LocationSource() {
+            @Override
+            public void activate(OnLocationChangedListener onLocationChangedListener) {
+                mListener = onLocationChangedListener;
+                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 onGetDrivingRoutePlanResult(DrivingRoutePlanResult routePlanResult) {
-                addRoutePlanLine(routePlanResult);
-                addRouteMarker();
+            public void deactivate() {
+                mListener = null;
+                if (mlocationClient != null) {
+                    mlocationClient.stopLocation();
+                    mlocationClient.onDestroy();
+                }
+                mlocationClient = null;
            }
        });
-    }
-
-    /**
-     * 添加线路规划路线
-     *
-     * @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;
-        }
-
-        List<LatLng> latLngs = new ArrayList<>();
-        List<LatLng> all = new ArrayList<>();
-        mLKMap.removeOverlay(polylines);
-        polylines.clear();
-
-        if (routePlanResult.getRouteInfos().size()>0){
-            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));
-    }
-
-    /**
-     * 添加起始点标记
-     */
-    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))
-                .iconGravity(Property.ICON_ANCHOR_BOTTOM)
-                .iconScale(0.5f);
-        markers.add((Marker) mLKMap.addOverlay(originOptions));
-
-        MarkerOptions destinationOptions = new MarkerOptions()
-                .position(new LatLng(locationsInfos.get(1).getLat(),locationsInfos.get(1).getLon()))
-                .icon(BitmapDescriptorFactory.fromResource(R.mipmap.zhong))
-                .iconGravity(Property.ICON_ANCHOR_BOTTOM)
-                .iconScale(0.5f);
-        markers.add((Marker) mLKMap.addOverlay(destinationOptions));
+        // 设置为true表示显示定位层并可触发定位，false表示隐藏定位层并不可触发定位，默认是false
+        aMap.setMyLocationEnabled(true);
+//        ld=new LocationGDUtil(con,hd);
+//        ld.onCreate();
    }


-//    private RouteSearch mRouteSearch;//路线查询器
-//    private List<LatLonPoint> lists = new ArrayList<>();
+    private RouteSearch mRouteSearch;//路线查询器
+    private List<LatLonPoint> lists = new ArrayList<>();


-//    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);
-//            }
+    public void search() {
+//        try {
+//            AMapLocationClient.updatePrivacyShow(con,true,true);
+//            AMapLocationClient.updatePrivacyAgree(con,true);
+        mRouteSearch = new RouteSearch(this);
+//        } catch (AMapException e) {
+//            e.printStackTrace();
 //        }
-//        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);
-//    }
+        //设置数据回调监听器
+        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) {
-//
-//        }
-//
-//    }
+    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];
@@ -833,25 +730,4 @@ 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();
-    }
-
 }
@@ -140,8 +140,8 @@ public class WelcomeActivity extends BaseAppCompatActivity {
            new XPopup.Builder(con)
                    .dismissOnBackPressed(false)
                    .dismissOnTouchOutside(false)
-                    .asCustom(new AgreementAlert(con, "https://agreement.dahehuoyun.com/currency/#/",
-                            "https://agreement.dahehuoyun.com/rule/serviceAgreement/dist/index.html#/", hd))
+                    .asCustom(new AgreementAlert(con, "http://agreement.dahehuoyun.com/currency/#/",
+                            "http://agreement.dahehuoyun.com/rule/serviceAgreement/dist/index.html#/", hd))
                    .show();
        }
        Glide.with(con)
@@ -24,6 +24,7 @@ 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;
@@ -73,9 +73,9 @@ public class SetupActivity extends BaseActivity {
        ConfigBean cb= ConfigParts.getConfigParts(con);
        if(cb!=null){
 //            url1=cb.getData().getUserUrl();
-            url1="https://agreement.dahehuoyun.com/rule/serviceAgreement/dist/index.html#/";
+            url1="http://agreement.dahehuoyun.com/rule/serviceAgreement/dist/index.html#/";
 //            url2=cb.getData().getPrivateUrl();
-            url2="https://agreement.dahehuoyun.com/currency/#/";
+            url2="http://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","https://agreement.dahehuoyun.com/rule/transactionRules/dist/index.html#/");
+                in.putExtra("url","http://agreement.dahehuoyun.com/rule/transactionRules/dist/index.html#/");
                startActivity(in);
            });
            r6.setOnClickListener(v12 -> {
-                String[] title={"平台客服:"+kefu,"银行客服:95528","技术咨询:13460042961"};
-                String[] value={kefu,"95528","13460042961"};
+                String[] title={"平台客服:"+kefu};
+                String[] value={kefu};
                new XPopup.Builder(con)
                        .isDarkTheme(false)
                        .isDestroyOnDismiss(true) //对于只使用一次的弹窗，推荐设置这个
@@ -0,0 +1,6 @@
+<?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>
@@ -4,12 +4,7 @@
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    xmlns:app="http://schemas.android.com/apk/res-auto">
-<!--    <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
+    <com.amap.api.maps.MapView
        android:id="@+id/map"
        android:layout_width="match_parent"
        android:layout_height="match_parent"/>
@@ -1,47 +1,54 @@
 <?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"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:orientation="vertical"
-    android:id="@+id/huoyuan_xq"
-    android:background="#fff">
+    android:background="#fff"
+    android:orientation="vertical">
+
    <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:src="@mipmap/share2"
                    android:layout_alignParentRight="true"
-                    android:scaleType="fitXY"
+                    android:layout_marginRight="@dimen/dp_38"
                    android:background="@null"
-                    android:visibility="gone"/>
+                    android:scaleType="fitXY"
+                    android:src="@mipmap/share2"
+                    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"
@@ -49,73 +56,102 @@
                    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_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:layout_alignParentRight="true"
+                    android:layout_marginTop="@dimen/dp_11"
+                    android:layout_marginRight="@dimen/dp_37"
                    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: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:id="@+id/totalFreight"
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:layout_gravity="center"
-                    android:text="0000"
-                    android:textColor="#ffffffff"
-                    android:textSize="@dimen/sp_40" />
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
                    android:text="净赚运费(元)"
                    android:textColor="#ffffffff"
-                    android:textSize="@dimen/sp_13"
-                    android:layout_gravity="center"
-                    />
+                    android:textSize="@dimen/sp_13" />
+
                <View
-                    android:layout_marginTop="@dimen/dp_16"
                    android:layout_width="match_parent"
                    android:layout_height="@dimen/dp_1"
-                    android:background="#EFEFEF"/>
+                    android:layout_marginTop="@dimen/dp_16"
+                    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:layout_centerVertical="true"
-                            />
+                            android:textSize="@dimen/sp_12" />

                        <TextView
                            android:id="@+id/distance"
@@ -128,10 +164,12 @@
                            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"
@@ -158,14 +196,17 @@
                            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"
@@ -191,10 +232,12 @@
                            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"
@@ -224,59 +267,67 @@
                            android:textSize="@dimen/sp_12" />
                    </RelativeLayout>
                </LinearLayout>
+
                <View
-                android:layout_width="match_parent"
-                android:layout_height="@dimen/dp_1"
-                android:background="#EFEFEF"/>
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/dp_1"
+                    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_marginLeft="@dimen/dp_5"
-                            android:text="运输要求:"
-                            android:textColor="#ffffffff"
-                            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_marginRight="@dimen/dp_5"
-                            android:text=""
-                            android:textColor="#ffffffff"
-                            android:textSize="@dimen/sp_12"
-                            android:layout_gravity="center"/>
+                    <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" />
+
+                    <TextView
+                        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" />
                </LinearLayout>
+
                <View
                    android:layout_width="match_parent"
                    android:layout_height="@dimen/dp_1"
-                    android:background="#EFEFEF"/>
+                    android:background="#EFEFEF" />
            </LinearLayout>
+        </LinearLayout>
    </LinearLayout>
-    </LinearLayout>
+
    <LinearLayout
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:background="@drawable/bg_bai">
+        android:background="@drawable/bg_bai"
+        android:orientation="vertical">
+
        <LinearLayout
-            android:layout_marginLeft="@dimen/dp_39"
-            android:layout_marginTop="@dimen/dp_17"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
+            android:layout_marginLeft="@dimen/dp_39"
+            android:layout_marginTop="@dimen/dp_17"
            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"
@@ -285,42 +336,48 @@
                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"
-            app:cardCornerRadius="@dimen/dp_14"
+            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: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:layout_centerVertical="true"/>
+                android:textSize="@dimen/sp_13" />

            <ImageButton
                android:id="@+id/xuanze"
@@ -328,8 +385,8 @@
                android:layout_height="@dimen/dp_29"
                android:layout_alignParentRight="true"
                android:layout_marginRight="@dimen/dp_38"
-                android:padding="@dimen/dp_5"
                android:background="@null"
+                android:padding="@dimen/dp_5"
                android:scaleType="fitXY"
                android:src="@mipmap/add1" />
        </RelativeLayout>
@@ -346,39 +403,37 @@
                android:layout_height="@dimen/dp_25"
                android:layout_gravity="center"
                android:layout_marginLeft="@dimen/dp_38"
-                android:padding="@dimen/dp_5"
                android:background="@null"
+                android:padding="@dimen/dp_5"
                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:layout_gravity="center"/>
+                android:textSize="@dimen/sp_13" />

            <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:layout_gravity="center"/>
+                android:textSize="@dimen/sp_13" />

        </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"
@@ -387,38 +442,39 @@
                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:layout_gravity="center"/>
+                android:textSize="@dimen/sp_13" />

            <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:layout_gravity="center"/>
+                android:visibility="gone" />

        </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="确认接单"
@@ -99,7 +99,7 @@

                        <TextView
                            android:id="@+id/loadingAddress"
-                            android:layout_width="@dimen/dp_120"
+                            android:layout_width="wrap_content"
                            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="@dimen/dp_120"
+                            android:layout_width="wrap_content"
                            android:layout_height="wrap_content"
                            android:layout_gravity="center"
                            android:layout_marginLeft="@dimen/dp_5"
@@ -140,6 +140,7 @@
                </LinearLayout>

                <LinearLayout
+                    android:visibility="gone"
                    android:layout_marginRight="@dimen/dp_10"
                    android:layout_alignParentRight="true"
                    android:layout_width="wrap_content"
@@ -123,6 +123,7 @@
                    </LinearLayout>
                </LinearLayout>
                <LinearLayout
+                    android:visibility="gone"
                    android:layout_marginRight="@dimen/dp_10"
                    android:layout_alignParentRight="true"
                    android:layout_width="wrap_content"
@@ -52,6 +52,7 @@
                        />
                </LinearLayout>
                <LinearLayout
+                    android:id="@+id/llMoney"
                    android:layout_marginTop="@dimen/dp_5"
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
@@ -12,7 +12,6 @@ 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'
@@ -32,7 +31,6 @@ allprojects {
        maven {
            url 'https://maven.aliyun.com/repository/releases'
        }
-        maven { url 'http://lbs-sdk.luokuang.com/repository/maven-releases/' }
    }
 }
Author	SHA1	Message	Date
lijia	e6dce562c8	首页权限优化	2024-08-05 16:12:32 +08:00
lijia	a20d49ecdf	协议https无法打开，临时切回http	2024-08-05 15:00:02 +08:00
lijia	7a89c41ed2	68版	2024-08-05 09:00:26 +08:00
lijia	894246456a	添加运单金额隐藏逻辑	2024-08-01 15:10:45 +08:00