From e27f54aa7e10836e2741dc590559e1039fbade78 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期五, 23 七月 2021 15:06:41 +0800
Subject: [PATCH] 1. 创建子任务时，执行用户默认为当前登录用户或执行组中的第一人 2. 修复部分企业类型问题图标错误 3. 新增场景账户自动生成功能
---
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