Merge remote-tracking branch 'origin/master'

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

@@ -24,7 +24,7 @@ class BillDetailsActivity : MBRActivity<BillDetailsVModel, BillDetailsAdapter, A
         titleBar()!!.tvRight!!.text="筛选"
         titleBar()!!.tvRight!!.setTextColor(Color.parseColor("#353637"))//#FFBC00
         vm.getTotalInfo()
-        vm.getInfo()
+        vm.reqInfo()
 
     }
 

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

@@ -19,7 +19,7 @@ class WithdrawalActivity : MBActivity<WithdrawalVModel, ActivityWithdrawalBindin
         super.onCreate(savedInstanceState)
         vm.canUseMoney.value=intent?.extras?.getString("money", "")
         vm.getBankInfo()
-        vm.getTips()
+        vm.reqTips()
     }
     override fun binding(): ActivityWithdrawalBinding {
        return ActivityWithdrawalBinding.inflate(layoutInflater)

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

@@ -3,17 +3,12 @@ package com.quansu.heifengwuliu.vmodel
 
 import android.app.Application
 import androidx.lifecycle.MutableLiveData
-import com.quansu.heifengwuliu.inte.ChoiceListData
 import com.quansu.heifengwuliu.model.AmountCount
-import com.quansu.heifengwuliu.model.InfoBean
 import com.quansu.heifengwuliu.model.SelectData
-import com.quansu.heifengwuliu.utils.PopuBottomUtils
 import com.quansu.heifengwuliu.utils.net.NetEngine
 import com.ysnows.base.base.BRRepository
 import com.ysnows.base.base.BRViewModel
 import com.ysnows.base.net.IResp
-import io.reactivex.Observable
-import java.util.ArrayList
 
 class BillDetailsVModel(application: Application) : BRViewModel<BRRepository>(application) {
 
@@ -36,7 +31,7 @@ class BillDetailsVModel(application: Application) : BRViewModel<BRRepository>(ap
 
 
 
-    fun getInfo() {
+    fun reqInfo() {
         repository().rxPreq(NetEngine.service.getInfo("7"))
                 .doOnNext {
                     if (it.ok()) {

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

@@ -84,7 +84,7 @@ class WithdrawalVModel(application: Application): BViewModel<BRepository>(applic
 
     }
 
-    fun getTips(){//获取提示语
+    fun reqTips(){//获取提示语
 
         repository().rxLreq(NetEngine.service.getInfo("5"))
                 .doOnNext {