fix bug

iMeiji · May 27, 2017 · 0f123ef · 0f123ef
1 parent 4a64244
commit 0f123ef
Show file tree

Hide file tree

Showing 10 changed files with 104 additions and 81 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -17,7 +17,7 @@ android {
         minSdkVersion 16
         targetSdkVersion 25
         versionCode 2
-        versionName "1.2.5"
+        versionName "1.2.5.1"
         multiDexEnabled true
         vectorDrawables.useSupportLibrary = true
     }

diff --git a/app/src/main/java/com/meiji/toutiao/adapter/wenda/WendaArticleAdapter.java b/app/src/main/java/com/meiji/toutiao/adapter/wenda/WendaArticleAdapter.java
@@ -92,79 +92,84 @@ public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType
     @Override
     public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) {
 
-        if (holder instanceof ThreeImageViewHolder) {
-            ThreeImageViewHolder viewHolder = (ThreeImageViewHolder) holder;
-            WendaArticleDataBean bean = list.get(position);
-
-            if (!SettingsUtil.getInstance().getIsNoPhotoMode()) {
-
-                int size = bean.getExtraBean().getWenda_image().getThree_image_list().size();
-                String[] ivs = new String[size];
-                for (int i = 0; i < size; i++) {
-                    ivs[i] = bean.getExtraBean().getWenda_image().getThree_image_list().get(i).getUrl();
-                }
-                switch (ivs.length) {
-                    case 1:
-                        Glide.with(context).load(ivs[0]).crossFade().centerCrop().into(viewHolder.iv_0);
-                        break;
-                    case 2:
-                        Glide.with(context).load(ivs[0]).crossFade().centerCrop().into(viewHolder.iv_0);
-                        Glide.with(context).load(ivs[1]).crossFade().centerCrop().into(viewHolder.iv_1);
-                        break;
-                    case 3:
-                        Glide.with(context).load(ivs[0]).crossFade().centerCrop().into(viewHolder.iv_0);
-                        Glide.with(context).load(ivs[1]).crossFade().centerCrop().into(viewHolder.iv_1);
-                        Glide.with(context).load(ivs[2]).crossFade().centerCrop().into(viewHolder.iv_2);
-                        break;
+        try {
+
+            if (holder instanceof ThreeImageViewHolder) {
+                ThreeImageViewHolder viewHolder = (ThreeImageViewHolder) holder;
+                WendaArticleDataBean bean = list.get(position);
+
+                if (!SettingsUtil.getInstance().getIsNoPhotoMode()) {
+
+                    int size = bean.getExtraBean().getWenda_image().getThree_image_list().size();
+                    String[] ivs = new String[size];
+                    for (int i = 0; i < size; i++) {
+                        ivs[i] = bean.getExtraBean().getWenda_image().getThree_image_list().get(i).getUrl();
+                    }
+                    switch (ivs.length) {
+                        case 1:
+                            Glide.with(context).load(ivs[0]).crossFade().centerCrop().into(viewHolder.iv_0);
+                            break;
+                        case 2:
+                            Glide.with(context).load(ivs[0]).crossFade().centerCrop().into(viewHolder.iv_0);
+                            Glide.with(context).load(ivs[1]).crossFade().centerCrop().into(viewHolder.iv_1);
+                            break;
+                        case 3:
+                            Glide.with(context).load(ivs[0]).crossFade().centerCrop().into(viewHolder.iv_0);
+                            Glide.with(context).load(ivs[1]).crossFade().centerCrop().into(viewHolder.iv_1);
+                            Glide.with(context).load(ivs[2]).crossFade().centerCrop().into(viewHolder.iv_2);
+                            break;
+                    }
                 }
-            }
 
-            String tv_title = bean.getQuestionBean().getTitle();
-            String tv_answer_count = bean.getQuestionBean().getNormal_ans_count() + "回答";
-            String tv_datetime = bean.getQuestionBean().getCreate_time() + "";
-            if (!TextUtils.isEmpty(tv_datetime)) {
-                tv_datetime = TimeUtil.getTimeStampAgo(tv_datetime);
+                String tv_title = bean.getQuestionBean().getTitle();
+                String tv_answer_count = bean.getQuestionBean().getNormal_ans_count() + "回答";
+                String tv_datetime = bean.getQuestionBean().getCreate_time() + "";
+                if (!TextUtils.isEmpty(tv_datetime)) {
+                    tv_datetime = TimeUtil.getTimeStampAgo(tv_datetime);
+                }
+                viewHolder.tv_title.setText(tv_title);
+                viewHolder.tv_answer_count.setText(tv_answer_count);
+                viewHolder.tv_time.setText(tv_datetime);
             }
-            viewHolder.tv_title.setText(tv_title);
-            viewHolder.tv_answer_count.setText(tv_answer_count);
-            viewHolder.tv_time.setText(tv_datetime);
-        }
 
-        if (holder instanceof LargeImageViewHolder) {
-            LargeImageViewHolder viewHolder = (LargeImageViewHolder) holder;
-            WendaArticleDataBean bean = list.get(position);
+            if (holder instanceof LargeImageViewHolder) {
+                LargeImageViewHolder viewHolder = (LargeImageViewHolder) holder;
+                WendaArticleDataBean bean = list.get(position);
 
-            if (!SettingsUtil.getInstance().getIsNoPhotoMode()) {
-                String url = bean.getExtraBean().getWenda_image().getLarge_image_list().get(0).getUrl();
-                Glide.with(context).load(url).crossFade().centerCrop().into(viewHolder.iv_image_big);
-            }
+                if (!SettingsUtil.getInstance().getIsNoPhotoMode()) {
+                    String url = bean.getExtraBean().getWenda_image().getLarge_image_list().get(0).getUrl();
+                    Glide.with(context).load(url).crossFade().centerCrop().into(viewHolder.iv_image_big);
+                }
 
-            String tv_title = bean.getQuestionBean().getTitle();
-            String tv_answer_count = bean.getQuestionBean().getNormal_ans_count() + "回答";
-            String tv_datetime = bean.getQuestionBean().getCreate_time() + "";
-            if (!TextUtils.isEmpty(tv_datetime)) {
-                tv_datetime = TimeUtil.getTimeStampAgo(tv_datetime);
+                String tv_title = bean.getQuestionBean().getTitle();
+                String tv_answer_count = bean.getQuestionBean().getNormal_ans_count() + "回答";
+                String tv_datetime = bean.getQuestionBean().getCreate_time() + "";
+                if (!TextUtils.isEmpty(tv_datetime)) {
+                    tv_datetime = TimeUtil.getTimeStampAgo(tv_datetime);
+                }
+                viewHolder.tv_title.setText(tv_title);
+                viewHolder.tv_answer_count.setText(tv_answer_count);
+                viewHolder.tv_time.setText(tv_datetime);
             }
-            viewHolder.tv_title.setText(tv_title);
-            viewHolder.tv_answer_count.setText(tv_answer_count);
-            viewHolder.tv_time.setText(tv_datetime);
-        }
 
-        if (holder instanceof NoImageViewHolder) {
-            NoImageViewHolder viewHolder = (NoImageViewHolder) holder;
-            WendaArticleDataBean bean = list.get(position);
+            if (holder instanceof NoImageViewHolder) {
+                NoImageViewHolder viewHolder = (NoImageViewHolder) holder;
+                WendaArticleDataBean bean = list.get(position);
 
-            String tv_title = bean.getQuestionBean().getTitle();
-            String tv_answer_count = bean.getQuestionBean().getNormal_ans_count() + "回答";
-            String tv_datetime = bean.getQuestionBean().getCreate_time() + "";
-            if (!TextUtils.isEmpty(tv_datetime)) {
-                tv_datetime = TimeUtil.getTimeStampAgo(tv_datetime);
+                String tv_title = bean.getQuestionBean().getTitle();
+                String tv_answer_count = bean.getQuestionBean().getNormal_ans_count() + "回答";
+                String tv_datetime = bean.getQuestionBean().getCreate_time() + "";
+                if (!TextUtils.isEmpty(tv_datetime)) {
+                    tv_datetime = TimeUtil.getTimeStampAgo(tv_datetime);
+                }
+                String tv_content = bean.getAnswerBean().getAbstractX();
+                viewHolder.tv_title.setText(tv_title);
+                viewHolder.tv_answer_count.setText(tv_answer_count);
+                viewHolder.tv_time.setText(tv_datetime);
+                viewHolder.tv_content.setText(tv_content);
             }
-            String tv_content = bean.getAnswerBean().getAbstractX();
-            viewHolder.tv_title.setText(tv_title);
-            viewHolder.tv_answer_count.setText(tv_answer_count);
-            viewHolder.tv_time.setText(tv_datetime);
-            viewHolder.tv_content.setText(tv_content);
+        } catch (Exception e) {
+
         }
     }
 

diff --git a/app/src/main/java/com/meiji/toutiao/api/IMobileNewsApi.java b/app/src/main/java/com/meiji/toutiao/api/IMobileNewsApi.java
@@ -7,7 +7,6 @@
 import okhttp3.ResponseBody;
 import retrofit2.Call;
 import retrofit2.http.GET;
-import retrofit2.http.POST;
 import retrofit2.http.Query;
 
 /**
@@ -29,19 +28,21 @@ public interface IMobileNewsApi {
      * @param deviceId 设备ID
      * @param category 新闻/图片/视频栏目
      */
-    @POST("http://is.snssdk.com/api/news/feed/v53/")
+    @GET("http://is.snssdk.com/api/news/feed/v53/")
     Call<ResponseBody> getNewsArticle(
             @Query("iid") String iid,
             @Query("device_id") String deviceId,
             @Query("category") String category);
 
-    @POST("http://is.snssdk.com/api/news/feed/v53/")
+    @GET("http://is.snssdk.com/api/news/feed/v53/?iid=10344168417&device_id=36394312781&refer=1&count=20")
     Observable<MultiNewsArticleBean> getNewsArticle(
-            @Query("category") String category);
+            @Query("category") String category,
+            @Query("max_behot_time") int maxBehotTime);
 
-    @POST("http://lf.snssdk.com/api/news/feed/v53/?iid=10247804300&device_id=36328180756")
+    @GET("http://lf.snssdk.com/api/news/feed/v53/?iid=10247804300&device_id=36328180756")
     Observable<MultiNewsArticleBean> getNewsArticle2(
-            @Query("category") String category);
+            @Query("category") String category,
+            @Query("max_behot_time") int maxBehotTime);
 
     /**
      * 获取新闻评论

diff --git a/app/src/main/java/com/meiji/toutiao/bean/news/MultiNewsArticleDataBean.java b/app/src/main/java/com/meiji/toutiao/bean/news/MultiNewsArticleDataBean.java
@@ -118,7 +118,7 @@ public class MultiNewsArticleDataBean {
     private int video_style;
     private String verified_content;
     private String display_url;
-    private boolean is_stick;
+    //    private boolean is_stick;
     private long item_id;
     private boolean is_subject;
     private int stick_style;
@@ -472,13 +472,13 @@ public void setDisplay_url(String display_url) {
         this.display_url = display_url;
     }
 
-    public boolean is_stick() {
-        return is_stick;
-    }
+//    public boolean is_stick() {
+//        return is_stick;
+//    }
 
-    public void setIs_stick(boolean is_stick) {
-        this.is_stick = is_stick;
-    }
+//    public void setIs_stick(boolean is_stick) {
+//        this.is_stick = is_stick;
+//    }
 
     public long getItem_id() {
         return item_id;

diff --git a/app/src/main/java/com/meiji/toutiao/database/DatabaseHelper.java b/app/src/main/java/com/meiji/toutiao/database/DatabaseHelper.java
@@ -1,5 +1,6 @@
 package com.meiji.toutiao.database;
 
+import android.content.ContentValues;
 import android.content.Context;
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteOpenHelper;
@@ -15,7 +16,7 @@
 public class DatabaseHelper extends SQLiteOpenHelper {
 
     private static final String DB_NAME = "Toutiao";
-    private static final int DB_VERSION = 3;
+    private static final int DB_VERSION = 4;
     private static final String CLEAR_TABLE_DATA = "delete from ";
     private static final String DROP_TABLE = "drop table if exists ";
     private static DatabaseHelper instance = null;
@@ -60,6 +61,13 @@ public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
             case 2:
                 db.execSQL(CLEAR_TABLE_DATA + NewsChannelTable.TABLENAME);
                 break;
+            case 3:
+                ContentValues values = new ContentValues();
+                values.put(NewsChannelTable.ID, "");
+                values.put(NewsChannelTable.NAME, "推荐");
+                values.put(NewsChannelTable.IS_ENABLE, 0);
+                values.put(NewsChannelTable.POSITION, 46);
+                db.insert(NewsChannelTable.TABLENAME, null, values);
         }
     }
 }
diff --git a/app/src/main/java/com/meiji/toutiao/module/news/multi/MultiNewsArticlePresenter.java b/app/src/main/java/com/meiji/toutiao/module/news/multi/MultiNewsArticlePresenter.java
@@ -16,6 +16,7 @@
 import com.meiji.toutiao.utils.NetWorkUtil;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.Random;
 
@@ -43,6 +44,7 @@ public class MultiNewsArticlePresenter implements IMultiNewsArticle.Presenter {
 
     MultiNewsArticlePresenter(IMultiNewsArticle.View view) {
         this.view = view;
+        this.time = (int) (new Date(System.currentTimeMillis()).getTime() / 1000);
     }
 
     private int getRandom() {
@@ -74,9 +76,9 @@ public void doLoadData(String... category) {
         }
 
         Observable<MultiNewsArticleBean> ob1 = RetrofitFactory.getRetrofit().create(IMobileNewsApi.class)
-                .getNewsArticle(this.category);
+                .getNewsArticle(this.category, this.time);
         Observable<MultiNewsArticleBean> ob2 = RetrofitFactory.getRetrofit().create(IMobileNewsApi.class)
-                .getNewsArticle2(this.category);
+                .getNewsArticle2(this.category, this.time);
 
         Observable.merge(ob1, ob2)
                 .subscribeOn(Schedulers.io())
@@ -94,6 +96,7 @@ public Observable<MultiNewsArticleDataBean> apply(@NonNull MultiNewsArticleBean
                 .filter(new Predicate<MultiNewsArticleDataBean>() {
                     @Override
                     public boolean test(@NonNull MultiNewsArticleDataBean multiNewsArticleDataBean) throws Exception {
+                        time = multiNewsArticleDataBean.getBehot_time();
                         if (TextUtils.isEmpty(multiNewsArticleDataBean.getSource())) {
                             return false;
                         }

diff --git a/app/src/main/java/com/meiji/toutiao/module/photo/article/PhotoArticlePresenter.java b/app/src/main/java/com/meiji/toutiao/module/photo/article/PhotoArticlePresenter.java
@@ -6,6 +6,7 @@
 import com.meiji.toutiao.module.photo.content.PhotoContentActivity;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 import io.reactivex.Observable;
@@ -31,6 +32,7 @@ class PhotoArticlePresenter implements IPhotoArticle.Presenter {
 
     PhotoArticlePresenter(IPhotoArticle.View view) {
         this.view = view;
+        this.time = (int) (new Date(System.currentTimeMillis()).getTime() / 1000);
     }
 
     @Override

diff --git a/app/src/main/java/com/meiji/toutiao/module/video/article/VideoArticlePresenter.java b/app/src/main/java/com/meiji/toutiao/module/video/article/VideoArticlePresenter.java
@@ -9,6 +9,7 @@
 import com.meiji.toutiao.module.video.content.VideoContentActivity;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 import io.reactivex.Observable;
@@ -34,6 +35,7 @@ public class VideoArticlePresenter implements IVideoArticle.Presenter {
 
     VideoArticlePresenter(IVideoArticle.View view) {
         this.view = view;
+        this.time = (int) (new Date(System.currentTimeMillis()).getTime() / 1000);
     }
 
     @Override

diff --git a/app/src/main/res/values/mobile_news_category.xml b/app/src/main/res/values/mobile_news_category.xml
@@ -3,6 +3,7 @@
 
     <!--需要单独处理的 视频 / 段子 / 问答 -->
     <string-array name="mobile_news_name">
+        <item>推荐</item>
         <item>热点</item>
         <item>视频</item>
         <item>社会</item>
@@ -60,6 +61,7 @@
     </string-array>
 
     <string-array name="mobile_news_id">
+        <item> </item>
         <item>news_hot</item>
         <item>video</item>
         <item>news_society</item>

diff --git a/app/src/main/res/values/video_category.xml b/app/src/main/res/values/video_category.xml
@@ -17,7 +17,7 @@
         <item>subv_voice</item>
         <item>subv_society</item>
         <item>subv_comedy</item>
-        <item>subv_haoshengyin</item>
+        <item>中国新唱将</item>
         <item>subv_entertainment</item>
     </string-array>