diff --git a/.idea/misc.xml b/.idea/misc.xml index 27ab103..249ea16 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -27,7 +27,7 @@ - + \ No newline at end of file diff --git a/app/src/main/java/com/lance/freebook/Data/APi/MovieService.java b/app/src/main/java/com/lance/freebook/Data/APi/BookService.java similarity index 85% rename from app/src/main/java/com/lance/freebook/Data/APi/MovieService.java rename to app/src/main/java/com/lance/freebook/Data/APi/BookService.java index 27c6d52..efa24e3 100644 --- a/app/src/main/java/com/lance/freebook/Data/APi/MovieService.java +++ b/app/src/main/java/com/lance/freebook/Data/APi/BookService.java @@ -12,14 +12,14 @@ * API接口 * 因为使用RxCache作为缓存策略 所以这里不需要写缓存信息 */ -public interface MovieService { +public interface BookService { //获取书库分类信息 - @GET("freebook/typeconfigs.json") + @GET("api/getTypeConfigList") Observable> getBookTypes(); //获得首页banner以及书籍数据 - @GET("freebook/home.json") + @GET("api/getHomeInfo") Observable getHomeInfo(); //获得搜索标签 diff --git a/app/src/main/java/com/lance/freebook/Data/HttpData/HttpData.java b/app/src/main/java/com/lance/freebook/Data/HttpData/HttpData.java index fd151c0..6194f73 100644 --- a/app/src/main/java/com/lance/freebook/Data/HttpData/HttpData.java +++ b/app/src/main/java/com/lance/freebook/Data/HttpData/HttpData.java @@ -1,7 +1,7 @@ package com.lance.freebook.Data.HttpData; import com.lance.freebook.Data.APi.CacheProviders; -import com.lance.freebook.Data.APi.MovieService; +import com.lance.freebook.Data.APi.BookService; import com.lance.freebook.Data.Retrofit.RetrofitUtils; import com.lance.freebook.MVP.Entity.BookTypeDto; import com.lance.freebook.MVP.Entity.HomeDto; @@ -33,7 +33,7 @@ public class HttpData extends RetrofitUtils { private static final CacheProviders providers = new RxCache.Builder() .persistence(cacheDirectory) .using(CacheProviders.class); - protected static final MovieService service = getRetrofit().create(MovieService.class); + protected static final BookService service = getRetrofit().create(BookService.class); //在访问HttpMethods时创建单例 private static class SingletonHolder { diff --git a/app/src/main/java/com/lance/freebook/MVP/Adapter/BookDownloadListAdapter.java b/app/src/main/java/com/lance/freebook/MVP/Adapter/BookDownloadListAdapter.java index 1e260ee..24e569f 100644 --- a/app/src/main/java/com/lance/freebook/MVP/Adapter/BookDownloadListAdapter.java +++ b/app/src/main/java/com/lance/freebook/MVP/Adapter/BookDownloadListAdapter.java @@ -169,7 +169,7 @@ protected void completed(BaseDownloadTask task) { TasksManager.getImpl() .updateViewHolder(item.getId(), helper); - task.start(); + item.setId(task.start()); } diff --git a/app/src/main/java/com/lance/freebook/MVP/Entity/BannerDto.java b/app/src/main/java/com/lance/freebook/MVP/Entity/BannerDto.java index 718bcec..c6a74f0 100644 --- a/app/src/main/java/com/lance/freebook/MVP/Entity/BannerDto.java +++ b/app/src/main/java/com/lance/freebook/MVP/Entity/BannerDto.java @@ -6,14 +6,24 @@ public class BannerDto { /** - * imageUrl : http://img1.youzy.cn/content2/thumbs/p00393573.jpeg - * bannerTitle : banner测试 - * Url : + * id : 1 + * imageUrl : http://odog3v89f.bkt.clouddn.com/banner/banner1.png + * bannerTitle : 游离在正邪边缘的人:残袍 + * bookid : 29286 */ + private int id; private String imageUrl; private String bannerTitle; - private String Url; + private int bookid; + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } public String getImageUrl() { return imageUrl; @@ -31,11 +41,11 @@ public void setBannerTitle(String bannerTitle) { this.bannerTitle = bannerTitle; } - public String getUrl() { - return Url; + public int getBookid() { + return bookid; } - public void setUrl(String Url) { - this.Url = Url; + public void setBookid(int bookid) { + this.bookid = bookid; } } diff --git a/app/src/main/java/com/lance/freebook/MVP/Home/Fragment/HomeDownloadFragment.java b/app/src/main/java/com/lance/freebook/MVP/Home/Fragment/HomeDownloadFragment.java index 1b0d11d..5ed4771 100644 --- a/app/src/main/java/com/lance/freebook/MVP/Home/Fragment/HomeDownloadFragment.java +++ b/app/src/main/java/com/lance/freebook/MVP/Home/Fragment/HomeDownloadFragment.java @@ -77,6 +77,7 @@ public void onMyyes() { } TasksManager.getImpl().removeTask(mQuickAdapter.getItem(position).getId()); mQuickAdapter.remove(position); + RefreshView(); myDialogDownload.dismiss(); } diff --git a/app/src/main/java/com/lance/freebook/common/Constant.java b/app/src/main/java/com/lance/freebook/common/Constant.java index 37b4539..cf01cce 100644 --- a/app/src/main/java/com/lance/freebook/common/Constant.java +++ b/app/src/main/java/com/lance/freebook/common/Constant.java @@ -5,8 +5,7 @@ * 本类存放项目所需常量 */ public class Constant { - public static String API_SERVER="http://odog3v89f.bkt.clouddn.com"; - public static String API_SEARCH="http://m.txt99.cc/search/result/searchtype/complex/searchkey/{Key}/page/1"; + public static String API_SERVER="http://112.74.93.67"; public static final String EMPTY_TITLE_BOOKS="这个分类还没书籍"; diff --git a/build.gradle b/build.gradle index 9eb41f0..243de31 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.2.0' + classpath 'com.android.tools.build:gradle:2.2.2' classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files