Merge remote-tracking branch 'origin/master'

app/src/main/AndroidManifest.xml

@@ -97,6 +97,7 @@
             android:taskAffinity="com.quansu.heifengwuliu" />
         <activity android:name=".activity.MsgActivity" />
         <activity android:name=".activity.AccountActivity" />
+        <activity android:name=".activity.PersonalVerityActivity" />
 
     </application >
 

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

@@ -0,0 +1,13 @@
+package com.quansu.heifengwuliu.activity
+
+import com.quansu.heifengwuliu.base.MBActivity
+import com.quansu.heifengwuliu.databinding.ActivityPersonalVerifyBinding
+import com.quansu.heifengwuliu.vmodel.PersonalVerityVModel
+
+class PersonalVerityActivity : MBActivity<PersonalVerityVModel, ActivityPersonalVerifyBinding>() {
+
+    override fun binding(): ActivityPersonalVerifyBinding {
+        return ActivityPersonalVerifyBinding.inflate(layoutInflater)
+    }
+
+}

app/src/main/java/com/quansu/heifengwuliu/repository/PersonalVerifyRepository.kt

@@ -0,0 +1,7 @@
+package com.quansu.heifengwuliu.repository
+
+import com.ysnows.base.base.BRepository
+
+class PersonalVerifyRepository : BRepository() {
+
+}

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

@@ -24,6 +24,15 @@ open class MineVModel : BViewModel<MineRepository>() {
         single(MsgActivity::class.java)
     }
 
+    fun goVerify() {
+        single(MsgActivity::class.java)
+    }
+
+
+    fun goPersonalVerify() {
+        single(MsgActivity::class.java)
+    }
+
     fun goMyAccount() {
         single(AccountActivity::class.java)
     }

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

@@ -0,0 +1,9 @@
+package com.quansu.heifengwuliu.vmodel
+
+import com.quansu.heifengwuliu.repository.PersonalVerifyRepository
+import com.ysnows.base.base.BViewModel
+
+class PersonalVerityVModel : BViewModel<PersonalVerifyRepository>() {
+
+
+}

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

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto" >
+
+    <data >
+
+        <variable
+            name="vm"
+            type="com.quansu.heifengwuliu.vmodel.PersonalVerityVModel" />
+    </data >
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:paddingStart="@dimen/dp_14"
+        android:paddingEnd="@dimen/dp_14" >
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/dp_55"
+            android:text="@string/id_information_upload"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <!--        <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton-->
+        <!--            android:layout_width=""-->
+        <!--            android:layout_height=""-->
+
+        <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_40"
+            android:layout_marginStart="@dimen/dp_30"
+            android:layout_marginEnd="@dimen/dp_30"
+            android:layout_marginBottom="@dimen/dp_30"
+            android:text="@string/submit"
+            app:layout_constraintBottom_toBottomOf="parent" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout >
+
+</layout >

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

@@ -12,6 +12,113 @@
         android:layout_height="match_parent"
         android:orientation="vertical" >
 
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="90dp"
+            android:padding="@dimen/dp_12" >
+
+            <TextView
+                android:id="@+id/available_balance_name"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/dp_8"
+                android:text="@string/available_balance"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <TextView
+                android:id="@+id/available_balance"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/dp_10"
+                android:text="￥2000"
+                app:layout_constraintBottom_toBottomOf="@id/available_balance_name"
+                app:layout_constraintStart_toEndOf="@id/available_balance_name"
+                app:layout_constraintTop_toTopOf="@id/available_balance_name" />
+
+            <TextView
+                android:id="@+id/all_balance_name"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/all_balance"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintStart_toStartOf="parent" />
+
+            <TextView
+                android:id="@+id/all_balance"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="￥20000"
+                app:layout_constraintBottom_toBottomOf="@id/all_balance_name"
+                app:layout_constraintStart_toEndOf="@id/all_balance_name"
+                app:layout_constraintTop_toTopOf="@id/all_balance_name" />
+
+            <TextView
+                android:id="@+id/freeze_balance_name"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/freeze_balance"
+                app:layout_constraintBottom_toBottomOf="@id/freeze_balance"
+                app:layout_constraintEnd_toStartOf="@id/freeze_balance"
+                app:layout_constraintTop_toTopOf="@id/freeze_balance" />
+
+            <TextView
+                android:id="@+id/freeze_balance"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="￥20000"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent" />
+
+            <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
+                android:id="@+id/btn_withdraw"
+                android:layout_width="70dp"
+                android:layout_height="28dp"
+                android:text="@string/withdraw"
+                app:layout_constraintBottom_toBottomOf="@id/available_balance_name"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toTopOf="@id/available_balance_name"
+                app:qmui_radius="@dimen/dp_5" />
+
+            <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
+                android:id="@+id/btn_topup"
+                android:layout_width="70dp"
+                android:layout_height="28dp"
+                android:layout_marginEnd="@dimen/dp_8"
+                android:text="@string/topup"
+                app:layout_constraintBottom_toBottomOf="@id/available_balance_name"
+                app:layout_constraintEnd_toStartOf="@id/btn_withdraw"
+                app:layout_constraintTop_toTopOf="@id/available_balance_name"
+                app:qmui_radius="@dimen/dp_5" />
+
+        </androidx.constraintlayout.widget.ConstraintLayout >
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="0.6dp"
+            android:background="@color/gray_lite" />
+
+        <LinearLayout
+            style="@style/mine_list"
+            android:layout_marginTop="4dp" >
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="@string/bill_detail" />
+
+            <ImageView
+                style="@style/mine_arrow_right"
+                android:src="@drawable/mine_right" />
+
+        </LinearLayout >
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="0.6dp"
+            android:background="@color/gray_lite" />
+
         <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
             android:id="@+id/refresh_layout"
             android:layout_width="match_parent"
@@ -22,7 +129,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-                tools:listitem="@layout/item_msg" />
+                tools:listitem="@layout/item_bill" />
 
         </androidx.swiperefreshlayout.widget.SwipeRefreshLayout >
     </LinearLayout >

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

@@ -98,15 +98,34 @@
                         tools:text="18353965350" />
 
                     <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
-                        android:layout_width="70dp"
+                        android:id="@+id/btn_identity_unverified"
+                        android:layout_width="80dp"
                         android:layout_height="26dp"
                         android:layout_marginEnd="@dimen/dp_10"
-                        android:text="未认证"
+                        android:onClick="@{v->vm.goPersonalVerify()}"
+                        android:text="@string/identity_unverified"
                         android:textColor="#459AEA"
                         android:textSize="@dimen/sp_13"
-                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintBottom_toTopOf="@id/btn_com_unverified"
                         app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintTop_toTopOf="parent"
+                        app:layout_constraintTop_toTopOf="@id/img_user_avater"
+                        app:qmui_backgroundColor="#E8F1FB"
+                        app:qmui_borderColor="#459AEA"
+                        app:qmui_radius="@dimen/dp_4" />
+
+                    <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
+                        android:id="@+id/btn_com_unverified"
+                        android:layout_width="80dp"
+                        android:layout_height="26dp"
+                        android:layout_marginTop="@dimen/dp_8"
+                        android:layout_marginEnd="@dimen/dp_10"
+                        android:onClick="@{v->vm.goVerify()}"
+                        android:text="@{vm.user.isDriver()?@string/vehicle_unverified:@string/com_unverified}"
+                        android:textColor="#459AEA"
+                        android:textSize="@dimen/sp_13"
+                        app:layout_constraintBottom_toBottomOf="@id/img_user_avater"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintTop_toBottomOf="@id/btn_identity_unverified"
                         app:qmui_backgroundColor="#E8F1FB"
                         app:qmui_borderColor="#459AEA"
                         app:qmui_radius="@dimen/dp_4" />

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

@@ -58,14 +58,31 @@
 
         </LinearLayout >
 
-        <ImageView
-            android:id="@+id/img_sort"
-            android:layout_width="50dp"
-            android:layout_height="50dp"
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
             android:layout_alignParentEnd="true"
             android:layout_centerVertical="true"
-            android:padding="@dimen/dp_14"
-            android:src="@drawable/ic_sort" />
+            android:orientation="vertical" >
+
+            <TextView
+                android:id="@+id/tv_balance"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:ellipsize="end"
+                android:maxLines="1"
+                android:text="@{item.title}"
+                tools:text="@string/app_name" />
+
+            <TextView
+                android:id="@+id/tv_available_balance"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/dp_2"
+                android:text="@{item.create_time}"
+                tools:text="@string/app_name" />
+
+        </LinearLayout >
 
         <View
             android:layout_width="match_parent"

app/src/main/res/values/strings.xml

@@ -416,5 +416,15 @@ Api 已达到使用限制
     <string name="msg" >消息</string >
     <string name="bill" >账单</string >
     <string name="analysis" >统计</string >
+    <string name="available_balance" >可用余额</string >
+    <string name="all_balance" >总金额</string >
+    <string name="freeze_balance" >已冻结</string >
+    <string name="withdraw" >提现</string >
+    <string name="topup" >充值</string >
+    <string name="bill_detail" >账单明细</string >
+    <string name="identity_unverified" >身份未认证</string >
+    <string name="com_unverified" >公司未认证</string >
+    <string name="vehicle_unverified" >车辆未认证</string >
+    <string name="id_information_upload" >身份证信息上传</string >
 
 </resources >

base/src/main/res/values/dimens.xml

@@ -30,5 +30,7 @@
     <dimen name="dp_22" >22dp</dimen >
     <dimen name="dp_7" >7dp</dimen >
     <dimen name="dp_16" >16dp</dimen >
+    <dimen name="dp_30" >30dp</dimen >
+    <dimen name="dp_55" >55dp</dimen >
 
 </resources >