Merge branch 'master' of bj.gitlab.cnlive.com:cnlive-team/CNLiveApp

Conflicts: app/src/main/java/com/cnlive/gundam/main/application/CNLiveApplication.java

Merge branch 'master' of bj.gitlab.cnlive.com:cnlive-team/CNLiveApp
Conflicts: app/src/main/java/com/cnlive/gundam/main/application/CNLiveApplication.java
朱显松
2 parents 01643e3d 15f895b0
Showing 4 changed files with 5 additions and 12 deletions
app/src/main/java/com/cnlive/gundam/main/model/ActivePlayInfo.java
app/src/main/java/com/cnlive/gundam/main/network/ApiService.java
app/src/main/java/com/cnlive/gundam/main/ui/fragment/HomeFragment.java
app/src/main/java/com/cnlive/gundam/main/utils/ActivityJumpUtil.java
@@ -35,7 +35,6 @@ public class ActivePlayInfo extends ErrorMessage {
         private String endTime;
         private String coverImgUrl;
         private String activityCategory;
-        private String extensions;
         private String rates;
         private String extViews;
@@ -122,14 +121,6 @@ public class ActivePlayInfo extends ErrorMessage {
             this.activityCategory = activityCategory;
         }
-        public String getExtensions() {
-            return extensions;
-        }
-
-        public void setExtensions(String extensions) {
-            this.extensions = extensions;
-        }
-
         public String getRates() {
             return rates;
         }
@@ -159,7 +150,6 @@ public class ActivePlayInfo extends ErrorMessage {
                     ", endTime='" + endTime + '\'' +
                     ", coverImgUrl='" + coverImgUrl + '\'' +
                     ", activityCategory='" + activityCategory + '\'' +
-                    ", extensions='" + extensions + '\'' +
                     ", rates='" + rates + '\'' +
                     ", extViews='" + extViews + '\'' +
                     '}';
@@ -9,6 +9,7 @@ import java.util.Map;
 import retrofit2.Call;
 import retrofit2.http.GET;
+import retrofit2.http.POST;
 import retrofit2.http.QueryMap;
 /**
@@ -26,7 +27,7 @@ public interface ApiService {
     Call<ActivePlayInfo> getActivityPlayInfo(@QueryMap Map<String, String> options);
     //判断活动的状态
-    @GET("vod_epg/getVodInfo4App")
+    @POST("vod_epg/getVodListInfo4App")
     Call<VodListPage> getVodInfoList(@QueryMap Map<String, String> options);
     //主播信息接口
@@ -94,7 +94,7 @@ public class HomeFragment extends Fragment implements SwipeRefreshLayout.OnRefre
         if (response.isSuccessful()) {
             VodListPage model = response.body();
             if (model != null && "0".equals(model.getCode())) {
-                if (model.getData() == null) {
+                if (model.getData() == null || model.getData().size() <= 0) {
                     Toast.makeText(getActivity(), getString(R.string.request_null), Toast.LENGTH_LONG).show();
                 } else {
                     adapter.updateItems(model.getData());
@@ -2,6 +2,7 @@ package com.cnlive.gundam.main.utils;
 import android.content.Context;
 import android.content.Intent;
+import android.util.Log;
 import android.widget.Toast;
 import com.cnlive.gundam.R;
@@ -49,6 +50,7 @@ public class ActivityJumpUtil {
             @Override
             public void onFailure(Call<ActivePlayInfo> call, Throwable t) {
+                Log.e("11111111111111", "onFailure: "+call.request().toString() );
                 Toast.makeText(context, context.getString(R.string.request_state_error), Toast.LENGTH_LONG).show();
             }
         });