From 58e1bd0804262507777917647e0c0aec6dc2eb93 Mon Sep 17 00:00:00 2001 From: litingting Date: Sat, 12 Oct 2024 18:39:45 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=95=B0=E6=8D=AE=E6=A0=B9?= =?UTF-8?q?=E6=8D=AEpageType=E5=8C=BA=E5=88=86=E9=A1=B5=E9=9D=A2=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=EF=BC=8C=E4=B8=93=E8=BE=91=E5=88=97=E8=A1=A8=E6=88=96?= =?UTF-8?q?=E8=80=85=E8=A7=86=E9=A2=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../music/player/adapter/AdapterCategory.java | 13 + .../player/adapter/AdapterCategoryList.java | 47 ++-- .../hi/music/player/api/RequestListener.java | 8 +- .../com/hi/music/player/helper/MyValue.java | 32 ++- .../response/child/ResponseCategory.java | 60 +++++ .../hi/music/player/network/JsonHelper.java | 229 +++++++++++++----- .../com/hi/music/player/network/MusicApi.java | 2 +- .../music/player/network/ObserverWrapper.java | 26 +- .../music/player/network/RetrofitManager.java | 2 +- .../ui/activity/CategoryListActivity.java | 10 +- .../player/ui/activity/PlayActivity.java | 32 ++- .../player/ui/activity/viewmodel/VMPlay.java | 16 +- .../music/player/ui/fragmnt/HomeFragment.java | 25 +- .../ui/fragmnt/viewmodel/VMCategoryList.java | 8 +- .../player/ui/fragmnt/viewmodel/VMHome.java | 16 +- .../res/layout/activity_category_list.xml | 3 + app/src/main/res/layout/activity_play.xml | 2 +- app/src/main/res/layout/item_category.xml | 5 +- .../main/res/layout/item_category_list.xml | 32 ++- 19 files changed, 432 insertions(+), 136 deletions(-) diff --git a/app/src/main/java/com/hi/music/player/adapter/AdapterCategory.java b/app/src/main/java/com/hi/music/player/adapter/AdapterCategory.java index 1ab7395..882040e 100644 --- a/app/src/main/java/com/hi/music/player/adapter/AdapterCategory.java +++ b/app/src/main/java/com/hi/music/player/adapter/AdapterCategory.java @@ -20,6 +20,7 @@ import com.hi.music.player.MusicApplication; import com.hi.music.player.R; import com.hi.music.player.databinding.ItemCategoryBinding; import com.hi.music.player.helper.CommonUtils; +import com.hi.music.player.helper.MyValue; import com.hi.music.player.javabean.response.child.ResponseCategory; public class AdapterCategory extends BaseAdapter{ @@ -37,6 +38,18 @@ public class AdapterCategory extends BaseAdapter itemHolder = (VHolder) holder; ItemCategoryBinding vb = itemHolder.getVb(); ResponseCategory responseCategory = data.get(position); + String pageType = responseCategory.getPageType(); + + if(pageType.equals(MyValue.PAGE_TYPE_MV)){ + ViewGroup.LayoutParams layoutParams = vb.header.getLayoutParams(); + layoutParams.width = CommonUtils.dpToPx(260); + vb.header.setLayoutParams(layoutParams); + }else { + ViewGroup.LayoutParams layoutParams = vb.header.getLayoutParams(); + layoutParams.width = CommonUtils.dpToPx(170); + vb.header.setLayoutParams(layoutParams); + } + Glide.with(MusicApplication.myApplication) .asDrawable() diff --git a/app/src/main/java/com/hi/music/player/adapter/AdapterCategoryList.java b/app/src/main/java/com/hi/music/player/adapter/AdapterCategoryList.java index 754333b..e5d62e3 100644 --- a/app/src/main/java/com/hi/music/player/adapter/AdapterCategoryList.java +++ b/app/src/main/java/com/hi/music/player/adapter/AdapterCategoryList.java @@ -44,25 +44,36 @@ public class AdapterCategoryList extends BaseAdapter() { - @Override - public boolean onLoadFailed(@Nullable GlideException e, @Nullable Object model, @NonNull Target target, boolean isFirstResource) { - CommonUtils.LogMsg(e.getMessage()); - return false; - } - @OptIn(markerClass = UnstableApi.class) - @Override - public boolean onResourceReady(@NonNull Drawable resource, @NonNull Object model, Target target, @NonNull DataSource dataSource, boolean isFirstResource) { - return false; - } - }) - .into(vb.image); + String smallCovert = child.getSmallCovert(); + if(smallCovert == null){ + vb.image.setVisibility(View.GONE); + vb.tvPosition.setVisibility(View.VISIBLE); + vb.tvPosition.setText(position); + }else { + vb.image.setVisibility(View.VISIBLE); + vb.tvPosition.setVisibility(View.GONE); + Glide.with(MusicApplication.myApplication) + .asDrawable() + .apply(RequestOptions.bitmapTransform(new RoundedCorners(CommonUtils.dpToPx(16)))) + .load(child.getSmallCovert()) + .placeholder(R.mipmap.ic_launcher) + .listener(new RequestListener() { + @Override + public boolean onLoadFailed(@Nullable GlideException e, @Nullable Object model, @NonNull Target target, boolean isFirstResource) { + CommonUtils.LogMsg(e.getMessage()); + return false; + } + + @OptIn(markerClass = UnstableApi.class) + @Override + public boolean onResourceReady(@NonNull Drawable resource, @NonNull Object model, Target target, @NonNull DataSource dataSource, boolean isFirstResource) { + return false; + } + }) + .into(vb.image); + } + vb.getRoot().setOnClickListener(new View.OnClickListener() { @Override diff --git a/app/src/main/java/com/hi/music/player/api/RequestListener.java b/app/src/main/java/com/hi/music/player/api/RequestListener.java index 8f452cb..14b687c 100644 --- a/app/src/main/java/com/hi/music/player/api/RequestListener.java +++ b/app/src/main/java/com/hi/music/player/api/RequestListener.java @@ -1,8 +1,12 @@ package com.hi.music.player.api; -public interface RequestListener { +import org.json.JSONObject; + +import okhttp3.ResponseBody; + +public interface RequestListener { void onFail(String errorMsg); - void onSuccess(T data) ; + void onSuccess(JSONObject data) ; } diff --git a/app/src/main/java/com/hi/music/player/helper/MyValue.java b/app/src/main/java/com/hi/music/player/helper/MyValue.java index 063e8ba..349ffc1 100644 --- a/app/src/main/java/com/hi/music/player/helper/MyValue.java +++ b/app/src/main/java/com/hi/music/player/helper/MyValue.java @@ -1,13 +1,40 @@ package com.hi.music.player.helper; public class MyValue { + + public static String PAGE_TYPE_MV="MUSIC_PAGE_TYPE_ARTIST"; + public static String PAGE_TYPE_LIST="MUSIC_PAGE_TYPE_PLAYLIST"; + public static String PAGE_TYPE_ALBUM="MUSIC_PAGE_TYPE_ALBUM"; + //-----------------------------PlayActivity + + + + /** + * 歌手单曲进入的数据key + */ public static String KEY_PLAY_ACTIVITY_SINGER = "click_singer"; + + /** + * 音乐列表进入的数据key和点击的列表位置key + */ public static String KEY_PLAY_ACTIVITY_CATEGORY_LIST = "click_category_list"; public static String KEY_PLAY_ACTIVITY_CATEGORY_LIST_INDEX = "click_category_list_index"; + + /** + * MV进入的数据key + */ + public static String KEY_PLAY_ACTIVITY_MV = "click_mv"; + + + + + + + //播放错误 public final static int PLAY_STATUS_CODE_ERROR = -1; @@ -23,15 +50,16 @@ public class MyValue { /** * 进入播放页面的来源 - * 0--单曲进入、 0--单曲进入、 0--音乐分类合集列表进入 + * 0--单曲进入、 1--音乐分类合集列表进入 2--视频mv进入 */ public static String KEY_ENTER_SOURCE = "ENTER_SOURCE"; public final static int TYPE_ENTER_SOURCE_SINGLE = 0; - public final static int TYPE_ENTER_SOURCE_CATEGORY = 1; + public final static int TYPE_ENTER_SOURCE_MV = 2; + //-----------------------------PlayActivity diff --git a/app/src/main/java/com/hi/music/player/javabean/response/child/ResponseCategory.java b/app/src/main/java/com/hi/music/player/javabean/response/child/ResponseCategory.java index d8d3a76..8acb93f 100644 --- a/app/src/main/java/com/hi/music/player/javabean/response/child/ResponseCategory.java +++ b/app/src/main/java/com/hi/music/player/javabean/response/child/ResponseCategory.java @@ -15,6 +15,66 @@ public class ResponseCategory implements Serializable { private String browseId; + private String videoId; + + private String playListId; + + private String params; + private String musicVideoType; + + + + /** + * 视频Mv + *MUSIC_PAGE_TYPE_USER_CHANNEL + * + * 音乐合集列表 + * MUSIC_PAGE_TYPE_PLAYLIST + * + * 专辑 + *MUSIC_PAGE_TYPE_ALBUM + */ + private String pageType; + + public String getParams() { + return params; + } + + public void setParams(String params) { + this.params = params; + } + + public String getMusicVideoType() { + return musicVideoType; + } + + public void setMusicVideoType(String musicVideoType) { + this.musicVideoType = musicVideoType; + } + + public String getPlayListId() { + return playListId; + } + + public void setPlayListId(String playListId) { + this.playListId = playListId; + } + + public String getVideoId() { + return videoId; + } + + public void setVideoId(String videoId) { + this.videoId = videoId; + } + + public String getPageType() { + return pageType; + } + + public void setPageType(String pageType) { + this.pageType = pageType; + } public String getBrowseId() { return browseId; diff --git a/app/src/main/java/com/hi/music/player/network/JsonHelper.java b/app/src/main/java/com/hi/music/player/network/JsonHelper.java index 57b0a1c..611f841 100644 --- a/app/src/main/java/com/hi/music/player/network/JsonHelper.java +++ b/app/src/main/java/com/hi/music/player/network/JsonHelper.java @@ -1,6 +1,7 @@ package com.hi.music.player.network; import com.hi.music.player.helper.CommonUtils; +import com.hi.music.player.helper.MyValue; import com.hi.music.player.javabean.response.ResponseCategoryList; import com.hi.music.player.javabean.response.ResponsePlayListInfo; import com.hi.music.player.javabean.response.ResponsePlayUrl; @@ -42,7 +43,7 @@ public class JsonHelper { } catch (JSONException exception) { - CommonUtils.LogMsg("----------exception="); + CommonUtils.LogMsg("---------首页-exception="); exception.printStackTrace(); } @@ -216,73 +217,72 @@ public class JsonHelper { //轻松愉悦的经典摇滚乐 String title = getJsonTitle(musicResponsiveHeaderRenderer.getJSONObject("title"), 0); - //Hold on to the feeling. - String description = getJsonTitle(musicResponsiveHeaderRenderer.getJSONObject("description") - .getJSONObject("musicDescriptionShelfRenderer") - .getJSONObject("description"), 0); + String description = ""; + //110 首歌曲.超过6小时 String secondSubtitle = getJsonTextNew(musicResponsiveHeaderRenderer.getJSONObject("secondSubtitle")); - CommonUtils.LogMsg("-------------title="+title+"--description="+description+"---secondSubtitle="+secondSubtitle+"---covert="+covert); + if(musicResponsiveHeaderRenderer.has("description")){ + //-----------------单曲合集类型 + //Hold on to the feeling. + description = getJsonTitle(musicResponsiveHeaderRenderer.getJSONObject("description") + .getJSONObject("musicDescriptionShelfRenderer") + .getJSONObject("description"), 0); + } + if(musicResponsiveHeaderRenderer.has("subtitle")){ + //-----------------专辑类型 + //专辑.1998 + description = getJsonTextNew(musicResponsiveHeaderRenderer.getJSONObject("subtitle")); + } - JSONArray jsonArray = jsonObject1.getJSONObject("secondaryContents") - .getJSONObject("sectionListRenderer") - .getJSONArray("contents") - .getJSONObject(0) - .getJSONObject("musicPlaylistShelfRenderer") - .getJSONArray("contents"); responseCategoryList.setCovert(covert); responseCategoryList.setDescription(description); responseCategoryList.setTitle(title); responseCategoryList.setSecondSubtitle(secondSubtitle); + + CommonUtils.LogMsg("-------------title="+title+"--description="+description+"---secondSubtitle="+secondSubtitle+"---covert="+covert); + + JSONObject contentsArray = jsonObject1.getJSONObject("secondaryContents") + .getJSONObject("sectionListRenderer") + .getJSONArray("contents") + .getJSONObject(0); List mList = new ArrayList<>(); - for(int i = 0;i getCategoryList(@Body RequestBody requestBody); diff --git a/app/src/main/java/com/hi/music/player/network/ObserverWrapper.java b/app/src/main/java/com/hi/music/player/network/ObserverWrapper.java index e61d911..a167e23 100644 --- a/app/src/main/java/com/hi/music/player/network/ObserverWrapper.java +++ b/app/src/main/java/com/hi/music/player/network/ObserverWrapper.java @@ -3,8 +3,12 @@ package com.hi.music.player.network; import com.hi.music.player.api.RequestListener; import com.hi.music.player.helper.CommonUtils; +import org.json.JSONException; +import org.json.JSONObject; + import io.reactivex.Observer; import io.reactivex.disposables.Disposable; +import okhttp3.ResponseBody; public class ObserverWrapper implements Observer { private RequestListener requestListener; @@ -20,13 +24,31 @@ public class ObserverWrapper implements Observer { @Override public void onNext(T t) { + ResponseBody responseBody = (ResponseBody) t; + JSONObject jsonObject = CommonUtils.toJsonObject(responseBody); + try { + if (jsonObject != null) { + if (jsonObject.has("playabilityStatus")) { + String status = jsonObject.getJSONObject("playabilityStatus").getString("status"); + if (!status.equals("OK")) { + requestListener.onFail(""); + return; + } + + } + requestListener.onSuccess(jsonObject); + } + + } catch (JSONException e) { + requestListener.onFail(e.getMessage()); + } + - requestListener.onSuccess(t); } @Override public void onError(Throwable e) { - CommonUtils.LogMsg("----------onError---"+e.getMessage()); + CommonUtils.LogMsg("----------onError---" + e.getMessage()); requestListener.onFail(e.getMessage()); } diff --git a/app/src/main/java/com/hi/music/player/network/RetrofitManager.java b/app/src/main/java/com/hi/music/player/network/RetrofitManager.java index 17348c5..3adf3ba 100644 --- a/app/src/main/java/com/hi/music/player/network/RetrofitManager.java +++ b/app/src/main/java/com/hi/music/player/network/RetrofitManager.java @@ -46,7 +46,7 @@ public class RetrofitManager { // } private synchronized Retrofit getRetrofit() { if (retrofit == null) { - long DEFAULT_TIMEOUT = 10; + long DEFAULT_TIMEOUT = 5; HttpLoggingInterceptor httpLoggingInterceptor = new HttpLoggingInterceptor(); httpLoggingInterceptor.setLevel(HttpLoggingInterceptor.Level.BODY); OkHttpClient client = new OkHttpClient.Builder() diff --git a/app/src/main/java/com/hi/music/player/ui/activity/CategoryListActivity.java b/app/src/main/java/com/hi/music/player/ui/activity/CategoryListActivity.java index cea5e6f..64baad0 100644 --- a/app/src/main/java/com/hi/music/player/ui/activity/CategoryListActivity.java +++ b/app/src/main/java/com/hi/music/player/ui/activity/CategoryListActivity.java @@ -45,6 +45,10 @@ import java.io.Serializable; import jp.wasabeef.glide.transformations.BlurTransformation; + +/** + * 音乐合集或者专辑列表页面 + */ public class CategoryListActivity extends BaseActivity implements HomeItemClickListener { @@ -52,6 +56,7 @@ public class CategoryListActivity extends BaseActivity() { @@ -131,7 +138,6 @@ public class CategoryListActivity extends BaseActivity implements S //-------单曲进入播放列表接口请求需要的参数 - private String playlistId, videoId, params, musicVideoType; + private String playlistId, videoId, params, musicVideoType = ""; //-------单曲进入播放列表接口请求需要的参数 private int mDefaultPlayStartIndex = 0; @@ -114,7 +113,7 @@ public class PlayActivity extends BaseActivity implements S videoId = responseSingle.getVideoId(); params = responseSingle.getParams(); musicVideoType = responseSingle.getMusicVideoType(); - vmPlay.getPlayMusicList(playlistId,videoId,params,musicVideoType); + vmPlay.getPlayMusicList(playlistId, videoId, params, musicVideoType); vmPlay.playList.observe(this, new Observer>() { @Override public void onChanged(List listInfos) { @@ -124,9 +123,24 @@ public class PlayActivity extends BaseActivity implements S break; case MyValue.TYPE_ENTER_SOURCE_CATEGORY: ResponsePlayListInfo playListInfo = (ResponsePlayListInfo) intent.getSerializableExtra(MyValue.KEY_PLAY_ACTIVITY_CATEGORY_LIST); - mDefaultPlayStartIndex = intent.getIntExtra(MyValue.KEY_PLAY_ACTIVITY_CATEGORY_LIST_INDEX,mDefaultPlayStartIndex); + mDefaultPlayStartIndex = intent.getIntExtra(MyValue.KEY_PLAY_ACTIVITY_CATEGORY_LIST_INDEX, mDefaultPlayStartIndex); videoId = playListInfo.getVideoId(); - CommonUtils.LogMsg("--------更新---videoId="+videoId); + CommonUtils.LogMsg("--------更新---videoId=" + videoId); + break; + + case MyValue.TYPE_ENTER_SOURCE_MV: + ResponseCategory responseCategory = (ResponseCategory) intent.getSerializableExtra(MyValue.KEY_PLAY_ACTIVITY_MV); + videoId = responseCategory.getVideoId(); + playlistId = responseCategory.getPlayListId(); + params = responseCategory.getParams(); + musicVideoType = responseCategory.getMusicVideoType(); + vmPlay.getPlayMusicList(playlistId, videoId, params, musicVideoType); + vmPlay.playList.observe(this, new Observer>() { + @Override + public void onChanged(List listInfos) { + vmApplication.reSetPlayList(listInfos); + } + }); break; } @@ -143,7 +157,7 @@ public class PlayActivity extends BaseActivity implements S vb.linearRetry.setVisibility(View.VISIBLE); return; } - CommonUtils.LogMsg("--------更新-playList " + playList.size()+"--videoId="+videoId); + CommonUtils.LogMsg("--------更新-playList " + playList.size() + "--videoId=" + videoId); if (playList.size() > 0) { mPlayList = playList; musicInfo = playList.get(0); @@ -445,9 +459,9 @@ public class PlayActivity extends BaseActivity implements S //重试按钮 vb.linearRetry.setVisibility(View.GONE); if (netError == 0) { - switch (mEnterType){ + switch (mEnterType) { case MyValue.TYPE_ENTER_SOURCE_SINGLE: - vmPlay.getPlayMusicList(playlistId,videoId,params,musicVideoType); + vmPlay.getPlayMusicList(playlistId, videoId, params, musicVideoType); break; } diff --git a/app/src/main/java/com/hi/music/player/ui/activity/viewmodel/VMPlay.java b/app/src/main/java/com/hi/music/player/ui/activity/viewmodel/VMPlay.java index 5c84b04..7d3b6bc 100644 --- a/app/src/main/java/com/hi/music/player/ui/activity/viewmodel/VMPlay.java +++ b/app/src/main/java/com/hi/music/player/ui/activity/viewmodel/VMPlay.java @@ -42,10 +42,10 @@ public class VMPlay extends ViewModel { } @Override - public void onSuccess(ResponseBody data) { - JSONObject jsonObject = CommonUtils.toJsonObject(data); - if (jsonObject != null) { - List responsePlayListInfos = JsonHelper.ResolvePlayListJson(jsonObject); + public void onSuccess(JSONObject data) { +// JSONObject jsonObject = CommonUtils.toJsonObject(data); + if (data != null) { + List responsePlayListInfos = JsonHelper.ResolvePlayListJson(data); _playList.setValue(responsePlayListInfos); } else { _playList.setValue(null); @@ -68,10 +68,10 @@ public class VMPlay extends ViewModel { } @Override - public void onSuccess(ResponseBody data) { - JSONObject jsonObject = CommonUtils.toJsonObject(data); - if (jsonObject != null) { - ResponsePlayUrl responsePlayUrl = JsonHelper.ResolvePlayUrlJson(jsonObject); + public void onSuccess(JSONObject data) { +// JSONObject jsonObject = CommonUtils.toJsonObject(data); + if (data != null) { + ResponsePlayUrl responsePlayUrl = JsonHelper.ResolvePlayUrlJson(data); if(responsePlayUrl == null){ // TODO: 2024/9/27 return; diff --git a/app/src/main/java/com/hi/music/player/ui/fragmnt/HomeFragment.java b/app/src/main/java/com/hi/music/player/ui/fragmnt/HomeFragment.java index a1b520c..76d100b 100644 --- a/app/src/main/java/com/hi/music/player/ui/fragmnt/HomeFragment.java +++ b/app/src/main/java/com/hi/music/player/ui/fragmnt/HomeFragment.java @@ -69,8 +69,12 @@ public class HomeFragment extends BaseFragment implements H vmHome.data.observe(getViewLifecycleOwner(), new Observer() { @Override public void onChanged(ResponseHome responseHome) { - if(responseHome == null)return; + if(responseHome == null){ + requestCount--; + return; + } List childList1 = responseHome.getChildList(); + if(childList1 == null) return; childList.addAll(childList1); adapterHome.removeLoadingFooter(); adapterHome.addData(childList1); @@ -90,8 +94,9 @@ public class HomeFragment extends BaseFragment implements H CommonUtils.LogMsg("------loadmore--"); adapterHome.addLoadingFooter(); vmHome.getHomeMore(); + requestCount++; } - requestCount++; + } } }); @@ -113,9 +118,19 @@ public class HomeFragment extends BaseFragment implements H public void onClickItemCategory(ResponseCategory data) { FragmentActivity activity = getActivity(); if(activity!= null){ - Intent intent = new Intent(activity, CategoryListActivity.class); - intent.putExtra(MyValue.KEY_PLAY_ACTIVITY_CATEGORY, data); - startActivity(intent); + String pageType = data.getPageType(); + if(pageType.equals(MyValue.PAGE_TYPE_MV)){ + Intent intent = new Intent(activity, PlayActivity.class); + intent.putExtra(MyValue.KEY_PLAY_ACTIVITY_MV, data); + intent.putExtra(MyValue.KEY_ENTER_SOURCE, MyValue.TYPE_ENTER_SOURCE_MV); + startActivity(intent); + }else { + Intent intent = new Intent(activity, CategoryListActivity.class); + intent.putExtra(MyValue.KEY_PLAY_ACTIVITY_CATEGORY, data); + startActivity(intent); + } + + } } } diff --git a/app/src/main/java/com/hi/music/player/ui/fragmnt/viewmodel/VMCategoryList.java b/app/src/main/java/com/hi/music/player/ui/fragmnt/viewmodel/VMCategoryList.java index 345adec..ada6386 100644 --- a/app/src/main/java/com/hi/music/player/ui/fragmnt/viewmodel/VMCategoryList.java +++ b/app/src/main/java/com/hi/music/player/ui/fragmnt/viewmodel/VMCategoryList.java @@ -30,10 +30,10 @@ public class VMCategoryList extends ViewModel { } @Override - public void onSuccess(ResponseBody data) { - JSONObject jsonObject = CommonUtils.toJsonObject(data); - if (jsonObject != null) { - ResponseCategoryList responseCategoryList = JsonHelper.ResolveCategoryList(jsonObject); + public void onSuccess(JSONObject data) { +// JSONObject jsonObject = CommonUtils.toJsonObject(data); + if (data != null) { + ResponseCategoryList responseCategoryList = JsonHelper.ResolveCategoryList(data); _data.setValue(responseCategoryList); } } diff --git a/app/src/main/java/com/hi/music/player/ui/fragmnt/viewmodel/VMHome.java b/app/src/main/java/com/hi/music/player/ui/fragmnt/viewmodel/VMHome.java index 459bcd3..f849e38 100644 --- a/app/src/main/java/com/hi/music/player/ui/fragmnt/viewmodel/VMHome.java +++ b/app/src/main/java/com/hi/music/player/ui/fragmnt/viewmodel/VMHome.java @@ -31,10 +31,10 @@ public class VMHome extends ViewModel { } @Override - public void onSuccess(ResponseBody data) { - JSONObject jsonObject = CommonUtils.toJsonObject(data); - if (jsonObject != null) { - ResponseHome responseHome = JsonHelper.ResolveHomeJson(jsonObject); + public void onSuccess(JSONObject data) { +// JSONObject jsonObject = CommonUtils.toJsonObject(data); + if (data != null) { + ResponseHome responseHome = JsonHelper.ResolveHomeJson(data); continuation = responseHome.getContinuation(); clickTrackingParams = responseHome.getClickTrackingParams(); @@ -58,10 +58,10 @@ public class VMHome extends ViewModel { } @Override - public void onSuccess(ResponseBody data) { - JSONObject jsonObject = CommonUtils.toJsonObject(data); - if (jsonObject != null) { - ResponseHome responseHome = JsonHelper.ResolveHomeMoreJson(jsonObject); + public void onSuccess(JSONObject data) { +// JSONObject jsonObject = CommonUtils.toJsonObject(data); + if (data != null) { + ResponseHome responseHome = JsonHelper.ResolveHomeMoreJson(data); continuation = responseHome.getContinuation(); clickTrackingParams = responseHome.getClickTrackingParams(); diff --git a/app/src/main/res/layout/activity_category_list.xml b/app/src/main/res/layout/activity_category_list.xml index 2cb82fe..d0ffa03 100644 --- a/app/src/main/res/layout/activity_category_list.xml +++ b/app/src/main/res/layout/activity_category_list.xml @@ -74,6 +74,9 @@ android:layout_below="@id/tvTitle" android:layout_centerHorizontal="true" android:layout_marginTop="5dp" + android:layout_marginStart="20dp" + android:layout_marginEnd="20dp" + android:gravity="center" android:textColor="@color/white" android:textSize="14sp" /> diff --git a/app/src/main/res/layout/activity_play.xml b/app/src/main/res/layout/activity_play.xml index 71f312e..1fa6ba3 100644 --- a/app/src/main/res/layout/activity_play.xml +++ b/app/src/main/res/layout/activity_play.xml @@ -31,7 +31,7 @@ android:layout_marginStart="40dp" android:layout_marginTop="30dp" android:layout_marginEnd="40dp" - android:scaleType="fitXY" + android:scaleType="fitCenter" android:src="@mipmap/ic_launcher" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" diff --git a/app/src/main/res/layout/item_category.xml b/app/src/main/res/layout/item_category.xml index 5bdd1cc..a8971ea 100644 --- a/app/src/main/res/layout/item_category.xml +++ b/app/src/main/res/layout/item_category.xml @@ -9,9 +9,8 @@ - + + + + + + + android:textSize="15sp" />