.取消请求头改为cookie存储

app/src/main/java/com/unis/sxzcl/ui/home/HomeFragment.java

@@ -11,6 +11,7 @@ import com.github.mikephil.charting.data.BarEntry;
 import com.github.mikephil.charting.data.PieEntry;
 import com.unis.model.DataCallback;
 import com.unis.model.NoticeModel;
+import com.unis.model.ProcessModel;
 import com.unis.model.UrlPath;
 import com.unis.model.UserModel;
 import com.unis.model.bean.UserBean;
@@ -240,19 +241,19 @@ public class HomeFragment extends BaseFragment<FragmentHomeBinding> {
     @Subscribe(threadMode = ThreadMode.MAIN)
     public void onTodoEvent(TodoEvent event) {
         // 待办事项数量
-//        ProcessModel.get().getTodoSize(new DataCallback<Integer>() {
-//            @Override
-//            public void onSuccess(Integer data) {
-//                if (!isActive())return;
-//
-//                if ((int) data == 0) {
-//                    mBinding.tvTodoCount.setVisibility(View.GONE);
-//                    return;
-//                }
-//                mBinding.tvTodoCount.setVisibility(View.VISIBLE);
-//                mBinding.tvTodoCount.setText(data + "");
-//            }
-//        });
+        ProcessModel.get().getTodoSize(new DataCallback<Integer>() {
+            @Override
+            public void onSuccess(Integer data) {
+                if (!isActive())return;
+
+                if ((int) data == 0) {
+                    mBinding.tvTodoCount.setVisibility(View.GONE);
+                    return;
+                }
+                mBinding.tvTodoCount.setVisibility(View.VISIBLE);
+                mBinding.tvTodoCount.setText(data + "");
+            }
+        });
 
         // 通知数量
         NoticeModel.get().getNoticeSize(new DataCallback<Integer>() {

app/src/main/java/com/unis/sxzcl/ui/home/MainActivity.java

@@ -57,7 +57,7 @@ public class MainActivity extends BaseActivity<ActivityMainBinding> {
                 BasicModel.get().getHouseDictionary();
                 BasicModel.get().getPersonDictionary();
             }
-        }, 1000);
+        }, 2000);
 
     }
 

app/src/main/res/layout/fragment_home.xml

@@ -69,7 +69,8 @@
             style="@style/text_flag"
             android:layout_alignRight="@id/iv_todo"
             android:layout_marginTop="8dp"
-            android:text="3" />
+            android:visibility="invisible"
+            android:text="0" />
 
         <ImageView
             android:id="@+id/iv_notice"
@@ -85,7 +86,8 @@
             style="@style/text_flag"
             android:layout_alignRight="@id/iv_notice"
             android:layout_marginTop="8dp"
-            android:text="2" />
+            android:visibility="invisible"
+            android:text="0" />
 
     </RelativeLayout>
 

model/src/main/java/com/unis/model/AnnounceModel.java

@@ -0,0 +1,78 @@
+package com.unis.model;
+
+import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
+import com.lzy.okgo.OkGo;
+import com.lzy.okgo.model.Response;
+import com.unis.model.bean.AnnounceBean;
+
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ *
+ * 包名: com.unis.model
+ * 类名: AnnounceModel
+ * 作用描述:
+ * 创建人: mQ
+ * 创建时间: 2020/12/27 15:44
+ * 更新人:
+ * 更新时间: 2020/12/27 15:44
+ * 更新说明:
+ * 版本号: 1.0
+ */
+public class AnnounceModel {
+    private AnnounceModel() {
+    }
+
+    private static final class SingleHolder {
+        private static final AnnounceModel INSTANCE = new AnnounceModel();
+    }
+
+    public static AnnounceModel get() {
+        return SingleHolder.INSTANCE;
+    }
+
+    /**
+     * 获取公告列表
+     */
+    public void getList(int page, final DataCallback<List<AnnounceBean>> callback) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("pageIndex", page);
+        map.put("pageSize", 10);
+        OkGo.<String>post(UrlPath.announce_list)
+                .upJson(new Gson().toJson(map))
+                .execute(new MyStringCallback() {
+                    @Override
+                    protected void onSuccessResult(Response<String> response) throws JSONException {
+                        String json = getDataJson(response);
+                        JSONObject object = new JSONObject(json);
+                        JSONArray jsonArray = object.getJSONArray("records");
+                        if (jsonArray == null || jsonArray.length() == 0) {
+                            callback.onSuccess(new ArrayList<AnnounceBean>());
+                            return;
+                        }
+                        List<AnnounceBean> list =
+                                new Gson().fromJson(jsonArray.toString(),
+                                        new TypeToken<List<AnnounceBean>>() {
+                                        }.getType());
+                        callback.onSuccess(list);
+                    }
+
+                    @Override
+                    public void onError(Response<String> response) {
+                        super.onError(response);
+                        callback.onError(getErrorMsg(response));
+                    }
+                });
+
+    }
+
+}

model/src/main/java/com/unis/model/DepotModel.java

@@ -68,6 +68,9 @@ public class DepotModel {
     public void saveSelectDepot(MultiDepotBean bean) {
         SPTool.saveString(Constant.KEY_SELECT_DEPOT, new Gson().toJson(bean));
     }
+    public void removeSelectDepot() {
+        SPTool.remove(Constant.KEY_SELECT_DEPOT);
+    }
 
     /**
      * 获取所选的库

model/src/main/java/com/unis/model/HouseModel.java

@@ -79,6 +79,10 @@ public class HouseModel {
         SPTool.saveString(Constant.KEY_SELECT_HOUSE, houseJson);
     }
 
+    public void removeSelectHouse() {
+        SPTool.remove(Constant.KEY_SELECT_HOUSE);
+    }
+
     /**
      * 获取选择的仓房
      */

model/src/main/java/com/unis/model/MyStringCallback.java

@@ -30,15 +30,13 @@ public abstract class MyStringCallback extends StringCallback {
     @Override
     public void onStart(Request<String, ? extends Request> request) {
         super.onStart(request);
-        String headToken = UserModel.get().getHeadToken();
-        if (headToken != null)
-            request.headers("Authorization", headToken);
-
-//        String token = UserModel.get().getHeadToken();
-//        if (token != null) {
+//        String headToken = UserModel.get().getHeadToken();
+//        if (headToken != null) {
+//            request.headers("Authorization", headToken);
+//
 //            HttpUrl httpUrl = HttpUrl.parse(UrlPath.host);
 //            Cookie.Builder builder = new Cookie.Builder();
-//            Cookie cookieToken = builder.name("Token").value(token).domain(httpUrl.host()).build();
+//            Cookie cookieToken = builder.name("Token").value(headToken).domain(httpUrl.host()).build();
 //            CookieStore cookieStore = OkGo.getInstance().getCookieJar().getCookieStore();
 //            cookieStore.saveCookie(httpUrl, cookieToken);
 //        }

model/src/main/java/com/unis/model/NoticeModel.java

@@ -78,9 +78,12 @@ public class NoticeModel {
      * 获取通知列表
      */
     public void getNoticeSize(final DataCallback<Integer> callback) {
+        Map<String, Object> condition = new HashMap<>();
+        condition.put("readStatus", false);
         Map<String, Object> map = new HashMap<>();
         map.put("pageIndex", 1);
         map.put("pageSize", 10);
+        map.put("condition", new Gson().toJson(condition));
         OkGo.<String>post(UrlPath.notice_list)
                 .upJson(new Gson().toJson(map))
                 .execute(new MyStringCallback() {

model/src/main/java/com/unis/model/UrlPath.java

@@ -96,6 +96,7 @@ public class UrlPath {
     // 审批流程
     public static final String approve_all = host + "/api/csc-szls-business/ventilation/processBasis/getBasisByType";
 
+
     /****************** 待办 ******************/
     // 待办 已发起
     public static final String todo_apply_list = host + "/api/csc-szls-business/ventilation/processAudit/applyList";
@@ -104,9 +105,15 @@ public class UrlPath {
     // 待办 已处理
     public static final String todo_finish_list = host + "/api/csc-szls-business/ventilation/processAudit/completeList";
 
+
     /****************** 通知 ******************/
     // 通知列表
     public static final String notice_list = host + "/api/csc-szls-message/sysNoticeUser/authority/getPage";
 
 
+    /****************** 公告 ******************/
+    // 公告列表
+    public static final String announce_list = host + "/api/csc-szls-message/sysAnnouncementUser/authority/getPage";
+
+
 }

model/src/main/java/com/unis/model/UserModel.java

@@ -6,7 +6,6 @@ import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
 import com.lzy.okgo.OkGo;
 import com.lzy.okgo.cookie.store.CookieStore;
-import com.lzy.okgo.model.HttpHeaders;
 import com.lzy.okgo.model.Response;
 import com.lzy.okgo.request.GetRequest;
 import com.lzy.okgo.request.base.Request;
@@ -14,7 +13,6 @@ import com.unis.model.bean.LoginBean;
 import com.unis.model.bean.UserBean;
 import com.unis.model.bean.person.PersonBean;
 import com.unis.model.bean.person.PersonTreeBean;
-import com.xyxsbj.mylibrary.tool.BaseApp;
 import com.xyxsbj.mylibrary.tool.LogTool;
 import com.xyxsbj.mylibrary.tool.SPTool;
 
@@ -119,8 +117,7 @@ public class UserModel {
                         // 添加cookie
                         HttpUrl httpUrl = HttpUrl.parse(UrlPath.host);
                         Cookie.Builder builder = new Cookie.Builder();
-                        Cookie cookieToken = builder.name("Token").value(token).domain(httpUrl.host()).build();
-                        Cookie cookieUserInfo = builder.name("UserInfo").value(userInfo).domain(httpUrl.host()).build();
+                        Cookie cookieToken = builder.name("Token").value(tokenType + "%20" + accessToken).domain(httpUrl.host()).build();
                         CookieStore cookieStore = OkGo.getInstance().getCookieJar().getCookieStore();
                         cookieStore.saveCookie(httpUrl, cookieToken);
 //                        cookieStore.saveCookie(httpUrl, cookie2);
@@ -130,9 +127,9 @@ public class UserModel {
                         LogTool.i("所有cookie如下：" + allCookie.toString());
 
                         // 添加请求头
-                        HttpHeaders headers = new HttpHeaders();
-                        headers.put("Authorization", token);
-                        OkGo.getInstance().init(BaseApp.getApp()).addCommonHeaders(headers);
+//                        HttpHeaders headers = new HttpHeaders();
+//                        headers.put("Authorization", token);
+//                        OkGo.getInstance().init(BaseApp.getApp()).addCommonHeaders(headers);
 
                         if (callBack != null)
                             callBack.onSuccess(bean);
@@ -198,6 +195,8 @@ public class UserModel {
         SPTool.remove(Constant.KEY_USER);
         SPTool.remove(Constant.KEY_TOKEN);
         SPTool.remove(Constant.KEY_HEAD_TOKEN);
+        HouseModel.get().removeSelectHouse();
+        DepotModel.get().removeSelectDepot();
     }
 
     /**