1.修改运输轨迹。

app/src/main/java/com/quansu/heifengwuliu/activity/GrabDetailsActivity.kt

@@ -85,13 +85,13 @@ class GrabDetailsActivity : MBActivity<GrabDetailsVModel, ActivityGrabdetailsBin
                 bean.order.send[bean.order.send.size-1].city.name+bean.order.send[bean.order.send.size-1].address
 
 
-        var item = PositionBean(positionName, bean.order.send[bean.order.send.size - 1].lat, bean.order.send[bean.order.send.size - 1].lng)
+        var item = PositionBean("",positionName, bean.order.send[bean.order.send.size - 1].lat, bean.order.send[bean.order.send.size - 1].lng)
 
         list.add(item)
         for(ss in bean.order.receive){
             var positionName = ss.province.name +ss.city.name + ss.city.name+ss.address
 
-            var item = PositionBean(positionName, ss.lat, ss.lng)
+            var item = PositionBean("",positionName, ss.lat, ss.lng)
             list.add(item)
         }
 

app/src/main/java/com/quansu/heifengwuliu/activity/SourceDetailsActivity.kt

@@ -31,8 +31,6 @@ class SourceDetailsActivity: MBActivity<SourceDetailsVModel, ActivitySourcedetai
         if(!TextUtils.isEmpty(info_id)) {
             vm.getInfo(info_id!!)
         }
-
-
         vm.info.observe(this, Observer {
             //观察
             initViewPager(vm.info.value!!)
@@ -40,10 +38,8 @@ class SourceDetailsActivity: MBActivity<SourceDetailsVModel, ActivitySourcedetai
                 vm.showPayDialog(info_id!!)
             }
 
-
         })
 
-
     }
 
 
@@ -55,13 +51,13 @@ class SourceDetailsActivity: MBActivity<SourceDetailsVModel, ActivitySourcedetai
                bean.order.send[bean.order.send.size-1].city.name+ bean.order.send[bean.order.send.size-1].address
 
 
-       var item = PositionBean(positionName, bean.order.send[bean.order.send.size - 1].lat, bean.order.send[bean.order.send.size - 1].lng)
+       var item = PositionBean("",positionName, bean.order.send[bean.order.send.size - 1].lat, bean.order.send[bean.order.send.size - 1].lng)
 
        list.add(item)
        for(ss in bean.order.receive){
 
            var positionName = ss.province.name +ss.city.name + ss.city.name+ss.address
-           var item = PositionBean(positionName, ss.lat, ss.lng)
+           var item = PositionBean("",positionName, ss.lat, ss.lng)
            list.add(item)
        }
        var isShow=false
@@ -69,6 +65,7 @@ class SourceDetailsActivity: MBActivity<SourceDetailsVModel, ActivitySourcedetai
            isShow=true
        }
 
+
        var  adapterOut= OrderInfoadapter(list,isShow)
        binding.recyclerViewOut.adapter=adapterOut
        var  outList = bean.order.send
@@ -95,7 +92,4 @@ class SourceDetailsActivity: MBActivity<SourceDetailsVModel, ActivitySourcedetai
         return SourceDetailsVModel::class.java
     }
 
-
-
-
 }

app/src/main/java/com/quansu/heifengwuliu/activity/WaybillDetailsActivity.kt

@@ -148,17 +148,19 @@ class WaybillDetailsActivity : MBActivity<WaybillDetailsVModel, ActivityWaybilld
 
 
         var list = ArrayList<PositionBean>()
+        var brand=bean.driver.number
+
 
         var positionName = bean.info.send[bean.info.send.size - 1].province.name + bean.info.send[bean.info.send.size - 1].city.name +
                 bean.info.send[bean.info.send.size - 1].city.name+  bean.info.send[bean.info.send.size - 1].address
 
-        var item = PositionBean(positionName, bean.info.send[bean.info.send.size - 1].lat, bean.info.send[bean.info.send.size - 1].lng)
+        var item = PositionBean(brand,positionName, bean.info.send[bean.info.send.size - 1].lat, bean.info.send[bean.info.send.size - 1].lng)
 
         list.add(item)
         for(ss in bean.info.receive){
             var positionName = ss.province.name +ss.city.name + ss.city.name+ss.address
 
-            var item = PositionBean(positionName, ss.lat, ss.lng)
+            var item = PositionBean(brand,positionName, ss.lat, ss.lng)
             list.add(item)
         }
 
@@ -167,6 +169,7 @@ class WaybillDetailsActivity : MBActivity<WaybillDetailsVModel, ActivityWaybilld
         if(!TextUtils.isEmpty(list[0].latitude)&&!TextUtils.isEmpty(list[list.size-1].latitude)){
             isShow=true
         }
+
         var adapterOut = OrderInfoadapter(list,isShow)
         binding.recyclerViewOut.adapter = adapterOut
         var outList = bean.info.send

app/src/main/java/com/quansu/heifengwuliu/adapter/OrderInfoadapter.kt

@@ -10,7 +10,6 @@ import com.qmuiteam.qmui.kotlin.onClick
 import com.quansu.heifengwuliu.R
 import com.quansu.heifengwuliu.databinding.ItemPeopleinfoBinding
 import com.quansu.heifengwuliu.model.DataInfoBean
-import com.quansu.heifengwuliu.model.WaybillDetails
 import com.yanzhenjie.permission.Action
 import com.yanzhenjie.permission.AndPermission
 import com.ysnows.base.base.BAdapter

app/src/main/java/com/quansu/heifengwuliu/vmodel/WaybillDetailsVModel.kt

@@ -257,24 +257,24 @@ open class WaybillDetailsVModel(application: Application) : BViewModel<BReposito
 
             if (order_state == 10 || order_state == 20) {
 
+                var brand=info.value!!.driver.number
 
 
                 var list = ArrayList<PositionBean>()
 
                 var positionName =   info.value!!.info.send[0].province.name+info.value!!.info.send[0].city.name+info.value!!.info.send[0].area.name+info.value!!.info.send[0].address
 
-                var item = PositionBean(positionName, info.value!!.info.send[info.value!!.info.send.size - 1].lat, info.value!!.info.send[info.value!!.info.send.size - 1].lng)
+                var item = PositionBean(brand,positionName, info.value!!.info.send[info.value!!.info.send.size - 1].lat, info.value!!.info.send[info.value!!.info.send.size - 1].lng)
 
                 list.add(item)
                 for(ss in info.value!!.info.receive){
                     var positionName = ss.province.name +ss.city.name + ss.city.name+ss.address
 
-                    var item = PositionBean(positionName, ss.lat, ss.lng)
+                    var item = PositionBean(brand,positionName, ss.lat, ss.lng)
                     list.add(item)
                 }
 
 
-
                 CCRetrofit.instance()
                         .with(repository().context)
                         .create(IGaode::class.java)

base/src/main/java/com/ysnows/base/model/PositionBean.java

@@ -54,9 +54,11 @@ public class PositionBean  {
 
 
 
+    public  String brand;//车牌号
 
-    public PositionBean(String position, String latitude, String longitude
+    public PositionBean(String brand,String position, String latitude, String longitude
                        ) {
+        this.brand=brand;
         this.position = position;
         this.latitude = latitude;
         this.longitude = longitude;

gaode/src/main/java/com/quansu/gaode/activity/PolylineActivity.java

@@ -92,6 +92,7 @@ public class PolylineActivity extends AppCompatActivity {
         item = new Gson().fromJson(getIntent().getStringExtra("item"), new TypeToken<List<PositionBean>>() {
         }.getType());
 
+
         imgBack = findViewById(R.id.img_back);
         tvStart = findViewById(R.id.tv_start);
         tvEnd = findViewById(R.id.tv_end);
@@ -185,7 +186,10 @@ public class PolylineActivity extends AppCompatActivity {
     public void getRoute() {
         // 构建车辆信息
         AMapCarInfo carInfo = new AMapCarInfo();
-        carInfo.setCarNumber("鲁Q13C2G");   //设置车牌号
+        if(!TextUtils.isEmpty(item.get(0).brand)) {
+            Log.e("-shy-", "Route=: "+ item.get(0).brand);
+            carInfo.setCarNumber(item.get(0).brand); //设置车牌号
+        }
 //        carInfo.setCarType("1");             //设置车辆类型,0:小车; 1:货车. 默认0(小车).
 //        carInfo.setVehicleAxis("6");         //设置货车的轴数，mCarType = 1时候生效，取值[0-255]，默认为2
 //        carInfo.setVehicleHeight("3.56");    //设置货车的高度，单位：米，mCarType = 1时候生效，取值[0-25.5],默认1.6米
@@ -437,7 +441,7 @@ public class PolylineActivity extends AppCompatActivity {
                 i++;
             }
         }
-        mockCenterList(centerList);
+        //mockCenterList(centerList);
         return centerList;
     }
 

gaode/src/main/java/com/quansu/gaode/componnent/CpGaode.java

@@ -28,7 +28,6 @@ public class CpGaode extends BIComponent implements IComponent {
      */
     public boolean selectLocation(CC cc,String city,String address) {
 
-        Log.e("-shy-", "---3333- ");
 
         Intent intent = new Intent(BApp.instance().getApplicationContext(), GaodeActivity.class);
         intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);
@@ -79,7 +78,7 @@ public class CpGaode extends BIComponent implements IComponent {
     }
     /**
      * 多点轨迹
-     *
+     *brand:车票号
      * @param cc
      * @return
      */