diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index eeb977f..b673222 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -242,6 +242,11 @@
android:configChanges="keyboardHidden|orientation|locale"
android:screenOrientation="portrait"
android:windowSoftInputMode="adjustPan|stateHidden" />
+
diff --git a/app/src/main/java/com/dahe/gldriver/ui/mine/MineFragment.kt b/app/src/main/java/com/dahe/gldriver/ui/mine/MineFragment.kt
index 78dff3b..55546ad 100644
--- a/app/src/main/java/com/dahe/gldriver/ui/mine/MineFragment.kt
+++ b/app/src/main/java/com/dahe/gldriver/ui/mine/MineFragment.kt
@@ -10,6 +10,7 @@ import com.dahe.gldriver.databinding.FragmentMineBinding
import com.dahe.gldriver.ui.account.authperson.AuthPartyActivity
import com.dahe.gldriver.ui.mine.activity.CarTeamActivity
import com.dahe.gldriver.ui.mine.activity.CarsManActivity
+import com.dahe.gldriver.ui.mine.activity.PersonInfoActivity
import com.dahe.gldriver.ui.mine.activity.RulesActivity
import com.dahe.gldriver.ui.mine.activity.WalletActivity
import com.dahe.gldriver.utils.SPUtils
@@ -69,6 +70,10 @@ class MineFragment : BaseFragment(), View.OnClickListener {
rlMoney.setOnClickListener {
ActivityUtils.startActivity(mContext, WalletActivity::class.java)
}
+
+ llPerson.setOnClickListener {
+ ActivityUtils.startActivity(mContext, PersonInfoActivity::class.java)
+ }
}
}
diff --git a/app/src/main/java/com/dahe/gldriver/ui/mine/activity/CarTeamActivity.kt b/app/src/main/java/com/dahe/gldriver/ui/mine/activity/CarTeamActivity.kt
index 98f7fe6..fd8a6a3 100644
--- a/app/src/main/java/com/dahe/gldriver/ui/mine/activity/CarTeamActivity.kt
+++ b/app/src/main/java/com/dahe/gldriver/ui/mine/activity/CarTeamActivity.kt
@@ -55,10 +55,10 @@ class CarTeamActivity : BaseActivity() {
binding.circleBarView.setProgress(30f,1000)
binding.circleBarView2.run {
- text = "高风险"
- valueText = "0"
- unitText= "分"
- progress = 60
+ text = "完成度"
+ valueText = "10"
+ unitText= "%"
+ progress = 20
}
mFragmentContainerHelper.handlePageSelected(0,true)
diff --git a/app/src/main/java/com/dahe/gldriver/ui/mine/activity/PersonInfoActivity.kt b/app/src/main/java/com/dahe/gldriver/ui/mine/activity/PersonInfoActivity.kt
new file mode 100644
index 0000000..5bebed2
--- /dev/null
+++ b/app/src/main/java/com/dahe/gldriver/ui/mine/activity/PersonInfoActivity.kt
@@ -0,0 +1,29 @@
+package com.dahe.gldriver.ui.mine.activity
+
+import android.os.Bundle
+import com.dahe.gldriver.R
+import com.dahe.gldriver.databinding.ActivityPersonInfoBinding
+import com.dahe.mylibrary.base.BaseActivity
+
+/**
+ * @ClassName PersonInfoActivity
+ * @Author john
+ * @Date 2024/2/18 08:47
+ * @Description TODO
+ */
+class PersonInfoActivity : BaseActivity() {
+ override fun initView(savedInstanceState: Bundle?) {
+ setStatusHeightParams(binding.rlTop)
+ setTitleBar("实名认证",true)
+
+ binding.circleBarView2.run {
+ text = "完成度"
+ valueText = "10"
+ unitText= "%"
+ progress = 20
+ }
+ }
+
+ override fun initDate() {
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/res/drawable-xxhdpi/icon_check.png b/app/src/main/res/drawable-xxhdpi/icon_check.png
new file mode 100644
index 0000000..9eb11b2
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/icon_check.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/icon_driver.png b/app/src/main/res/drawable-xxhdpi/icon_driver.png
new file mode 100644
index 0000000..8bf5960
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/icon_driver.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/icon_driving.png b/app/src/main/res/drawable-xxhdpi/icon_driving.png
new file mode 100644
index 0000000..d06a867
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/icon_driving.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/icon_face.png b/app/src/main/res/drawable-xxhdpi/icon_face.png
new file mode 100644
index 0000000..b586473
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/icon_face.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/icon_person.png b/app/src/main/res/drawable-xxhdpi/icon_person.png
new file mode 100644
index 0000000..0b6ba45
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/icon_person.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/icon_quali.png b/app/src/main/res/drawable-xxhdpi/icon_quali.png
new file mode 100644
index 0000000..8bf5960
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/icon_quali.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/icon_refre.png b/app/src/main/res/drawable-xxhdpi/icon_refre.png
new file mode 100644
index 0000000..4a6a305
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/icon_refre.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/icon_road.png b/app/src/main/res/drawable-xxhdpi/icon_road.png
new file mode 100644
index 0000000..302e97c
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/icon_road.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/icon_warn.png b/app/src/main/res/drawable-xxhdpi/icon_warn.png
new file mode 100644
index 0000000..da1ce9c
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/icon_warn.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/person_bg.png b/app/src/main/res/drawable-xxhdpi/person_bg.png
new file mode 100644
index 0000000..4e2388e
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/person_bg.png differ
diff --git a/app/src/main/res/drawable/shape_btn_11.xml b/app/src/main/res/drawable/shape_btn_11.xml
new file mode 100644
index 0000000..c8f66d3
--- /dev/null
+++ b/app/src/main/res/drawable/shape_btn_11.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_btn_14.xml b/app/src/main/res/drawable/shape_btn_14.xml
new file mode 100644
index 0000000..1d9998a
--- /dev/null
+++ b/app/src/main/res/drawable/shape_btn_14.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_car_team.xml b/app/src/main/res/layout/activity_car_team.xml
index 09b7c0d..8606ca6 100644
--- a/app/src/main/res/layout/activity_car_team.xml
+++ b/app/src/main/res/layout/activity_car_team.xml
@@ -32,7 +32,6 @@
android:id="@+id/circleBarView2"
android:layout_width="300dp"
android:layout_height="@dimen/dp_150"
- app:progress_color1="@color/red"
/>
diff --git a/app/src/main/res/layout/activity_person_info.xml b/app/src/main/res/layout/activity_person_info.xml
new file mode 100644
index 0000000..5147525
--- /dev/null
+++ b/app/src/main/res/layout/activity_person_info.xml
@@ -0,0 +1,874 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_mine.xml b/app/src/main/res/layout/fragment_mine.xml
index 6a780bf..3075abc 100644
--- a/app/src/main/res/layout/fragment_mine.xml
+++ b/app/src/main/res/layout/fragment_mine.xml
@@ -30,6 +30,7 @@
#EEEEEE
#333333
#666666
+ #cccccc
#ED4C19
#0256FF
diff --git a/mylibrary/src/main/java/com/dahe/mylibrary/weight/CircleBarView2.java b/mylibrary/src/main/java/com/dahe/mylibrary/weight/CircleBarView2.java
index ec1da53..f402d75 100644
--- a/mylibrary/src/main/java/com/dahe/mylibrary/weight/CircleBarView2.java
+++ b/mylibrary/src/main/java/com/dahe/mylibrary/weight/CircleBarView2.java
@@ -2,6 +2,7 @@ package com.dahe.mylibrary.weight;
import android.animation.ValueAnimator;
import android.content.Context;
+import android.content.res.TypedArray;
import android.graphics.Canvas;
import android.graphics.Paint;
import android.graphics.Point;
@@ -65,7 +66,7 @@ public class CircleBarView2 extends View {
public CircleBarView2(Context context, AttributeSet attrs, int defStyleAttr) {
super(context, attrs, defStyleAttr);
- initAttrs(context);
+ initAttrs(context,attrs);
}
public int getMax() {
@@ -134,13 +135,15 @@ public class CircleBarView2 extends View {
invalidate();
}
- private void initAttrs(Context context) {
+ private void initAttrs(Context context, AttributeSet attrs) {
+
+ TypedArray typedArray = context.obtainStyledAttributes(attrs, R.styleable.CircleBarView);
// 文字间距
textMargin = dp2px(context, 5);
// 圆弧宽度
- roundWidth = dp2px(context, 5);
+ roundWidth = dp2px(context, 8);
// 半径
- radius = dp2px(context, 72);
+ radius = dp2px(context, 92);
height = radius;
// 小间距
smallMargin = roundWidth / 2;
@@ -155,15 +158,15 @@ 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);
+ innerPaint.setStrokeWidth(roundWidth+10);
mTextPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
- mTextPaint.setColor(context.getColor(R.color.color_ff3));
- mTextPaint.setTextSize(sp2px(getContext(), 24));
+ mTextPaint.setColor(context.getColor(R.color.color_9));
+ mTextPaint.setTextSize(sp2px(getContext(), 16));
mValueTextPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
mValueTextPaint.setColor(valueColor);
- mValueTextPaint.setTextSize(sp2px(getContext(), 24));
+ mValueTextPaint.setTextSize(sp2px(getContext(), 34));
mUnitTextPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
mUnitTextPaint.setColor(context.getColor(R.color.color_ff3));