From 25b0d5d54278228a4d6e2f843932bd5a38b1b8f5 Mon Sep 17 00:00:00 2001 From: Godfather <981964879@qq.com> Date: Fri, 25 Feb 2022 18:39:49 +0800 Subject: [PATCH] =?UTF-8?q?version:1.7=20fix:=20update:=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=8A=A2=E8=B4=AD=E8=AF=A6=E6=83=85=E7=9A=84api=E5=92=8Cbean?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 13 ++- .../java/com/uiui/os/bean/ArticleDetails.java | 44 +++++++ .../java/com/uiui/os/bean/ArticleInfo.java | 57 ++++++++++ .../java/com/uiui/os/bean/GoodsDetails.java | 88 ++++++++++++++ .../main/java/com/uiui/os/bean/GoodsInfo.java | 107 ++++++++++++++++++ .../java/com/uiui/os/network/URLAddress.java | 8 ++ .../os/network/api/ArticleDetailsApi.java | 16 +++ .../uiui/os/network/api/ArticleListApi.java | 18 +++ .../uiui/os/network/api/GoodsDetailsApi.java | 19 ++++ .../com/uiui/os/network/api/GoodsListApi.java | 18 +++ 10 files changed, 382 insertions(+), 6 deletions(-) create mode 100644 app/src/main/java/com/uiui/os/bean/ArticleDetails.java create mode 100644 app/src/main/java/com/uiui/os/bean/ArticleInfo.java create mode 100644 app/src/main/java/com/uiui/os/bean/GoodsDetails.java create mode 100644 app/src/main/java/com/uiui/os/bean/GoodsInfo.java create mode 100644 app/src/main/java/com/uiui/os/network/api/ArticleDetailsApi.java create mode 100644 app/src/main/java/com/uiui/os/network/api/ArticleListApi.java create mode 100644 app/src/main/java/com/uiui/os/network/api/GoodsDetailsApi.java create mode 100644 app/src/main/java/com/uiui/os/network/api/GoodsListApi.java diff --git a/app/build.gradle b/app/build.gradle index 38d659d..79e5b78 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -136,22 +136,23 @@ dependencies { // implementation fileTree(dir: 'libs', include: ['*.jar']) compileOnly files('libs/framework.jar') implementation files('libs/QWeather_Public_Android_V4.6.jar') - + //保持1.3.1 更新会报错 implementation 'androidx.appcompat:appcompat:1.3.1' + //2.0.4以上无法预览 implementation 'androidx.constraintlayout:constraintlayout:2.0.4' implementation "androidx.recyclerview:recyclerview:1.2.1" // For control over item selection of both touch and mouse driven selection implementation "androidx.recyclerview:recyclerview-selection:1.1.0" implementation "androidx.viewpager2:viewpager2:1.0.0" // Java language implementation - implementation "androidx.fragment:fragment:1.4.0" + implementation "androidx.fragment:fragment:1.4.1" implementation 'androidx.legacy:legacy-support-v4:1.0.0' testImplementation 'junit:junit:4.12' androidTestImplementation 'androidx.test.ext:junit:1.1.3' androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' //glide - implementation 'com.github.bumptech.glide:glide:4.11.0' - annotationProcessor 'com.github.bumptech.glide:compiler:4.11.0' + implementation 'com.github.bumptech.glide:glide:4.13.1' + annotationProcessor 'com.github.bumptech.glide:compiler:4.13.1' //RxJava // implementation 'io.reactivex.rxjava2:rxjava:2.2.12' // implementation 'io.reactivex.rxjava2:rxandroid:2.1.1' @@ -162,7 +163,7 @@ dependencies { // implementation 'com.squareup.retrofit2:adapter-rxjava2:2.4.0' implementation "com.squareup.retrofit2:adapter-rxjava3:2.9.0" //Gson - implementation 'com.google.code.gson:gson:2.8.9' + implementation 'com.google.code.gson:gson:2.9.0' implementation 'com.google.zxing:core:3.4.1' //生命周期管理 implementation 'com.trello.rxlifecycle4:rxlifecycle:4.0.2' @@ -176,7 +177,7 @@ dependencies { //高德地图定位 implementation 'com.amap.api:location:5.1.0' //MMKV - implementation 'com.tencent:mmkv-static:1.2.11' + implementation 'com.tencent:mmkv-static:1.2.12' //状态栏透明 implementation 'com.gitee.zackratos:UltimateBarX:0.8.0' //指示器 diff --git a/app/src/main/java/com/uiui/os/bean/ArticleDetails.java b/app/src/main/java/com/uiui/os/bean/ArticleDetails.java new file mode 100644 index 0000000..4cc7d45 --- /dev/null +++ b/app/src/main/java/com/uiui/os/bean/ArticleDetails.java @@ -0,0 +1,44 @@ +package com.uiui.os.bean; + +import java.io.Serializable; + +public class ArticleDetails implements Serializable { + private static final long serialVersionUID = -1838902080467423485L; + + int id; + String title; + String content; + String img; + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + + public String getContent() { + return content; + } + + public void setContent(String content) { + this.content = content; + } + + public String getImg() { + return img; + } + + public void setImg(String img) { + this.img = img; + } +} diff --git a/app/src/main/java/com/uiui/os/bean/ArticleInfo.java b/app/src/main/java/com/uiui/os/bean/ArticleInfo.java new file mode 100644 index 0000000..007239d --- /dev/null +++ b/app/src/main/java/com/uiui/os/bean/ArticleInfo.java @@ -0,0 +1,57 @@ +package com.uiui.os.bean; + +import java.io.Serializable; + +public class ArticleInfo implements Serializable { + private static final long serialVersionUID = 5156317868469352633L; + + int id; + /*标题*/ + String title; + /*内容*/ + String content; + /*缩略图链接*/ + String img; + /*跳转链接*/ + String jump_url; + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + + public String getContent() { + return content; + } + + public void setContent(String content) { + this.content = content; + } + + public String getImg() { + return img; + } + + public void setImg(String img) { + this.img = img; + } + + public String getJump_url() { + return jump_url; + } + + public void setJump_url(String jump_url) { + this.jump_url = jump_url; + } +} diff --git a/app/src/main/java/com/uiui/os/bean/GoodsDetails.java b/app/src/main/java/com/uiui/os/bean/GoodsDetails.java new file mode 100644 index 0000000..54efe1f --- /dev/null +++ b/app/src/main/java/com/uiui/os/bean/GoodsDetails.java @@ -0,0 +1,88 @@ +package com.uiui.os.bean; + +import java.io.Serializable; + +public class GoodsDetails implements Serializable { + private static final long serialVersionUID = 8555224831444328502L; + int id; + String goods_name; + String img; + String goods_desc; + float original_price; + float buying_price; + int stock; + String details_img; + String video_url; + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public String getGoods_name() { + return goods_name; + } + + public void setGoods_name(String goods_name) { + this.goods_name = goods_name; + } + + public String getImg() { + return img; + } + + public void setImg(String img) { + this.img = img; + } + + public String getGoods_desc() { + return goods_desc; + } + + public void setGoods_desc(String goods_desc) { + this.goods_desc = goods_desc; + } + + public float getOriginal_price() { + return original_price; + } + + public void setOriginal_price(float original_price) { + this.original_price = original_price; + } + + public float getBuying_price() { + return buying_price; + } + + public void setBuying_price(float buying_price) { + this.buying_price = buying_price; + } + + public int getStock() { + return stock; + } + + public void setStock(int stock) { + this.stock = stock; + } + + public String getDetails_img() { + return details_img; + } + + public void setDetails_img(String details_img) { + this.details_img = details_img; + } + + public String getVideo_url() { + return video_url; + } + + public void setVideo_url(String video_url) { + this.video_url = video_url; + } +} diff --git a/app/src/main/java/com/uiui/os/bean/GoodsInfo.java b/app/src/main/java/com/uiui/os/bean/GoodsInfo.java new file mode 100644 index 0000000..303898d --- /dev/null +++ b/app/src/main/java/com/uiui/os/bean/GoodsInfo.java @@ -0,0 +1,107 @@ +package com.uiui.os.bean; + +import java.io.Serializable; + +public class GoodsInfo implements Serializable { + private static final long serialVersionUID = -229267734972111105L; + int id; + /*商品名*/ + String goods_name; + /*简介*/ + String goods_desc; + /*缩略图链接*/ + String img; + /*详情图链接*/ + String details_img; + /*视频链接*/ + String video_url; + /*原价*/ + float original_price; + /*抢购价*/ + float buying_price; + /*库存*/ + int stock; + /*跳转链接*/ + String jump_url; + + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public String getGoods_name() { + return goods_name; + } + + public void setGoods_name(String goods_name) { + this.goods_name = goods_name; + } + + public String getGoods_desc() { + return goods_desc; + } + + public void setGoods_desc(String goods_desc) { + this.goods_desc = goods_desc; + } + + public String getImg() { + return img; + } + + public void setImg(String img) { + this.img = img; + } + + public String getDetails_img() { + return details_img; + } + + public void setDetails_img(String details_img) { + this.details_img = details_img; + } + + public String getVideo_url() { + return video_url; + } + + public void setVideo_url(String video_url) { + this.video_url = video_url; + } + + public float getOriginal_price() { + return original_price; + } + + public void setOriginal_price(float original_price) { + this.original_price = original_price; + } + + public float getBuying_price() { + return buying_price; + } + + public void setBuying_price(float buying_price) { + this.buying_price = buying_price; + } + + public int getStock() { + return stock; + } + + public void setStock(int stock) { + this.stock = stock; + } + + public String getJump_url() { + return jump_url; + } + + public void setJump_url(String jump_url) { + this.jump_url = jump_url; + } +} diff --git a/app/src/main/java/com/uiui/os/network/URLAddress.java b/app/src/main/java/com/uiui/os/network/URLAddress.java index 03206e7..08e425d 100644 --- a/app/src/main/java/com/uiui/os/network/URLAddress.java +++ b/app/src/main/java/com/uiui/os/network/URLAddress.java @@ -18,5 +18,13 @@ public class URLAddress { public static final String UPDATE_DESKTOP_LAYOUT = "updateDesktopLayout"; /*获取桌面布局*/ public static final String GET_DESKTOP_LAYOUT = "getDesktopLayout"; + /*获取抢购列表*/ + public static final String GET_GOODS_LIST = "getGoodsList"; + /*获取资讯列表*/ + public static final String GET_ARTICLE_LIST = "getArticleList"; + /*获取抢购详情*/ + public static final String GET_GOODS_DETAILS = "getGoodsDetails"; + /*获取资讯详情*/ + public static final String GET_ARTICLE_DETAILS = "getArticleDetails"; } diff --git a/app/src/main/java/com/uiui/os/network/api/ArticleDetailsApi.java b/app/src/main/java/com/uiui/os/network/api/ArticleDetailsApi.java new file mode 100644 index 0000000..57e2402 --- /dev/null +++ b/app/src/main/java/com/uiui/os/network/api/ArticleDetailsApi.java @@ -0,0 +1,16 @@ +package com.uiui.os.network.api; + +import com.uiui.os.bean.ArticleDetails; +import com.uiui.os.bean.BaseResponse; +import com.uiui.os.network.URLAddress; + +import io.reactivex.rxjava3.core.Observable; +import retrofit2.http.GET; +import retrofit2.http.Query; + +public interface ArticleDetailsApi { + @GET(URLAddress.GET_ARTICLE_DETAILS) + Observable> getArticleDetails( + @Query("id") int id + ); +} diff --git a/app/src/main/java/com/uiui/os/network/api/ArticleListApi.java b/app/src/main/java/com/uiui/os/network/api/ArticleListApi.java new file mode 100644 index 0000000..b4cdc6d --- /dev/null +++ b/app/src/main/java/com/uiui/os/network/api/ArticleListApi.java @@ -0,0 +1,18 @@ +package com.uiui.os.network.api; + +import com.uiui.os.bean.ArticleInfo; +import com.uiui.os.bean.BaseResponse; +import com.uiui.os.network.URLAddress; + +import java.util.List; + +import io.reactivex.rxjava3.core.Observable; +import retrofit2.http.GET; +import retrofit2.http.Query; + +public interface ArticleListApi { + @GET(URLAddress.GET_ARTICLE_LIST) + Observable>> getArticleList( + @Query("sn") String sn + ); +} diff --git a/app/src/main/java/com/uiui/os/network/api/GoodsDetailsApi.java b/app/src/main/java/com/uiui/os/network/api/GoodsDetailsApi.java new file mode 100644 index 0000000..909c45c --- /dev/null +++ b/app/src/main/java/com/uiui/os/network/api/GoodsDetailsApi.java @@ -0,0 +1,19 @@ +package com.uiui.os.network.api; + +import com.uiui.os.bean.BaseResponse; +import com.uiui.os.bean.GoodsDetails; +import com.uiui.os.bean.GoodsInfo; +import com.uiui.os.network.URLAddress; + +import java.util.List; + +import io.reactivex.rxjava3.core.Observable; +import retrofit2.http.GET; +import retrofit2.http.Query; + +public interface GoodsDetailsApi { + @GET(URLAddress.GET_GOODS_DETAILS) + Observable> getGoodsDetails( + @Query("id") int id + ); +} diff --git a/app/src/main/java/com/uiui/os/network/api/GoodsListApi.java b/app/src/main/java/com/uiui/os/network/api/GoodsListApi.java new file mode 100644 index 0000000..266635d --- /dev/null +++ b/app/src/main/java/com/uiui/os/network/api/GoodsListApi.java @@ -0,0 +1,18 @@ +package com.uiui.os.network.api; + +import com.uiui.os.bean.BaseResponse; +import com.uiui.os.bean.GoodsInfo; +import com.uiui.os.network.URLAddress; + +import java.util.List; + +import io.reactivex.rxjava3.core.Observable; +import retrofit2.http.GET; +import retrofit2.http.Query; + +public interface GoodsListApi { + @GET(URLAddress.GET_GOODS_LIST) + Observable>> getGoodsList( + @Query("sn") String sn + ); +}