1. add some logic

app/build.gradle

@@ -18,7 +18,8 @@ android {
         ]
         ndk {
             //选择要添加的对应 cpu 类型的 .so 库。
-            abiFilters 'armeabi-v7a'
+//            abiFilters 'armeabi-v7a'
+            abiFilters 'arm64-v8a'
             // 还可以添加 'x86', 'x86_64', 'mips', 'mips64'
         }
     }

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

@@ -1,6 +1,7 @@
 package com.quansu.creativity.utils.net
 
 import com.quansu.creativity.model.*
+import com.ysnows.base.net.PageData
 import com.ysnows.base.net.Resp
 import io.reactivex.Observable
 import retrofit2.http.*
@@ -23,11 +24,19 @@ interface ApiService {
 
     @POST("bac")
     @FormUrlEncoded
-    fun bac(@Field("settings") settings: String?, @Field("funcs") funcsJson: String?, @Field("searchs") searchJson: String?, @Field("gesture") gestureJson: String?): Observable<Resp<String>>
+    fun bac(
+        @Field("settings") settings: String?,
+        @Field("funcs") funcsJson: String?,
+        @Field("searchs") searchJson: String?,
+        @Field("gesture") gestureJson: String?
+    ): Observable<Resp<String>>
 
     @POST("task/save")
     @FormUrlEncoded
-    fun taskSave(@Field("id") id: Int, @FieldMap params: HashMap<String?, Any?>?): Observable<Resp<String>>
+    fun taskSave(
+        @Field("id") id: Int,
+        @FieldMap params: HashMap<String?, Any?>?
+    ): Observable<Resp<String>>
 
     @POST("task/checked")
     @FormUrlEncoded
@@ -92,8 +101,14 @@ interface ApiService {
 
     @POST("api/index/register")
     @FormUrlEncoded
-    fun register(@Field("name") name: String?, @Field("mobile") mobile: String?, @Field("code") code: String?,
-                 @Field("type") type: String?, @Field("openid") openid: String? = null, @Field("unionid") unionId: String? = null): Observable<Resp<LoginBean>>
+    fun register(
+        @Field("name") name: String?,
+        @Field("mobile") mobile: String?,
+        @Field("code") code: String?,
+        @Field("type") type: String?,
+        @Field("openid") openid: String? = null,
+        @Field("unionid") unionId: String? = null
+    ): Observable<Resp<LoginBean>>
 
 
     /**
@@ -103,7 +118,10 @@ interface ApiService {
      */
     @POST("api/index/pwdLogin")
     @FormUrlEncoded
-    fun login(@Field("mobile") mobile: String?, @Field("pwd") pwd: String?): Observable<Resp<LoginBean>>
+    fun login(
+        @Field("mobile") mobile: String?,
+        @Field("pwd") pwd: String?
+    ): Observable<Resp<LoginBean>>
 
     /**
      *短信登录
@@ -112,7 +130,10 @@ interface ApiService {
      */
     @POST("api/index/smslogin")
     @FormUrlEncoded
-    fun smsLogin(@Field("mobile") mobile: String?, @Field("code") code: String?): Observable<Resp<LoginBean>>
+    fun smsLogin(
+        @Field("mobile") mobile: String?,
+        @Field("code") code: String?
+    ): Observable<Resp<LoginBean>>
 
     /**
      *微信登录
@@ -131,7 +152,10 @@ interface ApiService {
      */
     @POST("api/index/siml_register")
     @FormUrlEncoded
-    fun simlRegister(@Field("mobile") mobile: String?, @Field("type") type: String?): Observable<Resp<LoginBean>>
+    fun simlRegister(
+        @Field("mobile") mobile: String?,
+        @Field("type") type: String?
+    ): Observable<Resp<LoginBean>>
 
     /**
      * 用户信息
@@ -145,8 +169,10 @@ interface ApiService {
      * @return
      */
     @GET("api/address/addressList")
-    suspend fun addressList(@Query("type") type: String?,
-                            @Query("k") k: String, @Query("p") p: Int): Resp<List<AddressBean>>
+    suspend fun addressList(
+        @Query("type") type: String?,
+        @Query("k") k: String, @Query("p") p: Int
+    ): Resp<List<AddressBean>>
 
 
     /**
@@ -154,7 +180,10 @@ interface ApiService {
      * @return
      */
     @GET("api/common/getArea")
-    suspend fun getArea(@Query("code") code: String?, @Query("page") page: Int): Resp<List<AreaBean>>
+    suspend fun getArea(
+        @Query("code") code: String?,
+        @Query("page") page: Int
+    ): Resp<List<AreaBean>>
 
 
     /**
@@ -164,12 +193,14 @@ interface ApiService {
      */
     @POST("api/address/addressEdit")
     @FormUrlEncoded
-    fun addressEdit(@Field("addr_id") addr_id: String?, @Field("lat") lat: String?,
-                    @Field("lng") lng: String?, @Field("province") province: String?,
-                    @Field("city") city: String?, @Field("area") area: String?,
-                    @Field("address") address: String?, @Field("name") name: String?,
-                    @Field("mobile") mobile: String?, @Field("type") type: String?,
-                    @Field("is_default") is_default: String?): Observable<Resp<Any>>
+    fun addressEdit(
+        @Field("addr_id") addr_id: String?, @Field("lat") lat: String?,
+        @Field("lng") lng: String?, @Field("province") province: String?,
+        @Field("city") city: String?, @Field("area") area: String?,
+        @Field("address") address: String?, @Field("name") name: String?,
+        @Field("mobile") mobile: String?, @Field("type") type: String?,
+        @Field("is_default") is_default: String?
+    ): Observable<Resp<Any>>
 
 
     /**
@@ -209,17 +240,18 @@ interface ApiService {
      */
     @POST("api/info/infoEdit")
     @FormUrlEncoded
-    fun infoEdit(@Field("info_id") info_id: String?,
-                 @Field("type_id") type_id: String?,
-                 @Field("total") total: String?,
-                 @Field("driver") driver: String?,
-                 @Field("nums") nums: String?,
-                 @Field("is_public") is_public: String?,
-                 @Field("is_insurance") is_insurance: String?,
-                 @Field("type") type: String?,
-                 @Field("data") data: String?,
-                 @Field("send") send: String?,
-                 @Field("receive") receive: String?
+    fun infoEdit(
+        @Field("info_id") info_id: String?,
+        @Field("type_id") type_id: String?,
+        @Field("total") total: String?,
+        @Field("driver") driver: String?,
+        @Field("nums") nums: String?,
+        @Field("is_public") is_public: String?,
+        @Field("is_insurance") is_insurance: String?,
+        @Field("type") type: String?,
+        @Field("data") data: String?,
+        @Field("send") send: String?,
+        @Field("receive") receive: String?
     ): Observable<Resp<InfoEditBean>>
 
 
@@ -229,7 +261,10 @@ interface ApiService {
      */
     @POST("api/info/infoPay")
     @FormUrlEncoded
-    fun infoGetPay(@Field("info_id") info_id: String?, @Field("pay_pwd") pay_pwd: String?): Observable<Resp<Any>>
+    fun infoGetPay(
+        @Field("info_id") info_id: String?,
+        @Field("pay_pwd") pay_pwd: String?
+    ): Observable<Resp<Any>>
 
 
     /**
@@ -245,16 +280,27 @@ interface ApiService {
      */
     @GET("api/info/infoList")
     suspend fun infoList(
-            @Query("k") k: String?,
-            @Query("sp") sp: String?, @Query("sc") sc: String?, @Query("sa") sa: String?,
-            @Query("rp") rp: String?, @Query("rc") rc: String?, @Query("ra") ra: String?,
-            @Query("type_id") type_id: String?, @Query("s_time1") s_time1: String?, @Query("s_time2") s_time2: String?,
-            @Query("r_time1") r_time1: String?, @Query("r_time2") r_time2: String?, @Query("price1") price1: String?,
-            @Query("price2") price2: String?, @Query("sort") sort: String?, @Query("asc") asc: String?,
-
-            @Query("info_state") info_state: String?,
-            @Query("goods_type") goods_type: String?,
-            @Query("p") p: Int): Resp<List<InfoListBean>>
+        @Query("k") k: String?,
+        @Query("sp") sp: String?,
+        @Query("sc") sc: String?,
+        @Query("sa") sa: String?,
+        @Query("rp") rp: String?,
+        @Query("rc") rc: String?,
+        @Query("ra") ra: String?,
+        @Query("type_id") type_id: String?,
+        @Query("s_time1") s_time1: String?,
+        @Query("s_time2") s_time2: String?,
+        @Query("r_time1") r_time1: String?,
+        @Query("r_time2") r_time2: String?,
+        @Query("price1") price1: String?,
+        @Query("price2") price2: String?,
+        @Query("sort") sort: String?,
+        @Query("asc") asc: String?,
+
+        @Query("info_state") info_state: String?,
+        @Query("goods_type") goods_type: String?,
+        @Query("p") p: Int
+    ): Resp<List<InfoListBean>>
 
 
     /**
@@ -287,8 +333,9 @@ interface ApiService {
      */
     @POST("api/user/setInfo")
     @FormUrlEncoded
-    fun setInfo(@Field("idcard_z") idcard_z: String?, @Field("idcard_f") idcard_f: String?,
-                @Field("name") name: String?, @Field("idcard") idcard: String?
+    fun setInfo(
+        @Field("idcard_z") idcard_z: String?, @Field("idcard_f") idcard_f: String?,
+        @Field("name") name: String?, @Field("idcard") idcard: String?
     ): Observable<Resp<Any>>
 
     /**
@@ -297,9 +344,11 @@ interface ApiService {
      */
     @POST("api/user/setCard")
     @FormUrlEncoded
-    fun setCardBank(@Field("name") name: String?, @Field("number") number: String?,
-                    @Field("bank") bank: String?, @Field("kbank") kbank: String?,
-                    @Field("image") image: String?): Observable<Resp<Any>>
+    fun setCardBank(
+        @Field("name") name: String?, @Field("number") number: String?,
+        @Field("bank") bank: String?, @Field("kbank") kbank: String?,
+        @Field("image") image: String?
+    ): Observable<Resp<Any>>
 
 
     /**
@@ -316,8 +365,9 @@ interface ApiService {
      */
     @POST("api/user/setCompany")
     @FormUrlEncoded
-    fun setCompany(@Field("license_img") license_img: String?, @Field("license_sn") license_sn: String?,
-                   @Field("company_name") company_name: String?, @Field("company_addr") company_addr: String?
+    fun setCompany(
+        @Field("license_img") license_img: String?, @Field("license_sn") license_sn: String?,
+        @Field("company_name") company_name: String?, @Field("company_addr") company_addr: String?
     ): Observable<Resp<Any>>
 
 
@@ -327,22 +377,23 @@ interface ApiService {
      */
     @POST("api/user/setCar")
     @FormUrlEncoded
-    fun setCar(@Field("driver_img") driver_img: String?, @Field("driving_z") driving_z: String?,
-               @Field("driving_f") driving_f: String?, @Field("tonnage") tonnage: String?,
-               @Field("license_dl") license_dl: String?, @Field("license_cy") license_cy: String?,
-               @Field("number") number: String?,
-               @Field("color") color: String?, @Field("car_type") car_type: String?,
-               @Field("car_load") car_load: String?, @Field("car_brand") car_brand: String?,
-               @Field("driving_sn") driving_sn: String?, @Field("car_weight") car_weight: String?,
-               @Field("car_size_l") car_size_l: String?, @Field("car_size_w") car_size_w: String?,
-               @Field("car_size_h") car_size_h: String?,
-               @Field("car_cate") car_cate: String?,
-               @Field("car_energy") car_energy: String?, @Field("car_own") car_own: String?,
-               @Field("car_use") car_use: String?, @Field("car_sn") car_sn: String?,
-               @Field("organization") organization: String?, @Field("reg_date") reg_date: String?,
-               @Field("cert_date") cert_date: String?, @Field("driver_org") driver_org: String?,
-               @Field("start_date") start_date: String?, @Field("end_date") end_date: String?,
-               @Field("car_class") car_class: String?
+    fun setCar(
+        @Field("driver_img") driver_img: String?, @Field("driving_z") driving_z: String?,
+        @Field("driving_f") driving_f: String?, @Field("tonnage") tonnage: String?,
+        @Field("license_dl") license_dl: String?, @Field("license_cy") license_cy: String?,
+        @Field("number") number: String?,
+        @Field("color") color: String?, @Field("car_type") car_type: String?,
+        @Field("car_load") car_load: String?, @Field("car_brand") car_brand: String?,
+        @Field("driving_sn") driving_sn: String?, @Field("car_weight") car_weight: String?,
+        @Field("car_size_l") car_size_l: String?, @Field("car_size_w") car_size_w: String?,
+        @Field("car_size_h") car_size_h: String?,
+        @Field("car_cate") car_cate: String?,
+        @Field("car_energy") car_energy: String?, @Field("car_own") car_own: String?,
+        @Field("car_use") car_use: String?, @Field("car_sn") car_sn: String?,
+        @Field("organization") organization: String?, @Field("reg_date") reg_date: String?,
+        @Field("cert_date") cert_date: String?, @Field("driver_org") driver_org: String?,
+        @Field("start_date") start_date: String?, @Field("end_date") end_date: String?,
+        @Field("car_class") car_class: String?
 
     ): Observable<Resp<Any>>
 
@@ -366,10 +417,11 @@ interface ApiService {
      */
     @POST("api/invoice/invoiceEdit")
     @FormUrlEncoded
-    fun invoiceEdit(@Field("invoice_id") invoice_id: String?, @Field("company") company: String?,
-                    @Field("sn") sn: String?, @Field("addr") addr: String?,
-                    @Field("tel") tel: String?, @Field("bank") bank: String?,
-                    @Field("number") number: String?
+    fun invoiceEdit(
+        @Field("invoice_id") invoice_id: String?, @Field("company") company: String?,
+        @Field("sn") sn: String?, @Field("addr") addr: String?,
+        @Field("tel") tel: String?, @Field("bank") bank: String?,
+        @Field("number") number: String?
     ): Observable<Resp<Any>>
 
 
@@ -394,14 +446,26 @@ interface ApiService {
      * @return
      */
     @GET("api/order/infoList")
-    suspend fun infoListDriver(@Query("k") k: String?,
-                               @Query("sp") sp: String?, @Query("sc") sc: String?, @Query("sa") sa: String?,
-                               @Query("rp") rp: String?, @Query("rc") rc: String?, @Query("ra") ra: String?,
-                               @Query("type_id") type_id: String?, @Query("s_time1") s_time1: String?, @Query("s_time2") s_time2: String?,
-                               @Query("r_time1") r_time1: String?, @Query("r_time2") r_time2: String?, @Query("price1") price1: String?,
-                               @Query("price2") price2: String?, @Query("sort") sort: String?, @Query("asc") asc: String?,
-                               @Query("goods_type") goods_type: String?,
-                               @Query("p") p: Int): Resp<List<InfoListBean>>
+    suspend fun infoListDriver(
+        @Query("k") k: String?,
+        @Query("sp") sp: String?,
+        @Query("sc") sc: String?,
+        @Query("sa") sa: String?,
+        @Query("rp") rp: String?,
+        @Query("rc") rc: String?,
+        @Query("ra") ra: String?,
+        @Query("type_id") type_id: String?,
+        @Query("s_time1") s_time1: String?,
+        @Query("s_time2") s_time2: String?,
+        @Query("r_time1") r_time1: String?,
+        @Query("r_time2") r_time2: String?,
+        @Query("price1") price1: String?,
+        @Query("price2") price2: String?,
+        @Query("sort") sort: String?,
+        @Query("asc") asc: String?,
+        @Query("goods_type") goods_type: String?,
+        @Query("p") p: Int
+    ): Resp<List<InfoListBean>>
 
 
     /**
@@ -434,16 +498,27 @@ interface ApiService {
      */
     @GET("api/order/myList")
     suspend fun myList(
-            @Query("k") k: String?,
-            @Query("sp") sp: String?, @Query("sc") sc: String?, @Query("sa") sa: String?,
-            @Query("rp") rp: String?, @Query("rc") rc: String?, @Query("ra") ra: String?,
-            @Query("type_id") type_id: String?, @Query("s_time1") s_time1: String?, @Query("s_time2") s_time2: String?,
-            @Query("r_time1") r_time1: String?, @Query("r_time2") r_time2: String?, @Query("price1") price1: String?,
-            @Query("price2") price2: String?, @Query("sort") sort: String?, @Query("asc") asc: String?,
-
-            @Query("order_state") order_state: String?,
-            @Query("goods_type") goods_type: String?,
-            @Query("p") p: Int): Resp<List<InfoListBean>>
+        @Query("k") k: String?,
+        @Query("sp") sp: String?,
+        @Query("sc") sc: String?,
+        @Query("sa") sa: String?,
+        @Query("rp") rp: String?,
+        @Query("rc") rc: String?,
+        @Query("ra") ra: String?,
+        @Query("type_id") type_id: String?,
+        @Query("s_time1") s_time1: String?,
+        @Query("s_time2") s_time2: String?,
+        @Query("r_time1") r_time1: String?,
+        @Query("r_time2") r_time2: String?,
+        @Query("price1") price1: String?,
+        @Query("price2") price2: String?,
+        @Query("sort") sort: String?,
+        @Query("asc") asc: String?,
+
+        @Query("order_state") order_state: String?,
+        @Query("goods_type") goods_type: String?,
+        @Query("p") p: Int
+    ): Resp<List<InfoListBean>>
 
 
     /**
@@ -508,11 +583,12 @@ interface ApiService {
      */
     @GET("api/amount/amountList")
     suspend fun amountList(
-            @Query("status") status: String,
-            @Query("type") type: String,
-            @Query("time_start") time_start: String,
-            @Query("time_end") time_end: String,
-            @Query("p") p: Int): Resp<List<AmountList>>
+        @Query("status") status: String,
+        @Query("type") type: String,
+        @Query("time_start") time_start: String,
+        @Query("time_end") time_end: String,
+        @Query("p") p: Int
+    ): Resp<List<AmountList>>
 
     /**
      * 资金提现-资金
@@ -520,9 +596,10 @@ interface ApiService {
      */
     @POST("api/amount/withdraw")
     @FormUrlEncoded
-    fun withdraw(@Field("money") money: String?, @Field("name") name: String?,
-                 @Field("bank") bank: String?, @Field("kbank") kbank: String?,
-                 @Field("number") number: String?
+    fun withdraw(
+        @Field("money") money: String?, @Field("name") name: String?,
+        @Field("bank") bank: String?, @Field("kbank") kbank: String?,
+        @Field("number") number: String?
     ): Observable<Resp<Any>>
 
     /**
@@ -530,11 +607,13 @@ interface ApiService {
      * @return
      */
     @GET("api/amount/amountTotal")
-    fun amountTotal(@Query("status") status: String,
-                    @Query("type") type: String,
-                    @Query("time_start") time_start: String,
-                    @Query("time_end") time_end: String,
-                    @Query("p") p: Int): Observable<Resp<AmountCount>>
+    fun amountTotal(
+        @Query("status") status: String,
+        @Query("type") type: String,
+        @Query("time_start") time_start: String,
+        @Query("time_end") time_end: String,
+        @Query("p") p: Int
+    ): Observable<Resp<AmountCount>>
 
 
     /**
@@ -551,8 +630,9 @@ interface ApiService {
      */
     @POST("api/amount/amountAdd")
     @FormUrlEncoded
-    fun amountAdd(@Field("money") money: String?,
-                  @Field("pic") pic: String?
+    fun amountAdd(
+        @Field("money") money: String?,
+        @Field("pic") pic: String?
     ): Observable<Resp<Any>>
 
 
@@ -561,7 +641,10 @@ interface ApiService {
      * @return
      */
     @GET("api/info/carList")
-    suspend fun carList(@Query("info_id") info_id: String?, @Query("p") p: Int): Resp<List<DriverBean>>
+    suspend fun carList(
+        @Query("info_id") info_id: String?,
+        @Query("p") p: Int
+    ): Resp<List<DriverBean>>
 
 
     /**
@@ -570,7 +653,11 @@ interface ApiService {
      */
     @POST("api/info/carPay")
     @FormUrlEncoded
-    fun carPay(@Field("money") money: String?, @Field("order_id") order_id: String?, @Field("pay_pwd") pay_pwd: String?): Observable<Resp<Any>>
+    fun carPay(
+        @Field("money") money: String?,
+        @Field("order_id") order_id: String?,
+        @Field("pay_pwd") pay_pwd: String?
+    ): Observable<Resp<Any>>
 
 
     /**
@@ -579,8 +666,9 @@ interface ApiService {
      */
     @POST("api/info/eva")
     @FormUrlEncoded
-    fun eva(@Field("order_id") order_id: String?, @Field("score") score: String?,
-            @Field("content") content: String?
+    fun eva(
+        @Field("order_id") order_id: String?, @Field("score") score: String?,
+        @Field("content") content: String?
     ): Observable<Resp<Any>>
 
 
@@ -589,7 +677,10 @@ interface ApiService {
      * @return
      */
     @GET("api/info/orderEva")
-    suspend fun orderEva(@Query("order_id") order_id: String?, @Query("p") p: Int): Resp<List<OrderEva>>
+    suspend fun orderEva(
+        @Query("order_id") order_id: String?,
+        @Query("p") p: Int
+    ): Resp<List<OrderEva>>
 
 
     /**
@@ -638,9 +729,10 @@ interface ApiService {
      */
     @POST("api/guestbook/guestEdit")
     @FormUrlEncoded
-    suspend fun guestEdit(@Field("fk_id") fk_id: String?, @Field("title") title: String?,
-                          @Field("content") content: String?, @Field("mobile") mobile: String?,
-                          @Field("image") image: String?, @Field("type") type: String?
+    suspend fun guestEdit(
+        @Field("fk_id") fk_id: String?, @Field("title") title: String?,
+        @Field("content") content: String?, @Field("mobile") mobile: String?,
+        @Field("image") image: String?, @Field("type") type: String?
     ): Resp<Any>
 
 
@@ -649,7 +741,10 @@ interface ApiService {
      * @return
      */
     @GET("api/msg/msgList")
-    suspend fun msgList(@Query("p") p: Int): Resp<List<MsgList>>
+    suspend fun msgList(): Resp<List<MsgList>>
+
+    @GET("api/msg/msgList")
+    suspend fun msgListPage(@Query("p") p: Int): Resp<PageData<MsgList>>
 
 
     /**
@@ -658,7 +753,10 @@ interface ApiService {
      */
     @POST("api/user/setProfile")
     @FormUrlEncoded
-    suspend fun setProfile(@Field("avatar") avatar: String?, @Field("name") name: String?): Resp<Any>
+    suspend fun setProfile(
+        @Field("avatar") avatar: String?,
+        @Field("name") name: String?
+    ): Resp<Any>
 
 
     /**
@@ -666,9 +764,11 @@ interface ApiService {
      * @return
      */
     @GET("api/invoice/infoList")
-    suspend fun infoList(@Query("start_time") start_time: String,
-                         @Query("end_time") end_time: String,
-                         @Query("p") p: Int): Resp<List<InvoiceList>>
+    suspend fun infoList(
+        @Query("start_time") start_time: String,
+        @Query("end_time") end_time: String,
+        @Query("p") p: Int
+    ): Resp<List<InvoiceList>>
 
 
     /**
@@ -704,7 +804,8 @@ interface ApiService {
      */
     @POST("api/invoice/invoiceAdd")
     @FormUrlEncoded
-    suspend fun invoiceAdd(@Field("ids") ids: String?, @Field("money") money: String?
+    suspend fun invoiceAdd(
+        @Field("ids") ids: String?, @Field("money") money: String?
     ): Resp<Any>
 
 
@@ -729,8 +830,9 @@ interface ApiService {
      * @return
      */
     @GET("api/amount/amountLine")
-    suspend fun amountLine(@Query("start_time") start_time: String?,
-                           @Query("end_time") end_time: String?, @Query("k") k: String?
+    suspend fun amountLine(
+        @Query("start_time") start_time: String?,
+        @Query("end_time") end_time: String?, @Query("k") k: String?
     ): Resp<IconData>
 
 
@@ -791,7 +893,10 @@ interface ApiService {
      */
     @FormUrlEncoded
     @POST("api/baoxian/premiumTrial")
-    suspend fun premiumTrial(@Field("amount") amount: String?, @Field("schemeCode") schemeCode: String?): Resp<PremiumTrial>
+    suspend fun premiumTrial(
+        @Field("amount") amount: String?,
+        @Field("schemeCode") schemeCode: String?
+    ): Resp<PremiumTrial>
 
     /**
      * 投保方案
@@ -816,26 +921,26 @@ interface ApiService {
      */
     @FormUrlEncoded
     @POST("api/baoxian/insure")
-    suspend fun insure(@Field("order_id") order_id: String,
-                       @Field("amount") amount: String,
-                       @Field("payMoney") payMoney: String,
-                       @Field("schemeCode") schemeCode: String,
-                       @Field("start_areaName") start_areaName: String,
-                       @Field("start_areaCode") start_areaCode: String,
-                       @Field("finish_areaName") finish_areaName: String,
-                       @Field("finish_areaCode") finish_areaCode: String,
-                       @Field("transfer_areaName[]") transfer_areaName: List<String>,
-                       @Field("transfer_areaCode[]") transfer_areaCode: List<String>,
-                       @Field("goodsName") goodsName: String,
-                       @Field("name") name: String,
-                       @Field("personnelType") personnelType: String,
-                       @Field("certificateType") certificateType: String,
-                       @Field("certificateNo") certificateNo: String,
-                       @Field("mobile") mobile: String,
-                       @Field("licensePlateNo") licensePlateNo: String,
-                       @Field("licensePlateType") licensePlateType: String,
-       ): Resp<Any>
-
+    suspend fun insure(
+        @Field("order_id") order_id: String,
+        @Field("amount") amount: String,
+        @Field("payMoney") payMoney: String,
+        @Field("schemeCode") schemeCode: String,
+        @Field("start_areaName") start_areaName: String,
+        @Field("start_areaCode") start_areaCode: String,
+        @Field("finish_areaName") finish_areaName: String,
+        @Field("finish_areaCode") finish_areaCode: String,
+        @Field("transfer_areaName[]") transfer_areaName: List<String>,
+        @Field("transfer_areaCode[]") transfer_areaCode: List<String>,
+        @Field("goodsName") goodsName: String,
+        @Field("name") name: String,
+        @Field("personnelType") personnelType: String,
+        @Field("certificateType") certificateType: String,
+        @Field("certificateNo") certificateNo: String,
+        @Field("mobile") mobile: String,
+        @Field("licensePlateNo") licensePlateNo: String,
+        @Field("licensePlateType") licensePlateType: String,
+    ): Resp<Any>
 
 
     /**
@@ -847,7 +952,6 @@ interface ApiService {
     suspend fun baoxianOrderGet(@Query("order_id") order_id: String?): Resp<OrderGet>
 
 
-
     /**
      *  保单详情
      * @return
@@ -856,8 +960,6 @@ interface ApiService {
     suspend fun baoxianGetInfo(@Query("order_id") order_id: String?): Resp<OrderGet>
 
 
-
-
     /**
      *  司机来单提示
      * @return

app/src/main/java/com/quansu/creativity/vmodel/MsgVModel.kt

@@ -17,8 +17,6 @@ import kotlinx.coroutines.launch
 class MsgVModel(application: Application) : BRViewModel<BRRepository>(application) {
 
 
-
-
 //    fun toDetails(data_id:String){
 //
 //        UiSwitch.bundle(repository().context, ArticleDetailActivity::class.java, Bundle().apply {
@@ -30,16 +28,16 @@ class MsgVModel(application: Application) : BRViewModel<BRRepository>(applicatio
 //    }
 
     override fun apiFunc(): suspend () -> IResp<*> {
-        return { NetEngine.service.msgList(repository().page) }
+        return { NetEngine.service.msgListPage(repository().page) }
     }
 
 
-    fun isRead(data_id:String){
+    fun isRead(data_id: String) {
 
         viewModelScope.launch {
 
-           var it= repository().lreq { NetEngine.service.msgRead(data_id) }
-            if(it.ok()){
+            var it = repository().lreq { NetEngine.service.msgRead(data_id) }
+            if (it.ok()) {
                 //刷新我的界面-消息数量
                 RxBus.get().post(ConfigRx.REFRESH_USER_DATA, "")
             }

base/src/main/java/com/ysnows/base/net/PageData.kt

@@ -0,0 +1,3 @@
+package com.ysnows.base.net
+
+data class PageData<D>(val count: Int, val list: List<D>)

base/src/main/java/com/ysnows/base/net/PageResp.kt

@@ -0,0 +1,13 @@
+package com.ysnows.base.net
+
+class PageResp<D> : Resp<PageData<D>>() {
+
+    override fun empty(): Boolean {
+        return (data()?.count ?: 0) <= 0
+    }
+
+    override fun more(page: Int): Boolean {
+        return page * count() < total()
+    }
+
+}

base/src/main/java/com/ysnows/base/net/Resp.kt

@@ -3,7 +3,7 @@ package com.ysnows.base.net
 import com.ysnows.base.base.BApp
 import com.ysnows.base.utils.Toasts
 
-class Resp<D>(
+open class Resp<D>(
         val status: Int = 0,
         val message: String? = null,
         val total: Int = 0,