.增加cookie存储

.全局控制token

app/build.gradle

@@ -49,7 +49,7 @@ android {
 
     buildTypes {
         release {
-            minifyEnabled true
+            minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
             signingConfig signingConfigs.release
             zipAlignEnabled = true

app/src/main/java/com/unis/sxzcl/MyApp.java

@@ -44,4 +44,6 @@ public class MyApp extends BaseApp {
     }
 
 
+
+
 }

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

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

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

@@ -1,5 +1,6 @@
 package com.unis.sxzcl.ui.home;
 
+import android.os.Handler;
 import android.view.LayoutInflater;
 
 import com.unis.model.BasicModel;
@@ -47,11 +48,17 @@ public class MainActivity extends BaseActivity<ActivityMainBinding> {
 
     @Override
     protected void workTask() {
-        // 获取字典缓存
-        BasicModel.get().getDepotDictionary();
-        BasicModel.get().getDepartmentDictionary();
-        BasicModel.get().getHouseDictionary();
-        BasicModel.get().getPersonDictionary();
+        new Handler().postDelayed(new Runnable() {
+            @Override
+            public void run() {
+                // 获取字典缓存
+                BasicModel.get().getDepotDictionary();
+                BasicModel.get().getDepartmentDictionary();
+                BasicModel.get().getHouseDictionary();
+                BasicModel.get().getPersonDictionary();
+            }
+        }, 1000);
+
     }
 
     long exitTime;

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

@@ -16,9 +16,6 @@ import com.unis.sxzcl.base.BaseFragment;
 import com.unis.sxzcl.databinding.FragmentMainBinding;
 import com.unis.sxzcl.ui.work_module.WorkModuleFragment;
 import com.unis.sxzcl.widget.MyFragmentStatePagerAdapter;
-import com.unis.sxzcl.widget.dialog.VersionDialog;
-import com.xyxsbj.mylibrary.tool.LogTool;
-import com.xyxsbj.mylibrary.tool.VersionTool;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -150,16 +147,16 @@ public class MainFragment extends BaseFragment<FragmentMainBinding> {
             @Override
             public void onSuccess(List<VersionBean> data) {
                 if (!isActive()) return;
-                VersionBean bean = data.get(0);
-                long versionCode = VersionTool.getVersionCode(getContext());
-                LogTool.i("本地版本:" + versionCode + " 线上版本:" + bean.getVersionCode());
-                if (versionCode < bean.getVersionCode()) {
-                    // 有新版本更新
-                    new VersionDialog(getContext())
-                            .setContent(bean.getContent())
-                            .setVersionName(bean.getVersionName())
-                            .show();
-                }
+//                VersionBean bean = data.get(0);
+//                long versionCode = VersionTool.getVersionCode(getContext());
+//                LogTool.i("本地版本:" + versionCode + " 线上版本:" + bean.getVersionCode());
+//                if (versionCode < bean.getVersionCode()) {
+//                    // 有新版本更新
+//                    new VersionDialog(getContext())
+//                            .setContent(bean.getContent())
+//                            .setVersionName(bean.getVersionName())
+//                            .show();
+//                }
             }
         });
     }

app/src/main/java/com/unis/sxzcl/ui/notice/NoticeListFragment.java

@@ -80,7 +80,7 @@ public class NoticeListFragment extends BaseListFragment<FragmentBaseListTitleBi
                 if (refresh) mAdapter.setList(data);
                 else mAdapter.addData(data);
 
-                if (data.size() == 0) loadError();
+                if (data.size() == 0) loadEnd();
                 else loadComplete();
             }
 

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

@@ -81,7 +81,7 @@
             android:src="@drawable/ic_notice_white" />
 
         <TextView
-            android:id="@+id/tv_notice_flag"
+            android:id="@+id/tv_notice_count"
             style="@style/text_flag"
             android:layout_alignRight="@id/iv_notice"
             android:layout_marginTop="8dp"

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

@@ -1,8 +1,6 @@
 package com.unis.model;
 
-import com.lzy.okgo.OkGo;
 import com.lzy.okgo.callback.StringCallback;
-import com.lzy.okgo.cookie.store.CookieStore;
 import com.lzy.okgo.exception.HttpException;
 import com.lzy.okgo.exception.StorageException;
 import com.lzy.okgo.model.Response;
@@ -20,9 +18,6 @@ import java.net.ConnectException;
 import java.net.SocketTimeoutException;
 import java.net.UnknownHostException;
 
-import okhttp3.Cookie;
-import okhttp3.HttpUrl;
-
 /**
  * 创建人 mQ
  * 创建时间 2019/7/12 0012 22:18
@@ -39,14 +34,14 @@ public abstract class MyStringCallback extends StringCallback {
         if (headToken != null)
             request.headers("Authorization", headToken);
 
-        String token = UserModel.get().getHeadToken();
-        if (token != null) {
-            HttpUrl httpUrl = HttpUrl.parse(UrlPath.host);
-            Cookie.Builder builder = new Cookie.Builder();
-            Cookie cookieToken = builder.name("Token").value(token).domain(httpUrl.host()).build();
-            CookieStore cookieStore = OkGo.getInstance().getCookieJar().getCookieStore();
-            cookieStore.saveCookie(httpUrl, cookieToken);
-        }
+//        String token = UserModel.get().getHeadToken();
+//        if (token != null) {
+//            HttpUrl httpUrl = HttpUrl.parse(UrlPath.host);
+//            Cookie.Builder builder = new Cookie.Builder();
+//            Cookie cookieToken = builder.name("Token").value(token).domain(httpUrl.host()).build();
+//            CookieStore cookieStore = OkGo.getInstance().getCookieJar().getCookieStore();
+//            cookieStore.saveCookie(httpUrl, cookieToken);
+//        }
     }
 
     protected abstract void onSuccessResult(Response<String> response) throws JSONException;

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

@@ -72,4 +72,33 @@ public class NoticeModel {
                 });
 
     }
+
+
+    /**
+     * 获取通知列表
+     */
+    public void getNoticeSize(final DataCallback<Integer> callback) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("pageIndex", 1);
+        map.put("pageSize", 10);
+        OkGo.<String>post(UrlPath.notice_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);
+                        int total = object.optInt("total", 0);
+                        callback.onSuccess(total);
+                    }
+
+                    @Override
+                    public void onError(Response<String> response) {
+                        super.onError(response);
+                        callback.onError(getErrorMsg(response));
+                    }
+                });
+
+    }
+
 }

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

@@ -6,12 +6,15 @@ 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;
 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;
 
@@ -88,6 +91,13 @@ public class UserModel {
                 .upJson(new Gson().toJson(map))
                 .execute(new MyStringCallback() {
                     @Override
+                    public void onStart(Request<String, ? extends Request> request) {
+                        super.onStart(request);
+                        // 登录时 去掉token
+                        request.removeHeader("Authorization");
+                    }
+
+                    @Override
                     protected void onSuccessResult(Response<String> response) throws JSONException {
                         Gson gson = new Gson();
                         String dataJson = getDataJson(response.body());
@@ -106,6 +116,7 @@ public class UserModel {
                         String token = tokenType + " " + accessToken;
                         SPTool.saveString(Constant.KEY_HEAD_TOKEN, token);
 
+                        // 添加cookie
                         HttpUrl httpUrl = HttpUrl.parse(UrlPath.host);
                         Cookie.Builder builder = new Cookie.Builder();
                         Cookie cookieToken = builder.name("Token").value(token).domain(httpUrl.host()).build();
@@ -116,7 +127,12 @@ public class UserModel {
 
                         CookieStore store = OkGo.getInstance().getCookieJar().getCookieStore();
                         List<Cookie> allCookie = store.getAllCookie();
-                        LogTool.i("所有cookie如下："+ allCookie.toString());
+                        LogTool.i("所有cookie如下：" + allCookie.toString());
+
+                        // 添加请求头
+                        HttpHeaders headers = new HttpHeaders();
+                        headers.put("Authorization", token);
+                        OkGo.getInstance().init(BaseApp.getApp()).addCommonHeaders(headers);
 
                         if (callBack != null)
                             callBack.onSuccess(bean);

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

@@ -5,7 +5,6 @@ import com.google.gson.reflect.TypeToken;
 import com.lzy.okgo.OkGo;
 import com.lzy.okgo.model.Response;
 import com.unis.model.bean.VersionBean;
-import com.xyxsbj.mylibrary.tool.LogTool;
 
 import org.json.JSONArray;
 import org.json.JSONException;
@@ -44,7 +43,6 @@ public class VersionModel {
                 .execute(new MyStringCallback() {
                     @Override
                     protected void onSuccessResult(Response<String> response) throws JSONException {
-                        LogTool.i("版本信息:" + response.body());
                         JSONObject object = new JSONObject(response.body());
                         JSONArray info = object.optJSONArray("info");
                         if (info == null || info.length() == 0) {

mylibrary/src/main/java/com/xyxsbj/mylibrary/BaseApp.java

@@ -38,6 +38,9 @@ import okhttp3.OkHttpClient;
 public abstract class BaseApp extends Application {
 
 
+    private static BaseApp  applicationContext;
+
+
     protected abstract boolean isDebug();//是否开启调试
 
     protected abstract String buglyAppId();//腾讯bugly的APPID配置
@@ -45,6 +48,7 @@ public abstract class BaseApp extends Application {
     @Override
     public void onCreate() {
         super.onCreate();
+        applicationContext = this;
 
         SPTool.init(this, "myapp");
         ToastTool.init(getApplicationContext());
@@ -55,6 +59,10 @@ public abstract class BaseApp extends Application {
         initAlbum();
     }
 
+    public static BaseApp getApp(){
+        return applicationContext;
+    }
+
     private void initAlbum() {
         Album.initialize(AlbumConfig.newBuilder(this)
                 .setAlbumLoader(new MediaLoader())