diff --git a/app/build.gradle b/app/build.gradle index 132c290..78eff11 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -15,8 +15,8 @@ android { applicationId "com.uiuios.aios" minSdkVersion 24 targetSdkVersion 29 - versionCode 38 - versionName "4.7" + versionCode 39 + versionName "4.8" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/app/src/main/java/com/uiui/video/bean/VideoInfo.java b/app/src/main/java/com/uiui/video/bean/VideoInfo.java index 8b401d4..6376fb8 100644 --- a/app/src/main/java/com/uiui/video/bean/VideoInfo.java +++ b/app/src/main/java/com/uiui/video/bean/VideoInfo.java @@ -23,7 +23,8 @@ public class VideoInfo implements Serializable, Parcelable { String video_cover; double video_duration; //时长 单位秒 long video_size;//大小 单位字节 - int weigh; + @SerializedName("weigh") + int weight;//权重 int play_count;//播放次数 protected VideoInfo(Parcel in) { @@ -35,7 +36,7 @@ public class VideoInfo implements Serializable, Parcelable { video_cover = in.readString(); video_duration = in.readDouble(); video_size = in.readLong(); - weigh = in.readInt(); + weight = in.readInt(); play_count = in.readInt(); } @@ -49,7 +50,7 @@ public class VideoInfo implements Serializable, Parcelable { dest.writeString(video_cover); dest.writeDouble(video_duration); dest.writeLong(video_size); - dest.writeInt(weigh); + dest.writeInt(weight); dest.writeInt(play_count); } @@ -134,12 +135,12 @@ public class VideoInfo implements Serializable, Parcelable { this.video_size = video_size; } - public int getWeigh() { - return weigh; + public int getWeight() { + return weight; } - public void setWeigh(int weigh) { - this.weigh = weigh; + public void setWeight(int weight) { + this.weight = weight; } public int getPlay_count() { diff --git a/app/src/main/java/com/uiuios/aios/activity/GoodsActivity.java b/app/src/main/java/com/uiuios/aios/activity/GoodsActivity.java index 43180f3..9802741 100644 --- a/app/src/main/java/com/uiuios/aios/activity/GoodsActivity.java +++ b/app/src/main/java/com/uiuios/aios/activity/GoodsActivity.java @@ -180,6 +180,7 @@ public class GoodsActivity extends DataBindingActivity { if (listBaseResponse.code == 200) { GoodsList goodsList = listBaseResponse.data; List goodsInfos = goodsList.getData(); + goodsInfos.sort((o1, o2) -> Integer.compare(o2.getWeight(), o1.getWeight())); mGoodsAdapter.setGoodsInfoList(goodsInfos); mRecyclerView.setVisibility(View.VISIBLE); mBinding.clNodata.setVisibility(View.GONE); diff --git a/app/src/main/java/com/uiuios/aios/activity/InfoListActivity.java b/app/src/main/java/com/uiuios/aios/activity/InfoListActivity.java index 81cb49f..eb0f4c6 100644 --- a/app/src/main/java/com/uiuios/aios/activity/InfoListActivity.java +++ b/app/src/main/java/com/uiuios/aios/activity/InfoListActivity.java @@ -82,6 +82,7 @@ public class InfoListActivity extends BaseActivity { ArticleList articleList = listBaseResponse.data; List articleInfoList = articleList.getData(); if (articleInfoList != null && articleInfoList.size() != 0) { + articleInfoList.sort((o1, o2) -> Integer.compare(o2.getWeight(), o1.getWeight())); iv1.setVisibility(android.view.View.GONE); mArticleAdapter.setArticleBeanList(articleInfoList); } else { diff --git a/app/src/main/java/com/uiuios/aios/activity/InformationActivity.java b/app/src/main/java/com/uiuios/aios/activity/InformationActivity.java index fa18bf4..dcdf42c 100644 --- a/app/src/main/java/com/uiuios/aios/activity/InformationActivity.java +++ b/app/src/main/java/com/uiuios/aios/activity/InformationActivity.java @@ -175,6 +175,7 @@ public class InformationActivity extends DataBindingActivity { ArticleList articleList = listBaseResponse.data; List articleInfoList = articleList.getData(); if (articleInfoList != null && articleInfoList.size() != 0) { + articleInfoList.sort((o1, o2) -> Integer.compare(o2.getWeight(), o1.getWeight())); mInformationAdapter.setArticleInfos(articleInfoList); rv_video.setVisibility(View.VISIBLE); cl_nodata.setVisibility(android.view.View.GONE); diff --git a/app/src/main/java/com/uiuios/aios/bean/ArticleInfo.java b/app/src/main/java/com/uiuios/aios/bean/ArticleInfo.java index d157cf8..4a8e681 100644 --- a/app/src/main/java/com/uiuios/aios/bean/ArticleInfo.java +++ b/app/src/main/java/com/uiuios/aios/bean/ArticleInfo.java @@ -15,7 +15,7 @@ public class ArticleInfo implements Serializable { /*跳转链接*/ String jump_url; - int weight; + int weight;//权重 int click_count; String third_url; long update_time; diff --git a/app/src/main/java/com/uiuios/aios/bean/GoodsInfo.java b/app/src/main/java/com/uiuios/aios/bean/GoodsInfo.java index 31c869d..4a779b3 100644 --- a/app/src/main/java/com/uiuios/aios/bean/GoodsInfo.java +++ b/app/src/main/java/com/uiuios/aios/bean/GoodsInfo.java @@ -6,6 +6,7 @@ import java.io.Serializable; public class GoodsInfo implements Serializable { private static final long serialVersionUID = -229267734972111105L; + String id; /*商品名*/ String goods_name; @@ -31,7 +32,7 @@ public class GoodsInfo implements Serializable { String ensure; @SerializedName("class") String type; - int weight; + int weight;//权重 int click_count; int type_id; diff --git a/app/src/main/java/com/uiuios/aios/fragment/second/SecondPresenter.java b/app/src/main/java/com/uiuios/aios/fragment/second/SecondPresenter.java index ecce2a6..4c4f641 100644 --- a/app/src/main/java/com/uiuios/aios/fragment/second/SecondPresenter.java +++ b/app/src/main/java/com/uiuios/aios/fragment/second/SecondPresenter.java @@ -97,6 +97,7 @@ public class SecondPresenter implements SecondContact.Presenter { Log.e("getArticle", "onNext: " + listBaseResponse); ArticleList articleList = listBaseResponse.data; List articleInfoList = articleList.getData(); + articleInfoList.sort((o1, o2) -> Integer.compare(o2.getWeight(), o1.getWeight())); mView.setArticle(articleInfoList); } @@ -126,7 +127,9 @@ public class SecondPresenter implements SecondContact.Presenter { public void onNext(@NonNull BaseResponse> listBaseResponse) { Log.e("getLivenVideoList", "onNext: " + listBaseResponse); if (listBaseResponse.code == 200) { - mView.setLivenVideoList(listBaseResponse.data); + ArrayList videoInfoArrayList = listBaseResponse.data; + videoInfoArrayList.sort((o1, o2) -> Integer.compare(o2.getWeight(), o1.getWeight())); + mView.setLivenVideoList(videoInfoArrayList); } } @@ -155,7 +158,9 @@ public class SecondPresenter implements SecondContact.Presenter { public void onNext(@NonNull BaseResponse> listBaseResponse) { Log.e("getKnowledgeVideoList", "onNext: " + listBaseResponse); if (listBaseResponse.code == 200) { - mView.setKnowledgeVideoList(listBaseResponse.data); + ArrayList videoInfoArrayList = listBaseResponse.data; + videoInfoArrayList.sort((o1, o2) -> Integer.compare(o2.getWeight(), o1.getWeight())); + mView.setKnowledgeVideoList(videoInfoArrayList); } } diff --git a/app/src/main/java/com/uiuios/aios/network/UrlAddress.java b/app/src/main/java/com/uiuios/aios/network/UrlAddress.java index c0961f0..f46df4d 100644 --- a/app/src/main/java/com/uiuios/aios/network/UrlAddress.java +++ b/app/src/main/java/com/uiuios/aios/network/UrlAddress.java @@ -96,6 +96,6 @@ public class UrlAddress { /*知识视频列表*/ public static final String GET_KNOWLEDGE_VIDEO_LIST = "knowledgeVideo/getKnowledgeVideoList"; - public static final String geocoding = "geocoding/v3/"; + public static final String GEOCODING = "geocoding/v3/"; } diff --git a/app/src/main/java/com/uiuios/aios/network/api/amap/GeocodingApi.java b/app/src/main/java/com/uiuios/aios/network/api/amap/GeocodingApi.java index 28fb6f2..2e5c87b 100644 --- a/app/src/main/java/com/uiuios/aios/network/api/amap/GeocodingApi.java +++ b/app/src/main/java/com/uiuios/aios/network/api/amap/GeocodingApi.java @@ -8,7 +8,7 @@ import retrofit2.http.GET; import retrofit2.http.Query; public interface GeocodingApi { - @GET(UrlAddress.geocoding) + @GET(UrlAddress.GEOCODING) Observable geocoding( @Query("address") String address, @Query("output") String output,