From 6a5879320dfac43155d024814a0a4d794a612696 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期三, 21 八月 2024 13:52:14 +0800
Subject: [PATCH] 齐河联网版程序除补卡相关逻辑

---
 qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/net/ApiManager.java |   61 +++++++++++++++++-------------
 1 files changed, 34 insertions(+), 27 deletions(-)

diff --git a/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/net/ApiManager.java b/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/net/ApiManager.java
index 6746ef3..89194be 100644
--- a/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/net/ApiManager.java
+++ b/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/net/ApiManager.java
@@ -2,9 +2,11 @@
 
 import android.content.Context;
 import android.content.Intent;
+import android.text.TextUtils;
 
 
 import com.dayu.baselibrary.business.BusinessProvider;
+import com.dayu.qiheonlinelibrary.bean.BaseResult;
 import com.dayu.qiheonlinelibrary.net.subscribers.BaseProgressSubscriber;
 import com.dayu.qiheonlinelibrary.net.subscribers.ProgressSubscriber;
 import com.dayu.qiheonlinelibrary.net.subscribers.SubscriberListener;
@@ -117,8 +119,8 @@
                             BaseResponse tem = (BaseResponse) o;
                             BaseResponse<T> response = new BaseResponse<>();
                             //鏈櫥褰曟垨鐧诲綍瓒呮椂锛岃閲嶆柊鐧诲綍
-                            if (tem.getCode()==100401){
-                                if (BusinessProvider.getBusinessProvider()!=null){
+                            if (tem.getCode() == 100401) {
+                                if (BusinessProvider.getBusinessProvider() != null) {
                                     BusinessProvider.getBusinessProvider().startLoginNavigotor.navigateToLogin(context);
                                 }
 
@@ -126,35 +128,40 @@
 
                             response.setCode(tem.getCode());
                             response.setMsg(tem.getMsg());
-                            if (tClass!= null) {
-                            if ( tem.getData() instanceof Map) {
-                                try {
+                            if (tClass != null) {
+                                if (TextUtils.isEmpty(tem.getData().toString()) && BaseResult.class.isAssignableFrom(tClass)) {
+                                    response.setData(null);
+                                    return response;
+                                }
+                                if (tem.getData() instanceof Map) {
+                                    try {
 //                                    response.setData(MyJsonParser.getBeanFromMap((Map<String, Object>) tem.getData(), tClass));
-                                    String jsonData = MyJsonParser.getJsontoMap((Map) tem.getData());
-                                    response.setData(MyJsonParser.getBeanFromJson(jsonData, tClass));
-                                } catch (Exception e) {
-                                    e.printStackTrace();
-                                }
-                            } else if (  tem.getData() instanceof List) {
-                                try {
-                                    response.setData((T) MyJsonParser.getListByJson(MyJsonParser.getJsonbyList((List) tem.getData()), tClass));
-                                } catch (Exception e) {
-                                    e.printStackTrace();
-                                }
-                            } else if (  tem.getData() instanceof Integer) {
-                                response.setData((T) tem.getData());
-                            }  else if (tem.getData() instanceof Boolean){
-                                response.setData((T) tem.getData());
-                            }
-                            if ( tClass.getName() instanceof String && tem.getData() instanceof String) {
-                                try {
+                                        String jsonData = MyJsonParser.getJsontoMap((Map) tem.getData());
+                                        response.setData(MyJsonParser.getBeanFromJson(jsonData, tClass));
+                                    } catch (Exception e) {
+                                        e.printStackTrace();
+                                    }
+                                } else if (tem.getData() instanceof List) {
+                                    try {
+                                        response.setData((T) MyJsonParser.getListByJson(MyJsonParser.getJsonbyList((List) tem.getData()), tClass));
+                                    } catch (Exception e) {
+                                        e.printStackTrace();
+                                    }
+                                } else if (tem.getData() instanceof Integer) {
                                     response.setData((T) tem.getData());
-                                } catch (Exception e) {
-                                    e.printStackTrace();
+                                } else if (tem.getData() instanceof Boolean) {
+                                    response.setData((T) tem.getData());
                                 }
+                                if (tClass.getName() instanceof String && tem.getData() instanceof String) {
+                                    try {
+                                        response.setData((T) tem.getData());
+                                    } catch (Exception e) {
+                                        e.printStackTrace();
+                                    }
+                                }
+                                return response;
                             }
-                            return response;
-                        }}
+                        }
 
                         return null;
                     }

--
Gitblit v1.8.0