1.充值。

app/src/main/AndroidManifest.xml

@@ -101,6 +101,7 @@
         <activity android:name=".activity.MyOwnerActivity"/>
         <activity android:name=".activity.AllOwnerActivity"/>
         <activity android:name=".activity.CommentListActivity"/>
+        <activity android:name=".activity.RechargeActivity"/>
 
 
     </application >

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

@@ -0,0 +1,87 @@
+package com.quansu.heifengwuliu.activity
+
+import android.app.Activity
+import android.content.Intent
+import android.os.Bundle
+import com.luck.picture.lib.PictureSelector
+import com.quansu.heifengwuliu.base.MBActivity
+import com.quansu.heifengwuliu.config.MIntentAction
+import com.quansu.heifengwuliu.databinding.ActivityRechargeBinding
+import com.quansu.heifengwuliu.inte.OnUploadCallback
+import com.quansu.heifengwuliu.utils.OssUtils
+import com.quansu.heifengwuliu.vmodel.RechargeVModel
+import java.util.ArrayList
+
+/**
+ *Created by shihuiyun
+ *on 2020/9/24
+ */
+class RechargeActivity: MBActivity<RechargeVModel, ActivityRechargeBinding>(), OnUploadCallback<String> {
+
+
+    override fun initCreate(savedInstanceState: Bundle?) {
+        super.initCreate(savedInstanceState)
+        vm.getBankInfo()
+
+    }
+
+
+    override fun binding(): ActivityRechargeBinding {
+        return ActivityRechargeBinding.inflate(layoutInflater)
+    }
+
+
+    override fun vmClass(): Class<RechargeVModel> {
+        return RechargeVModel::class.java
+    }
+
+    override fun title(): String? {
+        return "充值"
+    }
+
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        super.onActivityResult(requestCode, resultCode, data)
+        if (resultCode != Activity.RESULT_OK) {
+            return
+        }
+        if (requestCode == MIntentAction.REQUEST_CODE_THREE) {//图片
+
+            val selectList = PictureSelector.obtainMultipleResult(data)
+            val list = ArrayList<String>()
+            if (null != selectList) {
+                for (path in selectList) {
+                    list.add(path.path)
+                }
+
+                OssUtils(this)
+                        .setUpLoad("recharge", list, this)
+
+            }
+
+            return
+
+        }
+        if (requestCode == MIntentAction.REQUEST_CODE_CAMERA) {//拍照
+            //拍照
+            val selectList = PictureSelector.obtainMultipleResult(data) ?: return
+            val list = ArrayList<String>()
+            list.add(selectList[0].path)
+            OssUtils(this)
+                    .setUpLoad("recharge", list, this)
+
+            return
+        }
+
+    }
+
+
+    override fun onUploadSuccess(t: String) {
+        val ss: Array<String> = t.split(",".toRegex()).toTypedArray()
+        vm.url.value = ss[1]
+
+    }
+
+    override fun onUploadError(error: String?) {
+        TODO("Not yet implemented")
+    }
+}

app/src/main/java/com/quansu/heifengwuliu/model/Card.kt

@@ -0,0 +1,10 @@
+package com.quansu.heifengwuliu.model
+
+import com.ysnows.base.inter.IModel
+
+/**
+ *Created by shihuiyun
+ *on 2020/9/24
+ */
+data class Card(var card:String,var bank:String) : IModel {
+}

app/src/main/java/com/quansu/heifengwuliu/utils/net/ApiService.kt

@@ -495,5 +495,23 @@ interface ApiService {
 
 
 
+    /**
+     * 系统卡号-资金
+     * @return
+     */
+    @GET("api/amount/getCard")
+    fun getCard(): Observable<Response<Card>>
+
+
+    /**
+     * 资金充值-资金
+     * @return
+     */
+    @POST("api/amount/amountAdd")
+    @FormUrlEncoded
+    fun amountAdd(@Field("money") money: String?,
+                  @Field("pic") pic: String?
+    ): Observable<Response<Any>>
+
 
 }

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

@@ -1,9 +1,9 @@
 package com.quansu.heifengwuliu.vmodel
 
 import android.os.Bundle
-import androidx.fragment.app.Fragment
 import androidx.lifecycle.MutableLiveData
 import com.quansu.heifengwuliu.activity.BillDetailsActivity
+import com.quansu.heifengwuliu.activity.RechargeActivity
 import com.quansu.heifengwuliu.activity.WithdrawalActivity
 import com.quansu.heifengwuliu.config.MIntentAction
 import com.quansu.heifengwuliu.fragment.AccountBillFragment
@@ -64,4 +64,9 @@ import io.reactivex.Observable
         UiSwitch.single(repository().context, BillDetailsActivity::class.java)
 
     }
+
+    fun toRecharge(){//去充值
+
+        UiSwitch.singleRes(fragment, RechargeActivity::class.java, MIntentAction.REQUEST_CODE_ONE)
+    }
 }

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

@@ -0,0 +1,87 @@
+package com.quansu.heifengwuliu.vmodel
+
+import android.app.Activity
+import android.content.Intent
+import android.text.TextUtils
+import androidx.databinding.Bindable
+import androidx.lifecycle.MutableLiveData
+import com.quansu.heifengwuliu.BR
+import com.quansu.heifengwuliu.model.Card
+import com.quansu.heifengwuliu.utils.ChosePhotoUtils
+import com.quansu.heifengwuliu.utils.net.NetEngine
+import com.ysnows.base.base.BRepository
+import com.ysnows.base.base.BViewModel
+
+/**
+ *Created by shihuiyun
+ *on 2020/9/22
+ */
+class RechargeVModel: BViewModel<BRepository>() {
+
+    var url:MutableLiveData<String> = MutableLiveData()
+
+    var infoBank:MutableLiveData<Card> = MutableLiveData()
+    var type=0//1是可以进行充值
+
+
+    @Bindable
+    var money: String? = null
+        set(value) {
+            field = value
+            notifyPropertyChanged(BR.money)
+        }
+
+
+    fun goSubmit(){
+
+        if(type==0){
+            toast("没有系统卡号，暂时无法充值")
+            return
+        }
+        if(TextUtils.isEmpty(money)){
+            toast("请输入提现金额")
+            return
+        }
+
+        if(TextUtils.isEmpty( url.value)){
+            toast("请上传提现凭证")
+            return
+        }
+
+        repository().lreq(NetEngine.service.amountAdd(money, url.value))
+                .doOnNext {
+                    if (it.ok(true)) {
+                        var con = repository().context as Activity
+                        con.setResult(Activity.RESULT_OK, Intent())
+                        con.finish()
+                    }
+                }
+                .subscribe()
+
+    }
+
+    fun getBankInfo(){//获取系统卡号
+        repository().lreq(NetEngine.service.getCard())
+                .doOnNext {
+                    if (it.ok(false)) {
+                        var bean=it.data() as Card
+                        if(null!=bean){
+                            type=1
+                            infoBank.value=bean
+                        }else{
+                            type=0
+                        }
+
+                    }
+                }
+                .subscribe()
+
+    }
+
+    fun choseImg(){
+        ChosePhotoUtils.getChosePhoto(view()!!.context(), 1)
+
+    }
+
+
+}

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

@@ -0,0 +1,213 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <data>
+
+        <variable
+            name="vm"
+            type="com.quansu.heifengwuliu.vmodel.RechargeVModel" />
+
+    </data>
+
+    <LinearLayout xmlns:app="http://schemas.android.com/apk/res-auto"
+        xmlns:tools="http://schemas.android.com/tools"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/color_bg"
+        android:orientation="vertical"
+        android:paddingStart="12dp"
+        android:paddingEnd="11dp">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="118dp"
+            android:layout_marginTop="19dp"
+            android:background="@drawable/ic_cash_top"
+            android:gravity="center"
+            android:orientation="horizontal">
+
+
+            <LinearLayout
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="25dp"
+                android:layout_weight="1"
+                android:orientation="vertical">
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="卡号："
+                        android:textColor="@color/white"
+                        android:textSize="17sp" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@{vm.infoBank.card}"
+                        android:textColor="@color/white"
+                        android:textSize="17sp"
+                        android:textStyle="bold"
+                        tools:text="768 9876 2134 2344 78" />
+
+
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="7dp"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="银行："
+                        android:textColor="@color/white"
+                        android:textSize="17sp" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@{vm.infoBank.bank}"
+                        android:textColor="@color/white"
+                        android:textSize="17sp"
+                        android:textStyle="bold"
+                        tools:text="中国农业银行" />
+
+
+                </LinearLayout>
+
+            </LinearLayout>
+
+            <ImageView
+                android:layout_width="8dp"
+                android:layout_height="14dp"
+                android:layout_marginStart="10dp"
+                android:layout_marginEnd="22dp"
+                android:visibility="gone"
+                android:src="@drawable/ic_white_right" />
+
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@drawable/bg_withdraw_bottom"
+            android:orientation="vertical">
+
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="25dp"
+                android:layout_marginTop="4dp"
+                android:text="*根据上方账户打款之后将凭证通过本页面上传"
+                android:textColor="#979899"
+                android:textSize="12sp" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="25dp"
+                android:layout_marginTop="21dp"
+                android:text="充值金额"
+                android:textColor="#1B1B1B"
+                android:textSize="14sp" />
+
+
+            <com.ysnows.base.widget.DelEditText
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="19dp"
+                android:background="@null"
+                android:hint="输入充值金额"
+                android:inputType="number|numberDecimal"
+                android:paddingStart="26dp"
+                android:text="@={vm.money}"
+                android:textColor="#353535"
+                android:textColorHint="#696969"
+                android:textSize="30sp" />
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:layout_marginStart="26dp"
+                android:layout_marginTop="16dp"
+                android:background="#EBEBEB" />
+
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="26dp"
+                android:layout_marginTop="23dp"
+                android:orientation="horizontal">
+
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="凭证"
+                    android:textColor="#1B1B1B"
+                    android:textSize="14sp" />
+
+
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="14dp"
+                    android:onClick="@{v->vm.choseImg()}"
+                    android:gravity="center_horizontal"
+                    android:orientation="vertical">
+
+                    <ImageView
+                        android:layout_width="57dp"
+                        app:url="@{vm.url}"
+                        android:src="@drawable/ic_recharge_photo"
+                        android:layout_height="57dp" />
+                      <TextView
+                          android:layout_width="wrap_content"
+                          android:textSize="13dp"
+                          android:textColor="#979899"
+                          android:text="上传凭证"
+                          android:layout_marginTop="7dp"
+                          android:layout_height="wrap_content"/>
+
+
+
+                </LinearLayout>
+
+
+            </LinearLayout>
+
+
+            <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
+                android:layout_width="match_parent"
+                android:layout_height="47dp"
+                android:layout_marginStart="26dp"
+                android:layout_marginTop="53dp"
+                android:layout_marginEnd="26dp"
+                android:layout_marginBottom="32dp"
+                android:onClick="@{v->vm.goSubmit()}"
+                android:text="提交"
+                android:textColor="@color/white"
+                android:textSize="16sp"
+                app:qmui_backgroundColor="#FFBB00"
+                app:qmui_borderColor="#FFBB00"
+                app:qmui_radius="25dp"
+                app:qmui_shadowAlpha="0.56"
+                app:qmui_shadowElevation="7dp" />
+
+
+        </LinearLayout>
+
+
+    </LinearLayout>
+</layout>

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

@@ -59,6 +59,7 @@
                 app:layout_constraintTop_toTopOf="parent"
                 app:qmui_backgroundColor="@color/white"
                 app:qmui_borderColor="@color/white"
+                android:onClick="@{v->vm.toRecharge()}"
                 app:qmui_borderWidth="1dp"
                 android:visibility="@{vm.user.isDriver()?View.GONE:View.VISIBLE}"
                 app:qmui_radius="25dp">