Bläddra i källkod

1.修改地图轨迹。

石慧云 4 år sedan
förälder
incheckning
67f7270e2e

+ 25 - 2
app/src/main/java/com/quansu/heifengwuliu/activity/GrabDetailsActivity.kt

@@ -2,6 +2,7 @@ package com.quansu.heifengwuliu.activity
 
 import android.graphics.Color.parseColor
 import android.os.Bundle
+import android.text.TextUtils
 import androidx.lifecycle.Observer
 import com.qmuiteam.qmui.kotlin.onClick
 import com.quansu.heifengwuliu.R
@@ -13,6 +14,8 @@ import com.quansu.heifengwuliu.model.DataInfoBean
 import com.quansu.heifengwuliu.utils.PopuShareWxUtils
 import com.quansu.heifengwuliu.utils.ShareWxDilaog
 import com.quansu.heifengwuliu.vmodel.GrabDetailsVModel
+import com.ysnows.base.model.PositionBean
+import java.util.ArrayList
 
 /**货源详情-司机端
  *Created by shihuiyun
@@ -56,9 +59,29 @@ class GrabDetailsActivity : MBActivity<GrabDetailsVModel, ActivityGrabdetailsBin
 
 
     private fun initViewPager(bean: DataInfoBean){
-        var positionName=bean.order.receive[bean.order.receive.size-1].province.name+bean.order.receive[bean.order.receive.size-1].city.name+bean.order.receive[bean.order.receive.size-1].city.name
 
-        var  adapterOut= OrderInfoadapter(positionName,bean.order.receive[bean.order.receive.size-1].lat,bean.order.receive[bean.order.receive.size-1].lng)
+        var list = ArrayList<PositionBean>()
+
+        var positionName = bean.order.send[bean.order.send.size-1].province.name+bean.order.send[bean.order.send.size-1].city.name+
+                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)
+
+        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)
+            list.add(item)
+        }
+
+        var isShow=false
+        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.order.send
         adapterOut!!.addData(outList)

+ 23 - 2
app/src/main/java/com/quansu/heifengwuliu/activity/SourceDetailsActivity.kt

@@ -9,6 +9,8 @@ import com.quansu.heifengwuliu.base.MBActivity
 import com.quansu.heifengwuliu.databinding.ActivitySourcedetailsBinding
 import com.quansu.heifengwuliu.model.DataInfoBean
 import com.quansu.heifengwuliu.vmodel.SourceDetailsVModel
+import com.ysnows.base.model.PositionBean
+import java.util.ArrayList
 
 /**
  * 货主-货源详情
@@ -45,9 +47,28 @@ class SourceDetailsActivity: MBActivity<SourceDetailsVModel, ActivitySourcedetai
 
 
    private fun initViewPager(bean:DataInfoBean){
-       var positionName=bean.order.receive[bean.order.receive.size-1].province.name+bean.order.receive[bean.order.receive.size-1].city.name+bean.order.receive[bean.order.receive.size-1].city.name
 
-       var  adapterOut= OrderInfoadapter(positionName,bean.order.receive[bean.order.receive.size-1].lat,bean.order.receive[bean.order.receive.size-1].lng)
+       var list = ArrayList<PositionBean>()
+
+       var positionName = bean.order.send[bean.order.send.size-1].province.name+bean.order.send[bean.order.send.size-1].city.name+
+               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)
+
+       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)
+           list.add(item)
+       }
+       var isShow=false
+       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.order.send
        adapterOut!!.addData(outList)

+ 23 - 2
app/src/main/java/com/quansu/heifengwuliu/activity/WaybillDetailsActivity.kt

@@ -4,6 +4,7 @@ import android.app.Activity
 import android.content.Intent
 import android.graphics.Rect
 import android.os.Bundle
+import android.text.TextUtils
 import android.util.Log
 import android.view.View
 import androidx.core.net.toUri
@@ -29,6 +30,7 @@ import com.quansu.heifengwuliu.utils.GridSpaceItemDecoration
 import com.quansu.heifengwuliu.utils.OssUtils
 import com.quansu.heifengwuliu.utils.PopuTipsUtils
 import com.quansu.heifengwuliu.vmodel.WaybillDetailsVModel
+import com.ysnows.base.model.PositionBean
 import com.ysnows.base.utils.UiUtils
 import java.util.*
 
@@ -141,8 +143,27 @@ class WaybillDetailsActivity : MBActivity<WaybillDetailsVModel, ActivityWaybilld
 
     private fun initViewPager(bean: WaybillDetails) {
 
-        var positionName = bean.info.receive[bean.info.receive.size - 1].province.name + bean.info.receive[bean.info.receive.size - 1].city.name + bean.info.receive[bean.info.receive.size - 1].city.name
-        var adapterOut = OrderInfoadapter(positionName, bean.info.receive[bean.info.receive.size - 1].lat, bean.info.receive[bean.info.receive.size - 1].lng)
+
+        var list = ArrayList<PositionBean>()
+
+        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)
+
+        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)
+            list.add(item)
+        }
+
+        var isShow=false
+        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
         adapterOut!!.addData(outList)

+ 4 - 7
app/src/main/java/com/quansu/heifengwuliu/adapter/OrderInfoadapter.kt

@@ -5,26 +5,23 @@ 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.ysnows.base.base.BAdapter
 import com.ysnows.base.ccretrofit.CCRetrofit
 import com.ysnows.base.model.PositionBean
 import com.ysnows.base.route.IGaode
 
-class OrderInfoadapter(val positionName:String,val latEnd:String,val lngEnd:String) : BAdapter<DataInfoBean.OrderBean.SendBean,
+class OrderInfoadapter(var list: ArrayList<PositionBean>,var isShow: Boolean) : BAdapter<DataInfoBean.OrderBean.SendBean,
         BaseDataBindingHolder<ItemPeopleinfoBinding>>(R.layout.item_peopleinfo) {
     override fun convert(holder: BaseDataBindingHolder<ItemPeopleinfoBinding>, item: DataInfoBean.OrderBean.SendBean) {
         holder.dataBinding?.item = item
-
+        holder.dataBinding?.isShow = isShow
         holder.dataBinding?.imgMap!!.onClick {
 
-            var start=item.province.name+item.city.name+item.area.name
-            var item= PositionBean(start,item.lat,item.lng,positionName,latEnd,lngEnd)
-
-
             CCRetrofit.instance()
                     .with(context)
                     .create(IGaode::class.java)
-                    .goRouteLocation(item)
+                    .goPolyline(list)
                     .subscribe()
         }
 

+ 16 - 6
app/src/main/java/com/quansu/heifengwuliu/vmodel/WaybillDetailsVModel.kt

@@ -243,18 +243,28 @@ open class WaybillDetailsVModel(application: Application) : BViewModel<BReposito
             if (order_state == 10 || order_state == 20) {
 
 
-                var start=info.value!!.info.send[0].province.name+info.value!!.info.send[0].city.name+info.value!!.info.send[0].area.name
 
-                var end=info.value!!.info.receive[info.value!!.info.receive.size-1].province.name+info.value!!.info.receive[info.value!!.info.receive.size-1].city.name+info.value!!.info.receive[info.value!!.info.receive.size-1].area.name
+                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
+
+
+                var item = PositionBean(positionName, info.value!!.info.receive[info.value!!.info.receive.size - 1].lat, info.value!!.info.receive[info.value!!.info.receive.size - 1].lng)
+
+                list.add(item)
+                for(ss in info.value!!.info.send){
+                    var positionName = ss.province.name +ss.city.name + ss.city.name
+
+                    var item = PositionBean(positionName, ss.lat, ss.lng)
+                    list.add(item)
+                }
+
 
-                var item= PositionBean(start,info.value!!.info.send[0].lat,
-                        info.value!!.info.send[0].lng,end,
-                        info.value!!.info.receive[info.value!!.info.receive.size-1].lat,info.value!!.info.receive[info.value!!.info.receive.size-1].lng)
 
                 CCRetrofit.instance()
                         .with(repository().context)
                         .create(IGaode::class.java)
-                        .goRouteLocation(item)
+                        .goPolyline(list)
                         .subscribe()
 
 

+ 6 - 6
app/src/main/res/layout/activity_waybilldetails.xml

@@ -192,7 +192,7 @@
                                 android:orientation="vertical">
 
                                 <TextView
-                                    android:layout_width="wrap_content"
+                                    android:layout_width="match_parent"
                                     android:layout_height="wrap_content"
                                     android:hint="暂未填写公司名"
                                     android:text="@{vm.info.company.company_name}"
@@ -213,14 +213,14 @@
                                         android:layout_marginEnd="@dimen/dp_10"
                                         android:text="累计交易"
                                         android:textColor="#979899"
-                                        android:textSize="16sp" />
+                                        android:textSize="12sp" />
 
                                     <TextView
                                         android:layout_width="wrap_content"
                                         android:layout_height="wrap_content"
                                         android:text="@{vm.info.company.info_nums}"
                                         android:textColor="#979899"
-                                        android:textSize="16sp"
+                                        android:textSize="12sp"
                                         tools:text="@string/single" />
 
 
@@ -231,14 +231,14 @@
                                         android:layout_marginEnd="@dimen/dp_10"
                                         android:text="好评率"
                                         android:textColor="#979899"
-                                        android:textSize="16sp" />
+                                        android:textSize="12sp" />
 
                                     <TextView
                                         android:layout_width="wrap_content"
                                         android:layout_height="wrap_content"
                                         android:text="@{vm.info.company.hpl+@string/percent_sign}"
                                         android:textColor="#979899"
-                                        android:textSize="16sp"
+                                        android:textSize="12sp"
                                         tools:text="@string/percent_sign" />
 
 
@@ -261,7 +261,7 @@
 
 
                                 <TextView
-                                    android:layout_width="60dp"
+                                    android:layout_width="50dp"
                                     android:gravity="center"
                                     android:layout_height="wrap_content"
                                     android:layout_marginTop="4dp"

+ 5 - 0
app/src/main/res/layout/item_peopleinfo.xml

@@ -4,8 +4,12 @@
 
     <data>
 
+        <import type="android.view.View" />
 
         <variable
+            name="isShow"
+            type="Boolean" />
+        <variable
             name="item"
             type="com.quansu.heifengwuliu.model.DataInfoBean.OrderBean.SendBean" />
 
@@ -71,6 +75,7 @@
                 android:layout_width="17dp"
                 android:layout_height="22dp"
                 android:layout_marginStart="32dp"
+                android:visibility="@{isShow?View.VISIBLE:View.GONE}"
                 android:src="@drawable/ic_item_address" />
 
 

+ 13 - 0
base/src/main/java/com/ysnows/base/model/PositionBean.java

@@ -20,6 +20,8 @@ public class PositionBean  {
 
 
 
+
+
     public PositionBean(String position, String latitude, String longitude,
                         String provincename, String cityname, String areaname ,
                         String areacode) {
@@ -49,4 +51,15 @@ public class PositionBean  {
         this.latitudeEnd = latitudeEnd;
         this.longitudeEnd = longitudeEnd;
     }
+
+
+
+
+    public PositionBean(String position, String latitude, String longitude
+                       ) {
+        this.position = position;
+        this.latitude = latitude;
+        this.longitude = longitude;
+    }
+
 }

+ 3 - 0
base/src/main/java/com/ysnows/base/route/IGaode.kt

@@ -16,6 +16,9 @@ interface  IGaode : IRoute {
 
     fun goRouteLocation(@Param("item") item: PositionBean): Observable<CCResult>
 
+    fun goPolyline(@Param("item") item: ArrayList<PositionBean>): Observable<CCResult>
+
+
     fun currentLocation(): Observable<CCResult>
 
 }

+ 1 - 0
gaode/src/main/AndroidManifest.xml

@@ -62,6 +62,7 @@
         </activity >
         <activity android:name=".activity.SearchAddressActivity"></activity>
         <activity android:name=".activity.RouteActivity"/>
+        <activity android:name=".activity.PolylineActivity"/>
 
 
 

+ 174 - 0
gaode/src/main/java/com/quansu/gaode/activity/PolylineActivity.java

@@ -0,0 +1,174 @@
+package com.quansu.gaode.activity;
+
+import android.graphics.Color;
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+import com.amap.api.maps.AMap;
+import com.amap.api.maps.CameraUpdateFactory;
+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.MarkerOptions;
+import com.amap.api.maps.model.PolylineOptions;
+import com.amap.api.services.core.LatLonPoint;
+import com.amap.api.services.geocoder.GeocodeSearch;
+import com.githang.statusbar.StatusBarCompat;
+import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
+import com.quansu.gaode.R;
+import com.quansu.gaode.utils.AMapUtil;
+import com.ysnows.base.model.PositionBean;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Created by shihuiyun
+ * on 2020/10/15
+ */
+public class PolylineActivity extends AppCompatActivity {
+    private AMap aMap;
+    private MapView mapView;
+    private ImageView imgBack;
+    private TextView tvStart;
+    private TextView tvEnd;
+    private GeocodeSearch geocoderSearch;
+
+    private List<LatLng> list;
+    private List<PositionBean> item;
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        StatusBarCompat.setStatusBarColor(this, Color.parseColor("#00ffffff"));
+
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.map_layout);
+
+         item = new Gson().fromJson(getIntent().getStringExtra("item"), new TypeToken<List<PositionBean>>() {
+        }.getType());
+
+        list = showListLat(item);
+        imgBack = findViewById(R.id.img_back);
+        tvStart = findViewById(R.id.tv_start);
+        tvEnd = findViewById(R.id.tv_end);
+        tvStart.setText(item.get(0).position);
+        tvEnd.setText(item.get(item.size()-1).position);
+        imgBack.setOnClickListener(v -> {
+            finish();
+        });
+
+        mapView = (MapView) findViewById(R.id.map);
+        mapView.onCreate(savedInstanceState);// 此方法必须重写
+        init();
+    }
+    /**
+     * 初始化AMap对象
+     */
+    private void init() {
+        if (aMap == null) {
+            aMap = mapView.getMap();
+            geocoderSearch = new GeocodeSearch(this);
+            setUpMap();
+        }
+    }
+
+    private void setUpMap() {
+
+        //起点位置和  地图界面大小控制
+        aMap.moveCamera(CameraUpdateFactory.newLatLngZoom(list.get(0), 7));
+        aMap.setMapTextZIndex(2);
+        // 绘制一条带有纹理的直线
+        aMap.addPolyline((new PolylineOptions())
+                //手动数据测试
+                //.add(new LatLng(26.57, 106.71),new LatLng(26.14,105.55),new LatLng(26.58, 104.82), new LatLng(30.67, 104.06))
+                //集合数据
+                .addAll(list)
+                //线的宽度
+                .width(30).setDottedLine(true).geodesic(true)
+                //颜色
+                .color(Color.argb(255,255,20,147)));
+
+
+        if(TextUtils.isEmpty(item.get(0).latitude)||TextUtils.isEmpty(item.get(item.size()-1).latitude)){
+            return;
+        }
+        LatLonPoint latLonPoint = new LatLonPoint(Double.parseDouble(item.get(0).latitude),Double.parseDouble(item.get(0).longitude));
+
+        //起点图标
+        View markerView = LayoutInflater.from(this).inflate(R.layout.gaode_start_marker,mapView,false);
+        aMap.addMarker(new MarkerOptions()
+                .position(AMapUtil.convertToLatLng(latLonPoint))
+                .icon(BitmapDescriptorFactory.fromView(markerView)));
+
+        //终点坐标
+        View markerEndView = LayoutInflater.from(this).inflate(R.layout.gaode_end_marker,mapView,false);
+
+        LatLonPoint latLonPointEnd = new LatLonPoint(Double.parseDouble(item.get(item.size()-1).latitude),Double.parseDouble(item.get(item.size()-1).longitude));
+        aMap.addMarker(new MarkerOptions()
+                .position(AMapUtil.convertToLatLng(latLonPointEnd))
+                .icon(BitmapDescriptorFactory.fromView(markerEndView)));
+    }
+
+    /**
+     * 方法必须重写
+     */
+    @Override
+    protected void onResume() {
+        super.onResume();
+        mapView.onResume();
+    }
+
+    /**
+     * 方法必须重写
+     */
+    @Override
+    protected void onPause() {
+        super.onPause();
+        mapView.onPause();
+    }
+    /**
+     * 方法必须重写
+     */
+    @Override
+    protected void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+        mapView.onSaveInstanceState(outState);
+    }
+
+    /**
+     * 方法必须重写
+     */
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        mapView.onDestroy();
+    }
+    /***
+     *经纬度集合
+     */
+    private List<LatLng> showListLat(List<PositionBean> item){
+
+
+        List<LatLng> points = new ArrayList<LatLng>();
+
+        for(PositionBean ss:item){
+            if(!TextUtils.isEmpty(ss.latitude)&&!TextUtils.isEmpty(ss.longitude)) {
+                Log.e("-shy-", "latitude=: "+ss.latitude+"//longitude="+ss.longitude );
+                points.add(new LatLng(Double.parseDouble(ss.latitude), Double.parseDouble(ss.longitude)));
+            }
+        }
+        return points;
+    }
+
+
+
+
+}

+ 4 - 3
gaode/src/main/java/com/quansu/gaode/activity/RouteActivity.java

@@ -76,8 +76,10 @@ public class RouteActivity extends AppCompatActivity implements AMap.OnMapClickL
         tvEnd = findViewById(R.id.tv_end);
         tvStart.setText(item.position);
         tvEnd.setText(item.positionEnd);
+        mapView = (MapView) findViewById(R.id.map);
+        initView();
 
-        if(TextUtils.isEmpty(item.latitude)&&TextUtils.isEmpty(item.latitudeEnd)){
+        if(TextUtils.isEmpty(item.latitude)||TextUtils.isEmpty(item.latitudeEnd)){
             Toast.makeText(this,"定位失败!",Toast.LENGTH_SHORT).show();
             return;
         }
@@ -90,12 +92,11 @@ public class RouteActivity extends AppCompatActivity implements AMap.OnMapClickL
         mEndPoint = new LatLonPoint(Double.parseDouble(item.latitudeEnd), Double.parseDouble(item.longitudeEnd));//终点
 
 
-        mapView = (MapView) findViewById(R.id.map);
         mapView.onCreate(bundle);
         init();
         setfromandtoMarker();
         searchRouteResult(ROUTE_TYPE_DRIVE, RouteSearch.WalkDefault);
-        initView();
+
 
     }
 

+ 21 - 0
gaode/src/main/java/com/quansu/gaode/componnent/CpGaode.java

@@ -8,12 +8,15 @@ import com.billy.cc.core.component.CCResult;
 import com.billy.cc.core.component.IComponent;
 import com.google.gson.Gson;
 import com.quansu.gaode.activity.GaodeActivity;
+import com.quansu.gaode.activity.PolylineActivity;
 import com.quansu.gaode.activity.RouteActivity;
 import com.quansu.gaode.utils.CurrentLocationUtils;
 import com.ysnows.base.base.BApp;
 import com.ysnows.base.ccextension.BIComponent;
 import com.ysnows.base.model.PositionBean;
 
+import java.util.ArrayList;
+
 
 public class CpGaode extends BIComponent implements IComponent {
     /**
@@ -72,6 +75,24 @@ public class CpGaode extends BIComponent implements IComponent {
         CC.sendCCResult(cc.getCallId(), CCResult.success());
         return false;
     }
+    /**
+     * 多点轨迹
+     *
+     * @param cc
+     * @return
+     */
+    public boolean goPolyline(CC cc, ArrayList<PositionBean> item){
+
+        Intent intent = new Intent(BApp.instance().getApplicationContext(), PolylineActivity.class);
+        intent.putExtra("item",new Gson().toJson(item));
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);
+        BApp.instance().getApplicationContext().startActivity(intent);
+
+        CC.sendCCResult(cc.getCallId(), CCResult.success());
+        return false;
+    }
+
+
 
 }
 

+ 12 - 0
gaode/src/main/res/layout/gaode_end_marker.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <ImageView
+        android:layout_width="35dp"
+        android:layout_height="35dp"
+        android:src="@drawable/end">
+    </ImageView>
+
+</LinearLayout>

+ 12 - 0
gaode/src/main/res/layout/gaode_start_marker.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <ImageView
+        android:layout_width="35dp"
+        android:layout_height="35dp"
+        android:src="@drawable/start">
+    </ImageView>
+
+</LinearLayout>

+ 2 - 0
gaode/src/main/res/layout/map_layout.xml

@@ -58,6 +58,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
+            android:layout_marginStart="10dp"
             android:gravity="right"
             android:textColor="#26292F"
             android:textSize="15sp"
@@ -93,6 +94,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
+            android:layout_marginStart="10dp"
             android:gravity="right"
             android:textColor="#26292F"
             android:textSize="15sp"