1. mv api() to viewmodel

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

@@ -23,7 +23,7 @@ class InvoiceActivity : MBRActivity<InvoiceVModel, InvoiceAdapter, ActivityInvoi
         titleBar()?.setRightText(getString(R.string.invoice_title))
         titleBar()?.tvRight!!.setOnClickListener {
             //发票抬头
-            UiSwitch.single(this,InvoiceTitleActivity::class.java)
+            UiSwitch.single(this, InvoiceTitleActivity::class.java)
 
         }
     }
@@ -57,13 +57,10 @@ class InvoiceActivity : MBRActivity<InvoiceVModel, InvoiceAdapter, ActivityInvoi
         return InvoiceAdapter(vm)
     }
 
-    override fun api(): Observable<out IResponse<*>> {
-        return NetEngine.service.invoiceList( vm?.repository()?.autoPage()!!)
-    }
-
     override fun title(): String? {
         return getString(R.string.invoice)
     }
+
     override fun vmClass(): Class<InvoiceVModel> {
         return InvoiceVModel::class.java
     }

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

@@ -1,25 +1,29 @@
 package com.quansu.heifengwuliu.vmodel
 
+import com.quansu.heifengwuliu.utils.net.NetEngine
 import com.ysnows.base.base.BRRepository
 import com.ysnows.base.base.BRViewModel
+import com.ysnows.base.net.IResponse
+import io.reactivex.Observable
 
 class InvoiceVModel : BRViewModel<BRRepository>() {
 
 
     //state：1：开票中 2通过（已邮寄） 3系统拒绝  9取消
-    fun getInvoiceStatus(state:Int):String{
-        return when (state){
-            1-> "开票中"
-            2-> "发票已邮寄"
-            3-> "系统拒绝"
-            9-> "已取消申请"
-            else-> ""
+    fun getInvoiceStatus(state: Int): String {
+        return when (state) {
+            1 -> "开票中"
+            2 -> "发票已邮寄"
+            3 -> "系统拒绝"
+            9 -> "已取消申请"
+            else -> ""
         }
 
     }
 
-
-
+    override fun api(): Observable<out IResponse<*>> {
+        return NetEngine.service.invoiceList(repository().autoPage())
+    }
 
 
 }