Update to fit the new api base url.

houston563 · Feb 26, 2016 · f4ba3f1 · f4ba3f1
1 parent af54371
commit f4ba3f1
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 14 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -72,11 +72,11 @@ android {
     buildTypes {
         release {
             // 不显示Log
-            buildConfigField "boolean", "LOG_DEBUG", "false"
+//            buildConfigField "boolean", "LOG_DEBUG", "false"
 
-            debuggable false
-            minifyEnabled true
-            shrinkResources true
+            debuggable true
+            minifyEnabled false
+            shrinkResources false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
             if (keyStore.exists()) {
                 println "Meizhi: using drakeet's key"

diff --git a/app/src/main/java/me/drakeet/meizhi/DrakeetRetrofit.java b/app/src/main/java/me/drakeet/meizhi/DrakeetRetrofit.java
@@ -50,12 +50,12 @@ public class DrakeetRetrofit {
 
         RestAdapter.Builder builder = new RestAdapter.Builder();
         builder.setClient(new OkClient(client))
-               .setEndpoint("http://gank.avosapps.com/api")
+               .setLogLevel(RestAdapter.LogLevel.FULL)
+               .setEndpoint("http://gank.io/api")
                .setConverter(new GsonConverter(gson));
         RestAdapter gankRestAdapter = builder.build();
         builder.setEndpoint("https://leancloud.cn:443/1.1/classes");
         RestAdapter drakeetRestAdapter = builder.build();
-        drakeetRestAdapter.setLogLevel(RestAdapter.LogLevel.FULL);
         gankService = gankRestAdapter.create(GankApi.class);
         drakeetService = drakeetRestAdapter.create(DrakeetApi.class);
     }

diff --git a/app/src/main/java/me/drakeet/meizhi/ui/MainActivity.java b/app/src/main/java/me/drakeet/meizhi/ui/MainActivity.java
@@ -45,17 +45,16 @@
 import me.drakeet.meizhi.App;
 import me.drakeet.meizhi.R;
 import me.drakeet.meizhi.data.MeizhiData;
-import me.drakeet.meizhi.data.休息视频Data;
-import me.drakeet.meizhi.func.OnMeizhiTouchListener;
 import me.drakeet.meizhi.data.entity.Gank;
 import me.drakeet.meizhi.data.entity.Meizhi;
+import me.drakeet.meizhi.data.休息视频Data;
+import me.drakeet.meizhi.func.OnMeizhiTouchListener;
 import me.drakeet.meizhi.ui.adapter.MeizhiListAdapter;
 import me.drakeet.meizhi.ui.base.SwipeRefreshBaseActivity;
 import me.drakeet.meizhi.util.AlarmManagerUtils;
 import me.drakeet.meizhi.util.DateUtils;
 import me.drakeet.meizhi.util.Once;
 import me.drakeet.meizhi.util.PreferencesLoader;
-import me.drakeet.meizhi.util.Stream;
 import me.drakeet.meizhi.util.ToastUtils;
 import rx.Observable;
 import rx.Subscription;
@@ -146,20 +145,20 @@ private void loadData(boolean clean) {
                      meizhi2.publishedAt.compareTo(meizhi1.publishedAt))
                .doOnNext(this::saveMeizhis)
                .observeOn(AndroidSchedulers.mainThread())
+               .finallyDo(() -> setRequestDataRefresh(false))
                .subscribe(meizhis -> {
                    if (clean) mMeizhiList.clear();
                    mMeizhiList.addAll(meizhis);
                    mMeizhiListAdapter.notifyDataSetChanged();
                    setRequestDataRefresh(false);
-               }, throwable -> loadError(throwable));
+               });
         // @formatter:on
         addSubscription(s);
     }
 
 
     private void loadError(Throwable throwable) {
         throwable.printStackTrace();
-        setRequestDataRefresh(false);
         Snackbar.make(mRecyclerView, R.string.snap_load_fail,
                 Snackbar.LENGTH_LONG).setAction(R.string.retry, v -> {
             requestDataRefresh();
@@ -173,9 +172,10 @@ private void saveMeizhis(List<Meizhi> meizhis) {
 
 
     private MeizhiData createMeizhiDataWith休息视频Desc(MeizhiData data, 休息视频Data love) {
-        Stream.from(data.results)
-              .forEach(meizhi -> meizhi.desc = meizhi.desc + " " +
-                      getFirstVideoDesc(meizhi.publishedAt, love.results));
+        for (Meizhi meizhi : data.results) {
+            meizhi.desc = meizhi.desc + " " +
+                    getFirstVideoDesc(meizhi.publishedAt, love.results);
+        }
         return data;
     }
 
@@ -187,6 +187,7 @@ private String getFirstVideoDesc(Date publishedAt, List<Gank> results) {
         String videoDesc = "";
         for (int i = mLastVideoIndex; i < results.size(); i++) {
             Gank video = results.get(i);
+            if (video.publishedAt == null) video.publishedAt = video.createdAt;
             if (DateUtils.isTheSameDay(publishedAt, video.publishedAt)) {
                 videoDesc = video.desc;
                 mLastVideoIndex = i;