From e102578ebfc95c27aeb13dce13fb82af53a2bead Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期四, 25 二月 2021 17:07:23 +0800
Subject: [PATCH] 1. 新增夜间施工查询界面 2. 新增夜间施工管理统计界面

---
 app/src/main/java/cn/flightfeather/thirdapp/common/net/ResultObserver.kt |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/cn/flightfeather/thirdapp/common/net/ResultObserver.kt b/app/src/main/java/cn/flightfeather/thirdapp/common/net/ResultObserver.kt
index 2cbc42f..b40a8cb 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/common/net/ResultObserver.kt
+++ b/app/src/main/java/cn/flightfeather/thirdapp/common/net/ResultObserver.kt
@@ -1,6 +1,7 @@
 package cn.flightfeather.thirdapp.common.net
 
 import android.accounts.NetworkErrorException
+import cn.flightfeather.thirdapp.model.bean.BaseResponse
 import io.reactivex.Observer
 import io.reactivex.disposables.Disposable
 import retrofit2.Response
@@ -66,8 +67,11 @@
         var currentPage = -1
         var totalPage = -1
         try {
-            currentPage = response.headers().get("currentPage")?.toInt() ?: -1
-            totalPage = response.headers().get("totalPage")?.toInt() ?: -1
+            val body = response.body()
+            if (body is BaseResponse<*>) {
+                currentPage = body.head?.page ?: -1
+                totalPage = body.head?.totalPage ?: -1
+            }
         } catch (e: Exception) {
             e.printStackTrace()
         }

--
Gitblit v1.9.3