自定义颜色的BUG修正

iMeiji · Jul 2, 2017 · e4070df · e4070df
1 parent 5c944ca
commit e4070df
Show file tree

Hide file tree

Showing 19 changed files with 2,406 additions and 24 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -16,8 +16,8 @@ android {
         applicationId "com.meiji.toutiao"
         minSdkVersion 16
         targetSdkVersion 25
-        versionCode 5
-        versionName "1.2.7"
+        versionCode 6
+        versionName "1.2.7.1"
         multiDexEnabled true
         vectorDrawables.useSupportLibrary = true
     }

diff --git a/app/src/main/java/com/meiji/toutiao/SettingsActivity.java b/app/src/main/java/com/meiji/toutiao/SettingsActivity.java
@@ -1,9 +1,10 @@
 package com.meiji.toutiao;
 
 
-import android.annotation.TargetApi;
+import android.app.ActivityManager;
 import android.content.Intent;
 import android.content.pm.PackageManager;
+import android.graphics.BitmapFactory;
 import android.graphics.Color;
 import android.graphics.drawable.ColorDrawable;
 import android.net.Uri;
@@ -71,13 +72,20 @@ public boolean onOptionsItemSelected(MenuItem item) {
         return super.onOptionsItemSelected(item);
     }
 
-    @TargetApi(Build.VERSION_CODES.M)
     @Override
     public void onColorSelection(@NonNull ColorChooserDialog dialog, @ColorInt int selectedColor) {
         if (getSupportActionBar() != null)
             getSupportActionBar().setBackgroundDrawable(new ColorDrawable(selectedColor));
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            // 状态栏上色
             getWindow().setStatusBarColor(CircleView.shiftColorDown(selectedColor));
+            // 最近任务栏上色
+            ActivityManager.TaskDescription tDesc = new ActivityManager.TaskDescription(
+                    getString(R.string.app_name),
+                    BitmapFactory.decodeResource(getResources(), R.mipmap.ic_launcher),
+                    selectedColor);
+            setTaskDescription(tDesc);
+            // 导航栏上色
             if (SettingsUtil.getInstance().getNavBar()) {
                 getWindow().setNavigationBarColor(CircleView.shiftColorDown(selectedColor));
             } else {
@@ -115,6 +123,8 @@ public boolean onPreferenceClick(Preference preference) {
                             .cancelButton(R.string.cancel)
                             .doneButton(R.string.done)
                             .customButton(R.string.custom)
+                            .presetsButton(R.string.back)
+                            .allowUserColorInputAlpha(false)
                             .show();
                     return false;
                 }

diff --git a/app/src/main/java/com/meiji/toutiao/api/IMobileMediaApi.java b/app/src/main/java/com/meiji/toutiao/api/IMobileMediaApi.java
@@ -1,6 +1,7 @@
 package com.meiji.toutiao.api;
 
 import com.meiji.toutiao.bean.media.MediaProfileBean;
+import com.meiji.toutiao.bean.media.MultiMediaArticleBean;
 
 import io.reactivex.Observable;
 import okhttp3.ResponseBody;
@@ -32,9 +33,9 @@ Observable<MediaProfileBean> getMediaProfile(
      * @param maxBehotTime 时间轴
      */
     @GET("https://is.snssdk.com/pgc/ma/?page_type=1&output=json&is_json=1&count=10&from=user_profile_app&version=2&as=479BB4B7254C150&cp=585DB1871ED64E1")
-    Call<ResponseBody> getMediaArticle(
+    Observable<MultiMediaArticleBean> getMediaArticle(
             @Query("media_id") String mediaId,
-            @Query("max_behot_time") int maxBehotTime);
+            @Query("max_behot_time") String maxBehotTime);
 
     /**
      * 获取头条号视频
@@ -46,7 +47,7 @@ Call<ResponseBody> getMediaArticle(
     @GET("https://is.snssdk.com/pgc/ma/?page_type=0&output=json&is_json=1&count=10&from=user_profile_app&version=2&as=479BB4B7254C150&cp=585DB1871ED64E1")
     Call<ResponseBody> getMediaVideo(
             @Query("media_id") String mediaId,
-            @Query("max_behot_time") int maxBehotTime);
+            @Query("max_behot_time") String maxBehotTime);
 
     /**
      * 获取头条号问答