diff --git a/app/src/main/java/com/lsp/view/main/MainActivity.kt b/app/src/main/java/com/lsp/view/main/MainActivity.kt index af77c07..ea92d13 100644 --- a/app/src/main/java/com/lsp/view/main/MainActivity.kt +++ b/app/src/main/java/com/lsp/view/main/MainActivity.kt @@ -262,7 +262,7 @@ class MainActivity : AppCompatActivity() { if (tyep.equals("0")){ service = postService.getPostData("100", tags,page) }else{ - service = postService.getPostData_php("dapi","post","index","100",tags,"1") + service = postService.getPostData_php("dapi","post","index","100",tags,"1",nowPage.toString()) } service.enqueue(object : Callback> { diff --git a/app/src/main/java/com/lsp/view/main/PostAdapter.kt b/app/src/main/java/com/lsp/view/main/PostAdapter.kt index c83bde4..5d5fba8 100644 --- a/app/src/main/java/com/lsp/view/main/PostAdapter.kt +++ b/app/src/main/java/com/lsp/view/main/PostAdapter.kt @@ -56,7 +56,21 @@ class PostAdapter(val context:Context, private val postList: List) :Recycl override fun onBindViewHolder(holder: ViewHolder, position: Int) { val post = postList[position] //TODO 增加XML解析 节省流量 - val glideUrl = GlideUrl(post.file_url, LazyHeaders.Builder().addHeader("User-Agent","Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/90.0.4430.212 Safari/537.36").build()) + val glideUrl:GlideUrl + var source:String + if (post.preview_url!=null) { + source = post.preview_url + + }else{ + source = post.file_url + } + glideUrl = GlideUrl(source + , + LazyHeaders.Builder().addHeader( + "User-Agent", + "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/90.0.4430.212 Safari/537.36" + ).build() + ) Glide.with(context).load(glideUrl).into(holder.picImage) if (position==postList.size-1&&postList.size>6){ //到达底部 diff --git a/app/src/main/java/com/lsp/view/retrofit/PostService.kt b/app/src/main/java/com/lsp/view/retrofit/PostService.kt index 95445b7..5e326dd 100644 --- a/app/src/main/java/com/lsp/view/retrofit/PostService.kt +++ b/app/src/main/java/com/lsp/view/retrofit/PostService.kt @@ -10,5 +10,5 @@ interface PostService { fun getPostData(@Query("limit") limit: String,@Query("tags") tags:String?,@Query("page") page:String): Call> @GET("index.php") - fun getPostData_php(@Query("page") page:String,@Query("s") s:String,@Query("q")q:String,@Query("limit") limit: String,@Query("tags") tags:String?,@Query("json")json:String): Call> + fun getPostData_php(@Query("page") page:String,@Query("s") s:String,@Query("q")q:String,@Query("limit") limit: String,@Query("tags") tags:String?,@Query("json")json:String,@Query("pid")pid:String): Call> } \ No newline at end of file