1.修改个人中心拨打电话号码不对。

2.navi-3dmap添加混淆。

app/proguard-rules.pro

@@ -364,12 +364,19 @@
 -keep class com.amap.api.maps2d.**{*;}
 -keep class com.amap.api.mapcore2d.**{*;}
 
-#    导航
+#导航 V7.3.0以前：
 -keep class com.amap.api.navi.**{*;}
--keep class com.autonavi.**{*;}
+-keep class com.alibaba.idst.nls.** {*;}
+-keep class com.nlspeech.nlscodec.** {*;}
+-keep class com.google.**{*;}
 #PictureSelector 2.0
 -keep class com.luck.picture.lib.** { *; }
 
+#导航 V7.3.0及以后：
+-keep class com.amap.api.navi.**{*;}
+-keep class com.alibaba.mit.alitts.*{*;}
+-keep class com.google.**{*;}
+
 #Ucrop
 -dontwarn com.yalantis.ucrop**
 -keep class com.yalantis.ucrop** { *; }

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

@@ -145,8 +145,8 @@ class HomeActivity : MBActivity<HomeVModel, ActivityHomeBinding>() {
 
         } else {
 
-           // val oneFragment = DeliverGoodsFragment()
-            val oneFragment =  OwnerSingleFragment()
+            val oneFragment = DeliverGoodsFragment()
+           // val oneFragment =  OwnerSingleFragment()
             val twoFragment = WayBillFragment()
             val threeFragment = MineFragment()
 

app/src/main/java/com/quansu/heifengwuliu/config/Config.kt

@@ -7,8 +7,8 @@ class Config : IConfig {
       // return "https://heifengwuliu.qs110.com/"
      // return "https://heifengwuliudev.qs110.com/"
 
-     // return "https://xinyunbida.qs110.com/"
-      return "https://xinyunbidadev.qs110.com/"
+      return "https://xinyunbida.qs110.com/"
+    // return "https://xinyunbidadev.qs110.com/"
 
     }
 

app/src/main/java/com/quansu/heifengwuliu/fragment/OwnerSingleFragment.kt

@@ -91,7 +91,7 @@ class OwnerSingleFragment : MBFragment<OwnerSingleVModel, FragmentOwnersingleBin
 
     override fun init(savedInstanceState: Bundle?) {
         super.init(savedInstanceState)
-        setShow()
+       // setShow()
         getData()
 
         vm.info.observe(this, Observer {

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

@@ -88,7 +88,10 @@ open class MineVModel(application: Application) : BViewModel<MineRepository>(app
     }
 
     fun callPhone() {
-        DialUtils.dialPhone(view()?.context(), "19898989898")
+
+       if(null!=user.value!!&&null!=user.value!!.kf_mobile) {
+           DialUtils.dialPhone(view()?.context(), user.value!!.kf_mobile)
+       }
 
     }
 

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

@@ -4,6 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools">
 
     <data>
+
         <import type="android.view.View" />
 
         <variable
@@ -40,19 +41,20 @@
                     android:id="@+id/ll"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    app:layout_constraintRight_toRightOf="parent"
-                    app:layout_constraintTop_toTopOf="parent"
+                    android:orientation="vertical"
                     app:layout_constraintLeft_toLeftOf="parent"
-                    android:orientation="vertical">
+                    app:layout_constraintRight_toRightOf="parent"
+                    app:layout_constraintTop_toTopOf="parent">
 
                     <TextView
                         android:id="@+id/tv"
                         android:layout_width="wrap_content"
-                        android:visibility="gone"
-                        android:layout_height="wrap_content" />
+                        android:layout_height="wrap_content"
+                        android:visibility="gone" />
 
                 </LinearLayout>
 
+
                 <ImageView
                     android:id="@+id/img_info"
                     android:layout_width="26dp"
@@ -68,20 +70,19 @@
 
                 <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
                     android:layout_width="17dp"
-                    app:qmui_backgroundColor="@color/white"
-                    app:qmui_borderColor="@color/white"
-                    app:qmui_radius="50dp"
-                    tools:text="2"
-                    android:textSize="11sp"
-                    android:text="@{String.valueOf(vm.user.msg_num)}"
-                    android:layout_marginEnd="14dp"
+                    android:layout_height="17dp"
                     android:layout_marginTop="9dp"
+                    android:layout_marginEnd="14dp"
+                    android:text="@{String.valueOf(vm.user.msg_num)}"
                     android:textColor="#FFBC00"
+                    android:textSize="11sp"
                     android:visibility="@{vm.user.msg_num==0?View.GONE:View.VISIBLE}"
                     app:layout_constraintRight_toRightOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/ll"
-                    android:layout_height="17dp"/>
-
+                    app:qmui_backgroundColor="@color/white"
+                    app:qmui_borderColor="@color/white"
+                    app:qmui_radius="50dp"
+                    tools:text="2" />
 
 
                 <androidx.constraintlayout.widget.ConstraintLayout
@@ -93,115 +94,146 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/img_info">
 
-                    <com.qmuiteam.qmui.widget.QMUIRadiusImageView
-                        android:id="@+id/img_user_avater"
-                        android:layout_width="55dp"
-                        android:layout_height="55dp"
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:orientation="horizontal"
                         android:layout_marginStart="38dp"
                         android:layout_marginTop="34dp"
-                        android:src="@drawable/ic_default_avatar"
                         app:layout_constraintLeft_toLeftOf="parent"
                         app:layout_constraintTop_toTopOf="parent"
-                        app:qmui_border_color="@color/white"
-                        app:qmui_is_circle="true"
-                        android:onClick="@{v->vm.goPassword(3)}"
-                        app:drawable="@{@drawable/ic_default_avatar}"
-                        app:url="@{vm.user.avatar()}" />
+                        android:layout_height="wrap_content">
 
-                    <TextView
-                        android:id="@+id/tv_user_name"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="7dp"
-                        android:text="@{vm.user.name}"
-                        android:textColor="#111111"
-                        android:onClick="@{v->vm.goPassword(3)}"
 
-                        android:textSize="20sp"
-                        android:textStyle="bold"
-                        app:layout_constraintStart_toEndOf="@id/img_user_avater"
-                        app:layout_constraintTop_toTopOf="@id/img_user_avater"
-                        tools:text="郑货主" />
 
-                    <TextView
-                        android:id="@+id/tv_user_mobile"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="@dimen/dp_10"
-                        android:layout_marginTop="2dp"
-                        android:layout_marginBottom="10dp"
-                        android:onClick="@{v->vm.goPassword(3)}"
-                        android:text="@{vm.user.mobile}"
-                        android:textColor="#606060"
-                        android:textSize="14sp"
-                        app:layout_constraintStart_toEndOf="@id/img_user_avater"
-                        app:layout_constraintTop_toBottomOf="@id/tv_user_name"
-                        tools:text="18353965350" />
+                        <com.qmuiteam.qmui.widget.QMUIRadiusImageView
+                            android:id="@+id/img_user_avater"
+                            android:layout_width="55dp"
+                            android:layout_height="55dp"
+                            android:onClick="@{v->vm.goPassword(3)}"
+                            android:src="@drawable/ic_default_avatar"
+                            app:drawable="@{@drawable/ic_default_avatar}"
+                            app:qmui_border_color="@color/white"
+                            app:qmui_is_circle="true"
+                            app:url="@{vm.user.avatar()}" />
 
 
-                    <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
-                        android:id="@+id/btn_identity_unverified"
-                        android:layout_width="84dp"
-                        android:layout_height="26dp"
-                        android:layout_marginEnd="49dp"
-                        android:gravity="center"
-                        android:onClick="@{v->vm.goPersonalVerify()}"
-                        android:orientation="horizontal"
-                        app:layout_constraintBottom_toTopOf="@id/btn_com_unverified"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintTop_toTopOf="@id/img_user_avater"
-                        app:qmui_borderColor="#FFBC00"
-                        app:qmui_borderWidth="1dp"
-                        app:qmui_radius="4dp">
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="@{vm.getIdentity(vm.user.is_info,1)}"
-                            android:textColor="#FFBC00"
-                            android:textSize="11sp"
-                            tools:text="身份未认证" />
+                        <LinearLayout
+                            android:layout_width="0dp"
+                            android:layout_weight="1"
+                            android:orientation="vertical"
+                            android:layout_height="wrap_content">
 
-                        <ImageView
-                            android:layout_width="8dp"
-                            android:layout_height="10dp"
-                            android:layout_marginStart="4dp"
-                            android:src="@drawable/ic_yellow_right" />
 
-                    </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
 
+                            <TextView
+                                android:id="@+id/tv_user_name"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_marginStart="7dp"
+                                android:onClick="@{v->vm.goPassword(3)}"
+                                android:text="@{vm.user.name}"
+                                android:textColor="#111111"
+                                android:layout_marginRight="@dimen/dp_5"
+                                android:textSize="20sp"
+                                android:textStyle="bold"
+                                tools:text="郑货主12222222222222222222222" />
 
-                    <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
-                        android:id="@+id/btn_com_unverified"
-                        android:layout_width="84dp"
-                        android:layout_height="26dp"
-                        android:layout_marginTop="8dp"
-                        android:layout_marginEnd="49dp"
-                        android:gravity="center"
-                        android:onClick="@{v->vm.user.isDriver()?vm.goVehicleVerify():vm.goComVerify()}"
-                        android:orientation="horizontal"
-                        app:layout_constraintBottom_toBottomOf="@id/img_user_avater"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintTop_toBottomOf="@id/btn_identity_unverified"
-                        app:qmui_borderColor="#FFBC00"
-                        app:qmui_borderWidth="1dp"
-                        app:qmui_radius="4dp">
-
-                        <TextView
+                            <TextView
+                                android:id="@+id/tv_user_mobile"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_marginStart="@dimen/dp_10"
+                                android:layout_marginTop="2dp"
+                                android:layout_marginBottom="10dp"
+                                android:onClick="@{v->vm.goPassword(3)}"
+                                android:text="@{vm.user.mobile}"
+                                android:textColor="#606060"
+                                android:textSize="14sp"
+                                tools:text="18353965350" />
+
+
+                        </LinearLayout>
+
+
+                        <LinearLayout
                             android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="@{vm.user.isDriver()? vm.getIdentity(vm.user.is_car,2):vm.getIdentity(vm.user.is_company,3)}"
-                            android:textColor="#FFBC00"
-                            android:textSize="11sp"
-                            tools:text="身份未认证" />
+                            android:orientation="vertical"
+                            android:layout_height="wrap_content">
+
+
+                            <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
+                                android:id="@+id/btn_identity_unverified"
+                                android:layout_width="84dp"
+                                android:layout_height="26dp"
+                                android:layout_marginEnd="49dp"
+                                android:gravity="center"
+                                android:onClick="@{v->vm.goPersonalVerify()}"
+                                android:orientation="horizontal"
+                                app:qmui_borderColor="#FFBC00"
+                                app:qmui_borderWidth="1dp"
+                                app:qmui_radius="4dp">
+
+                                <TextView
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:text="@{vm.getIdentity(vm.user.is_info,1)}"
+                                    android:textColor="#FFBC00"
+                                    android:textSize="11sp"
+                                    tools:text="身份未认证" />
+
+                                <ImageView
+                                    android:layout_width="8dp"
+                                    android:layout_height="10dp"
+                                    android:layout_marginStart="4dp"
+                                    android:src="@drawable/ic_yellow_right" />
+
+                            </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
+
+
+                            <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
+                                android:id="@+id/btn_com_unverified"
+                                android:layout_width="84dp"
+                                android:layout_height="26dp"
+                                android:layout_marginTop="8dp"
+                                android:layout_marginEnd="49dp"
+                                android:gravity="center"
+                                android:onClick="@{v->vm.user.isDriver()?vm.goVehicleVerify():vm.goComVerify()}"
+                                android:orientation="horizontal"
+                                app:qmui_borderColor="#FFBC00"
+                                app:qmui_borderWidth="1dp"
+                                app:qmui_radius="4dp">
+
+                                <TextView
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:text="@{vm.user.isDriver()? vm.getIdentity(vm.user.is_car,2):vm.getIdentity(vm.user.is_company,3)}"
+                                    android:textColor="#FFBC00"
+                                    android:textSize="11sp"
+                                    tools:text="身份未认证" />
+
+                                <ImageView
+                                    android:layout_width="8dp"
+                                    android:layout_height="10dp"
+                                    android:layout_marginStart="4dp"
+                                    android:src="@drawable/ic_yellow_right" />
+
+                            </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
+
+
+
+
+                        </LinearLayout>
+
+
+
+                    </LinearLayout>
+
+
+
+
 
-                        <ImageView
-                            android:layout_width="8dp"
-                            android:layout_height="10dp"
-                            android:layout_marginStart="4dp"
-                            android:src="@drawable/ic_yellow_right" />
 
-                    </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
 
 
                 </androidx.constraintlayout.widget.ConstraintLayout>
@@ -225,9 +257,9 @@
                         android:orientation="horizontal"
                         android:paddingTop="16dp"
                         android:paddingBottom="15dp"
+                        android:visibility="@{vm.user.isDriver()?View.VISIBLE:View.GONE}"
                         app:qmui_backgroundColor="@color/white"
                         app:qmui_borderColor="@color/white"
-                        android:visibility="@{vm.user.isDriver()?View.VISIBLE:View.GONE}"
                         app:qmui_radius="10dp">
 
                         <LinearLayout
@@ -301,8 +333,8 @@
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
                             android:layout_weight="1"
-                            android:onClick="@{v->vm.toCall(vm.user.kf_mobile)}"
                             android:gravity="center"
+                            android:onClick="@{v->vm.toCall(vm.user.kf_mobile)}"
                             android:orientation="vertical">
 
                             <ImageView
@@ -333,9 +365,9 @@
                         android:orientation="horizontal"
                         android:paddingTop="16dp"
                         android:paddingBottom="15dp"
+                        android:visibility="@{vm.user.isDriver()?View.GONE:View.VISIBLE}"
                         app:qmui_backgroundColor="@color/white"
                         app:qmui_borderColor="@color/white"
-                        android:visibility="@{vm.user.isDriver()?View.GONE:View.VISIBLE}"
                         app:qmui_radius="10dp">
 
                         <LinearLayout
@@ -410,8 +442,8 @@
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
                             android:layout_weight="1"
-                            android:onClick="@{v->vm.toCall(vm.user.kf_mobile)}"
                             android:gravity="center"
+                            android:onClick="@{v->vm.toCall(vm.user.kf_mobile)}"
                             android:orientation="vertical">
 
                             <ImageView
@@ -450,8 +482,7 @@
                         <LinearLayout
                             style="@style/mine_list"
                             android:onClick="@{v->vm.goComment()}"
-                            android:visibility="@{vm.user.isDriver()?View.GONE:View.VISIBLE}"
-                            >
+                            android:visibility="@{vm.user.isDriver()?View.GONE:View.VISIBLE}">
 
                             <ImageView
                                 style="@style/mine_img"
@@ -468,9 +499,9 @@
                         </LinearLayout>
 
                         <LinearLayout
-                            android:visibility="@{vm.user.isDriver()?View.GONE:View.VISIBLE}"
                             style="@style/mine_list"
-                            android:onClick="@{v->vm.goAdress()}">
+                            android:onClick="@{v->vm.goAdress()}"
+                            android:visibility="@{vm.user.isDriver()?View.GONE:View.VISIBLE}">
 
                             <ImageView
                                 style="@style/mine_img"

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

@@ -22,6 +22,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="@color/white"
+            android:visibility="gone"
             android:orientation="vertical">
 
             <TextView
@@ -37,6 +38,7 @@
             android:layout_height="50dp"
             android:background="@color/white"
             android:gravity="center"
+            android:visibility="gone"
             android:orientation="horizontal"
             >
 

build.gradle

@@ -9,8 +9,8 @@ buildscript {
     ext.coroutines = '1.3.4'
 
     ext.application_id = "com.quansu.heifengwuliu"
-    ext.application_version_code = 4
-    ext.application_version_name = "1.0.4"
+    ext.application_version_code = 5
+    ext.application_version_name = "1.0.5"
     ext.support_version = "29.0.2"
     ext.min_sdk_version = 23
     ext.target_sdk_version = 30

gaode/proguard-rules.pro

@@ -45,3 +45,12 @@
 #    导航
 -keep class com.amap.api.navi.**{*;}
 -keep class com.autonavi.**{*;}
+#导航 V7.3.0以前：
+-keep class com.amap.api.navi.**{*;}
+-keep class com.alibaba.idst.nls.** {*;}
+-keep class com.nlspeech.nlscodec.** {*;}
+-keep class com.google.**{*;}
+#导航 V7.3.0及以后：
+-keep class com.amap.api.navi.**{*;}
+-keep class com.alibaba.mit.alitts.*{*;}
+-keep class com.google.**{*;}