From d4e3a5b87a874f11f5bee480d3949da8a789b987 Mon Sep 17 00:00:00 2001
From: lijia <john_095130@163.com>
Date: Tue, 30 Apr 2024 17:15:59 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E8=BD=A6=E9=95=BF=E8=A7=84?=
 =?UTF-8?q?=E5=88=99=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ui/account/authperson/AuthDrivingActivity.kt          | 2 +-
 .../ui/account/authperson/AuthTrailerActivity.kt          | 2 +-
 .../ui/account/authperson/EditDrivingActivity.kt          | 2 +-
 .../ui/account/authperson/EditTrailerActivity.kt          | 2 +-
 .../ui/mine/activity/PersonInfoActivity.kt                | 1 -
 app/src/main/res/layout/activity_auth_driving.xml         | 2 ++
 app/src/main/res/layout/activity_auth_trailer.xml         | 3 +++
 .../java/com/arpa/mylibrary/weight/CircleBarView2.java    | 8 ++++----
 8 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/account/authperson/AuthDrivingActivity.kt b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/account/authperson/AuthDrivingActivity.kt
index 1f4cbb7..0309e0a 100644
--- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/account/authperson/AuthDrivingActivity.kt
+++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/account/authperson/AuthDrivingActivity.kt
@@ -232,7 +232,7 @@ class AuthDrivingActivity : BaseActivity<ActivityAuthDrivingBinding>() {
                 //车长
                 if (it.overallDimension.contains("mm")) {
                     var overall = it.overallDimension.replace("mm", "")
-                    var splits = overall.split("×")
+                    var splits = overall.split("×","x","X")
                     if (splits.size == 3) {
                         upDrivingInfoBean.carLong =
                             if (splits[0].toIntOrNull() != null) splits[0] else ""
diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/account/authperson/AuthTrailerActivity.kt b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/account/authperson/AuthTrailerActivity.kt
index 54b065d..8b6ce25 100644
--- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/account/authperson/AuthTrailerActivity.kt
+++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/account/authperson/AuthTrailerActivity.kt
@@ -179,7 +179,7 @@ class AuthTrailerActivity : BaseActivity<ActivityAuthTrailerBinding>() {
                 //车长
                 if (it.overallDimension.contains("mm")) {
                     var overall = it.overallDimension.replace("mm", "")
-                    var splits = overall.split("×")
+                    var splits = overall.split("×","x","X")
                     if (splits.size == 3) {
                         upDrivingInfoBean.carLong =
                             if (splits[0].toIntOrNull() != null) splits[0] else ""
diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/account/authperson/EditDrivingActivity.kt b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/account/authperson/EditDrivingActivity.kt
index 69bc93c..4018ca3 100644
--- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/account/authperson/EditDrivingActivity.kt
+++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/account/authperson/EditDrivingActivity.kt
@@ -270,7 +270,7 @@ class EditDrivingActivity : BaseActivity<ActivityAuthDrivingBinding>() {
                 //车长
                 if (it.overallDimension.contains("mm")) {
                     var overall = it.overallDimension.replace("mm", "")
-                    var splits = overall.split("×")
+                    var splits = overall.split("×","x","X")
                     if (splits.size == 3) {
                         upDrivingInfoBean.carLong =
                             if (splits[0].toIntOrNull() != null) splits[0] else ""
diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/account/authperson/EditTrailerActivity.kt b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/account/authperson/EditTrailerActivity.kt
index 200159f..37836e1 100644
--- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/account/authperson/EditTrailerActivity.kt
+++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/account/authperson/EditTrailerActivity.kt
@@ -226,7 +226,7 @@ class EditTrailerActivity : BaseActivity<ActivityAuthTrailerBinding>() {
                 //车长
                 if (it.overallDimension.contains("mm")) {
                     var overall = it.overallDimension.replace("mm", "")
-                    var splits = overall.split("×")
+                    var splits = overall.split("×","x","X")
                     if (splits.size == 3) {
                         upDrivingInfoBean.trailerLong =
                             if (splits[0].toIntOrNull() != null) splits[0] else ""
diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/mine/activity/PersonInfoActivity.kt b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/mine/activity/PersonInfoActivity.kt
index 305754b..30dbd96 100644
--- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/mine/activity/PersonInfoActivity.kt
+++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/mine/activity/PersonInfoActivity.kt
@@ -297,7 +297,6 @@ class PersonInfoActivity : BaseActivity<ActivityPersonInfoBinding>(), View.OnCli
             btnFace.visibility = if (data?.isRealName == "0") View.VISIBLE else View.GONE
 
             circleBarView2.progress = doneInfoCount * 100 / allInfoCount
-
         }
     }
 
diff --git a/app/src/main/res/layout/activity_auth_driving.xml b/app/src/main/res/layout/activity_auth_driving.xml
index 958270b..519729c 100644
--- a/app/src/main/res/layout/activity_auth_driving.xml
+++ b/app/src/main/res/layout/activity_auth_driving.xml
@@ -219,6 +219,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:maxWidth="@dimen/dp_100"
+                            android:drawableLeft="@drawable/start"
                             android:text="车辆所有人"
                             android:textColor="@color/black"
                             android:textSize="@dimen/sp_15"></TextView>
@@ -248,6 +249,7 @@
                             android:layout_height="wrap_content"
                             android:maxWidth="@dimen/dp_100"
                             android:text="使用性质"
+                            android:drawableLeft="@drawable/start"
                             android:textColor="@color/black"
                             android:textSize="@dimen/sp_15"></TextView>
 
diff --git a/app/src/main/res/layout/activity_auth_trailer.xml b/app/src/main/res/layout/activity_auth_trailer.xml
index 1d21123..b8dc719 100644
--- a/app/src/main/res/layout/activity_auth_trailer.xml
+++ b/app/src/main/res/layout/activity_auth_trailer.xml
@@ -34,6 +34,7 @@
             android:layout_height="wrap_content"
             android:orientation="vertical">
 
+
             <androidx.cardview.widget.CardView
                 android:id="@+id/cdPerson"
                 android:layout_width="match_parent"
@@ -180,6 +181,7 @@
                         android:orientation="horizontal">
 
                         <TextView
+                            android:drawableLeft="@drawable/start"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:maxWidth="@dimen/dp_100"
@@ -209,6 +211,7 @@
                         android:orientation="horizontal">
 
                         <TextView
+                            android:drawableLeft="@drawable/start"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:maxWidth="@dimen/dp_100"
diff --git a/mylibrary/src/main/java/com/arpa/mylibrary/weight/CircleBarView2.java b/mylibrary/src/main/java/com/arpa/mylibrary/weight/CircleBarView2.java
index 93361e2..b1484d4 100644
--- a/mylibrary/src/main/java/com/arpa/mylibrary/weight/CircleBarView2.java
+++ b/mylibrary/src/main/java/com/arpa/mylibrary/weight/CircleBarView2.java
@@ -66,7 +66,7 @@ public class CircleBarView2 extends View {
 
     public CircleBarView2(Context context, AttributeSet attrs, int defStyleAttr) {
         super(context, attrs, defStyleAttr);
-        initAttrs(context,attrs);
+        initAttrs(context, attrs);
     }
 
     public int getMax() {
@@ -82,7 +82,7 @@ public class CircleBarView2 extends View {
     }
 
     public void setProgress(int progress) {
-        if (this.progress == progress) {
+        if (progress != 0 && this.progress == progress) {
             return;
         }
         if (animator != null && animator.isRunning()) {
@@ -158,7 +158,7 @@ public class CircleBarView2 extends View {
         innerPaint.setColor(context.getColor(R.color.color_f15));
         innerPaint.setStyle(Paint.Style.STROKE);
         innerPaint.setStrokeCap(Paint.Cap.ROUND);
-        innerPaint.setStrokeWidth(roundWidth+10);
+        innerPaint.setStrokeWidth(roundWidth + 10);
 
         mTextPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
         mTextPaint.setColor(context.getColor(R.color.color_9));
@@ -206,7 +206,7 @@ public class CircleBarView2 extends View {
         // 中心点
         centerPoint.set(getWidth() / 2, height / 2);
         // 计算圆弧显示的范围，height * 2 是因为圆弧的高度是根据园来算的，所以双倍才是半个圆
-        oval.set(getWidth() / 2f - radius, (float) roundWidth, getWidth() / 2f + radius, height * 2 - roundWidth*2);
+        oval.set(getWidth() / 2f - radius, (float) roundWidth, getWidth() / 2f + radius, height * 2 - roundWidth * 2);
     }
 
     @Override