首页权限优化

app/build.gradle

@@ -37,8 +37,8 @@ android {
         applicationId "com.arpa.hndahesudintocctmsdriver"
         minSdkVersion 24
         targetSdkVersion 30
-        versionCode 67
+        versionCode 68
-        versionName "3.3.7"
+        versionName "3.3.8"
         flavorDimensions "CHANNEL_VALUE"
         flavorDimensions "app_icon"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

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

@@ -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) {
+                    boolean isHasLocation = false;
-
+                    boolean isHasStor = false;
-                    } else {
+                    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;//地图定位样式

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

@@ -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));

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

@@ -40,6 +40,7 @@ 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;
@@ -73,6 +74,7 @@ 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 {
 
@@ -109,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);
@@ -202,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);
@@ -446,12 +475,16 @@ public class StartYunDanActivity extends BaseActivity {
         return str;
     }
 
+    private CustomDialog customDialog;
+
     @Override
     protected void onResume() {
         super.onResume();
         if (map != null) {
             map.onResume();
         }
+        customDialog = new CustomDialog(con, "网络请求中...");
+        customDialog.show();
         hyr.startOrder(id);
         hyr.getEvaluate(id);
     }

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

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

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

@@ -73,9 +73,9 @@ public class SetupActivity extends BaseActivity {
         ConfigBean cb= ConfigParts.getConfigParts(con);
         if(cb!=null){
 //            url1=cb.getData().getUserUrl();
-            url1="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[] title={"平台客服:"+kefu};
-                String[] value={kefu,"95528","13460042961"};
+                String[] value={kefu};
                 new XPopup.Builder(con)
                         .isDarkTheme(false)
                         .isDestroyOnDismiss(true) //对于只使用一次的弹窗，推荐设置这个

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

@@ -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>

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

@@ -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:background="#fff"
-    android:orientation="vertical"
+    android:orientation="vertical">
-    android:id="@+id/huoyuan_xq"
+
-    android:background="#fff">
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@color/theme_color"
         android:orientation="vertical">
+
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
             android:paddingBottom="@dimen/dp_20">
+
             <RelativeLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_68">
+
                 <ImageButton
-                    android:layout_marginLeft="@dimen/dp_38"
                     android:id="@+id/return_btn"
                     android:layout_width="@dimen/dp_21"
                     android:layout_height="@dimen/dp_18"
+                    android:layout_marginLeft="@dimen/dp_38"
                     android:background="@null"
                     android:scaleType="fitXY"
                     android:src="@mipmap/return_btn" />
+
                 <ImageButton
-                    android:layout_marginRight="@dimen/dp_38"
                     android:layout_width="@dimen/dp_18"
                     android:layout_height="@dimen/dp_18"
-                    android: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:textSize="@dimen/sp_13" />
-                    android:layout_gravity="center"
+
-                    />
                 <View
-                    android:layout_marginTop="@dimen/dp_16"
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/dp_1"
-                    android: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:textSize="@dimen/sp_12" />
-                            android:layout_centerVertical="true"
-                            />
 
                         <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_width="match_parent"
-                android:layout_height="@dimen/dp_1"
+                    android:layout_height="@dimen/dp_1"
-                android:background="#EFEFEF"/>
+                    android:background="#EFEFEF" />
+
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/dp_28"
                     android:orientation="horizontal">
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_centerVertical="true"
-                            android:layout_marginLeft="@dimen/dp_5"
-                            android:text="运输要求:"
-                            android:textColor="#ffffffff"
-                            android:textSize="@dimen/sp_12"
-                            android:layout_gravity="center"/>
 
-                        <TextView
+                    <TextView
-                            android:layout_marginLeft="@dimen/dp_7"
+                        android:layout_width="wrap_content"
-                            android:id="@+id/requirement"
+                        android:layout_height="wrap_content"
-                            android:layout_width="wrap_content"
+                        android:layout_centerVertical="true"
-                            android:layout_height="wrap_content"
+                        android:layout_gravity="center"
-                            android:layout_marginRight="@dimen/dp_5"
+                        android:layout_marginLeft="@dimen/dp_5"
-                            android:text=""
+                        android:text="运输要求:"
-                            android:textColor="#ffffffff"
+                        android:textColor="#ffffffff"
-                            android:textSize="@dimen/sp_12"
+                        android:textSize="@dimen/sp_12" />
-                            android:layout_gravity="center"/>
+
+                    <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:textSize="@dimen/sp_13" />
-                android:layout_centerVertical="true"/>
 
             <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:textSize="@dimen/sp_13" />
-                android:layout_gravity="center"/>
 
             <TextView
                 android:id="@+id/check_contract"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_gravity="center"
                 android:text="《运输合同》"
                 android:textColor="@color/theme_color_news"
-                android:textSize="@dimen/sp_13"
+                android:textSize="@dimen/sp_13" />
-                android:layout_gravity="center"/>
 
         </LinearLayout>
 
         <RelativeLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/dp_7"
+            android:layout_marginTop="@dimen/dp_7">
-            >
 
             <ImageButton
-                android:visibility="invisible"
                 android:id="@+id/btnFp"
                 android:layout_width="@dimen/dp_25"
                 android:layout_height="@dimen/dp_25"
@@ -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:textSize="@dimen/sp_13" />
-                android:layout_gravity="center"/>
 
             <TextView
-                android:visibility="gone"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_gravity="center"
                 android:text="增值税发票"
                 android:textColor="@color/red"
                 android:textSize="@dimen/sp_13"
-                android: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="确认接单"

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

@@ -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"

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

@@ -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"

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

@@ -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"