网络缓存接口更新

朱显松
1 parent ebaf1eba
Showing 13 changed files with 478 additions and 19 deletions
app/build.gradle
app/src/main/java/com/cnlive/libs/demo/data/model/AppVersionInfo.java
app/src/main/java/com/cnlive/libs/demo/data/network/testapi/ApiRequest.java
app/src/main/java/com/cnlive/libs/demo/data/network/testapi/ApiService.java
app/src/main/java/com/cnlive/libs/demo/data/network/testapi/BaseInfo.java
app/src/main/java/com/cnlive/libs/demo/data/network/testapi/MomentData.java
app/src/main/java/com/cnlive/libs/demo/mvptest/ui/activity/LaunchActivity.java
cnlive/build.gradle
cnlive/src/main/java/com/cnlive/libs/base/data/network/OffLineInterceptor.java
cnlive/src/main/java/com/cnlive/libs/base/data/network/OnLineInterceptor.java
cnlive/src/main/java/com/cnlive/libs/base/data/network/RetrofitUtil.java
cnlive/src/main/java/com/cnlive/libs/base/frame/ReflectUtil.java
cnlive/src/main/java/com/cnlive/libs/base/frame/adapter/DataBindingRecyclerAdapter.java
@@ -37,6 +37,9 @@ android {
     dataBinding {
         enabled true
     }
+    lintOptions {
+        abortOnError false
+    }
 }
  
 dependencies {
+package com.cnlive.libs.demo.data.model;
+
+public class AppVersionInfo {
+
+
+
+    /**
+     * deviceType : IOS
+     * msg : 达人端1.0
+     * createTime : 2018-04-02 00:00:00
+     * id : aaaaa
+     * type : B
+     * version : 1.0
+     */
+
+    private String deviceType;
+    private String msg;
+    private String createTime;
+    private String id;
+    private String type;
+    private String version;
+    private String versionCode;
+
+    public String getVersionCode() {
+        return versionCode;
+    }
+
+    public void setVersionCode(String versionCode) {
+        this.versionCode = versionCode;
+    }
+
+    public String getDownLoadUrl() {
+        return downLoadUrl;
+    }
+
+    public void setDownLoadUrl(String downLoadUrl) {
+        this.downLoadUrl = downLoadUrl;
+    }
+
+    private String downLoadUrl;
+
+    public String getDeviceType() {
+        return deviceType;
+    }
+
+    public void setDeviceType(String deviceType) {
+        this.deviceType = deviceType;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+
+    public void setMsg(String msg) {
+        this.msg = msg;
+    }
+
+    public String getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(String createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public String getVersion() {
+        return version;
+    }
+
+    public void setVersion(String version) {
+        this.version = version;
+    }
+}
 \ No newline at end of file
 package com.cnlive.libs.demo.data.network.testapi;
  
  
+import android.content.Context;
+
 import com.cnlive.libs.base.data.model.IBaseInfo;
 import com.cnlive.libs.base.data.network.RetrofitUtil;
 import com.cnlive.libs.base.data.network.Subscriber;
@@ -33,6 +35,10 @@ public class ApiRequest {
         return RetrofitUtil.getRestAPI(getUrl(clazz), clazz);
     }
  
+    public static <T> T service(Class<T> clazz, Context context) {
+        return RetrofitUtil.getRestAPI(context, true, true, 10_000, 10_000, getUrl(clazz), clazz);
+    }
+
     public static <T extends IBaseInfo> Disposable subscribe(Observable<Result<T>> observable, Subscriber<T> subscriber) {
         return observable.take(1)
                 .subscribeOn(Schedulers.io())
@@ -4,14 +4,27 @@ package com.cnlive.libs.demo.data.network.testapi;
 import com.cnlive.libs.demo.data.model.AppInfo;
 import com.cnlive.libs.demo.mvptest.model.ExpertLibraryListBean;
  
+import java.util.Map;
+
 import io.reactivex.Observable;
 import retrofit2.adapter.rxjava2.Result;
 import retrofit2.http.GET;
+import retrofit2.http.Headers;
 import retrofit2.http.Query;
+import retrofit2.http.QueryMap;
  
 public interface ApiService {
-     String URL_DEBUG = "https://ymzx.asia-cloud.com/api/";
-     String URL_RELEASE = "https://ymzx.asia-cloud.com/api/";
+     String URL_DEBUG = "https://apiwjj.cnlive.com/Daren/moment/";
+     String URL_RELEASE = "https://apiwjj.cnlive.com/Daren/moment/";
+
+
+    /**
+     * 版本更新
+     *
+     * @return
+     */
+    @GET("friendMoment.action")
+    Observable<Result<BaseInfo<MomentData>>> getVersion(@QueryMap() Map<String, String> map);
  
     /**
      * 获取应用程序信息
@@ -19,6 +32,7 @@ public interface ApiService {
      * @param app_id 应用程序ID
      * @return AppInfo
      */
+    @Headers("cache:60")
     @GET("apps/info")
     Observable<Result<AppInfo>> appInfo(@Query("app_id") int app_id);
  
+package com.cnlive.libs.demo.data.network.testapi;
+
+import com.cnlive.libs.base.data.model.IBaseInfo;
+
+public class BaseInfo<T> implements IBaseInfo {
+    //TODO 接口错误信息 需要自定义
+    private String errorCode = "0";
+    private String errorMessage = "";
+
+    //TODO 接口内容数据 需要自定义
+    private T data;
+
+    public void setCode(String status_code) {
+        this.errorCode = status_code;
+    }
+
+    public String getCode() {
+        return errorCode;
+    }
+
+    public void setMessage(String errorMessage) {
+        this.errorMessage = errorMessage;
+    }
+
+    public String getMessage() {
+        return errorMessage;
+    }
+
+    public void setData(T data) {
+        this.data = data;
+    }
+
+    public T getData() {
+        return data;
+    }
+}
+package com.cnlive.libs.demo.data.network.testapi;
+
+import java.io.Serializable;
+import java.util.List;
+
+public class MomentData implements Serializable {
+
+    private boolean lastPage = true;
+    //新消息提醒
+    private MomentIcon icon;
+    //朋友圈列表
+    private List<FriendItem> moments;
+    //个人相册列表
+    private List<PhotoItem> items;
+
+    public static class MomentIcon implements Serializable{
+        private String nickName;
+        private String userId;
+        private String image;
+
+        public String getNickName() {
+            return nickName;
+        }
+
+        public void setNickName(String nickName) {
+            this.nickName = nickName;
+        }
+
+        public String getUserId() {
+            return userId;
+        }
+
+        public void setUserId(String userId) {
+            this.userId = userId;
+        }
+
+        public String getImage() {
+            return image;
+        }
+
+        public void setImage(String image) {
+            this.image = image;
+        }
+    }
+
+    public static class MomentVideo implements Serializable{
+        private String time;
+        private String imageUrl;
+        private String videoId;
+
+        public String getTime() {
+            return time;
+        }
+
+        public void setTime(String time) {
+            this.time = time;
+        }
+
+        public String getImageUrl() {
+            return imageUrl;
+        }
+
+        public void setImageUrl(String imageUrl) {
+            this.imageUrl = imageUrl;
+        }
+
+        public String getVideoId() {
+            return videoId;
+        }
+
+        public void setVideoId(String videoId) {
+            this.videoId = videoId;
+        }
+    }
+
+    public static class PhotoItem implements Serializable{
+        private String sid;
+        private String text;
+        private long ts;
+        private String address;
+        private List<String> images;
+        private String itemId;
+        private int type;
+        private MomentVideo video;
+
+        public String getSid() {
+            return sid;
+        }
+
+        public void setSid(String sid) {
+            this.sid = sid;
+        }
+
+        public String getText() {
+            return text;
+        }
+
+        public void setText(String text) {
+            this.text = text;
+        }
+
+        public long getTs() {
+            return ts;
+        }
+
+        public void setTs(long ts) {
+            this.ts = ts;
+        }
+
+        public String getAddress() {
+            return address;
+        }
+
+        public void setAddress(String address) {
+            this.address = address;
+        }
+
+        public List<String> getImages() {
+            return images;
+        }
+
+        public void setImages(List<String> images) {
+            this.images = images;
+        }
+
+        public String getItemId() {
+            return itemId;
+        }
+
+        public void setItemId(String itemId) {
+            this.itemId = itemId;
+        }
+
+        public int getType() {
+            return type;
+        }
+
+        public void setType(int type) {
+            this.type = type;
+        }
+
+        public MomentVideo getVideo() {
+            return video;
+        }
+
+        public void setVideo(MomentVideo video) {
+            this.video = video;
+        }
+    }
+
+    public static class FriendItem implements Serializable{
+        private PhotoItem item;
+        private MomentIcon icon;
+
+        public PhotoItem getItem() {
+            return item;
+        }
+
+        public void setItem(PhotoItem item) {
+            this.item = item;
+        }
+
+        public MomentIcon getIcon() {
+            return icon;
+        }
+
+        public void setIcon(MomentIcon icon) {
+            this.icon = icon;
+        }
+    }
+
+    public MomentIcon getIcon() {
+        return icon;
+    }
+
+    public void setIcon(MomentIcon icon) {
+        this.icon = icon;
+    }
+
+    public List<PhotoItem> getItems() {
+        return items;
+    }
+
+    public void setItems(List<PhotoItem> items) {
+        this.items = items;
+    }
+
+    public List<FriendItem> getMoments() {
+        return moments;
+    }
+
+    public void setMoments(List<FriendItem> moments) {
+        this.moments = moments;
+    }
+
+    public boolean isLastPage() {
+        return lastPage;
+    }
+
+    public void setLastPage(boolean lastPage) {
+        this.lastPage = lastPage;
+    }
+}
 \ No newline at end of file
@@ -6,14 +6,25 @@ import android.os.Bundle;
 import android.util.Log;
 import android.view.View;
  
+import com.cnlive.libs.base.data.network.Subscriber;
 import com.cnlive.libs.base.frame.activity.MvpViewStateBindingActivity;
 import com.cnlive.libs.demo.R;
 import com.cnlive.libs.demo.ToastTest;
+import com.cnlive.libs.demo.data.network.testapi.ApiRequest;
+import com.cnlive.libs.demo.data.network.testapi.ApiService;
+import com.cnlive.libs.demo.data.network.testapi.BaseInfo;
+import com.cnlive.libs.demo.data.network.testapi.MomentData;
 import com.cnlive.libs.demo.databinding.ActivityLaunchBinding;
 import com.cnlive.libs.demo.mvptest.frame.presenter.LaunchPresenter;
 import com.cnlive.libs.demo.mvptest.frame.view.LaunchView;
 import com.cnlive.libs.demo.mvptest.model.LaunchListItemData;
 import com.cnlive.libs.demo.mvptest.model.LaunchPage;
+import com.google.gson.Gson;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import static com.cnlive.libs.demo.RequestTest.subscriberBuild;
  
 public class LaunchActivity extends MvpViewStateBindingActivity<LaunchView, LaunchPresenter, LaunchPage, ActivityLaunchBinding> {
  
@@ -30,7 +41,7 @@ public class LaunchActivity extends MvpViewStateBindingActivity&lt;LaunchView, Laun
     @Override
     protected void onPostCreate(Bundle savedInstanceState) {
         super.onPostCreate(savedInstanceState);
-        getViewData().getAdapter().setItemClickListener((id,item) -> {
+        getViewData().getAdapter().setItemClickListener((id, item) -> {
             Log.e("DemoView", "Click " + item.getName());
         });
     }
@@ -49,8 +60,8 @@ public class LaunchActivity extends MvpViewStateBindingActivity&lt;LaunchView, Laun
     public void onClick(View view) {
         switch (view.getId()) {
             case R.id.click:
-                getViewData().setTime(2);
-                startActivity(new Intent(this, LaunchActivity.class));
+//                getViewData().setTime(2);
+//                startActivity(new Intent(this, LaunchActivity.class));
                 break;
         }
     }
@@ -63,8 +74,23 @@ public class LaunchActivity extends MvpViewStateBindingActivity&lt;LaunchView, Laun
     private int index = 1;
  
     public void onAddItemClick(View view) {
-        getViewData().getAdapter().addItem(new LaunchListItemData("" + index++));
-        getViewData().setTime(getViewData().getAdapter().getItemCount());
+        Map<String, String> requestMap = new HashMap<>();
+        requestMap.put("sid", "815510");
+        ApiRequest.subscribe(
+                ApiRequest.service(ApiService.class, this).getVersion(requestMap),
+                new Subscriber<BaseInfo<MomentData>>(this, subscriberBuild) {
+                    @Override
+                    public void onCompleted(String code, String message, BaseInfo<MomentData> data) {
+                        Log.e("DemoView", "结果 " + new Gson().toJson(data));
+                    }
+
+                    @Override
+                    public void onError(String code, String message) {
+                        Log.e("DemoView", "错误 " + code + ":" + message);
+                    }
+                });
+//        getViewData().getAdapter().addItem(new LaunchListItemData("" + index++));
+//        getViewData().setTime(getViewData().getAdapter().getItemCount());
     }
  
     public void onMainItemClick(View view) {
@@ -78,7 +78,7 @@ ext {
     siteUrl = 'http://bj.gitlab.cnlive.com/cnlive-team/CNVideoDemo'
     gitUrl = 'http://bj.gitlab.cnlive.com/cnlive-team/CNVideoDemo.git'
  
-    libraryVersion = '0.3.0'
+    libraryVersion = '0.3.3'
  
     developerId = 'CNlive'
     developerName = 'Granzon'
+package com.cnlive.libs.base.data.network;
+
+import android.content.Context;
+
+import java.io.IOException;
+
+import okhttp3.Interceptor;
+import okhttp3.Request;
+
+/**
+ * Created by xiansong on 2018/4/4.
+ */
+
+public class OffLineInterceptor implements Interceptor {
+
+    private static final int TIMEOUT_DISCONNECT = 60 * 60 * 24 * 7; //7天
+
+    private Context mContext;
+
+    protected OffLineInterceptor(Context context) {
+        mContext = context;
+    }
+
+    @Override
+    public okhttp3.Response intercept(Chain chain) throws IOException {
+        Request request = chain.request();
+        //离线的时候为7天的缓存。
+        if (!NetworkUtil.isConnectInternet(mContext)) {
+            request = request.newBuilder()
+                    .header("Cache-Control", "public, only-if-cached, max-stale=" + TIMEOUT_DISCONNECT)
+                    .build();
+        }
+        return chain.proceed(request);
+    }
+}
+package com.cnlive.libs.base.data.network;
+
+import java.io.IOException;
+
+import okhttp3.Interceptor;
+
+/**
+ * Created by xiansong on 2018/4/4.
+ */
+
+public class OnLineInterceptor implements Interceptor {
+
+    private static final int TIMEOUT_CONNECT = 5; //5秒
+
+    @Override
+    public okhttp3.Response intercept(Chain chain) throws IOException {
+        //获取retrofit @headers里面的参数，参数可以自己定义，在本例我自己定义的是cache，跟@headers里面对应就可以了
+        String cache = chain.request().header("cache");
+        okhttp3.Response originalResponse = chain.proceed(chain.request());
+        String cacheControl = originalResponse.header("Cache-Control");
+        //如果cacheControl为空，就让他TIMEOUT_CONNECT秒的缓存，本例是5秒，方便观察。注意这里的cacheControl是服务器返回的
+        if (cacheControl == null) {
+            //如果cache没值，缓存时间为TIMEOUT_CONNECT，有的话就为cache的值
+            if (cache == null || "".equals(cache)) {
+                cache = TIMEOUT_CONNECT + "";
+            }
+            originalResponse = originalResponse.newBuilder()
+                    .header("Cache-Control", "public, max-age=" + cache)
+                    .build();
+            return originalResponse;
+        } else {
+            return originalResponse;
+        }
+    }
+}
 \ No newline at end of file
@@ -24,6 +24,9 @@ import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory;
 import retrofit2.converter.gson.GsonConverterFactory;
  
 public class RetrofitUtil {
+
+    private static Context context;
+
     private static boolean DEBUG = AppConfig.isDebug();
  
     private static final String TAG = "RetrofitUtil";
@@ -42,8 +45,8 @@ public class RetrofitUtil {
         return getRestAPI(null, false, showLog, 5000, 5000, endpoint, service);
     }
  
-    private static <T> T getRestAPI(Context context, boolean hasCache, boolean showLog, int readTimeout, int connectTimeout, String endpoint, Class<T> service) {
-
+    public static <T> T getRestAPI(Context context, boolean hasCache, boolean showLog, int readTimeout, int connectTimeout, String endpoint, Class<T> service) {
+        RetrofitUtil.context = context;
         OkHttpClient.Builder okHttpClientBuilder = new OkHttpClient().newBuilder();
  
         try {
@@ -71,8 +74,10 @@ public class RetrofitUtil {
             okHttpClientBuilder.readTimeout(readTimeout, TimeUnit.SECONDS);
         }
         if (hasCache) {
+            okHttpClientBuilder.addNetworkInterceptor(new OnLineInterceptor());
+            okHttpClientBuilder.addInterceptor(new OffLineInterceptor(context));
+
             okHttpClientBuilder.cache(new Cache(context.getCacheDir(), 10 * 1024 * 1024));
-            okHttpClientBuilder.addNetworkInterceptor(new ClientInterceptor(context));
         }
  
         if (showLog) {
@@ -91,5 +96,4 @@ public class RetrofitUtil {
         return retrofit.create(service);
     }
  
-
 }
@@ -32,11 +32,6 @@ public class ReflectUtil {
     public static Object invoke(Object obj, String methodName, Object data) {
         Object result = null;
         try {
-            Log.e("DemOView", "--------------------Test " + methodName + " : " + data.getClass());
-            for (Method method : obj.getClass().getMethods()) {
-                Log.e("DemOView", "Test " + method.getName() + " : " + method.getParameterAnnotations().toString());
-            }
-
             Method method = obj.getClass().getMethod(methodName, new Class[]{data.getClass()});
             result = method.invoke(obj, data);
         } catch (Exception e) {
@@ -45,6 +40,17 @@ public class ReflectUtil {
         return result;
     }
  
+    public static Object invoke(Object obj, String methodName) {
+        Object result = null;
+        try {
+            Method method = obj.getClass().getMethod(methodName);
+            result = method.invoke(obj);
+        } catch (Exception e) {
+            LogUtil.e(TAG, "The page data type is not match ", e);
+        }
+        return result;
+    }
+
     public static <R> R instance(int position, Class type, Object data) {
         R result = null;
         try {
@@ -62,12 +62,14 @@ public abstract class DataBindingRecyclerAdapter&lt;D, T extends ViewDataBinding&gt; e
     }
  
     @Override
-    public void onBindViewHolder(DataBindingViewHolder holder, int position) {
+    public void onBindViewHolder(final DataBindingViewHolder holder, int position) {
         ReflectUtil.invoke(holder.binding, "setData", getList().get(position));
         ReflectUtil.invoke(holder.binding, "setClick", new Click(position) {
             @Override
             public void onClick(View v) {
-                if (listener != null) listener.onItemClick(v.getId(), getList().get(position));
+//                if (listener != null) listener.onItemClick(v.getId(), getList().get(position));
+                if (listener != null)
+                    listener.onItemClick(v.getId(), (D) ReflectUtil.invoke(holder.binding, "getData"));
             }
         }, View.OnClickListener.class);
         holder.binding.executePendingBindings();