Skip to content

FIX style item.checkCircle.backgroundColor not work with original CheckRadioView && FIX CheckStyle && fix sumsung take photo crash bug:configuration changed cause MediaStoreCompat uri and path cleaned #578

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ThorWu wants to merge 5 commits into
base: master
Choose a base branch
from
Open

FIX style item.checkCircle.backgroundColor not work with original CheckRadioView && FIX CheckStyle && fix sumsung take photo crash bug:configuration changed cause MediaStoreCompat uri and path cleaned #578

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3c90783
fix sumsung take photo bug:config change MediaStoreCompat uri and pat…
ThorWu Mar 5, 2019
3727f24
fix checkstyle:Caused by: java.io.FileNotFoundException: http://www.p…
ThorWu Mar 6, 2019
11f9244
fix crash bugs
ThorWu Mar 6, 2019
56fb573
fix crash bugs
ThorWu Mar 6, 2019
ce8d60a
fix original check color
ThorWu Mar 23, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion checkstyle.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<!DOCTYPE module PUBLIC
"-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
"-//Puppy Crawl//DTD Check Configuration 1.3//EN"
"http://www.puppycrawl.com/dtds/configuration_1_3.dtd">

<module name="Checker">
Expand Down
16 changes: 11 additions & 5 deletions matisse/src/main/java/com/zhihu/matisse/internal/ui/widget/CheckRadioView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.zhihu.matisse.internal.ui.widget;

import android.content.Context;
import android.content.res.TypedArray;
import android.graphics.PorterDuff;
import android.graphics.drawable.Drawable;
import android.support.v4.content.res.ResourcesCompat;
Expand All @@ -21,17 +22,22 @@ public CheckRadioView(Context context) {
init();
}



public CheckRadioView(Context context, AttributeSet attrs) {
super(context, attrs);
init();
}

public CheckRadioView(Context context, AttributeSet attrs, int defStyleAttr) {
super(context, attrs, defStyleAttr);
init();
}

private void init() {
mSelectedColor = ResourcesCompat.getColor(
getResources(), R.color.zhihu_item_checkCircle_backgroundColor,
getContext().getTheme());
TypedArray ta = getContext().getTheme()
.obtainStyledAttributes(new int[]{R.attr.item_checkCircle_backgroundColor});
mSelectedColor = ta.getColor(0,
ResourcesCompat.getColor(getResources(), R.color.zhihu_item_checkCircle_backgroundColor, getContext().getTheme()));
ta.recycle();
mUnSelectUdColor = ResourcesCompat.getColor(
getResources(), R.color.zhihu_check_original_radio_disable,
getContext().getTheme());
Expand Down
32 changes: 29 additions & 3 deletions matisse/src/main/java/com/zhihu/matisse/internal/utils/MediaStoreCompat.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,13 @@
import android.content.pm.ResolveInfo;
import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
import android.os.Environment;
import android.provider.MediaStore;
import android.support.v4.app.Fragment;
import android.support.v4.content.FileProvider;
import android.support.v4.os.EnvironmentCompat;
import android.text.TextUtils;

import com.zhihu.matisse.internal.entity.CaptureStrategy;

Expand All @@ -40,11 +42,14 @@

public class MediaStoreCompat {

public static final String MEDIA_STORE_COMPAT_CUR_PHOTO_URI = "media_store_compat_cur_photo_uri";
public static final String MEDIA_STORE_COMPAT_CUR_PHOTO_PATH = "media_store_compat_cur_photo_path";

private final WeakReference<Activity> mContext;
private final WeakReference<Fragment> mFragment;
private CaptureStrategy mCaptureStrategy;
private Uri mCurrentPhotoUri;
private String mCurrentPhotoPath;
private CaptureStrategy mCaptureStrategy;
private Uri mCurrentPhotoUri;
private String mCurrentPhotoPath;

public MediaStoreCompat(Activity activity) {
mContext = new WeakReference<>(activity);
Expand All @@ -56,6 +61,27 @@ public MediaStoreCompat(Activity activity, Fragment fragment) {
mFragment = new WeakReference<>(fragment);
}

public void onSaveInstanceState(Bundle outState) {
if (outState == null) {
return;
}

if (mCurrentPhotoUri != null) {
outState.putString(MEDIA_STORE_COMPAT_CUR_PHOTO_URI, mCurrentPhotoUri.toString());
}
outState.putString(MEDIA_STORE_COMPAT_CUR_PHOTO_PATH, mCurrentPhotoPath);
}

public void onCreate(Bundle savedInstanceState) {
if (savedInstanceState != null) {
mCurrentPhotoPath = savedInstanceState.getString(MEDIA_STORE_COMPAT_CUR_PHOTO_PATH, null);
String uriStr = savedInstanceState.getString(MEDIA_STORE_COMPAT_CUR_PHOTO_URI, null);
if (!TextUtils.isEmpty(uriStr)) {
mCurrentPhotoUri = Uri.parse(uriStr);
}
}
}

/**
* Checks whether the device has a camera feature or not.
*
Expand Down
4 changes: 4 additions & 0 deletions matisse/src/main/java/com/zhihu/matisse/ui/MatisseActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
if (mSpec.captureStrategy == null)
throw new RuntimeException("Don't forget to set CaptureStrategy.");
mMediaStoreCompat.setCaptureStrategy(mSpec.captureStrategy);
mMediaStoreCompat.onCreate(savedInstanceState);
}

Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
Expand Down Expand Up @@ -157,6 +158,9 @@ protected void onSaveInstanceState(Bundle outState) {
super.onSaveInstanceState(outState);
mSelectedCollection.onSaveInstanceState(outState);
mAlbumCollection.onSaveInstanceState(outState);
if (mMediaStoreCompat != null) {
mMediaStoreCompat.onSaveInstanceState(outState);
}
outState.putBoolean("checkState", mOriginalEnable);
}

Expand Down