());
+ }
+
private boolean isDebug() {
if (isDebug == null) isDebug = AppUtils.isAppDebug();
return isDebug;
diff --git a/lib/base/src/main/java/com/blankj/base/BaseFragment.java b/lib/base/src/main/java/com/blankj/base/BaseFragment.java
index 2ff0a90913..ab2b8877fe 100644
--- a/lib/base/src/main/java/com/blankj/base/BaseFragment.java
+++ b/lib/base/src/main/java/com/blankj/base/BaseFragment.java
@@ -2,13 +2,6 @@
import android.content.Context;
import android.os.Bundle;
-import android.support.annotation.IdRes;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentTransaction;
-import android.support.v7.app.AppCompatActivity;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
@@ -17,6 +10,14 @@
import com.blankj.utilcode.util.AppUtils;
import com.blankj.utilcode.util.ClickUtils;
+import androidx.annotation.IdRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentTransaction;
+
/**
*
* author: Blankj
@@ -89,7 +90,7 @@ public void onCreate(@Nullable Bundle savedInstanceState) {
} else {
ft.show(this);
}
- ft.commitAllowingStateLoss();
+ ft.commitNowAllowingStateLoss();
}
Bundle bundle = getArguments();
initData(bundle);
diff --git a/lib/base/src/main/java/com/blankj/base/IBaseView.java b/lib/base/src/main/java/com/blankj/base/IBaseView.java
index 282649b774..821cbf4399 100644
--- a/lib/base/src/main/java/com/blankj/base/IBaseView.java
+++ b/lib/base/src/main/java/com/blankj/base/IBaseView.java
@@ -1,11 +1,12 @@
package com.blankj.base;
import android.os.Bundle;
-import android.support.annotation.LayoutRes;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
import android.view.View;
+import androidx.annotation.LayoutRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
/**
*
diff --git a/lib/base/src/main/java/com/blankj/base/dialog/BaseDialog.java b/lib/base/src/main/java/com/blankj/base/dialog/BaseDialog.java
index fcb8a84858..1599d8becc 100644
--- a/lib/base/src/main/java/com/blankj/base/dialog/BaseDialog.java
+++ b/lib/base/src/main/java/com/blankj/base/dialog/BaseDialog.java
@@ -4,12 +4,13 @@
import android.app.Dialog;
import android.content.Context;
import android.os.Bundle;
-import android.support.annotation.NonNull;
import android.view.View;
import android.view.Window;
import com.blankj.utilcode.util.ActivityUtils;
-import com.blankj.utilcode.util.Utils;
+import com.blankj.utilcode.util.ThreadUtils;
+
+import androidx.annotation.NonNull;
/**
*
@@ -53,7 +54,7 @@ protected void onCreate(Bundle savedInstanceState) {
@Override
public void show() {
- Utils.runOnUiThread(new Runnable() {
+ ThreadUtils.runOnUiThread(new Runnable() {
@Override
public void run() {
if (ActivityUtils.isActivityAlive(getContext())) {
@@ -65,7 +66,7 @@ public void run() {
@Override
public void dismiss() {
- Utils.runOnUiThread(new Runnable() {
+ ThreadUtils.runOnUiThread(new Runnable() {
@Override
public void run() {
if (ActivityUtils.isActivityAlive(getContext())) {
diff --git a/lib/base/src/main/java/com/blankj/base/dialog/BaseDialogFragment.java b/lib/base/src/main/java/com/blankj/base/dialog/BaseDialogFragment.java
index 21e224bf62..e115e78878 100644
--- a/lib/base/src/main/java/com/blankj/base/dialog/BaseDialogFragment.java
+++ b/lib/base/src/main/java/com/blankj/base/dialog/BaseDialogFragment.java
@@ -1,22 +1,26 @@
package com.blankj.base.dialog;
import android.annotation.SuppressLint;
+import android.app.Activity;
import android.app.Dialog;
+import android.content.Context;
import android.content.DialogInterface;
import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.DialogFragment;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentActivity;
-import android.support.v4.app.FragmentManager;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.view.Window;
import com.blankj.utilcode.util.ActivityUtils;
-import com.blankj.utilcode.util.Utils;
+import com.blankj.utilcode.util.LogUtils;
+import com.blankj.utilcode.util.ThreadUtils;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.DialogFragment;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
+import androidx.fragment.app.FragmentManager;
/**
*
@@ -34,18 +38,28 @@ public class BaseDialogFragment extends DialogFragment {
protected FragmentActivity mActivity;
protected View mContentView;
- public BaseDialogFragment init(FragmentActivity activity, DialogLayoutCallback listener) {
- mActivity = activity;
+ public BaseDialogFragment init(Context context, DialogLayoutCallback listener) {
+ mActivity = getFragmentActivity(context);
mDialogLayoutCallback = listener;
return this;
}
- public BaseDialogFragment init(FragmentActivity activity, DialogCallback dialogCallback) {
- mActivity = activity;
+ public BaseDialogFragment init(Context context, DialogCallback dialogCallback) {
+ mActivity = getFragmentActivity(context);
mDialogCallback = dialogCallback;
return this;
}
+ private FragmentActivity getFragmentActivity(Context context) {
+ Activity activity = ActivityUtils.getActivityByContext(context);
+ if (activity == null) return null;
+ if (activity instanceof FragmentActivity) {
+ return (FragmentActivity) activity;
+ }
+ LogUtils.w(context + "not instanceof FragmentActivity");
+ return null;
+ }
+
@Override
public int getTheme() {
if (mDialogLayoutCallback != null) {
@@ -59,10 +73,19 @@ public int getTheme() {
@NonNull
public Dialog onCreateDialog(Bundle savedInstanceState) {
+ Dialog dialog;
+ if (mDialogCallback != null) {
+ dialog = mDialogCallback.bindDialog(mActivity);
+ } else {
+ dialog = super.onCreateDialog(savedInstanceState);
+ }
+ Window window = dialog.getWindow();
if (mDialogCallback != null) {
- return mDialogCallback.bindDialog(mActivity);
+ mDialogCallback.setWindowStyle(window);
+ } else if (mDialogLayoutCallback != null) {
+ mDialogLayoutCallback.setWindowStyle(window);
}
- return super.onCreateDialog(savedInstanceState);
+ return dialog;
}
@Nullable
@@ -83,20 +106,6 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
super.onViewCreated(view, savedInstanceState);
}
- @Override
- public void onStart() {
- super.onStart();
- Dialog dialog = getDialog();
- if (dialog == null) return;
- Window window = dialog.getWindow();
- if (window == null) return;
- if (mDialogCallback != null) {
- mDialogCallback.setWindowStyle(window);
- } else if (mDialogLayoutCallback != null) {
- mDialogLayoutCallback.setWindowStyle(window);
- }
- }
-
@Override
public void onCancel(DialogInterface dialog) {
super.onCancel(dialog);
@@ -118,7 +127,7 @@ public void show() {
}
public void show(final String tag) {
- Utils.runOnUiThread(new Runnable() {
+ ThreadUtils.runOnUiThread(new Runnable() {
@SuppressLint("CommitTransaction")
@Override
public void run() {
@@ -128,7 +137,7 @@ public void run() {
if (prev != null) {
fm.beginTransaction().remove(prev);
}
- BaseDialogFragment.super.showNow(fm, tag);
+ BaseDialogFragment.super.show(fm, tag);
}
}
});
@@ -136,7 +145,7 @@ public void run() {
@Override
public void dismiss() {
- Utils.runOnUiThread(new Runnable() {
+ ThreadUtils.runOnUiThread(new Runnable() {
@Override
public void run() {
if (ActivityUtils.isActivityAlive(mActivity)) {
diff --git a/lib/base/src/main/java/com/blankj/base/dialog/DialogCallback.java b/lib/base/src/main/java/com/blankj/base/dialog/DialogCallback.java
index 7d1c6e632a..defd34483f 100644
--- a/lib/base/src/main/java/com/blankj/base/dialog/DialogCallback.java
+++ b/lib/base/src/main/java/com/blankj/base/dialog/DialogCallback.java
@@ -2,9 +2,10 @@
import android.app.Activity;
import android.app.Dialog;
-import android.support.annotation.NonNull;
import android.view.Window;
+import androidx.annotation.NonNull;
+
/**
*
* author: blankj
diff --git a/lib/base/src/main/java/com/blankj/base/mvp/BaseModel.java b/lib/base/src/main/java/com/blankj/base/mvp/BaseModel.java
index cbdd94c2be..b48ed32f23 100644
--- a/lib/base/src/main/java/com/blankj/base/mvp/BaseModel.java
+++ b/lib/base/src/main/java/com/blankj/base/mvp/BaseModel.java
@@ -1,10 +1,8 @@
package com.blankj.base.mvp;
-import com.blankj.utilcode.util.ThreadUtils;
-import com.blankj.utilcode.util.ToastUtils;
+import android.util.Log;
-import java.util.ArrayList;
-import java.util.List;
+import androidx.annotation.CallSuper;
/**
*
@@ -16,24 +14,12 @@
*/
public abstract class BaseModel {
- private List mTasks = new ArrayList<>();
+ private static final String TAG = BaseView.TAG;
- public abstract void onCreateModel();
+ public abstract void onCreate();
- public abstract void onDestroyModel();
-
- public ThreadUtils.Task addAutoDestroyTask(ThreadUtils.Task task) {
- if (task == null) return null;
- mTasks.add(task);
- return task;
- }
-
- void destroy() {
- onDestroyModel();
- for (ThreadUtils.Task task : mTasks) {
- if (task == null) continue;
- task.cancel();
- ToastUtils.showLong("Mvp Task Canceled.");
- }
+ @CallSuper
+ public void onDestroy() {
+ Log.i(TAG, "destroy model: " + getClass().getSimpleName());
}
}
diff --git a/lib/base/src/main/java/com/blankj/base/mvp/BasePresenter.java b/lib/base/src/main/java/com/blankj/base/mvp/BasePresenter.java
index 93e3223324..32e672417b 100644
--- a/lib/base/src/main/java/com/blankj/base/mvp/BasePresenter.java
+++ b/lib/base/src/main/java/com/blankj/base/mvp/BasePresenter.java
@@ -1,16 +1,14 @@
package com.blankj.base.mvp;
-import android.arch.lifecycle.Lifecycle;
-import android.arch.lifecycle.LifecycleObserver;
-import android.arch.lifecycle.LifecycleOwner;
-import android.arch.lifecycle.OnLifecycleEvent;
-import android.support.annotation.CallSuper;
-
-import com.blankj.utilcode.util.LogUtils;
+import android.util.Log;
import java.util.HashMap;
import java.util.Map;
+import androidx.annotation.CallSuper;
+import androidx.lifecycle.ViewModel;
+import androidx.lifecycle.ViewModelProvider;
+
/**
*
* author: blankj
@@ -19,16 +17,19 @@
* desc :
*
*/
-public abstract class BasePresenter implements LifecycleObserver {
+public abstract class BasePresenter {
- private V mView;
- private Map mModelMap = new HashMap<>();
+ private static final String TAG = BaseView.TAG;
- public abstract void onAttachView();
+ private V mView;
+ private Map, BaseModel> mModelMap = new HashMap<>();
+ private boolean isAlive = true;
+
+ public abstract void onBindView();
void bindView(V view) {
this.mView = view;
- onAttachView();
+ onBindView();
}
public V getView() {
@@ -44,34 +45,29 @@ public M getModel(Class modelClass) {
try {
M model = modelClass.newInstance();
mModelMap.put(modelClass, model);
- model.onCreateModel();
+ model.onCreate();
return model;
} catch (IllegalAccessException e) {
- e.printStackTrace();
+ Log.e("BasePresenter", "getModel", e);
} catch (InstantiationException e) {
- e.printStackTrace();
+ Log.e("BasePresenter", "getModel", e);
}
return null;
}
@CallSuper
- @OnLifecycleEvent(Lifecycle.Event.ON_DESTROY)
- public void onDestroyPresenter() {
- if (mView != null) {
- mView.mPresenterMap.remove(this.getClass());
- mView.onDestroyView();
- }
+ public void onDestroy() {
+ Log.i(TAG, "destroy presenter: " + getClass().getSimpleName());
+ isAlive = false;
for (BaseModel model : mModelMap.values()) {
if (model != null) {
- model.destroy();
+ model.onDestroy();
}
}
mModelMap.clear();
- LogUtils.e("onDestroyPresenter");
}
- @OnLifecycleEvent(Lifecycle.Event.ON_ANY)
- public void onLifecycleChanged(LifecycleOwner owner, Lifecycle.Event event) {
- LogUtils.e(event.toString());
+ public boolean isAlive() {
+ return isAlive;
}
}
diff --git a/lib/base/src/main/java/com/blankj/base/mvp/BaseView.java b/lib/base/src/main/java/com/blankj/base/mvp/BaseView.java
index 1e725be0b0..a68909d01f 100644
--- a/lib/base/src/main/java/com/blankj/base/mvp/BaseView.java
+++ b/lib/base/src/main/java/com/blankj/base/mvp/BaseView.java
@@ -1,12 +1,17 @@
package com.blankj.base.mvp;
-import android.arch.lifecycle.Lifecycle;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentActivity;
+import android.util.Log;
import java.util.HashMap;
import java.util.Map;
+import androidx.annotation.CallSuper;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
+import androidx.lifecycle.Lifecycle;
+import androidx.lifecycle.LifecycleObserver;
+import androidx.lifecycle.OnLifecycleEvent;
+
/**
*
* author: blankj
@@ -15,51 +20,95 @@
* desc :
*
*/
-public abstract class BaseView {
+public class BaseView implements LifecycleObserver {
+
+ public static final String TAG = "UtilsMVP";
- private FragmentActivity mActivity;
- private Fragment mFragment;
- private Lifecycle mLifecycle;
- Map> mPresenterMap = new HashMap<>();
+ private FragmentActivity mActivity;
+ private Fragment mFragment;
+ private Lifecycle mLifecycle;
+ private Map, BasePresenter> mPresenterMap = new HashMap<>();
- public abstract void onDestroyView();
+ public BaseView(Fragment fragment) {
+ mFragment = fragment;
+ mActivity = fragment.getActivity();
+ mLifecycle = mFragment.getLifecycle();
+ addLifecycle(this);
+ }
public BaseView(FragmentActivity activity) {
mActivity = activity;
- mLifecycle = activity.getLifecycle();
+ mLifecycle = mActivity.getLifecycle();
+ addLifecycle(this);
}
- public BaseView(Fragment fragment) {
- mFragment = fragment;
- mActivity = fragment.getActivity();
- mLifecycle = fragment.getLifecycle();
+ public BaseView(Lifecycle lifecycle) {
+ mLifecycle = lifecycle;
+ addLifecycle(this);
}
public T getActivity() {
+ if (mActivity == null) {
+ return null;
+ }
//noinspection unchecked
return (T) mActivity;
}
public T getFragment() {
+ if (mFragment == null) {
+ return null;
+ }
//noinspection unchecked
return (T) mFragment;
}
- public void addPresenter(BasePresenter presenter) {
+ public V addPresenter(BasePresenter presenter) {
+ if (presenter == null) return (V) this;
mPresenterMap.put(presenter.getClass(), presenter);
//noinspection unchecked
presenter.bindView((V) this);
- if (mLifecycle != null) {
- mLifecycle.addObserver(presenter);
- }
+ return (V) this;
}
public > P getPresenter(Class
presenterClass) {
+ if (presenterClass == null) {
+ throw new IllegalArgumentException("presenterClass is null!");
+ }
BasePresenter basePresenter = mPresenterMap.get(presenterClass);
- if (basePresenter != null) {
- //noinspection unchecked
- return (P) basePresenter;
+ if (basePresenter == null) {
+ throw new IllegalArgumentException("presenter of <" + presenterClass.getSimpleName() + "> is not added!");
+ }
+ //noinspection unchecked
+ return (P) basePresenter;
+ }
+
+ @CallSuper
+ @OnLifecycleEvent(Lifecycle.Event.ON_DESTROY)
+ public void onDestroy() {
+ Log.i(TAG, "destroy view: " + getClass().getSimpleName());
+ removeLifecycle(this);
+ for (BasePresenter presenter : mPresenterMap.values()) {
+ if (presenter != null) {
+ presenter.onDestroy();
+ }
+ }
+ mPresenterMap.clear();
+ }
+
+ private void addLifecycle(LifecycleObserver observer) {
+ if (mLifecycle == null) {
+ Log.w(TAG, "addLifecycle: mLifecycle is null");
+ return;
+ }
+ mLifecycle.addObserver(observer);
+ }
+
+ private void removeLifecycle(LifecycleObserver observer) {
+ if (mLifecycle == null) {
+ Log.w(TAG, "removeLifecycle: mLifecycle is null");
+ return;
}
- return null;
+ mLifecycle.removeObserver(observer);
}
}
diff --git a/lib/base/src/main/java/com/blankj/base/rv/BaseItem.java b/lib/base/src/main/java/com/blankj/base/rv/BaseItem.java
index 7ca2a573d4..b0d6de04fa 100644
--- a/lib/base/src/main/java/com/blankj/base/rv/BaseItem.java
+++ b/lib/base/src/main/java/com/blankj/base/rv/BaseItem.java
@@ -1,14 +1,17 @@
package com.blankj.base.rv;
-import android.support.annotation.LayoutRes;
-import android.support.annotation.NonNull;
-import android.support.v7.widget.RecyclerView;
import android.util.SparseArray;
import android.util.SparseIntArray;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
+import java.util.List;
+
+import androidx.annotation.LayoutRes;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
/**
*
* author: Blankj
@@ -21,6 +24,7 @@ public abstract class BaseItem {
private static final SparseIntArray LAYOUT_SPARSE_ARRAY = new SparseIntArray();
private static final SparseArray VIEW_SPARSE_ARRAY = new SparseArray<>();
+ public boolean isBindViewHolder = false;
static ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
int layoutByType = LAYOUT_SPARSE_ARRAY.get(viewType, -1);
@@ -36,7 +40,11 @@ static ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType
public abstract void bind(@NonNull final ItemViewHolder holder, final int position);
+ public void partialUpdate(List payloads) {
+ }
+
void bindViewHolder(@NonNull final ItemViewHolder holder, final int position) {
+ isBindViewHolder = true;
if (mOnItemClickListener != null) {
holder.itemView.setOnClickListener(new View.OnClickListener() {
@Override
@@ -67,7 +75,9 @@ public boolean onLongClick(View v) {
bind(holder, position);
}
- public void onViewRecycled(@NonNull final ItemViewHolder holder, final int position) {/**/}
+ public void onViewRecycled(@NonNull final ItemViewHolder holder, final int position) {
+ isBindViewHolder = false;
+ }
public long getItemId() {
return RecyclerView.NO_ID;
@@ -113,10 +123,19 @@ private int getViewTypeByView(@NonNull View view) {
}
public void update() {
+ if (getAdapter() == null) return;
//noinspection unchecked
getAdapter().updateItem((T) this);
}
+ public List getItems() {
+ return getAdapter().getItems();
+ }
+
+ public int getCount() {
+ return getAdapter().getItemCount();
+ }
+
public int getIndex() {
//noinspection SuspiciousMethodCalls
return getAdapter().getItems().indexOf(this);
diff --git a/lib/base/src/main/java/com/blankj/base/rv/BaseItemAdapter.java b/lib/base/src/main/java/com/blankj/base/rv/BaseItemAdapter.java
index 6b99194cd1..67d5902752 100644
--- a/lib/base/src/main/java/com/blankj/base/rv/BaseItemAdapter.java
+++ b/lib/base/src/main/java/com/blankj/base/rv/BaseItemAdapter.java
@@ -1,10 +1,11 @@
package com.blankj.base.rv;
-import android.support.annotation.IntRange;
-import android.support.annotation.NonNull;
-import android.support.v7.widget.RecyclerView;
import android.view.ViewGroup;
+import androidx.annotation.IntRange;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
@@ -53,6 +54,15 @@ public final void onBindViewHolder(@NonNull ItemViewHolder holder, int position)
mItems.get(position).bindViewHolder(holder, position);
}
+ @Override
+ public void onBindViewHolder(@NonNull ItemViewHolder holder, int position, @NonNull List payloads) {
+ if (payloads.isEmpty()) {
+ super.onBindViewHolder(holder, position, payloads);
+ return;
+ }
+ mItems.get(position).partialUpdate(payloads);
+ }
+
@Override
public int getItemCount() {
return mItems.size();
@@ -151,14 +161,41 @@ public int removeItemById(final long id, boolean notifyRemoved) {
///////////////////////////////////////////////////////////////////////////
public void updateItem(@NonNull final Item item) {
+ updateItems(item, 1, null);
+ }
+
+ public void updateItem(@IntRange(from = 0) final int index) {
+ updateItems(index, 1, null);
+ }
+
+ public void updateItem(@NonNull final Item item, Object payload) {
+ updateItems(item, 1, payload);
+ }
+
+ public void updateItem(@IntRange(from = 0) final int index, Object payload) {
+ updateItems(index, 1, payload);
+ }
+
+ public void updateItems(@NonNull final Item item, int itemCount) {
int itemIndex = mItems.indexOf(item);
if (itemIndex != -1) {
- notifyItemChanged(itemIndex);
+ updateItems(itemIndex, itemCount);
}
}
- public void updateItem(@IntRange(from = 0) final int index) {
- notifyItemChanged(index);
+ public void updateItems(@IntRange(from = 0) final int index, int itemCount) {
+ updateItems(index, itemCount, null);
+ }
+
+ public void updateItems(@NonNull final Item item, int itemCount, Object payload) {
+ int itemIndex = mItems.indexOf(item);
+ if (itemIndex != -1) {
+ updateItems(itemIndex, itemCount, payload);
+ }
+ }
+
+ public void updateItems(@IntRange(from = 0) final int index, int itemCount, Object payload) {
+ notifyItemRangeChanged(index, itemCount, payload);
}
public void addItem(@NonNull final Item item) {
diff --git a/lib/base/src/main/java/com/blankj/base/rv/ItemViewHolder.java b/lib/base/src/main/java/com/blankj/base/rv/ItemViewHolder.java
index 27ebd714eb..e2bf00dfd6 100644
--- a/lib/base/src/main/java/com/blankj/base/rv/ItemViewHolder.java
+++ b/lib/base/src/main/java/com/blankj/base/rv/ItemViewHolder.java
@@ -1,7 +1,7 @@
package com.blankj.base.rv;
-import android.support.annotation.IdRes;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.IdRes;
+import androidx.recyclerview.widget.RecyclerView;
import android.util.SparseArray;
import android.view.View;
diff --git a/lib/base/src/main/java/com/blankj/base/rv/RecycleViewDivider.java b/lib/base/src/main/java/com/blankj/base/rv/RecycleViewDivider.java
index 357d38ad6b..6c2e4383af 100644
--- a/lib/base/src/main/java/com/blankj/base/rv/RecycleViewDivider.java
+++ b/lib/base/src/main/java/com/blankj/base/rv/RecycleViewDivider.java
@@ -5,11 +5,11 @@
import android.graphics.Canvas;
import android.graphics.Rect;
import android.graphics.drawable.Drawable;
-import android.support.annotation.DrawableRes;
-import android.support.annotation.NonNull;
-import android.support.v4.content.ContextCompat;
-import android.support.v4.view.ViewCompat;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.DrawableRes;
+import androidx.annotation.NonNull;
+import androidx.core.content.ContextCompat;
+import androidx.core.view.ViewCompat;
+import androidx.recyclerview.widget.RecyclerView;
import android.view.View;
import android.widget.LinearLayout;
diff --git a/lib/base/src/main/java/com/blankj/base/view/EmptyGoneTextView.java b/lib/base/src/main/java/com/blankj/base/view/EmptyGoneTextView.java
index 9749c45519..abb765a0a4 100644
--- a/lib/base/src/main/java/com/blankj/base/view/EmptyGoneTextView.java
+++ b/lib/base/src/main/java/com/blankj/base/view/EmptyGoneTextView.java
@@ -2,12 +2,13 @@
import android.annotation.SuppressLint;
import android.content.Context;
-import android.support.annotation.Nullable;
import android.util.AttributeSet;
import android.widget.TextView;
import com.blankj.utilcode.util.StringUtils;
+import androidx.annotation.Nullable;
+
/**
*
* author: blankj
diff --git a/lib/base/src/main/res/layout/activity_back.xml b/lib/base/src/main/res/layout/activity_back.xml
new file mode 100644
index 0000000000..c01cbee99d
--- /dev/null
+++ b/lib/base/src/main/res/layout/activity_back.xml
@@ -0,0 +1,34 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/lib/common/build.gradle b/lib/common/build.gradle
index c4bb45fba5..4993b43792 100644
--- a/lib/common/build.gradle
+++ b/lib/common/build.gradle
@@ -1,4 +1,4 @@
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
- api Config.depConfig.lib_base.dep
+ api Config.modules.lib_base.dep
}
\ No newline at end of file
diff --git a/lib/common/src/main/java/com/blankj/common/activity/CommonActivity.java b/lib/common/src/main/java/com/blankj/common/activity/CommonActivity.java
index 85ea261138..1d7d739597 100644
--- a/lib/common/src/main/java/com/blankj/common/activity/CommonActivity.java
+++ b/lib/common/src/main/java/com/blankj/common/activity/CommonActivity.java
@@ -1,12 +1,7 @@
package com.blankj.common.activity;
+import android.content.Context;
import android.os.Bundle;
-import android.support.annotation.CallSuper;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.StringRes;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
import android.text.TextUtils;
import android.view.LayoutInflater;
import android.view.MenuItem;
@@ -20,10 +15,18 @@
import com.blankj.common.dialog.CommonDialogLoading;
import com.blankj.common.item.CommonItem;
import com.blankj.swipepanel.SwipePanel;
+import com.blankj.utilcode.util.LanguageUtils;
import com.blankj.utilcode.util.SizeUtils;
import java.util.List;
+import androidx.annotation.CallSuper;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
/**
*
* author: Blankj
@@ -42,6 +45,11 @@ public abstract class CommonActivity extends BaseActivity {
public View commonContentView;
+// @Override
+// protected void attachBaseContext(Context newBase) {
+// super.attachBaseContext(LanguageUtils.attachBaseContext(newBase));
+// }
+
///////////////////////////////////////////////////////////////////////////
// title view
///////////////////////////////////////////////////////////////////////////
@@ -209,7 +217,7 @@ public void showLoading() {
public void showLoading(Runnable listener) {
if (mDialogLoading != null) {
- dismissLoading();
+ return;
}
mDialogLoading = new CommonDialogLoading().init(this, listener);
mDialogLoading.show();
diff --git a/lib/common/src/main/java/com/blankj/common/activity/CommonActivityDrawerView.java b/lib/common/src/main/java/com/blankj/common/activity/CommonActivityDrawerView.java
index 31cdef3363..684d580a74 100644
--- a/lib/common/src/main/java/com/blankj/common/activity/CommonActivityDrawerView.java
+++ b/lib/common/src/main/java/com/blankj/common/activity/CommonActivityDrawerView.java
@@ -2,11 +2,6 @@
import android.content.Intent;
import android.net.Uri;
-import android.support.annotation.NonNull;
-import android.support.annotation.StringRes;
-import android.support.design.widget.NavigationView;
-import android.support.v4.widget.DrawerLayout;
-import android.support.v7.app.AppCompatActivity;
import android.view.MenuItem;
import android.view.View;
import android.widget.FrameLayout;
@@ -14,6 +9,12 @@
import com.blankj.common.R;
import com.blankj.utilcode.util.ActivityUtils;
import com.blankj.utilcode.util.StringUtils;
+import com.google.android.material.navigation.NavigationView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.StringRes;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.drawerlayout.widget.DrawerLayout;
/**
*
diff --git a/lib/common/src/main/java/com/blankj/common/activity/CommonActivityItemsView.java b/lib/common/src/main/java/com/blankj/common/activity/CommonActivityItemsView.java
index 4bb48d78a4..120eae1963 100644
--- a/lib/common/src/main/java/com/blankj/common/activity/CommonActivityItemsView.java
+++ b/lib/common/src/main/java/com/blankj/common/activity/CommonActivityItemsView.java
@@ -1,9 +1,5 @@
package com.blankj.common.activity;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
import com.blankj.base.rv.BaseItemAdapter;
import com.blankj.base.rv.RecycleViewDivider;
@@ -12,6 +8,11 @@
import java.util.List;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
/**
*
* author: blankj
diff --git a/lib/common/src/main/java/com/blankj/common/activity/CommonActivityTitleView.java b/lib/common/src/main/java/com/blankj/common/activity/CommonActivityTitleView.java
index 57a259181b..623feee1a3 100644
--- a/lib/common/src/main/java/com/blankj/common/activity/CommonActivityTitleView.java
+++ b/lib/common/src/main/java/com/blankj/common/activity/CommonActivityTitleView.java
@@ -1,11 +1,5 @@
package com.blankj.common.activity;
-import android.support.annotation.NonNull;
-import android.support.annotation.StringRes;
-import android.support.design.widget.CoordinatorLayout;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
import android.view.MenuItem;
import android.view.View;
import android.view.ViewStub;
@@ -15,6 +9,13 @@
import com.blankj.utilcode.util.BarUtils;
import com.blankj.utilcode.util.ColorUtils;
+import androidx.annotation.NonNull;
+import androidx.annotation.StringRes;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+import androidx.coordinatorlayout.widget.CoordinatorLayout;
+
/**
*
* author: blankj
diff --git a/lib/common/src/main/java/com/blankj/common/dialog/CommonDialogContent.java b/lib/common/src/main/java/com/blankj/common/dialog/CommonDialogContent.java
index 327b9fd3f8..1cbe7a8ab2 100644
--- a/lib/common/src/main/java/com/blankj/common/dialog/CommonDialogContent.java
+++ b/lib/common/src/main/java/com/blankj/common/dialog/CommonDialogContent.java
@@ -1,6 +1,6 @@
package com.blankj.common.dialog;
-import android.support.v4.app.FragmentActivity;
+import android.content.Context;
import android.text.TextUtils;
import android.util.Pair;
import android.view.View;
@@ -31,10 +31,10 @@ public class CommonDialogContent extends BaseDialogFragment {
private TextView cdcBottomPositiveTv;
private TextView cdcBottomNegativeTv;
- public CommonDialogContent init(FragmentActivity activity, final CharSequence title, final CharSequence content,
+ public CommonDialogContent init(Context context, final CharSequence title, final CharSequence content,
final Pair positiveBtnAction,
final Pair negativeBtnAction) {
- super.init(activity, new DialogLayoutCallback() {
+ super.init(context, new DialogLayoutCallback() {
@Override
public int bindTheme() {
return R.style.CommonContentDialogStyle;
diff --git a/lib/common/src/main/java/com/blankj/common/dialog/CommonDialogLoading.java b/lib/common/src/main/java/com/blankj/common/dialog/CommonDialogLoading.java
index 9faeedd7cc..b40a10f5cc 100644
--- a/lib/common/src/main/java/com/blankj/common/dialog/CommonDialogLoading.java
+++ b/lib/common/src/main/java/com/blankj/common/dialog/CommonDialogLoading.java
@@ -1,12 +1,15 @@
package com.blankj.common.dialog;
-import android.support.v4.app.FragmentActivity;
+import android.content.Context;
+import android.graphics.Color;
import android.view.View;
import android.view.Window;
+import android.view.WindowManager;
import com.blankj.base.dialog.BaseDialogFragment;
import com.blankj.base.dialog.DialogLayoutCallback;
import com.blankj.common.R;
+import com.blankj.utilcode.util.BarUtils;
/**
*
@@ -18,8 +21,8 @@
*/
public class CommonDialogLoading extends BaseDialogFragment {
- public CommonDialogLoading init(FragmentActivity activity, final Runnable onCancelListener) {
- super.init(activity, new DialogLayoutCallback() {
+ public CommonDialogLoading init(Context context, final Runnable onCancelListener) {
+ super.init(context, new DialogLayoutCallback() {
@Override
public int bindTheme() {
return R.style.CommonLoadingDialogStyle;
@@ -40,7 +43,9 @@ public void initView(BaseDialogFragment dialog, View contentView) {
}
@Override
- public void setWindowStyle(Window window) {
+ public void setWindowStyle(final Window window) {
+ window.setLayout(WindowManager.LayoutParams.MATCH_PARENT, WindowManager.LayoutParams.MATCH_PARENT);
+ BarUtils.setStatusBarColor(window, Color.TRANSPARENT);
}
@Override
diff --git a/lib/common/src/main/java/com/blankj/common/fragment/CommonFragment.java b/lib/common/src/main/java/com/blankj/common/fragment/CommonFragment.java
index c2525d8f7e..46f4b24115 100644
--- a/lib/common/src/main/java/com/blankj/common/fragment/CommonFragment.java
+++ b/lib/common/src/main/java/com/blankj/common/fragment/CommonFragment.java
@@ -1,11 +1,6 @@
package com.blankj.common.fragment;
import android.os.Bundle;
-import android.support.annotation.CallSuper;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
import android.view.View;
import com.blankj.base.BaseFragment;
@@ -17,6 +12,12 @@
import java.util.List;
+import androidx.annotation.CallSuper;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
/**
*
* author: blankj
diff --git a/lib/common/src/main/java/com/blankj/common/helper/PermissionHelper.kt b/lib/common/src/main/java/com/blankj/common/helper/PermissionHelper.kt
new file mode 100644
index 0000000000..1df23cb1a4
--- /dev/null
+++ b/lib/common/src/main/java/com/blankj/common/helper/PermissionHelper.kt
@@ -0,0 +1,96 @@
+package com.blankj.common.helper
+
+import android.content.Context
+import android.util.Pair
+import android.view.View
+import com.blankj.common.R
+import com.blankj.common.dialog.CommonDialogContent
+import com.blankj.utilcode.constant.PermissionConstants
+import com.blankj.utilcode.util.*
+
+/**
+ * ```
+ * author: Blankj
+ * blog : http://blankj.com
+ * time : 2018/01/06
+ * desc : helper about permission
+ * ```
+ */
+object PermissionHelper {
+
+ fun request(context: Context, callback: PermissionUtils.SimpleCallback,
+ @PermissionConstants.PermissionGroup vararg permissions: String) {
+ PermissionUtils.permission(*permissions)
+ .rationale { activity, shouldRequest -> showRationaleDialog(activity, shouldRequest) }
+ .callback(object : PermissionUtils.SingleCallback {
+ override fun callback(isAllGranted: Boolean, granted: MutableList,
+ deniedForever: MutableList, denied: MutableList) {
+ LogUtils.d(isAllGranted, granted, deniedForever, denied)
+ if (isAllGranted) {
+ callback.onGranted()
+ return
+ }
+ if (deniedForever.isNotEmpty()) {
+ showOpenAppSettingDialog(context)
+ return
+ }
+ val activity = ActivityUtils.getActivityByContext(context)
+ if (activity != null) {
+ SnackbarUtils.with(activity.findViewById(android.R.id.content))
+ .setMessage("Permission denied: ${permissions2String(denied)}")
+ .showError(true)
+ }
+ callback.onDenied()
+ }
+
+ fun permissions2String(permissions: MutableList): String {
+ if (permissions.isEmpty()) return "[]"
+ val sb: StringBuilder = StringBuilder()
+ for (permission in permissions) {
+ sb.append(", " + permission.substring(permission.lastIndexOf('.') + 1))
+ }
+ return "[${sb.substring(2)}]"
+ }
+ })
+ .request()
+ }
+
+ fun showRationaleDialog(context: Context, shouldRequest: PermissionUtils.OnRationaleListener.ShouldRequest) {
+ CommonDialogContent().init(context,
+ StringUtils.getString(android.R.string.dialog_alert_title),
+ StringUtils.getString(R.string.permission_rationale_message),
+ Pair(StringUtils.getString(android.R.string.ok), View.OnClickListener {
+ shouldRequest.again(true)
+ }),
+ Pair(StringUtils.getString(android.R.string.cancel), View.OnClickListener {
+ shouldRequest.again(false)
+ }))
+ .show()
+ }
+
+ fun showExplainDialog(context: Context, denied: List, shouldRequest: PermissionUtils.OnExplainListener.ShouldRequest) {
+ CommonDialogContent().init(context,
+ StringUtils.getString(android.R.string.dialog_alert_title),
+ "We needs the permissions of $denied to test the utils of permission.",
+ Pair(StringUtils.getString(android.R.string.ok), View.OnClickListener {
+ shouldRequest.start(true)
+ }),
+ Pair(StringUtils.getString(android.R.string.cancel), View.OnClickListener {
+ ToastUtils.showShort("request failed.")
+ shouldRequest.start(false)
+ }))
+ .show()
+ }
+
+ fun showOpenAppSettingDialog(context: Context) {
+ CommonDialogContent().init(context,
+ StringUtils.getString(android.R.string.dialog_alert_title),
+ StringUtils.getString(R.string.permission_denied_forever_message),
+ Pair(StringUtils.getString(android.R.string.ok), View.OnClickListener {
+ PermissionUtils.launchAppDetailsSettings()
+ }),
+ Pair(StringUtils.getString(android.R.string.cancel), View.OnClickListener {
+ }))
+ .show()
+ }
+}
\ No newline at end of file
diff --git a/lib/common/src/main/java/com/blankj/common/item/CommonItem.java b/lib/common/src/main/java/com/blankj/common/item/CommonItem.java
index 1b36dc384d..c04ef136ab 100644
--- a/lib/common/src/main/java/com/blankj/common/item/CommonItem.java
+++ b/lib/common/src/main/java/com/blankj/common/item/CommonItem.java
@@ -1,13 +1,13 @@
package com.blankj.common.item;
-import android.support.annotation.CallSuper;
-import android.support.annotation.NonNull;
-
import com.blankj.base.rv.BaseItem;
import com.blankj.base.rv.ItemViewHolder;
import com.blankj.common.R;
import com.blankj.utilcode.util.ColorUtils;
+import androidx.annotation.CallSuper;
+import androidx.annotation.NonNull;
+
/**
*
* author: blankj
diff --git a/lib/common/src/main/java/com/blankj/common/item/CommonItemClick.java b/lib/common/src/main/java/com/blankj/common/item/CommonItemClick.java
index 5a7c8f9d87..3db0b7caed 100644
--- a/lib/common/src/main/java/com/blankj/common/item/CommonItemClick.java
+++ b/lib/common/src/main/java/com/blankj/common/item/CommonItemClick.java
@@ -1,7 +1,5 @@
package com.blankj.common.item;
-import android.support.annotation.NonNull;
-import android.support.annotation.StringRes;
import android.view.View;
import android.widget.TextView;
@@ -11,7 +9,8 @@
import com.blankj.utilcode.util.StringUtils;
import com.blankj.utilcode.util.Utils;
-import kotlin.Unit;
+import androidx.annotation.NonNull;
+import androidx.annotation.StringRes;
/**
*
@@ -103,11 +102,11 @@ public void onItemClick(ItemViewHolder holder, CommonItemClick item, int positio
});
}
- public CommonItemClick setOnClickUpdateContentListener(@NonNull final Utils.Func1 func1) {
+ public CommonItemClick setOnClickUpdateContentListener(@NonNull final Utils.Supplier supplier) {
setOnItemClickListener(new OnItemClickListener() {
@Override
public void onItemClick(ItemViewHolder holder, CommonItemClick item, int position) {
- item.mContent = func1.call(null);
+ item.mContent = supplier.get();
update();
}
});
diff --git a/lib/common/src/main/java/com/blankj/common/item/CommonItemImage.java b/lib/common/src/main/java/com/blankj/common/item/CommonItemImage.java
index 438766581b..207746bf85 100644
--- a/lib/common/src/main/java/com/blankj/common/item/CommonItemImage.java
+++ b/lib/common/src/main/java/com/blankj/common/item/CommonItemImage.java
@@ -1,7 +1,5 @@
package com.blankj.common.item;
-import android.support.annotation.NonNull;
-import android.support.annotation.StringRes;
import android.widget.ImageView;
import android.widget.TextView;
@@ -10,7 +8,8 @@
import com.blankj.utilcode.util.StringUtils;
import com.blankj.utilcode.util.Utils;
-import kotlin.Unit;
+import androidx.annotation.NonNull;
+import androidx.annotation.StringRes;
/**
*
@@ -22,17 +21,17 @@
*/
public class CommonItemImage extends CommonItem {
- private CharSequence mTitle;
- private Utils.Func1 mSetImageFunc1;
+ private CharSequence mTitle;
+ private Utils.Consumer mSetImageConsumer;
- public CommonItemImage(@StringRes int title, @NonNull Utils.Func1 setImageFunc1) {
- this(StringUtils.getString(title), setImageFunc1);
+ public CommonItemImage(@StringRes int title, @NonNull Utils.Consumer setImageConsumer) {
+ this(StringUtils.getString(title), setImageConsumer);
}
- public CommonItemImage(@NonNull CharSequence title, @NonNull Utils.Func1 setImageFunc1) {
+ public CommonItemImage(@NonNull CharSequence title, @NonNull Utils.Consumer setImageConsumer) {
super(R.layout.common_item_title_image);
mTitle = title;
- mSetImageFunc1 = setImageFunc1;
+ mSetImageConsumer = setImageConsumer;
}
@Override
@@ -42,6 +41,6 @@ public void bind(@NonNull ItemViewHolder holder, int position) {
titleTv.setText(mTitle);
ImageView commonItemIv = holder.findViewById(R.id.commonItemIv);
- mSetImageFunc1.call(commonItemIv);
+ mSetImageConsumer.accept(commonItemIv);
}
}
diff --git a/lib/common/src/main/java/com/blankj/common/item/CommonItemSeekBar.java b/lib/common/src/main/java/com/blankj/common/item/CommonItemSeekBar.java
index 2629e3d2d5..14ff005851 100644
--- a/lib/common/src/main/java/com/blankj/common/item/CommonItemSeekBar.java
+++ b/lib/common/src/main/java/com/blankj/common/item/CommonItemSeekBar.java
@@ -1,7 +1,5 @@
package com.blankj.common.item;
-import android.support.annotation.NonNull;
-import android.support.annotation.StringRes;
import android.view.MotionEvent;
import android.view.View;
import android.widget.SeekBar;
@@ -11,6 +9,9 @@
import com.blankj.common.R;
import com.blankj.utilcode.util.StringUtils;
+import androidx.annotation.NonNull;
+import androidx.annotation.StringRes;
+
/**
*
* author: blankj
@@ -21,22 +22,22 @@
*/
public class CommonItemSeekBar extends CommonItem {
- private CharSequence mTitle;
- private CharSequence mContent;
- private int mMaxProgress;
- private int mCurProgress;
- private SeekBar.OnSeekBarChangeListener mOnSeekBarChangeListener;
+ private CharSequence mTitle;
+ private CharSequence mContent;
+ private int mMaxProgress;
+ private int mCurProgress;
+ private ProgressListener mProgressListener;
- public CommonItemSeekBar(@StringRes int title, int maxProgress, int curProgress, @NonNull SeekBar.OnSeekBarChangeListener itemClickListener) {
- this(StringUtils.getString(title), maxProgress, curProgress, itemClickListener);
+ public CommonItemSeekBar(@StringRes int title, int maxProgress, @NonNull ProgressListener listener) {
+ this(StringUtils.getString(title), maxProgress, listener);
}
- public CommonItemSeekBar(@NonNull CharSequence title, int maxProgress, int curProgress, @NonNull SeekBar.OnSeekBarChangeListener itemClickListener) {
+ public CommonItemSeekBar(@NonNull CharSequence title, int maxProgress, @NonNull ProgressListener listener) {
super(R.layout.common_item_title_seekbar);
mTitle = title;
mMaxProgress = maxProgress;
- mCurProgress = curProgress;
- mOnSeekBarChangeListener = itemClickListener;
+ mCurProgress = listener.getCurValue();
+ mProgressListener = listener;
mContent = String.valueOf(mCurProgress);
}
@@ -62,19 +63,21 @@ public boolean onTouch(View v, MotionEvent event) {
seekBar.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
@Override
public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
- mOnSeekBarChangeListener.onProgressChanged(seekBar, progress, fromUser);
- mCurProgress = progress;
- contentTv.setText(String.valueOf(progress));
+ mProgressListener.onProgressChanged(seekBar, progress, fromUser);
+ int curValue = mProgressListener.getCurValue();
+ mCurProgress = curValue;
+ contentTv.setText(String.valueOf(curValue));
+ seekBar.setProgress(curValue);
}
@Override
public void onStartTrackingTouch(SeekBar seekBar) {
- mOnSeekBarChangeListener.onStartTrackingTouch(seekBar);
+ mProgressListener.onStartTrackingTouch(seekBar);
}
@Override
public void onStopTrackingTouch(SeekBar seekBar) {
- mOnSeekBarChangeListener.onStartTrackingTouch(seekBar);
+ mProgressListener.onStopTrackingTouch(seekBar);
}
});
}
@@ -87,4 +90,17 @@ public void setTitle(CharSequence title) {
public CharSequence getTitle() {
return mTitle;
}
+
+ public static abstract class ProgressListener implements SeekBar.OnSeekBarChangeListener {
+
+ public abstract int getCurValue();
+
+ @Override
+ public void onStartTrackingTouch(SeekBar seekBar) {
+ }
+
+ @Override
+ public void onStopTrackingTouch(SeekBar seekBar) {
+ }
+ }
}
diff --git a/lib/common/src/main/java/com/blankj/common/item/CommonItemSwitch.java b/lib/common/src/main/java/com/blankj/common/item/CommonItemSwitch.java
index 39f1419503..cbb9b0792a 100644
--- a/lib/common/src/main/java/com/blankj/common/item/CommonItemSwitch.java
+++ b/lib/common/src/main/java/com/blankj/common/item/CommonItemSwitch.java
@@ -1,8 +1,6 @@
package com.blankj.common.item;
import android.annotation.SuppressLint;
-import android.support.annotation.NonNull;
-import android.support.annotation.StringRes;
import android.view.MotionEvent;
import android.view.View;
import android.widget.Switch;
@@ -14,7 +12,8 @@
import com.blankj.utilcode.util.StringUtils;
import com.blankj.utilcode.util.Utils;
-import kotlin.Unit;
+import androidx.annotation.NonNull;
+import androidx.annotation.StringRes;
/**
*
@@ -26,23 +25,23 @@
*/
public class CommonItemSwitch extends CommonItem {
- private CharSequence mTitle;
- private CharSequence mContent;
- private boolean mState;
- private Utils.Func1 mGetStateFunc1;
- private Utils.Func1 mSetStateFunc1;
+ private CharSequence mTitle;
+ private CharSequence mContent;
+ private boolean mState;
+ private Utils.Supplier mGetStateSupplier;
+ private Utils.Consumer mSetStateConsumer;
- public CommonItemSwitch(@StringRes int title, @NonNull Utils.Func1 getStateFun1, @NonNull Utils.Func1 setStateFun1) {
- this(StringUtils.getString(title), getStateFun1, setStateFun1);
+ public CommonItemSwitch(@StringRes int title, @NonNull Utils.Supplier getStateSupplier, @NonNull Utils.Consumer setStateConsumer) {
+ this(StringUtils.getString(title), getStateSupplier, setStateConsumer);
}
- public CommonItemSwitch(@NonNull CharSequence title, @NonNull Utils.Func1 getStateFun1, @NonNull Utils.Func1 setStateFun1) {
+ public CommonItemSwitch(@NonNull CharSequence title, @NonNull Utils.Supplier getStateSupplier, @NonNull Utils.Consumer setStateConsumer) {
super(R.layout.common_item_title_switch);
mTitle = title;
- mGetStateFunc1 = getStateFun1;
- mSetStateFunc1 = setStateFun1;
- mState = getStateFun1.call(null);
+ mGetStateSupplier = getStateSupplier;
+ mSetStateConsumer = setStateConsumer;
+ mState = getStateSupplier.get();
mContent = String.valueOf(mState);
}
@@ -69,8 +68,8 @@ public boolean onTouch(View v, MotionEvent event) {
holder.itemView.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- mSetStateFunc1.call(!mState);
- mState = mGetStateFunc1.call(null);
+ mSetStateConsumer.accept(!mState);
+ mState = mGetStateSupplier.get();
contentTv.setText(String.valueOf(mState));
switchView.setChecked(mState);
}
diff --git a/lib/common/src/main/java/com/blankj/common/item/CommonItemTitle.java b/lib/common/src/main/java/com/blankj/common/item/CommonItemTitle.java
index 557e983b30..0c088fb6ec 100644
--- a/lib/common/src/main/java/com/blankj/common/item/CommonItemTitle.java
+++ b/lib/common/src/main/java/com/blankj/common/item/CommonItemTitle.java
@@ -1,8 +1,6 @@
package com.blankj.common.item;
import android.graphics.Color;
-import android.support.annotation.NonNull;
-import android.support.annotation.StringRes;
import android.view.Gravity;
import android.widget.TextView;
@@ -11,7 +9,8 @@
import com.blankj.utilcode.util.StringUtils;
import com.blankj.utilcode.util.Utils;
-import kotlin.Unit;
+import androidx.annotation.NonNull;
+import androidx.annotation.StringRes;
/**
*
@@ -23,15 +22,15 @@
*/
public class CommonItemTitle extends CommonItem {
- private CharSequence mTitle;
- private Utils.Func1 mGetTitleFunc1;
- private boolean mIsTitleCenter;
- private CharSequence mContent;
+ private CharSequence mTitle;
+ private Utils.Supplier mGetTitleSupplier;
+ private boolean mIsTitleCenter;
+ private CharSequence mContent;
- public CommonItemTitle(@NonNull Utils.Func1 getTitleFunc1, boolean isTitleCenter) {
+ public CommonItemTitle(@NonNull Utils.Supplier getTitleSupplier, boolean isTitleCenter) {
super(R.layout.common_item_title_content);
- mTitle = mGetTitleFunc1.call(null);
- mGetTitleFunc1 = getTitleFunc1;
+ mTitle = mGetTitleSupplier.get();
+ mGetTitleSupplier = getTitleSupplier;
mIsTitleCenter = isTitleCenter;
}
@@ -54,8 +53,8 @@ public CommonItemTitle(@NonNull CharSequence title, CharSequence content) {
@Override
public void bind(@NonNull ItemViewHolder holder, int position) {
super.bind(holder, position);
- if (mGetTitleFunc1 != null) {
- mTitle = mGetTitleFunc1.call(null);
+ if (mGetTitleSupplier != null) {
+ mTitle = mGetTitleSupplier.get();
}
final TextView titleTv = holder.findViewById(R.id.commonItemTitleTv);
final TextView contentTv = holder.findViewById(R.id.commonItemContentTv);
@@ -76,8 +75,25 @@ public void bind(@NonNull ItemViewHolder holder, int position) {
}
public void setTitle(CharSequence title) {
+ setTitle(title, true);
+ }
+
+ public void setContent(CharSequence content) {
+ setContent(content, true);
+ }
+
+ public void setTitle(CharSequence title, boolean isUpdate) {
mTitle = title;
- update();
+ if (isUpdate) {
+ update();
+ }
+ }
+
+ public void setContent(CharSequence content, boolean isUpdate) {
+ mContent = content;
+ if (isUpdate) {
+ update();
+ }
}
public CharSequence getTitle() {
diff --git a/lib/common/src/main/java/com/blankj/common/view/RotateView.java b/lib/common/src/main/java/com/blankj/common/view/RotateView.java
new file mode 100644
index 0000000000..7d3e0a9c02
--- /dev/null
+++ b/lib/common/src/main/java/com/blankj/common/view/RotateView.java
@@ -0,0 +1,57 @@
+package com.blankj.common.view;
+
+import android.animation.ObjectAnimator;
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.View;
+import android.view.animation.LinearInterpolator;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+/**
+ *
+ * author: blankj
+ * blog : http://blankj.com
+ * time : 2020/03/28
+ * desc :
+ *
+ */
+public class RotateView extends View {
+
+ private ObjectAnimator headerAnimator;
+
+ public RotateView(Context context) {
+ this(context, null);
+ }
+
+ public RotateView(Context context, @Nullable AttributeSet attrs) {
+ this(context, attrs, 0);
+ }
+
+ public RotateView(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+ super(context, attrs, defStyleAttr);
+ }
+
+ @Override
+ protected void onVisibilityChanged(@NonNull View changedView, int visibility) {
+ super.onVisibilityChanged(changedView, visibility);
+ if (headerAnimator == null) {
+ initAnimator();
+ }
+ if (visibility == VISIBLE) {
+ headerAnimator.start();
+ } else {
+ headerAnimator.end();
+ }
+ }
+
+ private void initAnimator() {
+ headerAnimator = ObjectAnimator.ofFloat(this, "rotation", 0f, 360f);
+ headerAnimator.setRepeatCount(ObjectAnimator.INFINITE);
+ headerAnimator.setInterpolator(new LinearInterpolator());
+ headerAnimator.setRepeatMode(ObjectAnimator.RESTART);
+ headerAnimator.setDuration(1000);
+ headerAnimator.start();
+ }
+}
diff --git a/lib/common/src/main/res/drawable-xxhdpi/common_loading.png b/lib/common/src/main/res/drawable-xxhdpi/common_loading.png
index dd845f4f2e..6389a295de 100644
Binary files a/lib/common/src/main/res/drawable-xxhdpi/common_loading.png and b/lib/common/src/main/res/drawable-xxhdpi/common_loading.png differ
diff --git a/lib/common/src/main/res/drawable/common_loading_bg.xml b/lib/common/src/main/res/drawable/common_loading_bg.xml
new file mode 100644
index 0000000000..2454b72e20
--- /dev/null
+++ b/lib/common/src/main/res/drawable/common_loading_bg.xml
@@ -0,0 +1,5 @@
+
+
+
\ No newline at end of file
diff --git a/lib/common/src/main/res/layout/common_activity_drawer.xml b/lib/common/src/main/res/layout/common_activity_drawer.xml
index 966bc2af9a..3d2c27a6e7 100644
--- a/lib/common/src/main/res/layout/common_activity_drawer.xml
+++ b/lib/common/src/main/res/layout/common_activity_drawer.xml
@@ -1,5 +1,5 @@
-
-
-
+
+
diff --git a/lib/common/src/main/res/layout/common_activity_title_stub_scroll.xml b/lib/common/src/main/res/layout/common_activity_title_stub_scroll.xml
index e0eb288c1b..6a26dca6f2 100644
--- a/lib/common/src/main/res/layout/common_activity_title_stub_scroll.xml
+++ b/lib/common/src/main/res/layout/common_activity_title_stub_scroll.xml
@@ -1,5 +1,5 @@
-
+
-
\ No newline at end of file
+
@@ -59,18 +59,20 @@
- @null
-
-
diff --git a/lib/subutil/README-CN.md b/lib/subutil/README-CN.md
index 1375839321..a712609087 100644
--- a/lib/subutil/README-CN.md
+++ b/lib/subutil/README-CN.md
@@ -11,14 +11,11 @@
getAppStoreIntent: 获取跳转应用商店意图
```
-* ### 剪贴板相关 -> [ClipboardUtils.java][clipboard.java] -> [Test][clipboard.test]
+* ### 电池相关 -> [BatteryUtils.java][battery.java] -> [Demo][battery.demo]
```
-copyText : 复制文本到剪贴板
-getText : 获取剪贴板的文本
-copyUri : 复制 uri 到剪贴板
-getUri : 获取剪贴板的 uri
-copyIntent: 复制意图到剪贴板
-getIntent : 获取剪贴板的意图
+registerBatteryStatusChangedListener : 注册电池状态改变监听器
+isRegisteredBatteryStatusChangedListener: 判断是否注册电池状态改变监听器
+unregisterBatteryStatusChangedListener : 注销电池状态改变监听器
```
* ### 坐标转换相关 -> [CoordinateUtils.java][coordinate.java] -> [Test][coordinate.test]
@@ -81,8 +78,8 @@ getSurnameFirstLetter: 根据名字获取姓氏的首字母
[appStore.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/subutil/src/main/java/com/blankj/subutil/util/AppStoreUtils.java
[appStore.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/feature/subutil/pkg/src/main/java/com/blankj/subutil/pkg/feature/appStore/AppStoreActivity.kt
-[clipboard.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/subutil/src/main/java/com/blankj/subutil/util/ClipboardUtils.java
-[clipboard.test]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/subutil/src/test/java/com/blankj/subutil/util/ClipboardUtilsTest.java
+[battery.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/subutil/src/main/java/com/blankj/subutil/util/BatteryUtils.java
+[battery.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/feature/subutil/pkg/src/main/java/com/blankj/subutil/pkg/feature/battery/BatteryActivity.kt
[coordinate.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/subutil/src/main/java/com/blankj/subutil/util/CoordinateUtils.java
[coordinate.test]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/subutil/src/test/java/com/blankj/subutil/util/CoordinateUtilsTest.java
diff --git a/lib/subutil/README.md b/lib/subutil/README.md
index 8dca27dd71..f25b631c1b 100644
--- a/lib/subutil/README.md
+++ b/lib/subutil/README.md
@@ -11,14 +11,11 @@ You should copy the following classes which you want to use in your project.
getAppStoreIntent
```
-* ### About Clipboard -> [ClipboardUtils.java][clipboard.java] -> [Test][clipboard.test]
+* ### About Battery -> [BatteryUtils.java][battery.java] -> [Demo][battery.demo]
```
-copyText
-getText
-copyUri
-getUri
-copyIntent
-getIntent
+registerBatteryStatusChangedListener
+isRegisteredBatteryStatusChangedListener
+unregisterBatteryStatusChangedListener
```
* ### About Coordinate -> [CoordinateUtils.java][coordinate.java] -> [Test][coordinate.test]
@@ -81,8 +78,8 @@ getSurnameFirstLetter
[appStore.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/subutil/src/main/java/com/blankj/subutil/util/AppStoreUtils.java
[appStore.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/feature/subutil/pkg/src/main/java/com/blankj/subutil/pkg/feature/appStore/AppStoreActivity.kt
-[clipboard.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/subutil/src/main/java/com/blankj/subutil/util/ClipboardUtils.java
-[clipboard.test]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/subutil/src/test/java/com/blankj/subutil/util/ClipboardUtilsTest.java
+[battery.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/subutil/src/main/java/com/blankj/subutil/util/BatteryUtils.java
+[battery.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/feature/subutil/pkg/src/main/java/com/blankj/subutil/pkg/feature/battery/BatteryActivity.kt
[coordinate.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/subutil/src/main/java/com/blankj/subutil/util/CoordinateUtils.java
[coordinate.test]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/subutil/src/test/java/com/blankj/subutil/util/CoordinateUtilsTest.java
diff --git a/lib/subutil/build.gradle b/lib/subutil/build.gradle
index 4074688205..8a697c5a1e 100644
--- a/lib/subutil/build.gradle
+++ b/lib/subutil/build.gradle
@@ -1,7 +1,4 @@
apply {
- plugin Config.depConfig.plugin_traute.pluginId
- plugin Config.depConfig.plugin_maven.pluginId
- plugin Config.depConfig.plugin_bintray.pluginId
plugin "readme-sub"
}
@@ -11,16 +8,16 @@ readme {
}
dependencies {
- compileOnly Config.depConfig.support_appcompat_v7.dep
- compileOnly Config.depConfig.support_design.dep
- compileOnly Config.depConfig.lib_utilcode.dep
- api(Config.depConfig.glide.dep) {
+ compileOnly Config.libs.androidx_appcompat.path
+ compileOnly Config.libs.androidx_material.path
+ compileOnly Config.modules.lib_utilcode.dep
+ api(Config.libs.glide.path) {
exclude group: "com.android.support"
}
- api Config.depConfig.retrofit.dep
- api Config.depConfig.gson.dep
+ api Config.libs.retrofit.path
+ api Config.libs.gson.path
- testImplementation Config.depConfig.lib_utilcode.dep
- testImplementation Config.depConfig.test_junit.dep
- testImplementation Config.depConfig.test_robolectric.dep
+ testImplementation Config.modules.lib_utilcode.dep
+ testImplementation Config.libs.test_junit.path
+ testImplementation Config.libs.test_robolectric.path
}
\ No newline at end of file
diff --git a/lib/subutil/src/main/java/com/blankj/subutil/util/AppStoreUtils.java b/lib/subutil/src/main/java/com/blankj/subutil/util/AppStoreUtils.java
index b54d183952..92aa89be0b 100644
--- a/lib/subutil/src/main/java/com/blankj/subutil/util/AppStoreUtils.java
+++ b/lib/subutil/src/main/java/com/blankj/subutil/util/AppStoreUtils.java
@@ -1,13 +1,12 @@
package com.blankj.subutil.util;
import android.content.Intent;
-import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;
import android.net.Uri;
-import android.text.TextUtils;
import android.util.Log;
+import com.blankj.utilcode.util.AppUtils;
import com.blankj.utilcode.util.RomUtils;
import com.blankj.utilcode.util.Utils;
@@ -21,7 +20,7 @@
* desc : utils about app store
*
*/
-public class AppStoreUtils {
+public final class AppStoreUtils {
private static final String TAG = "AppStoreUtils";
@@ -88,7 +87,7 @@ public static Intent getAppStoreIntent(final String packageName, boolean isInclu
for (ResolveInfo resolveInfo : resolveInfos) {
String pkgName = resolveInfo.activityInfo.packageName;
if (!GOOGLE_PLAY_APP_STORE_PACKAGE_NAME.equals(pkgName)) {
- if (isAppSystem(pkgName)) {
+ if (AppUtils.isAppSystem(pkgName)) {
intent.setPackage(pkgName);
return intent;
}
@@ -105,25 +104,6 @@ public static Intent getAppStoreIntent(final String packageName, boolean isInclu
return intent;
}
- private static boolean go2NormalAppStore(String packageName) {
- Intent intent = getNormalAppStoreIntent();
- if (intent == null) return false;
- intent.setData(Uri.parse("market://details?id=" + packageName));
- intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
- Utils.getApp().startActivity(intent);
- return true;
- }
-
- private static Intent getNormalAppStoreIntent() {
- Intent intent = new Intent();
- Uri uri = Uri.parse("market://details?id=" + Utils.getApp().getPackageName());
- intent.setData(uri);
- if (getAvailableIntentSize(intent) > 0) {
- return intent;
- }
- return null;
- }
-
private static Intent getSamsungAppStoreIntent(final String packageName) {
Intent intent = new Intent();
intent.setClassName("com.sec.android.app.samsungapps", "com.sec.android.app.samsungapps.Main");
@@ -152,16 +132,4 @@ private static int getAvailableIntentSize(final Intent intent) {
.queryIntentActivities(intent, PackageManager.MATCH_DEFAULT_ONLY)
.size();
}
-
- private static boolean isAppSystem(final String packageName) {
- if (TextUtils.isEmpty(packageName)) return false;
- try {
- PackageManager pm = Utils.getApp().getPackageManager();
- ApplicationInfo ai = pm.getApplicationInfo(packageName, 0);
- return ai != null && (ai.flags & ApplicationInfo.FLAG_SYSTEM) != 0;
- } catch (PackageManager.NameNotFoundException e) {
- e.printStackTrace();
- return false;
- }
- }
}
diff --git a/lib/subutil/src/main/java/com/blankj/subutil/util/BatteryUtils.java b/lib/subutil/src/main/java/com/blankj/subutil/util/BatteryUtils.java
new file mode 100644
index 0000000000..c00433374a
--- /dev/null
+++ b/lib/subutil/src/main/java/com/blankj/subutil/util/BatteryUtils.java
@@ -0,0 +1,213 @@
+package com.blankj.subutil.util;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.os.BatteryManager;
+import android.os.Build;
+import android.os.PowerManager;
+
+import com.blankj.utilcode.util.ThreadUtils;
+import com.blankj.utilcode.util.Utils;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.util.HashSet;
+import java.util.Set;
+
+import androidx.annotation.IntDef;
+import androidx.annotation.RequiresApi;
+
+/**
+ *
+ * author: blankj
+ * blog : http://blankj.com
+ * time : 2020/03/31
+ * desc :
+ *
+ */
+public final class BatteryUtils {
+
+ @IntDef({BatteryStatus.UNKNOWN, BatteryStatus.DISCHARGING, BatteryStatus.CHARGING,
+ BatteryStatus.NOT_CHARGING, BatteryStatus.FULL})
+ @Retention(RetentionPolicy.SOURCE)
+ public @interface BatteryStatus {
+ int UNKNOWN = BatteryManager.BATTERY_STATUS_UNKNOWN;
+ int DISCHARGING = BatteryManager.BATTERY_STATUS_DISCHARGING;
+ int CHARGING = BatteryManager.BATTERY_STATUS_CHARGING;
+ int NOT_CHARGING = BatteryManager.BATTERY_STATUS_NOT_CHARGING;
+ int FULL = BatteryManager.BATTERY_STATUS_FULL;
+ }
+
+ /**
+ * Return whether the app is on the device's power whitelist.
+ *
+ * @return {@code true}: yes mListeners = new HashSet<>();
+
+ void registerListener(final OnBatteryStatusChangedListener listener) {
+ if (listener == null) return;
+ ThreadUtils.runOnUiThread(new Runnable() {
+ @Override
+ public void run() {
+ int preSize = mListeners.size();
+ mListeners.add(listener);
+ if (preSize == 0 && mListeners.size() == 1) {
+ IntentFilter intentFilter = new IntentFilter();
+ intentFilter.addAction(Intent.ACTION_BATTERY_CHANGED);
+ Utils.getApp().registerReceiver(BatteryChangedReceiver.getInstance(), intentFilter);
+ }
+ }
+ });
+ }
+
+ boolean isRegistered(final OnBatteryStatusChangedListener listener) {
+ if (listener == null) return false;
+ return mListeners.contains(listener);
+ }
+
+ void unregisterListener(final OnBatteryStatusChangedListener listener) {
+ if (listener == null) return;
+ ThreadUtils.runOnUiThread(new Runnable() {
+ @Override
+ public void run() {
+ int preSize = mListeners.size();
+ mListeners.remove(listener);
+ if (preSize == 1 && mListeners.size() == 0) {
+ Utils.getApp().unregisterReceiver(BatteryChangedReceiver.getInstance());
+ }
+ }
+ });
+ }
+
+ @Override
+ public void onReceive(Context context, final Intent intent) {
+ if (Intent.ACTION_BATTERY_CHANGED.equals(intent.getAction())) {
+ ThreadUtils.runOnUiThread(new Runnable() {
+ @Override
+ public void run() {
+ int level = intent.getIntExtra(BatteryManager.EXTRA_LEVEL, -1);
+ int status = intent.getIntExtra(BatteryManager.EXTRA_STATUS, BatteryStatus.UNKNOWN);
+ for (OnBatteryStatusChangedListener listener : mListeners) {
+ listener.onBatteryStatusChanged(new Status(level, status));
+ }
+ }
+ });
+ }
+ }
+
+ private static class LazyHolder {
+ private static final BatteryChangedReceiver INSTANCE = new BatteryChangedReceiver();
+ }
+ }
+
+ public interface OnBatteryStatusChangedListener {
+ void onBatteryStatusChanged(Status status);
+ }
+
+ public static final class Status {
+ private int level;
+ @BatteryStatus
+ private int status;
+
+ Status(int level, int status) {
+ this.level = level;
+ this.status = status;
+ }
+
+ public int getLevel() {
+ return level;
+ }
+
+ public void setLevel(int level) {
+ this.level = level;
+ }
+
+ @BatteryStatus
+ public int getStatus() {
+ return status;
+ }
+
+ public void setStatus(int status) {
+ this.status = status;
+ }
+
+ @Override
+ public String toString() {
+ return batteryStatus2String(status) + ": " + level + "%";
+ }
+
+ public static String batteryStatus2String(@BatteryStatus int status) {
+ if (status == BatteryStatus.DISCHARGING) {
+ return "discharging";
+ }
+ if (status == BatteryStatus.CHARGING) {
+ return "charging";
+ }
+ if (status == BatteryStatus.NOT_CHARGING) {
+ return "not_charging";
+ }
+ if (status == BatteryStatus.FULL) {
+ return "full";
+ }
+ return "unknown";
+ }
+ }
+}
diff --git a/lib/subutil/src/main/java/com/blankj/subutil/util/ClipboardUtils.java b/lib/subutil/src/main/java/com/blankj/subutil/util/ClipboardUtils.java
deleted file mode 100644
index 13f1061d7e..0000000000
--- a/lib/subutil/src/main/java/com/blankj/subutil/util/ClipboardUtils.java
+++ /dev/null
@@ -1,96 +0,0 @@
-package com.blankj.subutil.util;
-
-import android.content.ClipData;
-import android.content.ClipboardManager;
-import android.content.Context;
-import android.content.Intent;
-import android.net.Uri;
-
-import com.blankj.utilcode.util.Utils;
-
-/**
- *
- * author: Blankj
- * blog : http://blankj.com
- * time : 2016/09/25
- * desc : 剪贴板相关工具类
- *
- */
-public final class ClipboardUtils {
-
- private ClipboardUtils() {
- throw new UnsupportedOperationException("u can't instantiate me...");
- }
-
- /**
- * 复制文本到剪贴板
- *
- * @param text 文本
- */
- public static void copyText(final CharSequence text) {
- ClipboardManager cm = (ClipboardManager) Utils.getApp().getSystemService(Context.CLIPBOARD_SERVICE);
- cm.setPrimaryClip(ClipData.newPlainText("text", text));
- }
-
- /**
- * 获取剪贴板的文本
- *
- * @return 剪贴板的文本
- */
- public static CharSequence getText() {
- ClipboardManager cm = (ClipboardManager) Utils.getApp().getSystemService(Context.CLIPBOARD_SERVICE);
- ClipData clip = cm.getPrimaryClip();
- if (clip != null && clip.getItemCount() > 0) {
- return clip.getItemAt(0).coerceToText(Utils.getApp());
- }
- return null;
- }
-
- /**
- * 复制uri到剪贴板
- *
- * @param uri uri
- */
- public static void copyUri(final Uri uri) {
- ClipboardManager cm = (ClipboardManager) Utils.getApp().getSystemService(Context.CLIPBOARD_SERVICE);
- cm.setPrimaryClip(ClipData.newUri(Utils.getApp().getContentResolver(), "uri", uri));
- }
-
- /**
- * 获取剪贴板的uri
- *
- * @return 剪贴板的uri
- */
- public static Uri getUri() {
- ClipboardManager cm = (ClipboardManager) Utils.getApp().getSystemService(Context.CLIPBOARD_SERVICE);
- ClipData clip = cm.getPrimaryClip();
- if (clip != null && clip.getItemCount() > 0) {
- return clip.getItemAt(0).getUri();
- }
- return null;
- }
-
- /**
- * 复制意图到剪贴板
- *
- * @param intent 意图
- */
- public static void copyIntent(final Intent intent) {
- ClipboardManager cm = (ClipboardManager) Utils.getApp().getSystemService(Context.CLIPBOARD_SERVICE);
- cm.setPrimaryClip(ClipData.newIntent("intent", intent));
- }
-
- /**
- * 获取剪贴板的意图
- *
- * @return 剪贴板的意图
- */
- public static Intent getIntent() {
- ClipboardManager cm = (ClipboardManager) Utils.getApp().getSystemService(Context.CLIPBOARD_SERVICE);
- ClipData clip = cm.getPrimaryClip();
- if (clip != null && clip.getItemCount() > 0) {
- return clip.getItemAt(0).getIntent();
- }
- return null;
- }
-}
diff --git a/lib/subutil/src/main/java/com/blankj/subutil/util/CoordinateUtils.java b/lib/subutil/src/main/java/com/blankj/subutil/util/CoordinateUtils.java
index ee6d78a118..c205a52a75 100644
--- a/lib/subutil/src/main/java/com/blankj/subutil/util/CoordinateUtils.java
+++ b/lib/subutil/src/main/java/com/blankj/subutil/util/CoordinateUtils.java
@@ -121,6 +121,34 @@ public static double[] wgs84ToBd09(double lng, double lat) {
return gcj02ToBd09(gcj[0], gcj[1]);
}
+ /**
+ * Mercator 坐标转 WGS84 坐标
+ *
+ * @param lng Mercator 坐标经度
+ * @param lat Mercator 坐标纬度
+ * @return WGS84 坐标：[经度，纬度]
+ */
+ public static double[] mercatorToWGS84(double lng, double lat) {
+ double x = lng / 20037508.34d * 180.;
+ double y = lat / 20037508.34d * 180.;
+ y = 180 / PI * (2 * Math.atan(Math.exp(y * PI / 180.0)) - PI / 2);
+ return new double[]{x, y};
+ }
+
+ /**
+ * WGS84 坐标转 Mercator 坐标
+ *
+ * @param lng WGS84 坐标经度
+ * @param lat WGS84 坐标纬度
+ * @return Mercator 坐标：[经度，纬度]
+ */
+ public static double[] wgs84ToMercator(double lng, double lat) {
+ double x = lng * 20037508.34D / 180.0;
+ double y = Math.log(Math.tan((90.0 + lat) * PI / 360.0)) / (PI / 180.);
+ y = y * 20037508.34D / 180.0;
+ return new double[]{x, y};
+ }
+
private static double transformLat(double lng, double lat) {
double ret = -100.0 + 2.0 * lng + 3.0 * lat + 0.2 * lat * lat + 0.1 * lng * lat + 0.2 * Math.sqrt(Math.abs(lng));
ret += (20.0 * Math.sin(6.0 * lng * PI) + 20.0 * Math.sin(2.0 * lng * PI)) * 2.0 / 3.0;
diff --git a/lib/subutil/src/main/java/com/blankj/subutil/util/DangerousUtils.java b/lib/subutil/src/main/java/com/blankj/subutil/util/DangerousUtils.java
index 4d8fd89d65..d7ed5d0ea9 100644
--- a/lib/subutil/src/main/java/com/blankj/subutil/util/DangerousUtils.java
+++ b/lib/subutil/src/main/java/com/blankj/subutil/util/DangerousUtils.java
@@ -5,12 +5,12 @@
import android.content.Intent;
import android.os.Build;
import android.os.PowerManager;
-import android.support.annotation.RequiresPermission;
import android.telephony.SmsManager;
import android.telephony.TelephonyManager;
import android.text.TextUtils;
import android.util.Log;
+import com.blankj.utilcode.util.IntentUtils;
import com.blankj.utilcode.util.ShellUtils;
import com.blankj.utilcode.util.Utils;
@@ -18,6 +18,8 @@
import java.lang.reflect.Method;
import java.util.List;
+import androidx.annotation.RequiresPermission;
+
import static android.Manifest.permission.MODIFY_PHONE_STATE;
import static android.Manifest.permission.SEND_SMS;
@@ -229,9 +231,7 @@ public static boolean shutdown() {
try {
ShellUtils.CommandResult result = ShellUtils.execCmd("reboot -p", true);
if (result.result == 0) return true;
- Intent intent = new Intent("android.intent.action.ACTION_REQUEST_SHUTDOWN");
- intent.putExtra("android.intent.extra.KEY_CONFIRM", false);
- Utils.getApp().startActivity(intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
+ Utils.getApp().startActivity(IntentUtils.getShutdownIntent());
return true;
} catch (Exception e) {
return false;
@@ -326,7 +326,7 @@ public static boolean setMobileDataEnabled(final boolean enabled) {
setDataEnabledMethod.invoke(tm, enabled);
return true;
} catch (Exception e) {
- Log.e("NetworkUtils", "setMobileDataEnabled: ", e);
+ e.printStackTrace();
}
return false;
}
diff --git a/lib/subutil/src/main/java/com/blankj/subutil/util/HttpsUtil.java b/lib/subutil/src/main/java/com/blankj/subutil/util/HttpsUtil.java
index 24356f5187..e0acb09850 100644
--- a/lib/subutil/src/main/java/com/blankj/subutil/util/HttpsUtil.java
+++ b/lib/subutil/src/main/java/com/blankj/subutil/util/HttpsUtil.java
@@ -8,7 +8,11 @@
import java.util.Scanner;
/**
- * Create by MilkZS on 2019/1/9 13:36
+ *
+ * author: MilkZS
+ * time : 2019/01/09
+ * desc : https 工具类
+ *
*/
public final class HttpsUtil {
diff --git a/lib/subutil/src/main/java/com/blankj/subutil/util/LocationUtils.java b/lib/subutil/src/main/java/com/blankj/subutil/util/LocationUtils.java
index 3b16dcaf50..ba65b13900 100755
--- a/lib/subutil/src/main/java/com/blankj/subutil/util/LocationUtils.java
+++ b/lib/subutil/src/main/java/com/blankj/subutil/util/LocationUtils.java
@@ -11,7 +11,7 @@
import android.location.LocationProvider;
import android.os.Bundle;
import android.provider.Settings;
-import android.support.annotation.RequiresPermission;
+import androidx.annotation.RequiresPermission;
import android.util.Log;
import com.blankj.utilcode.util.Utils;
diff --git a/lib/subutil/src/main/java/com/blankj/subutil/util/PinyinUtils.java b/lib/subutil/src/main/java/com/blankj/subutil/util/PinyinUtils.java
index 22486b3a91..934408c65e 100644
--- a/lib/subutil/src/main/java/com/blankj/subutil/util/PinyinUtils.java
+++ b/lib/subutil/src/main/java/com/blankj/subutil/util/PinyinUtils.java
@@ -1,6 +1,6 @@
package com.blankj.subutil.util;
-import android.support.v4.util.SimpleArrayMap;
+import androidx.collection.SimpleArrayMap;
/**
*
diff --git a/lib/subutil/src/main/java/com/blankj/subutil/util/TemperatureUtils.java b/lib/subutil/src/main/java/com/blankj/subutil/util/TemperatureUtils.java
new file mode 100644
index 0000000000..f50687ab59
--- /dev/null
+++ b/lib/subutil/src/main/java/com/blankj/subutil/util/TemperatureUtils.java
@@ -0,0 +1,40 @@
+package com.blankj.subutil.util;
+
+/**
+ *
+ * author: Faramarz Afzali
+ * time : 2020/09/05
+ * desc : This class is intended for converting temperatures into different units.
+ * C refers to the Celsius unit
+ * F refers to the Fahrenheit unit
+ * K refers to the Kelvin unit
+ *
+ */
+public final class TemperatureUtils {
+
+ public static float cToF(float temp) {
+ return (temp * 9) / 5 + 32;
+ }
+
+ public static float cToK(float temp) {
+ return temp + 273.15f;
+ }
+
+
+ public static float fToC(float temp) {
+ return (temp - 32) * 5 / 9;
+ }
+
+ public static float fToK(float temp) {
+ return temp + 255.3722222222f;
+ }
+
+
+ public static float kToC(float temp) {
+ return temp - 273.15f;
+ }
+
+ public static float kToF(float temp) {
+ return temp - 459.67f;
+ }
+}
diff --git a/lib/subutil/src/main/java/com/blankj/subutil/util/Utils.java b/lib/subutil/src/main/java/com/blankj/subutil/util/Utils.java
new file mode 100644
index 0000000000..91b336abcf
--- /dev/null
+++ b/lib/subutil/src/main/java/com/blankj/subutil/util/Utils.java
@@ -0,0 +1,143 @@
+package com.blankj.subutil.util;
+
+import android.annotation.SuppressLint;
+import android.app.Application;
+import android.content.ContentProvider;
+import android.content.ContentValues;
+import android.content.Context;
+import android.database.Cursor;
+import android.net.Uri;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import java.lang.reflect.InvocationTargetException;
+
+/**
+ *
+ * author:
+ * ___ ___ ___ ___
+ * _____ / /\ /__/\ /__/| / /\
+ * / /::\ / /::\ \ \:\ | |:| / /:/
+ * / /:/\:\ ___ ___ / /:/\:\ \ \:\ | |:| /__/::\
+ * / /:/~/::\ /__/\ / /\ / /:/~/::\ _____\__\:\ __| |:| \__\/\:\
+ * /__/:/ /:/\:| \ \:\ / /:/ /__/:/ /:/\:\ /__/::::::::\ /__/\_|:|____ \ \:\
+ * \ \:\/:/~/:/ \ \:\ /:/ \ \:\/:/__\/ \ \:\~~\~~\/ \ \:\/:::::/ \__\:\
+ * \ \::/ /:/ \ \:\/:/ \ \::/ \ \:\ ~~~ \ \::/~~~~ / /:/
+ * \ \:\/:/ \ \::/ \ \:\ \ \:\ \ \:\ /__/:/
+ * \ \::/ \__\/ \ \:\ \ \:\ \ \:\ \__\/
+ * \__\/ \__\/ \__\/ \__\/
+ * blog : http://blankj.com
+ * time : 16/12/08
+ * desc : utils about initialization
+ *
+ */
+public final class Utils {
+
+ @SuppressLint("StaticFieldLeak")
+ private static Application sApplication;
+
+ private Utils() {
+ throw new UnsupportedOperationException("u can't instantiate me...");
+ }
+
+ /**
+ * Init utils.
+ * Init it in the class of Application.
+ *
+ * @param context context
+ */
+ public static void init(final Context context) {
+ if (context == null) {
+ init(getApplicationByReflect());
+ return;
+ }
+ init((Application) context.getApplicationContext());
+ }
+
+ /**
+ * Init utils.
+ * Init it in the class of Application.
+ *
+ * @param app application
+ */
+ public static void init(final Application app) {
+ if (sApplication == null) {
+ if (app == null) {
+ Utils.sApplication = getApplicationByReflect();
+ } else {
+ Utils.sApplication = app;
+ }
+ }
+ }
+
+ /**
+ * Return the context of Application object.
+ *
+ * @return the context of Application object
+ */
+ public static Application getApp() {
+ if (sApplication != null) return sApplication;
+ return getApplicationByReflect();
+ }
+
+ private static Application getApplicationByReflect() {
+ try {
+ @SuppressLint("PrivateApi")
+ Class activityThread = Class.forName("android.app.ActivityThread");
+ Object at = activityThread.getMethod("currentActivityThread").invoke(null);
+ Object app = activityThread.getMethod("getApplication").invoke(at);
+ if (app == null) {
+ throw new NullPointerException("u should init first");
+ }
+ init((Application) app);
+ return sApplication;
+ } catch (NoSuchMethodException e) {
+ e.printStackTrace();
+ } catch (IllegalAccessException e) {
+ e.printStackTrace();
+ } catch (InvocationTargetException e) {
+ e.printStackTrace();
+ } catch (ClassNotFoundException e) {
+ e.printStackTrace();
+ }
+ throw new NullPointerException("u should init first");
+ }
+
+
+ public static final class ContentProvider4SubUtil extends ContentProvider {
+
+ @Override
+ public boolean onCreate() {
+ Utils.init(getContext());
+ return true;
+ }
+
+ @Nullable
+ @Override
+ public Cursor query(@NonNull Uri uri, @Nullable String[] projection, @Nullable String selection, @Nullable String[] selectionArgs, @Nullable String sortOrder) {
+ return null;
+ }
+
+ @Nullable
+ @Override
+ public String getType(@NonNull Uri uri) {
+ return null;
+ }
+
+ @Nullable
+ @Override
+ public Uri insert(@NonNull Uri uri, @Nullable ContentValues values) {
+ return null;
+ }
+
+ @Override
+ public int delete(@NonNull Uri uri, @Nullable String selection, @Nullable String[] selectionArgs) {
+ return 0;
+ }
+
+ @Override
+ public int update(@NonNull Uri uri, @Nullable ContentValues values, @Nullable String selection, @Nullable String[] selectionArgs) {
+ return 0;
+ }
+ }
+}
\ No newline at end of file
diff --git a/lib/subutil/src/main/java/com/blankj/subutil/util/http/ExecutorFactory.java b/lib/subutil/src/main/java/com/blankj/subutil/util/http/ExecutorFactory.java
index f5583397d9..2f26fb9c24 100644
--- a/lib/subutil/src/main/java/com/blankj/subutil/util/http/ExecutorFactory.java
+++ b/lib/subutil/src/main/java/com/blankj/subutil/util/http/ExecutorFactory.java
@@ -2,7 +2,8 @@
import android.os.Handler;
import android.os.Looper;
-import android.support.annotation.NonNull;
+
+import androidx.annotation.NonNull;
import java.util.concurrent.Executor;
import java.util.concurrent.LinkedBlockingQueue;
diff --git a/lib/subutil/src/main/java/com/blankj/subutil/util/http/HttpUtils.java b/lib/subutil/src/main/java/com/blankj/subutil/util/http/HttpUtils.java
index 451ecb03d7..8c06c36e3c 100644
--- a/lib/subutil/src/main/java/com/blankj/subutil/util/http/HttpUtils.java
+++ b/lib/subutil/src/main/java/com/blankj/subutil/util/http/HttpUtils.java
@@ -1,7 +1,8 @@
package com.blankj.subutil.util.http;
import android.accounts.NetworkErrorException;
-import android.support.annotation.NonNull;
+
+import androidx.annotation.NonNull;
import java.io.BufferedOutputStream;
import java.io.ByteArrayOutputStream;
diff --git a/lib/subutil/src/main/java/com/blankj/subutil/util/http/Request.java b/lib/subutil/src/main/java/com/blankj/subutil/util/http/Request.java
index aa0f8ffa69..e409010a7e 100644
--- a/lib/subutil/src/main/java/com/blankj/subutil/util/http/Request.java
+++ b/lib/subutil/src/main/java/com/blankj/subutil/util/http/Request.java
@@ -1,6 +1,7 @@
package com.blankj.subutil.util.http;
-import android.support.annotation.NonNull;
+
+import androidx.annotation.NonNull;
import java.io.BufferedInputStream;
import java.io.ByteArrayInputStream;
diff --git a/lib/subutil/src/main/java/com/blankj/subutil/util/http/SSLConfig.java b/lib/subutil/src/main/java/com/blankj/subutil/util/http/SSLConfig.java
index 181ccd04fc..69fab40981 100644
--- a/lib/subutil/src/main/java/com/blankj/subutil/util/http/SSLConfig.java
+++ b/lib/subutil/src/main/java/com/blankj/subutil/util/http/SSLConfig.java
@@ -2,7 +2,8 @@
import android.annotation.SuppressLint;
import android.os.Build;
-import android.support.annotation.NonNull;
+
+import androidx.annotation.NonNull;
import java.io.IOException;
import java.net.InetAddress;
diff --git a/lib/subutil/src/test/java/com/blankj/subutil/util/BaseTest.java b/lib/subutil/src/test/java/com/blankj/subutil/util/BaseTest.java
index de2d6b30c8..d21100695e 100644
--- a/lib/subutil/src/test/java/com/blankj/subutil/util/BaseTest.java
+++ b/lib/subutil/src/test/java/com/blankj/subutil/util/BaseTest.java
@@ -30,6 +30,5 @@ public BaseTest() {
@Test
public void test() throws Exception {
- System.out.println("1234");
}
}
diff --git a/lib/subutil/src/test/java/com/blankj/subutil/util/ClipboardUtilsTest.java b/lib/subutil/src/test/java/com/blankj/subutil/util/ClipboardUtilsTest.java
deleted file mode 100644
index e1d550fb5c..0000000000
--- a/lib/subutil/src/test/java/com/blankj/subutil/util/ClipboardUtilsTest.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package com.blankj.subutil.util;
-
-import android.content.Intent;
-import android.net.Uri;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.annotation.Config;
-
-import static org.junit.Assert.assertEquals;
-
-
-/**
- *
- * author: Blankj
- * blog : http://blankj.com
- * time : 2016/09/26
- * desc : ClipboardUtils 单元测试
- *
- */
-@RunWith(RobolectricTestRunner.class)
-@Config(manifest = Config.NONE)
-public class ClipboardUtilsTest {
-
- static {
- TestUtils.init();
- }
-
- @Test
- public void testText() throws Exception {
- ClipboardUtils.copyText("test");
- assertEquals("test", ClipboardUtils.getText());
- }
-
- @Test
- public void testUri() throws Exception {
- ClipboardUtils.copyUri(Uri.parse("http://www.blankj.com/"));
- System.out.println((ClipboardUtils.getUri()));
- }
-
- @Test
- public void testIntent() throws Exception {
- Intent intent = new Intent();
- intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
- intent.setAction(Intent.ACTION_DIAL);
- ClipboardUtils.copyIntent(intent);
- System.out.println(ClipboardUtils.getText());
- }
-}
\ No newline at end of file
diff --git a/lib/subutil/src/test/java/com/blankj/subutil/util/TemperatureUtilsTest.java b/lib/subutil/src/test/java/com/blankj/subutil/util/TemperatureUtilsTest.java
new file mode 100644
index 0000000000..84ee329851
--- /dev/null
+++ b/lib/subutil/src/test/java/com/blankj/subutil/util/TemperatureUtilsTest.java
@@ -0,0 +1,54 @@
+package com.blankj.subutil.util;
+
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+
+/**
+ *
+ * author: Blankj
+ * blog : http://blankj.com
+ * time : 2018/03/22
+ * desc : TemperatureUtils 单元测试
+ *
+ */
+@RunWith(JUnit4.class)
+public class TemperatureUtilsTest {
+
+ private float delta = 1e-15f;
+
+ @Test
+ public void cToF() {
+ Assert.assertEquals(32f, TemperatureUtils.cToF(0f), delta);
+ }
+
+ @Test
+ public void cToK() {
+ Assert.assertEquals(273.15f, TemperatureUtils.cToK(0f), delta);
+ }
+
+
+ @Test
+ public void fToC() {
+ Assert.assertEquals(-17.777779f, TemperatureUtils.fToC(0f), delta);
+ }
+
+ @Test
+ public void fToK() {
+ Assert.assertEquals(255.3722222222f, TemperatureUtils.fToK(0f), delta);
+ }
+
+
+ @Test
+ public void kToC() {
+ Assert.assertEquals(-273.15f, TemperatureUtils.kToC(0f), delta);
+ }
+
+ @Test
+ public void kToF() {
+ Assert.assertEquals(-459.67f, TemperatureUtils.kToF(0f), delta);
+ }
+
+}
diff --git a/lib/subutil/src/test/java/com/blankj/subutil/util/TestUtils.java b/lib/subutil/src/test/java/com/blankj/subutil/util/TestUtils.java
deleted file mode 100644
index 78422556ed..0000000000
--- a/lib/subutil/src/test/java/com/blankj/subutil/util/TestUtils.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.blankj.subutil.util;
-
-import com.blankj.utilcode.util.Utils;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-/**
- *
- * author: Blankj
- * blog : http://blankj.com
- * time : 2016/08/21
- * desc : utils about test
- *
- */
-@RunWith(RobolectricTestRunner.class)
-@Config(manifest = Config.NONE)
-public class TestUtils {
-
- public static void init() {
- Utils.init(RuntimeEnvironment.application);
- }
-
- @Test
- public void test() throws Exception {
-
- }
-}
\ No newline at end of file
diff --git a/lib/utilcode/README-CN.md b/lib/utilcode/README-CN.md
index a8c77bc6b8..6610b3be99 100644
--- a/lib/utilcode/README-CN.md
+++ b/lib/utilcode/README-CN.md
@@ -2,10 +2,11 @@
Gradle:
```groovy
-implementation 'com.blankj:utilcode:1.26.0'
-
// if u use AndroidX, use the following
-implementation 'com.blankj:utilcodex:1.26.0'
+implementation 'com.blankj:utilcodex:1.31.1'
+
+// Not in maintenance
+implementation 'com.blankj:utilcode:1.30.7'
```
@@ -13,24 +14,26 @@ implementation 'com.blankj:utilcodex:1.26.0'
* ### Activity 相关 -> [ActivityUtils.java][activity.java] -> [Demo][activity.demo]
```
-getActivityByView : 根据视图获取 Activity
-getActivityByContext : 根据上下文获取 Activity
-isActivityExists : 判断 Activity 是否存在
-startActivity : 启动 Activity
-startActivityForResult : 启动 Activity 为返回结果
-startActivities : 启动多个 Activity
-startHomeActivity : 回到桌面
-getActivityList : 获取 Activity 栈链表
-getLauncherActivity : 获取启动项 Activity
-getMainActivities : 获取主的 Activity 们
-getTopActivity : 获取栈顶 Activity
-isActivityAlive : 判断 Activity 是否存活
-isActivityExistsInStack : 判断 Activity 是否存在栈中
-finishActivity : 结束 Activity
-finishToActivity : 结束到指定 Activity
-finishOtherActivities : 结束所有其他类型的 Activity
-finishAllActivities : 结束所有 Activity
-finishAllActivitiesExceptNewest: 结束除最新之外的所有 Activity
+addActivityLifecycleCallbacks : 增加 Activity 生命周期监听
+removeActivityLifecycleCallbacks: 移除 Activity 生命周期监听
+getAliveActivityByContext : 根据上下文获取存活的 Activity
+getActivityByContext : 根据上下文获取 Activity
+isActivityExists : 判断 Activity 是否存在
+startActivity : 启动 Activity
+startActivityForResult : 启动 Activity 为返回结果
+startActivities : 启动多个 Activity
+startHomeActivity : 回到桌面
+getActivityList : 获取 Activity 栈链表
+getLauncherActivity : 获取启动项 Activity
+getMainActivities : 获取主的 Activity 们
+getTopActivity : 获取栈顶 Activity
+isActivityAlive : 判断 Activity 是否存活
+isActivityExistsInStack : 判断 Activity 是否存在栈中
+finishActivity : 结束 Activity
+finishToActivity : 结束到指定 Activity
+finishOtherActivities : 结束所有其他类型的 Activity
+finishAllActivities : 结束所有 Activity
+finishAllActivitiesExceptNewest : 结束除最新之外的所有 Activity
```
* ### AdaptScreen 相关 -> [AdaptScreenUtils.java][adaptScreen.java] -> [Demo][adaptScreen.demo]
@@ -69,13 +72,16 @@ getAppName : 获取 App 名称
getAppPath : 获取 App 路径
getAppVersionName : 获取 App 版本号
getAppVersionCode : 获取 App 版本码
-getAppSignature : 获取 App 签名
-getAppSignatureSHA1 : 获取应用签名的的 SHA1 值
-getAppSignatureSHA256 : 获取应用签名的的 SHA256 值
-getAppSignatureMD5 : 获取应用签名的的 MD5 值
+getAppMinSdkVersion : 获取 App 支持最低系统版本号
+getAppTargetSdkVersion : 获取 App 目标系统版本号
+getAppSignatures : 获取 App 签名
+getAppSignaturesSHA1 : 获取应用签名的的 SHA1 值
+getAppSignaturesSHA256 : 获取应用签名的的 SHA256 值
+getAppSignaturesMD5 : 获取应用签名的的 MD5 值
getAppInfo : 获取 App 信息
getAppsInfo : 获取所有已安装 App 信息
getApkInfo : 获取 Apk 信息
+isFirstTimeInstalled : 判断应用是否首次安装
```
* ### 数组相关 -> [ArrayUtils.java][array.java] -> [Test][array.test]
@@ -135,8 +141,9 @@ isNavBarVisible : 判断导航栏是否可见
setNavBarColor : 设置导航栏颜色
getNavBarColor : 获取导航栏颜色
isSupportNavBar : 判断是否支持导航栏
-setNavBarLightMode : 设置状态栏是否为浅色模式
-isNavBarLightMode : 判断状态栏是否为浅色模式
+setNavBarLightMode : 设置导航栏是否为浅色模式
+isNavBarLightMode : 判断导航栏是否为浅色模式
+transparentNavBar : 透明导航栏
```
* ### 亮度相关 -> [BrightnessUtils.java][brightness.java] -> [Demo][brightness.demo]
@@ -272,10 +279,24 @@ applyPressedBgAlpha : 应用点击后对背景改变透明度
applyPressedBgDark : 应用点击后对背景加深
applySingleDebouncing : 对单视图应用防抖点击
applyGlobalDebouncing : 对所有设置 GlobalDebouncing 的视图应用防抖点击
+expandClickArea : 扩大点击区域
+back2HomeFriendly : 友好地返回桌面
ClickUtils#OnDebouncingClickListener: 防抖点击监听器
ClickUtils#OnMultiClickListener : 连续点击监听器
```
+* ### 剪贴板相关 -> [ClipboardUtils.java][clipboard.java] -> [Demo][clipboard.demo]
+```
+copyText : 复制文本到剪贴板
+getText : 获取剪贴板的文本
+copyUri : 复制 uri 到剪贴板
+getUri : 获取剪贴板的 uri
+copyIntent : 复制意图到剪贴板
+getIntent : 获取剪贴板的意图
+addChangedListener : 增加剪贴板监听器
+removeChangedListener: 移除剪贴板监听器
+```
+
* ### 克隆相关 -> [CloneUtils.java][clone.java] -> [Test][clone.test]
```
deepClone: 深度克隆
@@ -315,8 +336,8 @@ transform : 对原集合进行转变
collect : 转变为新的集合
countMatches : 查找到匹配的元素个数
exists : 判断集合是否存在符合条件的元素
-addIgnoreNull : 新增元素如果不为空
-addAll : 新增多个元素
+addIgnoreNull : 增加元素如果不为空
+addAll : 增加多个元素
get : 获取集合元素
size : 获取集合个数
sizeIsEmpty : 判断个数是否为零
@@ -338,13 +359,21 @@ string2Int : 颜色串转颜色值
int2RgbString : 颜色值转 RGB 串
int2ArgbString : 颜色值转 ARGB 串
getRandomColor : 获取随机色
+isLightColor : 判断是否亮色
```
* ### 转换相关 -> [ConvertUtils.java][convert.java] -> [Test][convert.test]
```
+int2HexString, hexString2Int : int 与 hexString 互转
bytes2Bits, bits2Bytes : bytes 与 bits 互转
bytes2Chars, chars2Bytes : bytes 与 chars 互转
bytes2HexString, hexString2Bytes : bytes 与 hexString 互转
+bytes2String, string2Bytes : bytes 与 string 互转
+bytes2JSONObject, jsonObject2Bytes : bytes 与 JSONObject 互转
+bytes2JSONArray, jsonArray2Bytes : bytes 与 JSONArray 互转
+bytes2Parcelable, parcelable2Bytes : bytes 与 Parcelable 互转
+bytes2Object, serializable2Bytes : bytes 与 Object 互转
+bytes2Bitmap, bitmap2Bytes : bytes 与 Bitmap 互转
memorySize2Byte, byte2MemorySize : 以 unit 为单位的内存大小与字节数互转
byte2FitMemorySize : 字节数转合适内存大小
timeSpan2Millis, millis2TimeSpan : 以 unit 为单位的时间长度与毫秒时间戳互转
@@ -354,7 +383,7 @@ inputStream2Bytes, bytes2InputStream : inputStream 与 bytes 互转
outputStream2Bytes, bytes2OutputStream : outputStream 与 bytes 互转
inputStream2String, string2InputStream : inputStream 与 string 按编码互转
outputStream2String, string2OutputStream: outputStream 与 string 按编码互转
-bitmap2Bytes, bytes2Bitmap : bitmap 与 bytes 互转
+inputStream2Lines : inputStream 转 文本行
drawable2Bitmap, bitmap2Drawable : drawable 与 bitmap 互转
drawable2Bytes, bytes2Drawable : drawable 与 bytes 互转
view2Bitmap : view 转 Bitmap
@@ -364,24 +393,33 @@ sp2px, px2sp : sp 与 px 互转
* ### 崩溃相关 -> [CrashUtils.java][crash.java]
```
-init: 初始化
+init : 初始化
+CrashInfo.addExtraHead: 增加额外头部
+CrashInfo.getThrowable: 获取崩溃异常
+CrashInfo.toString : 获取崩溃信息
+```
+
+* ### 防抖相关 -> [DebouncingUtils.java][debouncing.java]
+```
+isValid: 是否有效
```
* ### 设备相关 -> [DeviceUtils.java][device.java] -> [Demo][device.demo]
```
-isDeviceRooted : 判断设备是否 rooted
-isAdbEnabled : 判断设备 ADB 是否可用
-getSDKVersionName: 获取设备系统版本号
-getSDKVersionCode: 获取设备系统版本码
-getAndroidID : 获取设备 AndroidID
-getMacAddress : 获取设备 MAC 地址
-getManufacturer : 获取设备厂商
-getModel : 获取设备型号
-getABIs : 获取设备 ABIs
-isTablet : 判断是否是平板
-isEmulator : 判断是否是模拟器
-getUniqueDeviceId: 获取唯一设备 ID
-isSameDevice : 判断是否同一设备
+isDeviceRooted : 判断设备是否 rooted
+isAdbEnabled : 判断设备 ADB 是否可用
+getSDKVersionName : 获取设备系统版本号
+getSDKVersionCode : 获取设备系统版本码
+getAndroidID : 获取设备 AndroidID
+getMacAddress : 获取设备 MAC 地址
+getManufacturer : 获取设备厂商
+getModel : 获取设备型号
+getABIs : 获取设备 ABIs
+isTablet : 判断是否是平板
+isEmulator : 判断是否是模拟器
+isDevelopmentSettingsEnabled: 开发者选项是否打开
+getUniqueDeviceId : 获取唯一设备 ID
+isSameDevice : 判断是否同一设备
```
* ### 闪光灯相关 -> [FlashlightUtils.java][flashlight.java] -> [Demo][flashlight.demo]
@@ -401,6 +439,8 @@ base64Encode2String: Base64 编码
base64Decode : Base64 解码
htmlEncode : Html 编码
htmlDecode : Html 解码
+binaryEncode : 二进制编码
+binaryDecode : 二进制解码
```
* ### 加密解密相关 -> [EncryptUtils.java][encrypt.java] -> [Test][encrypt.test]
@@ -427,6 +467,7 @@ encryptAES, encryptAES2HexString, encryptAES2Base64 : AES 加密
decryptAES, decryptHexStringAES, decryptBase64AES : AES 解密
encryptRSA, encryptRSA2HexString, encryptRSA2Base64 : RSA 加密
decryptRSA, decryptHexStringRSA, decryptBase64RSA : RSA 解密
+rc4 : rc4 加解密
```
* ### 文件相关 -> [FileIOUtils.java][fileIo.java] -> [Test][fileIo.test]
@@ -474,11 +515,13 @@ getFileName : 根据全路径获取文件名
getFileNameNoExtension : 根据全路径获取文件名不带拓展名
getFileExtension : 根据全路径获取文件拓展名
notifySystemToScan : 通知系统扫描文件
+getFsTotalSize : 获取文件系统总大小
+getFsAvailableSize : 获取文件系统可用大小
```
* ### Fragment 相关 -> [FragmentUtils.java][fragment.java] -> [Demo][fragment.demo]
```
-add : 新增 fragment
+add : 增加 fragment
show : 显示 fragment
hide : 隐藏 fragment
showHide : 先显示后隐藏 fragment
@@ -506,14 +549,16 @@ setBackground : 设置背景
* ### Gson 相关 -> [GsonUtils.java][gson.java] -> [Test][gson.test]
```
-getGson : 获取 Gson 对象
-toJson : 对象转 Json 串
-fromJson : Json 串转对象
-getListType : 获取链表类型
-getSetType : 获取集合类型
-getMapType : 获取字典类型
-getArrayType: 获取数组类型
-getType : 获取类型
+setGsonDelegate: 设置默认的 Gson 代理对象
+setGson : 设置 Gson 对象
+getGson : 获取 Gson 对象
+toJson : 对象转 Json 串
+fromJson : Json 串转对象
+getListType : 获取链表类型
+getSetType : 获取集合类型
+getMapType : 获取字典类型
+getArrayType : 获取数组类型
+getType : 获取类型
```
* ### 图片相关 -> [ImageUtils.java][image.java] -> [Demo][image.demo]
@@ -541,6 +586,7 @@ fastBlur : 快速模糊
renderScriptBlur : renderScript 模糊图片
stackBlur : stack 模糊图片
save : 保存图片
+save2Album : 保存图片到相册
isImage : 根据文件名判断文件是否为图片
getImageType : 获取图片类型
compressByScale : 按缩放压缩
@@ -558,6 +604,7 @@ getLaunchAppIntent : 获取打开 App 的意图
getLaunchAppDetailsSettingsIntent: 获取 App 具体设置的意图
getShareTextIntent : 获取分享文本的意图
getShareImageIntent : 获取分享图片的意图
+getShareTextImageIntent : 获取分享图文的意图
getComponentIntent : 获取其他应用组件的意图
getShutdownIntent : 获取关机的意图
getCaptureIntent : 获取拍照的意图
@@ -578,44 +625,57 @@ clickBlankArea2HideSoftInput : 点击屏幕空白区域隐藏软键盘
* ### 语言相关 -> [LanguageUtils.java][language.java] -> [Demo][language.demo]
```
-applySystemLanguage: 应用系统语言
-applyLanguage : 应用语言
+applySystemLanguage : 设置系统语言
+applyLanguage : 设置语言
+isAppliedLanguage : 是否设置了语言
+getAppliedLanguage : 获取设置的语言
+getContextLanguage : 获取上下文的语言
+getAppContextLanguage : 获取应用上下文的语言
+getSystemLanguage : 获取系统的语言
+updateAppContextLanguage: 更新应用上下文语言
+attachBaseContext : 如果设置语言无效则在 Activity#attachBaseContext 调用它
```
* ### 日志相关 -> [LogUtils.java][log.java] -> [Demo][log.demo]
```
-getConfig : 获取 log 配置
-Config.setLogSwitch : 设置 log 总开关
-Config.setConsoleSwitch : 设置 log 控制台开关
-Config.setGlobalTag : 设置 log 全局 tag
-Config.setLogHeadSwitch : 设置 log 头部信息开关
-Config.setLog2FileSwitch : 设置 log 文件开关
-Config.setDir : 设置 log 文件存储目录
-Config.setFilePrefix : 设置 log 文件前缀
-Config.setBorderSwitch : 设置 log 边框开关
-Config.setSingleTagSwitch: 设置 log 单一 tag 开关（为美化 AS 3.1 的 Logcat）
-Config.setConsoleFilter : 设置 log 控制台过滤器
-Config.setFileFilter : 设置 log 文件过滤器
-Config.setStackDeep : 设置 log 栈深度
-Config.setStackOffset : 设置 log 栈偏移
-Config.setSaveDays : 设置 log 可保留天数
-Config.addFormatter : 新增 log 格式化器
-log : 自定义 tag 的 type 日志
-v : tag 为类名的 Verbose 日志
-vTag : 自定义 tag 的 Verbose 日志
-d : tag 为类名的 Debug 日志
-dTag : 自定义 tag 的 Debug 日志
-i : tag 为类名的 Info 日志
-iTag : 自定义 tag 的 Info 日志
-w : tag 为类名的 Warn 日志
-wTag : 自定义 tag 的 Warn 日志
-e : tag 为类名的 Error 日志
-eTag : 自定义 tag 的 Error 日志
-a : tag 为类名的 Assert 日志
-aTag : 自定义 tag 的 Assert 日志
-file : log 到文件
-json : log 字符串之 json
-xml : log 字符串之 xml
+getConfig : 获取 log 配置
+Config.setLogSwitch : 设置 log 总开关
+Config.setConsoleSwitch : 设置 log 控制台开关
+Config.setGlobalTag : 设置 log 全局 tag
+Config.setLogHeadSwitch : 设置 log 头部信息开关
+Config.setLog2FileSwitch : 设置 log 文件开关
+Config.setDir : 设置 log 文件存储目录
+Config.setFilePrefix : 设置 log 文件前缀
+Config.setBorderSwitch : 设置 log 边框开关
+Config.setSingleTagSwitch : 设置 log 单一 tag 开关（为美化 AS 3.1 的 Logcat）
+Config.setConsoleFilter : 设置 log 控制台过滤器
+Config.setFileFilter : 设置 log 文件过滤器
+Config.setStackDeep : 设置 log 栈深度
+Config.setStackOffset : 设置 log 栈偏移
+Config.setSaveDays : 设置 log 可保留天数
+Config.addFormatter : 增加 log 格式化器
+Config.setFileWriter : 设置文件写入器
+Config.setOnConsoleOutputListener: 设置控制台输出监听器
+Config.setOnFileOutputListener : 设置文件输出监听器
+Config.addFileExtraHead : 增加 log 文件头部
+log : 自定义 tag 的 type 日志
+v : tag 为类名的 Verbose 日志
+vTag : 自定义 tag 的 Verbose 日志
+d : tag 为类名的 Debug 日志
+dTag : 自定义 tag 的 Debug 日志
+i : tag 为类名的 Info 日志
+iTag : 自定义 tag 的 Info 日志
+w : tag 为类名的 Warn 日志
+wTag : 自定义 tag 的 Warn 日志
+e : tag 为类名的 Error 日志
+eTag : 自定义 tag 的 Error 日志
+a : tag 为类名的 Assert 日志
+aTag : 自定义 tag 的 Assert 日志
+file : log 到文件
+json : log 字符串之 json
+xml : log 字符串之 xml
+getCurrentLogFilePath : 获取当前日志文件路径
+getLogFiles : 获取所有日志
```
* ### Map 相关 -> [MapUtils.java][map.java] -> [Test][map.test]
@@ -643,28 +703,32 @@ getMetaDataInReceiver: 获取 receiver 的 meta-data 值
* ### 网络相关 -> [NetworkUtils.java][network.java] -> [Demo][network.demo]
```
-openWirelessSettings : 打开网络设置界面
-isConnected : 判断网络是否连接
-isAvailable[Async] : 判断网络是否可用
-isAvailableByPing[Async] : 用 ping 判断网络是否可用
-isAvailableByDns[Async] : 用 DNS 判断网络是否可用
-getMobileDataEnabled : 判断移动数据是否打开
-isMobileData : 判断网络是否是移动数据
-is4G : 判断网络是否是 4G
-getWifiEnabled : 判断 wifi 是否打开
-setWifiEnabled : 打开或关闭 wifi
-isWifiConnected : 判断 wifi 是否连接状态
-isWifiAvailable[Async] : 判断 wifi 数据是否可用
-getNetworkOperatorName : 获取移动网络运营商名称
-getNetworkType : 获取当前网络类型
-getIPAddress[Async] : 获取 IP 地址
-getDomainAddress[Async] : 获取域名 IP 地址
-getIpAddressByWifi : 根据 WiFi 获取网络 IP 地址
-getGatewayByWifi : 根据 WiFi 获取网关 IP 地址
-getNetMaskByWifi : 根据 WiFi 获取子网掩码 IP 地址
-getServerAddressByWifi : 根据 WiFi 获取服务端 IP 地址
-registerNetworkStatusChangedListener : 注册网络状态改变监听器
-unregisterNetworkStatusChangedListener: 注销网络状态改变监听器
+openWirelessSettings : 打开网络设置界面
+isConnected : 判断网络是否连接
+isAvailable[Async] : 判断网络是否可用
+isAvailableByPing[Async] : 用 ping 判断网络是否可用
+isAvailableByDns[Async] : 用 DNS 判断网络是否可用
+getMobileDataEnabled : 判断移动数据是否打开
+isMobileData : 判断网络是否是移动数据
+is4G : 判断网络是否是 4G
+getWifiEnabled : 判断 wifi 是否打开
+setWifiEnabled : 打开或关闭 wifi
+isWifiConnected : 判断 wifi 是否连接状态
+isWifiAvailable[Async] : 判断 wifi 数据是否可用
+getNetworkOperatorName : 获取移动网络运营商名称
+getNetworkType : 获取当前网络类型
+getIPAddress[Async] : 获取 IP 地址
+getDomainAddress[Async] : 获取域名 IP 地址
+getIpAddressByWifi : 根据 WiFi 获取网络 IP 地址
+getGatewayByWifi : 根据 WiFi 获取网关 IP 地址
+getNetMaskByWifi : 根据 WiFi 获取子网掩码 IP 地址
+getServerAddressByWifi : 根据 WiFi 获取服务端 IP 地址
+registerNetworkStatusChangedListener : 注册网络状态改变监听器
+isRegisteredNetworkStatusChangedListener: 判断是否注册网络状态改变监听器
+unregisterNetworkStatusChangedListener : 注销网络状态改变监听器
+getWifiScanResult : 获取 WIFI 列表
+addOnWifiChangedConsumer : 增加 WIFI 改变监听
+removeOnWifiChangedConsumer : 移除 WIFI 改变监听
```
* ### 通知相关 -> [NotificationUtils.java][notification.java] -> [Demo][notification.demo]
@@ -676,18 +740,27 @@ cancelAll : 取消所有通知
setNotificationBarVisibility: 设置通知栏是否可见
```
+* ### 数字相关 -> [NumberUtils.java][number.java] -> [Test][number.test]
+```
+format : 格式化
+float2Double: 浮点转双精度
+```
+
* ### 对象相关 -> [ObjectUtils.java][object.java] -> [Test][object.test]
```
-isEmpty : 判断对象是否为空
-isNotEmpty : 判断对象是否非空
-equals : 判断对象是否相等
-requireNonNull: 检查对象非空
-getOrDefault : 获取非空或默认对象
-hashCode : 获取对象哈希值
+isEmpty : 判断对象是否为空
+isNotEmpty : 判断对象是否非空
+equals : 判断对象是否相等
+compare : 比较对象大小
+requireNonNull(s): 要求对象非空
+getOrDefault : 获取非空或默认对象
+toString : 转字符串
+hashCode(s) : 获取对象哈希值
```
* ### 路径相关 -> [PathUtils.java][path.java] -> [Demo][path.demo]
```
+join : 连接路径
getRootPath : 获取根路径
getDataPath : 获取数据路径
getDownloadCachePath : 获取下载缓存路径
@@ -724,10 +797,21 @@ getExternalAppDownloadPath : 获取外存应用下载路径
getExternalAppDcimPath : 获取外存应用数码相机图片路径
getExternalAppDocumentsPath : 获取外存应用文档路径
getExternalAppObbPath : 获取外存应用 OBB 路径
+getRootPathExternalFirst : 优先获取外部根路径
+getAppDataPathExternalFirst : 优先获取外部数据路径
+getFilesPathExternalFirst : 优先获取外部文件路径
+getCachePathExternalFirst : 优先获取外部缓存路径
```
* ### 权限相关 -> [PermissionUtils.java][permission.java] -> [Demo][permission.demo]
```
+permission : 设置请求权限
+permissionGroup : 设置请求权限组
+permission.explain : 设置权限请求前的解释
+permission.rationale : 设置拒绝权限后再次请求的回调接口
+permission.callback : 设置回调
+permission.theme : 设置主题
+permission.request : 开始请求
getPermissions : 获取应用权限
isGranted : 判断权限是否被授予
isGrantedWriteSettings : 判断修改系统权限是否被授予
@@ -735,11 +819,6 @@ requestWriteSettings : 申请修改系统权限
isGrantedDrawOverlays : 判断悬浮窗权限是否被授予
requestDrawOverlays : 申请悬浮窗权限
launchAppDetailsSettings: 打开应用具体设置
-permission : 设置请求权限
-rationale : 设置拒绝权限后再次请求的回调接口
-callback : 设置回调
-theme : 设置主题
-request : 开始请求
```
* ### 手机相关 -> [PhoneUtils.java][phone.java] -> [Demo][phone.demo]
@@ -779,23 +858,37 @@ get : 获取反射想要获取的
* ### 正则相关 -> [RegexUtils.java][regex.java] -> [Test][regex.test]
```
-isMobileSimple : 简单验证手机号
-isMobileExact : 精确验证手机号
-isTel : 验证电话号码
-isIDCard15 : 验证身份证号码 15 位
-isIDCard18 : 简单验证身份证号码 18 位
-isIDCard18Exact: 精确验证身份证号码 18 位
-isEmail : 验证邮箱
-isURL : 验证 URL
-isZh : 验证汉字
-isUsername : 验证用户名
-isDate : 验证 yyyy-MM-dd 格式的日期校验，已考虑平闰年
-isIP : 验证 IP 地址
-isMatch : 判断是否匹配正则
-getMatches : 获取正则匹配的部分
-getSplits : 获取正则匹配分组
-getReplaceFirst: 替换正则匹配的第一部分
-getReplaceAll : 替换所有正则匹配的部分
+isMobileSimple : 简单验证手机号
+isMobileExact : 精确验证手机号
+isTel : 验证电话号码
+isIDCard15 : 验证身份证号码 15 位
+isIDCard18 : 简单验证身份证号码 18 位
+isIDCard18Exact : 精确验证身份证号码 18 位
+isEmail : 验证邮箱
+isURL : 验证 URL
+isZh : 验证汉字
+isUsername : 验证用户名
+isDate : 验证 yyyy-MM-dd 格式的日期校验，已考虑平闰年
+isIP : 验证 IP 地址
+isMatch : 判断是否匹配正则
+getMatches : 获取正则匹配的部分
+getSplits : 获取正则匹配分组
+getReplaceFirst : 替换正则匹配的第一部分
+getReplaceAll : 替换所有正则匹配的部分
+RegexConstants.REGEX_DOUBLE_BYTE_CHAR : 双字节
+RegexConstants.REGEX_BLANK_LINE : 空行
+RegexConstants.REGEX_QQ_NUM : QQ 号
+RegexConstants.REGEX_CHINA_POSTAL_CODE : 邮编
+RegexConstants.REGEX_INTEGER : 整数
+RegexConstants.REGEX_POSITIVE_INTEGER : 正整数
+RegexConstants.REGEX_NEGATIVE_INTEGER : 负整数
+RegexConstants.REGEX_NOT_NEGATIVE_INTEGER: 非负整数
+RegexConstants.REGEX_NOT_POSITIVE_INTEGER: 非正整数
+RegexConstants.REGEX_FLOAT : 浮点数
+RegexConstants.REGEX_POSITIVE_FLOAT : 正浮点数
+RegexConstants.REGEX_NEGATIVE_FLOAT : 负浮点数
+RegexConstants.REGEX_NOT_NEGATIVE_FLOAT : 非负浮点数
+RegexConstants.REGEX_NOT_POSITIVE_FLOAT : 非正浮点数
```
* ### 资源相关 -> [ResourceUtils.java][resource.java] -> [Demo][resource.demo]
@@ -873,6 +966,10 @@ isSDCardEnableByEnvironment: 根据 Environment 判断 SD 卡是否可用
getSDCardPathByEnvironment : 根据 Environment 获取 SD 卡路径
getSDCardInfo : 获取 SD 卡信息
getMountedSDCardPath : 获取已挂载的 SD 卡路径
+getExternalTotalSize : 获取外置 SD 卡总大小
+getExternalAvailableSize : 获取外置 SD 卡可用大小
+getInternalTotalSize : 获取内置 SD 卡总大小
+getInternalAvailableSize : 获取内置 SD 卡可用大小
```
* ### 服务相关 -> [ServiceUtils.java][service.java]
@@ -1005,11 +1102,17 @@ lowerFirstLetter: 首字母小写
reverse : 反转字符串
toDBC : 转化为半角字符
toSBC : 转化为全角字符
+getString : 获取字符资源
+getStringArray : 获取字符数组资源
+format : 格式化字符串
```
* ### 线程相关 -> [ThreadUtils.java][thread.java] -> [Test][thread.test]
```
isMainThread : 判断当前是否主线程
+getMainHandler : 获取主线程 Handler
+runOnUiThread : 运行在主线程
+runOnUiThreadDelayed : 延时运行在主线程
getFixedPool : 获取固定线程池
getSinglePool : 获取单线程池
getCachedPool : 获取缓冲线程池
@@ -1039,6 +1142,7 @@ setDeliver : 设置任务结束后交付的线程
* ### 时间相关 -> [TimeUtils.java][time.java] -> [Test][time.test]
```
+getSafeDateFormat : 获取安全的日期格式
millis2String : 将时间戳转为时间字符串
string2Millis : 将时间字符串转为时间戳
string2Date : 将时间字符串转为 Date 类型
@@ -1072,16 +1176,24 @@ getZodiac : 获取星座
* ### 吐司相关 -> [ToastUtils.java][toast.java] -> [Demo][toast.demo]
```
-setGravity : 设置吐司位置
-setBgColor : 设置背景颜色
-setBgResource : 设置背景资源
-setMsgColor : 设置消息颜色
-setMsgTextSize : 设置消息字体大小
-showShort : 显示短时吐司
-showLong : 显示长时吐司
-showCustomShort: 显示短时自定义吐司
-showCustomLong : 显示长时自定义吐司
-cancel : 取消吐司显示
+make : 制作吐司
+make.setMode : 设置模式
+make.setGravity : 设置位置
+make.setBgColor : 设置背景颜色
+make.setBgResource : 设置背景资源
+make.setTextColor : 设置字体颜色
+make.setTextSize : 设置字体大小
+make.setDurationIsLong : 设置是否长时间显示
+make.setLeftIcon : 设置左侧图标
+make.setTopIcon : 设置顶部图标
+make.setRightIcon : 设置右侧图标
+make.setBottomIcon : 设置底部图标
+make.setNotUseSystemToast: 设置不使用系统吐司
+make.show : 显示吐司
+getDefaultMaker : 获取默认制作实例（控制 showShort、showLong 样式）
+showShort : 显示短时吐司
+showLong : 显示长时吐司
+cancel : 取消吐司显示
```
* ### 触摸相关 -> [TouchUtils.java][touch.java]
@@ -1089,17 +1201,30 @@ cancel : 取消吐司显示
setOnTouchListener: 设置触摸事件
```
-* ### UI 消息相关 -> [UiMessageUtils.java][uiMessage.java]
+* ### UI 消息相关 -> [UiMessageUtils.java][uiMessage.java] -> [Demo][uiMessage.demo]
```
send : 发送消息
-addListener : 新增消息监听器
+addListener : 增加消息监听器
removeListener: 移除消息监听器
```
* ### URI 相关 -> [UriUtils.java][uri.java]
```
-file2Uri: file 转 uri
-uri2File: uri 转 file
+res2Uri : res 转 uri
+file2Uri : file 转 uri
+uri2File : uri 转 file
+uri2FileNoCacheCopy: uri 转 file 不拷贝缓存
+uri2Bytes : uri 转 bytes
+```
+
+* ### UtilsTransActivity -> [UtilsTransActivity.java][trans.java]
+```
+start: 启动随当前线程的透明 Activity
+```
+
+* ### UtilsTransActivity4MainProcess -> [UtilsTransActivity4MainProcess.java][trans4Main.java]
+```
+start: 启动主线程的透明 Activity
```
* ### 震动相关 -> [VibrateUtils.java][vibrate.java] -> [Demo][vibrate.demo]
@@ -1115,6 +1240,15 @@ runOnUiThread : 在 UI 线程运行
runOnUiThreadDelayed: 在 UI 线程延迟运行
isLayoutRtl : 布局是否从右到左
fixScrollViewTopping: 修复 ScrollView 置顶问题
+layoutId2View : layoutId 转为 view
+```
+
+* ### 音量相关 -> [VolumeUtils.java][volume.java]
+```
+getVolume : 获取音量
+setVolume : 设置音量
+getMaxVolume: 获取最大音量
+getMinVolume: 获取最小音量
```
* ### 压缩相关 -> [ZipUtils.java][zip.java] -> [Test][zip.test]
@@ -1130,9 +1264,7 @@ getComments : 获取压缩文件中的注释链表
## 打个小广告
-欢迎加入我的知识星球「**[基你太美](https://t.zsxq.com/FmeqfYF)**」，我会在星球中分享 [AucFrame](https://blankj.com/2019/07/22/auc-frame/) 框架、大厂面经、[AndroidUtilCode](https://github.com/Blankj/AndroidUtilCode) 更详尽的说明...一切我所了解的知识，你可以通过支付进入我的星球「**[基你太美](https://t.zsxq.com/FmeqfYF)**」进行体验，加入后优先观看星球中精华的部分，如果觉得星球的内容对自身没有收益，你可以自行申请退款退出星球，也没必要加我好友；**如果你已确定要留在我的星球，可以通过扫描如下二维码（备注：基你太美）加我个人微信，发送给我你的星球 ID，方便我后续拉你进群(PS：进得越早价格越便宜)。**
-
-
+欢迎加入我的小专栏「**[基你太美](https://xiaozhuanlan.com/Blankj)**」一起学习。
@@ -1184,6 +1316,9 @@ getComments : 获取压缩文件中的注释链表
[click.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/utilcode/src/main/java/com/blankj/utilcode/util/ClickUtils.java
[click.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/feature/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/click/ClickActivity.kt
+[clipboard.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/utilcode/src/main/java/com/blankj/utilcode/util/ClipboardUtils.java
+[clipboard.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/feature/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/clipboard/ClipboardActivity.kt
+
[clone.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/utilcode/src/main/java/com/blankj/utilcode/util/CloneUtils.java
[clone.test]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/utilcode/src/test/java/com/blankj/utilcode/util/CloneUtilsTest.java
@@ -1200,6 +1335,8 @@ getComments : 获取压缩文件中的注释链表
[crash.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/utilcode/src/main/java/com/blankj/utilcode/util/CrashUtils.java
+[debouncing.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/utilcode/src/main/java/com/blankj/utilcode/util/DebouncingUtils.java
+
[device.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/utilcode/src/main/java/com/blankj/utilcode/util/DeviceUtils.java
[device.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/feature/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/device/DeviceActivity.kt
@@ -1253,6 +1390,9 @@ getComments : 获取压缩文件中的注释链表
[notification.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/utilcode/src/main/java/com/blankj/utilcode/util/NotificationUtils.java
[notification.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/feature/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/notification/NotificationActivity.kt
+[number.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/utilcode/src/main/java/com/blankj/utilcode/util/NumberUtils.java
+[number.test]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/utilcode/src/test/java/com/blankj/utilcode/util/NumberUtilsTest.java
+
[object.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/utilcode/src/main/java/com/blankj/utilcode/util/ObjectUtils.java
[object.test]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/utilcode/src/test/java/com/blankj/utilcode/util/ObjectUtilsTest.java
@@ -1321,13 +1461,21 @@ getComments : 获取压缩文件中的注释链表
[touch.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/utilcode/src/main/java/com/blankj/utilcode/util/TouchUtils.java
[uiMessage.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/utilcode/src/main/java/com/blankj/utilcode/util/UiMessageUtils.java
+[uiMessage.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/feature/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/uiMessage/UiMessageActivity.kt
[uri.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/utilcode/src/main/java/com/blankj/utilcode/util/UriUtils.java
+[trans.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/utilcode/src/main/java/com/blankj/utilcode/util/UtilsTransActivity.java
+
+[trans4Main.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/utilcode/src/main/java/com/blankj/utilcode/util/UtilsTransActivity4MainProcess.java
+
[vibrate.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/utilcode/src/main/java/com/blankj/utilcode/util/VibrateUtils.java
[vibrate.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/feature/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/vibrate/VibrateActivity.kt
[view.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/utilcode/src/main/java/com/blankj/utilcode/util/ViewUtils.java
+[volume.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/utilcode/src/main/java/com/blankj/utilcode/util/VolumeUtils.java
+[volume.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/feature/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/volume/VolumeActivity.kt
+
[zip.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/utilcode/src/main/java/com/blankj/utilcode/util/ZipUtils.java
[zip.test]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/utilcode/src/test/java/com/blankj/utilcode/util/ZipUtilsTest.java
diff --git a/lib/utilcode/README.md b/lib/utilcode/README.md
index a982b784eb..d8f5c13bcb 100644
--- a/lib/utilcode/README.md
+++ b/lib/utilcode/README.md
@@ -2,10 +2,11 @@
Gradle:
```groovy
-implementation 'com.blankj:utilcode:1.26.0'
-
// if u use AndroidX, use the following
-implementation 'com.blankj:utilcodex:1.26.0'
+implementation 'com.blankj:utilcodex:1.31.1'
+
+// Not in maintenance
+implementation 'com.blankj:utilcode:1.30.7'
```
@@ -13,7 +14,9 @@ implementation 'com.blankj:utilcodex:1.26.0'
* ### About Activity -> [ActivityUtils.java][activity.java] -> [Demo][activity.demo]
```
-getActivityByView
+addActivityLifecycleCallbacks
+removeActivityLifecycleCallbacks
+getAliveActivityByContext
getActivityByContext
isActivityExists
startActivity
@@ -69,10 +72,12 @@ getAppName
getAppPath
getAppVersionName
getAppVersionCode
-getAppSignature
-getAppSignatureSHA1
-getAppSignatureSHA256
-getAppSignatureMD5
+getAppMinSdkVersion
+getAppTargetSdkVersion
+getAppSignatures
+getAppSignaturesSHA1
+getAppSignaturesSHA256
+getAppSignaturesMD5
getAppInfo
getAppsInfo
getApkInfo
@@ -137,6 +142,7 @@ getNavBarColor
isSupportNavBar
setNavBarLightMode
isNavBarLightMode
+transparentNavBar
```
* ### About Brightness -> [BrightnessUtils.java][brightness.java] -> [Demo][brightness.demo]
@@ -272,10 +278,24 @@ applyPressedBgAlpha
applyPressedBgDark
applySingleDebouncing
applyGlobalDebouncing
+expandClickArea
+back2HomeFriendly
ClickUtils#OnDebouncingClickListener
ClickUtils#OnMultiClickListener
```
+* ### About Clipboard -> [ClipboardUtils.java][clipboard.java] -> [Demo][clipboard.demo]
+```
+copyText
+getText
+copyUri
+getUri
+copyIntent
+getIntent
+addChangedListener
+removeChangedListener
+```
+
* ### About Clone -> [CloneUtils.java][clone.java] -> [Test][clone.test]
```
deepClone
@@ -338,13 +358,21 @@ string2Int
int2RgbString
int2ArgbString
getRandomColor
+isLightColor
```
* ### About Convert -> [ConvertUtils.java][convert.java] -> [Test][convert.test]
```
+int2HexString, hexString2Int
bytes2Bits, bits2Bytes
bytes2Chars, chars2Bytes
bytes2HexString, hexString2Bytes
+bytes2String, string2Bytes
+bytes2JSONObject, jsonObject2Bytes
+bytes2JSONArray, jsonArray2Bytes
+bytes2Parcelable, parcelable2Bytes
+bytes2Object, serializable2Bytes
+bytes2Bitmap, bitmap2Bytes
memorySize2Byte, byte2MemorySize
byte2FitMemorySize
timeSpan2Millis, millis2TimeSpan
@@ -354,7 +382,7 @@ inputStream2Bytes, bytes2InputStream
outputStream2Bytes, bytes2OutputStream
inputStream2String, string2InputStream
outputStream2String, string2OutputStream
-bitmap2Bytes, bytes2Bitmap
+inputStream2Lines
drawable2Bitmap, bitmap2Drawable
drawable2Bytes, bytes2Drawable
view2Bitmap
@@ -365,6 +393,14 @@ sp2px, px2sp
* ### About Crash -> [CrashUtils.java][crash.java]
```
init
+CrashInfo.addExtraHead
+CrashInfo.getThrowable
+CrashInfo.toString
+```
+
+* ### About Debouncing -> [DebouncingUtils.java][debouncing.java]
+```
+isValid
```
* ### About Device -> [DeviceUtils.java][device.java] -> [Demo][device.demo]
@@ -380,6 +416,7 @@ getModel
getABIs
isTablet
isEmulator
+isDevelopmentSettingsEnabled
getUniqueDeviceId
isSameDevice
```
@@ -401,6 +438,8 @@ base64Encode2String
base64Decode
htmlEncode
htmlDecode
+binaryEncode
+binaryDecode
```
* ### About Encrypt -> [EncryptUtils.java][encrypt.java] -> [Test][encrypt.test]
@@ -427,6 +466,7 @@ encryptAES, encryptAES2HexString, encryptAES2Base64
decryptAES, decryptHexStringAES, decryptBase64AES
encryptRSA, encryptRSA2HexString, encryptRSA2Base64
decryptRSA, decryptHexStringRSA, decryptBase64RSA
+rc4
```
* ### About FileIO -> [FileIOUtils.java][fileIo.java] -> [Test][fileIo.test]
@@ -474,6 +514,8 @@ getFileName
getFileNameNoExtension
getFileExtension
notifySystemToScan
+getFsTotalSize
+getFsAvailableSize
```
* ### About Fragment -> [FragmentUtils.java][fragment.java] -> [Demo][fragment.demo]
@@ -506,6 +548,8 @@ setBackground
* ### About Gson -> [GsonUtils.java][gson.java] -> [Test][gson.test]
```
+setGsonDelegate
+setGson
getGson
toJson
fromJson
@@ -541,6 +585,7 @@ fastBlur
renderScriptBlur
stackBlur
save
+save2Album
isImage
getImageType
compressByScale
@@ -558,6 +603,7 @@ getLaunchAppIntent
getLaunchAppDetailsSettingsIntent
getShareTextIntent
getShareImageIntent
+getShareTextImageIntent
getComponentIntent
getShutdownIntent
getCaptureIntent
@@ -580,6 +626,13 @@ clickBlankArea2HideSoftInput
```
applySystemLanguage
applyLanguage
+isAppliedLanguage
+getAppliedLanguage
+getContextLanguage
+getAppContextLanguage
+getSystemLanguage
+updateAppContextLanguage
+attachBaseContext
```
* ### About Log -> [LogUtils.java][log.java] -> [Demo][log.demo]
@@ -600,6 +653,10 @@ Config.setStackDeep
Config.setStackOffset
Config.setSaveDays
Config.addFormatter
+Config.setFileWriter
+Config.setOnConsoleOutputListener
+Config.setOnFileOutputListener
+Config.addFileExtraHead
log
v
vTag
@@ -616,6 +673,8 @@ aTag
file
json
xml
+getCurrentLogFilePath
+getLogFiles
```
* ### About Map -> [MapUtils.java][map.java] -> [Test][map.test]
@@ -645,26 +704,30 @@ getMetaDataInReceiver
```
openWirelessSettings
isConnected
-isAvailable[Async] : 判断网络是否可用
-isAvailableByPing[Async] : 用 ping 判断网络是否可用
-isAvailableByDns[Async] : 用 DNS 判断网络是否可用
+isAvailable[Async] : 判断网络是否可用
+isAvailableByPing[Async] : 用 ping 判断网络是否可用
+isAvailableByDns[Async] : 用 DNS 判断网络是否可用
getMobileDataEnabled
isMobileData
is4G
getWifiEnabled
setWifiEnabled
isWifiConnected
-isWifiAvailable[Async] : 判断 wifi 数据是否可用
+isWifiAvailable[Async] : 判断 wifi 数据是否可用
getNetworkOperatorName
getNetworkType
-getIPAddress[Async] : 获取 IP 地址
-getDomainAddress[Async] : 获取域名 IP 地址
+getIPAddress[Async] : 获取 IP 地址
+getDomainAddress[Async] : 获取域名 IP 地址
getIpAddressByWifi
getGatewayByWifi
getNetMaskByWifi
getServerAddressByWifi
registerNetworkStatusChangedListener
+isRegisteredNetworkStatusChangedListener
unregisterNetworkStatusChangedListener
+getWifiScanResult
+addOnWifiChangedConsumer
+removeOnWifiChangedConsumer
```
* ### About Notification -> [NotificationUtils.java][notification.java] -> [Demo][notification.demo]
@@ -676,18 +739,27 @@ cancelAll
setNotificationBarVisibility
```
+* ### About Number -> [NumberUtils.java][number.java] -> [Test][number.test]
+```
+format
+float2Double
+```
+
* ### About Object -> [ObjectUtils.java][object.java] -> [Test][object.test]
```
isEmpty
isNotEmpty
equals
-requireNonNull
+compare
+requireNonNull(s)
getOrDefault
-hashCode
+toString
+hashCode(s)
```
* ### About Path -> [PathUtils.java][path.java] -> [Demo][path.demo]
```
+join
getRootPath
getDataPath
getDownloadCachePath
@@ -724,10 +796,21 @@ getExternalAppDownloadPath
getExternalAppDcimPath
getExternalAppDocumentsPath
getExternalAppObbPath
+getRootPathExternalFirst
+getAppDataPathExternalFirst
+getFilesPathExternalFirst
+getCachePathExternalFirst
```
* ### About Permission -> [PermissionUtils.java][permission.java] -> [Demo][permission.demo]
```
+permission
+permissionGroup
+permission.explain
+permission.rationale
+permission.callback
+permission.theme
+permission.request
getPermissions
isGranted
isGrantedWriteSettings
@@ -735,11 +818,6 @@ requestWriteSettings
isGrantedDrawOverlays
requestDrawOverlays
launchAppDetailsSettings
-permission
-rationale
-callback
-theme
-request
```
* ### About Phone -> [PhoneUtils.java][phone.java] -> [Demo][phone.demo]
@@ -796,6 +874,20 @@ getMatches
getSplits
getReplaceFirst
getReplaceAll
+RegexConstants.REGEX_DOUBLE_BYTE_CHAR
+RegexConstants.REGEX_BLANK_LINE
+RegexConstants.REGEX_QQ_NUM
+RegexConstants.REGEX_CHINA_POSTAL_CODE
+RegexConstants.REGEX_INTEGER
+RegexConstants.REGEX_POSITIVE_INTEGER
+RegexConstants.REGEX_NEGATIVE_INTEGER
+RegexConstants.REGEX_NOT_NEGATIVE_INTEGER
+RegexConstants.REGEX_NOT_POSITIVE_INTEGER
+RegexConstants.REGEX_FLOAT
+RegexConstants.REGEX_POSITIVE_FLOAT
+RegexConstants.REGEX_NEGATIVE_FLOAT
+RegexConstants.REGEX_NOT_NEGATIVE_FLOAT
+RegexConstants.REGEX_NOT_POSITIVE_FLOAT
```
* ### About Resource -> [ResourceUtils.java][resource.java] -> [Demo][resource.demo]
@@ -873,6 +965,10 @@ isSDCardEnableByEnvironment
getSDCardPathByEnvironment
getSDCardInfo
getMountedSDCardPath
+getExternalTotalSize
+getExternalAvailableSize
+getInternalTotalSize
+getInternalAvailableSize
```
* ### About Service -> [ServiceUtils.java][service.java]
@@ -1005,11 +1101,17 @@ lowerFirstLetter
reverse
toDBC
toSBC
+getString
+getStringArray
+format
```
* ### About Thread -> [ThreadUtils.java][thread.java] -> [Test][thread.test]
```
isMainThread
+getMainHandler
+runOnUiThread
+runOnUiThreadDelayed
getFixedPool
getSinglePool
getCachedPool
@@ -1039,6 +1141,7 @@ setDeliver
* ### About Time -> [TimeUtils.java][time.java] -> [Test][time.test]
```
+getSafeDateFormat
millis2String
string2Millis
string2Date
@@ -1072,15 +1175,23 @@ getZodiac
* ### About Toast -> [ToastUtils.java][toast.java] -> [Demo][toast.demo]
```
-setGravity
-setBgColor
-setBgResource
-setMsgColor
-setMsgTextSize
+make
+make.setMode
+make.setGravity
+make.setBgColor
+make.setBgResource
+make.setTextColor
+make.setTextSize
+make.setDurationIsLong
+make.setLeftIcon
+make.setTopIcon
+make.setRightIcon
+make.setBottomIcon
+make.setNotUseSystemToast
+make.show
+getDefaultMaker
showShort
showLong
-showCustomShort
-showCustomLong
cancel
```
@@ -1089,7 +1200,7 @@ cancel
setOnTouchListener
```
-* ### About UiMessage -> [UiMessageUtils.java][uiMessage.java]
+* ### About UiMessage -> [UiMessageUtils.java][uiMessage.java] -> [Demo][uiMessage.demo]
```
send
addListener
@@ -1098,8 +1209,21 @@ removeListener
* ### About Uri -> [UriUtils.java][uri.java]
```
+res2Uri
file2Uri
uri2File
+uri2FileNoCacheCopy
+uri2Bytes
+```
+
+* ### UtilsTransActivity -> [UtilsTransActivity.java][trans.java]
+```
+start
+```
+
+* ### UtilsTransActivity4MainProcess -> [UtilsTransActivity4MainProcess.java][trans4Main.java]
+```
+start
```
* ### About Vibrate -> [VibrateUtils.java][vibrate.java] -> [Demo][vibrate.demo]
@@ -1115,6 +1239,15 @@ runOnUiThread
runOnUiThreadDelayed
isLayoutRtl
fixScrollViewTopping
+layoutId2View
+```
+
+* ### About Volume -> [VolumeUtils.java][volume.java]
+```
+getVolume
+setVolume
+getMaxVolume
+getMinVolume
```
* ### About Zip -> [ZipUtils.java][zip.java] -> [Test][zip.test]
@@ -1132,7 +1265,6 @@ getComments
-
[activity.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/utilcode/src/main/java/com/blankj/utilcode/util/ActivityUtils.java
[activity.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/feature/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/activity/ActivityActivity.kt
@@ -1181,6 +1313,9 @@ getComments
[click.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/utilcode/src/main/java/com/blankj/utilcode/util/ClickUtils.java
[click.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/feature/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/click/ClickActivity.kt
+[clipboard.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/utilcode/src/main/java/com/blankj/utilcode/util/ClipboardUtils.java
+[clipboard.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/feature/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/clipboard/ClipboardActivity.kt
+
[clone.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/utilcode/src/main/java/com/blankj/utilcode/util/CloneUtils.java
[clone.test]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/utilcode/src/test/java/com/blankj/utilcode/util/CloneUtilsTest.java
@@ -1197,6 +1332,8 @@ getComments
[crash.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/utilcode/src/main/java/com/blankj/utilcode/util/CrashUtils.java
+[debouncing.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/utilcode/src/main/java/com/blankj/utilcode/util/DebouncingUtils.java
+
[device.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/utilcode/src/main/java/com/blankj/utilcode/util/DeviceUtils.java
[device.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/feature/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/device/DeviceActivity.kt
@@ -1250,6 +1387,9 @@ getComments
[notification.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/utilcode/src/main/java/com/blankj/utilcode/util/NotificationUtils.java
[notification.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/feature/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/notification/NotificationActivity.kt
+[number.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/utilcode/src/main/java/com/blankj/utilcode/util/NumberUtils.java
+[number.test]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/utilcode/src/test/java/com/blankj/utilcode/util/NumberUtilsTest.java
+
[object.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/utilcode/src/main/java/com/blankj/utilcode/util/ObjectUtils.java
[object.test]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/utilcode/src/test/java/com/blankj/utilcode/util/ObjectUtilsTest.java
@@ -1318,13 +1458,21 @@ getComments
[touch.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/utilcode/src/main/java/com/blankj/utilcode/util/TouchUtils.java
[uiMessage.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/utilcode/src/main/java/com/blankj/utilcode/util/UiMessageUtils.java
+[uiMessage.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/feature/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/uiMessage/UiMessageActivity.kt
[uri.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/utilcode/src/main/java/com/blankj/utilcode/util/UriUtils.java
+[trans.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/utilcode/src/main/java/com/blankj/utilcode/util/UtilsTransActivity.java
+
+[trans4Main.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/utilcode/src/main/java/com/blankj/utilcode/util/UtilsTransActivity4MainProcess.java
+
[vibrate.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/utilcode/src/main/java/com/blankj/utilcode/util/VibrateUtils.java
[vibrate.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/feature/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/vibrate/VibrateActivity.kt
[view.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/utilcode/src/main/java/com/blankj/utilcode/util/ViewUtils.java
+[volume.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/utilcode/src/main/java/com/blankj/utilcode/util/VolumeUtils.java
+[volume.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/feature/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/volume/VolumeActivity.kt
+
[zip.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/utilcode/src/main/java/com/blankj/utilcode/util/ZipUtils.java
[zip.test]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/utilcode/src/test/java/com/blankj/utilcode/util/ZipUtilsTest.java
diff --git a/lib/utilcode/build.gradle b/lib/utilcode/build.gradle
index f38995ed6e..37a43b0a66 100644
--- a/lib/utilcode/build.gradle
+++ b/lib/utilcode/build.gradle
@@ -1,9 +1,5 @@
apply {
- plugin Config.depConfig.plugin_traute.pluginId
- plugin Config.depConfig.plugin_maven.pluginId
- plugin Config.depConfig.plugin_bintray.pluginId
plugin "readme-core"
- from "${rootDir.path}/gradle/upload/bintrayUploadAndroid.gradle"
}
readme {
@@ -11,14 +7,41 @@ readme {
readmeCnFile file('./README-CN.md')
}
+android {
+ compileSdkVersion Config.compileSdkVersion
+ defaultConfig {
+ minSdkVersion Config.minSdkVersion
+ versionCode Config.versionCode
+ versionName Config.versionName
+ consumerProguardFiles 'proguard-rules.pro'
+ }
+
+ buildTypes {
+ release {
+ minifyEnabled false
+ proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+ consumerProguardFiles 'proguard-rules.pro'
+ }
+ }
+}
+
dependencies {
- implementation Config.depConfig.gson.dep
+ implementation Config.libs.gson.path
- compileOnly Config.depConfig.support_appcompat_v7.dep
- compileOnly Config.depConfig.support_design.dep
+ implementation Config.libs.androidx_appcompat.path
+ compileOnly Config.libs.androidx_material.path
- testImplementation Config.depConfig.test_junit.dep
- testImplementation Config.depConfig.test_robolectric.dep
- testImplementation Config.depConfig.support_appcompat_v7.dep
- testImplementation Config.depConfig.eventbus_lib.dep
-}
\ No newline at end of file
+ testImplementation Config.libs.test_junit.path
+ testImplementation Config.libs.test_robolectric.path
+ testImplementation Config.libs.androidx_appcompat.path
+ testImplementation Config.libs.androidx_material.path
+ testImplementation Config.libs.eventbus_lib.path
+}
+
+ext {
+ groupId = Config.modules.lib_utilcode.groupId
+ artifactId = Config.modules.lib_utilcode.artifactId
+ version = Config.modules.lib_utilcode.version
+ website = "https://github.com/Blankj/AndroidUtilCode"
+}
+apply from: "${rootDir.path}/config/publish.gradle"
\ No newline at end of file
diff --git a/lib/utilcode/proguard-rules.pro b/lib/utilcode/proguard-rules.pro
index a35f9c0d91..b0df707115 100644
--- a/lib/utilcode/proguard-rules.pro
+++ b/lib/utilcode/proguard-rules.pro
@@ -21,4 +21,8 @@
@com.blankj.utilcode.util.BusUtils$Bus ;
}
+-keep public class * extends com.blankj.utilcode.util.ApiUtils$BaseApi
+-keep,allowobfuscation @interface com.blankj.utilcode.util.ApiUtils$Api
+-keep @com.blankj.utilcode.util.ApiUtils$Api class *
+
-keepattributes *Annotation*
\ No newline at end of file
diff --git a/lib/utilcode/project.properties b/lib/utilcode/project.properties
deleted file mode 100644
index 22ae3b8603..0000000000
--- a/lib/utilcode/project.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-#project
-project.name=UtilCode
-project.groupId=com.blankj
-project.artifactId=utilcode
-project.packaging=aar
-project.siteUrl=https://github.com/Blankj/AndroidUtilCode
-project.gitUrl=https://github.com/Blankj/AndroidUtilCode.git
-#javadoc
-javadoc.name=UtilCode
\ No newline at end of file
diff --git a/lib/utilcode/src/main/AndroidManifest.xml b/lib/utilcode/src/main/AndroidManifest.xml
index bc6ab22622..ab497595d4 100644
--- a/lib/utilcode/src/main/AndroidManifest.xml
+++ b/lib/utilcode/src/main/AndroidManifest.xml
@@ -1,27 +1,45 @@
+
+
+
+
+
+
+
+ android:grantUriPermissions="true">
-
+
diff --git a/lib/utilcode/src/main/java/com/blankj/utilcode/constant/MemoryConstants.java b/lib/utilcode/src/main/java/com/blankj/utilcode/constant/MemoryConstants.java
index b68bfcb113..5c05c0163e 100644
--- a/lib/utilcode/src/main/java/com/blankj/utilcode/constant/MemoryConstants.java
+++ b/lib/utilcode/src/main/java/com/blankj/utilcode/constant/MemoryConstants.java
@@ -1,6 +1,6 @@
package com.blankj.utilcode.constant;
-import android.support.annotation.IntDef;
+import androidx.annotation.IntDef;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
diff --git a/lib/utilcode/src/main/java/com/blankj/utilcode/constant/PermissionConstants.java b/lib/utilcode/src/main/java/com/blankj/utilcode/constant/PermissionConstants.java
index 489de57a8d..9298657483 100644
--- a/lib/utilcode/src/main/java/com/blankj/utilcode/constant/PermissionConstants.java
+++ b/lib/utilcode/src/main/java/com/blankj/utilcode/constant/PermissionConstants.java
@@ -1,10 +1,9 @@
package com.blankj.utilcode.constant;
-import android.Manifest;
import android.Manifest.permission;
import android.annotation.SuppressLint;
import android.os.Build;
-import android.support.annotation.StringDef;
+import androidx.annotation.StringDef;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
@@ -21,58 +20,63 @@
@SuppressLint("InlinedApi")
public final class PermissionConstants {
- public static final String CALENDAR = Manifest.permission_group.CALENDAR;
- public static final String CAMERA = Manifest.permission_group.CAMERA;
- public static final String CONTACTS = Manifest.permission_group.CONTACTS;
- public static final String LOCATION = Manifest.permission_group.LOCATION;
- public static final String MICROPHONE = Manifest.permission_group.MICROPHONE;
- public static final String PHONE = Manifest.permission_group.PHONE;
- public static final String SENSORS = Manifest.permission_group.SENSORS;
- public static final String SMS = Manifest.permission_group.SMS;
- public static final String STORAGE = Manifest.permission_group.STORAGE;
+ public static final String CALENDAR = "CALENDAR";
+ public static final String CAMERA = "CAMERA";
+ public static final String CONTACTS = "CONTACTS";
+ public static final String LOCATION = "LOCATION";
+ public static final String MICROPHONE = "MICROPHONE";
+ public static final String PHONE = "PHONE";
+ public static final String SENSORS = "SENSORS";
+ public static final String SMS = "SMS";
+ public static final String STORAGE = "STORAGE";
+ public static final String ACTIVITY_RECOGNITION = "ACTIVITY_RECOGNITION";
- private static final String[] GROUP_CALENDAR = {
+ private static final String[] GROUP_CALENDAR = {
permission.READ_CALENDAR, permission.WRITE_CALENDAR
};
- private static final String[] GROUP_CAMERA = {
+ private static final String[] GROUP_CAMERA = {
permission.CAMERA
};
- private static final String[] GROUP_CONTACTS = {
+ private static final String[] GROUP_CONTACTS = {
permission.READ_CONTACTS, permission.WRITE_CONTACTS, permission.GET_ACCOUNTS
};
- private static final String[] GROUP_LOCATION = {
- permission.ACCESS_FINE_LOCATION, permission.ACCESS_COARSE_LOCATION
+ private static final String[] GROUP_LOCATION = {
+ permission.ACCESS_FINE_LOCATION, permission.ACCESS_COARSE_LOCATION, permission.ACCESS_BACKGROUND_LOCATION
};
- private static final String[] GROUP_MICROPHONE = {
+ private static final String[] GROUP_MICROPHONE = {
permission.RECORD_AUDIO
};
- private static final String[] GROUP_PHONE = {
+ private static final String[] GROUP_PHONE = {
permission.READ_PHONE_STATE, permission.READ_PHONE_NUMBERS, permission.CALL_PHONE,
permission.READ_CALL_LOG, permission.WRITE_CALL_LOG, permission.ADD_VOICEMAIL,
permission.USE_SIP, permission.PROCESS_OUTGOING_CALLS, permission.ANSWER_PHONE_CALLS
};
- private static final String[] GROUP_PHONE_BELOW_O = {
+ private static final String[] GROUP_PHONE_BELOW_O = {
permission.READ_PHONE_STATE, permission.READ_PHONE_NUMBERS, permission.CALL_PHONE,
permission.READ_CALL_LOG, permission.WRITE_CALL_LOG, permission.ADD_VOICEMAIL,
permission.USE_SIP, permission.PROCESS_OUTGOING_CALLS
};
- private static final String[] GROUP_SENSORS = {
+ private static final String[] GROUP_SENSORS = {
permission.BODY_SENSORS
};
- private static final String[] GROUP_SMS = {
+ private static final String[] GROUP_SMS = {
permission.SEND_SMS, permission.RECEIVE_SMS, permission.READ_SMS,
permission.RECEIVE_WAP_PUSH, permission.RECEIVE_MMS,
};
- private static final String[] GROUP_STORAGE = {
+ private static final String[] GROUP_STORAGE = {
permission.READ_EXTERNAL_STORAGE, permission.WRITE_EXTERNAL_STORAGE,
};
+ private static final String[] GROUP_ACTIVITY_RECOGNITION = {
+ permission.ACTIVITY_RECOGNITION,
+ };
@StringDef({CALENDAR, CAMERA, CONTACTS, LOCATION, MICROPHONE, PHONE, SENSORS, SMS, STORAGE,})
@Retention(RetentionPolicy.SOURCE)
- public @interface Permission {
+ public @interface PermissionGroup {
}
- public static String[] getPermissions(@Permission final String permission) {
+ public static String[] getPermissions(@PermissionGroup final String permission) {
+ if (permission == null) return new String[0];
switch (permission) {
case CALENDAR:
return GROUP_CALENDAR;
@@ -96,6 +100,8 @@ public static String[] getPermissions(@Permission final String permission) {
return GROUP_SMS;
case STORAGE:
return GROUP_STORAGE;
+ case ACTIVITY_RECOGNITION:
+ return GROUP_ACTIVITY_RECOGNITION;
}
return new String[]{permission};
}
diff --git a/lib/utilcode/src/main/java/com/blankj/utilcode/constant/RegexConstants.java b/lib/utilcode/src/main/java/com/blankj/utilcode/constant/RegexConstants.java
index 2af770e4b0..02618da72b 100644
--- a/lib/utilcode/src/main/java/com/blankj/utilcode/constant/RegexConstants.java
+++ b/lib/utilcode/src/main/java/com/blankj/utilcode/constant/RegexConstants.java
@@ -16,13 +16,14 @@ public final class RegexConstants {
public static final String REGEX_MOBILE_SIMPLE = "^[1]\\d{10}$";
/**
* Regex of exact mobile.
- * china mobile: 134(0-8), 135, 136, 137, 138, 139, 147, 150, 151, 152, 157, 158, 159, 178, 182, 183, 184, 187, 188, 198
- * china unicom: 130, 131, 132, 145, 155, 156, 166, 171, 175, 176, 185, 186
- * china telecom: 133, 153, 173, 177, 180, 181, 189, 199, 191
+ * china mobile: 134(0-8), 135, 136, 137, 138, 139, 147, 150, 151, 152, 157, 158, 159, 165, 172, 178, 182, 183, 184, 187, 188, 195, 197, 198
+ * china unicom: 130, 131, 132, 145, 155, 156, 166, 167, 175, 176, 185, 186, 196
+ * china telecom: 133, 149, 153, 162, 173, 177, 180, 181, 189, 190, 191, 199
+ * china broadcasting: 192
* global star: 1349
- * virtual operator: 170
+ * virtual operator: 170, 171
*/
- public static final String REGEX_MOBILE_EXACT = "^((13[0-9])|(14[5,7])|(15[0-3,5-9])|(16[6])|(17[0,1,3,5-8])|(18[0-9])|(19[1,8,9]))\\d{8}$";
+ public static final String REGEX_MOBILE_EXACT = "^((13[0-9])|(14[579])|(15[0-35-9])|(16[2567])|(17[0-35-8])|(18[0-9])|(19[0-35-9]))\\d{8}$";
/**
* Regex of telephone number.
*/
@@ -83,6 +84,10 @@ public final class RegexConstants {
* Regex of postal code in China.
*/
public static final String REGEX_CHINA_POSTAL_CODE = "[1-9]\\d{5}(?!\\d)";
+ /**
+ * Regex of integer.
+ */
+ public static final String REGEX_INTEGER = "^(-?[1-9]\\d*)|0$";
/**
* Regex of positive integer.
*/
@@ -91,10 +96,6 @@ public final class RegexConstants {
* Regex of negative integer.
*/
public static final String REGEX_NEGATIVE_INTEGER = "^-[1-9]\\d*$";
- /**
- * Regex of integer.
- */
- public static final String REGEX_INTEGER = "^-?[1-9]\\d*$";
/**
* Regex of non-negative integer.
*/
@@ -103,6 +104,10 @@ public final class RegexConstants {
* Regex of non-positive integer.
*/
public static final String REGEX_NOT_POSITIVE_INTEGER = "^-[1-9]\\d*|0$";
+ /**
+ * Regex of positive float.
+ */
+ public static final String REGEX_FLOAT = "^-?([1-9]\\d*\\.\\d*|0\\.\\d*[1-9]\\d*|0?\\.0+|0)$";
/**
* Regex of positive float.
*/
@@ -111,6 +116,14 @@ public final class RegexConstants {
* Regex of negative float.
*/
public static final String REGEX_NEGATIVE_FLOAT = "^-[1-9]\\d*\\.\\d*|-0\\.\\d*[1-9]\\d*$";
+ /**
+ * Regex of positive float.
+ */
+ public static final String REGEX_NOT_NEGATIVE_FLOAT = "^[1-9]\\d*\\.\\d*|0\\.\\d*[1-9]\\d*|0?\\.0+|0$";
+ /**
+ * Regex of negative float.
+ */
+ public static final String REGEX_NOT_POSITIVE_FLOAT = "^(-([1-9]\\d*\\.\\d*|0\\.\\d*[1-9]\\d*))|0?\\.0+|0$";
///////////////////////////////////////////////////////////////////////////
// If u want more please visit http://toutiao.com/i6231678548520731137
diff --git a/lib/utilcode/src/main/java/com/blankj/utilcode/constant/TimeConstants.java b/lib/utilcode/src/main/java/com/blankj/utilcode/constant/TimeConstants.java
index 9932037bf8..45090576e3 100644
--- a/lib/utilcode/src/main/java/com/blankj/utilcode/constant/TimeConstants.java
+++ b/lib/utilcode/src/main/java/com/blankj/utilcode/constant/TimeConstants.java
@@ -1,6 +1,6 @@
package com.blankj.utilcode.constant;
-import android.support.annotation.IntDef;
+import androidx.annotation.IntDef;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
diff --git a/lib/utilcode/src/main/java/com/blankj/utilcode/util/ActivityUtils.java b/lib/utilcode/src/main/java/com/blankj/utilcode/util/ActivityUtils.java
index 8d3983fb5c..d49ce6ff06 100644
--- a/lib/utilcode/src/main/java/com/blankj/utilcode/util/ActivityUtils.java
+++ b/lib/utilcode/src/main/java/com/blankj/utilcode/util/ActivityUtils.java
@@ -10,19 +10,22 @@
import android.graphics.drawable.Drawable;
import android.os.Build;
import android.os.Bundle;
-import android.support.annotation.AnimRes;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.ActivityOptionsCompat;
-import android.support.v4.app.Fragment;
-import android.support.v4.util.Pair;
import android.text.TextUtils;
import android.util.Log;
import android.view.View;
+import java.lang.ref.WeakReference;
+import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.List;
+import androidx.annotation.AnimRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.app.ActivityOptionsCompat;
+import androidx.core.util.Pair;
+import androidx.fragment.app.Fragment;
+
/**
*
* author: Blankj
@@ -38,13 +41,52 @@ private ActivityUtils() {
}
/**
- * Return the activity by view.
+ * Add callbacks of activity lifecycle.
+ *
+ * @param callbacks The callbacks.
+ */
+ public static void addActivityLifecycleCallbacks(@Nullable final Utils.ActivityLifecycleCallbacks callbacks) {
+ UtilsBridge.addActivityLifecycleCallbacks(callbacks);
+ }
+
+ /**
+ * Add callbacks of activity lifecycle.
+ *
+ * @param activity The activity.
+ * @param callbacks The callbacks.
+ */
+ public static void addActivityLifecycleCallbacks(@Nullable final Activity activity,
+ @Nullable final Utils.ActivityLifecycleCallbacks callbacks) {
+ UtilsBridge.addActivityLifecycleCallbacks(activity, callbacks);
+ }
+
+ /**
+ * Remove callbacks of activity lifecycle.
*
- * @param view The view.
- * @return the activity by view.
+ * @param callbacks The callbacks.
+ */
+ public static void removeActivityLifecycleCallbacks(@Nullable final Utils.ActivityLifecycleCallbacks callbacks) {
+ UtilsBridge.removeActivityLifecycleCallbacks(callbacks);
+ }
+
+ /**
+ * Remove callbacks of activity lifecycle.
+ *
+ * @param activity The activity.
*/
- public static Activity getActivityByView(@NonNull View view) {
- return getActivityByContext(view.getContext());
+ public static void removeActivityLifecycleCallbacks(@Nullable final Activity activity) {
+ UtilsBridge.removeActivityLifecycleCallbacks(activity);
+ }
+
+ /**
+ * Remove callbacks of activity lifecycle.
+ *
+ * @param activity The activity.
+ * @param callbacks The callbacks.
+ */
+ public static void removeActivityLifecycleCallbacks(@Nullable final Activity activity,
+ @Nullable final Utils.ActivityLifecycleCallbacks callbacks) {
+ UtilsBridge.removeActivityLifecycleCallbacks(activity, callbacks);
}
/**
@@ -53,13 +95,48 @@ public static Activity getActivityByView(@NonNull View view) {
* @param context The context.
* @return the activity by context.
*/
- public static Activity getActivityByContext(Context context) {
- if (context instanceof Activity) return (Activity) context;
+ @Nullable
+ public static Activity getActivityByContext(@Nullable Context context) {
+ if (context == null) return null;
+ Activity activity = getActivityByContextInner(context);
+ if (!isActivityAlive(activity)) return null;
+ return activity;
+ }
+
+ @Nullable
+ private static Activity getActivityByContextInner(@Nullable Context context) {
+ if (context == null) return null;
+ List list = new ArrayList<>();
while (context instanceof ContextWrapper) {
if (context instanceof Activity) {
return (Activity) context;
}
+ Activity activity = getActivityFromDecorContext(context);
+ if (activity != null) return activity;
+ list.add(context);
context = ((ContextWrapper) context).getBaseContext();
+ if (context == null) {
+ return null;
+ }
+ if (list.contains(context)) {
+ // loop context
+ return null;
+ }
+ }
+ return null;
+ }
+
+ @Nullable
+ private static Activity getActivityFromDecorContext(@Nullable Context context) {
+ if (context == null) return null;
+ if (context.getClass().getName().equals("com.android.internal.policy.DecorContext")) {
+ try {
+ Field mActivityContextField = context.getClass().getDeclaredField("mActivityContext");
+ mActivityContextField.setAccessible(true);
+ //noinspection ConstantConditions,unchecked
+ return ((WeakReference) mActivityContextField.get(context)).get();
+ } catch (Exception ignore) {
+ }
}
return null;
}
@@ -75,9 +152,10 @@ public static boolean isActivityExists(@NonNull final String pkg,
@NonNull final String cls) {
Intent intent = new Intent();
intent.setClassName(pkg, cls);
- return !(Utils.getApp().getPackageManager().resolveActivity(intent, 0) == null ||
- intent.resolveActivity(Utils.getApp().getPackageManager()) == null ||
- Utils.getApp().getPackageManager().queryIntentActivities(intent, 0).size() == 0);
+ PackageManager pm = Utils.getApp().getPackageManager();
+ return !(pm.resolveActivity(intent, 0) == null ||
+ intent.resolveActivity(pm) == null ||
+ pm.queryIntentActivities(intent, 0).size() == 0);
}
/**
@@ -86,7 +164,7 @@ public static boolean isActivityExists(@NonNull final String pkg,
* @param clz The activity class.
*/
public static void startActivity(@NonNull final Class clz) {
- Context context = Utils.getTopActivityOrApp();
+ Context context = getTopActivityOrApp();
startActivity(context, null, context.getPackageName(), clz.getName(), null);
}
@@ -98,7 +176,7 @@ public static void startActivity(@NonNull final Class clz) {
*/
public static void startActivity(@NonNull final Class clz,
@Nullable final Bundle options) {
- Context context = Utils.getTopActivityOrApp();
+ Context context = getTopActivityOrApp();
startActivity(context, null, context.getPackageName(), clz.getName(), options);
}
@@ -114,7 +192,7 @@ public static void startActivity(@NonNull final Class clz,
public static void startActivity(@NonNull final Class clz,
@AnimRes final int enterAnim,
@AnimRes final int exitAnim) {
- Context context = Utils.getTopActivityOrApp();
+ Context context = getTopActivityOrApp();
startActivity(context, null, context.getPackageName(), clz.getName(),
getOptionsBundle(context, enterAnim, exitAnim));
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN && context instanceof Activity) {
@@ -190,7 +268,7 @@ public static void startActivity(@NonNull final Activity activity,
*/
public static void startActivity(@NonNull final Bundle extras,
@NonNull final Class clz) {
- Context context = Utils.getTopActivityOrApp();
+ Context context = getTopActivityOrApp();
startActivity(context, extras, context.getPackageName(), clz.getName(), null);
}
@@ -204,7 +282,7 @@ public static void startActivity(@NonNull final Bundle extras,
public static void startActivity(@NonNull final Bundle extras,
@NonNull final Class clz,
@Nullable final Bundle options) {
- Context context = Utils.getTopActivityOrApp();
+ Context context = getTopActivityOrApp();
startActivity(context, extras, context.getPackageName(), clz.getName(), options);
}
@@ -222,7 +300,7 @@ public static void startActivity(@NonNull final Bundle extras,
@NonNull final Class clz,
@AnimRes final int enterAnim,
@AnimRes final int exitAnim) {
- Context context = Utils.getTopActivityOrApp();
+ Context context = getTopActivityOrApp();
startActivity(context, extras, context.getPackageName(), clz.getName(),
getOptionsBundle(context, enterAnim, exitAnim));
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN && context instanceof Activity) {
@@ -306,7 +384,7 @@ public static void startActivity(@NonNull final Bundle extras,
*/
public static void startActivity(@NonNull final String pkg,
@NonNull final String cls) {
- startActivity(Utils.getTopActivityOrApp(), null, pkg, cls, null);
+ startActivity(getTopActivityOrApp(), null, pkg, cls, null);
}
/**
@@ -319,7 +397,7 @@ public static void startActivity(@NonNull final String pkg,
public static void startActivity(@NonNull final String pkg,
@NonNull final String cls,
@Nullable final Bundle options) {
- startActivity(Utils.getTopActivityOrApp(), null, pkg, cls, options);
+ startActivity(getTopActivityOrApp(), null, pkg, cls, options);
}
/**
@@ -336,7 +414,7 @@ public static void startActivity(@NonNull final String pkg,
@NonNull final String cls,
@AnimRes final int enterAnim,
@AnimRes final int exitAnim) {
- Context context = Utils.getTopActivityOrApp();
+ Context context = getTopActivityOrApp();
startActivity(context, null, pkg, cls, getOptionsBundle(context, enterAnim, exitAnim));
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN && context instanceof Activity) {
((Activity) context).overridePendingTransition(enterAnim, exitAnim);
@@ -419,7 +497,7 @@ public static void startActivity(@NonNull final Activity activity,
public static void startActivity(@NonNull final Bundle extras,
@NonNull final String pkg,
@NonNull final String cls) {
- startActivity(Utils.getTopActivityOrApp(), extras, pkg, cls, null);
+ startActivity(getTopActivityOrApp(), extras, pkg, cls, null);
}
/**
@@ -434,7 +512,7 @@ public static void startActivity(@NonNull final Bundle extras,
@NonNull final String pkg,
@NonNull final String cls,
@Nullable final Bundle options) {
- startActivity(Utils.getTopActivityOrApp(), extras, pkg, cls, options);
+ startActivity(getTopActivityOrApp(), extras, pkg, cls, options);
}
/**
@@ -453,7 +531,7 @@ public static void startActivity(@NonNull final Bundle extras,
@NonNull final String cls,
@AnimRes final int enterAnim,
@AnimRes final int exitAnim) {
- Context context = Utils.getTopActivityOrApp();
+ Context context = getTopActivityOrApp();
startActivity(context, extras, pkg, cls, getOptionsBundle(context, enterAnim, exitAnim));
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN && context instanceof Activity) {
((Activity) context).overridePendingTransition(enterAnim, exitAnim);
@@ -540,7 +618,7 @@ public static void startActivity(@NonNull final Bundle extras,
* @return {@code true}: success getActivityList() {
- return Utils.getActivityList();
+ return UtilsBridge.getActivityList();
}
/**
@@ -1390,18 +1468,14 @@ public static String getLauncherActivity() {
* @return the name of launcher activity
*/
public static String getLauncherActivity(@NonNull final String pkg) {
+ if (UtilsBridge.isSpace(pkg)) return "";
Intent intent = new Intent(Intent.ACTION_MAIN, null);
intent.addCategory(Intent.CATEGORY_LAUNCHER);
intent.setPackage(pkg);
PackageManager pm = Utils.getApp().getPackageManager();
List info = pm.queryIntentActivities(intent, 0);
- int size = info.size();
- if (size == 0) return "";
- for (int i = 0; i < size; i++) {
- ResolveInfo ri = info.get(i);
- if (ri.activityInfo.processName.equals(pkg)) {
- return ri.activityInfo.name;
- }
+ if (info == null || info.size() == 0) {
+ return "";
}
return info.get(0).activityInfo.name;
}
@@ -1444,7 +1518,7 @@ public static List getMainActivities(@NonNull final String pkg) {
* @return the top activity in activity's stack
*/
public static Activity getTopActivity() {
- return Utils.getActivityLifecycle().getTopActivity();
+ return UtilsBridge.getTopActivity();
}
/**
@@ -1475,7 +1549,7 @@ public static boolean isActivityAlive(final Activity activity) {
* @return {@code true}: yes activities = Utils.getActivityList();
+ List activities = UtilsBridge.getActivityList();
for (Activity aActivity : activities) {
if (aActivity.equals(activity)) {
return true;
@@ -1491,7 +1565,7 @@ public static boolean isActivityExistsInStack(@NonNull final Activity activity)
* @return {@code true}: yes activities = Utils.getActivityList();
+ List activities = UtilsBridge.getActivityList();
for (Activity aActivity : activities) {
if (aActivity.getClass().equals(clz)) {
return true;
@@ -1555,7 +1629,7 @@ public static void finishActivity(@NonNull final Class clz)
*/
public static void finishActivity(@NonNull final Class clz,
final boolean isLoadAnim) {
- List activities = Utils.getActivityList();
+ List activities = UtilsBridge.getActivityList();
for (Activity activity : activities) {
if (activity.getClass().equals(clz)) {
activity.finish();
@@ -1578,7 +1652,7 @@ public static void finishActivity(@NonNull final Class clz,
public static void finishActivity(@NonNull final Class clz,
@AnimRes final int enterAnim,
@AnimRes final int exitAnim) {
- List activities = Utils.getActivityList();
+ List activities = UtilsBridge.getActivityList();
for (Activity activity : activities) {
if (activity.getClass().equals(clz)) {
activity.finish();
@@ -1608,16 +1682,15 @@ public static boolean finishToActivity(@NonNull final Activity activity,
public static boolean finishToActivity(@NonNull final Activity activity,
final boolean isIncludeSelf,
final boolean isLoadAnim) {
- List activities = Utils.getActivityList();
- for (int i = activities.size() - 1; i >= 0; --i) {
- Activity aActivity = activities.get(i);
- if (aActivity.equals(activity)) {
+ List activities = UtilsBridge.getActivityList();
+ for (Activity act : activities) {
+ if (act.equals(activity)) {
if (isIncludeSelf) {
- finishActivity(aActivity, isLoadAnim);
+ finishActivity(act, isLoadAnim);
}
return true;
}
- finishActivity(aActivity, isLoadAnim);
+ finishActivity(act, isLoadAnim);
}
return false;
}
@@ -1636,16 +1709,15 @@ public static boolean finishToActivity(@NonNull final Activity activity,
final boolean isIncludeSelf,
@AnimRes final int enterAnim,
@AnimRes final int exitAnim) {
- List activities = Utils.getActivityList();
- for (int i = activities.size() - 1; i >= 0; --i) {
- Activity aActivity = activities.get(i);
- if (aActivity.equals(activity)) {
+ List activities = UtilsBridge.getActivityList();
+ for (Activity act : activities) {
+ if (act.equals(activity)) {
if (isIncludeSelf) {
- finishActivity(aActivity, enterAnim, exitAnim);
+ finishActivity(act, enterAnim, exitAnim);
}
return true;
}
- finishActivity(aActivity, enterAnim, exitAnim);
+ finishActivity(act, enterAnim, exitAnim);
}
return false;
}
@@ -1671,16 +1743,15 @@ public static boolean finishToActivity(@NonNull final Class
public static boolean finishToActivity(@NonNull final Class clz,
final boolean isIncludeSelf,
final boolean isLoadAnim) {
- List activities = Utils.getActivityList();
- for (int i = activities.size() - 1; i >= 0; --i) {
- Activity aActivity = activities.get(i);
- if (aActivity.getClass().equals(clz)) {
+ List activities = UtilsBridge.getActivityList();
+ for (Activity act : activities) {
+ if (act.getClass().equals(clz)) {
if (isIncludeSelf) {
- finishActivity(aActivity, isLoadAnim);
+ finishActivity(act, isLoadAnim);
}
return true;
}
- finishActivity(aActivity, isLoadAnim);
+ finishActivity(act, isLoadAnim);
}
return false;
}
@@ -1699,16 +1770,15 @@ public static boolean finishToActivity(@NonNull final Class
final boolean isIncludeSelf,
@AnimRes final int enterAnim,
@AnimRes final int exitAnim) {
- List activities = Utils.getActivityList();
- for (int i = activities.size() - 1; i >= 0; --i) {
- Activity aActivity = activities.get(i);
- if (aActivity.getClass().equals(clz)) {
+ List activities = UtilsBridge.getActivityList();
+ for (Activity act : activities) {
+ if (act.getClass().equals(clz)) {
if (isIncludeSelf) {
- finishActivity(aActivity, enterAnim, exitAnim);
+ finishActivity(act, enterAnim, exitAnim);
}
return true;
}
- finishActivity(aActivity, enterAnim, exitAnim);
+ finishActivity(act, enterAnim, exitAnim);
}
return false;
}
@@ -1731,11 +1801,10 @@ public static void finishOtherActivities(@NonNull final Class clz,
final boolean isLoadAnim) {
- List activities = Utils.getActivityList();
- for (int i = activities.size() - 1; i >= 0; i--) {
- Activity activity = activities.get(i);
- if (!activity.getClass().equals(clz)) {
- finishActivity(activity, isLoadAnim);
+ List activities = UtilsBridge.getActivityList();
+ for (Activity act : activities) {
+ if (!act.getClass().equals(clz)) {
+ finishActivity(act, isLoadAnim);
}
}
}
@@ -1752,11 +1821,10 @@ public static void finishOtherActivities(@NonNull final Class clz,
@AnimRes final int enterAnim,
@AnimRes final int exitAnim) {
- List activities = Utils.getActivityList();
- for (int i = activities.size() - 1; i >= 0; i--) {
- Activity activity = activities.get(i);
- if (!activity.getClass().equals(clz)) {
- finishActivity(activity, enterAnim, exitAnim);
+ List activities = UtilsBridge.getActivityList();
+ for (Activity act : activities) {
+ if (!act.getClass().equals(clz)) {
+ finishActivity(act, enterAnim, exitAnim);
}
}
}
@@ -1774,13 +1842,12 @@ public static void finishAllActivities() {
* @param isLoadAnim True to use animation for the outgoing activity, false otherwise.
*/
public static void finishAllActivities(final boolean isLoadAnim) {
- List activityList = Utils.getActivityList();
- for (int i = activityList.size() - 1; i >= 0; --i) {// remove from top
- Activity activity = activityList.get(i);
+ List activityList = UtilsBridge.getActivityList();
+ for (Activity act : activityList) {
// sActivityList remove the index activity at onActivityDestroyed
- activity.finish();
+ act.finish();
if (!isLoadAnim) {
- activity.overridePendingTransition(0, 0);
+ act.overridePendingTransition(0, 0);
}
}
}
@@ -1795,12 +1862,11 @@ public static void finishAllActivities(final boolean isLoadAnim) {
*/
public static void finishAllActivities(@AnimRes final int enterAnim,
@AnimRes final int exitAnim) {
- List activityList = Utils.getActivityList();
- for (int i = activityList.size() - 1; i >= 0; --i) {// remove from top
- Activity activity = activityList.get(i);
+ List activityList = UtilsBridge.getActivityList();
+ for (Activity act : activityList) {
// sActivityList remove the index activity at onActivityDestroyed
- activity.finish();
- activity.overridePendingTransition(enterAnim, exitAnim);
+ act.finish();
+ act.overridePendingTransition(enterAnim, exitAnim);
}
}
@@ -1817,8 +1883,8 @@ public static void finishAllActivitiesExceptNewest() {
* @param isLoadAnim True to use animation for the outgoing activity, false otherwise.
*/
public static void finishAllActivitiesExceptNewest(final boolean isLoadAnim) {
- List activities = Utils.getActivityList();
- for (int i = activities.size() - 2; i >= 0; i--) {
+ List activities = UtilsBridge.getActivityList();
+ for (int i = 1; i < activities.size(); i++) {
finishActivity(activities.get(i), isLoadAnim);
}
}
@@ -1833,8 +1899,8 @@ public static void finishAllActivitiesExceptNewest(final boolean isLoadAnim) {
*/
public static void finishAllActivitiesExceptNewest(@AnimRes final int enterAnim,
@AnimRes final int exitAnim) {
- List activities = Utils.getActivityList();
- for (int i = activities.size() - 2; i >= 0; i--) {
+ List activities = UtilsBridge.getActivityList();
+ for (int i = 1; i < activities.size(); i++) {
finishActivity(activities.get(i), enterAnim, exitAnim);
}
}
@@ -1845,6 +1911,7 @@ public static void finishAllActivitiesExceptNewest(@AnimRes final int enterAnim,
* @param activity The activity.
* @return the icon of activity
*/
+ @Nullable
public static Drawable getActivityIcon(@NonNull final Activity activity) {
return getActivityIcon(activity.getComponentName());
}
@@ -1855,6 +1922,7 @@ public static Drawable getActivityIcon(@NonNull final Activity activity) {
* @param clz The activity class.
* @return the icon of activity
*/
+ @Nullable
public static Drawable getActivityIcon(@NonNull final Class clz) {
return getActivityIcon(new ComponentName(Utils.getApp(), clz));
}
@@ -1865,6 +1933,7 @@ public static Drawable getActivityIcon(@NonNull final Class
* @param activityName The name of activity.
* @return the icon of activity
*/
+ @Nullable
public static Drawable getActivityIcon(@NonNull final ComponentName activityName) {
PackageManager pm = Utils.getApp().getPackageManager();
try {
@@ -1881,6 +1950,7 @@ public static Drawable getActivityIcon(@NonNull final ComponentName activityName
* @param activity The activity.
* @return the logo of activity
*/
+ @Nullable
public static Drawable getActivityLogo(@NonNull final Activity activity) {
return getActivityLogo(activity.getComponentName());
}
@@ -1891,6 +1961,7 @@ public static Drawable getActivityLogo(@NonNull final Activity activity) {
* @param clz The activity class.
* @return the logo of activity
*/
+ @Nullable
public static Drawable getActivityLogo(@NonNull final Class clz) {
return getActivityLogo(new ComponentName(Utils.getApp(), clz));
}
@@ -1901,6 +1972,7 @@ public static Drawable getActivityLogo(@NonNull final Class
* @param activityName The name of activity.
* @return the logo of activity
*/
+ @Nullable
public static Drawable getActivityLogo(@NonNull final ComponentName activityName) {
PackageManager pm = Utils.getApp().getPackageManager();
try {
@@ -1925,28 +1997,22 @@ private static void startActivity(final Context context,
private static boolean startActivity(final Intent intent,
final Context context,
final Bundle options) {
- if (!isIntentAvailable(intent)) {
- Log.e("ActivityUtils", "intent is unavailable");
- return false;
- }
if (!(context instanceof Activity)) {
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
}
- if (options != null && Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
- context.startActivity(intent, options);
- } else {
- context.startActivity(intent);
+ try {
+ if (options != null && Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
+ context.startActivity(intent, options);
+ } else {
+ context.startActivity(intent);
+ }
+ } catch (Exception e) {
+ Log.e("ActivityUtils", "An exception occurred in startActivity, error message: " + e.getLocalizedMessage());
+ return false;
}
return true;
}
- private static boolean isIntentAvailable(final Intent intent) {
- return Utils.getApp()
- .getPackageManager()
- .queryIntentActivities(intent, PackageManager.MATCH_DEFAULT_ONLY)
- .size() > 0;
- }
-
private static boolean startActivityForResult(final Activity activity,
final Bundle extras,
final String pkg,
@@ -1963,15 +2029,16 @@ private static boolean startActivityForResult(final Intent intent,
final Activity activity,
final int requestCode,
@Nullable final Bundle options) {
- if (!isIntentAvailable(intent)) {
- Log.e("ActivityUtils", "intent is unavailable");
+ try {
+ if (options != null && Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
+ activity.startActivityForResult(intent, requestCode, options);
+ } else {
+ activity.startActivityForResult(intent, requestCode);
+ }
+ } catch (Exception e) {
+ Log.e("ActivityUtils", "An exception occurred in startActivityForResult, error message: " + e.getLocalizedMessage());
return false;
}
- if (options != null && Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
- activity.startActivityForResult(intent, requestCode, options);
- } else {
- activity.startActivityForResult(intent, requestCode);
- }
return true;
}
@@ -2006,18 +2073,19 @@ private static boolean startActivityForResult(final Intent intent,
final Fragment fragment,
final int requestCode,
@Nullable final Bundle options) {
- if (!isIntentAvailable(intent)) {
- Log.e("ActivityUtils", "intent is unavailable");
- return false;
- }
if (fragment.getActivity() == null) {
Log.e("ActivityUtils", "Fragment " + fragment + " not attached to Activity");
return false;
}
- if (options != null && Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
- fragment.startActivityForResult(intent, requestCode, options);
- } else {
- fragment.startActivityForResult(intent, requestCode);
+ try {
+ if (options != null && Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
+ fragment.startActivityForResult(intent, requestCode, options);
+ } else {
+ fragment.startActivityForResult(intent, requestCode);
+ }
+ } catch (Exception e) {
+ Log.e("ActivityUtils", "An exception occurred in fragment.startActivityForResult, error message: " + e.getLocalizedMessage());
+ return false;
}
return true;
}
@@ -2056,4 +2124,13 @@ private static Bundle getOptionsBundle(final Activity activity,
}
return ActivityOptionsCompat.makeSceneTransitionAnimation(activity, pairs).toBundle();
}
+
+ private static Context getTopActivityOrApp() {
+ if (UtilsBridge.isAppForeground()) {
+ Activity topActivity = getTopActivity();
+ return topActivity == null ? Utils.getApp() : topActivity;
+ } else {
+ return Utils.getApp();
+ }
+ }
}
diff --git a/lib/utilcode/src/main/java/com/blankj/utilcode/util/AdaptScreenUtils.java b/lib/utilcode/src/main/java/com/blankj/utilcode/util/AdaptScreenUtils.java
index 95309032f6..aef62a44dc 100644
--- a/lib/utilcode/src/main/java/com/blankj/utilcode/util/AdaptScreenUtils.java
+++ b/lib/utilcode/src/main/java/com/blankj/utilcode/util/AdaptScreenUtils.java
@@ -2,12 +2,13 @@
import android.content.res.Resources;
import android.util.DisplayMetrics;
-import android.util.Log;
import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.List;
+import androidx.annotation.NonNull;
+
/**
*
* author: Blankj
@@ -27,7 +28,8 @@ private AdaptScreenUtils() {
/**
* Adapt for the horizontal screen, and call it in {@link android.app.Activity#getResources()}.
*/
- public static Resources adaptWidth(final Resources resources, final int designWidth) {
+ @NonNull
+ public static Resources adaptWidth(@NonNull final Resources resources, final int designWidth) {
float newXdpi = (resources.getDisplayMetrics().widthPixels * 72f) / designWidth;
applyDisplayMetrics(resources, newXdpi);
return resources;
@@ -36,14 +38,16 @@ public static Resources adaptWidth(final Resources resources, final int designWi
/**
* Adapt for the vertical screen, and call it in {@link android.app.Activity#getResources()}.
*/
- public static Resources adaptHeight(final Resources resources, final int designHeight) {
+ @NonNull
+ public static Resources adaptHeight(@NonNull final Resources resources, final int designHeight) {
return adaptHeight(resources, designHeight, false);
}
/**
* Adapt for the vertical screen, and call it in {@link android.app.Activity#getResources()}.
*/
- public static Resources adaptHeight(final Resources resources, final int designHeight, final boolean includeNavBar) {
+ @NonNull
+ public static Resources adaptHeight(@NonNull final Resources resources, final int designHeight, final boolean includeNavBar) {
float screenHeight = (resources.getDisplayMetrics().heightPixels
+ (includeNavBar ? getNavBarHeight(resources) : 0)) * 72f;
float newXdpi = screenHeight / designHeight;
@@ -51,7 +55,7 @@ public static Resources adaptHeight(final Resources resources, final int designH
return resources;
}
- private static int getNavBarHeight(final Resources resources) {
+ private static int getNavBarHeight(@NonNull final Resources resources) {
int resourceId = resources.getIdentifier("navigation_bar_height", "dimen", "android");
if (resourceId != 0) {
return resources.getDimensionPixelSize(resourceId);
@@ -64,7 +68,8 @@ private static int getNavBarHeight(final Resources resources) {
* @param resources The resources.
* @return the resource
*/
- public static Resources closeAdapt(final Resources resources) {
+ @NonNull
+ public static Resources closeAdapt(@NonNull final Resources resources) {
float newXdpi = Resources.getSystem().getDisplayMetrics().density * 72f;
applyDisplayMetrics(resources, newXdpi);
return resources;
@@ -92,13 +97,22 @@ public static int px2Pt(final float pxValue) {
return (int) (pxValue * 72 / metrics.xdpi + 0.5);
}
- private static void applyDisplayMetrics(final Resources resources, final float newXdpi) {
+ private static void applyDisplayMetrics(@NonNull final Resources resources, final float newXdpi) {
resources.getDisplayMetrics().xdpi = newXdpi;
Utils.getApp().getResources().getDisplayMetrics().xdpi = newXdpi;
applyOtherDisplayMetrics(resources, newXdpi);
}
- static void preLoad() {
+ static Runnable getPreLoadRunnable() {
+ return new Runnable() {
+ @Override
+ public void run() {
+ preLoad();
+ }
+ };
+ }
+
+ private static void preLoad() {
applyDisplayMetrics(Resources.getSystem(), Resources.getSystem().getDisplayMetrics().xdpi);
}
@@ -136,7 +150,7 @@ private static void applyMetricsFields(final Resources resources, final float ne
DisplayMetrics dm = (DisplayMetrics) metricsField.get(resources);
if (dm != null) dm.xdpi = newXdpi;
} catch (Exception e) {
- Log.e("AdaptScreenUtils", "applyMetricsFields: " + e);
+ e.printStackTrace();
}
}
}
@@ -144,8 +158,7 @@ private static void applyMetricsFields(final Resources resources, final float ne
private static DisplayMetrics getMetricsFromField(final Resources resources, final Field field) {
try {
return (DisplayMetrics) field.get(resources);
- } catch (Exception e) {
- Log.e("AdaptScreenUtils", "getMetricsFromField: " + e);
+ } catch (Exception ignore) {
return null;
}
}
diff --git a/lib/utilcode/src/main/java/com/blankj/utilcode/util/ApiUtils.java b/lib/utilcode/src/main/java/com/blankj/utilcode/util/ApiUtils.java
index cd3346f36d..2fb3a88b74 100644
--- a/lib/utilcode/src/main/java/com/blankj/utilcode/util/ApiUtils.java
+++ b/lib/utilcode/src/main/java/com/blankj/utilcode/util/ApiUtils.java
@@ -1,6 +1,5 @@
package com.blankj.utilcode.util;
-import android.support.annotation.NonNull;
import android.util.Log;
import java.lang.annotation.ElementType;
@@ -11,6 +10,9 @@
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
/**
*
* author: Blankj
@@ -47,10 +49,17 @@ private void registerImpl(Class implClass) {
* @param The type.
* @return the api
*/
+ @Nullable
public static T getApi(@NonNull final Class apiClass) {
return getInstance().getApiInner(apiClass);
}
+ public static void register(@Nullable Class implClass) {
+ if (implClass == null) return;
+ getInstance().registerImpl(implClass);
+ }
+
+ @NonNull
public static String toString_() {
return getInstance().toString();
}
@@ -66,28 +75,29 @@ private static ApiUtils getInstance() {
private Result getApiInner(Class apiClass) {
BaseApi api = mApiMap.get(apiClass);
- if (api == null) {
- synchronized (this) {
- api = mApiMap.get(apiClass);
- if (api == null) {
- Class implClass = mInjectApiImplMap.get(apiClass);
- if (implClass != null) {
- try {
- api = (BaseApi) implClass.newInstance();
- mApiMap.put(apiClass, api);
- } catch (Exception ignore) {
- Log.e(TAG, "The <" + implClass + "> has no parameterless constructor.");
- return null;
- }
- } else {
- Log.e(TAG, "The <" + apiClass + "> doesn't implement.");
- return null;
- }
+ if (api != null) {
+ return (Result) api;
+ }
+ synchronized (apiClass) {
+ api = mApiMap.get(apiClass);
+ if (api != null) {
+ return (Result) api;
+ }
+ Class implClass = mInjectApiImplMap.get(apiClass);
+ if (implClass != null) {
+ try {
+ api = (BaseApi) implClass.newInstance();
+ mApiMap.put(apiClass, api);
+ return (Result) api;
+ } catch (Exception ignore) {
+ Log.e(TAG, "The <" + implClass + "> has no parameterless constructor.");
+ return null;
}
+ } else {
+ Log.e(TAG, "The <" + apiClass + "> doesn't implement.");
+ return null;
}
}
- //noinspection unchecked
- return (Result) api;
}
private static class LazyHolder {
@@ -100,6 +110,6 @@ private static class LazyHolder {
boolean isMock() default false;
}
- public abstract static class BaseApi {
+ public static class BaseApi {
}
}
\ No newline at end of file
diff --git a/lib/utilcode/src/main/java/com/blankj/utilcode/util/AppUtils.java b/lib/utilcode/src/main/java/com/blankj/utilcode/util/AppUtils.java
index 5685a0aac8..3a07653fb0 100644
--- a/lib/utilcode/src/main/java/com/blankj/utilcode/util/AppUtils.java
+++ b/lib/utilcode/src/main/java/com/blankj/utilcode/util/AppUtils.java
@@ -1,30 +1,23 @@
package com.blankj.utilcode.util;
-import android.annotation.SuppressLint;
import android.app.Activity;
import android.app.ActivityManager;
-import android.app.AppOpsManager;
-import android.app.usage.UsageStats;
-import android.app.usage.UsageStatsManager;
-import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
import android.content.pm.Signature;
+import android.content.pm.SigningInfo;
import android.graphics.drawable.Drawable;
import android.net.Uri;
import android.os.Build;
-import android.provider.Settings;
-import android.support.annotation.NonNull;
-import android.support.v4.content.FileProvider;
import android.util.Log;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
import java.io.File;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
import java.util.ArrayList;
import java.util.List;
@@ -48,7 +41,7 @@ private AppUtils() {
* @param listener The status of application changed listener
*/
public static void registerAppStatusChangedListener(@NonNull final Utils.OnAppStatusChangedListener listener) {
- Utils.getActivityLifecycle().addOnAppStatusChangedListener(listener);
+ UtilsBridge.addOnAppStatusChangedListener(listener);
}
/**
@@ -57,7 +50,7 @@ public static void registerAppStatusChangedListener(@NonNull final Utils.OnAppSt
* @param listener The status of application changed listener
*/
public static void unregisterAppStatusChangedListener(@NonNull final Utils.OnAppStatusChangedListener listener) {
- Utils.getActivityLifecycle().removeOnAppStatusChangedListener(listener);
+ UtilsBridge.removeOnAppStatusChangedListener(listener);
}
/**
@@ -68,7 +61,7 @@ public static void unregisterAppStatusChangedListener(@NonNull final Utils.OnApp
* @param filePath The path of file.
*/
public static void installApp(final String filePath) {
- installApp(getFileByPath(filePath));
+ installApp(UtilsBridge.getFileByPath(filePath));
}
/**
@@ -79,24 +72,9 @@ public static void installApp(final String filePath) {
* @param file The file.
*/
public static void installApp(final File file) {
- if (!isFileExists(file)) return;
- Utils.getApp().startActivity(getInstallAppIntent(file, true));
- }
-
- /**
- * Install the app.
- * Target APIs greater than 25 must hold
- * {@code
- *
- * @param activity The activity.
- * @param filePath The path of file.
- * @param requestCode If >= 0, this code will be returned in
- * onActivityResult() when the activity exits.
- */
- public static void installApp(final Activity activity,
- final String filePath,
- final int requestCode) {
- installApp(activity, getFileByPath(filePath), requestCode);
+ Intent installAppIntent = UtilsBridge.getInstallAppIntent(file);
+ if (installAppIntent == null) return;
+ Utils.getApp().startActivity(installAppIntent);
}
/**
@@ -104,41 +82,24 @@ public static void installApp(final Activity activity,
* Target APIs greater than 25 must hold
* {@code
*
- * @param activity The activity.
- * @param file The file.
- * @param requestCode If >= 0, this code will be returned in
- * onActivityResult() when the activity exits.
+ * @param uri The uri.
*/
- public static void installApp(final Activity activity,
- final File file,
- final int requestCode) {
- if (!isFileExists(file)) return;
- activity.startActivityForResult(getInstallAppIntent(file), requestCode);
+ public static void installApp(final Uri uri) {
+ Intent installAppIntent = UtilsBridge.getInstallAppIntent(uri);
+ if (installAppIntent == null) return;
+ Utils.getApp().startActivity(installAppIntent);
}
/**
* Uninstall the app.
+ * Target APIs greater than 25 must hold
+ * Must hold {@code
*
* @param packageName The name of the package.
*/
public static void uninstallApp(final String packageName) {
- if (isSpace(packageName)) return;
- Utils.getApp().startActivity(getUninstallAppIntent(packageName, true));
- }
-
- /**
- * Uninstall the app.
- *
- * @param activity The activity.
- * @param packageName The name of the package.
- * @param requestCode If >= 0, this code will be returned in
- * onActivityResult() when the activity exits.
- */
- public static void uninstallApp(final Activity activity,
- final String packageName,
- final int requestCode) {
- if (isSpace(packageName)) return;
- activity.startActivityForResult(getUninstallAppIntent(packageName), requestCode);
+ if (UtilsBridge.isSpace(packageName)) return;
+ Utils.getApp().startActivity(UtilsBridge.getUninstallAppIntent(packageName));
}
/**
@@ -147,12 +108,12 @@ public static void uninstallApp(final Activity activity,
* @param pkgName The name of the package.
* @return {@code true}: yesTarget APIs greater than 21 must hold
* {@code
*
- * @param packageName The name of the package.
+ * @param pkgName The name of the package.
* @return {@code true}: yes taskInfo = am.getRunningTasks(Integer.MAX_VALUE);
if (taskInfo != null && taskInfo.size() > 0) {
for (ActivityManager.RunningTaskInfo aInfo : taskInfo) {
- if (pkgName.equals(aInfo.baseActivity.getPackageName())) {
- return true;
+ if (aInfo.baseActivity != null) {
+ if (pkgName.equals(aInfo.baseActivity.getPackageName())) {
+ return true;
+ }
}
}
}
List serviceInfo = am.getRunningServices(Integer.MAX_VALUE);
if (serviceInfo != null && serviceInfo.size() > 0) {
for (ActivityManager.RunningServiceInfo aInfo : serviceInfo) {
- if (uid == aInfo.uid) {
+ if (pkgName.equals(aInfo.service.getPackageName())) {
return true;
}
}
@@ -291,8 +241,8 @@ public static boolean isAppRunning(@NonNull final String pkgName) {
* @param packageName The name of the package.
*/
public static void launchApp(final String packageName) {
- if (isSpace(packageName)) return;
- Intent launchAppIntent = getLaunchAppIntent(packageName, true);
+ if (UtilsBridge.isSpace(packageName)) return;
+ Intent launchAppIntent = UtilsBridge.getLaunchAppIntent(packageName);
if (launchAppIntent == null) {
Log.e("AppUtils", "Didn't exist launcher activity.");
return;
@@ -300,26 +250,6 @@ public static void launchApp(final String packageName) {
Utils.getApp().startActivity(launchAppIntent);
}
- /**
- * Launch the application.
- *
- * @param activity The activity.
- * @param packageName The name of the package.
- * @param requestCode If >= 0, this code will be returned in
- * onActivityResult() when the activity exits.
- */
- public static void launchApp(final Activity activity,
- final String packageName,
- final int requestCode) {
- if (isSpace(packageName)) return;
- Intent launchAppIntent = getLaunchAppIntent(packageName);
- if (launchAppIntent == null) {
- Log.e("AppUtils", "Didn't exist launcher activity.");
- return;
- }
- activity.startActivityForResult(launchAppIntent, requestCode);
- }
-
/**
* Relaunch the application.
*/
@@ -333,7 +263,7 @@ public static void relaunchApp() {
* @param isKillProcess True to kill the process, false otherwise.
*/
public static void relaunchApp(final boolean isKillProcess) {
- Intent intent = getLaunchAppIntent(Utils.getApp().getPackageName(), true);
+ Intent intent = UtilsBridge.getLaunchAppIntent(Utils.getApp().getPackageName());
if (intent == null) {
Log.e("AppUtils", "Didn't exist launcher activity.");
return;
@@ -358,25 +288,44 @@ public static void launchAppDetailsSettings() {
/**
* Launch the application's details settings.
*
- * @param packageName The name of the package.
+ * @param pkgName The name of the package.
*/
- public static void launchAppDetailsSettings(final String packageName) {
- if (isSpace(packageName)) return;
- Intent intent = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
- intent.setData(Uri.parse("package:" + packageName));
- Utils.getApp().startActivity(intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
+ public static void launchAppDetailsSettings(final String pkgName) {
+ if (UtilsBridge.isSpace(pkgName)) return;
+ Intent intent = UtilsBridge.getLaunchAppDetailsSettingsIntent(pkgName, true);
+ if (!UtilsBridge.isIntentAvailable(intent)) return;
+ Utils.getApp().startActivity(intent);
+ }
+
+ /**
+ * Launch the application's details settings.
+ *
+ * @param activity The activity.
+ * @param requestCode The requestCode.
+ */
+ public static void launchAppDetailsSettings(final Activity activity, final int requestCode) {
+ launchAppDetailsSettings(activity, requestCode, Utils.getApp().getPackageName());
+ }
+
+ /**
+ * Launch the application's details settings.
+ *
+ * @param activity The activity.
+ * @param requestCode The requestCode.
+ * @param pkgName The name of the package.
+ */
+ public static void launchAppDetailsSettings(final Activity activity, final int requestCode, final String pkgName) {
+ if (activity == null || UtilsBridge.isSpace(pkgName)) return;
+ Intent intent = UtilsBridge.getLaunchAppDetailsSettingsIntent(pkgName, false);
+ if (!UtilsBridge.isIntentAvailable(intent)) return;
+ activity.startActivityForResult(intent, requestCode);
}
/**
* Exit the application.
*/
public static void exitApp() {
- List activityList = Utils.getActivityList();
- for (int i = activityList.size() - 1; i >= 0; --i) {// remove from top
- Activity activity = activityList.get(i);
- // sActivityList remove the index activity at onActivityDestroyed
- activity.finish();
- }
+ UtilsBridge.finishAllActivities();
System.exit(0);
}
@@ -385,6 +334,7 @@ public static void exitApp() {
*
* @return the application's icon
*/
+ @Nullable
public static Drawable getAppIcon() {
return getAppIcon(Utils.getApp().getPackageName());
}
@@ -395,8 +345,9 @@ public static Drawable getAppIcon() {
* @param packageName The name of the package.
* @return the application's icon
*/
+ @Nullable
public static Drawable getAppIcon(final String packageName) {
- if (isSpace(packageName)) return null;
+ if (UtilsBridge.isSpace(packageName)) return null;
try {
PackageManager pm = Utils.getApp().getPackageManager();
PackageInfo pi = pm.getPackageInfo(packageName, 0);
@@ -423,7 +374,7 @@ public static int getAppIconId() {
* @return the application's icon resource identifier
*/
public static int getAppIconId(final String packageName) {
- if (isSpace(packageName)) return 0;
+ if (UtilsBridge.isSpace(packageName)) return 0;
try {
PackageManager pm = Utils.getApp().getPackageManager();
PackageInfo pi = pm.getPackageInfo(packageName, 0);
@@ -434,11 +385,44 @@ public static int getAppIconId(final String packageName) {
}
}
+
+ /**
+ * Return true if this is the first ever time that the application is installed on the device.
+ *
+ * @return true if this is the first ever time that the application is installed on the device.
+ */
+ public static boolean isFirstTimeInstall() {
+ try {
+ long firstInstallTime = Utils.getApp().getPackageManager().getPackageInfo(getAppPackageName(), 0).firstInstallTime;
+ long lastUpdateTime = Utils.getApp().getPackageManager().getPackageInfo(getAppPackageName(), 0).lastUpdateTime;
+ return firstInstallTime == lastUpdateTime;
+ } catch (Exception e) {
+ return false;
+ }
+ }
+
+ /**
+ * Return true if app was previously installed and this one is an update/upgrade to that one, returns false if this is a fresh installation and not an update/upgrade.
+ *
+ * @return true if app was previously installed and this one is an update/upgrade to that one, returns false if this is a fresh installation and not an update/upgrade.
+ */
+ public static boolean isAppUpgraded() {
+ try {
+ long firstInstallTime = Utils.getApp().getPackageManager().getPackageInfo(getAppPackageName(), 0).firstInstallTime;
+ long lastUpdateTime = Utils.getApp().getPackageManager().getPackageInfo(getAppPackageName(), 0).lastUpdateTime;
+ return firstInstallTime != lastUpdateTime;
+ } catch (Exception e) {
+ return false;
+ }
+ }
+
+
/**
* Return the application's package name.
*
* @return the application's package name
*/
+ @NonNull
public static String getAppPackageName() {
return Utils.getApp().getPackageName();
}
@@ -448,6 +432,7 @@ public static String getAppPackageName() {
*
* @return the application's name
*/
+ @NonNull
public static String getAppName() {
return getAppName(Utils.getApp().getPackageName());
}
@@ -458,12 +443,13 @@ public static String getAppName() {
* @param packageName The name of the package.
* @return the application's name
*/
+ @NonNull
public static String getAppName(final String packageName) {
- if (isSpace(packageName)) return "";
+ if (UtilsBridge.isSpace(packageName)) return "";
try {
PackageManager pm = Utils.getApp().getPackageManager();
PackageInfo pi = pm.getPackageInfo(packageName, 0);
- return pi == null ? null : pi.applicationInfo.loadLabel(pm).toString();
+ return pi == null ? "" : pi.applicationInfo.loadLabel(pm).toString();
} catch (PackageManager.NameNotFoundException e) {
e.printStackTrace();
return "";
@@ -475,6 +461,7 @@ public static String getAppName(final String packageName) {
*
* @return the application's path
*/
+ @NonNull
public static String getAppPath() {
return getAppPath(Utils.getApp().getPackageName());
}
@@ -485,12 +472,13 @@ public static String getAppPath() {
* @param packageName The name of the package.
* @return the application's path
*/
+ @NonNull
public static String getAppPath(final String packageName) {
- if (isSpace(packageName)) return "";
+ if (UtilsBridge.isSpace(packageName)) return "";
try {
PackageManager pm = Utils.getApp().getPackageManager();
PackageInfo pi = pm.getPackageInfo(packageName, 0);
- return pi == null ? null : pi.applicationInfo.sourceDir;
+ return pi == null ? "" : pi.applicationInfo.sourceDir;
} catch (PackageManager.NameNotFoundException e) {
e.printStackTrace();
return "";
@@ -502,6 +490,7 @@ public static String getAppPath(final String packageName) {
*
* @return the application's version name
*/
+ @NonNull
public static String getAppVersionName() {
return getAppVersionName(Utils.getApp().getPackageName());
}
@@ -512,12 +501,13 @@ public static String getAppVersionName() {
* @param packageName The name of the package.
* @return the application's version name
*/
+ @NonNull
public static String getAppVersionName(final String packageName) {
- if (isSpace(packageName)) return "";
+ if (UtilsBridge.isSpace(packageName)) return "";
try {
PackageManager pm = Utils.getApp().getPackageManager();
PackageInfo pi = pm.getPackageInfo(packageName, 0);
- return pi == null ? null : pi.versionName;
+ return pi == null ? "" : pi.versionName;
} catch (PackageManager.NameNotFoundException e) {
e.printStackTrace();
return "";
@@ -540,7 +530,7 @@ public static int getAppVersionCode() {
* @return the application's version code
*/
public static int getAppVersionCode(final String packageName) {
- if (isSpace(packageName)) return -1;
+ if (UtilsBridge.isSpace(packageName)) return -1;
try {
PackageManager pm = Utils.getApp().getPackageManager();
PackageInfo pi = pm.getPackageInfo(packageName, 0);
@@ -551,13 +541,73 @@ public static int getAppVersionCode(final String packageName) {
}
}
+ /**
+ * Return the application's minimum sdk version code.
+ *
+ * @return the application's minimum sdk version code
+ */
+ public static int getAppMinSdkVersion() {
+ return getAppMinSdkVersion(Utils.getApp().getPackageName());
+ }
+
+ /**
+ * Return the application's minimum sdk version code.
+ *
+ * @param packageName The name of the package.
+ * @return the application's minimum sdk version code
+ */
+ public static int getAppMinSdkVersion(final String packageName) {
+ if (UtilsBridge.isSpace(packageName)) return -1;
+ if (android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.N) return -1;
+ try {
+ PackageManager pm = Utils.getApp().getPackageManager();
+ PackageInfo pi = pm.getPackageInfo(packageName, 0);
+ if (null == pi) return -1;
+ ApplicationInfo ai = pi.applicationInfo;
+ return null == ai ? -1 : ai.minSdkVersion;
+ } catch (PackageManager.NameNotFoundException e) {
+ e.printStackTrace();
+ return -1;
+ }
+ }
+
+ /**
+ * Return the application's target sdk version code.
+ *
+ * @return the application's target sdk version code
+ */
+ public static int getAppTargetSdkVersion() {
+ return getAppTargetSdkVersion(Utils.getApp().getPackageName());
+ }
+
+ /**
+ * Return the application's target sdk version code.
+ *
+ * @param packageName The name of the package.
+ * @return the application's target sdk version code
+ */
+ public static int getAppTargetSdkVersion(final String packageName) {
+ if (UtilsBridge.isSpace(packageName)) return -1;
+ try {
+ PackageManager pm = Utils.getApp().getPackageManager();
+ PackageInfo pi = pm.getPackageInfo(packageName, 0);
+ if (null == pi) return -1;
+ ApplicationInfo ai = pi.applicationInfo;
+ return null == ai ? -1 : ai.targetSdkVersion;
+ } catch (PackageManager.NameNotFoundException e) {
+ e.printStackTrace();
+ return -1;
+ }
+ }
+
/**
* Return the application's signature.
*
* @return the application's signature
*/
- public static Signature[] getAppSignature() {
- return getAppSignature(Utils.getApp().getPackageName());
+ @Nullable
+ public static Signature[] getAppSignatures() {
+ return getAppSignatures(Utils.getApp().getPackageName());
}
/**
@@ -566,26 +616,69 @@ public static Signature[] getAppSignature() {
* @param packageName The name of the package.
* @return the application's signature
*/
- public static Signature[] getAppSignature(final String packageName) {
- if (isSpace(packageName)) return null;
+ @Nullable
+ public static Signature[] getAppSignatures(final String packageName) {
+ if (UtilsBridge.isSpace(packageName)) return null;
try {
PackageManager pm = Utils.getApp().getPackageManager();
- @SuppressLint("PackageManagerGetSignatures")
- PackageInfo pi = pm.getPackageInfo(packageName, PackageManager.GET_SIGNATURES);
- return pi == null ? null : pi.signatures;
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+ PackageInfo pi = pm.getPackageInfo(packageName, PackageManager.GET_SIGNING_CERTIFICATES);
+ if (pi == null) return null;
+
+ SigningInfo signingInfo = pi.signingInfo;
+ if (signingInfo.hasMultipleSigners()) {
+ return signingInfo.getApkContentsSigners();
+ } else {
+ return signingInfo.getSigningCertificateHistory();
+ }
+ } else {
+ PackageInfo pi = pm.getPackageInfo(packageName, PackageManager.GET_SIGNATURES);
+ if (pi == null) return null;
+
+ return pi.signatures;
+ }
} catch (PackageManager.NameNotFoundException e) {
e.printStackTrace();
return null;
}
}
+ /**
+ * Return the application's signature.
+ *
+ * @param file The file.
+ * @return the application's signature
+ */
+ @Nullable
+ public static Signature[] getAppSignatures(final File file) {
+ if (file == null) return null;
+ PackageManager pm = Utils.getApp().getPackageManager();
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+ PackageInfo pi = pm.getPackageArchiveInfo(file.getAbsolutePath(), PackageManager.GET_SIGNING_CERTIFICATES);
+ if (pi == null) return null;
+
+ SigningInfo signingInfo = pi.signingInfo;
+ if (signingInfo.hasMultipleSigners()) {
+ return signingInfo.getApkContentsSigners();
+ } else {
+ return signingInfo.getSigningCertificateHistory();
+ }
+ } else {
+ PackageInfo pi = pm.getPackageArchiveInfo(file.getAbsolutePath(), PackageManager.GET_SIGNATURES);
+ if (pi == null) return null;
+
+ return pi.signatures;
+ }
+ }
+
/**
* Return the application's signature for SHA1 value.
*
* @return the application's signature for SHA1 value
*/
- public static String getAppSignatureSHA1() {
- return getAppSignatureSHA1(Utils.getApp().getPackageName());
+ @NonNull
+ public static List getAppSignaturesSHA1() {
+ return getAppSignaturesSHA1(Utils.getApp().getPackageName());
}
/**
@@ -594,8 +687,9 @@ public static String getAppSignatureSHA1() {
* @param packageName The name of the package.
* @return the application's signature for SHA1 value
*/
- public static String getAppSignatureSHA1(final String packageName) {
- return getAppSignatureHash(packageName, "SHA1");
+ @NonNull
+ public static List getAppSignaturesSHA1(final String packageName) {
+ return getAppSignaturesHash(packageName, "SHA1");
}
/**
@@ -603,8 +697,9 @@ public static String getAppSignatureSHA1(final String packageName) {
*
* @return the application's signature for SHA256 value
*/
- public static String getAppSignatureSHA256() {
- return getAppSignatureSHA256(Utils.getApp().getPackageName());
+ @NonNull
+ public static List getAppSignaturesSHA256() {
+ return getAppSignaturesSHA256(Utils.getApp().getPackageName());
}
/**
@@ -613,8 +708,9 @@ public static String getAppSignatureSHA256() {
* @param packageName The name of the package.
* @return the application's signature for SHA256 value
*/
- public static String getAppSignatureSHA256(final String packageName) {
- return getAppSignatureHash(packageName, "SHA256");
+ @NonNull
+ public static List getAppSignaturesSHA256(final String packageName) {
+ return getAppSignaturesHash(packageName, "SHA256");
}
/**
@@ -622,8 +718,9 @@ public static String getAppSignatureSHA256(final String packageName) {
*
* @return the application's signature for MD5 value
*/
- public static String getAppSignatureMD5() {
- return getAppSignatureMD5(Utils.getApp().getPackageName());
+ @NonNull
+ public static List getAppSignaturesMD5() {
+ return getAppSignaturesMD5(Utils.getApp().getPackageName());
}
/**
@@ -632,11 +729,11 @@ public static String getAppSignatureMD5() {
* @param packageName The name of the package.
* @return the application's signature for MD5 value
*/
- public static String getAppSignatureMD5(final String packageName) {
- return getAppSignatureHash(packageName, "MD5");
+ @NonNull
+ public static List getAppSignaturesMD5(final String packageName) {
+ return getAppSignaturesHash(packageName, "MD5");
}
-
/**
* Return the application's user-ID.
*
@@ -654,22 +751,24 @@ public static int getAppUid() {
*/
public static int getAppUid(String pkgName) {
try {
- ApplicationInfo ai = Utils.getApp().getPackageManager().getApplicationInfo(pkgName, 0);
- if (ai != null) {
- return ai.uid;
- }
+ return Utils.getApp().getPackageManager().getApplicationInfo(pkgName, 0).uid;
} catch (Exception e) {
e.printStackTrace();
+ return -1;
}
- return -1;
}
- private static String getAppSignatureHash(final String packageName, final String algorithm) {
- if (isSpace(packageName)) return "";
- Signature[] signature = getAppSignature(packageName);
- if (signature == null || signature.length <= 0) return "";
- return bytes2HexString(hashTemplate(signature[0].toByteArray(), algorithm))
- .replaceAll("(?<=[0-9A-F]{2})[0-9A-F]{2}", ":$0");
+ private static List getAppSignaturesHash(final String packageName, final String algorithm) {
+ ArrayList result = new ArrayList<>();
+ if (UtilsBridge.isSpace(packageName)) return result;
+ Signature[] signatures = getAppSignatures(packageName);
+ if (signatures == null || signatures.length <= 0) return result;
+ for (Signature signature : signatures) {
+ String hash = UtilsBridge.bytes2HexString(UtilsBridge.hashTemplate(signature.toByteArray(), algorithm))
+ .replaceAll("(?<=[0-9A-F]{2})[0-9A-F]{2}", ":$0");
+ result.add(hash);
+ }
+ return result;
}
/**
@@ -681,11 +780,14 @@ private static String getAppSignatureHash(final String packageName, final String
* path of package
* version name
* version code
+ * minimum sdk version code
+ * target sdk version code
* is system
*
*
* @return the application's information
*/
+ @Nullable
public static AppInfo getAppInfo() {
return getAppInfo(Utils.getApp().getPackageName());
}
@@ -699,12 +801,15 @@ public static AppInfo getAppInfo() {
* path of package
* version name
* version code
+ * minimum sdk version code
+ * target sdk version code
* is system
*
*
* @param packageName The name of the package.
* @return the application's information
*/
+ @Nullable
public static AppInfo getAppInfo(final String packageName) {
try {
PackageManager pm = Utils.getApp().getPackageManager();
@@ -721,6 +826,7 @@ public static AppInfo getAppInfo(final String packageName) {
*
* @return the applications' information
*/
+ @NonNull
public static List getAppsInfo() {
List list = new ArrayList<>();
PackageManager pm = Utils.getApp().getPackageManager();
@@ -739,6 +845,7 @@ public static List getAppsInfo() {
*
* @return the application's package information
*/
+ @Nullable
public static AppUtils.AppInfo getApkInfo(final File apkFile) {
if (apkFile == null || !apkFile.isFile() || !apkFile.exists()) return null;
return getApkInfo(apkFile.getAbsolutePath());
@@ -749,8 +856,9 @@ public static AppUtils.AppInfo getApkInfo(final File apkFile) {
*
* @return the application's package information
*/
+ @Nullable
public static AppUtils.AppInfo getApkInfo(final String apkFilePath) {
- if (isSpace(apkFilePath)) return null;
+ if (UtilsBridge.isSpace(apkFilePath)) return null;
PackageManager pm = Utils.getApp().getPackageManager();
if (pm == null) return null;
PackageInfo pi = pm.getPackageArchiveInfo(apkFilePath, 0);
@@ -761,17 +869,41 @@ public static AppUtils.AppInfo getApkInfo(final String apkFilePath) {
return getBean(pm, pi);
}
+
+ /**
+ * Return whether the application was first installed.
+ *
+ * @return {@code true}: yes info = pm.queryIntentActivities(intent, 0);
- int size = info.size();
- if (size == 0) return "";
- for (int i = 0; i < size; i++) {
- ResolveInfo ri = info.get(i);
- if (ri.activityInfo.processName.equals(pkg)) {
- return ri.activityInfo.name;
- }
- }
- return info.get(0).activityInfo.name;
- }
-
- private static String getForegroundProcessName() {
- ActivityManager am =
- (ActivityManager) Utils.getApp().getSystemService(Context.ACTIVITY_SERVICE);
- List pInfo = am.getRunningAppProcesses();
- if (pInfo != null && pInfo.size() > 0) {
- for (ActivityManager.RunningAppProcessInfo aInfo : pInfo) {
- if (aInfo.importance
- == ActivityManager.RunningAppProcessInfo.IMPORTANCE_FOREGROUND) {
- return aInfo.processName;
- }
- }
- }
- if (android.os.Build.VERSION.SDK_INT > android.os.Build.VERSION_CODES.LOLLIPOP) {
- PackageManager pm = Utils.getApp().getPackageManager();
- Intent intent = new Intent(Settings.ACTION_USAGE_ACCESS_SETTINGS);
- List list =
- pm.queryIntentActivities(intent, PackageManager.MATCH_DEFAULT_ONLY);
- Log.i("ProcessUtils", list.toString());
- if (list.size() <= 0) {
- Log.i("ProcessUtils",
- "getForegroundProcessName: noun of access to usage information.");
- return "";
- }
- try {// Access to usage information.
- ApplicationInfo info =
- pm.getApplicationInfo(Utils.getApp().getPackageName(), 0);
- AppOpsManager aom =
- (AppOpsManager) Utils.getApp().getSystemService(Context.APP_OPS_SERVICE);
- if (aom.checkOpNoThrow(AppOpsManager.OPSTR_GET_USAGE_STATS,
- info.uid,
- info.packageName) != AppOpsManager.MODE_ALLOWED) {
- intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
- Utils.getApp().startActivity(intent);
- }
- if (aom.checkOpNoThrow(AppOpsManager.OPSTR_GET_USAGE_STATS,
- info.uid,
- info.packageName) != AppOpsManager.MODE_ALLOWED) {
- Log.i("ProcessUtils",
- "getForegroundProcessName: refuse to device usage stats.");
- return "";
- }
- UsageStatsManager usageStatsManager = (UsageStatsManager) Utils.getApp()
- .getSystemService(Context.USAGE_STATS_SERVICE);
- List usageStatsList = null;
- if (usageStatsManager != null) {
- long endTime = System.currentTimeMillis();
- long beginTime = endTime - 86400000 * 7;
- usageStatsList = usageStatsManager
- .queryUsageStats(UsageStatsManager.INTERVAL_BEST,
- beginTime, endTime);
- }
- if (usageStatsList == null || usageStatsList.isEmpty()) return null;
- UsageStats recentStats = null;
- for (UsageStats usageStats : usageStatsList) {
- if (recentStats == null
- || usageStats.getLastTimeUsed() > recentStats.getLastTimeUsed()) {
- recentStats = usageStats;
- }
- }
- return recentStats == null ? null : recentStats.getPackageName();
- } catch (PackageManager.NameNotFoundException e) {
- e.printStackTrace();
- }
- }
- return "";
- }
}
diff --git a/lib/utilcode/src/main/java/com/blankj/utilcode/util/ArrayUtils.java b/lib/utilcode/src/main/java/com/blankj/utilcode/util/ArrayUtils.java
index 08b6142276..48594cedb5 100644
--- a/lib/utilcode/src/main/java/com/blankj/utilcode/util/ArrayUtils.java
+++ b/lib/utilcode/src/main/java/com/blankj/utilcode/util/ArrayUtils.java
@@ -8,6 +8,9 @@
import java.util.LinkedList;
import java.util.List;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
/**
*
* author: blankj
@@ -30,39 +33,47 @@ private ArrayUtils() {
* @param array The array.
* @return a new array only of those given elements.
*/
- @SafeVarargs
+ @NonNull
public static T[] newArray(T... array) {
return array;
}
+ @NonNull
public static long[] newLongArray(long... array) {
return array;
}
+ @NonNull
public static int[] newIntArray(int... array) {
return array;
}
+ @NonNull
public static short[] newShortArray(short... array) {
return array;
}
+ @NonNull
public static char[] newCharArray(char... array) {
return array;
}
+ @NonNull
public static byte[] newByteArray(byte... array) {
return array;
}
+ @NonNull
public static double[] newDoubleArray(double... array) {
return array;
}
+ @NonNull
public static float[] newFloatArray(float... array) {
return array;
}
+ @NonNull
public static boolean[] newBooleanArray(boolean... array) {
return array;
}
@@ -73,7 +84,7 @@ public static boolean[] newBooleanArray(boolean... array) {
* @param array The array.
* @return {@code true}: yesnull
* @return the cloned array, null if null input
*/
- public static T[] copy(T[] array) {
+ @Nullable
+ public static T[] copy(@Nullable T[] array) {
if (array == null) return null;
return subArray(array, 0, array.length);
}
- public static long[] copy(long[] array) {
+ @Nullable
+ public static long[] copy(@Nullable long[] array) {
if (array == null) return null;
return subArray(array, 0, array.length);
}
- public static int[] copy(int[] array) {
+ @Nullable
+ public static int[] copy(@Nullable int[] array) {
if (array == null) return null;
return subArray(array, 0, array.length);
}
- public static short[] copy(short[] array) {
+ @Nullable
+ public static short[] copy(@Nullable short[] array) {
if (array == null) return null;
return subArray(array, 0, array.length);
}
- public static char[] copy(char[] array) {
+ @Nullable
+ public static char[] copy(@Nullable char[] array) {
if (array == null) return null;
return subArray(array, 0, array.length);
}
- public static byte[] copy(byte[] array) {
+ @Nullable
+ public static byte[] copy(@Nullable byte[] array) {
if (array == null) return null;
return subArray(array, 0, array.length);
}
- public static double[] copy(double[] array) {
+ @Nullable
+ public static double[] copy(@Nullable double[] array) {
if (array == null) return null;
return subArray(array, 0, array.length);
}
- public static float[] copy(float[] array) {
+ @Nullable
+ public static float[] copy(@Nullable float[] array) {
if (array == null) return null;
return subArray(array, 0, array.length);
}
- public static boolean[] copy(boolean[] array) {
+ @Nullable
+ public static boolean[] copy(@Nullable boolean[] array) {
if (array == null) return null;
return subArray(array, 0, array.length);
}
- private static Object realCopy(Object array) {
+ @Nullable
+ private static Object realCopy(@Nullable Object array) {
if (array == null) return null;
return realSubArray(array, 0, getLength(array));
}
@@ -398,44 +421,54 @@ private static Object realCopy(Object array) {
// subArray
///////////////////////////////////////////////////////////////////////////
- public static T[] subArray(T[] array, int startIndexInclusive, int endIndexExclusive) {
+ @Nullable
+ public static T[] subArray(@Nullable T[] array, int startIndexInclusive, int endIndexExclusive) {
//noinspection unchecked
return (T[]) realSubArray(array, startIndexInclusive, endIndexExclusive);
}
- public static long[] subArray(long[] array, int startIndexInclusive, int endIndexExclusive) {
+ @Nullable
+ public static long[] subArray(@Nullable long[] array, int startIndexInclusive, int endIndexExclusive) {
return (long[]) realSubArray(array, startIndexInclusive, endIndexExclusive);
}
- public static int[] subArray(int[] array, int startIndexInclusive, int endIndexExclusive) {
+ @Nullable
+ public static int[] subArray(@Nullable int[] array, int startIndexInclusive, int endIndexExclusive) {
return (int[]) realSubArray(array, startIndexInclusive, endIndexExclusive);
}
- public static short[] subArray(short[] array, int startIndexInclusive, int endIndexExclusive) {
+ @Nullable
+ public static short[] subArray(@Nullable short[] array, int startIndexInclusive, int endIndexExclusive) {
return (short[]) realSubArray(array, startIndexInclusive, endIndexExclusive);
}
- public static char[] subArray(char[] array, int startIndexInclusive, int endIndexExclusive) {
+ @Nullable
+ public static char[] subArray(@Nullable char[] array, int startIndexInclusive, int endIndexExclusive) {
return (char[]) realSubArray(array, startIndexInclusive, endIndexExclusive);
}
- public static byte[] subArray(byte[] array, int startIndexInclusive, int endIndexExclusive) {
+ @Nullable
+ public static byte[] subArray(@Nullable byte[] array, int startIndexInclusive, int endIndexExclusive) {
return (byte[]) realSubArray(array, startIndexInclusive, endIndexExclusive);
}
- public static double[] subArray(double[] array, int startIndexInclusive, int endIndexExclusive) {
+ @Nullable
+ public static double[] subArray(@Nullable double[] array, int startIndexInclusive, int endIndexExclusive) {
return (double[]) realSubArray(array, startIndexInclusive, endIndexExclusive);
}
- public static float[] subArray(float[] array, int startIndexInclusive, int endIndexExclusive) {
+ @Nullable
+ public static float[] subArray(@Nullable float[] array, int startIndexInclusive, int endIndexExclusive) {
return (float[]) realSubArray(array, startIndexInclusive, endIndexExclusive);
}
- public static boolean[] subArray(boolean[] array, int startIndexInclusive, int endIndexExclusive) {
+ @Nullable
+ public static boolean[] subArray(@Nullable boolean[] array, int startIndexInclusive, int endIndexExclusive) {
return (boolean[]) realSubArray(array, startIndexInclusive, endIndexExclusive);
}
- private static Object realSubArray(Object array, int startIndexInclusive, int endIndexExclusive) {
+ @Nullable
+ private static Object realSubArray(@Nullable Object array, int startIndexInclusive, int endIndexExclusive) {
if (array == null) {
return null;
}
@@ -482,44 +515,54 @@ private static Object realSubArray(Object array, int startIndexInclusive, int en
* @param element the object to realAdd
* @return A new array containing the existing elements plus the new element
*/
- public static T[] add(T[] array, T element) {
+ @NonNull
+ public static T[] add(@Nullable T[] array, @Nullable T element) {
Class type = array != null ? array.getClass() : (element != null ? element.getClass() : Object.class);
return (T[]) realAddOne(array, element, type);
}
- public static boolean[] add(boolean[] array, boolean element) {
+ @NonNull
+ public static boolean[] add(@Nullable boolean[] array, boolean element) {
return (boolean[]) realAddOne(array, element, Boolean.TYPE);
}
- public static byte[] add(byte[] array, byte element) {
+ @NonNull
+ public static byte[] add(@Nullable byte[] array, byte element) {
return (byte[]) realAddOne(array, element, Byte.TYPE);
}
- public static char[] add(char[] array, char element) {
+ @NonNull
+ public static char[] add(@Nullable char[] array, char element) {
return (char[]) realAddOne(array, element, Character.TYPE);
}
- public static double[] add(double[] array, double element) {
+ @NonNull
+ public static double[] add(@Nullable double[] array, double element) {
return (double[]) realAddOne(array, element, Double.TYPE);
}
- public static float[] add(float[] array, float element) {
+ @NonNull
+ public static float[] add(@Nullable float[] array, float element) {
return (float[]) realAddOne(array, element, Float.TYPE);
}
- public static int[] add(int[] array, int element) {
+ @NonNull
+ public static int[] add(@Nullable int[] array, int element) {
return (int[]) realAddOne(array, element, Integer.TYPE);
}
- public static long[] add(long[] array, long element) {
+ @NonNull
+ public static long[] add(@Nullable long[] array, long element) {
return (long[]) realAddOne(array, element, Long.TYPE);
}
- public static short[] add(short[] array, short element) {
+ @NonNull
+ public static short[] add(@Nullable short[] array, short element) {
return (short[]) realAddOne(array, element, Short.TYPE);
}
- private static Object realAddOne(Object array, Object element, Class newArrayComponentType) {
+ @NonNull
+ private static Object realAddOne(@Nullable Object array, @Nullable Object element, Class newArrayComponentType) {
Object newArray;
int arrayLength = 0;
if (array != null) {
@@ -553,43 +596,52 @@ private static Object realAddOne(Object array, Object element, Class newArrayCom
* @return The new array, null if null array inputs.
* The type of the new array is the type of the first array.
*/
- public static T[] add(T[] array1, T[] array2) {
+ @Nullable
+ public static T[] add(@Nullable T[] array1, @Nullable T[] array2) {
return (T[]) realAddArr(array1, array2);
}
- public static boolean[] add(boolean[] array1, boolean[] array2) {
+ @Nullable
+ public static boolean[] add(@Nullable boolean[] array1, @Nullable boolean[] array2) {
return (boolean[]) realAddArr(array1, array2);
}
- public static char[] add(char[] array1, char[] array2) {
+ @Nullable
+ public static char[] add(@Nullable char[] array1, @Nullable char[] array2) {
return (char[]) realAddArr(array1, array2);
}
- public static byte[] add(byte[] array1, byte[] array2) {
+ @Nullable
+ public static byte[] add(@Nullable byte[] array1, @Nullable byte[] array2) {
return (byte[]) realAddArr(array1, array2);
}
- public static short[] add(short[] array1, short[] array2) {
+ @Nullable
+ public static short[] add(@Nullable short[] array1, @Nullable short[] array2) {
return (short[]) realAddArr(array1, array2);
}
- public static int[] add(int[] array1, int[] array2) {
+ @Nullable
+ public static int[] add(@Nullable int[] array1, @Nullable int[] array2) {
return (int[]) realAddArr(array1, array2);
}
- public static long[] add(long[] array1, long[] array2) {
+ @Nullable
+ public static long[] add(@Nullable long[] array1, @Nullable long[] array2) {
return (long[]) realAddArr(array1, array2);
}
- public static float[] add(float[] array1, float[] array2) {
+ @Nullable
+ public static float[] add(@Nullable float[] array1, @Nullable float[] array2) {
return (float[]) realAddArr(array1, array2);
}
- public static double[] add(double[] array1, double[] array2) {
+ @Nullable
+ public static double[] add(@Nullable double[] array1, @Nullable double[] array2) {
return (double[]) realAddArr(array1, array2);
}
- private static Object realAddArr(Object array1, Object array2) {
+ private static Object realAddArr(@Nullable Object array1, @Nullable Object array2) {
if (array1 == null && array2 == null) return null;
if (array1 == null) {
return realCopy(array2);
@@ -619,11 +671,11 @@ private static Object realAddArr(Object array1, Object array2) {
* whose component type is the same as the element.
*
*
- * ArrayUtils.add(null, 0, null) = [null]
- * ArrayUtils.add(null, 0, "a") = ["a"]
- * ArrayUtils.add(["a"], 1, null) = ["a", null]
- * ArrayUtils.add(["a"], 1, "b") = ["a", "b"]
- * ArrayUtils.add(["a", "b"], 3, "c") = ["a", "b", "c"]
+ * ArrayUtils.add(null, 0, null) = null
+ * ArrayUtils.add(null, 0, ["a"]) = ["a"]
+ * ArrayUtils.add(["a"], 1, null) = ["a"]
+ * ArrayUtils.add(["a"], 1, ["b"]) = ["a", "b"]
+ * ArrayUtils.add(["a", "b"], 2, ["c"]) = ["a", "b", "c"]
*
*
* @param array1 the array to realAdd the element to, may be null
@@ -633,51 +685,76 @@ private static Object realAddArr(Object array1, Object array2) {
* @throws IndexOutOfBoundsException if the index is out of range
* (index < 0 || index > array.length).
*/
- public static T[] add(T[] array1, int index, T[] array2) {
+ @Nullable
+ public static T[] add(@Nullable T[] array1, int index, @Nullable T[] array2) {
Class clss;
if (array1 != null) {
clss = array1.getClass().getComponentType();
} else if (array2 != null) {
clss = array2.getClass().getComponentType();
} else {
- return (T[]) new Object[]{null};
+ return null;
}
return (T[]) realAddArr(array1, index, array2, clss);
}
- public static boolean[] add(boolean[] array1, int index, boolean[] array2) {
- return (boolean[]) realAddArr(array1, index, array2, Boolean.TYPE);
+ @Nullable
+ public static boolean[] add(@Nullable boolean[] array1, int index, @Nullable boolean[] array2) {
+ Object result = realAddArr(array1, index, array2, Boolean.TYPE);
+ if (result == null) return null;
+ return (boolean[]) result;
}
- public static char[] add(char[] array1, int index, char[] array2) {
- return (char[]) realAddArr(array1, index, array2, Character.TYPE);
+ public static char[] add(@Nullable char[] array1, int index, @Nullable char[] array2) {
+ Object result = realAddArr(array1, index, array2, Character.TYPE);
+ if (result == null) return null;
+ return (char[]) result;
}
- public static byte[] add(byte[] array1, int index, byte[] array2) {
- return (byte[]) realAddArr(array1, index, array2, Byte.TYPE);
+ @Nullable
+ public static byte[] add(@Nullable byte[] array1, int index, @Nullable byte[] array2) {
+ Object result = realAddArr(array1, index, array2, Byte.TYPE);
+ if (result == null) return null;
+ return (byte[]) result;
}
- public static short[] add(short[] array1, int index, short[] array2) {
- return (short[]) realAddArr(array1, index, array2, Short.TYPE);
+ @Nullable
+ public static short[] add(@Nullable short[] array1, int index, @Nullable short[] array2) {
+ Object result = realAddArr(array1, index, array2, Short.TYPE);
+ if (result == null) return null;
+ return (short[]) result;
}
- public static int[] add(int[] array1, int index, int[] array2) {
- return (int[]) realAddArr(array1, index, array2, Integer.TYPE);
+ @Nullable
+ public static int[] add(@Nullable int[] array1, int index, @Nullable int[] array2) {
+ Object result = realAddArr(array1, index, array2, Integer.TYPE);
+ if (result == null) return null;
+ return (int[]) result;
}
- public static long[] add(long[] array1, int index, long[] array2) {
- return (long[]) realAddArr(array1, index, array2, Long.TYPE);
+ @Nullable
+ public static long[] add(@Nullable long[] array1, int index, @Nullable long[] array2) {
+ Object result = realAddArr(array1, index, array2, Long.TYPE);
+ if (result == null) return null;
+ return (long[]) result;
}
- public static float[] add(float[] array1, int index, float[] array2) {
- return (float[]) realAddArr(array1, index, array2, Float.TYPE);
+ @Nullable
+ public static float[] add(@Nullable float[] array1, int index, @Nullable float[] array2) {
+ Object result = realAddArr(array1, index, array2, Float.TYPE);
+ if (result == null) return null;
+ return (float[]) result;
}
- public static double[] add(double[] array1, int index, double[] array2) {
- return (double[]) realAddArr(array1, index, array2, Double.TYPE);
+ @Nullable
+ public static double[] add(@Nullable double[] array1, int index, @Nullable double[] array2) {
+ Object result = realAddArr(array1, index, array2, Double.TYPE);
+ if (result == null) return null;
+ return (double[]) result;
}
- private static Object realAddArr(Object array1, int index, Object array2, Class clss) {
+ @Nullable
+ private static Object realAddArr(@Nullable Object array1, int index, @Nullable Object array2, Class clss) {
if (array1 == null && array2 == null) return null;
int len1 = getLength(array1);
int len2 = getLength(array2);
@@ -736,7 +813,8 @@ private static Object realAddArr(Object array1, int index, Object array2, Class
* @throws IndexOutOfBoundsException if the index is out of range
* (index < 0 || index > array.length).
*/
- public static T[] add(T[] array, int index, T element) {
+ @NonNull
+ public static T[] add(@Nullable T[] array, int index, @Nullable T element) {
Class clss;
if (array != null) {
clss = array.getClass().getComponentType();
@@ -748,39 +826,48 @@ public static T[] add(T[] array, int index, T element) {
return (T[]) realAdd(array, index, element, clss);
}
- public static boolean[] add(boolean[] array, int index, boolean element) {
+ @NonNull
+ public static boolean[] add(@Nullable boolean[] array, int index, boolean element) {
return (boolean[]) realAdd(array, index, element, Boolean.TYPE);
}
- public static char[] add(char[] array, int index, char element) {
+ @NonNull
+ public static char[] add(@Nullable char[] array, int index, char element) {
return (char[]) realAdd(array, index, element, Character.TYPE);
}
- public static byte[] add(byte[] array, int index, byte element) {
+ @NonNull
+ public static byte[] add(@Nullable byte[] array, int index, byte element) {
return (byte[]) realAdd(array, index, element, Byte.TYPE);
}
- public static short[] add(short[] array, int index, short element) {
+ @NonNull
+ public static short[] add(@Nullable short[] array, int index, short element) {
return (short[]) realAdd(array, index, element, Short.TYPE);
}
- public static int[] add(int[] array, int index, int element) {
+ @NonNull
+ public static int[] add(@Nullable int[] array, int index, int element) {
return (int[]) realAdd(array, index, element, Integer.TYPE);
}
- public static long[] add(long[] array, int index, long element) {
+ @NonNull
+ public static long[] add(@Nullable long[] array, int index, long element) {
return (long[]) realAdd(array, index, element, Long.TYPE);
}
- public static float[] add(float[] array, int index, float element) {
+ @NonNull
+ public static float[] add(@Nullable float[] array, int index, float element) {
return (float[]) realAdd(array, index, element, Float.TYPE);
}
- public static double[] add(double[] array, int index, double element) {
+ @NonNull
+ public static double[] add(@Nullable double[] array, int index, double element) {
return (double[]) realAdd(array, index, element, Double.TYPE);
}
- private static Object realAdd(Object array, int index, Object element, Class clss) {
+ @NonNull
+ private static Object realAdd(@Nullable Object array, int index, @Nullable Object element, Class clss) {
if (array == null) {
if (index != 0) {
throw new IndexOutOfBoundsException("Index: " + index + ", Length: 0");
@@ -826,15 +913,16 @@ private static Object realAdd(Object array, int index, Object element, Class cls
* ArrayUtils.remove(["a", "b", "c"], 1) = ["a", "c"]
*
*
- * @param array the array to remove the element from, may not be null
+ * @param array the array to remove the element from, may be null
* @param index the position of the element to be removed
* @return A new array containing the existing elements except the element
* at the specified position.
* @throws IndexOutOfBoundsException if the index is out of range
- * (index < 0 || index >= array.length), or if the array is null.
- * @since 2.1
+ * (index < 0 || index >= array.length)
*/
- public static Object[] remove(Object[] array, int index) {
+ @Nullable
+ public static Object[] remove(@Nullable Object[] array, int index) {
+ if (array == null) return null;
return (Object[]) remove((Object) array, index);
}
@@ -861,9 +949,9 @@ public static Object[] remove(Object[] array, int index) {
* @param element the element to be removed
* @return A new array containing the existing elements except the first
* occurrence of the specified element.
- * @since 2.1
*/
- public static Object[] removeElement(Object[] array, Object element) {
+ @Nullable
+ public static Object[] removeElement(@Nullable Object[] array, @Nullable Object element) {
int index = indexOf(array, element);
if (index == INDEX_NOT_FOUND) {
return copy(array);
@@ -871,11 +959,14 @@ public static Object[] removeElement(Object[] array, Object element) {
return remove(array, index);
}
- public static boolean[] remove(boolean[] array, int index) {
+ @Nullable
+ public static boolean[] remove(@Nullable boolean[] array, int index) {
+ if (array == null) return null;
return (boolean[]) remove((Object) array, index);
}
- public static boolean[] removeElement(boolean[] array, boolean element) {
+ @Nullable
+ public static boolean[] removeElement(@Nullable boolean[] array, boolean element) {
int index = indexOf(array, element);
if (index == INDEX_NOT_FOUND) {
return copy(array);
@@ -883,11 +974,14 @@ public static boolean[] removeElement(boolean[] array, boolean element) {
return remove(array, index);
}
- public static byte[] remove(byte[] array, int index) {
+ @Nullable
+ public static byte[] remove(@Nullable byte[] array, int index) {
+ if (array == null) return null;
return (byte[]) remove((Object) array, index);
}
- public static byte[] removeElement(byte[] array, byte element) {
+ @Nullable
+ public static byte[] removeElement(@Nullable byte[] array, byte element) {
int index = indexOf(array, element);
if (index == INDEX_NOT_FOUND) {
return copy(array);
@@ -895,11 +989,14 @@ public static byte[] removeElement(byte[] array, byte element) {
return remove(array, index);
}
- public static char[] remove(char[] array, int index) {
+ @Nullable
+ public static char[] remove(@Nullable char[] array, int index) {
+ if (array == null) return null;
return (char[]) remove((Object) array, index);
}
- public static char[] removeElement(char[] array, char element) {
+ @Nullable
+ public static char[] removeElement(@Nullable char[] array, char element) {
int index = indexOf(array, element);
if (index == INDEX_NOT_FOUND) {
return copy(array);
@@ -907,23 +1004,30 @@ public static char[] removeElement(char[] array, char element) {
return remove(array, index);
}
- public static double[] remove(double[] array, int index) {
+ @Nullable
+ public static double[] remove(@Nullable double[] array, int index) {
+ if (array == null) return null;
return (double[]) remove((Object) array, index);
}
- public static double[] removeElement(double[] array, double element) {
+ @Nullable
+ public static double[] removeElement(@Nullable double[] array, double element) {
int index = indexOf(array, element);
if (index == INDEX_NOT_FOUND) {
return copy(array);
}
+ //noinspection ConstantConditions
return remove(array, index);
}
- public static float[] remove(float[] array, int index) {
+ @Nullable
+ public static float[] remove(@Nullable float[] array, int index) {
+ if (array == null) return null;
return (float[]) remove((Object) array, index);
}
- public static float[] removeElement(float[] array, float element) {
+ @Nullable
+ public static float[] removeElement(@Nullable float[] array, float element) {
int index = indexOf(array, element);
if (index == INDEX_NOT_FOUND) {
return copy(array);
@@ -931,11 +1035,14 @@ public static float[] removeElement(float[] array, float element) {
return remove(array, index);
}
- public static int[] remove(int[] array, int index) {
+ @Nullable
+ public static int[] remove(@Nullable int[] array, int index) {
+ if (array == null) return null;
return (int[]) remove((Object) array, index);
}
- public static int[] removeElement(int[] array, int element) {
+ @Nullable
+ public static int[] removeElement(@Nullable int[] array, int element) {
int index = indexOf(array, element);
if (index == INDEX_NOT_FOUND) {
return copy(array);
@@ -943,11 +1050,14 @@ public static int[] removeElement(int[] array, int element) {
return remove(array, index);
}
- public static long[] remove(long[] array, int index) {
+ @Nullable
+ public static long[] remove(@Nullable long[] array, int index) {
+ if (array == null) return null;
return (long[]) remove((Object) array, index);
}
- public static long[] removeElement(long[] array, long element) {
+ @Nullable
+ public static long[] removeElement(@Nullable long[] array, long element) {
int index = indexOf(array, element);
if (index == INDEX_NOT_FOUND) {
return copy(array);
@@ -955,11 +1065,14 @@ public static long[] removeElement(long[] array, long element) {
return remove(array, index);
}
- public static short[] remove(short[] array, int index) {
+ @Nullable
+ public static short[] remove(@Nullable short[] array, int index) {
+ if (array == null) return null;
return (short[]) remove((Object) array, index);
}
- public static short[] removeElement(short[] array, short element) {
+ @Nullable
+ public static short[] removeElement(@Nullable short[] array, short element) {
int index = indexOf(array, element);
if (index == INDEX_NOT_FOUND) {
return copy(array);
@@ -967,7 +1080,8 @@ public static short[] removeElement(short[] array, short element) {
return remove(array, index);
}
- private static Object remove(Object array, int index) {
+ @NonNull
+ private static Object remove(@NonNull Object array, int index) {
int length = getLength(array);
if (index < 0 || index >= length) {
throw new IndexOutOfBoundsException("Index: " + index + ", Length: " + length);
@@ -986,11 +1100,11 @@ private static Object remove(Object array, int index) {
// object indexOf
///////////////////////////////////////////////////////////////////////////
- public static int indexOf(Object[] array, Object objectToFind) {
+ public static int indexOf(@Nullable Object[] array, @Nullable Object objectToFind) {
return indexOf(array, objectToFind, 0);
}
- public static int indexOf(Object[] array, final Object objectToFind, int startIndex) {
+ public static int indexOf(@Nullable Object[] array, @Nullable final Object objectToFind, int startIndex) {
if (array == null) {
return INDEX_NOT_FOUND;
}
@@ -1013,11 +1127,11 @@ public static int indexOf(Object[] array, final Object objectToFind, int startIn
return INDEX_NOT_FOUND;
}
- public static int lastIndexOf(Object[] array, Object objectToFind) {
+ public static int lastIndexOf(@Nullable Object[] array, @Nullable Object objectToFind) {
return lastIndexOf(array, objectToFind, Integer.MAX_VALUE);
}
- public static int lastIndexOf(Object[] array, Object objectToFind, int startIndex) {
+ public static int lastIndexOf(@Nullable Object[] array, @Nullable Object objectToFind, int startIndex) {
if (array == null) {
return INDEX_NOT_FOUND;
}
@@ -1042,7 +1156,7 @@ public static int lastIndexOf(Object[] array, Object objectToFind, int startInde
return INDEX_NOT_FOUND;
}
- public static boolean contains(Object[] array, Object objectToFind) {
+ public static boolean contains(@Nullable Object[] array, @Nullable Object objectToFind) {
return indexOf(array, objectToFind) != INDEX_NOT_FOUND;
}
@@ -1050,11 +1164,11 @@ public static boolean contains(Object[] array, Object objectToFind) {
// long indexOf
///////////////////////////////////////////////////////////////////////////
- public static int indexOf(long[] array, long valueToFind) {
+ public static int indexOf(@Nullable long[] array, long valueToFind) {
return indexOf(array, valueToFind, 0);
}
- public static int indexOf(long[] array, long valueToFind, int startIndex) {
+ public static int indexOf(@Nullable long[] array, long valueToFind, int startIndex) {
if (array == null) {
return INDEX_NOT_FOUND;
}
@@ -1069,11 +1183,11 @@ public static int indexOf(long[] array, long valueToFind, int startIndex) {
return INDEX_NOT_FOUND;
}
- public static int lastIndexOf(long[] array, long valueToFind) {
+ public static int lastIndexOf(@Nullable long[] array, long valueToFind) {
return lastIndexOf(array, valueToFind, Integer.MAX_VALUE);
}
- public static int lastIndexOf(long[] array, long valueToFind, int startIndex) {
+ public static int lastIndexOf(@Nullable long[] array, long valueToFind, int startIndex) {
if (array == null) {
return INDEX_NOT_FOUND;
}
@@ -1090,7 +1204,7 @@ public static int lastIndexOf(long[] array, long valueToFind, int startIndex) {
return INDEX_NOT_FOUND;
}
- public static boolean contains(long[] array, long valueToFind) {
+ public static boolean contains(@Nullable long[] array, long valueToFind) {
return indexOf(array, valueToFind) != INDEX_NOT_FOUND;
}
@@ -1098,11 +1212,11 @@ public static boolean contains(long[] array, long valueToFind) {
// int indexOf
///////////////////////////////////////////////////////////////////////////
- public static int indexOf(int[] array, int valueToFind) {
+ public static int indexOf(@Nullable int[] array, int valueToFind) {
return indexOf(array, valueToFind, 0);
}
- public static int indexOf(int[] array, int valueToFind, int startIndex) {
+ public static int indexOf(@Nullable int[] array, int valueToFind, int startIndex) {
if (array == null) {
return INDEX_NOT_FOUND;
}
@@ -1117,11 +1231,11 @@ public static int indexOf(int[] array, int valueToFind, int startIndex) {
return INDEX_NOT_FOUND;
}
- public static int lastIndexOf(int[] array, int valueToFind) {
+ public static int lastIndexOf(@Nullable int[] array, int valueToFind) {
return lastIndexOf(array, valueToFind, Integer.MAX_VALUE);
}
- public static int lastIndexOf(int[] array, int valueToFind, int startIndex) {
+ public static int lastIndexOf(@Nullable int[] array, int valueToFind, int startIndex) {
if (array == null) {
return INDEX_NOT_FOUND;
}
@@ -1138,7 +1252,7 @@ public static int lastIndexOf(int[] array, int valueToFind, int startIndex) {
return INDEX_NOT_FOUND;
}
- public static boolean contains(int[] array, int valueToFind) {
+ public static boolean contains(@Nullable int[] array, int valueToFind) {
return indexOf(array, valueToFind) != INDEX_NOT_FOUND;
}
@@ -1146,11 +1260,11 @@ public static boolean contains(int[] array, int valueToFind) {
// short indexOf
///////////////////////////////////////////////////////////////////////////
- public static int indexOf(short[] array, short valueToFind) {
+ public static int indexOf(@Nullable short[] array, short valueToFind) {
return indexOf(array, valueToFind, 0);
}
- public static int indexOf(short[] array, short valueToFind, int startIndex) {
+ public static int indexOf(@Nullable short[] array, short valueToFind, int startIndex) {
if (array == null) {
return INDEX_NOT_FOUND;
}
@@ -1165,11 +1279,11 @@ public static int indexOf(short[] array, short valueToFind, int startIndex) {
return INDEX_NOT_FOUND;
}
- public static int lastIndexOf(short[] array, short valueToFind) {
+ public static int lastIndexOf(@Nullable short[] array, short valueToFind) {
return lastIndexOf(array, valueToFind, Integer.MAX_VALUE);
}
- public static int lastIndexOf(short[] array, short valueToFind, int startIndex) {
+ public static int lastIndexOf(@Nullable short[] array, short valueToFind, int startIndex) {
if (array == null) {
return INDEX_NOT_FOUND;
}
@@ -1186,7 +1300,7 @@ public static int lastIndexOf(short[] array, short valueToFind, int startIndex)
return INDEX_NOT_FOUND;
}
- public static boolean contains(short[] array, short valueToFind) {
+ public static boolean contains(@Nullable short[] array, short valueToFind) {
return indexOf(array, valueToFind) != INDEX_NOT_FOUND;
}
@@ -1194,11 +1308,11 @@ public static boolean contains(short[] array, short valueToFind) {
// char indexOf
///////////////////////////////////////////////////////////////////////////
- public static int indexOf(char[] array, char valueToFind) {
+ public static int indexOf(@Nullable char[] array, char valueToFind) {
return indexOf(array, valueToFind, 0);
}
- public static int indexOf(char[] array, char valueToFind, int startIndex) {
+ public static int indexOf(@Nullable char[] array, char valueToFind, int startIndex) {
if (array == null) {
return INDEX_NOT_FOUND;
}
@@ -1213,11 +1327,11 @@ public static int indexOf(char[] array, char valueToFind, int startIndex) {
return INDEX_NOT_FOUND;
}
- public static int lastIndexOf(char[] array, char valueToFind) {
+ public static int lastIndexOf(@Nullable char[] array, char valueToFind) {
return lastIndexOf(array, valueToFind, Integer.MAX_VALUE);
}
- public static int lastIndexOf(char[] array, char valueToFind, int startIndex) {
+ public static int lastIndexOf(@Nullable char[] array, char valueToFind, int startIndex) {
if (array == null) {
return INDEX_NOT_FOUND;
}
@@ -1234,7 +1348,7 @@ public static int lastIndexOf(char[] array, char valueToFind, int startIndex) {
return INDEX_NOT_FOUND;
}
- public static boolean contains(char[] array, char valueToFind) {
+ public static boolean contains(@Nullable char[] array, char valueToFind) {
return indexOf(array, valueToFind) != INDEX_NOT_FOUND;
}
@@ -1242,11 +1356,11 @@ public static boolean contains(char[] array, char valueToFind) {
// byte indexOf
///////////////////////////////////////////////////////////////////////////
- public static int indexOf(byte[] array, byte valueToFind) {
+ public static int indexOf(@Nullable byte[] array, byte valueToFind) {
return indexOf(array, valueToFind, 0);
}
- public static int indexOf(byte[] array, byte valueToFind, int startIndex) {
+ public static int indexOf(@Nullable byte[] array, byte valueToFind, int startIndex) {
if (array == null) {
return INDEX_NOT_FOUND;
}
@@ -1261,11 +1375,11 @@ public static int indexOf(byte[] array, byte valueToFind, int startIndex) {
return INDEX_NOT_FOUND;
}
- public static int lastIndexOf(byte[] array, byte valueToFind) {
+ public static int lastIndexOf(@Nullable byte[] array, byte valueToFind) {
return lastIndexOf(array, valueToFind, Integer.MAX_VALUE);
}
- public static int lastIndexOf(byte[] array, byte valueToFind, int startIndex) {
+ public static int lastIndexOf(@Nullable byte[] array, byte valueToFind, int startIndex) {
if (array == null) {
return INDEX_NOT_FOUND;
}
@@ -1282,7 +1396,7 @@ public static int lastIndexOf(byte[] array, byte valueToFind, int startIndex) {
return INDEX_NOT_FOUND;
}
- public static boolean contains(byte[] array, byte valueToFind) {
+ public static boolean contains(@Nullable byte[] array, byte valueToFind) {
return indexOf(array, valueToFind) != INDEX_NOT_FOUND;
}
@@ -1290,15 +1404,15 @@ public static boolean contains(byte[] array, byte valueToFind) {
// double indexOf
///////////////////////////////////////////////////////////////////////////
- public static int indexOf(double[] array, double valueToFind) {
+ public static int indexOf(@Nullable double[] array, double valueToFind) {
return indexOf(array, valueToFind, 0);
}
- public static int indexOf(double[] array, double valueToFind, double tolerance) {
+ public static int indexOf(@Nullable double[] array, double valueToFind, double tolerance) {
return indexOf(array, valueToFind, 0, tolerance);
}
- public static int indexOf(double[] array, double valueToFind, int startIndex) {
+ public static int indexOf(@Nullable double[] array, double valueToFind, int startIndex) {
if (ArrayUtils.isEmpty(array)) {
return INDEX_NOT_FOUND;
}
@@ -1313,7 +1427,7 @@ public static int indexOf(double[] array, double valueToFind, int startIndex) {
return INDEX_NOT_FOUND;
}
- public static int indexOf(double[] array, double valueToFind, int startIndex, double tolerance) {
+ public static int indexOf(@Nullable double[] array, double valueToFind, int startIndex, double tolerance) {
if (ArrayUtils.isEmpty(array)) {
return INDEX_NOT_FOUND;
}
@@ -1330,15 +1444,15 @@ public static int indexOf(double[] array, double valueToFind, int startIndex, do
return INDEX_NOT_FOUND;
}
- public static int lastIndexOf(double[] array, double valueToFind) {
+ public static int lastIndexOf(@Nullable double[] array, double valueToFind) {
return lastIndexOf(array, valueToFind, Integer.MAX_VALUE);
}
- public static int lastIndexOf(double[] array, double valueToFind, double tolerance) {
+ public static int lastIndexOf(@Nullable double[] array, double valueToFind, double tolerance) {
return lastIndexOf(array, valueToFind, Integer.MAX_VALUE, tolerance);
}
- public static int lastIndexOf(double[] array, double valueToFind, int startIndex) {
+ public static int lastIndexOf(@Nullable double[] array, double valueToFind, int startIndex) {
if (ArrayUtils.isEmpty(array)) {
return INDEX_NOT_FOUND;
}
@@ -1355,7 +1469,7 @@ public static int lastIndexOf(double[] array, double valueToFind, int startIndex
return INDEX_NOT_FOUND;
}
- public static int lastIndexOf(double[] array, double valueToFind, int startIndex, double tolerance) {
+ public static int lastIndexOf(@Nullable double[] array, double valueToFind, int startIndex, double tolerance) {
if (ArrayUtils.isEmpty(array)) {
return INDEX_NOT_FOUND;
}
@@ -1374,11 +1488,11 @@ public static int lastIndexOf(double[] array, double valueToFind, int startIndex
return INDEX_NOT_FOUND;
}
- public static boolean contains(double[] array, double valueToFind) {
+ public static boolean contains(@Nullable double[] array, double valueToFind) {
return indexOf(array, valueToFind) != INDEX_NOT_FOUND;
}
- public static boolean contains(double[] array, double valueToFind, double tolerance) {
+ public static boolean contains(@Nullable double[] array, double valueToFind, double tolerance) {
return indexOf(array, valueToFind, 0, tolerance) != INDEX_NOT_FOUND;
}
@@ -1386,11 +1500,11 @@ public static boolean contains(double[] array, double valueToFind, double tolera
// float indexOf
///////////////////////////////////////////////////////////////////////////
- public static int indexOf(float[] array, float valueToFind) {
+ public static int indexOf(@Nullable float[] array, float valueToFind) {
return indexOf(array, valueToFind, 0);
}
- public static int indexOf(float[] array, float valueToFind, int startIndex) {
+ public static int indexOf(@Nullable float[] array, float valueToFind, int startIndex) {
if (ArrayUtils.isEmpty(array)) {
return INDEX_NOT_FOUND;
}
@@ -1405,11 +1519,11 @@ public static int indexOf(float[] array, float valueToFind, int startIndex) {
return INDEX_NOT_FOUND;
}
- public static int lastIndexOf(float[] array, float valueToFind) {
+ public static int lastIndexOf(@Nullable float[] array, float valueToFind) {
return lastIndexOf(array, valueToFind, Integer.MAX_VALUE);
}
- public static int lastIndexOf(float[] array, float valueToFind, int startIndex) {
+ public static int lastIndexOf(@Nullable float[] array, float valueToFind, int startIndex) {
if (ArrayUtils.isEmpty(array)) {
return INDEX_NOT_FOUND;
}
@@ -1426,7 +1540,7 @@ public static int lastIndexOf(float[] array, float valueToFind, int startIndex)
return INDEX_NOT_FOUND;
}
- public static boolean contains(float[] array, float valueToFind) {
+ public static boolean contains(@Nullable float[] array, float valueToFind) {
return indexOf(array, valueToFind) != INDEX_NOT_FOUND;
}
@@ -1434,11 +1548,11 @@ public static boolean contains(float[] array, float valueToFind) {
// bool indexOf
///////////////////////////////////////////////////////////////////////////
- public static int indexOf(boolean[] array, boolean valueToFind) {
+ public static int indexOf(@Nullable boolean[] array, boolean valueToFind) {
return indexOf(array, valueToFind, 0);
}
- public static int indexOf(boolean[] array, boolean valueToFind, int startIndex) {
+ public static int indexOf(@Nullable boolean[] array, boolean valueToFind, int startIndex) {
if (ArrayUtils.isEmpty(array)) {
return INDEX_NOT_FOUND;
}
@@ -1453,11 +1567,11 @@ public static int indexOf(boolean[] array, boolean valueToFind, int startIndex)
return INDEX_NOT_FOUND;
}
- public static int lastIndexOf(boolean[] array, boolean valueToFind) {
+ public static int lastIndexOf(@Nullable boolean[] array, boolean valueToFind) {
return lastIndexOf(array, valueToFind, Integer.MAX_VALUE);
}
- public static int lastIndexOf(boolean[] array, boolean valueToFind, int startIndex) {
+ public static int lastIndexOf(@Nullable boolean[] array, boolean valueToFind, int startIndex) {
if (ArrayUtils.isEmpty(array)) {
return INDEX_NOT_FOUND;
}
@@ -1474,7 +1588,7 @@ public static int lastIndexOf(boolean[] array, boolean valueToFind, int startInd
return INDEX_NOT_FOUND;
}
- public static boolean contains(boolean[] array, boolean valueToFind) {
+ public static boolean contains(@Nullable boolean[] array, boolean valueToFind) {
return indexOf(array, valueToFind) != INDEX_NOT_FOUND;
}
@@ -1482,7 +1596,8 @@ public static boolean contains(boolean[] array, boolean valueToFind) {
// char converters
///////////////////////////////////////////////////////////////////////////
- public static char[] toPrimitive(Character[] array) {
+ @Nullable
+ public static char[] toPrimitive(@Nullable Character[] array) {
if (array == null) {
return null;
} else if (array.length == 0) {
@@ -1495,7 +1610,8 @@ public static char[] toPrimitive(Character[] array) {
return result;
}
- public static char[] toPrimitive(Character[] array, char valueForNull) {
+ @Nullable
+ public static char[] toPrimitive(@Nullable Character[] array, char valueForNull) {
if (array == null) {
return null;
} else if (array.length == 0) {
@@ -1509,7 +1625,8 @@ public static char[] toPrimitive(Character[] array, char valueForNull) {
return result;
}
- public static Character[] toObject(char[] array) {
+ @Nullable
+ public static Character[] toObject(@Nullable char[] array) {
if (array == null) {
return null;
} else if (array.length == 0) {
@@ -1526,7 +1643,8 @@ public static Character[] toObject(char[] array) {
// long converters
///////////////////////////////////////////////////////////////////////////
- public static long[] toPrimitive(Long[] array) {
+ @Nullable
+ public static long[] toPrimitive(@Nullable Long[] array) {
if (array == null) {
return null;
} else if (array.length == 0) {
@@ -1539,7 +1657,8 @@ public static long[] toPrimitive(Long[] array) {
return result;
}
- public static long[] toPrimitive(Long[] array, long valueForNull) {
+ @Nullable
+ public static long[] toPrimitive(@Nullable Long[] array, long valueForNull) {
if (array == null) {
return null;
} else if (array.length == 0) {
@@ -1553,7 +1672,8 @@ public static long[] toPrimitive(Long[] array, long valueForNull) {
return result;
}
- public static Long[] toObject(long[] array) {
+ @Nullable
+ public static Long[] toObject(@Nullable long[] array) {
if (array == null) {
return null;
} else if (array.length == 0) {
@@ -1570,7 +1690,8 @@ public static Long[] toObject(long[] array) {
// int converters
///////////////////////////////////////////////////////////////////////////
- public static int[] toPrimitive(Integer[] array) {
+ @Nullable
+ public static int[] toPrimitive(@Nullable Integer[] array) {
if (array == null) {
return null;
} else if (array.length == 0) {
@@ -1583,7 +1704,8 @@ public static int[] toPrimitive(Integer[] array) {
return result;
}
- public static int[] toPrimitive(Integer[] array, int valueForNull) {
+ @Nullable
+ public static int[] toPrimitive(@Nullable Integer[] array, int valueForNull) {
if (array == null) {
return null;
} else if (array.length == 0) {
@@ -1597,7 +1719,8 @@ public static int[] toPrimitive(Integer[] array, int valueForNull) {
return result;
}
- public static Integer[] toObject(int[] array) {
+ @Nullable
+ public static Integer[] toObject(@Nullable int[] array) {
if (array == null) {
return null;
} else if (array.length == 0) {
@@ -1614,7 +1737,8 @@ public static Integer[] toObject(int[] array) {
// short converters
///////////////////////////////////////////////////////////////////////////
- public static short[] toPrimitive(Short[] array) {
+ @Nullable
+ public static short[] toPrimitive(@Nullable Short[] array) {
if (array == null) {
return null;
} else if (array.length == 0) {
@@ -1627,7 +1751,8 @@ public static short[] toPrimitive(Short[] array) {
return result;
}
- public static short[] toPrimitive(Short[] array, short valueForNull) {
+ @Nullable
+ public static short[] toPrimitive(@Nullable Short[] array, short valueForNull) {
if (array == null) {
return null;
} else if (array.length == 0) {
@@ -1641,7 +1766,8 @@ public static short[] toPrimitive(Short[] array, short valueForNull) {
return result;
}
- public static Short[] toObject(short[] array) {
+ @Nullable
+ public static Short[] toObject(@Nullable short[] array) {
if (array == null) {
return null;
} else if (array.length == 0) {
@@ -1658,7 +1784,8 @@ public static Short[] toObject(short[] array) {
// byte converters
///////////////////////////////////////////////////////////////////////////
- public static byte[] toPrimitive(Byte[] array) {
+ @Nullable
+ public static byte[] toPrimitive(@Nullable Byte[] array) {
if (array == null) {
return null;
} else if (array.length == 0) {
@@ -1671,7 +1798,8 @@ public static byte[] toPrimitive(Byte[] array) {
return result;
}
- public static byte[] toPrimitive(Byte[] array, byte valueForNull) {
+ @Nullable
+ public static byte[] toPrimitive(@Nullable Byte[] array, byte valueForNull) {
if (array == null) {
return null;
} else if (array.length == 0) {
@@ -1685,7 +1813,8 @@ public static byte[] toPrimitive(Byte[] array, byte valueForNull) {
return result;
}
- public static Byte[] toObject(byte[] array) {
+ @Nullable
+ public static Byte[] toObject(@Nullable byte[] array) {
if (array == null) {
return null;
} else if (array.length == 0) {
@@ -1702,7 +1831,8 @@ public static Byte[] toObject(byte[] array) {
// double converters
///////////////////////////////////////////////////////////////////////////
- public static double[] toPrimitive(Double[] array) {
+ @Nullable
+ public static double[] toPrimitive(@Nullable Double[] array) {
if (array == null) {
return null;
} else if (array.length == 0) {
@@ -1715,7 +1845,8 @@ public static double[] toPrimitive(Double[] array) {
return result;
}
- public static double[] toPrimitive(Double[] array, double valueForNull) {
+ @Nullable
+ public static double[] toPrimitive(@Nullable Double[] array, double valueForNull) {
if (array == null) {
return null;
} else if (array.length == 0) {
@@ -1729,7 +1860,8 @@ public static double[] toPrimitive(Double[] array, double valueForNull) {
return result;
}
- public static Double[] toObject(double[] array) {
+ @Nullable
+ public static Double[] toObject(@Nullable double[] array) {
if (array == null) {
return null;
} else if (array.length == 0) {
@@ -1746,7 +1878,8 @@ public static Double[] toObject(double[] array) {
// float converters
///////////////////////////////////////////////////////////////////////////
- public static float[] toPrimitive(Float[] array) {
+ @Nullable
+ public static float[] toPrimitive(@Nullable Float[] array) {
if (array == null) {
return null;
} else if (array.length == 0) {
@@ -1759,7 +1892,8 @@ public static float[] toPrimitive(Float[] array) {
return result;
}
- public static float[] toPrimitive(Float[] array, float valueForNull) {
+ @Nullable
+ public static float[] toPrimitive(@Nullable Float[] array, float valueForNull) {
if (array == null) {
return null;
} else if (array.length == 0) {
@@ -1773,7 +1907,8 @@ public static float[] toPrimitive(Float[] array, float valueForNull) {
return result;
}
- public static Float[] toObject(float[] array) {
+ @Nullable
+ public static Float[] toObject(@Nullable float[] array) {
if (array == null) {
return null;
} else if (array.length == 0) {
@@ -1790,7 +1925,8 @@ public static Float[] toObject(float[] array) {
// boolean converters
///////////////////////////////////////////////////////////////////////////
- public static boolean[] toPrimitive(Boolean[] array) {
+ @Nullable
+ public static boolean[] toPrimitive(@Nullable Boolean[] array) {
if (array == null) {
return null;
} else if (array.length == 0) {
@@ -1803,7 +1939,8 @@ public static boolean[] toPrimitive(Boolean[] array) {
return result;
}
- public static boolean[] toPrimitive(Boolean[] array, boolean valueForNull) {
+ @Nullable
+ public static boolean[] toPrimitive(@Nullable Boolean[] array, boolean valueForNull) {
if (array == null) {
return null;
} else if (array.length == 0) {
@@ -1817,7 +1954,8 @@ public static boolean[] toPrimitive(Boolean[] array, boolean valueForNull) {
return result;
}
- public static Boolean[] toObject(boolean[] array) {
+ @Nullable
+ public static Boolean[] toObject(@Nullable boolean[] array) {
if (array == null) {
return null;
} else if (array.length == 0) {
@@ -1830,67 +1968,71 @@ public static Boolean[] toObject(boolean[] array) {
return result;
}
- public static List asList(T... array) {
+ @NonNull
+ public static List asList(@Nullable T... array) {
if (array == null || array.length == 0) {
return Collections.emptyList();
}
return Arrays.asList(array);
}
- public static List asUnmodifiableList(T... array) {
+ @NonNull
+ public static List asUnmodifiableList(@Nullable T... array) {
return Collections.unmodifiableList(asList(array));
}
- public static List asArrayList(T... array) {
+ @NonNull
+ public static List asArrayList(@Nullable T... array) {
List list = new ArrayList<>();
if (array == null || array.length == 0) return list;
list.addAll(Arrays.asList(array));
return list;
}
- public static List asLinkedList(T... array) {
+ @NonNull
+ public static List asLinkedList(@Nullable T... array) {
List list = new LinkedList<>();
if (array == null || array.length == 0) return list;
list.addAll(Arrays.asList(array));
return list;
}
- public static void sort(T[] array, Comparator c) {
+ public static void sort(@Nullable T[] array, Comparator c) {
if (array == null || array.length < 2) return;
Arrays.sort(array, c);
}
- public static void sort(byte[] array) {
+ public static void sort(@Nullable byte[] array) {
if (array == null || array.length < 2) return;
Arrays.sort(array);
}
- public static void sort(char[] array) {
+ public static void sort(@Nullable char[] array) {
if (array == null || array.length < 2) return;
Arrays.sort(array);
}
- public static void sort(double[] array) {
+ public static void sort(@Nullable double[] array) {
if (array == null || array.length < 2) return;
Arrays.sort(array);
}
- public static void sort(float[] array) {
+ public static void sort(@Nullable float[] array) {
if (array == null || array.length < 2) return;
Arrays.sort(array);
}
- public static void sort(int[] array) {
+ public static void sort(@Nullable int[] array) {
if (array == null || array.length < 2) return;
Arrays.sort(array);
}
- public static void sort(long[] array) {
+ public static void sort(@Nullable long[] array) {
if (array == null || array.length < 2) return;
Arrays.sort(array);
}
- public static void sort(short[] array) {
+ public static void sort(@Nullable short[] array) {
if (array == null || array.length < 2) return;
Arrays.sort(array);
}
@@ -1903,7 +2045,7 @@ public static void sort(short[] array) {
* @param array The array.
* @param closure the closure to perform, may be null
*/
- public static void forAllDo(Object array, Closure closure) {
+ public static void forAllDo(@Nullable Object array, @Nullable Closure closure) {
if (array == null || closure == null) return;
if (array instanceof Object[]) {
Object[] objects = (Object[]) array;
@@ -1970,7 +2112,8 @@ public static void forAllDo(Object array, Closure closure) {
* @param array The array.
* @return the string of array
*/
- public static String toString(Object array) {
+ @NonNull
+ public static String toString(@Nullable Object array) {
if (array == null) return "null";
if (array instanceof Object[]) {
return Arrays.deepToString((Object[]) array);
diff --git a/lib/utilcode/src/main/java/com/blankj/utilcode/util/BarUtils.java b/lib/utilcode/src/main/java/com/blankj/utilcode/util/BarUtils.java
index c6427c9cb8..e8cacc5f0c 100644
--- a/lib/utilcode/src/main/java/com/blankj/utilcode/util/BarUtils.java
+++ b/lib/utilcode/src/main/java/com/blankj/utilcode/util/BarUtils.java
@@ -1,19 +1,15 @@
package com.blankj.utilcode.util;
+import static android.Manifest.permission.EXPAND_STATUS_BAR;
+
import android.annotation.SuppressLint;
import android.app.Activity;
import android.content.Context;
-import android.content.ContextWrapper;
import android.content.res.Resources;
import android.graphics.Color;
import android.graphics.Point;
import android.os.Build;
-import android.support.annotation.ColorInt;
-import android.support.annotation.NonNull;
-import android.support.annotation.RequiresApi;
-import android.support.annotation.RequiresPermission;
-import android.support.v4.widget.DrawerLayout;
-import android.util.Log;
+import android.provider.Settings;
import android.util.TypedValue;
import android.view.Display;
import android.view.KeyCharacterMap;
@@ -25,9 +21,13 @@
import android.view.Window;
import android.view.WindowManager;
-import java.lang.reflect.Method;
+import androidx.annotation.ColorInt;
+import androidx.annotation.NonNull;
+import androidx.annotation.RequiresApi;
+import androidx.annotation.RequiresPermission;
+import androidx.drawerlayout.widget.DrawerLayout;
-import static android.Manifest.permission.EXPAND_STATUS_BAR;
+import java.lang.reflect.Method;
/**
*
@@ -44,8 +44,8 @@ public final class BarUtils {
///////////////////////////////////////////////////////////////////////////
private static final String TAG_STATUS_BAR = "TAG_STATUS_BAR";
- private static final String TAG_OFFSET = "TAG_OFFSET";
- private static final int KEY_OFFSET = -123;
+ private static final String TAG_OFFSET = "TAG_OFFSET";
+ private static final int KEY_OFFSET = -123;
private BarUtils() {
throw new UnsupportedOperationException("u can't instantiate me...");
@@ -57,7 +57,7 @@ private BarUtils() {
* @return the status bar's height
*/
public static int getStatusBarHeight() {
- Resources resources = Utils.getApp().getResources();
+ Resources resources = Resources.getSystem();
int resourceId = resources.getIdentifier("status_bar_height", "dimen", "android");
return resources.getDimensionPixelSize(resourceId);
}
@@ -194,14 +194,14 @@ public static void subtractMarginTopEqualStatusBarHeight(@NonNull View view) {
view.setTag(KEY_OFFSET, false);
}
- private static void addMarginTopEqualStatusBarHeight(final Window window) {
+ private static void addMarginTopEqualStatusBarHeight(@NonNull final Window window) {
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.KITKAT) return;
View withTag = window.getDecorView().findViewWithTag(TAG_OFFSET);
if (withTag == null) return;
addMarginTopEqualStatusBarHeight(withTag);
}
- private static void subtractMarginTopEqualStatusBarHeight(final Window window) {
+ private static void subtractMarginTopEqualStatusBarHeight(@NonNull final Window window) {
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.KITKAT) return;
View withTag = window.getDecorView().findViewWithTag(TAG_OFFSET);
if (withTag == null) return;
@@ -272,7 +272,7 @@ public static View setStatusBarColor(@NonNull final Window window,
public static void setStatusBarColor(@NonNull final View fakeStatusBar,
@ColorInt final int color) {
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.KITKAT) return;
- Activity activity = getActivityByView(fakeStatusBar);
+ Activity activity = UtilsBridge.getActivityByContext(fakeStatusBar.getContext());
if (activity == null) return;
transparentStatusBar(activity);
fakeStatusBar.setVisibility(View.VISIBLE);
@@ -289,7 +289,7 @@ public static void setStatusBarColor(@NonNull final View fakeStatusBar,
*/
public static void setStatusBarCustom(@NonNull final View fakeStatusBar) {
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.KITKAT) return;
- Activity activity = getActivityByView(fakeStatusBar);
+ Activity activity = UtilsBridge.getActivityByContext(fakeStatusBar.getContext());
if (activity == null) return;
transparentStatusBar(activity);
fakeStatusBar.setVisibility(View.VISIBLE);
@@ -334,7 +334,7 @@ public static void setStatusBarColor4Drawer(@NonNull final DrawerLayout drawer,
@ColorInt final int color,
final boolean isTop) {
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.KITKAT) return;
- Activity activity = getActivityByView(fakeStatusBar);
+ Activity activity = UtilsBridge.getActivityByContext(fakeStatusBar.getContext());
if (activity == null) return;
transparentStatusBar(activity);
drawer.setFitsSystemWindows(false);
@@ -349,13 +349,13 @@ public static void setStatusBarColor4Drawer(@NonNull final DrawerLayout drawer,
}
}
- private static View applyStatusBarColor(final Activity activity,
+ private static View applyStatusBarColor(@NonNull final Activity activity,
final int color,
boolean isDecor) {
return applyStatusBarColor(activity.getWindow(), color, isDecor);
}
- private static View applyStatusBarColor(final Window window,
+ private static View applyStatusBarColor(@NonNull final Window window,
final int color,
boolean isDecor) {
ViewGroup parent = isDecor ?
@@ -374,25 +374,25 @@ private static View applyStatusBarColor(final Window window,
return fakeStatusBarView;
}
- private static void hideStatusBarView(final Activity activity) {
+ private static void hideStatusBarView(@NonNull final Activity activity) {
hideStatusBarView(activity.getWindow());
}
- private static void hideStatusBarView(final Window window) {
+ private static void hideStatusBarView(@NonNull final Window window) {
ViewGroup decorView = (ViewGroup) window.getDecorView();
View fakeStatusBarView = decorView.findViewWithTag(TAG_STATUS_BAR);
if (fakeStatusBarView == null) return;
fakeStatusBarView.setVisibility(View.GONE);
}
- private static void showStatusBarView(final Window window) {
+ private static void showStatusBarView(@NonNull final Window window) {
ViewGroup decorView = (ViewGroup) window.getDecorView();
View fakeStatusBarView = decorView.findViewWithTag(TAG_STATUS_BAR);
if (fakeStatusBarView == null) return;
fakeStatusBarView.setVisibility(View.VISIBLE);
}
- private static View createStatusBarView(final Context context,
+ private static View createStatusBarView(@NonNull final Context context,
final int color) {
View statusBarView = new View(context);
statusBarView.setLayoutParams(new ViewGroup.LayoutParams(
@@ -402,11 +402,11 @@ private static View createStatusBarView(final Context context,
return statusBarView;
}
- public static void transparentStatusBar(final Activity activity) {
+ public static void transparentStatusBar(@NonNull final Activity activity) {
transparentStatusBar(activity.getWindow());
}
- public static void transparentStatusBar(final Window window) {
+ public static void transparentStatusBar(@NonNull final Window window) {
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.KITKAT) return;
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
window.clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
@@ -483,7 +483,7 @@ private static void invokePanels(final String methodName) {
* @return the navigation bar's height
*/
public static int getNavBarHeight() {
- Resources res = Utils.getApp().getResources();
+ Resources res = Resources.getSystem();
int resourceId = res.getIdentifier("navigation_bar_height", "dimen", "android");
if (resourceId != 0) {
return res.getDimensionPixelSize(resourceId);
@@ -517,9 +517,7 @@ public static void setNavBarVisibility(@NonNull final Window window, boolean isV
final View child = decorView.getChildAt(i);
final int id = child.getId();
if (id != View.NO_ID) {
- String resourceEntryName = Utils.getApp()
- .getResources()
- .getResourceEntryName(id);
+ String resourceEntryName = getResNameById(id);
if ("navigationBarBackground".equals(resourceEntryName)) {
child.setVisibility(isVisible ? View.VISIBLE : View.INVISIBLE);
}
@@ -560,9 +558,7 @@ public static boolean isNavBarVisible(@NonNull final Window window) {
final View child = decorView.getChildAt(i);
final int id = child.getId();
if (id != View.NO_ID) {
- String resourceEntryName = Utils.getApp()
- .getResources()
- .getResourceEntryName(id);
+ String resourceEntryName = getResNameById(id);
if ("navigationBarBackground".equals(resourceEntryName)
&& child.getVisibility() == View.VISIBLE) {
isVisible = true;
@@ -571,12 +567,33 @@ public static boolean isNavBarVisible(@NonNull final Window window) {
}
}
if (isVisible) {
+ // 对于三星手机，android10以下非OneUI2的版本，比如 s8，note8 等设备上，
+ // 导航栏显示存在bug："当用户隐藏导航栏时显示输入法的时候导航栏会跟随显示"，会导致隐藏输入法之后判断错误
+ // 这个问题在 OneUI 2 & android 10 版本已修复
+ if (UtilsBridge.isSamsung()
+ && Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1
+ && Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
+ try {
+ return Settings.Global.getInt(Utils.getApp().getContentResolver(), "navigationbar_hide_bar_enabled") == 0;
+ } catch (Exception ignore) {
+ }
+ }
+
int visibility = decorView.getSystemUiVisibility();
isVisible = (visibility & View.SYSTEM_UI_FLAG_HIDE_NAVIGATION) == 0;
}
+
return isVisible;
}
+ private static String getResNameById(int id) {
+ try {
+ return Utils.getApp().getResources().getResourceEntryName(id);
+ } catch (Exception ignore) {
+ return "";
+ }
+ }
+
/**
* Set the navigation bar's color.
*
@@ -651,7 +668,7 @@ public static boolean isSupportNavBar() {
*/
public static void setNavBarLightMode(@NonNull final Activity activity,
final boolean isLightMode) {
- setStatusBarLightMode(activity.getWindow(), isLightMode);
+ setNavBarLightMode(activity.getWindow(), isLightMode);
}
/**
@@ -681,7 +698,7 @@ public static void setNavBarLightMode(@NonNull final Window window,
* @return {@code true}: yes
* author: Blankj
@@ -105,7 +106,7 @@ public static void setWindowBrightness(@NonNull final Window window,
* @param window 窗口
* @return 屏幕亮度 0-255
*/
- public static int getWindowBrightness(final Window window) {
+ public static int getWindowBrightness(@NonNull final Window window) {
WindowManager.LayoutParams lp = window.getAttributes();
float brightness = lp.screenBrightness;
if (brightness < 0) return getBrightness();
diff --git a/lib/utilcode/src/main/java/com/blankj/utilcode/util/BusUtils.java b/lib/utilcode/src/main/java/com/blankj/utilcode/util/BusUtils.java
index 269c384d3b..537a55fd92 100644
--- a/lib/utilcode/src/main/java/com/blankj/utilcode/util/BusUtils.java
+++ b/lib/utilcode/src/main/java/com/blankj/utilcode/util/BusUtils.java
@@ -8,8 +8,6 @@
import java.lang.annotation.Target;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
@@ -18,6 +16,9 @@
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.CopyOnWriteArraySet;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
/**
*
* author: Blankj
@@ -31,10 +32,9 @@ public final class BusUtils {
private static final Object NULL = "nULl";
private static final String TAG = "BusUtils";
- private final Map> mTag_BusInfoListMap = new HashMap<>();
-
+ private final Map> mTag_BusInfoListMap = new ConcurrentHashMap<>();
private final Map> mClassName_BusesMap = new ConcurrentHashMap<>();
- private final Map> mClassName_TagsMap = new HashMap<>();
+ private final Map> mClassName_TagsMap = new ConcurrentHashMap<>();
private final Map> mClassName_Tag_Arg4StickyMap = new ConcurrentHashMap<>();
private BusUtils() {
@@ -58,33 +58,33 @@ private void registerBus(String tag,
boolean sticky, String threadMode, int priority) {
List busInfoList = mTag_BusInfoListMap.get(tag);
if (busInfoList == null) {
- busInfoList = new ArrayList<>();
+ busInfoList = new CopyOnWriteArrayList<>();
mTag_BusInfoListMap.put(tag, busInfoList);
}
- busInfoList.add(new BusInfo(className, funName, paramType, paramName, sticky, threadMode, priority));
+ busInfoList.add(new BusInfo(tag, className, funName, paramType, paramName, sticky, threadMode, priority));
}
- public static void register(final Object bus) {
+ public static void register(@Nullable final Object bus) {
getInstance().registerInner(bus);
}
- public static void unregister(final Object bus) {
+ public static void unregister(@Nullable final Object bus) {
getInstance().unregisterInner(bus);
}
- public static void post(final String tag) {
+ public static void post(@NonNull final String tag) {
post(tag, NULL);
}
- public static void post(final String tag, final Object arg) {
+ public static void post(@NonNull final String tag, @NonNull final Object arg) {
getInstance().postInner(tag, arg);
}
- public static void postSticky(final String tag) {
+ public static void postSticky(@NonNull final String tag) {
postSticky(tag, NULL);
}
- public static void postSticky(final String tag, final Object arg) {
+ public static void postSticky(@NonNull final String tag, final Object arg) {
getInstance().postStickyInner(tag, arg);
}
@@ -105,30 +105,44 @@ private static BusUtils getInstance() {
return LazyHolder.INSTANCE;
}
- private void registerInner(final Object bus) {
+ private void registerInner(@Nullable final Object bus) {
if (bus == null) return;
- Class aClass = bus.getClass();
+ Class aClass = bus.getClass();
String className = aClass.getName();
+ boolean isNeedRecordTags = false;
synchronized (mClassName_BusesMap) {
Set buses = mClassName_BusesMap.get(className);
if (buses == null) {
buses = new CopyOnWriteArraySet<>();
mClassName_BusesMap.put(className, buses);
+ isNeedRecordTags = true;
}
- buses.add(bus);
+ if (buses.contains(bus)) {
+ Log.w(TAG, "The bus of <" + bus + "> already registered.");
+ return;
+ } else {
+ buses.add(bus);
+ }
+ }
+ if (isNeedRecordTags) {
+ recordTags(aClass, className);
}
+ consumeStickyIfExist(bus);
+ }
+
+ private void recordTags(Class aClass, String className) {
List tags = mClassName_TagsMap.get(className);
if (tags == null) {
synchronized (mClassName_TagsMap) {
tags = mClassName_TagsMap.get(className);
if (tags == null) {
- tags = new ArrayList<>();
+ tags = new CopyOnWriteArrayList<>();
for (Map.Entry> entry : mTag_BusInfoListMap.entrySet()) {
for (BusInfo busInfo : entry.getValue()) {
try {
if (Class.forName(busInfo.className).isAssignableFrom(aClass)) {
tags.add(entry.getKey());
- busInfo.classNames.add(className);
+ busInfo.subClassNames.add(className);
}
} catch (ClassNotFoundException e) {
e.printStackTrace();
@@ -139,15 +153,38 @@ private void registerInner(final Object bus) {
}
}
}
- processSticky(bus);
}
- private void processSticky(final Object bus) {
+ private void consumeStickyIfExist(final Object bus) {
Map tagArgMap = mClassName_Tag_Arg4StickyMap.get(bus.getClass().getName());
if (tagArgMap == null) return;
synchronized (mClassName_Tag_Arg4StickyMap) {
for (Map.Entry tagArgEntry : tagArgMap.entrySet()) {
- postInner(tagArgEntry.getKey(), tagArgEntry.getValue());
+ consumeSticky(bus, tagArgEntry.getKey(), tagArgEntry.getValue());
+ }
+ }
+ }
+
+ private void consumeSticky(final Object bus, final String tag, final Object arg) {
+ List busInfoList = mTag_BusInfoListMap.get(tag);
+ if (busInfoList == null) {
+ Log.e(TAG, "The bus of tag <" + tag + "> is not exists.");
+ return;
+ }
+ for (BusInfo busInfo : busInfoList) {
+ if (!busInfo.subClassNames.contains(bus.getClass().getName())) {
+ continue;
+ }
+ if (!busInfo.sticky) {
+ continue;
+ }
+
+ synchronized (mClassName_Tag_Arg4StickyMap) {
+ Map tagArgMap = mClassName_Tag_Arg4StickyMap.get(busInfo.className);
+ if (tagArgMap == null || !tagArgMap.containsKey(tag)) {
+ continue;
+ }
+ invokeBus(bus, arg, busInfo, true);
}
}
}
@@ -173,18 +210,29 @@ private void postInner(final String tag, final Object arg, final boolean sticky)
List busInfoList = mTag_BusInfoListMap.get(tag);
if (busInfoList == null) {
Log.e(TAG, "The bus of tag <" + tag + "> is not exists.");
+ if (mTag_BusInfoListMap.isEmpty()) {
+ Log.e(TAG, "Please check whether the bus plugin is applied.");
+ }
return;
}
for (BusInfo busInfo : busInfoList) {
- if (busInfo.method == null) {
- Method method = getMethodByBusInfo(busInfo);
- if (method == null) {
- return;
- }
- busInfo.method = method;
+ invokeBus(arg, busInfo, sticky);
+ }
+ }
+
+ private void invokeBus(Object arg, BusInfo busInfo, boolean sticky) {
+ invokeBus(null, arg, busInfo, sticky);
+ }
+
+ private void invokeBus(Object bus, Object arg, BusInfo busInfo, boolean sticky) {
+ if (busInfo.method == null) {
+ Method method = getMethodByBusInfo(busInfo);
+ if (method == null) {
+ return;
}
- invokeMethod(tag, arg, busInfo, sticky);
+ busInfo.method = method;
}
+ invokeMethod(bus, arg, busInfo, sticky);
}
private Method getMethodByBusInfo(BusInfo busInfo) {
@@ -225,16 +273,20 @@ private Class getClassName(String paramType) throws ClassNotFoundException {
}
}
- private void invokeMethod(final String tag, final Object arg, final BusInfo busInfo, final boolean sticky) {
+ private void invokeMethod(final Object arg, final BusInfo busInfo, final boolean sticky) {
+ invokeMethod(null, arg, busInfo, sticky);
+ }
+
+ private void invokeMethod(final Object bus, final Object arg, final BusInfo busInfo, final boolean sticky) {
Runnable runnable = new Runnable() {
@Override
public void run() {
- realInvokeMethod(tag, arg, busInfo, sticky);
+ realInvokeMethod(bus, arg, busInfo, sticky);
}
};
switch (busInfo.threadMode) {
case "MAIN":
- Utils.runOnUiThread(runnable);
+ ThreadUtils.runOnUiThread(runnable);
return;
case "IO":
ThreadUtils.getIoPool().execute(runnable);
@@ -253,22 +305,28 @@ public void run() {
}
}
- private void realInvokeMethod(final String tag, Object arg, BusInfo busInfo, boolean sticky) {
+ private void realInvokeMethod(Object bus, Object arg, BusInfo busInfo, boolean sticky) {
Set buses = new HashSet<>();
- for (String className : busInfo.classNames) {
- Set subBuses = mClassName_BusesMap.get(className);
- if (subBuses != null && !subBuses.isEmpty()) {
- buses.addAll(subBuses);
+ if (bus == null) {
+ for (String subClassName : busInfo.subClassNames) {
+ Set subBuses = mClassName_BusesMap.get(subClassName);
+ if (subBuses != null && !subBuses.isEmpty()) {
+ buses.addAll(subBuses);
+ }
}
- }
- if (buses.size() == 0) {
- if (!sticky) {
- Log.e(TAG, "The bus of tag <" + tag + "> was not registered before.");
- return;
- } else {
+ if (buses.size() == 0) {
+ if (!sticky) {
+ Log.e(TAG, "The " + busInfo + " was not registered before.");
+ }
return;
}
+ } else {
+ buses.add(bus);
}
+ invokeBuses(arg, busInfo, buses);
+ }
+
+ private void invokeBuses(Object arg, BusInfo busInfo, Set buses) {
try {
if (arg == NULL) {
for (Object bus : buses) {
@@ -292,20 +350,21 @@ private void postStickyInner(final String tag, final Object arg) {
Log.e(TAG, "The bus of tag <" + tag + "> is not exists.");
return;
}
+ // 获取多对象，然后消费各个 busInfoList
for (BusInfo busInfo : busInfoList) {
if (!busInfo.sticky) { // not sticky bus will post directly.
- postInner(tag, arg);
- return;
+ invokeBus(arg, busInfo, false);
+ continue;
}
synchronized (mClassName_Tag_Arg4StickyMap) {
Map tagArgMap = mClassName_Tag_Arg4StickyMap.get(busInfo.className);
if (tagArgMap == null) {
- tagArgMap = new HashMap<>();
+ tagArgMap = new ConcurrentHashMap<>();
mClassName_Tag_Arg4StickyMap.put(busInfo.className, tagArgMap);
}
tagArgMap.put(tag, arg);
}
- postInner(tag, arg, true);
+ invokeBus(arg, busInfo, true);
}
}
@@ -317,13 +376,11 @@ private void removeStickyInner(final String tag) {
}
for (BusInfo busInfo : busInfoList) {
if (!busInfo.sticky) {
- Log.e(TAG, "The bus of tag <" + tag + "> is not sticky.");
- return;
+ continue;
}
synchronized (mClassName_Tag_Arg4StickyMap) {
Map tagArgMap = mClassName_Tag_Arg4StickyMap.get(busInfo.className);
if (tagArgMap == null || !tagArgMap.containsKey(tag)) {
- Log.e(TAG, "The sticky bus of tag <" + tag + "> didn't post.");
return;
}
tagArgMap.remove(tag);
@@ -331,8 +388,15 @@ private void removeStickyInner(final String tag) {
}
}
+ static void registerBus4Test(String tag,
+ String className, String funName, String paramType, String paramName,
+ boolean sticky, String threadMode, int priority) {
+ getInstance().registerBus(tag, className, funName, paramType, paramName, sticky, threadMode, priority);
+ }
+
private static final class BusInfo {
+ String tag;
String className;
String funName;
String paramType;
@@ -341,10 +405,11 @@ private static final class BusInfo {
String threadMode;
int priority;
Method method;
- List classNames;
+ List subClassNames;
- BusInfo(String className, String funName, String paramType, String paramName,
+ BusInfo(String tag, String className, String funName, String paramType, String paramName,
boolean sticky, String threadMode, int priority) {
+ this.tag = tag;
this.className = className;
this.funName = funName;
this.paramType = paramType;
@@ -352,19 +417,24 @@ private static final class BusInfo {
this.sticky = sticky;
this.threadMode = threadMode;
this.priority = priority;
- this.classNames = new CopyOnWriteArrayList<>();
+ this.subClassNames = new CopyOnWriteArrayList<>();
}
@Override
public String toString() {
- return "BusInfo { desc: " + className + "#" + funName +
- ("".equals(paramType) ? "()" : ("(" + paramType + " " + paramName + ")")) +
+ return "BusInfo { tag : " + tag +
+ ", desc: " + getDesc() +
", sticky: " + sticky +
", threadMode: " + threadMode +
", method: " + method +
", priority: " + priority +
" }";
}
+
+ private String getDesc() {
+ return className + "#" + funName +
+ ("".equals(paramType) ? "()" : ("(" + paramType + " " + paramName + ")"));
+ }
}
public enum ThreadMode {
diff --git a/lib/utilcode/src/main/java/com/blankj/utilcode/util/CacheDiskStaticUtils.java b/lib/utilcode/src/main/java/com/blankj/utilcode/util/CacheDiskStaticUtils.java
index bb48a4b5cf..23100f60b0 100644
--- a/lib/utilcode/src/main/java/com/blankj/utilcode/util/CacheDiskStaticUtils.java
+++ b/lib/utilcode/src/main/java/com/blankj/utilcode/util/CacheDiskStaticUtils.java
@@ -3,13 +3,15 @@
import android.graphics.Bitmap;
import android.graphics.drawable.Drawable;
import android.os.Parcelable;
-import android.support.annotation.NonNull;
import org.json.JSONArray;
import org.json.JSONObject;
import java.io.Serializable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
/**
*
* author: Blankj
@@ -27,7 +29,7 @@ public final class CacheDiskStaticUtils {
*
* @param cacheDiskUtils The default instance of {@link CacheDiskUtils}.
*/
- public static void setDefaultCacheDiskUtils(final CacheDiskUtils cacheDiskUtils) {
+ public static void setDefaultCacheDiskUtils(@Nullable final CacheDiskUtils cacheDiskUtils) {
sDefaultCacheDiskUtils = cacheDiskUtils;
}
@@ -37,7 +39,7 @@ public static void setDefaultCacheDiskUtils(final CacheDiskUtils cacheDiskUtils)
* @param key The key of cache.
* @param value The value of cache.
*/
- public static void put(@NonNull final String key, final byte[] value) {
+ public static void put(@NonNull final String key, @Nullable final byte[] value) {
put(key, value, getDefaultCacheDiskUtils());
}
@@ -48,7 +50,7 @@ public static void put(@NonNull final String key, final byte[] value) {
* @param value The value of cache.
* @param saveTime The save time of cache, in seconds.
*/
- public static void put(@NonNull final String key, final byte[] value, final int saveTime) {
+ public static void put(@NonNull final String key, @Nullable final byte[] value, final int saveTime) {
put(key, value, saveTime, getDefaultCacheDiskUtils());
}
@@ -69,7 +71,7 @@ public static byte[] getBytes(@NonNull final String key) {
* @param defaultValue The default value if the cache doesn't exist.
* @return the bytes if cache exists or defaultValue otherwise
*/
- public static byte[] getBytes(@NonNull final String key, final byte[] defaultValue) {
+ public static byte[] getBytes(@NonNull final String key, @Nullable final byte[] defaultValue) {
return getBytes(key, defaultValue, getDefaultCacheDiskUtils());
}
@@ -83,7 +85,7 @@ public static byte[] getBytes(@NonNull final String key, final byte[] defaultVal
* @param key The key of cache.
* @param value The value of cache.
*/
- public static void put(@NonNull final String key, final String value) {
+ public static void put(@NonNull final String key, @Nullable final String value) {
put(key, value, getDefaultCacheDiskUtils());
}
@@ -94,7 +96,7 @@ public static void put(@NonNull final String key, final String value) {
* @param value The value of cache.
* @param saveTime The save time of cache, in seconds.
*/
- public static void put(@NonNull final String key, final String value, final int saveTime) {
+ public static void put(@NonNull final String key, @Nullable final String value, final int saveTime) {
put(key, value, saveTime, getDefaultCacheDiskUtils());
}
@@ -115,7 +117,7 @@ public static String getString(@NonNull final String key) {
* @param defaultValue The default value if the cache doesn't exist.
* @return the string value if cache exists or defaultValue otherwise
*/
- public static String getString(@NonNull final String key, final String defaultValue) {
+ public static String getString(@NonNull final String key, @Nullable final String defaultValue) {
return getString(key, defaultValue, getDefaultCacheDiskUtils());
}
@@ -129,7 +131,7 @@ public static String getString(@NonNull final String key, final String defaultVa
* @param key The key of cache.
* @param value The value of cache.
*/
- public static void put(@NonNull final String key, final JSONObject value) {
+ public static void put(@NonNull final String key, @Nullable final JSONObject value) {
put(key, value, getDefaultCacheDiskUtils());
}
@@ -141,7 +143,7 @@ public static void put(@NonNull final String key, final JSONObject value) {
* @param saveTime The save time of cache, in seconds.
*/
public static void put(@NonNull final String key,
- final JSONObject value,
+ @Nullable final JSONObject value,
final int saveTime) {
put(key, value, saveTime, getDefaultCacheDiskUtils());
}
@@ -163,7 +165,7 @@ public static JSONObject getJSONObject(@NonNull final String key) {
* @param defaultValue The default value if the cache doesn't exist.
* @return the JSONObject if cache exists or defaultValue otherwise
*/
- public static JSONObject getJSONObject(@NonNull final String key, final JSONObject defaultValue) {
+ public static JSONObject getJSONObject(@NonNull final String key, @Nullable final JSONObject defaultValue) {
return getJSONObject(key, defaultValue, getDefaultCacheDiskUtils());
}
@@ -178,7 +180,7 @@ public static JSONObject getJSONObject(@NonNull final String key, final JSONObje
* @param key The key of cache.
* @param value The value of cache.
*/
- public static void put(@NonNull final String key, final JSONArray value) {
+ public static void put(@NonNull final String key, @Nullable final JSONArray value) {
put(key, value, getDefaultCacheDiskUtils());
}
@@ -189,7 +191,7 @@ public static void put(@NonNull final String key, final JSONArray value) {
* @param value The value of cache.
* @param saveTime The save time of cache, in seconds.
*/
- public static void put(@NonNull final String key, final JSONArray value, final int saveTime) {
+ public static void put(@NonNull final String key, @Nullable final JSONArray value, final int saveTime) {
put(key, value, saveTime, getDefaultCacheDiskUtils());
}
@@ -210,7 +212,7 @@ public static JSONArray getJSONArray(@NonNull final String key) {
* @param defaultValue The default value if the cache doesn't exist.
* @return the JSONArray if cache exists or defaultValue otherwise
*/
- public static JSONArray getJSONArray(@NonNull final String key, final JSONArray defaultValue) {
+ public static JSONArray getJSONArray(@NonNull final String key, @Nullable final JSONArray defaultValue) {
return getJSONArray(key, defaultValue, getDefaultCacheDiskUtils());
}
@@ -225,7 +227,7 @@ public static JSONArray getJSONArray(@NonNull final String key, final JSONArray
* @param key The key of cache.
* @param value The value of cache.
*/
- public static void put(@NonNull final String key, final Bitmap value) {
+ public static void put(@NonNull final String key, @Nullable final Bitmap value) {
put(key, value, getDefaultCacheDiskUtils());
}
@@ -236,7 +238,7 @@ public static void put(@NonNull final String key, final Bitmap value) {
* @param value The value of cache.
* @param saveTime The save time of cache, in seconds.
*/
- public static void put(@NonNull final String key, final Bitmap value, final int saveTime) {
+ public static void put(@NonNull final String key, @Nullable final Bitmap value, final int saveTime) {
put(key, value, saveTime, getDefaultCacheDiskUtils());
}
@@ -257,7 +259,7 @@ public static Bitmap getBitmap(@NonNull final String key) {
* @param defaultValue The default value if the cache doesn't exist.
* @return the bitmap if cache exists or defaultValue otherwise
*/
- public static Bitmap getBitmap(@NonNull final String key, final Bitmap defaultValue) {
+ public static Bitmap getBitmap(@NonNull final String key, @Nullable final Bitmap defaultValue) {
return getBitmap(key, defaultValue, getDefaultCacheDiskUtils());
}
@@ -271,7 +273,7 @@ public static Bitmap getBitmap(@NonNull final String key, final Bitmap defaultVa
* @param key The key of cache.
* @param value The value of cache.
*/
- public static void put(@NonNull final String key, final Drawable value) {
+ public static void put(@NonNull final String key, @Nullable final Drawable value) {
put(key, value, getDefaultCacheDiskUtils());
}
@@ -282,7 +284,7 @@ public static void put(@NonNull final String key, final Drawable value) {
* @param value The value of cache.
* @param saveTime The save time of cache, in seconds.
*/
- public static void put(@NonNull final String key, final Drawable value, final int saveTime) {
+ public static void put(@NonNull final String key, @Nullable final Drawable value, final int saveTime) {
put(key, value, saveTime, getDefaultCacheDiskUtils());
}
@@ -303,7 +305,7 @@ public static Drawable getDrawable(@NonNull final String key) {
* @param defaultValue The default value if the cache doesn't exist.
* @return the drawable if cache exists or defaultValue otherwise
*/
- public static Drawable getDrawable(@NonNull final String key, final Drawable defaultValue) {
+ public static Drawable getDrawable(@NonNull final String key, final @Nullable Drawable defaultValue) {
return getDrawable(key, defaultValue, getDefaultCacheDiskUtils());
}
@@ -317,7 +319,7 @@ public static Drawable getDrawable(@NonNull final String key, final Drawable def
* @param key The key of cache.
* @param value The value of cache.
*/
- public static void put(@NonNull final String key, final Parcelable value) {
+ public static void put(@NonNull final String key, @Nullable final Parcelable value) {
put(key, value, getDefaultCacheDiskUtils());
}
@@ -328,7 +330,7 @@ public static void put(@NonNull final String key, final Parcelable value) {
* @param value The value of cache.
* @param saveTime The save time of cache, in seconds.
*/
- public static void put(@NonNull final String key, final Parcelable value, final int saveTime) {
+ public static void put(@NonNull final String key, @Nullable final Parcelable value, final int saveTime) {
put(key, value, saveTime, getDefaultCacheDiskUtils());
}
@@ -356,7 +358,7 @@ public static T getParcelable(@NonNull final String key,
*/
public static T getParcelable(@NonNull final String key,
@NonNull final Parcelable.Creator creator,
- final T defaultValue) {
+ @Nullable final T defaultValue) {
return getParcelable(key, creator, defaultValue, getDefaultCacheDiskUtils());
}
@@ -370,7 +372,7 @@ public static T getParcelable(@NonNull final String key,
* @param key The key of cache.
* @param value The value of cache.
*/
- public static void put(@NonNull final String key, final Serializable value) {
+ public static void put(@NonNull final String key, @Nullable final Serializable value) {
put(key, value, getDefaultCacheDiskUtils());
}
@@ -381,7 +383,7 @@ public static void put(@NonNull final String key, final Serializable value) {
* @param value The value of cache.
* @param saveTime The save time of cache, in seconds.
*/
- public static void put(@NonNull final String key, final Serializable value, final int saveTime) {
+ public static void put(@NonNull final String key, @Nullable final Serializable value, final int saveTime) {
put(key, value, saveTime, getDefaultCacheDiskUtils());
}
@@ -402,7 +404,7 @@ public static Object getSerializable(@NonNull final String key) {
* @param defaultValue The default value if the cache doesn't exist.
* @return the bitmap if cache exists or defaultValue otherwise
*/
- public static Object getSerializable(@NonNull final String key, final Object defaultValue) {
+ public static Object getSerializable(@NonNull final String key, @Nullable final Object defaultValue) {
return getSerializable(key, defaultValue, getDefaultCacheDiskUtils());
}
@@ -455,7 +457,7 @@ public static boolean clear() {
* @param cacheDiskUtils The instance of {@link CacheDiskUtils}.
*/
public static void put(@NonNull final String key,
- final byte[] value,
+ @Nullable final byte[] value,
@NonNull final CacheDiskUtils cacheDiskUtils) {
cacheDiskUtils.put(key, value);
}
@@ -469,7 +471,7 @@ public static void put(@NonNull final String key,
* @param cacheDiskUtils The instance of {@link CacheDiskUtils}.
*/
public static void put(@NonNull final String key,
- final byte[] value,
+ @Nullable final byte[] value,
final int saveTime,
@NonNull final CacheDiskUtils cacheDiskUtils) {
cacheDiskUtils.put(key, value, saveTime);
@@ -495,7 +497,7 @@ public static byte[] getBytes(@NonNull final String key, @NonNull final CacheDis
* @return the bytes if cache exists or defaultValue otherwise
*/
public static byte[] getBytes(@NonNull final String key,
- final byte[] defaultValue,
+ @Nullable final byte[] defaultValue,
@NonNull final CacheDiskUtils cacheDiskUtils) {
return cacheDiskUtils.getBytes(key, defaultValue);
}
@@ -512,7 +514,7 @@ public static byte[] getBytes(@NonNull final String key,
* @param cacheDiskUtils The instance of {@link CacheDiskUtils}.
*/
public static void put(@NonNull final String key,
- final String value,
+ @Nullable final String value,
@NonNull final CacheDiskUtils cacheDiskUtils) {
cacheDiskUtils.put(key, value);
}
@@ -526,7 +528,7 @@ public static void put(@NonNull final String key,
* @param cacheDiskUtils The instance of {@link CacheDiskUtils}.
*/
public static void put(@NonNull final String key,
- final String value,
+ @Nullable final String value,
final int saveTime,
@NonNull final CacheDiskUtils cacheDiskUtils) {
cacheDiskUtils.put(key, value, saveTime);
@@ -552,7 +554,7 @@ public static String getString(@NonNull final String key, @NonNull final CacheDi
* @return the string value if cache exists or defaultValue otherwise
*/
public static String getString(@NonNull final String key,
- final String defaultValue,
+ @Nullable final String defaultValue,
@NonNull final CacheDiskUtils cacheDiskUtils) {
return cacheDiskUtils.getString(key, defaultValue);
}
@@ -569,7 +571,7 @@ public static String getString(@NonNull final String key,
* @param cacheDiskUtils The instance of {@link CacheDiskUtils}.
*/
public static void put(@NonNull final String key,
- final JSONObject value,
+ @Nullable final JSONObject value,
@NonNull final CacheDiskUtils cacheDiskUtils) {
cacheDiskUtils.put(key, value);
}
@@ -583,7 +585,7 @@ public static void put(@NonNull final String key,
* @param cacheDiskUtils The instance of {@link CacheDiskUtils}.
*/
public static void put(@NonNull final String key,
- final JSONObject value,
+ @Nullable final JSONObject value,
final int saveTime,
@NonNull final CacheDiskUtils cacheDiskUtils) {
cacheDiskUtils.put(key, value, saveTime);
@@ -609,7 +611,7 @@ public static JSONObject getJSONObject(@NonNull final String key, @NonNull final
* @return the JSONObject if cache exists or defaultValue otherwise
*/
public static JSONObject getJSONObject(@NonNull final String key,
- final JSONObject defaultValue,
+ @Nullable final JSONObject defaultValue,
@NonNull final CacheDiskUtils cacheDiskUtils) {
return cacheDiskUtils.getJSONObject(key, defaultValue);
}
@@ -627,7 +629,7 @@ public static JSONObject getJSONObject(@NonNull final String key,
* @param cacheDiskUtils The instance of {@link CacheDiskUtils}.
*/
public static void put(@NonNull final String key,
- final JSONArray value,
+ @Nullable final JSONArray value,
@NonNull final CacheDiskUtils cacheDiskUtils) {
cacheDiskUtils.put(key, value);
}
@@ -641,7 +643,7 @@ public static void put(@NonNull final String key,
* @param cacheDiskUtils The instance of {@link CacheDiskUtils}.
*/
public static void put(@NonNull final String key,
- final JSONArray value,
+ @Nullable final JSONArray value,
final int saveTime,
@NonNull final CacheDiskUtils cacheDiskUtils) {
cacheDiskUtils.put(key, value, saveTime);
@@ -667,7 +669,7 @@ public static JSONArray getJSONArray(@NonNull final String key, @NonNull final C
* @return the JSONArray if cache exists or defaultValue otherwise
*/
public static JSONArray getJSONArray(@NonNull final String key,
- final JSONArray defaultValue,
+ @Nullable final JSONArray defaultValue,
@NonNull final CacheDiskUtils cacheDiskUtils) {
return cacheDiskUtils.getJSONArray(key, defaultValue);
}
@@ -685,7 +687,7 @@ public static JSONArray getJSONArray(@NonNull final String key,
* @param cacheDiskUtils The instance of {@link CacheDiskUtils}.
*/
public static void put(@NonNull final String key,
- final Bitmap value,
+ @Nullable final Bitmap value,
@NonNull final CacheDiskUtils cacheDiskUtils) {
cacheDiskUtils.put(key, value);
}
@@ -699,7 +701,7 @@ public static void put(@NonNull final String key,
* @param cacheDiskUtils The instance of {@link CacheDiskUtils}.
*/
public static void put(@NonNull final String key,
- final Bitmap value,
+ @Nullable final Bitmap value,
final int saveTime,
@NonNull final CacheDiskUtils cacheDiskUtils) {
cacheDiskUtils.put(key, value, saveTime);
@@ -725,7 +727,7 @@ public static Bitmap getBitmap(@NonNull final String key, @NonNull final CacheDi
* @return the bitmap if cache exists or defaultValue otherwise
*/
public static Bitmap getBitmap(@NonNull final String key,
- final Bitmap defaultValue,
+ @Nullable final Bitmap defaultValue,
@NonNull final CacheDiskUtils cacheDiskUtils) {
return cacheDiskUtils.getBitmap(key, defaultValue);
}
@@ -742,7 +744,7 @@ public static Bitmap getBitmap(@NonNull final String key,
* @param cacheDiskUtils The instance of {@link CacheDiskUtils}.
*/
public static void put(@NonNull final String key,
- final Drawable value,
+ @Nullable final Drawable value,
@NonNull final CacheDiskUtils cacheDiskUtils) {
cacheDiskUtils.put(key, value);
}
@@ -756,7 +758,7 @@ public static void put(@NonNull final String key,
* @param cacheDiskUtils The instance of {@link CacheDiskUtils}.
*/
public static void put(@NonNull final String key,
- final Drawable value,
+ @Nullable final Drawable value,
final int saveTime,
@NonNull final CacheDiskUtils cacheDiskUtils) {
cacheDiskUtils.put(key, value, saveTime);
@@ -782,7 +784,7 @@ public static Drawable getDrawable(@NonNull final String key, @NonNull final Cac
* @return the drawable if cache exists or defaultValue otherwise
*/
public static Drawable getDrawable(@NonNull final String key,
- final Drawable defaultValue,
+ @Nullable final Drawable defaultValue,
@NonNull final CacheDiskUtils cacheDiskUtils) {
return cacheDiskUtils.getDrawable(key, defaultValue);
}
@@ -799,7 +801,7 @@ public static Drawable getDrawable(@NonNull final String key,
* @param cacheDiskUtils The instance of {@link CacheDiskUtils}.
*/
public static void put(@NonNull final String key,
- final Parcelable value,
+ @Nullable final Parcelable value,
@NonNull final CacheDiskUtils cacheDiskUtils) {
cacheDiskUtils.put(key, value);
}
@@ -813,7 +815,7 @@ public static void put(@NonNull final String key,
* @param cacheDiskUtils The instance of {@link CacheDiskUtils}.
*/
public static void put(@NonNull final String key,
- final Parcelable value,
+ @Nullable final Parcelable value,
final int saveTime,
@NonNull final CacheDiskUtils cacheDiskUtils) {
cacheDiskUtils.put(key, value, saveTime);
@@ -846,7 +848,7 @@ public static T getParcelable(@NonNull final String key,
*/
public static T getParcelable(@NonNull final String key,
@NonNull final Parcelable.Creator creator,
- final T defaultValue,
+ @Nullable final T defaultValue,
@NonNull final CacheDiskUtils cacheDiskUtils) {
return cacheDiskUtils.getParcelable(key, creator, defaultValue);
}
@@ -863,7 +865,7 @@ public static T getParcelable(@NonNull final String key,
* @param cacheDiskUtils The instance of {@link CacheDiskUtils}.
*/
public static void put(@NonNull final String key,
- final Serializable value,
+ @Nullable final Serializable value,
@NonNull final CacheDiskUtils cacheDiskUtils) {
cacheDiskUtils.put(key, value);
}
@@ -877,7 +879,7 @@ public static void put(@NonNull final String key,
* @param cacheDiskUtils The instance of {@link CacheDiskUtils}.
*/
public static void put(@NonNull final String key,
- final Serializable value,
+ @Nullable final Serializable value,
final int saveTime,
@NonNull final CacheDiskUtils cacheDiskUtils) {
cacheDiskUtils.put(key, value, saveTime);
@@ -903,7 +905,7 @@ public static Object getSerializable(@NonNull final String key, @NonNull final C
* @return the bitmap if cache exists or defaultValue otherwise
*/
public static Object getSerializable(@NonNull final String key,
- final Object defaultValue,
+ @Nullable final Object defaultValue,
@NonNull final CacheDiskUtils cacheDiskUtils) {
return cacheDiskUtils.getSerializable(key, defaultValue);
}
@@ -949,6 +951,7 @@ public static boolean clear(@NonNull final CacheDiskUtils cacheDiskUtils) {
return cacheDiskUtils.clear();
}
+ @NonNull
private static CacheDiskUtils getDefaultCacheDiskUtils() {
return sDefaultCacheDiskUtils != null ? sDefaultCacheDiskUtils : CacheDiskUtils.getInstance();
}
diff --git a/lib/utilcode/src/main/java/com/blankj/utilcode/util/CacheDiskUtils.java b/lib/utilcode/src/main/java/com/blankj/utilcode/util/CacheDiskUtils.java
index 67e6b3fb0e..773e550a16 100644
--- a/lib/utilcode/src/main/java/com/blankj/utilcode/util/CacheDiskUtils.java
+++ b/lib/utilcode/src/main/java/com/blankj/utilcode/util/CacheDiskUtils.java
@@ -1,34 +1,20 @@
package com.blankj.utilcode.util;
import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.graphics.Canvas;
-import android.graphics.PixelFormat;
-import android.graphics.drawable.BitmapDrawable;
import android.graphics.drawable.Drawable;
-import android.os.Parcel;
import android.os.Parcelable;
-import android.support.annotation.NonNull;
import android.util.Log;
+import androidx.annotation.NonNull;
+
import com.blankj.utilcode.constant.CacheConstants;
import org.json.JSONArray;
import org.json.JSONObject;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
import java.io.File;
-import java.io.FileOutputStream;
import java.io.FilenameFilter;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.io.RandomAccessFile;
import java.io.Serializable;
-import java.nio.ByteBuffer;
-import java.nio.MappedByteBuffer;
-import java.nio.channels.FileChannel;
import java.util.Collections;
import java.util.HashMap;
import java.util.Locale;
@@ -114,7 +100,7 @@ public static CacheDiskUtils getInstance(final long maxSize, final int maxCount)
* @return the single {@link CacheDiskUtils} instance
*/
public static CacheDiskUtils getInstance(String cacheName, final long maxSize, final int maxCount) {
- if (isSpace(cacheName)) cacheName = "cacheUtils";
+ if (UtilsBridge.isSpace(cacheName)) cacheName = "cacheUtils";
File file = new File(Utils.getApp().getCacheDir(), cacheName);
return getInstance(file, maxSize, maxCount);
}
@@ -217,7 +203,7 @@ private void realPutBytes(final String key, byte[] value, int saveTime) {
if (diskCacheManager == null) return;
if (saveTime >= 0) value = DiskCacheHelper.newByteArrayWithTime(saveTime, value);
File file = diskCacheManager.getFileBeforePut(key);
- writeFileFromBytes(file, value);
+ UtilsBridge.writeFileFromBytes(file, value);
diskCacheManager.updateModify(file);
diskCacheManager.put(file);
}
@@ -253,7 +239,7 @@ private byte[] realGetBytes(@NonNull final String key, final byte[] defaultValue
if (diskCacheManager == null) return defaultValue;
final File file = diskCacheManager.getFileIfExists(key);
if (file == null) return defaultValue;
- byte[] data = readFile2Bytes(file);
+ byte[] data = UtilsBridge.readFile2Bytes(file);
if (DiskCacheHelper.isDue(data)) {
diskCacheManager.removeByKey(key);
return defaultValue;
@@ -284,7 +270,7 @@ public void put(@NonNull final String key, final String value) {
* @param saveTime The save time of cache, in seconds.
*/
public void put(@NonNull final String key, final String value, final int saveTime) {
- realPutBytes(TYPE_STRING + key, string2Bytes(value), saveTime);
+ realPutBytes(TYPE_STRING + key, UtilsBridge.string2Bytes(value), saveTime);
}
/**
@@ -307,7 +293,7 @@ public String getString(@NonNull final String key) {
public String getString(@NonNull final String key, final String defaultValue) {
byte[] bytes = realGetBytes(TYPE_STRING + key);
if (bytes == null) return defaultValue;
- return bytes2String(bytes);
+ return UtilsBridge.bytes2String(bytes);
}
///////////////////////////////////////////////////////////////////////////
@@ -334,7 +320,7 @@ public void put(@NonNull final String key, final JSONObject value) {
public void put(@NonNull final String key,
final JSONObject value,
final int saveTime) {
- realPutBytes(TYPE_JSON_OBJECT + key, jsonObject2Bytes(value), saveTime);
+ realPutBytes(TYPE_JSON_OBJECT + key, UtilsBridge.jsonObject2Bytes(value), saveTime);
}
/**
@@ -357,7 +343,7 @@ public JSONObject getJSONObject(@NonNull final String key) {
public JSONObject getJSONObject(@NonNull final String key, final JSONObject defaultValue) {
byte[] bytes = realGetBytes(TYPE_JSON_OBJECT + key);
if (bytes == null) return defaultValue;
- return bytes2JSONObject(bytes);
+ return UtilsBridge.bytes2JSONObject(bytes);
}
@@ -383,7 +369,7 @@ public void put(@NonNull final String key, final JSONArray value) {
* @param saveTime The save time of cache, in seconds.
*/
public void put(@NonNull final String key, final JSONArray value, final int saveTime) {
- realPutBytes(TYPE_JSON_ARRAY + key, jsonArray2Bytes(value), saveTime);
+ realPutBytes(TYPE_JSON_ARRAY + key, UtilsBridge.jsonArray2Bytes(value), saveTime);
}
/**
@@ -406,7 +392,7 @@ public JSONArray getJSONArray(@NonNull final String key) {
public JSONArray getJSONArray(@NonNull final String key, final JSONArray defaultValue) {
byte[] bytes = realGetBytes(TYPE_JSON_ARRAY + key);
if (bytes == null) return defaultValue;
- return bytes2JSONArray(bytes);
+ return UtilsBridge.bytes2JSONArray(bytes);
}
@@ -432,7 +418,7 @@ public void put(@NonNull final String key, final Bitmap value) {
* @param saveTime The save time of cache, in seconds.
*/
public void put(@NonNull final String key, final Bitmap value, final int saveTime) {
- realPutBytes(TYPE_BITMAP + key, bitmap2Bytes(value), saveTime);
+ realPutBytes(TYPE_BITMAP + key, UtilsBridge.bitmap2Bytes(value), saveTime);
}
/**
@@ -455,7 +441,7 @@ public Bitmap getBitmap(@NonNull final String key) {
public Bitmap getBitmap(@NonNull final String key, final Bitmap defaultValue) {
byte[] bytes = realGetBytes(TYPE_BITMAP + key);
if (bytes == null) return defaultValue;
- return bytes2Bitmap(bytes);
+ return UtilsBridge.bytes2Bitmap(bytes);
}
///////////////////////////////////////////////////////////////////////////
@@ -480,7 +466,7 @@ public void put(@NonNull final String key, final Drawable value) {
* @param saveTime The save time of cache, in seconds.
*/
public void put(@NonNull final String key, final Drawable value, final int saveTime) {
- realPutBytes(TYPE_DRAWABLE + key, drawable2Bytes(value), saveTime);
+ realPutBytes(TYPE_DRAWABLE + key, UtilsBridge.drawable2Bytes(value), saveTime);
}
/**
@@ -503,7 +489,7 @@ public Drawable getDrawable(@NonNull final String key) {
public Drawable getDrawable(@NonNull final String key, final Drawable defaultValue) {
byte[] bytes = realGetBytes(TYPE_DRAWABLE + key);
if (bytes == null) return defaultValue;
- return bytes2Drawable(bytes);
+ return UtilsBridge.bytes2Drawable(bytes);
}
///////////////////////////////////////////////////////////////////////////
@@ -528,7 +514,7 @@ public void put(@NonNull final String key, final Parcelable value) {
* @param saveTime The save time of cache, in seconds.
*/
public void put(@NonNull final String key, final Parcelable value, final int saveTime) {
- realPutBytes(TYPE_PARCELABLE + key, parcelable2Bytes(value), saveTime);
+ realPutBytes(TYPE_PARCELABLE + key, UtilsBridge.parcelable2Bytes(value), saveTime);
}
/**
@@ -558,7 +544,7 @@ public T getParcelable(@NonNull final String key,
final T defaultValue) {
byte[] bytes = realGetBytes(TYPE_PARCELABLE + key);
if (bytes == null) return defaultValue;
- return bytes2Parcelable(bytes, creator);
+ return UtilsBridge.bytes2Parcelable(bytes, creator);
}
///////////////////////////////////////////////////////////////////////////
@@ -583,7 +569,7 @@ public void put(@NonNull final String key, final Serializable value) {
* @param saveTime The save time of cache, in seconds.
*/
public void put(@NonNull final String key, final Serializable value, final int saveTime) {
- realPutBytes(TYPE_SERIALIZABLE + key, serializable2Bytes(value), saveTime);
+ realPutBytes(TYPE_SERIALIZABLE + key, UtilsBridge.serializable2Bytes(value), saveTime);
}
/**
@@ -606,7 +592,7 @@ public Object getSerializable(@NonNull final String key) {
public Object getSerializable(@NonNull final String key, final Object defaultValue) {
byte[] bytes = realGetBytes(TYPE_SERIALIZABLE + key);
if (bytes == null) return defaultValue;
- return bytes2Object(bytes);
+ return UtilsBridge.bytes2Object(bytes);
}
/**
@@ -886,221 +872,4 @@ private static boolean hasTimeInfo(final byte[] data) {
&& data[13] == '_';
}
}
-
- ///////////////////////////////////////////////////////////////////////////
- // other utils methods
- ///////////////////////////////////////////////////////////////////////////
-
- private static byte[] string2Bytes(final String string) {
- if (string == null) return null;
- return string.getBytes();
- }
-
- private static String bytes2String(final byte[] bytes) {
- if (bytes == null) return null;
- return new String(bytes);
- }
-
- private static byte[] jsonObject2Bytes(final JSONObject jsonObject) {
- if (jsonObject == null) return null;
- return jsonObject.toString().getBytes();
- }
-
- private static JSONObject bytes2JSONObject(final byte[] bytes) {
- if (bytes == null) return null;
- try {
- return new JSONObject(new String(bytes));
- } catch (Exception e) {
- e.printStackTrace();
- return null;
- }
- }
-
- private static byte[] jsonArray2Bytes(final JSONArray jsonArray) {
- if (jsonArray == null) return null;
- return jsonArray.toString().getBytes();
- }
-
- private static JSONArray bytes2JSONArray(final byte[] bytes) {
- if (bytes == null) return null;
- try {
- return new JSONArray(new String(bytes));
- } catch (Exception e) {
- e.printStackTrace();
- return null;
- }
- }
-
- private static byte[] parcelable2Bytes(final Parcelable parcelable) {
- if (parcelable == null) return null;
- Parcel parcel = Parcel.obtain();
- parcelable.writeToParcel(parcel, 0);
- byte[] bytes = parcel.marshall();
- parcel.recycle();
- return bytes;
- }
-
- private static T bytes2Parcelable(final byte[] bytes,
- final Parcelable.Creator creator) {
- if (bytes == null) return null;
- Parcel parcel = Parcel.obtain();
- parcel.unmarshall(bytes, 0, bytes.length);
- parcel.setDataPosition(0);
- T result = creator.createFromParcel(parcel);
- parcel.recycle();
- return result;
- }
-
- private static byte[] serializable2Bytes(final Serializable serializable) {
- if (serializable == null) return null;
- ByteArrayOutputStream baos;
- ObjectOutputStream oos = null;
- try {
- oos = new ObjectOutputStream(baos = new ByteArrayOutputStream());
- oos.writeObject(serializable);
- return baos.toByteArray();
- } catch (Exception e) {
- e.printStackTrace();
- return null;
- } finally {
- try {
- if (oos != null) {
- oos.close();
- }
- } catch (IOException e) {
- e.printStackTrace();
- }
- }
- }
-
- private static Object bytes2Object(final byte[] bytes) {
- if (bytes == null) return null;
- ObjectInputStream ois = null;
- try {
- ois = new ObjectInputStream(new ByteArrayInputStream(bytes));
- return ois.readObject();
- } catch (Exception e) {
- e.printStackTrace();
- return null;
- } finally {
- try {
- if (ois != null) {
- ois.close();
- }
- } catch (IOException e) {
- e.printStackTrace();
- }
- }
- }
-
- private static byte[] bitmap2Bytes(final Bitmap bitmap) {
- if (bitmap == null) return null;
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- bitmap.compress(Bitmap.CompressFormat.PNG, 100, baos);
- return baos.toByteArray();
- }
-
- private static Bitmap bytes2Bitmap(final byte[] bytes) {
- return (bytes == null || bytes.length <= 0)
- ? null
- : BitmapFactory.decodeByteArray(bytes, 0, bytes.length);
- }
-
- private static byte[] drawable2Bytes(final Drawable drawable) {
- return drawable == null ? null : bitmap2Bytes(drawable2Bitmap(drawable));
- }
-
- private static Drawable bytes2Drawable(final byte[] bytes) {
- return bytes == null ? null : bitmap2Drawable(bytes2Bitmap(bytes));
- }
-
- private static Bitmap drawable2Bitmap(final Drawable drawable) {
- if (drawable instanceof BitmapDrawable) {
- BitmapDrawable bitmapDrawable = (BitmapDrawable) drawable;
- if (bitmapDrawable.getBitmap() != null) {
- return bitmapDrawable.getBitmap();
- }
- }
- Bitmap bitmap;
- if (drawable.getIntrinsicWidth() <= 0 || drawable.getIntrinsicHeight() <= 0) {
- bitmap = Bitmap.createBitmap(
- 1,
- 1,
- drawable.getOpacity() != PixelFormat.OPAQUE
- ? Bitmap.Config.ARGB_8888
- : Bitmap.Config.RGB_565
- );
- } else {
- bitmap = Bitmap.createBitmap(
- drawable.getIntrinsicWidth(),
- drawable.getIntrinsicHeight(),
- drawable.getOpacity() != PixelFormat.OPAQUE
- ? Bitmap.Config.ARGB_8888
- : Bitmap.Config.RGB_565
- );
- }
- Canvas canvas = new Canvas(bitmap);
- drawable.setBounds(0, 0, canvas.getWidth(), canvas.getHeight());
- drawable.draw(canvas);
- return bitmap;
- }
-
- private static Drawable bitmap2Drawable(final Bitmap bitmap) {
- return bitmap == null
- ? null
- : new BitmapDrawable(Utils.getApp().getResources(), bitmap);
- }
-
-
- private static void writeFileFromBytes(final File file, final byte[] bytes) {
- FileChannel fc = null;
- try {
- fc = new FileOutputStream(file, false).getChannel();
- fc.write(ByteBuffer.wrap(bytes));
- fc.force(true);
- } catch (IOException e) {
- e.printStackTrace();
- } finally {
- try {
- if (fc != null) {
- fc.close();
- }
- } catch (IOException e) {
- e.printStackTrace();
- }
- }
- }
-
- private static byte[] readFile2Bytes(final File file) {
- FileChannel fc = null;
- try {
- fc = new RandomAccessFile(file, "r").getChannel();
- int size = (int) fc.size();
- MappedByteBuffer mbb = fc.map(FileChannel.MapMode.READ_ONLY, 0, size).load();
- byte[] data = new byte[size];
- mbb.get(data, 0, size);
- return data;
- } catch (IOException e) {
- e.printStackTrace();
- return null;
- } finally {
- try {
- if (fc != null) {
- fc.close();
- }
- } catch (IOException e) {
- e.printStackTrace();
- }
- }
- }
-
- private static boolean isSpace(final String s) {
- if (s == null) return true;
- for (int i = 0, len = s.length(); i < len; ++i) {
- if (!Character.isWhitespace(s.charAt(i))) {
- return false;
- }
- }
- return true;
- }
}
\ No newline at end of file
diff --git a/lib/utilcode/src/main/java/com/blankj/utilcode/util/CacheDoubleStaticUtils.java b/lib/utilcode/src/main/java/com/blankj/utilcode/util/CacheDoubleStaticUtils.java
index 2ef267bd01..6dbb9f7475 100644
--- a/lib/utilcode/src/main/java/com/blankj/utilcode/util/CacheDoubleStaticUtils.java
+++ b/lib/utilcode/src/main/java/com/blankj/utilcode/util/CacheDoubleStaticUtils.java
@@ -3,13 +3,14 @@
import android.graphics.Bitmap;
import android.graphics.drawable.Drawable;
import android.os.Parcelable;
-import android.support.annotation.NonNull;
import org.json.JSONArray;
import org.json.JSONObject;
import java.io.Serializable;
+import androidx.annotation.NonNull;
+
/**
*
* author: Blankj
diff --git a/lib/utilcode/src/main/java/com/blankj/utilcode/util/CacheDoubleUtils.java b/lib/utilcode/src/main/java/com/blankj/utilcode/util/CacheDoubleUtils.java
index c800423c78..c39c9ef9d4 100644
--- a/lib/utilcode/src/main/java/com/blankj/utilcode/util/CacheDoubleUtils.java
+++ b/lib/utilcode/src/main/java/com/blankj/utilcode/util/CacheDoubleUtils.java
@@ -3,7 +3,7 @@
import android.graphics.Bitmap;
import android.graphics.drawable.Drawable;
import android.os.Parcelable;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
import com.blankj.utilcode.constant.CacheConstants;
@@ -113,7 +113,12 @@ public byte[] getBytes(@NonNull final String key) {
public byte[] getBytes(@NonNull final String key, final byte[] defaultValue) {
byte[] obj = mCacheMemoryUtils.get(key);
if (obj != null) return obj;
- return mCacheDiskUtils.getBytes(key, defaultValue);
+ byte[] bytes = mCacheDiskUtils.getBytes(key);
+ if (bytes != null) {
+ mCacheMemoryUtils.put(key, bytes);
+ return bytes;
+ }
+ return defaultValue;
}
///////////////////////////////////////////////////////////////////////////
@@ -162,7 +167,12 @@ public String getString(@NonNull final String key) {
public String getString(@NonNull final String key, final String defaultValue) {
String obj = mCacheMemoryUtils.get(key);
if (obj != null) return obj;
- return mCacheDiskUtils.getString(key, defaultValue);
+ String string = mCacheDiskUtils.getString(key);
+ if (string != null) {
+ mCacheMemoryUtils.put(key, string);
+ return string;
+ }
+ return defaultValue;
}
///////////////////////////////////////////////////////////////////////////
@@ -213,7 +223,12 @@ public JSONObject getJSONObject(@NonNull final String key) {
public JSONObject getJSONObject(@NonNull final String key, final JSONObject defaultValue) {
JSONObject obj = mCacheMemoryUtils.get(key);
if (obj != null) return obj;
- return mCacheDiskUtils.getJSONObject(key, defaultValue);
+ JSONObject jsonObject = mCacheDiskUtils.getJSONObject(key);
+ if (jsonObject != null) {
+ mCacheMemoryUtils.put(key, jsonObject);
+ return jsonObject;
+ }
+ return defaultValue;
}
@@ -263,7 +278,12 @@ public JSONArray getJSONArray(@NonNull final String key) {
public JSONArray getJSONArray(@NonNull final String key, final JSONArray defaultValue) {
JSONArray obj = mCacheMemoryUtils.get(key);
if (obj != null) return obj;
- return mCacheDiskUtils.getJSONArray(key, defaultValue);
+ JSONArray jsonArray = mCacheDiskUtils.getJSONArray(key);
+ if (jsonArray != null) {
+ mCacheMemoryUtils.put(key, jsonArray);
+ return jsonArray;
+ }
+ return defaultValue;
}
///////////////////////////////////////////////////////////////////////////
@@ -312,7 +332,12 @@ public Bitmap getBitmap(@NonNull final String key) {
public Bitmap getBitmap(@NonNull final String key, final Bitmap defaultValue) {
Bitmap obj = mCacheMemoryUtils.get(key);
if (obj != null) return obj;
- return mCacheDiskUtils.getBitmap(key, defaultValue);
+ Bitmap bitmap = mCacheDiskUtils.getBitmap(key);
+ if (bitmap != null) {
+ mCacheMemoryUtils.put(key, bitmap);
+ return bitmap;
+ }
+ return defaultValue;
}
///////////////////////////////////////////////////////////////////////////
@@ -361,7 +386,12 @@ public Drawable getDrawable(@NonNull final String key) {
public Drawable getDrawable(@NonNull final String key, final Drawable defaultValue) {
Drawable obj = mCacheMemoryUtils.get(key);
if (obj != null) return obj;
- return mCacheDiskUtils.getDrawable(key, defaultValue);
+ Drawable drawable = mCacheDiskUtils.getDrawable(key);
+ if (drawable != null) {
+ mCacheMemoryUtils.put(key, drawable);
+ return drawable;
+ }
+ return defaultValue;
}
///////////////////////////////////////////////////////////////////////////
@@ -417,7 +447,12 @@ public T getParcelable(@NonNull final String key,
final T defaultValue) {
T value = mCacheMemoryUtils.get(key);
if (value != null) return value;
- return mCacheDiskUtils.getParcelable(key, creator, defaultValue);
+ T val = mCacheDiskUtils.getParcelable(key, creator);
+ if (val != null) {
+ mCacheMemoryUtils.put(key, val);
+ return val;
+ }
+ return defaultValue;
}
///////////////////////////////////////////////////////////////////////////
@@ -466,7 +501,12 @@ public Object getSerializable(@NonNull final String key) {
public Object getSerializable(@NonNull final String key, final Object defaultValue) {
Object obj = mCacheMemoryUtils.get(key);
if (obj != null) return obj;
- return mCacheDiskUtils.getSerializable(key, defaultValue);
+ Object serializable = mCacheDiskUtils.getSerializable(key);
+ if (serializable != null) {
+ mCacheMemoryUtils.put(key, serializable);
+ return serializable;
+ }
+ return defaultValue;
}
/**
diff --git a/lib/utilcode/src/main/java/com/blankj/utilcode/util/CacheMemoryStaticUtils.java b/lib/utilcode/src/main/java/com/blankj/utilcode/util/CacheMemoryStaticUtils.java
index 56abfba117..aedcfa7fc4 100644
--- a/lib/utilcode/src/main/java/com/blankj/utilcode/util/CacheMemoryStaticUtils.java
+++ b/lib/utilcode/src/main/java/com/blankj/utilcode/util/CacheMemoryStaticUtils.java
@@ -1,6 +1,6 @@
package com.blankj.utilcode.util;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
/**
*
diff --git a/lib/utilcode/src/main/java/com/blankj/utilcode/util/CacheMemoryUtils.java b/lib/utilcode/src/main/java/com/blankj/utilcode/util/CacheMemoryUtils.java
index d0e06e394d..ddaa2baed9 100644
--- a/lib/utilcode/src/main/java/com/blankj/utilcode/util/CacheMemoryUtils.java
+++ b/lib/utilcode/src/main/java/com/blankj/utilcode/util/CacheMemoryUtils.java
@@ -1,7 +1,7 @@
package com.blankj.utilcode.util;
-import android.support.annotation.NonNull;
-import android.support.v4.util.LruCache;
+import androidx.annotation.NonNull;
+import androidx.collection.LruCache;
import com.blankj.utilcode.constant.CacheConstants;
diff --git a/lib/utilcode/src/main/java/com/blankj/utilcode/util/CleanUtils.java b/lib/utilcode/src/main/java/com/blankj/utilcode/util/CleanUtils.java
index 2af0f22310..7db3edbd6a 100644
--- a/lib/utilcode/src/main/java/com/blankj/utilcode/util/CleanUtils.java
+++ b/lib/utilcode/src/main/java/com/blankj/utilcode/util/CleanUtils.java
@@ -1,9 +1,14 @@
package com.blankj.utilcode.util;
+import android.app.ActivityManager;
+import android.content.Context;
+import android.os.Build;
import android.os.Environment;
import java.io.File;
+import androidx.annotation.RequiresApi;
+
/**
*
* author: Blankj
@@ -25,7 +30,7 @@ private CleanUtils() {
* @return {@code true}: success
* author: Blankj
@@ -40,8 +47,7 @@ public class ClickUtils {
private static final int PRESSED_BG_DARK_STYLE = 5;
private static final float PRESSED_BG_DARK_DEFAULT_VALUE = 0.9f;
- private static final int DEBOUNCING_TAG = -7;
- private static final long DEBOUNCING_DEFAULT_VALUE = 200;
+ private static final long DEBOUNCING_DEFAULT_VALUE = 1000;
private ClickUtils() {
throw new UnsupportedOperationException("u can't instantiate me...");
@@ -198,7 +204,7 @@ private static Drawable createStyleDrawable(Drawable src, int style, float value
}
Drawable disable = src.getConstantState().newDrawable().mutate();
- disable = createAlphaDrawable(pressed, 0.5f);
+ disable = createAlphaDrawable(disable, 0.5f);
StateListDrawable drawable = new StateListDrawable();
drawable.addState(new int[]{android.R.attr.state_pressed}, pressed);
@@ -208,30 +214,15 @@ private static Drawable createStyleDrawable(Drawable src, int style, float value
}
private static Drawable createAlphaDrawable(Drawable drawable, float alpha) {
- if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.KITKAT
- && !(drawable instanceof ColorDrawable)) {
- Bitmap bitmap = Bitmap.createBitmap(drawable.getIntrinsicWidth(), drawable.getIntrinsicHeight(), Bitmap.Config.ARGB_8888);
- Canvas myCanvas = new Canvas(bitmap);
- drawable.setAlpha((int) (alpha * 255));
- drawable.setBounds(0, 0, drawable.getIntrinsicWidth(), drawable.getIntrinsicHeight());
- drawable.draw(myCanvas);
- return new BitmapDrawable(Resources.getSystem(), bitmap);
- }
- drawable.setAlpha((int) (alpha * 255));
- return drawable;
+ ClickDrawableWrapper drawableWrapper = new ClickDrawableWrapper(drawable);
+ drawableWrapper.setAlpha((int) (alpha * 255));
+ return drawableWrapper;
}
private static Drawable createDarkDrawable(Drawable drawable, float alpha) {
- if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.KITKAT && !(drawable instanceof ColorDrawable)) {
- Bitmap bitmap = Bitmap.createBitmap(drawable.getIntrinsicWidth(), drawable.getIntrinsicHeight(), Bitmap.Config.ARGB_8888);
- Canvas myCanvas = new Canvas(bitmap);
- drawable.setColorFilter(getDarkColorFilter(alpha));
- drawable.setBounds(0, 0, drawable.getIntrinsicWidth(), drawable.getIntrinsicHeight());
- drawable.draw(myCanvas);
- return new BitmapDrawable(Resources.getSystem(), bitmap);
- }
- drawable.setColorFilter(getDarkColorFilter(alpha));
- return drawable;
+ ClickDrawableWrapper drawableWrapper = new ClickDrawableWrapper(drawable);
+ drawableWrapper.setColorFilter(getDarkColorFilter(alpha));
+ return drawableWrapper;
}
private static ColorMatrixColorFilter getDarkColorFilter(float darkAlpha) {
@@ -350,9 +341,82 @@ public void onDebouncingClick(View v) {
}
}
- private static int dp2px(final float dpValue) {
- final float scale = Resources.getSystem().getDisplayMetrics().density;
- return (int) (dpValue * scale + 0.5f);
+ /**
+ * Expand the click area of the view
+ *
+ * @param view The view.
+ * @param expandSize The size.
+ */
+ public static void expandClickArea(@NonNull final View view, final int expandSize) {
+ expandClickArea(view, expandSize, expandSize, expandSize, expandSize);
+ }
+
+ public static void expandClickArea(@NonNull final View view,
+ final int expandSizeTop,
+ final int expandSizeLeft,
+ final int expandSizeRight,
+ final int expandSizeBottom) {
+ final View parentView = (View) view.getParent();
+ if (parentView == null) {
+ Log.e("ClickUtils", "expandClickArea must have parent view.");
+ return;
+ }
+ parentView.post(new Runnable() {
+ @Override
+ public void run() {
+ final Rect rect = new Rect();
+ view.getHitRect(rect);
+ rect.top -= expandSizeTop;
+ rect.bottom += expandSizeBottom;
+ rect.left -= expandSizeLeft;
+ rect.right += expandSizeRight;
+ parentView.setTouchDelegate(new TouchDelegate(rect, view));
+ }
+ });
+ }
+
+ private static final long TIP_DURATION = 2000L;
+ private static long sLastClickMillis;
+ private static int sClickCount;
+
+ public static void back2HomeFriendly(final CharSequence tip) {
+ back2HomeFriendly(tip, TIP_DURATION, Back2HomeFriendlyListener.DEFAULT);
+ }
+
+ public static void back2HomeFriendly(@NonNull final CharSequence tip,
+ final long duration,
+ @NonNull Back2HomeFriendlyListener listener) {
+ long nowMillis = SystemClock.elapsedRealtime();
+ if (Math.abs(nowMillis - sLastClickMillis) < duration) {
+ sClickCount++;
+ if (sClickCount == 2) {
+ UtilsBridge.startHomeActivity();
+ listener.dismiss();
+ sLastClickMillis = 0;
+ }
+ } else {
+ sClickCount = 1;
+ listener.show(tip, duration);
+ sLastClickMillis = nowMillis;
+ }
+ }
+
+ public interface Back2HomeFriendlyListener {
+ Back2HomeFriendlyListener DEFAULT = new Back2HomeFriendlyListener() {
+ @Override
+ public void show(CharSequence text, long duration) {
+ UtilsBridge.toastShowShort(text);
+ }
+
+ @Override
+ public void dismiss() {
+ UtilsBridge.toastCancel();
+ }
+ };
+
+ void show(CharSequence text, long duration);
+
+ void dismiss();
}
public static abstract class OnDebouncingClickListener implements View.OnClickListener {
@@ -367,16 +431,7 @@ public void run() {
};
private static boolean isValid(@NonNull final View view, final long duration) {
- long curTime = System.currentTimeMillis();
- Object tag = view.getTag(DEBOUNCING_TAG);
- if (!(tag instanceof Long)) {
- view.setTag(DEBOUNCING_TAG, curTime);
- return true;
- }
- long preTime = (Long) tag;
- if (curTime - preTime <= duration) return false;
- view.setTag(DEBOUNCING_TAG, curTime);
- return true;
+ return UtilsBridge.isValid(view, duration);
}
private long mDuration;
@@ -509,4 +564,58 @@ private static class LazyHolder {
private static final OnUtilsTouchListener INSTANCE = new OnUtilsTouchListener();
}
}
+
+ static class ClickDrawableWrapper extends ShadowUtils.DrawableWrapper {
+
+ private BitmapDrawable mBitmapDrawable = null;
+
+ // 低版本ColorDrawable.setColorFilter无效，这里直接用画笔画上
+ private Paint mColorPaint = null;
+
+ public ClickDrawableWrapper(Drawable drawable) {
+ super(drawable);
+ if (drawable instanceof ColorDrawable) {
+ mColorPaint = new Paint(Paint.ANTI_ALIAS_FLAG | Paint.DITHER_FLAG);
+ mColorPaint.setColor(((ColorDrawable) drawable).getColor());
+ }
+ }
+
+ @Override
+ public void setColorFilter(ColorFilter cf) {
+ super.setColorFilter(cf);
+ // 低版本 StateListDrawable.selectDrawable 会重置 ColorFilter
+ if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
+ if (mColorPaint != null) {
+ mColorPaint.setColorFilter(cf);
+ }
+ }
+ }
+
+ @Override
+ public void setAlpha(int alpha) {
+ super.setAlpha(alpha);
+ // 低版本 StateListDrawable.selectDrawable 会重置 Alpha
+ if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
+ if (mColorPaint != null) {
+ mColorPaint.setColor(((ColorDrawable) getWrappedDrawable()).getColor());
+ }
+ }
+ }
+
+ @Override
+ public void draw(Canvas canvas) {
+ if (mBitmapDrawable == null) {
+ Bitmap bitmap = Bitmap.createBitmap(getBounds().width(), getBounds().height(), Bitmap.Config.ARGB_8888);
+ Canvas myCanvas = new Canvas(bitmap);
+ if (mColorPaint != null) {
+ myCanvas.drawRect(getBounds(), mColorPaint);
+ } else {
+ super.draw(myCanvas);
+ }
+ mBitmapDrawable = new BitmapDrawable(Resources.getSystem(), bitmap);
+ mBitmapDrawable.setBounds(getBounds());
+ }
+ mBitmapDrawable.draw(canvas);
+ }
+ }
}
diff --git a/lib/utilcode/src/main/java/com/blankj/utilcode/util/ClipboardUtils.java b/lib/utilcode/src/main/java/com/blankj/utilcode/util/ClipboardUtils.java
new file mode 100644
index 0000000000..82127b4847
--- /dev/null
+++ b/lib/utilcode/src/main/java/com/blankj/utilcode/util/ClipboardUtils.java
@@ -0,0 +1,109 @@
+package com.blankj.utilcode.util;
+
+import android.content.ClipData;
+import android.content.ClipDescription;
+import android.content.ClipboardManager;
+import android.content.Context;
+
+/**
+ *
+ * author: Blankj
+ * blog : http://blankj.com
+ * time : 2016/09/25
+ * desc : utils about clipboard
+ *
+ */
+public final class ClipboardUtils {
+
+ private ClipboardUtils() {
+ throw new UnsupportedOperationException("u can't instantiate me...");
+ }
+
+ /**
+ * Copy the text to clipboard.
+ * The label equals name of package.
+ *
+ * @param text The text.
+ */
+ public static void copyText(final CharSequence text) {
+ ClipboardManager cm = (ClipboardManager) Utils.getApp().getSystemService(Context.CLIPBOARD_SERVICE);
+ //noinspection ConstantConditions
+ cm.setPrimaryClip(ClipData.newPlainText(Utils.getApp().getPackageName(), text));
+ }
+
+ /**
+ * Copy the text to clipboard.
+ *
+ * @param label The label.
+ * @param text The text.
+ */
+ public static void copyText(final CharSequence label, final CharSequence text) {
+ ClipboardManager cm = (ClipboardManager) Utils.getApp().getSystemService(Context.CLIPBOARD_SERVICE);
+ //noinspection ConstantConditions
+ cm.setPrimaryClip(ClipData.newPlainText(label, text));
+ }
+
+ /**
+ * Clear the clipboard.
+ */
+ public static void clear() {
+ ClipboardManager cm = (ClipboardManager) Utils.getApp().getSystemService(Context.CLIPBOARD_SERVICE);
+ //noinspection ConstantConditions
+ cm.setPrimaryClip(ClipData.newPlainText(null, ""));
+ }
+
+ /**
+ * Return the label for clipboard.
+ *
+ * @return the label for clipboard
+ */
+ public static CharSequence getLabel() {
+ ClipboardManager cm = (ClipboardManager) Utils.getApp().getSystemService(Context.CLIPBOARD_SERVICE);
+ //noinspection ConstantConditions
+ ClipDescription des = cm.getPrimaryClipDescription();
+ if (des == null) {
+ return "";
+ }
+ CharSequence label = des.getLabel();
+ if (label == null) {
+ return "";
+ }
+ return label;
+ }
+
+ /**
+ * Return the text for clipboard.
+ *
+ * @return the text for clipboard
+ */
+ public static CharSequence getText() {
+ ClipboardManager cm = (ClipboardManager) Utils.getApp().getSystemService(Context.CLIPBOARD_SERVICE);
+ //noinspection ConstantConditions
+ ClipData clip = cm.getPrimaryClip();
+ if (clip != null && clip.getItemCount() > 0) {
+ CharSequence text = clip.getItemAt(0).coerceToText(Utils.getApp());
+ if (text != null) {
+ return text;
+ }
+ }
+ return "";
+ }
+
+ /**
+ * Add the clipboard changed listener.
+ */
+ public static void addChangedListener(final ClipboardManager.OnPrimaryClipChangedListener listener) {
+ ClipboardManager cm = (ClipboardManager) Utils.getApp().getSystemService(Context.CLIPBOARD_SERVICE);
+ //noinspection ConstantConditions
+ cm.addPrimaryClipChangedListener(listener);
+ }
+
+ /**
+ * Remove the clipboard changed listener.
+ */
+ public static void removeChangedListener(final ClipboardManager.OnPrimaryClipChangedListener listener) {
+ ClipboardManager cm = (ClipboardManager) Utils.getApp().getSystemService(Context.CLIPBOARD_SERVICE);
+ //noinspection ConstantConditions
+ cm.removePrimaryClipChangedListener(listener);
+ }
+}
diff --git a/lib/utilcode/src/main/java/com/blankj/utilcode/util/CloneUtils.java b/lib/utilcode/src/main/java/com/blankj/utilcode/util/CloneUtils.java
index 93a4b720e4..108c73e6d2 100644
--- a/lib/utilcode/src/main/java/com/blankj/utilcode/util/CloneUtils.java
+++ b/lib/utilcode/src/main/java/com/blankj/utilcode/util/CloneUtils.java
@@ -1,7 +1,5 @@
package com.blankj.utilcode.util;
-import com.google.gson.Gson;
-
import java.lang.reflect.Type;
/**
@@ -28,8 +26,7 @@ private CloneUtils() {
*/
public static T deepClone(final T data, final Type type) {
try {
- Gson gson = new Gson();
- return gson.fromJson(gson.toJson(data), type);
+ return UtilsBridge.fromJson(UtilsBridge.toJson(data), type);
} catch (Exception e) {
e.printStackTrace();
return null;
diff --git a/lib/utilcode/src/main/java/com/blankj/utilcode/util/CollectionUtils.java b/lib/utilcode/src/main/java/com/blankj/utilcode/util/CollectionUtils.java
index 33a9504348..2fcdbd18ed 100644
--- a/lib/utilcode/src/main/java/com/blankj/utilcode/util/CollectionUtils.java
+++ b/lib/utilcode/src/main/java/com/blankj/utilcode/util/CollectionUtils.java
@@ -79,7 +79,7 @@ public static ArrayList newArrayListNotNull(E... array) {
}
@SafeVarargs
- public static List newLinkedList(E... array) {
+ public static LinkedList newLinkedList(E... array) {
LinkedList list = new LinkedList<>();
if (array == null || array.length == 0) return list;
for (E e : array) {
@@ -89,7 +89,7 @@ public static List newLinkedList(E... array) {
}
@SafeVarargs
- public static List newLinkedListNotNull(E... array) {
+ public static LinkedList newLinkedListNotNull(E... array) {
LinkedList list = new LinkedList<>();
if (array == null || array.length == 0) return list;
for (E e : array) {
@@ -373,7 +373,7 @@ public static boolean isSubCollection(final Collection a, final Collection b) {
*/
public static boolean isProperSubCollection(final Collection a, final Collection b) {
if (a == null || b == null) return false;
- return a.size() < b.size() && CollectionUtils.isSubCollection(a, b);
+ return a.size() < b.size() && isSubCollection(a, b);
}
/**
diff --git a/lib/utilcode/src/main/java/com/blankj/utilcode/util/ColorUtils.java b/lib/utilcode/src/main/java/com/blankj/utilcode/util/ColorUtils.java
index 93763b470b..c75e866124 100644
--- a/lib/utilcode/src/main/java/com/blankj/utilcode/util/ColorUtils.java
+++ b/lib/utilcode/src/main/java/com/blankj/utilcode/util/ColorUtils.java
@@ -1,12 +1,12 @@
package com.blankj.utilcode.util;
import android.graphics.Color;
-import android.support.annotation.ColorInt;
-import android.support.annotation.ColorRes;
-import android.support.annotation.FloatRange;
-import android.support.annotation.IntRange;
-import android.support.annotation.NonNull;
-import android.support.v4.content.ContextCompat;
+import androidx.annotation.ColorInt;
+import androidx.annotation.ColorRes;
+import androidx.annotation.FloatRange;
+import androidx.annotation.IntRange;
+import androidx.annotation.NonNull;
+import androidx.core.content.ContextCompat;
/**
*
@@ -204,4 +204,14 @@ public static int getRandomColor(final boolean supportAlpha) {
int high = supportAlpha ? (int) (Math.random() * 0x100) << 24 : 0xFF000000;
return high | (int) (Math.random() * 0x1000000);
}
+
+ /**
+ * Return whether the color is light.
+ *
+ * @param color The color.
+ * @return {@code true}: yes
@@ -30,12 +38,35 @@
*/
public final class ConvertUtils {
+ private static final int BUFFER_SIZE = 8192;
+ private static final char[] HEX_DIGITS_UPPER =
+ {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'};
+ private static final char[] HEX_DIGITS_LOWER =
+ {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'};
+
private ConvertUtils() {
throw new UnsupportedOperationException("u can't instantiate me...");
}
- private static final char[] hexDigits =
- {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'};
+ /**
+ * Int to hex string.
+ *
+ * @param num The int number.
+ * @return the hex string
+ */
+ public static String int2HexString(int num) {
+ return Integer.toHexString(num);
+ }
+
+ /**
+ * Hex string to int.
+ *
+ * @param hexString The hex string.
+ * @return the int
+ */
+ public static int hexString2Int(String hexString) {
+ return Integer.parseInt(hexString, 16);
+ }
/**
* Bytes to bits.
@@ -121,7 +152,20 @@ public static byte[] chars2Bytes(final char[] chars) {
* @return hex string
*/
public static String bytes2HexString(final byte[] bytes) {
+ return bytes2HexString(bytes, true);
+ }
+
+ /**
+ * Bytes to hex string.
+ * e.g. bytes2HexString(new byte[] { 0, (byte) 0xa8 }, true) returns "00A8"
+ *
+ * @param bytes The bytes.
+ * @param isUpperCase True to use upper case, false otherwise.
+ * @return hex string
+ */
+ public static String bytes2HexString(final byte[] bytes, boolean isUpperCase) {
if (bytes == null) return "";
+ char[] hexDigits = isUpperCase ? HEX_DIGITS_UPPER : HEX_DIGITS_LOWER;
int len = bytes.length;
if (len <= 0) return "";
char[] ret = new char[len << 1];
@@ -140,7 +184,7 @@ public static String bytes2HexString(final byte[] bytes) {
* @return the bytes
*/
public static byte[] hexString2Bytes(String hexString) {
- if (isSpace(hexString)) return null;
+ if (UtilsBridge.isSpace(hexString)) return new byte[0];
int len = hexString.length();
if (len % 2 != 0) {
hexString = "0" + hexString;
@@ -149,12 +193,12 @@ public static byte[] hexString2Bytes(String hexString) {
char[] hexBytes = hexString.toUpperCase().toCharArray();
byte[] ret = new byte[len >> 1];
for (int i = 0; i < len; i += 2) {
- ret[i >> 1] = (byte) (hex2Int(hexBytes[i]) << 4 | hex2Int(hexBytes[i + 1]));
+ ret[i >> 1] = (byte) (hex2Dec(hexBytes[i]) << 4 | hex2Dec(hexBytes[i + 1]));
}
return ret;
}
- private static int hex2Int(final char hexChar) {
+ private static int hex2Dec(final char hexChar) {
if (hexChar >= '0' && hexChar <= '9') {
return hexChar - '0';
} else if (hexChar >= 'A' && hexChar <= 'F') {
@@ -164,6 +208,204 @@ private static int hex2Int(final char hexChar) {
}
}
+ /**
+ * Bytes to string.
+ */
+ public static String bytes2String(final byte[] bytes) {
+ return bytes2String(bytes, "");
+ }
+
+ /**
+ * Bytes to string.
+ */
+ public static String bytes2String(final byte[] bytes, final String charsetName) {
+ if (bytes == null) return null;
+ try {
+ return new String(bytes, getSafeCharset(charsetName));
+ } catch (UnsupportedEncodingException e) {
+ e.printStackTrace();
+ return new String(bytes);
+ }
+ }
+
+ /**
+ * String to bytes.
+ */
+ public static byte[] string2Bytes(final String string) {
+ return string2Bytes(string, "");
+ }
+
+ /**
+ * String to bytes.
+ */
+ public static byte[] string2Bytes(final String string, final String charsetName) {
+ if (string == null) return null;
+ try {
+ return string.getBytes(getSafeCharset(charsetName));
+ } catch (UnsupportedEncodingException e) {
+ e.printStackTrace();
+ return string.getBytes();
+ }
+ }
+
+ /**
+ * Bytes to JSONObject.
+ */
+ public static JSONObject bytes2JSONObject(final byte[] bytes) {
+ if (bytes == null) return null;
+ try {
+ return new JSONObject(new String(bytes));
+ } catch (Exception e) {
+ e.printStackTrace();
+ return null;
+ }
+ }
+
+ /**
+ * JSONObject to bytes.
+ */
+ public static byte[] jsonObject2Bytes(final JSONObject jsonObject) {
+ if (jsonObject == null) return null;
+ return jsonObject.toString().getBytes();
+ }
+
+ /**
+ * Bytes to JSONArray.
+ */
+ public static JSONArray bytes2JSONArray(final byte[] bytes) {
+ if (bytes == null) return null;
+ try {
+ return new JSONArray(new String(bytes));
+ } catch (Exception e) {
+ e.printStackTrace();
+ return null;
+ }
+ }
+
+ /**
+ * JSONArray to bytes.
+ */
+ public static byte[] jsonArray2Bytes(final JSONArray jsonArray) {
+ if (jsonArray == null) return null;
+ return jsonArray.toString().getBytes();
+ }
+
+ /**
+ * Bytes to Parcelable
+ */
+ public static T bytes2Parcelable(final byte[] bytes,
+ final Parcelable.Creator creator) {
+ if (bytes == null) return null;
+ Parcel parcel = Parcel.obtain();
+ parcel.unmarshall(bytes, 0, bytes.length);
+ parcel.setDataPosition(0);
+ T result = creator.createFromParcel(parcel);
+ parcel.recycle();
+ return result;
+ }
+
+ /**
+ * Parcelable to bytes.
+ */
+ public static byte[] parcelable2Bytes(final Parcelable parcelable) {
+ if (parcelable == null) return null;
+ Parcel parcel = Parcel.obtain();
+ parcelable.writeToParcel(parcel, 0);
+ byte[] bytes = parcel.marshall();
+ parcel.recycle();
+ return bytes;
+ }
+
+ /**
+ * Bytes to Serializable.
+ */
+ public static Object bytes2Object(final byte[] bytes) {
+ if (bytes == null) return null;
+ ObjectInputStream ois = null;
+ try {
+ ois = new ObjectInputStream(new ByteArrayInputStream(bytes));
+ return ois.readObject();
+ } catch (Exception e) {
+ e.printStackTrace();
+ return null;
+ } finally {
+ try {
+ if (ois != null) {
+ ois.close();
+ }
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+ }
+
+ /**
+ * Serializable to bytes.
+ */
+ public static byte[] serializable2Bytes(final Serializable serializable) {
+ if (serializable == null) return null;
+ ByteArrayOutputStream baos;
+ ObjectOutputStream oos = null;
+ try {
+ oos = new ObjectOutputStream(baos = new ByteArrayOutputStream());
+ oos.writeObject(serializable);
+ return baos.toByteArray();
+ } catch (Exception e) {
+ e.printStackTrace();
+ return null;
+ } finally {
+ try {
+ if (oos != null) {
+ oos.close();
+ }
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+ }
+
+ /**
+ * Bytes to bitmap.
+ */
+ public static Bitmap bytes2Bitmap(final byte[] bytes) {
+ return UtilsBridge.bytes2Bitmap(bytes);
+ }
+
+ /**
+ * Bitmap to bytes.
+ */
+ public static byte[] bitmap2Bytes(final Bitmap bitmap) {
+ return UtilsBridge.bitmap2Bytes(bitmap);
+ }
+
+ /**
+ * Bitmap to bytes.
+ */
+ public static byte[] bitmap2Bytes(final Bitmap bitmap, final Bitmap.CompressFormat format, int quality) {
+ return UtilsBridge.bitmap2Bytes(bitmap, format, quality);
+ }
+
+ /**
+ * Bytes to drawable.
+ */
+ public static Drawable bytes2Drawable(final byte[] bytes) {
+ return UtilsBridge.bytes2Drawable(bytes);
+ }
+
+ /**
+ * Drawable to bytes.
+ */
+ public static byte[] drawable2Bytes(final Drawable drawable) {
+ return UtilsBridge.drawable2Bytes(drawable);
+ }
+
+ /**
+ * Drawable to bytes.
+ */
+ public static byte[] drawable2Bytes(final Drawable drawable, final Bitmap.CompressFormat format, int quality) {
+ return UtilsBridge.drawable2Bytes(drawable, format, quality);
+ }
+
/**
* Size of memory in unit to size of byte.
*
@@ -211,16 +453,32 @@ public static double byte2MemorySize(final long byteSize,
*/
@SuppressLint("DefaultLocale")
public static String byte2FitMemorySize(final long byteSize) {
+ return byte2FitMemorySize(byteSize, 3);
+ }
+
+ /**
+ * Size of byte to fit size of memory.
+ * to three decimal places
+ *
+ * @param byteSize Size of byte.
+ * @param precision The precision
+ * @return fit size of memory
+ */
+ @SuppressLint("DefaultLocale")
+ public static String byte2FitMemorySize(final long byteSize, int precision) {
+ if (precision < 0) {
+ throw new IllegalArgumentException("precision shouldn't be less than zero!");
+ }
if (byteSize < 0) {
- return "shouldn't be less than zero!";
+ throw new IllegalArgumentException("byteSize shouldn't be less than zero!");
} else if (byteSize < MemoryConstants.KB) {
- return String.format("%.3fB", (double) byteSize);
+ return String.format("%." + precision + "fB", (double) byteSize);
} else if (byteSize < MemoryConstants.MB) {
- return String.format("%.3fKB", (double) byteSize / MemoryConstants.KB);
+ return String.format("%." + precision + "fKB", (double) byteSize / MemoryConstants.KB);
} else if (byteSize < MemoryConstants.GB) {
- return String.format("%.3fMB", (double) byteSize / MemoryConstants.MB);
+ return String.format("%." + precision + "fMB", (double) byteSize / MemoryConstants.MB);
} else {
- return String.format("%.3fGB", (double) byteSize / MemoryConstants.GB);
+ return String.format("%." + precision + "fGB", (double) byteSize / MemoryConstants.GB);
}
}
@@ -276,36 +534,20 @@ public static long millis2TimeSpan(final long millis, @TimeConstants.Unit final
*
* @return fit time span
*/
- @SuppressLint("DefaultLocale")
public static String millis2FitTimeSpan(long millis, int precision) {
- if (millis <= 0 || precision <= 0) return null;
- StringBuilder sb = new StringBuilder();
- String[] units = {"天", "小时", "分钟", "秒", "毫秒"};
- int[] unitLen = {86400000, 3600000, 60000, 1000, 1};
- precision = Math.min(precision, 5);
- for (int i = 0; i < precision; i++) {
- if (millis >= unitLen[i]) {
- long mode = millis / unitLen[i];
- millis -= mode * unitLen[i];
- sb.append(mode).append(units[i]);
- }
- }
- return sb.toString();
+ return UtilsBridge.millis2FitTimeSpan(millis, precision);
}
/**
* Input stream to output stream.
- *
- * @param is The input stream.
- * @return output stream
*/
public static ByteArrayOutputStream input2OutputStream(final InputStream is) {
if (is == null) return null;
try {
ByteArrayOutputStream os = new ByteArrayOutputStream();
- byte[] b = new byte[MemoryConstants.KB];
+ byte[] b = new byte[BUFFER_SIZE];
int len;
- while ((len = is.read(b, 0, MemoryConstants.KB)) != -1) {
+ while ((len = is.read(b, 0, BUFFER_SIZE)) != -1) {
os.write(b, 0, len);
}
return os;
@@ -323,20 +565,14 @@ public static ByteArrayOutputStream input2OutputStream(final InputStream is) {
/**
* Output stream to input stream.
- *
- * @param out The output stream.
- * @return input stream
*/
- public ByteArrayInputStream output2InputStream(final OutputStream out) {
+ public static ByteArrayInputStream output2InputStream(final OutputStream out) {
if (out == null) return null;
return new ByteArrayInputStream(((ByteArrayOutputStream) out).toByteArray());
}
/**
* Input stream to bytes.
- *
- * @param is The input stream.
- * @return bytes
*/
public static byte[] inputStream2Bytes(final InputStream is) {
if (is == null) return null;
@@ -345,9 +581,6 @@ public static byte[] inputStream2Bytes(final InputStream is) {
/**
* Bytes to input stream.
- *
- * @param bytes The bytes.
- * @return input stream
*/
public static InputStream bytes2InputStream(final byte[] bytes) {
if (bytes == null || bytes.length <= 0) return null;
@@ -356,9 +589,6 @@ public static InputStream bytes2InputStream(final byte[] bytes) {
/**
* Output stream to bytes.
- *
- * @param out The output stream.
- * @return bytes
*/
public static byte[] outputStream2Bytes(final OutputStream out) {
if (out == null) return null;
@@ -367,9 +597,6 @@ public static byte[] outputStream2Bytes(final OutputStream out) {
/**
* Bytes to output stream.
- *
- * @param bytes The bytes.
- * @return output stream
*/
public static OutputStream bytes2OutputStream(final byte[] bytes) {
if (bytes == null || bytes.length <= 0) return null;
@@ -394,17 +621,13 @@ public static OutputStream bytes2OutputStream(final byte[] bytes) {
/**
* Input stream to string.
- *
- * @param is The input stream.
- * @param charsetName The name of charset.
- * @return string
*/
public static String inputStream2String(final InputStream is, final String charsetName) {
- if (is == null || isSpace(charsetName)) return "";
+ if (is == null) return "";
try {
ByteArrayOutputStream baos = input2OutputStream(is);
if (baos == null) return "";
- return baos.toString(charsetName);
+ return baos.toString(getSafeCharset(charsetName));
} catch (UnsupportedEncodingException e) {
e.printStackTrace();
return "";
@@ -413,15 +636,11 @@ public static String inputStream2String(final InputStream is, final String chars
/**
* String to input stream.
- *
- * @param string The string.
- * @param charsetName The name of charset.
- * @return input stream
*/
public static InputStream string2InputStream(final String string, final String charsetName) {
- if (string == null || isSpace(charsetName)) return null;
+ if (string == null) return null;
try {
- return new ByteArrayInputStream(string.getBytes(charsetName));
+ return new ByteArrayInputStream(string.getBytes(getSafeCharset(charsetName)));
} catch (UnsupportedEncodingException e) {
e.printStackTrace();
return null;
@@ -430,15 +649,11 @@ public static InputStream string2InputStream(final String string, final String c
/**
* Output stream to string.
- *
- * @param out The output stream.
- * @param charsetName The name of charset.
- * @return string
*/
public static String outputStream2String(final OutputStream out, final String charsetName) {
- if (out == null || isSpace(charsetName)) return "";
+ if (out == null) return "";
try {
- return new String(outputStream2Bytes(out), charsetName);
+ return new String(outputStream2Bytes(out), getSafeCharset(charsetName));
} catch (UnsupportedEncodingException e) {
e.printStackTrace();
return "";
@@ -447,193 +662,100 @@ public static String outputStream2String(final OutputStream out, final String ch
/**
* String to output stream.
- *
- * @param string The string.
- * @param charsetName The name of charset.
- * @return output stream
*/
public static OutputStream string2OutputStream(final String string, final String charsetName) {
- if (string == null || isSpace(charsetName)) return null;
+ if (string == null) return null;
try {
- return bytes2OutputStream(string.getBytes(charsetName));
+ return bytes2OutputStream(string.getBytes(getSafeCharset(charsetName)));
} catch (UnsupportedEncodingException e) {
e.printStackTrace();
return null;
}
}
- /**
- * Bitmap to bytes.
- *
- * @param bitmap The bitmap.
- * @param format The format of bitmap.
- * @return bytes
- */
- public static byte[] bitmap2Bytes(final Bitmap bitmap, final Bitmap.CompressFormat format) {
- if (bitmap == null) return null;
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- bitmap.compress(format, 100, baos);
- return baos.toByteArray();
+ public static List inputStream2Lines(final InputStream is) {
+ return inputStream2Lines(is, "");
}
- /**
- * Bytes to bitmap.
- *
- * @param bytes The bytes.
- * @return bitmap
- */
- public static Bitmap bytes2Bitmap(final byte[] bytes) {
- return (bytes == null || bytes.length == 0)
- ? null
- : BitmapFactory.decodeByteArray(bytes, 0, bytes.length);
+ public static List inputStream2Lines(final InputStream is,
+ final String charsetName) {
+ BufferedReader reader = null;
+ try {
+ List list = new ArrayList<>();
+ reader = new BufferedReader(new InputStreamReader(is, getSafeCharset(charsetName)));
+ String line;
+ while ((line = reader.readLine()) != null) {
+ list.add(line);
+ }
+ return list;
+ } catch (IOException e) {
+ e.printStackTrace();
+ return null;
+ } finally {
+ try {
+ if (reader != null) {
+ reader.close();
+ }
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
}
/**
* Drawable to bitmap.
- *
- * @param drawable The drawable.
- * @return bitmap
*/
public static Bitmap drawable2Bitmap(final Drawable drawable) {
- if (drawable instanceof BitmapDrawable) {
- BitmapDrawable bitmapDrawable = (BitmapDrawable) drawable;
- if (bitmapDrawable.getBitmap() != null) {
- return bitmapDrawable.getBitmap();
- }
- }
- Bitmap bitmap;
- if (drawable.getIntrinsicWidth() <= 0 || drawable.getIntrinsicHeight() <= 0) {
- bitmap = Bitmap.createBitmap(1, 1,
- drawable.getOpacity() != PixelFormat.OPAQUE
- ? Bitmap.Config.ARGB_8888
- : Bitmap.Config.RGB_565);
- } else {
- bitmap = Bitmap.createBitmap(drawable.getIntrinsicWidth(),
- drawable.getIntrinsicHeight(),
- drawable.getOpacity() != PixelFormat.OPAQUE
- ? Bitmap.Config.ARGB_8888
- : Bitmap.Config.RGB_565);
- }
- Canvas canvas = new Canvas(bitmap);
- drawable.setBounds(0, 0, canvas.getWidth(), canvas.getHeight());
- drawable.draw(canvas);
- return bitmap;
+ return UtilsBridge.drawable2Bitmap(drawable);
}
/**
* Bitmap to drawable.
- *
- * @param bitmap The bitmap.
- * @return drawable
*/
public static Drawable bitmap2Drawable(final Bitmap bitmap) {
- return bitmap == null ? null : new BitmapDrawable(Utils.getApp().getResources(), bitmap);
- }
-
- /**
- * Drawable to bytes.
- *
- * @param drawable The drawable.
- * @param format The format of bitmap.
- * @return bytes
- */
- public static byte[] drawable2Bytes(final Drawable drawable,
- final Bitmap.CompressFormat format) {
- return drawable == null ? null : bitmap2Bytes(drawable2Bitmap(drawable), format);
- }
-
- /**
- * Bytes to drawable.
- *
- * @param bytes The bytes.
- * @return drawable
- */
- public static Drawable bytes2Drawable(final byte[] bytes) {
- return bytes == null ? null : bitmap2Drawable(bytes2Bitmap(bytes));
+ return UtilsBridge.bitmap2Drawable(bitmap);
}
/**
* View to bitmap.
- *
- * @param view The view.
- * @return bitmap
*/
public static Bitmap view2Bitmap(final View view) {
- if (view == null) return null;
- boolean drawingCacheEnabled = view.isDrawingCacheEnabled();
- boolean willNotCacheDrawing = view.willNotCacheDrawing();
- view.setDrawingCacheEnabled(true);
- view.setWillNotCacheDrawing(false);
- final Bitmap drawingCache = view.getDrawingCache();
- Bitmap bitmap;
- if (null == drawingCache) {
- view.layout(0, 0, view.getWidth(), view.getHeight());
- view.buildDrawingCache();
- bitmap = Bitmap.createBitmap(view.getDrawingCache());
- } else {
- bitmap = Bitmap.createBitmap(drawingCache);
- }
- view.destroyDrawingCache();
- view.setWillNotCacheDrawing(willNotCacheDrawing);
- view.setDrawingCacheEnabled(drawingCacheEnabled);
- return bitmap;
+ return UtilsBridge.view2Bitmap(view);
}
/**
* Value of dp to value of px.
- *
- * @param dpValue The value of dp.
- * @return value of px
*/
public static int dp2px(final float dpValue) {
- final float scale = Resources.getSystem().getDisplayMetrics().density;
- return (int) (dpValue * scale + 0.5f);
+ return UtilsBridge.dp2px(dpValue);
}
/**
* Value of px to value of dp.
- *
- * @param pxValue The value of px.
- * @return value of dp
*/
public static int px2dp(final float pxValue) {
- final float scale = Resources.getSystem().getDisplayMetrics().density;
- return (int) (pxValue / scale + 0.5f);
+ return UtilsBridge.px2dp(pxValue);
}
/**
* Value of sp to value of px.
- *
- * @param spValue The value of sp.
- * @return value of px
*/
public static int sp2px(final float spValue) {
- final float fontScale = Resources.getSystem().getDisplayMetrics().scaledDensity;
- return (int) (spValue * fontScale + 0.5f);
+ return UtilsBridge.sp2px(spValue);
}
/**
* Value of px to value of sp.
- *
- * @param pxValue The value of px.
- * @return value of sp
*/
public static int px2sp(final float pxValue) {
- final float fontScale = Resources.getSystem().getDisplayMetrics().scaledDensity;
- return (int) (pxValue / fontScale + 0.5f);
+ return UtilsBridge.px2sp(pxValue);
}
- ///////////////////////////////////////////////////////////////////////////
- // other utils methods
- ///////////////////////////////////////////////////////////////////////////
-
- private static boolean isSpace(final String s) {
- if (s == null) return true;
- for (int i = 0, len = s.length(); i < len; ++i) {
- if (!Character.isWhitespace(s.charAt(i))) {
- return false;
- }
+ private static String getSafeCharset(String charsetName) {
+ String cn = charsetName;
+ if (UtilsBridge.isSpace(charsetName) || !Charset.isSupported(charsetName)) {
+ cn = "UTF-8";
}
- return true;
+ return cn;
}
}
diff --git a/lib/utilcode/src/main/java/com/blankj/utilcode/util/CrashUtils.java b/lib/utilcode/src/main/java/com/blankj/utilcode/util/CrashUtils.java
index 66e44e982e..598f7fdbac 100644
--- a/lib/utilcode/src/main/java/com/blankj/utilcode/util/CrashUtils.java
+++ b/lib/utilcode/src/main/java/com/blankj/utilcode/util/CrashUtils.java
@@ -1,30 +1,11 @@
package com.blankj.utilcode.util;
-import android.annotation.SuppressLint;
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager;
-import android.os.Build;
-import android.os.Environment;
-import android.support.annotation.NonNull;
-import android.support.annotation.RequiresPermission;
-import android.util.Log;
-
-import java.io.BufferedWriter;
+import androidx.annotation.NonNull;
import java.io.File;
-import java.io.FileOutputStream;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.OutputStreamWriter;
import java.lang.Thread.UncaughtExceptionHandler;
-import java.text.Format;
import java.text.SimpleDateFormat;
import java.util.Date;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-
-import static android.Manifest.permission.WRITE_EXTERNAL_STORAGE;
+import java.util.Map;
/**
*
@@ -36,78 +17,10 @@
*/
public final class CrashUtils {
- private static String defaultDir;
- private static String dir;
- private static String versionName;
- private static int versionCode;
-
private static final String FILE_SEP = System.getProperty("file.separator");
- @SuppressLint("SimpleDateFormat")
- private static final Format FORMAT = new SimpleDateFormat("MM-dd_HH-mm-ss");
-
- private static final UncaughtExceptionHandler DEFAULT_UNCAUGHT_EXCEPTION_HANDLER;
- private static final UncaughtExceptionHandler UNCAUGHT_EXCEPTION_HANDLER;
-
- private static OnCrashListener sOnCrashListener;
-
- static {
- try {
- PackageInfo pi = Utils.getApp()
- .getPackageManager()
- .getPackageInfo(Utils.getApp().getPackageName(), 0);
- if (pi != null) {
- versionName = pi.versionName;
- versionCode = pi.versionCode;
- }
- } catch (PackageManager.NameNotFoundException e) {
- e.printStackTrace();
- }
- DEFAULT_UNCAUGHT_EXCEPTION_HANDLER = Thread.getDefaultUncaughtExceptionHandler();
-
- UNCAUGHT_EXCEPTION_HANDLER = new UncaughtExceptionHandler() {
- @Override
- public void uncaughtException(final Thread t, final Throwable e) {
- if (e == null) {
- if (DEFAULT_UNCAUGHT_EXCEPTION_HANDLER != null) {
- DEFAULT_UNCAUGHT_EXCEPTION_HANDLER.uncaughtException(t, null);
- } else {
- android.os.Process.killProcess(android.os.Process.myPid());
- System.exit(1);
- }
- return;
- }
-
- final String time = FORMAT.format(new Date(System.currentTimeMillis()));
- final StringBuilder sb = new StringBuilder();
- final String head = "************* Log Head ****************" +
- "\nTime Of Crash : " + time +
- "\nDevice Manufacturer: " + Build.MANUFACTURER +
- "\nDevice Model : " + Build.MODEL +
- "\nAndroid Version : " + Build.VERSION.RELEASE +
- "\nAndroid SDK : " + Build.VERSION.SDK_INT +
- "\nApp VersionName : " + versionName +
- "\nApp VersionCode : " + versionCode +
- "\n************* Log Head ****************\n\n";
- sb.append(head)
- .append(ThrowableUtils.getFullStackTrace(e));
- final String crashInfo = sb.toString();
- final String fullPath = (dir == null ? defaultDir : dir) + time + ".txt";
- if (createOrExistsFile(fullPath)) {
- input2File(crashInfo, fullPath);
- } else {
- Log.e("CrashUtils", "create " + fullPath + " failed!");
- }
-
- if (sOnCrashListener != null) {
- sOnCrashListener.onCrash(crashInfo, e);
- }
- if (DEFAULT_UNCAUGHT_EXCEPTION_HANDLER != null) {
- DEFAULT_UNCAUGHT_EXCEPTION_HANDLER.uncaughtException(t, e);
- }
- }
- };
- }
+ private static final UncaughtExceptionHandler DEFAULT_UNCAUGHT_EXCEPTION_HANDLER =
+ Thread.getDefaultUncaughtExceptionHandler();
private CrashUtils() {
throw new UnsupportedOperationException("u can't instantiate me...");
@@ -115,80 +28,88 @@ private CrashUtils() {
/**
* Initialization.
- * Must hold {@code
*/
- @SuppressLint("MissingPermission")
public static void init() {
init("");
}
/**
* Initialization
- * Must hold {@code
*
* @param crashDir The directory of saving crash information.
*/
- @RequiresPermission(WRITE_EXTERNAL_STORAGE)
public static void init(@NonNull final File crashDir) {
init(crashDir.getAbsolutePath(), null);
}
/**
* Initialization
- * Must hold {@code
*
* @param crashDirPath The directory's path of saving crash information.
*/
- @RequiresPermission(WRITE_EXTERNAL_STORAGE)
public static void init(final String crashDirPath) {
init(crashDirPath, null);
}
/**
* Initialization
- * Must hold {@code
*
* @param onCrashListener The crash listener.
*/
- @SuppressLint("MissingPermission")
public static void init(final OnCrashListener onCrashListener) {
init("", onCrashListener);
}
/**
* Initialization
- * Must hold {@code
*
- * @param crashDir The directory of saving crash information.
+ * @param crashDir The directory of saving crash information.
* @param onCrashListener The crash listener.
*/
- @RequiresPermission(WRITE_EXTERNAL_STORAGE)
public static void init(@NonNull final File crashDir, final OnCrashListener onCrashListener) {
init(crashDir.getAbsolutePath(), onCrashListener);
}
/**
* Initialization
- * Must hold {@code
*
- * @param crashDirPath The directory's path of saving crash information.
+ * @param crashDirPath The directory's path of saving crash information.
* @param onCrashListener The crash listener.
*/
- @RequiresPermission(WRITE_EXTERNAL_STORAGE)
public static void init(final String crashDirPath, final OnCrashListener onCrashListener) {
- if (isSpace(crashDirPath)) {
- dir = null;
+ String dirPath;
+ if (UtilsBridge.isSpace(crashDirPath)) {
+ if (UtilsBridge.isSDCardEnableByEnvironment()
+ && Utils.getApp().getExternalFilesDir(null) != null) {
+ dirPath = Utils.getApp().getExternalFilesDir(null) + FILE_SEP + "crash" + FILE_SEP;
+ } else {
+ dirPath = Utils.getApp().getFilesDir() + FILE_SEP + "crash" + FILE_SEP;
+ }
} else {
- dir = crashDirPath.endsWith(FILE_SEP) ? crashDirPath : crashDirPath + FILE_SEP;
+ dirPath = crashDirPath.endsWith(FILE_SEP) ? crashDirPath : crashDirPath + FILE_SEP;
}
- if (Environment.MEDIA_MOUNTED.equals(Environment.getExternalStorageState())
- && Utils.getApp().getExternalCacheDir() != null)
- defaultDir = Utils.getApp().getExternalCacheDir() + FILE_SEP + "crash" + FILE_SEP;
- else {
- defaultDir = Utils.getApp().getCacheDir() + FILE_SEP + "crash" + FILE_SEP;
- }
- sOnCrashListener = onCrashListener;
- Thread.setDefaultUncaughtExceptionHandler(UNCAUGHT_EXCEPTION_HANDLER);
+ Thread.setDefaultUncaughtExceptionHandler(
+ getUncaughtExceptionHandler(dirPath, onCrashListener));
+ }
+
+ private static UncaughtExceptionHandler getUncaughtExceptionHandler(final String dirPath,
+ final OnCrashListener onCrashListener) {
+ return new UncaughtExceptionHandler() {
+ @Override
+ public void uncaughtException(@NonNull final Thread t, @NonNull final Throwable e) {
+ final String time = new SimpleDateFormat("yyyy_MM_dd-HH_mm_ss").format(new Date());
+ CrashInfo info = new CrashInfo(time, e);
+ final String crashFile = dirPath + time + ".txt";
+ UtilsBridge.writeFileFromString(crashFile, info.toString(), true);
+
+ if (DEFAULT_UNCAUGHT_EXCEPTION_HANDLER != null) {
+ DEFAULT_UNCAUGHT_EXCEPTION_HANDLER.uncaughtException(t, e);
+ }
+ if (onCrashListener != null) {
+ onCrashListener.onCrash(info);
+ }
+ }
+ };
}
///////////////////////////////////////////////////////////////////////////
@@ -196,69 +117,34 @@ public static void init(final String crashDirPath, final OnCrashListener onCrash
///////////////////////////////////////////////////////////////////////////
public interface OnCrashListener {
- void onCrash(String crashInfo, Throwable e);
+ void onCrash(CrashInfo crashInfo);
}
- ///////////////////////////////////////////////////////////////////////////
- // other utils methods
- ///////////////////////////////////////////////////////////////////////////
+ public static final class CrashInfo {
+ private UtilsBridge.FileHead mFileHeadProvider;
+ private Throwable mThrowable;
- private static void input2File(final String input, final String filePath) {
- Future submit = Executors.newSingleThreadExecutor().submit(new Callable() {
- @Override
- public Boolean call() {
- BufferedWriter bw = null;
- try {
- bw = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(filePath, true), "UTF-8"));
- bw.write(input);
- return true;
- } catch (IOException e) {
- e.printStackTrace();
- return false;
- } finally {
- try {
- if (bw != null) {
- bw.close();
- }
- } catch (IOException e) {
- e.printStackTrace();
- }
- }
- }
- });
- try {
- if (submit.get()) return;
- } catch (InterruptedException e) {
- e.printStackTrace();
- } catch (ExecutionException e) {
- e.printStackTrace();
+ private CrashInfo(String time, Throwable throwable) {
+ mThrowable = throwable;
+ mFileHeadProvider = new UtilsBridge.FileHead("Crash");
+ mFileHeadProvider.addFirst("Time Of Crash", time);
}
- Log.e("CrashUtils", "write crash info to " + filePath + " failed!");
- }
- private static boolean createOrExistsFile(final String filePath) {
- File file = new File(filePath);
- if (file.exists()) return file.isFile();
- if (!createOrExistsDir(file.getParentFile())) return false;
- try {
- return file.createNewFile();
- } catch (IOException e) {
- e.printStackTrace();
- return false;
+ public final void addExtraHead(Map extraHead) {
+ mFileHeadProvider.append(extraHead);
}
- }
- private static boolean createOrExistsDir(final File file) {
- return file != null && (file.exists() ? file.isDirectory() : file.mkdirs());
- }
+ public final void addExtraHead(String key, String value) {
+ mFileHeadProvider.append(key, value);
+ }
- private static boolean isSpace(final String s) {
- if (s == null) return true;
- for (int i = 0, len = s.length(); i < len; ++i) {
- if (!Character.isWhitespace(s.charAt(i))) {
- return false;
- }
+ public final Throwable getThrowable() {
+ return mThrowable;
+ }
+
+ @Override
+ public String toString() {
+ return mFileHeadProvider.toString() + UtilsBridge.getFullStackTrace(mThrowable);
}
- return true;
}
}
diff --git a/lib/utilcode/src/main/java/com/blankj/utilcode/util/DebouncingUtils.java b/lib/utilcode/src/main/java/com/blankj/utilcode/util/DebouncingUtils.java
new file mode 100644
index 0000000000..afc49b9c6f
--- /dev/null
+++ b/lib/utilcode/src/main/java/com/blankj/utilcode/util/DebouncingUtils.java
@@ -0,0 +1,86 @@
+package com.blankj.utilcode.util;
+
+import android.os.SystemClock;
+import android.text.TextUtils;
+import android.view.View;
+
+import java.util.Iterator;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+import androidx.annotation.NonNull;
+
+/**
+ *
+ * author: Blankj
+ * blog : http://blankj.com
+ * time : 2020/09/01
+ * desc : utils about debouncing
+ *
+ */
+public class DebouncingUtils {
+
+ private static final int CACHE_SIZE = 64;
+ private static final Map KEY_MILLIS_MAP = new ConcurrentHashMap<>(CACHE_SIZE);
+ private static final long DEBOUNCING_DEFAULT_VALUE = 1000;
+
+ private DebouncingUtils() {
+ throw new UnsupportedOperationException("u can't instantiate me...");
+ }
+
+ /**
+ * Return whether the view is not in a jitter state.
+ *
+ * @param view The view.
+ * @return {@code true}: yes> it = KEY_MILLIS_MAP.entrySet().iterator(); it.hasNext(); ) {
+ Map.Entry entry = it.next();
+ Long validTime = entry.getValue();
+ if (curTime >= validTime) {
+ it.remove();
+ }
+ }
+ }
+}
diff --git a/lib/utilcode/src/main/java/com/blankj/utilcode/util/DeviceUtils.java b/lib/utilcode/src/main/java/com/blankj/utilcode/util/DeviceUtils.java
index 44235d4d60..9cd01108e1 100644
--- a/lib/utilcode/src/main/java/com/blankj/utilcode/util/DeviceUtils.java
+++ b/lib/utilcode/src/main/java/com/blankj/utilcode/util/DeviceUtils.java
@@ -4,23 +4,28 @@
import android.content.Context;
import android.content.Intent;
import android.content.res.Configuration;
+import android.content.res.Resources;
import android.net.Uri;
import android.net.wifi.WifiInfo;
import android.net.wifi.WifiManager;
import android.os.Build;
import android.provider.Settings;
-import android.support.annotation.RequiresApi;
-import android.support.annotation.RequiresPermission;
import android.telephony.TelephonyManager;
import android.text.TextUtils;
+import java.io.BufferedReader;
import java.io.File;
+import java.io.IOException;
+import java.io.InputStreamReader;
import java.net.InetAddress;
import java.net.NetworkInterface;
import java.net.SocketException;
import java.util.Enumeration;
import java.util.UUID;
+import androidx.annotation.RequiresApi;
+import androidx.annotation.RequiresPermission;
+
import static android.Manifest.permission.ACCESS_WIFI_STATE;
import static android.Manifest.permission.CHANGE_WIFI_STATE;
import static android.Manifest.permission.INTERNET;
@@ -112,10 +117,10 @@ public static String getAndroidID() {
*
* @return the MAC address
*/
- @RequiresPermission(allOf = {ACCESS_WIFI_STATE, INTERNET, CHANGE_WIFI_STATE})
+ @RequiresPermission(allOf = {ACCESS_WIFI_STATE, CHANGE_WIFI_STATE})
public static String getMacAddress() {
String macAddress = getMacAddress((String[]) null);
- if (!macAddress.equals("") || getWifiEnabled()) return macAddress;
+ if (!TextUtils.isEmpty(macAddress) || getWifiEnabled()) return macAddress;
setWifiEnabled(true);
setWifiEnabled(false);
return getMacAddress((String[]) null);
@@ -150,7 +155,7 @@ private static void setWifiEnabled(final boolean enabled) {
*
* @return the MAC address
*/
- @RequiresPermission(allOf = {ACCESS_WIFI_STATE, INTERNET})
+ @RequiresPermission(allOf = {ACCESS_WIFI_STATE})
public static String getMacAddress(final String... excepts) {
String macAddress = getMacAddressByNetworkInterface();
if (isAddressNotInExcepts(macAddress, excepts)) {
@@ -172,25 +177,37 @@ public static String getMacAddress(final String... excepts) {
}
private static boolean isAddressNotInExcepts(final String address, final String... excepts) {
+ if (TextUtils.isEmpty(address)) {
+ return false;
+ }
+ if ("02:00:00:00:00:00".equals(address)) {
+ return false;
+ }
if (excepts == null || excepts.length == 0) {
- return !"02:00:00:00:00:00".equals(address);
+ return true;
}
for (String filter : excepts) {
- if (address.equals(filter)) {
+ if (filter != null && filter.equals(address)) {
return false;
}
}
return true;
}
- @SuppressLint({"MissingPermission", "HardwareIds"})
+ @RequiresPermission(ACCESS_WIFI_STATE)
private static String getMacAddressByWifiInfo() {
try {
final WifiManager wifi = (WifiManager) Utils.getApp()
.getApplicationContext().getSystemService(WIFI_SERVICE);
if (wifi != null) {
final WifiInfo info = wifi.getConnectionInfo();
- if (info != null) return info.getMacAddress();
+ if (info != null) {
+ @SuppressLint("HardwareIds")
+ String macAddress = info.getMacAddress();
+ if (!TextUtils.isEmpty(macAddress)) {
+ return macAddress;
+ }
+ }
}
} catch (Exception e) {
e.printStackTrace();
@@ -264,11 +281,11 @@ private static InetAddress getInetAddress() {
}
private static String getMacAddressByFile() {
- ShellUtils.CommandResult result = ShellUtils.execCmd("getprop wifi.interface", false);
+ ShellUtils.CommandResult result = UtilsBridge.execCmd("getprop wifi.interface", false);
if (result.result == 0) {
String name = result.successMsg;
if (name != null) {
- result = ShellUtils.execCmd("cat /sys/class/net/" + name + "/address", false);
+ result = UtilsBridge.execCmd("cat /sys/class/net/" + name + "/address", false);
if (result.result == 0) {
String address = result.successMsg;
if (address != null && address.length() > 0) {
@@ -329,7 +346,7 @@ public static String[] getABIs() {
* @return {@code true}: yes{1}{UUID(macAddress)}
+ * {2}{UUID(androidId )}
+ * {9}{UUID(random )}
+ *
+ * @param useCache True to use cache, false otherwise.
+ * @return the unique device id
+ */
+ public static String getUniqueDeviceId(boolean useCache) {
+ return getUniqueDeviceId("", useCache);
+ }
+
+ /**
+ * Return the unique device id.
+ * android 10 deprecated {prefix}{1}{UUID(macAddress)}
+ * {prefix}{2}{UUID(androidId )}
+ * {prefix}{9}{UUID(random )}
+ *
+ * @param prefix The prefix of the unique device id.
+ * @param useCache True to use cache, false otherwise.
+ * @return the unique device id
+ */
+ public static String getUniqueDeviceId(String prefix, boolean useCache) {
+ if (!useCache) {
+ return getUniqueDeviceIdReal(prefix);
+ }
if (udid == null) {
synchronized (DeviceUtils.class) {
if (udid == null) {
- final String id = Utils.getSpUtils4Utils().getString(KEY_UDID, null);
+ final String id = UtilsBridge.getSpUtils4Utils().getString(KEY_UDID, null);
if (id != null) {
udid = id;
return udid;
}
- try {
- final String androidId = getAndroidID();
- if (!TextUtils.isEmpty(androidId)) {
- return saveUdid(prefix + 2, androidId);
- }
-
- } catch (Exception ignore) {/**/}
- return saveUdid(prefix + 9, "");
+ return getUniqueDeviceIdReal(prefix);
}
}
}
return udid;
}
- @SuppressLint({"MissingPermission", "HardwareIds"})
+ private static String getUniqueDeviceIdReal(String prefix) {
+ try {
+ final String androidId = getAndroidID();
+ if (!TextUtils.isEmpty(androidId)) {
+ return saveUdid(prefix + 2, androidId);
+ }
+
+ } catch (Exception ignore) {/**/}
+ return saveUdid(prefix + 9, "");
+ }
+
+ @RequiresPermission(allOf = {ACCESS_WIFI_STATE, INTERNET, CHANGE_WIFI_STATE})
public static boolean isSameDevice(final String uniqueDeviceId) {
// {prefix}{type}{32id}
if (TextUtils.isEmpty(uniqueDeviceId) && uniqueDeviceId.length() < 33) return false;
if (uniqueDeviceId.equals(udid)) return true;
- final String cachedId = Utils.getSpUtils4Utils().getString(KEY_UDID, null);
+ final String cachedId = UtilsBridge.getSpUtils4Utils().getString(KEY_UDID, null);
if (uniqueDeviceId.equals(cachedId)) return true;
int st = uniqueDeviceId.length() - 33;
String type = uniqueDeviceId.substring(st, st + 1);
- if (type.startsWith("2")) {
+ if (type.startsWith("1")) {
+ String macAddress = getMacAddress();
+ if (macAddress.equals("")) {
+ return false;
+ }
+ return uniqueDeviceId.substring(st + 1).equals(getUdid("", macAddress));
+ } else if (type.startsWith("2")) {
final String androidId = getAndroidID();
if (TextUtils.isEmpty(androidId)) {
return false;
@@ -446,7 +551,7 @@ public static boolean isSameDevice(final String uniqueDeviceId) {
private static String saveUdid(String prefix, String id) {
udid = getUdid(prefix, id);
- SPUtils.getInstance().put(KEY_UDID, udid);
+ UtilsBridge.getSpUtils4Utils().put(KEY_UDID, udid);
return udid;
}
diff --git a/lib/utilcode/src/main/java/com/blankj/utilcode/util/EncodeUtils.java b/lib/utilcode/src/main/java/com/blankj/utilcode/util/EncodeUtils.java
index 6a491c7c92..a961be77a4 100644
--- a/lib/utilcode/src/main/java/com/blankj/utilcode/util/EncodeUtils.java
+++ b/lib/utilcode/src/main/java/com/blankj/utilcode/util/EncodeUtils.java
@@ -175,7 +175,6 @@ public static String htmlEncode(final CharSequence input) {
* @param input The input.
* @return the string of decode html-encode string
*/
- @SuppressWarnings("deprecation")
public static CharSequence htmlDecode(final String input) {
if (input == null || input.length() == 0) return "";
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
@@ -191,13 +190,13 @@ public static CharSequence htmlDecode(final String input) {
* @param input The input.
* @return binary string
*/
- public static String binEncode(final String input) {
- StringBuilder stringBuilder = new StringBuilder();
+ public static String binaryEncode(final String input) {
+ if (input == null || input.length() == 0) return "";
+ StringBuilder sb = new StringBuilder();
for (char i : input.toCharArray()) {
- stringBuilder.append(Integer.toBinaryString(i));
- stringBuilder.append(' ');
+ sb.append(Integer.toBinaryString(i)).append(" ");
}
- return stringBuilder.toString();
+ return sb.deleteCharAt(sb.length() - 1).toString();
}
/**
@@ -206,11 +205,12 @@ public static String binEncode(final String input) {
* @param input binary string
* @return UTF-8 String
*/
- public static String binDecode(final String input) {
- String[] splitted = input.split(" ");
+ public static String binaryDecode(final String input) {
+ if (input == null || input.length() == 0) return "";
+ String[] splits = input.split(" ");
StringBuilder sb = new StringBuilder();
- for (String i : splitted) {
- sb.append(((char) Integer.parseInt(i.replace(" ", ""), 2)));
+ for (String split : splits) {
+ sb.append(((char) Integer.parseInt(split, 2)));
}
return sb.toString();
}
diff --git a/lib/utilcode/src/main/java/com/blankj/utilcode/util/EncryptUtils.java b/lib/utilcode/src/main/java/com/blankj/utilcode/util/EncryptUtils.java
index 691ff1f6f0..933f8e4953 100644
--- a/lib/utilcode/src/main/java/com/blankj/utilcode/util/EncryptUtils.java
+++ b/lib/utilcode/src/main/java/com/blankj/utilcode/util/EncryptUtils.java
@@ -1,6 +1,6 @@
package com.blankj.utilcode.util;
-import android.util.Base64;
+import android.os.Build;
import java.io.File;
import java.io.FileInputStream;
@@ -12,15 +12,11 @@
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.security.spec.AlgorithmParameterSpec;
-import java.security.spec.InvalidKeySpecException;
import java.security.spec.PKCS8EncodedKeySpec;
import java.security.spec.X509EncodedKeySpec;
-import javax.crypto.BadPaddingException;
import javax.crypto.Cipher;
-import javax.crypto.IllegalBlockSizeException;
import javax.crypto.Mac;
-import javax.crypto.NoSuchPaddingException;
import javax.crypto.SecretKey;
import javax.crypto.SecretKeyFactory;
import javax.crypto.spec.DESKeySpec;
@@ -63,7 +59,7 @@ public static String encryptMD2ToString(final String data) {
* @return the hex string of MD2 encryption
*/
public static String encryptMD2ToString(final byte[] data) {
- return bytes2HexString(encryptMD2(data));
+ return UtilsBridge.bytes2HexString(encryptMD2(data));
}
/**
@@ -96,9 +92,9 @@ public static String encryptMD5ToString(final String data) {
*/
public static String encryptMD5ToString(final String data, final String salt) {
if (data == null && salt == null) return "";
- if (salt == null) return bytes2HexString(encryptMD5(data.getBytes()));
- if (data == null) return bytes2HexString(encryptMD5(salt.getBytes()));
- return bytes2HexString(encryptMD5((data + salt).getBytes()));
+ if (salt == null) return UtilsBridge.bytes2HexString(encryptMD5(data.getBytes()));
+ if (data == null) return UtilsBridge.bytes2HexString(encryptMD5(salt.getBytes()));
+ return UtilsBridge.bytes2HexString(encryptMD5((data + salt).getBytes()));
}
/**
@@ -108,7 +104,7 @@ public static String encryptMD5ToString(final String data, final String salt) {
* @return the hex string of MD5 encryption
*/
public static String encryptMD5ToString(final byte[] data) {
- return bytes2HexString(encryptMD5(data));
+ return UtilsBridge.bytes2HexString(encryptMD5(data));
}
/**
@@ -120,12 +116,12 @@ public static String encryptMD5ToString(final byte[] data) {
*/
public static String encryptMD5ToString(final byte[] data, final byte[] salt) {
if (data == null && salt == null) return "";
- if (salt == null) return bytes2HexString(encryptMD5(data));
- if (data == null) return bytes2HexString(encryptMD5(salt));
+ if (salt == null) return UtilsBridge.bytes2HexString(encryptMD5(data));
+ if (data == null) return UtilsBridge.bytes2HexString(encryptMD5(salt));
byte[] dataSalt = new byte[data.length + salt.length];
System.arraycopy(data, 0, dataSalt, 0, data.length);
System.arraycopy(salt, 0, dataSalt, data.length, salt.length);
- return bytes2HexString(encryptMD5(dataSalt));
+ return UtilsBridge.bytes2HexString(encryptMD5(dataSalt));
}
/**
@@ -145,7 +141,7 @@ public static byte[] encryptMD5(final byte[] data) {
* @return the hex string of file's MD5 encryption
*/
public static String encryptMD5File2String(final String filePath) {
- File file = isSpace(filePath) ? null : new File(filePath);
+ File file = UtilsBridge.isSpace(filePath) ? null : new File(filePath);
return encryptMD5File2String(file);
}
@@ -156,7 +152,7 @@ public static String encryptMD5File2String(final String filePath) {
* @return the bytes of file's MD5 encryption
*/
public static byte[] encryptMD5File(final String filePath) {
- File file = isSpace(filePath) ? null : new File(filePath);
+ File file = UtilsBridge.isSpace(filePath) ? null : new File(filePath);
return encryptMD5File(file);
}
@@ -167,7 +163,7 @@ public static byte[] encryptMD5File(final String filePath) {
* @return the hex string of file's MD5 encryption
*/
public static String encryptMD5File2String(final File file) {
- return bytes2HexString(encryptMD5File(file));
+ return UtilsBridge.bytes2HexString(encryptMD5File(file));
}
/**
@@ -222,7 +218,7 @@ public static String encryptSHA1ToString(final String data) {
* @return the hex string of SHA1 encryption
*/
public static String encryptSHA1ToString(final byte[] data) {
- return bytes2HexString(encryptSHA1(data));
+ return UtilsBridge.bytes2HexString(encryptSHA1(data));
}
/**
@@ -253,7 +249,7 @@ public static String encryptSHA224ToString(final String data) {
* @return the hex string of SHA224 encryption
*/
public static String encryptSHA224ToString(final byte[] data) {
- return bytes2HexString(encryptSHA224(data));
+ return UtilsBridge.bytes2HexString(encryptSHA224(data));
}
/**
@@ -284,7 +280,7 @@ public static String encryptSHA256ToString(final String data) {
* @return the hex string of SHA256 encryption
*/
public static String encryptSHA256ToString(final byte[] data) {
- return bytes2HexString(encryptSHA256(data));
+ return UtilsBridge.bytes2HexString(encryptSHA256(data));
}
/**
@@ -315,7 +311,7 @@ public static String encryptSHA384ToString(final String data) {
* @return the hex string of SHA384 encryption
*/
public static String encryptSHA384ToString(final byte[] data) {
- return bytes2HexString(encryptSHA384(data));
+ return UtilsBridge.bytes2HexString(encryptSHA384(data));
}
/**
@@ -346,7 +342,7 @@ public static String encryptSHA512ToString(final String data) {
* @return the hex string of SHA512 encryption
*/
public static String encryptSHA512ToString(final byte[] data) {
- return bytes2HexString(encryptSHA512(data));
+ return UtilsBridge.bytes2HexString(encryptSHA512(data));
}
/**
@@ -366,7 +362,7 @@ public static byte[] encryptSHA512(final byte[] data) {
* @param algorithm The name of hash encryption.
* @return the bytes of hash encryption
*/
- private static byte[] hashTemplate(final byte[] data, final String algorithm) {
+ static byte[] hashTemplate(final byte[] data, final String algorithm) {
if (data == null || data.length <= 0) return null;
try {
MessageDigest md = MessageDigest.getInstance(algorithm);
@@ -402,7 +398,7 @@ public static String encryptHmacMD5ToString(final String data, final String key)
* @return the hex string of HmacMD5 encryption
*/
public static String encryptHmacMD5ToString(final byte[] data, final byte[] key) {
- return bytes2HexString(encryptHmacMD5(data, key));
+ return UtilsBridge.bytes2HexString(encryptHmacMD5(data, key));
}
/**
@@ -436,7 +432,7 @@ public static String encryptHmacSHA1ToString(final String data, final String key
* @return the hex string of HmacSHA1 encryption
*/
public static String encryptHmacSHA1ToString(final byte[] data, final byte[] key) {
- return bytes2HexString(encryptHmacSHA1(data, key));
+ return UtilsBridge.bytes2HexString(encryptHmacSHA1(data, key));
}
/**
@@ -470,7 +466,7 @@ public static String encryptHmacSHA224ToString(final String data, final String k
* @return the hex string of HmacSHA224 encryption
*/
public static String encryptHmacSHA224ToString(final byte[] data, final byte[] key) {
- return bytes2HexString(encryptHmacSHA224(data, key));
+ return UtilsBridge.bytes2HexString(encryptHmacSHA224(data, key));
}
/**
@@ -504,7 +500,7 @@ public static String encryptHmacSHA256ToString(final String data, final String k
* @return the hex string of HmacSHA256 encryption
*/
public static String encryptHmacSHA256ToString(final byte[] data, final byte[] key) {
- return bytes2HexString(encryptHmacSHA256(data, key));
+ return UtilsBridge.bytes2HexString(encryptHmacSHA256(data, key));
}
/**
@@ -538,7 +534,7 @@ public static String encryptHmacSHA384ToString(final String data, final String k
* @return the hex string of HmacSHA384 encryption
*/
public static String encryptHmacSHA384ToString(final byte[] data, final byte[] key) {
- return bytes2HexString(encryptHmacSHA384(data, key));
+ return UtilsBridge.bytes2HexString(encryptHmacSHA384(data, key));
}
/**
@@ -572,7 +568,7 @@ public static String encryptHmacSHA512ToString(final String data, final String k
* @return the hex string of HmacSHA512 encryption
*/
public static String encryptHmacSHA512ToString(final byte[] data, final byte[] key) {
- return bytes2HexString(encryptHmacSHA512(data, key));
+ return UtilsBridge.bytes2HexString(encryptHmacSHA512(data, key));
}
/**
@@ -627,7 +623,7 @@ public static byte[] encryptDES2Base64(final byte[] data,
final byte[] key,
final String transformation,
final byte[] iv) {
- return base64Encode(encryptDES(data, key, transformation, iv));
+ return UtilsBridge.base64Encode(encryptDES(data, key, transformation, iv));
}
/**
@@ -644,7 +640,7 @@ public static String encryptDES2HexString(final byte[] data,
final byte[] key,
final String transformation,
final byte[] iv) {
- return bytes2HexString(encryptDES(data, key, transformation, iv));
+ return UtilsBridge.bytes2HexString(encryptDES(data, key, transformation, iv));
}
/**
@@ -678,7 +674,7 @@ public static byte[] decryptBase64DES(final byte[] data,
final byte[] key,
final String transformation,
final byte[] iv) {
- return decryptDES(base64Decode(data), key, transformation, iv);
+ return decryptDES(UtilsBridge.base64Decode(data), key, transformation, iv);
}
/**
@@ -695,7 +691,7 @@ public static byte[] decryptHexStringDES(final String data,
final byte[] key,
final String transformation,
final byte[] iv) {
- return decryptDES(hexString2Bytes(data), key, transformation, iv);
+ return decryptDES(UtilsBridge.hexString2Bytes(data), key, transformation, iv);
}
/**
@@ -733,7 +729,7 @@ public static byte[] encrypt3DES2Base64(final byte[] data,
final byte[] key,
final String transformation,
final byte[] iv) {
- return base64Encode(encrypt3DES(data, key, transformation, iv));
+ return UtilsBridge.base64Encode(encrypt3DES(data, key, transformation, iv));
}
/**
@@ -750,7 +746,7 @@ public static String encrypt3DES2HexString(final byte[] data,
final byte[] key,
final String transformation,
final byte[] iv) {
- return bytes2HexString(encrypt3DES(data, key, transformation, iv));
+ return UtilsBridge.bytes2HexString(encrypt3DES(data, key, transformation, iv));
}
/**
@@ -784,7 +780,7 @@ public static byte[] decryptBase64_3DES(final byte[] data,
final byte[] key,
final String transformation,
final byte[] iv) {
- return decrypt3DES(base64Decode(data), key, transformation, iv);
+ return decrypt3DES(UtilsBridge.base64Decode(data), key, transformation, iv);
}
/**
@@ -801,7 +797,7 @@ public static byte[] decryptHexString3DES(final String data,
final byte[] key,
final String transformation,
final byte[] iv) {
- return decrypt3DES(hexString2Bytes(data), key, transformation, iv);
+ return decrypt3DES(UtilsBridge.hexString2Bytes(data), key, transformation, iv);
}
/**
@@ -839,7 +835,7 @@ public static byte[] encryptAES2Base64(final byte[] data,
final byte[] key,
final String transformation,
final byte[] iv) {
- return base64Encode(encryptAES(data, key, transformation, iv));
+ return UtilsBridge.base64Encode(encryptAES(data, key, transformation, iv));
}
/**
@@ -856,7 +852,7 @@ public static String encryptAES2HexString(final byte[] data,
final byte[] key,
final String transformation,
final byte[] iv) {
- return bytes2HexString(encryptAES(data, key, transformation, iv));
+ return UtilsBridge.bytes2HexString(encryptAES(data, key, transformation, iv));
}
/**
@@ -890,7 +886,7 @@ public static byte[] decryptBase64AES(final byte[] data,
final byte[] key,
final String transformation,
final byte[] iv) {
- return decryptAES(base64Decode(data), key, transformation, iv);
+ return decryptAES(UtilsBridge.base64Decode(data), key, transformation, iv);
}
/**
@@ -907,7 +903,7 @@ public static byte[] decryptHexStringAES(final String data,
final byte[] key,
final String transformation,
final byte[] iv) {
- return decryptAES(hexString2Bytes(data), key, transformation, iv);
+ return decryptAES(UtilsBridge.hexString2Bytes(data), key, transformation, iv);
}
/**
@@ -984,7 +980,7 @@ public static byte[] encryptRSA2Base64(final byte[] data,
final byte[] publicKey,
final int keySize,
final String transformation) {
- return base64Encode(encryptRSA(data, publicKey, keySize, transformation));
+ return UtilsBridge.base64Encode(encryptRSA(data, publicKey, keySize, transformation));
}
/**
@@ -1000,7 +996,7 @@ public static String encryptRSA2HexString(final byte[] data,
final byte[] publicKey,
final int keySize,
final String transformation) {
- return bytes2HexString(encryptRSA(data, publicKey, keySize, transformation));
+ return UtilsBridge.bytes2HexString(encryptRSA(data, publicKey, keySize, transformation));
}
/**
@@ -1032,7 +1028,7 @@ public static byte[] decryptBase64RSA(final byte[] data,
final byte[] privateKey,
final int keySize,
final String transformation) {
- return decryptRSA(base64Decode(data), privateKey, keySize, transformation);
+ return decryptRSA(UtilsBridge.base64Decode(data), privateKey, keySize, transformation);
}
/**
@@ -1048,7 +1044,7 @@ public static byte[] decryptHexStringRSA(final String data,
final byte[] privateKey,
final int keySize,
final String transformation) {
- return decryptRSA(hexString2Bytes(data), privateKey, keySize, transformation);
+ return decryptRSA(UtilsBridge.hexString2Bytes(data), privateKey, keySize, transformation);
}
/**
@@ -1087,12 +1083,18 @@ private static byte[] rsaTemplate(final byte[] data,
}
try {
Key rsaKey;
+ KeyFactory keyFactory;
+ if (Build.VERSION.SDK_INT < 28) {
+ keyFactory = KeyFactory.getInstance("RSA", "BC");
+ } else {
+ keyFactory = KeyFactory.getInstance("RSA");
+ }
if (isEncrypt) {
X509EncodedKeySpec keySpec = new X509EncodedKeySpec(key);
- rsaKey = KeyFactory.getInstance("RSA").generatePublic(keySpec);
+ rsaKey = keyFactory.generatePublic(keySpec);
} else {
PKCS8EncodedKeySpec keySpec = new PKCS8EncodedKeySpec(key);
- rsaKey = KeyFactory.getInstance("RSA").generatePrivate(keySpec);
+ rsaKey = keyFactory.generatePrivate(keySpec);
}
if (rsaKey == null) return null;
Cipher cipher = Cipher.getInstance(transformation);
@@ -1125,17 +1127,7 @@ private static byte[] rsaTemplate(final byte[] data,
} else {
return cipher.doFinal(data);
}
- } catch (NoSuchAlgorithmException e) {
- e.printStackTrace();
- } catch (NoSuchPaddingException e) {
- e.printStackTrace();
- } catch (InvalidKeyException e) {
- e.printStackTrace();
- } catch (BadPaddingException e) {
- e.printStackTrace();
- } catch (IllegalBlockSizeException e) {
- e.printStackTrace();
- } catch (InvalidKeySpecException e) {
+ } catch (Exception e) {
e.printStackTrace();
}
return null;
@@ -1183,72 +1175,10 @@ public static byte[] rc4(byte[] data, byte[] key) {
return ret;
}
- ///////////////////////////////////////////////////////////////////////////
- // other utils methods
- ///////////////////////////////////////////////////////////////////////////
-
private static byte[] joins(final byte[] prefix, final byte[] suffix) {
byte[] ret = new byte[prefix.length + suffix.length];
System.arraycopy(prefix, 0, ret, 0, prefix.length);
System.arraycopy(suffix, 0, ret, prefix.length, suffix.length);
return ret;
}
-
- private static final char[] HEX_DIGITS =
- {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'};
-
- private static String bytes2HexString(final byte[] bytes) {
- if (bytes == null) return "";
- int len = bytes.length;
- if (len <= 0) return "";
- char[] ret = new char[len << 1];
- for (int i = 0, j = 0; i < len; i++) {
- ret[j++] = HEX_DIGITS[bytes[i] >> 4 & 0x0f];
- ret[j++] = HEX_DIGITS[bytes[i] & 0x0f];
- }
- return new String(ret);
- }
-
- private static byte[] hexString2Bytes(String hexString) {
- if (isSpace(hexString)) return null;
- int len = hexString.length();
- if (len % 2 != 0) {
- hexString = "0" + hexString;
- len = len + 1;
- }
- char[] hexBytes = hexString.toUpperCase().toCharArray();
- byte[] ret = new byte[len >> 1];
- for (int i = 0; i < len; i += 2) {
- ret[i >> 1] = (byte) (hex2Dec(hexBytes[i]) << 4 | hex2Dec(hexBytes[i + 1]));
- }
- return ret;
- }
-
- private static int hex2Dec(final char hexChar) {
- if (hexChar >= '0' && hexChar <= '9') {
- return hexChar - '0';
- } else if (hexChar >= 'A' && hexChar <= 'F') {
- return hexChar - 'A' + 10;
- } else {
- throw new IllegalArgumentException();
- }
- }
-
- private static byte[] base64Encode(final byte[] input) {
- return Base64.encode(input, Base64.NO_WRAP);
- }
-
- private static byte[] base64Decode(final byte[] input) {
- return Base64.decode(input, Base64.NO_WRAP);
- }
-
- private static boolean isSpace(final String s) {
- if (s == null) return true;
- for (int i = 0, len = s.length(); i < len; ++i) {
- if (!Character.isWhitespace(s.charAt(i))) {
- return false;
- }
- }
- return true;
- }
}
diff --git a/lib/utilcode/src/main/java/com/blankj/utilcode/util/FileIOUtils.java b/lib/utilcode/src/main/java/com/blankj/utilcode/util/FileIOUtils.java
index b40565aa16..ca786e0b98 100644
--- a/lib/utilcode/src/main/java/com/blankj/utilcode/util/FileIOUtils.java
+++ b/lib/utilcode/src/main/java/com/blankj/utilcode/util/FileIOUtils.java
@@ -1,5 +1,7 @@
package com.blankj.utilcode.util;
+import android.util.Log;
+
import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
import java.io.BufferedReader;
@@ -51,7 +53,7 @@ private FileIOUtils() {
* @return {@code true}: success readFile2List(final String filePath) {
- return readFile2List(getFileByPath(filePath), null);
+ return readFile2List(UtilsBridge.getFileByPath(filePath), null);
}
/**
@@ -562,7 +588,7 @@ public static List readFile2List(final String filePath) {
* @return the lines in file
*/
public static List readFile2List(final String filePath, final String charsetName) {
- return readFile2List(getFileByPath(filePath), charsetName);
+ return readFile2List(UtilsBridge.getFileByPath(filePath), charsetName);
}
/**
@@ -595,7 +621,7 @@ public static List readFile2List(final File file, final String charsetNa
* @return the lines in file
*/
public static List readFile2List(final String filePath, final int st, final int end) {
- return readFile2List(getFileByPath(filePath), st, end, null);
+ return readFile2List(UtilsBridge.getFileByPath(filePath), st, end, null);
}
/**
@@ -611,7 +637,7 @@ public static List readFile2List(final String filePath,
final int st,
final int end,
final String charsetName) {
- return readFile2List(getFileByPath(filePath), st, end, charsetName);
+ return readFile2List(UtilsBridge.getFileByPath(filePath), st, end, charsetName);
}
/**
@@ -639,14 +665,14 @@ public static List readFile2List(final File file,
final int st,
final int end,
final String charsetName) {
- if (!isFileExists(file)) return null;
+ if (!UtilsBridge.isFileExists(file)) return null;
if (st > end) return null;
BufferedReader reader = null;
try {
String line;
int curLine = 1;
List list = new ArrayList<>();
- if (isSpace(charsetName)) {
+ if (UtilsBridge.isSpace(charsetName)) {
reader = new BufferedReader(new InputStreamReader(new FileInputStream(file)));
} else {
reader = new BufferedReader(
@@ -680,7 +706,7 @@ public static List readFile2List(final File file,
* @return the string in file
*/
public static String readFile2String(final String filePath) {
- return readFile2String(getFileByPath(filePath), null);
+ return readFile2String(UtilsBridge.getFileByPath(filePath), null);
}
/**
@@ -691,7 +717,7 @@ public static String readFile2String(final String filePath) {
* @return the string in file
*/
public static String readFile2String(final String filePath, final String charsetName) {
- return readFile2String(getFileByPath(filePath), charsetName);
+ return readFile2String(UtilsBridge.getFileByPath(filePath), charsetName);
}
/**
@@ -714,7 +740,7 @@ public static String readFile2String(final File file) {
public static String readFile2String(final File file, final String charsetName) {
byte[] bytes = readFile2BytesByStream(file);
if (bytes == null) return null;
- if (isSpace(charsetName)) {
+ if (UtilsBridge.isSpace(charsetName)) {
return new String(bytes);
} else {
try {
@@ -737,7 +763,7 @@ public static String readFile2String(final File file, final String charsetName)
* @return the bytes in file
*/
public static byte[] readFile2BytesByStream(final String filePath) {
- return readFile2BytesByStream(getFileByPath(filePath), null);
+ return readFile2BytesByStream(UtilsBridge.getFileByPath(filePath), null);
}
/**
@@ -763,7 +789,7 @@ public static byte[] readFile2BytesByStream(final File file) {
*/
public static byte[] readFile2BytesByStream(final String filePath,
final OnProgressUpdateListener listener) {
- return readFile2BytesByStream(getFileByPath(filePath));
+ return readFile2BytesByStream(UtilsBridge.getFileByPath(filePath), listener);
}
/**
@@ -775,7 +801,7 @@ public static byte[] readFile2BytesByStream(final String filePath,
*/
public static byte[] readFile2BytesByStream(final File file,
final OnProgressUpdateListener listener) {
- if (!isFileExists(file)) return null;
+ if (!UtilsBridge.isFileExists(file)) return null;
try {
ByteArrayOutputStream os = null;
InputStream is = new BufferedInputStream(new FileInputStream(file), sBufferSize);
@@ -828,7 +854,7 @@ public static byte[] readFile2BytesByStream(final File file,
* @return the bytes in file
*/
public static byte[] readFile2BytesByChannel(final String filePath) {
- return readFile2BytesByChannel(getFileByPath(filePath));
+ return readFile2BytesByChannel(UtilsBridge.getFileByPath(filePath));
}
/**
@@ -838,10 +864,14 @@ public static byte[] readFile2BytesByChannel(final String filePath) {
* @return the bytes in file
*/
public static byte[] readFile2BytesByChannel(final File file) {
- if (!isFileExists(file)) return null;
+ if (!UtilsBridge.isFileExists(file)) return null;
FileChannel fc = null;
try {
fc = new RandomAccessFile(file, "r").getChannel();
+ if (fc == null) {
+ Log.e("FileIOUtils", "fc is null.");
+ return new byte[0];
+ }
ByteBuffer byteBuffer = ByteBuffer.allocate((int) fc.size());
while (true) {
if (!((fc.read(byteBuffer)) > 0)) break;
@@ -868,7 +898,7 @@ public static byte[] readFile2BytesByChannel(final File file) {
* @return the bytes in file
*/
public static byte[] readFile2BytesByMap(final String filePath) {
- return readFile2BytesByMap(getFileByPath(filePath));
+ return readFile2BytesByMap(UtilsBridge.getFileByPath(filePath));
}
/**
@@ -878,10 +908,14 @@ public static byte[] readFile2BytesByMap(final String filePath) {
* @return the bytes in file
*/
public static byte[] readFile2BytesByMap(final File file) {
- if (!isFileExists(file)) return null;
+ if (!UtilsBridge.isFileExists(file)) return null;
FileChannel fc = null;
try {
fc = new RandomAccessFile(file, "r").getChannel();
+ if (fc == null) {
+ Log.e("FileIOUtils", "fc is null.");
+ return new byte[0];
+ }
int size = (int) fc.size();
MappedByteBuffer mbb = fc.map(FileChannel.MapMode.READ_ONLY, 0, size).load();
byte[] result = new byte[size];
@@ -911,81 +945,7 @@ public static void setBufferSize(final int bufferSize) {
sBufferSize = bufferSize;
}
- ///////////////////////////////////////////////////////////////////////////
- // other utils methods
- ///////////////////////////////////////////////////////////////////////////
-
- private static File getFileByPath(final String filePath) {
- return isSpace(filePath) ? null : new File(filePath);
- }
-
- private static boolean createOrExistsFile(final String filePath) {
- return createOrExistsFile(getFileByPath(filePath));
- }
-
- private static boolean createOrExistsFile(final File file) {
- if (file == null) return false;
- if (file.exists()) return file.isFile();
- if (!createOrExistsDir(file.getParentFile())) return false;
- try {
- return file.createNewFile();
- } catch (IOException e) {
- e.printStackTrace();
- return false;
- }
- }
-
- private static boolean createOrExistsDir(final File file) {
- return file != null && (file.exists() ? file.isDirectory() : file.mkdirs());
- }
-
- private static boolean isFileExists(final File file) {
- return file != null && file.exists();
- }
-
- private static boolean isSpace(final String s) {
- if (s == null) return true;
- for (int i = 0, len = s.length(); i < len; ++i) {
- if (!Character.isWhitespace(s.charAt(i))) {
- return false;
- }
- }
- return true;
- }
-
- private static byte[] is2Bytes(final InputStream is) {
- if (is == null) return null;
- ByteArrayOutputStream os = null;
- try {
- os = new ByteArrayOutputStream();
- byte[] b = new byte[sBufferSize];
- int len;
- while ((len = is.read(b, 0, sBufferSize)) != -1) {
- os.write(b, 0, len);
- }
- return os.toByteArray();
- } catch (IOException e) {
- e.printStackTrace();
- return null;
- } finally {
- try {
- is.close();
- } catch (IOException e) {
- e.printStackTrace();
- }
- try {
- if (os != null) {
- os.close();
- }
- } catch (IOException e) {
- e.printStackTrace();
- }
- }
- }
-
public interface OnProgressUpdateListener {
-
void onProgressUpdate(double progress);
-
}
}
diff --git a/lib/utilcode/src/main/java/com/blankj/utilcode/util/FileUtils.java b/lib/utilcode/src/main/java/com/blankj/utilcode/util/FileUtils.java
index 512f2e920a..1acca1e050 100644
--- a/lib/utilcode/src/main/java/com/blankj/utilcode/util/FileUtils.java
+++ b/lib/utilcode/src/main/java/com/blankj/utilcode/util/FileUtils.java
@@ -5,17 +5,16 @@
import android.content.res.AssetFileDescriptor;
import android.net.Uri;
import android.os.Build;
+import android.os.StatFs;
+import android.text.TextUtils;
import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
import java.io.File;
import java.io.FileFilter;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
-import java.io.OutputStream;
import java.net.URL;
import java.security.DigestInputStream;
import java.security.MessageDigest;
@@ -24,7 +23,6 @@
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
-import java.util.Locale;
import javax.net.ssl.HttpsURLConnection;
@@ -51,7 +49,21 @@ private FileUtils() {
* @return the file
*/
public static File getFileByPath(final String filePath) {
- return isSpace(filePath) ? null : new File(filePath);
+ return UtilsBridge.isSpace(filePath) ? null : new File(filePath);
+ }
+
+ /**
+ * Return whether the file exists.
+ *
+ * @param file The file.
+ * @return {@code true}: yes listFilesInDir(final File dir) {
* @return the files in directory
*/
public static List listFilesInDir(final String dirPath, Comparator comparator) {
- return listFilesInDir(getFileByPath(dirPath), false);
+ return listFilesInDir(getFileByPath(dirPath), false, comparator);
}
/**
@@ -836,7 +848,7 @@ private static List listFilesInDirWithFilterInner(final File dir,
List list = new ArrayList<>();
if (!isDir(dir)) return list;
File[] files = dir.listFiles();
- if (files != null && files.length != 0) {
+ if (files != null && files.length > 0) {
for (File file : files) {
if (filter.accept(file)) {
list.add(file);
@@ -1111,7 +1123,7 @@ public static String getSize(final File file) {
*/
private static String getDirSize(final File dir) {
long len = getDirLength(dir);
- return len == -1 ? "" : byte2FitMemorySize(len);
+ return len == -1 ? "" : UtilsBridge.byte2FitMemorySize(len);
}
/**
@@ -1122,7 +1134,7 @@ private static String getDirSize(final File dir) {
*/
private static String getFileSize(final File file) {
long len = getFileLength(file);
- return len == -1 ? "" : byte2FitMemorySize(len);
+ return len == -1 ? "" : UtilsBridge.byte2FitMemorySize(len);
}
/**
@@ -1156,10 +1168,10 @@ public static long getLength(final File file) {
* @return the length of directory
*/
private static long getDirLength(final File dir) {
- if (!isDir(dir)) return -1;
+ if (!isDir(dir)) return 0;
long len = 0;
File[] files = dir.listFiles();
- if (files != null && files.length != 0) {
+ if (files != null && files.length > 0) {
for (File file : files) {
if (file.isDirectory()) {
len += getDirLength(file);
@@ -1213,7 +1225,7 @@ private static long getFileLength(final File file) {
* @return the md5 of file
*/
public static String getFileMD5ToString(final String filePath) {
- File file = isSpace(filePath) ? null : new File(filePath);
+ File file = UtilsBridge.isSpace(filePath) ? null : new File(filePath);
return getFileMD5ToString(file);
}
@@ -1224,7 +1236,7 @@ public static String getFileMD5ToString(final String filePath) {
* @return the md5 of file
*/
public static String getFileMD5ToString(final File file) {
- return bytes2HexString(getFileMD5(file));
+ return UtilsBridge.bytes2HexString(getFileMD5(file));
}
/**
@@ -1288,7 +1300,7 @@ public static String getDirName(final File file) {
* @return the file's path of directory
*/
public static String getDirName(final String filePath) {
- if (isSpace(filePath)) return "";
+ if (UtilsBridge.isSpace(filePath)) return "";
int lastSep = filePath.lastIndexOf(File.separator);
return lastSep == -1 ? "" : filePath.substring(0, lastSep + 1);
}
@@ -1311,7 +1323,7 @@ public static String getFileName(final File file) {
* @return the name of file
*/
public static String getFileName(final String filePath) {
- if (isSpace(filePath)) return "";
+ if (UtilsBridge.isSpace(filePath)) return "";
int lastSep = filePath.lastIndexOf(File.separator);
return lastSep == -1 ? filePath : filePath.substring(lastSep + 1);
}
@@ -1334,7 +1346,7 @@ public static String getFileNameNoExtension(final File file) {
* @return the name of file without extension
*/
public static String getFileNameNoExtension(final String filePath) {
- if (isSpace(filePath)) return "";
+ if (UtilsBridge.isSpace(filePath)) return "";
int lastPoi = filePath.lastIndexOf('.');
int lastSep = filePath.lastIndexOf(File.separator);
if (lastSep == -1) {
@@ -1364,13 +1376,22 @@ public static String getFileExtension(final File file) {
* @return the extension of file
*/
public static String getFileExtension(final String filePath) {
- if (isSpace(filePath)) return "";
+ if (UtilsBridge.isSpace(filePath)) return "";
int lastPoi = filePath.lastIndexOf('.');
int lastSep = filePath.lastIndexOf(File.separator);
if (lastPoi == -1 || lastSep >= lastPoi) return "";
return filePath.substring(lastPoi + 1);
}
+ /**
+ * Notify system to scan the file.
+ *
+ * @param filePath The path of file.
+ */
+ public static void notifySystemToScan(final String filePath) {
+ notifySystemToScan(getFileByPath(filePath));
+ }
+
/**
* Notify system to scan the file.
*
@@ -1379,18 +1400,50 @@ public static String getFileExtension(final String filePath) {
public static void notifySystemToScan(final File file) {
if (file == null || !file.exists()) return;
Intent intent = new Intent(Intent.ACTION_MEDIA_SCANNER_SCAN_FILE);
- Uri uri = Uri.fromFile(file);
- intent.setData(uri);
+ intent.setData(Uri.parse("file://" + file.getAbsolutePath()));
Utils.getApp().sendBroadcast(intent);
}
/**
- * Notify system to scan the file.
+ * Return the total size of file system.
*
- * @param filePath The path of file.
+ * @param anyPathInFs Any path in file system.
+ * @return the total size of file system
*/
- public static void notifySystemToScan(final String filePath) {
- notifySystemToScan(getFileByPath(filePath));
+ public static long getFsTotalSize(String anyPathInFs) {
+ if (TextUtils.isEmpty(anyPathInFs)) return 0;
+ StatFs statFs = new StatFs(anyPathInFs);
+ long blockSize;
+ long totalSize;
+ if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.JELLY_BEAN_MR2) {
+ blockSize = statFs.getBlockSizeLong();
+ totalSize = statFs.getBlockCountLong();
+ } else {
+ blockSize = statFs.getBlockSize();
+ totalSize = statFs.getBlockCount();
+ }
+ return blockSize * totalSize;
+ }
+
+ /**
+ * Return the available size of file system.
+ *
+ * @param anyPathInFs Any path in file system.
+ * @return the available size of file system
+ */
+ public static long getFsAvailableSize(final String anyPathInFs) {
+ if (TextUtils.isEmpty(anyPathInFs)) return 0;
+ StatFs statFs = new StatFs(anyPathInFs);
+ long blockSize;
+ long availableSize;
+ if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.JELLY_BEAN_MR2) {
+ blockSize = statFs.getBlockSizeLong();
+ availableSize = statFs.getAvailableBlocksLong();
+ } else {
+ blockSize = statFs.getBlockSize();
+ availableSize = statFs.getAvailableBlocks();
+ }
+ return blockSize * availableSize;
}
///////////////////////////////////////////////////////////////////////////
@@ -1400,77 +1453,4 @@ public static void notifySystemToScan(final String filePath) {
public interface OnReplaceListener {
boolean onReplace(File srcFile, File destFile);
}
-
- ///////////////////////////////////////////////////////////////////////////
- // other utils methods
- ///////////////////////////////////////////////////////////////////////////
-
- private static final char[] HEX_DIGITS =
- {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'};
-
- private static String bytes2HexString(final byte[] bytes) {
- if (bytes == null) return "";
- int len = bytes.length;
- if (len <= 0) return "";
- char[] ret = new char[len << 1];
- for (int i = 0, j = 0; i < len; i++) {
- ret[j++] = HEX_DIGITS[bytes[i] >> 4 & 0x0f];
- ret[j++] = HEX_DIGITS[bytes[i] & 0x0f];
- }
- return new String(ret);
- }
-
- private static String byte2FitMemorySize(final long byteNum) {
- if (byteNum < 0) {
- return "shouldn't be less than zero!";
- } else if (byteNum < 1024) {
- return String.format(Locale.getDefault(), "%.3fB", (double) byteNum);
- } else if (byteNum < 1048576) {
- return String.format(Locale.getDefault(), "%.3fKB", (double) byteNum / 1024);
- } else if (byteNum < 1073741824) {
- return String.format(Locale.getDefault(), "%.3fMB", (double) byteNum / 1048576);
- } else {
- return String.format(Locale.getDefault(), "%.3fGB", (double) byteNum / 1073741824);
- }
- }
-
- private static boolean isSpace(final String s) {
- if (s == null) return true;
- for (int i = 0, len = s.length(); i < len; ++i) {
- if (!Character.isWhitespace(s.charAt(i))) {
- return false;
- }
- }
- return true;
- }
-
- private static boolean writeFileFromIS(final File file,
- final InputStream is) {
- OutputStream os = null;
- try {
- os = new BufferedOutputStream(new FileOutputStream(file));
- byte[] data = new byte[8192];
- int len;
- while ((len = is.read(data, 0, 8192)) != -1) {
- os.write(data, 0, len);
- }
- return true;
- } catch (IOException e) {
- e.printStackTrace();
- return false;
- } finally {
- try {
- is.close();
- } catch (IOException e) {
- e.printStackTrace();
- }
- try {
- if (os != null) {
- os.close();
- }
- } catch (IOException e) {
- e.printStackTrace();
- }
- }
- }
}
diff --git a/lib/utilcode/src/main/java/com/blankj/utilcode/util/FlashlightUtils.java b/lib/utilcode/src/main/java/com/blankj/utilcode/util/FlashlightUtils.java
index 1b864f6ef5..e74996d4e4 100644
--- a/lib/utilcode/src/main/java/com/blankj/utilcode/util/FlashlightUtils.java
+++ b/lib/utilcode/src/main/java/com/blankj/utilcode/util/FlashlightUtils.java
@@ -65,7 +65,7 @@ public static void setFlashlightStatus(final boolean isOn) {
parameters.setFlashMode(FLASH_MODE_TORCH);
mCamera.setParameters(parameters);
} catch (IOException e) {
- Log.e("FlashlightUtils", "setFlashlightStatusOn: ", e);
+ e.printStackTrace();
}
}
} else {
diff --git a/lib/utilcode/src/main/java/com/blankj/utilcode/util/FragmentUtils.java b/lib/utilcode/src/main/java/com/blankj/utilcode/util/FragmentUtils.java
index b6c9615309..31bbac1217 100644
--- a/lib/utilcode/src/main/java/com/blankj/utilcode/util/FragmentUtils.java
+++ b/lib/utilcode/src/main/java/com/blankj/utilcode/util/FragmentUtils.java
@@ -3,23 +3,25 @@
import android.graphics.drawable.Drawable;
import android.os.Build;
import android.os.Bundle;
-import android.support.annotation.AnimRes;
-import android.support.annotation.AnimatorRes;
-import android.support.annotation.ColorInt;
-import android.support.annotation.DrawableRes;
-import android.support.annotation.IdRes;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentTransaction;
import android.util.Log;
import android.view.View;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collections;
import java.util.List;
+import androidx.annotation.AnimRes;
+import androidx.annotation.AnimatorRes;
+import androidx.annotation.ColorInt;
+import androidx.annotation.DrawableRes;
+import androidx.annotation.IdRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentTransaction;
+
/**
*
* author: Blankj
@@ -301,7 +303,7 @@ public static void add(@NonNull final FragmentManager fm,
final boolean isHide,
final boolean isAddStack) {
putArgs(add, new Args(containerId, tag, isHide, isAddStack));
- operateNoAnim(fm, TYPE_ADD_FRAGMENT, null, add);
+ operateNoAnim(TYPE_ADD_FRAGMENT, fm, null, add);
}
/**
@@ -489,7 +491,7 @@ public static void add(@NonNull final FragmentManager fm,
putArgs(adds[i], new Args(containerId, tags[i], showIndex != i, false));
}
}
- operateNoAnim(fm, TYPE_ADD_FRAGMENT, null, adds);
+ operateNoAnim(TYPE_ADD_FRAGMENT, fm, null, adds);
}
/**
@@ -499,7 +501,7 @@ public static void add(@NonNull final FragmentManager fm,
*/
public static void show(@NonNull final Fragment show) {
putArgs(show, false);
- operateNoAnim(show.getFragmentManager(), TYPE_SHOW_FRAGMENT, null, show);
+ operateNoAnim(TYPE_SHOW_FRAGMENT, show.getFragmentManager(), null, show);
}
/**
@@ -512,11 +514,7 @@ public static void show(@NonNull final FragmentManager fm) {
for (Fragment show : fragments) {
putArgs(show, false);
}
- operateNoAnim(fm,
- TYPE_SHOW_FRAGMENT,
- null,
- fragments.toArray(new Fragment[0])
- );
+ operateNoAnim(TYPE_SHOW_FRAGMENT, fm, null, fragments.toArray(new Fragment[0]));
}
/**
@@ -526,7 +524,7 @@ public static void show(@NonNull final FragmentManager fm) {
*/
public static void hide(@NonNull final Fragment hide) {
putArgs(hide, true);
- operateNoAnim(hide.getFragmentManager(), TYPE_HIDE_FRAGMENT, null, hide);
+ operateNoAnim(TYPE_HIDE_FRAGMENT, hide.getFragmentManager(), null, hide);
}
/**
@@ -539,21 +537,28 @@ public static void hide(@NonNull final FragmentManager fm) {
for (Fragment hide : fragments) {
putArgs(hide, true);
}
- operateNoAnim(fm,
- TYPE_HIDE_FRAGMENT,
- null,
- fragments.toArray(new Fragment[0])
- );
+ operateNoAnim(TYPE_HIDE_FRAGMENT, fm, null, fragments.toArray(new Fragment[0]));
+ }
+
+ /**
+ * Show fragment then hide other fragment.
+ *
+ * @param show The fragment will be show.
+ * @param hide The fragment will be hide.
+ */
+ public static void showHide(@NonNull final Fragment show,
+ @NonNull final Fragment hide) {
+ showHide(show, Collections.singletonList(hide));
}
/**
* Show fragment then hide other fragment.
*
* @param showIndex The index of fragment will be shown.
- * @param fragments The fragments will be hide.
+ * @param fragments The fragment will be hide.
*/
- public static void showHide(final int showIndex, @NonNull final List fragments) {
- showHide(fragments.get(showIndex), fragments);
+ public static void showHide(final int showIndex, @NonNull final Fragment... fragments) {
+ showHide(fragments[showIndex], fragments);
}
/**
@@ -562,22 +567,18 @@ public static void showHide(final int showIndex, @NonNull final List f
* @param show The fragment will be show.
* @param hide The fragment will be hide.
*/
- public static void showHide(@NonNull final Fragment show, @NonNull final List hide) {
- for (Fragment fragment : hide) {
- putArgs(fragment, fragment != show);
- }
- operateNoAnim(show.getFragmentManager(), TYPE_SHOW_HIDE_FRAGMENT, show,
- hide.toArray(new Fragment[0]));
+ public static void showHide(@NonNull final Fragment show, @NonNull final Fragment... hide) {
+ showHide(show, Arrays.asList(hide));
}
/**
* Show fragment then hide other fragment.
*
* @param showIndex The index of fragment will be shown.
- * @param fragments The fragment will be hide.
+ * @param fragments The fragments will be hide.
*/
- public static void showHide(final int showIndex, @NonNull final Fragment... fragments) {
- showHide(fragments[showIndex], fragments);
+ public static void showHide(final int showIndex, @NonNull final List fragments) {
+ showHide(fragments.get(showIndex), fragments);
}
/**
@@ -586,13 +587,14 @@ public static void showHide(final int showIndex, @NonNull final Fragment... frag
* @param show The fragment will be show.
* @param hide The fragment will be hide.
*/
- public static void showHide(@NonNull final Fragment show, @NonNull final Fragment... hide) {
+ public static void showHide(@NonNull final Fragment show, @NonNull final List hide) {
for (Fragment fragment : hide) {
putArgs(fragment, fragment != show);
}
- operateNoAnim(show.getFragmentManager(), TYPE_SHOW_HIDE_FRAGMENT, show, hide);
+ operateNoAnim(TYPE_SHOW_HIDE_FRAGMENT, show.getFragmentManager(), show, hide.toArray(new Fragment[0]));
}
+
/**
* Show fragment then hide other fragment.
*
@@ -600,10 +602,47 @@ public static void showHide(@NonNull final Fragment show, @NonNull final Fragmen
* @param hide The fragment will be hide.
*/
public static void showHide(@NonNull final Fragment show,
- @NonNull final Fragment hide) {
- putArgs(show, false);
- putArgs(hide, true);
- operateNoAnim(show.getFragmentManager(), TYPE_SHOW_HIDE_FRAGMENT, show, hide);
+ @NonNull final Fragment hide, @AnimatorRes @AnimRes final int enterAnim,
+ @AnimatorRes @AnimRes final int exitAnim,
+ @AnimatorRes @AnimRes final int popEnterAnim,
+ @AnimatorRes @AnimRes final int popExitAnim) {
+ showHide(show, Collections.singletonList(hide), enterAnim, exitAnim, popEnterAnim, popExitAnim);
+ }
+
+ /**
+ * Show fragment then hide other fragment.
+ *
+ * @param showIndex The index of fragment will be shown.
+ * @param fragments The fragments will be hide.
+ */
+ public static void showHide(final int showIndex, @NonNull final List fragments,
+ @AnimatorRes @AnimRes final int enterAnim,
+ @AnimatorRes @AnimRes final int exitAnim,
+ @AnimatorRes @AnimRes final int popEnterAnim,
+ @AnimatorRes @AnimRes final int popExitAnim) {
+ showHide(fragments.get(showIndex), fragments, enterAnim, exitAnim, popEnterAnim, popExitAnim);
+ }
+
+ /**
+ * Show fragment then hide other fragment.
+ *
+ * @param show The fragment will be show.
+ * @param hide The fragment will be hide.
+ */
+ public static void showHide(@NonNull final Fragment show, @NonNull final List hide,
+ @AnimatorRes @AnimRes final int enterAnim,
+ @AnimatorRes @AnimRes final int exitAnim,
+ @AnimatorRes @AnimRes final int popEnterAnim,
+ @AnimatorRes @AnimRes final int popExitAnim) {
+ for (Fragment fragment : hide) {
+ putArgs(fragment, fragment != show);
+ }
+ FragmentManager fm = show.getFragmentManager();
+ if (fm != null) {
+ FragmentTransaction ft = fm.beginTransaction();
+ addAnim(ft, enterAnim, exitAnim, popEnterAnim, popExitAnim);
+ operate(TYPE_SHOW_HIDE_FRAGMENT, fm, ft, show, hide.toArray(new Fragment[0]));
+ }
}
/**
@@ -1357,7 +1396,7 @@ public static void popAll(@NonNull final FragmentManager fm, final boolean isImm
* @param remove The fragment will be removed.
*/
public static void remove(@NonNull final Fragment remove) {
- operateNoAnim(remove.getFragmentManager(), TYPE_REMOVE_FRAGMENT, null, remove);
+ operateNoAnim(TYPE_REMOVE_FRAGMENT, remove.getFragmentManager(), null, remove);
}
/**
@@ -1367,8 +1406,7 @@ public static void remove(@NonNull final Fragment remove) {
* @param isIncludeSelf True to include the fragment, false otherwise.
*/
public static void removeTo(@NonNull final Fragment removeTo, final boolean isIncludeSelf) {
- operateNoAnim(removeTo.getFragmentManager(), TYPE_REMOVE_TO_FRAGMENT,
- isIncludeSelf ? removeTo : null, removeTo);
+ operateNoAnim(TYPE_REMOVE_TO_FRAGMENT, removeTo.getFragmentManager(), isIncludeSelf ? removeTo : null, removeTo);
}
/**
@@ -1378,11 +1416,7 @@ public static void removeTo(@NonNull final Fragment removeTo, final boolean isIn
*/
public static void removeAll(@NonNull final FragmentManager fm) {
List fragments = getFragments(fm);
- operateNoAnim(fm,
- TYPE_REMOVE_FRAGMENT,
- null,
- fragments.toArray(new Fragment[0])
- );
+ operateNoAnim(TYPE_REMOVE_FRAGMENT, fm, null, fragments.toArray(new Fragment[0]));
}
private static void putArgs(final Fragment fragment, final Args args) {
@@ -1414,8 +1448,7 @@ private static Args getArgs(final Fragment fragment) {
bundle.getBoolean(ARGS_IS_ADD_STACK));
}
- private static void operateNoAnim(@Nullable final FragmentManager fm,
- final int type,
+ private static void operateNoAnim(final int type, @Nullable final FragmentManager fm,
final Fragment src,
Fragment... dest) {
if (fm == null) return;
@@ -1493,6 +1526,7 @@ private static void operate(final int type,
break;
}
ft.commitAllowingStateLoss();
+ fm.executePendingTransactions();
}
private static void addAnim(final FragmentTransaction ft,
@@ -1542,14 +1576,14 @@ private static Fragment getTopIsInStack(@NonNull final FragmentManager fm,
if (isInStack) {
Bundle args = fragment.getArguments();
if (args != null && args.getBoolean(ARGS_IS_ADD_STACK)) {
- return getTopIsInStack(fragment.getChildFragmentManager(), parentFragment, true);
+ return getTopIsInStack(fragment.getChildFragmentManager(), fragment, true);
}
} else {
- return getTopIsInStack(fragment.getChildFragmentManager(), parentFragment, false);
+ return getTopIsInStack(fragment.getChildFragmentManager(), fragment, false);
}
}
}
- return null;
+ return parentFragment;
}
/**
diff --git a/lib/utilcode/src/main/java/com/blankj/utilcode/util/GsonUtils.java b/lib/utilcode/src/main/java/com/blankj/utilcode/util/GsonUtils.java
index 2951f9797f..c3eb0684c6 100644
--- a/lib/utilcode/src/main/java/com/blankj/utilcode/util/GsonUtils.java
+++ b/lib/utilcode/src/main/java/com/blankj/utilcode/util/GsonUtils.java
@@ -1,5 +1,7 @@
package com.blankj.utilcode.util;
+import android.text.TextUtils;
+
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.google.gson.reflect.TypeToken;
@@ -9,6 +11,9 @@
import java.util.List;
import java.util.Map;
import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+
+import androidx.annotation.NonNull;
/**
@@ -21,31 +26,58 @@
*/
public final class GsonUtils {
- private static final Gson GSON = createGson(true);
+ private static final String KEY_DEFAULT = "defaultGson";
+ private static final String KEY_DELEGATE = "delegateGson";
+ private static final String KEY_LOG_UTILS = "logUtilsGson";
- private static final Gson GSON_NO_NULLS = createGson(false);
+ private static final Map GSONS = new ConcurrentHashMap<>();
private GsonUtils() {
throw new UnsupportedOperationException("u can't instantiate me...");
}
/**
- * Gets pre-configured {@link Gson} instance.
+ * Set the delegate of {@link Gson}.
*
- * @return {@link Gson} instance.
+ * @param delegate The delegate of {@link Gson}.
*/
- public static Gson getGson() {
- return getGson(true);
+ public static void setGsonDelegate(Gson delegate) {
+ if (delegate == null) return;
+ GSONS.put(KEY_DELEGATE, delegate);
}
/**
- * Gets pre-configured {@link Gson} instance.
+ * Set the {@link Gson} with key.
*
- * @param serializeNulls Determines if nulls will be serialized.
- * @return {@link Gson} instance.
+ * @param key The key.
+ * @param gson The {@link Gson}.
*/
- public static Gson getGson(final boolean serializeNulls) {
- return serializeNulls ? GSON_NO_NULLS : GSON;
+ public static void setGson(final String key, final Gson gson) {
+ if (TextUtils.isEmpty(key) || gson == null) return;
+ GSONS.put(key, gson);
+ }
+
+ /**
+ * Return the {@link Gson} with key.
+ *
+ * @param key The key.
+ * @return the {@link Gson} with key
+ */
+ public static Gson getGson(final String key) {
+ return GSONS.get(key);
+ }
+
+ public static Gson getGson() {
+ Gson gsonDelegate = GSONS.get(KEY_DELEGATE);
+ if (gsonDelegate != null) {
+ return gsonDelegate;
+ }
+ Gson gsonDefault = GSONS.get(KEY_DEFAULT);
+ if (gsonDefault == null) {
+ gsonDefault = createGson();
+ GSONS.put(KEY_DEFAULT, gsonDefault);
+ }
+ return gsonDefault;
}
/**
@@ -55,86 +87,133 @@ public static Gson getGson(final boolean serializeNulls) {
* @return object serialized into json.
*/
public static String toJson(final Object object) {
- return toJson(object, true);
+ return toJson(getGson(), object);
}
/**
* Serializes an object into json.
*
- * @param object The object to serialize.
- * @param includeNulls Determines if nulls will be included.
+ * @param src The object to serialize.
+ * @param typeOfSrc The specific genericized type of src.
* @return object serialized into json.
*/
- public static String toJson(final Object object, final boolean includeNulls) {
- return includeNulls ? GSON.toJson(object) : GSON_NO_NULLS.toJson(object);
+ public static String toJson(final Object src, @NonNull final Type typeOfSrc) {
+ return toJson(getGson(), src, typeOfSrc);
}
/**
* Serializes an object into json.
*
- * @param src The object to serialize.
- * @param typeOfSrc The specific genericized type of src.
+ * @param gson The gson.
+ * @param object The object to serialize.
* @return object serialized into json.
*/
- public static String toJson(final Object src, final Type typeOfSrc) {
- return toJson(src, typeOfSrc, true);
+ public static String toJson(@NonNull final Gson gson, final Object object) {
+ return gson.toJson(object);
}
/**
* Serializes an object into json.
*
- * @param src The object to serialize.
- * @param typeOfSrc The specific genericized type of src.
- * @param includeNulls Determines if nulls will be included.
+ * @param gson The gson.
+ * @param src The object to serialize.
+ * @param typeOfSrc The specific genericized type of src.
* @return object serialized into json.
*/
- public static String toJson(final Object src, final Type typeOfSrc, final boolean includeNulls) {
- return includeNulls ? GSON.toJson(src, typeOfSrc) : GSON_NO_NULLS.toJson(src, typeOfSrc);
+ public static String toJson(@NonNull final Gson gson, final Object src, @NonNull final Type typeOfSrc) {
+ return gson.toJson(src, typeOfSrc);
+ }
+
+ /**
+ * Converts {@link String} to given type.
+ *
+ * @param json The json to convert.
+ * @param type Type json will be converted to.
+ * @return instance of type
+ */
+ public static T fromJson(final String json, @NonNull final Class type) {
+ return fromJson(getGson(), json, type);
+ }
+
+ /**
+ * Converts {@link String} to given type.
+ *
+ * @param json the json to convert.
+ * @param type type type json will be converted to.
+ * @return instance of type
+ */
+ public static T fromJson(final String json, @NonNull final Type type) {
+ return fromJson(getGson(), json, type);
}
+ /**
+ * Converts {@link Reader} to given type.
+ *
+ * @param reader the reader to convert.
+ * @param type type type json will be converted to.
+ * @return instance of type
+ */
+ public static T fromJson(@NonNull final Reader reader, @NonNull final Class type) {
+ return fromJson(getGson(), reader, type);
+ }
+
+ /**
+ * Converts {@link Reader} to given type.
+ *
+ * @param reader the reader to convert.
+ * @param type type type json will be converted to.
+ * @return instance of type
+ */
+ public static T fromJson(@NonNull final Reader reader, @NonNull final Type type) {
+ return fromJson(getGson(), reader, type);
+ }
/**
* Converts {@link String} to given type.
*
+ * @param gson The gson.
* @param json The json to convert.
* @param type Type json will be converted to.
* @return instance of type
*/
- public static T fromJson(final String json, final Class type) {
- return GSON.fromJson(json, type);
+ public static T fromJson(@NonNull final Gson gson, final String json, @NonNull final Class type) {
+ return gson.fromJson(json, type);
}
/**
* Converts {@link String} to given type.
*
+ * @param gson The gson.
* @param json the json to convert.
* @param type type type json will be converted to.
* @return instance of type
*/
- public static T fromJson(final String json, final Type type) {
- return GSON.fromJson(json, type);
+ public static T fromJson(@NonNull final Gson gson, final String json, @NonNull final Type type) {
+ return gson.fromJson(json, type);
}
/**
* Converts {@link Reader} to given type.
*
+ * @param gson The gson.
* @param reader the reader to convert.
* @param type type type json will be converted to.
* @return instance of type
*/
- public static T fromJson(final Reader reader, final Class type) {
- return GSON.fromJson(reader, type);
+ public static T fromJson(@NonNull final Gson gson, final Reader reader, @NonNull final Class type) {
+ return gson.fromJson(reader, type);
}
/**
* Converts {@link Reader} to given type.
*
+ * @param gson The gson.
* @param reader the reader to convert.
* @param type type type json will be converted to.
* @return instance of type
*/
- public static T fromJson(final Reader reader, final Type type) {
- return GSON.fromJson(reader, type);
+ public static T fromJson(@NonNull final Gson gson, final Reader reader, @NonNull final Type type) {
+ return gson.fromJson(reader, type);
}
/**
@@ -143,7 +222,7 @@ public static T fromJson(final Reader reader, final Type type) {
* @param type The type.
* @return the type of {@link List} with the {@code type}
*/
- public static Type getListType(final Type type) {
+ public static Type getListType(@NonNull final Type type) {
return TypeToken.getParameterized(List.class, type).getType();
}
@@ -153,7 +232,7 @@ public static Type getListType(final Type type) {
* @param type The type.
* @return the type of {@link Set} with the {@code type}
*/
- public static Type getSetType(final Type type) {
+ public static Type getSetType(@NonNull final Type type) {
return TypeToken.getParameterized(Set.class, type).getType();
}
@@ -164,7 +243,7 @@ public static Type getSetType(final Type type) {
* @param valueType The type of value.
* @return the type of map with the {@code keyType} and {@code valueType}
*/
- public static Type getMapType(final Type keyType, final Type valueType) {
+ public static Type getMapType(@NonNull final Type keyType, @NonNull final Type valueType) {
return TypeToken.getParameterized(Map.class, keyType, valueType).getType();
}
@@ -174,7 +253,7 @@ public static Type getMapType(final Type keyType, final Type valueType) {
* @param type The type.
* @return the type of map with the {@code type}
*/
- public static Type getArrayType(final Type type) {
+ public static Type getArrayType(@NonNull final Type type) {
return TypeToken.getArray(type).getType();
}
@@ -185,19 +264,20 @@ public static Type getArrayType(final Type type) {
* @param typeArguments The type of arguments.
* @return the type of map with the {@code type}
*/
- public static Type getType(final Type rawType, final Type... typeArguments) {
+ public static Type getType(@NonNull final Type rawType, @NonNull final Type... typeArguments) {
return TypeToken.getParameterized(rawType, typeArguments).getType();
}
- /**
- * Create a pre-configured {@link Gson} instance.
- *
- * @param serializeNulls determines if nulls will be serialized.
- * @return {@link Gson} instance.
- */
- private static Gson createGson(final boolean serializeNulls) {
- final GsonBuilder builder = new GsonBuilder();
- if (serializeNulls) builder.serializeNulls();
- return builder.create();
+ static Gson getGson4LogUtils() {
+ Gson gson4LogUtils = GSONS.get(KEY_LOG_UTILS);
+ if (gson4LogUtils == null) {
+ gson4LogUtils = new GsonBuilder().setPrettyPrinting().serializeNulls().create();
+ GSONS.put(KEY_LOG_UTILS, gson4LogUtils);
+ }
+ return gson4LogUtils;
+ }
+
+ private static Gson createGson() {
+ return new GsonBuilder().serializeNulls().disableHtmlEscaping().create();
}
}
diff --git a/lib/utilcode/src/main/java/com/blankj/utilcode/util/ImageUtils.java b/lib/utilcode/src/main/java/com/blankj/utilcode/util/ImageUtils.java
index c1b6c50f8f..e0d472428f 100644
--- a/lib/utilcode/src/main/java/com/blankj/utilcode/util/ImageUtils.java
+++ b/lib/utilcode/src/main/java/com/blankj/utilcode/util/ImageUtils.java
@@ -1,5 +1,7 @@
package com.blankj.utilcode.util;
+import android.Manifest;
+import android.content.ContentValues;
import android.content.res.Resources;
import android.graphics.Bitmap;
import android.graphics.Bitmap.CompressFormat;
@@ -12,6 +14,7 @@
import android.graphics.LinearGradient;
import android.graphics.Matrix;
import android.graphics.Paint;
+import android.graphics.Path;
import android.graphics.PixelFormat;
import android.graphics.PorterDuff;
import android.graphics.PorterDuffColorFilter;
@@ -22,18 +25,16 @@
import android.graphics.drawable.BitmapDrawable;
import android.graphics.drawable.Drawable;
import android.media.ExifInterface;
+import android.net.Uri;
import android.os.Build;
+import android.os.Environment;
+import android.provider.MediaStore;
import android.renderscript.Allocation;
import android.renderscript.Element;
import android.renderscript.RenderScript;
import android.renderscript.ScriptIntrinsicBlur;
-import android.support.annotation.ColorInt;
-import android.support.annotation.DrawableRes;
-import android.support.annotation.FloatRange;
-import android.support.annotation.IntRange;
-import android.support.annotation.NonNull;
-import android.support.annotation.RequiresApi;
-import android.support.v4.content.ContextCompat;
+import android.text.TextUtils;
+import android.util.Log;
import android.view.View;
import java.io.BufferedOutputStream;
@@ -46,6 +47,15 @@
import java.io.InputStream;
import java.io.OutputStream;
+import androidx.annotation.ColorInt;
+import androidx.annotation.DrawableRes;
+import androidx.annotation.FloatRange;
+import androidx.annotation.IntRange;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
+import androidx.core.content.ContextCompat;
+
/**
*
* author: Blankj
@@ -64,13 +74,24 @@ private ImageUtils() {
* Bitmap to bytes.
*
* @param bitmap The bitmap.
- * @param format The format of bitmap.
* @return bytes
*/
- public static byte[] bitmap2Bytes(final Bitmap bitmap, final CompressFormat format) {
+ public static byte[] bitmap2Bytes(final Bitmap bitmap) {
+ return bitmap2Bytes(bitmap, CompressFormat.PNG, 100);
+ }
+
+ /**
+ * Bitmap to bytes.
+ *
+ * @param bitmap The bitmap.
+ * @param format The format of bitmap.
+ * @param quality The quality.
+ * @return bytes
+ */
+ public static byte[] bitmap2Bytes(@Nullable final Bitmap bitmap, @NonNull final CompressFormat format, int quality) {
if (bitmap == null) return null;
ByteArrayOutputStream baos = new ByteArrayOutputStream();
- bitmap.compress(format, 100, baos);
+ bitmap.compress(format, quality, baos);
return baos.toByteArray();
}
@@ -80,7 +101,7 @@ public static byte[] bitmap2Bytes(final Bitmap bitmap, final CompressFormat form
* @param bytes The bytes.
* @return bitmap
*/
- public static Bitmap bytes2Bitmap(final byte[] bytes) {
+ public static Bitmap bytes2Bitmap(@Nullable final byte[] bytes) {
return (bytes == null || bytes.length == 0)
? null
: BitmapFactory.decodeByteArray(bytes, 0, bytes.length);
@@ -92,7 +113,8 @@ public static Bitmap bytes2Bitmap(final byte[] bytes) {
* @param drawable The drawable.
* @return bitmap
*/
- public static Bitmap drawable2Bitmap(final Drawable drawable) {
+ public static Bitmap drawable2Bitmap(@Nullable final Drawable drawable) {
+ if (drawable == null) return null;
if (drawable instanceof BitmapDrawable) {
BitmapDrawable bitmapDrawable = (BitmapDrawable) drawable;
if (bitmapDrawable.getBitmap() != null) {
@@ -124,10 +146,20 @@ public static Bitmap drawable2Bitmap(final Drawable drawable) {
* @param bitmap The bitmap.
* @return drawable
*/
- public static Drawable bitmap2Drawable(final Bitmap bitmap) {
+ public static Drawable bitmap2Drawable(@Nullable final Bitmap bitmap) {
return bitmap == null ? null : new BitmapDrawable(Utils.getApp().getResources(), bitmap);
}
+ /**
+ * Drawable to bytes.
+ *
+ * @param drawable The drawable.
+ * @return bytes
+ */
+ public static byte[] drawable2Bytes(@Nullable final Drawable drawable) {
+ return drawable == null ? null : bitmap2Bytes(drawable2Bitmap(drawable));
+ }
+
/**
* Drawable to bytes.
*
@@ -135,8 +167,8 @@ public static Drawable bitmap2Drawable(final Bitmap bitmap) {
* @param format The format of bitmap.
* @return bytes
*/
- public static byte[] drawable2Bytes(final Drawable drawable, final CompressFormat format) {
- return drawable == null ? null : bitmap2Bytes(drawable2Bitmap(drawable), format);
+ public static byte[] drawable2Bytes(final Drawable drawable, final CompressFormat format, int quality) {
+ return drawable == null ? null : bitmap2Bytes(drawable2Bitmap(drawable), format, quality);
}
/**
@@ -161,18 +193,24 @@ public static Bitmap view2Bitmap(final View view) {
boolean willNotCacheDrawing = view.willNotCacheDrawing();
view.setDrawingCacheEnabled(true);
view.setWillNotCacheDrawing(false);
- final Bitmap drawingCache = view.getDrawingCache();
+ Bitmap drawingCache = view.getDrawingCache();
Bitmap bitmap;
- if (null == drawingCache) {
+ if (null == drawingCache || drawingCache.isRecycled()) {
view.measure(View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED),
View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED));
view.layout(0, 0, view.getMeasuredWidth(), view.getMeasuredHeight());
view.buildDrawingCache();
- bitmap = Bitmap.createBitmap(view.getDrawingCache());
+ drawingCache = view.getDrawingCache();
+ if (null == drawingCache || drawingCache.isRecycled()) {
+ bitmap = Bitmap.createBitmap(view.getMeasuredWidth(), view.getMeasuredHeight(), Bitmap.Config.RGB_565);
+ Canvas canvas = new Canvas(bitmap);
+ view.draw(canvas);
+ } else {
+ bitmap = Bitmap.createBitmap(drawingCache);
+ }
} else {
bitmap = Bitmap.createBitmap(drawingCache);
}
- view.destroyDrawingCache();
view.setWillNotCacheDrawing(willNotCacheDrawing);
view.setDrawingCacheEnabled(drawingCacheEnabled);
return bitmap;
@@ -214,7 +252,7 @@ public static Bitmap getBitmap(final File file, final int maxWidth, final int ma
* @return bitmap
*/
public static Bitmap getBitmap(final String filePath) {
- if (isSpace(filePath)) return null;
+ if (UtilsBridge.isSpace(filePath)) return null;
return BitmapFactory.decodeFile(filePath);
}
@@ -227,7 +265,7 @@ public static Bitmap getBitmap(final String filePath) {
* @return bitmap
*/
public static Bitmap getBitmap(final String filePath, final int maxWidth, final int maxHeight) {
- if (isSpace(filePath)) return null;
+ if (UtilsBridge.isSpace(filePath)) return null;
BitmapFactory.Options options = new BitmapFactory.Options();
options.inJustDecodeBounds = true;
BitmapFactory.decodeFile(filePath, options);
@@ -257,8 +295,12 @@ public static Bitmap getBitmap(final InputStream is) {
*/
public static Bitmap getBitmap(final InputStream is, final int maxWidth, final int maxHeight) {
if (is == null) return null;
- byte[] bytes = input2Byte(is);
- return getBitmap(bytes, 0, maxWidth, maxHeight);
+ BitmapFactory.Options options = new BitmapFactory.Options();
+ options.inJustDecodeBounds = true;
+ BitmapFactory.decodeStream(is, null, options);
+ options.inSampleSize = calculateInSampleSize(options, maxWidth, maxHeight);
+ options.inJustDecodeBounds = false;
+ return BitmapFactory.decodeStream(is, null, options);
}
/**
@@ -303,6 +345,9 @@ public static Bitmap getBitmap(final byte[] data,
*/
public static Bitmap getBitmap(@DrawableRes final int resId) {
Drawable drawable = ContextCompat.getDrawable(Utils.getApp(), resId);
+ if (drawable == null) {
+ return null;
+ }
Canvas canvas = new Canvas();
Bitmap bitmap = Bitmap.createBitmap(drawable.getIntrinsicWidth(),
drawable.getIntrinsicHeight(),
@@ -753,11 +798,27 @@ public static Bitmap toRoundCorner(final Bitmap src,
*/
public static Bitmap toRoundCorner(final Bitmap src,
final float radius,
- @IntRange(from = 0) int borderSize,
+ @FloatRange(from = 0) float borderSize,
@ColorInt int borderColor) {
return toRoundCorner(src, radius, borderSize, borderColor, false);
}
+ /**
+ * Return the round corner bitmap.
+ *
+ * @param src The source of bitmap.
+ * @param radii Array of 8 values, 4 pairs of [X,Y] radii
+ * @param borderSize The size of border.
+ * @param borderColor The color of border.
+ * @return the round corner bitmap
+ */
+ public static Bitmap toRoundCorner(final Bitmap src,
+ final float[] radii,
+ @FloatRange(from = 0) float borderSize,
+ @ColorInt int borderColor) {
+ return toRoundCorner(src, radii, borderSize, borderColor, false);
+ }
+
/**
* Return the round corner bitmap.
*
@@ -770,7 +831,26 @@ public static Bitmap toRoundCorner(final Bitmap src,
*/
public static Bitmap toRoundCorner(final Bitmap src,
final float radius,
- @IntRange(from = 0) int borderSize,
+ @FloatRange(from = 0) float borderSize,
+ @ColorInt int borderColor,
+ final boolean recycle) {
+ float[] radii = {radius, radius, radius, radius, radius, radius, radius, radius};
+ return toRoundCorner(src, radii, borderSize, borderColor, recycle);
+ }
+
+ /**
+ * Return the round corner bitmap.
+ *
+ * @param src The source of bitmap.
+ * @param radii Array of 8 values, 4 pairs of [X,Y] radii
+ * @param borderSize The size of border.
+ * @param borderColor The color of border.
+ * @param recycle True to recycle the source of bitmap, false otherwise.
+ * @return the round corner bitmap
+ */
+ public static Bitmap toRoundCorner(final Bitmap src,
+ final float[] radii,
+ @FloatRange(from = 0) float borderSize,
@ColorInt int borderColor,
final boolean recycle) {
if (isEmptyBitmap(src)) return null;
@@ -784,14 +864,16 @@ public static Bitmap toRoundCorner(final Bitmap src,
RectF rectF = new RectF(0, 0, width, height);
float halfBorderSize = borderSize / 2f;
rectF.inset(halfBorderSize, halfBorderSize);
- canvas.drawRoundRect(rectF, radius, radius, paint);
+ Path path = new Path();
+ path.addRoundRect(rectF, radii, Path.Direction.CW);
+ canvas.drawPath(path, paint);
if (borderSize > 0) {
paint.setShader(null);
paint.setColor(borderColor);
paint.setStyle(Paint.Style.STROKE);
paint.setStrokeWidth(borderSize);
paint.setStrokeCap(Paint.Cap.ROUND);
- canvas.drawRoundRect(rectF, radius, radius, paint);
+ canvas.drawPath(path, paint);
}
if (recycle && !src.isRecycled() && ret != src) src.recycle();
return ret;
@@ -807,12 +889,46 @@ public static Bitmap toRoundCorner(final Bitmap src,
* @return the round corner bitmap with border
*/
public static Bitmap addCornerBorder(final Bitmap src,
- @IntRange(from = 1) final int borderSize,
+ @FloatRange(from = 1) final float borderSize,
@ColorInt final int color,
@FloatRange(from = 0) final float cornerRadius) {
return addBorder(src, borderSize, color, false, cornerRadius, false);
}
+ /**
+ * Return the round corner bitmap with border.
+ *
+ * @param src The source of bitmap.
+ * @param borderSize The size of border.
+ * @param color The color of border.
+ * @param radii Array of 8 values, 4 pairs of [X,Y] radii
+ * @return the round corner bitmap with border
+ */
+ public static Bitmap addCornerBorder(final Bitmap src,
+ @FloatRange(from = 1) final float borderSize,
+ @ColorInt final int color,
+ final float[] radii) {
+ return addBorder(src, borderSize, color, false, radii, false);
+ }
+
+ /**
+ * Return the round corner bitmap with border.
+ *
+ * @param src The source of bitmap.
+ * @param borderSize The size of border.
+ * @param color The color of border.
+ * @param radii Array of 8 values, 4 pairs of [X,Y] radii
+ * @param recycle True to recycle the source of bitmap, false otherwise.
+ * @return the round corner bitmap with border
+ */
+ public static Bitmap addCornerBorder(final Bitmap src,
+ @FloatRange(from = 1) final float borderSize,
+ @ColorInt final int color,
+ final float[] radii,
+ final boolean recycle) {
+ return addBorder(src, borderSize, color, false, radii, recycle);
+ }
+
/**
* Return the round corner bitmap with border.
*
@@ -824,7 +940,7 @@ public static Bitmap addCornerBorder(final Bitmap src,
* @return the round corner bitmap with border
*/
public static Bitmap addCornerBorder(final Bitmap src,
- @IntRange(from = 1) final int borderSize,
+ @FloatRange(from = 1) final float borderSize,
@ColorInt final int color,
@FloatRange(from = 0) final float cornerRadius,
final boolean recycle) {
@@ -840,7 +956,7 @@ public static Bitmap addCornerBorder(final Bitmap src,
* @return the round bitmap with border
*/
public static Bitmap addCircleBorder(final Bitmap src,
- @IntRange(from = 1) final int borderSize,
+ @FloatRange(from = 1) final float borderSize,
@ColorInt final int color) {
return addBorder(src, borderSize, color, true, 0, false);
}
@@ -855,7 +971,7 @@ public static Bitmap addCircleBorder(final Bitmap src,
* @return the round bitmap with border
*/
public static Bitmap addCircleBorder(final Bitmap src,
- @IntRange(from = 1) final int borderSize,
+ @FloatRange(from = 1) final float borderSize,
@ColorInt final int color,
final boolean recycle) {
return addBorder(src, borderSize, color, true, 0, recycle);
@@ -873,11 +989,33 @@ public static Bitmap addCircleBorder(final Bitmap src,
* @return the bitmap with border
*/
private static Bitmap addBorder(final Bitmap src,
- @IntRange(from = 1) final int borderSize,
+ @FloatRange(from = 1) final float borderSize,
@ColorInt final int color,
final boolean isCircle,
final float cornerRadius,
final boolean recycle) {
+ float[] radii = {cornerRadius, cornerRadius, cornerRadius, cornerRadius,
+ cornerRadius, cornerRadius, cornerRadius, cornerRadius};
+ return addBorder(src, borderSize, color, isCircle, radii, recycle);
+ }
+
+ /**
+ * Return the bitmap with border.
+ *
+ * @param src The source of bitmap.
+ * @param borderSize The size of border.
+ * @param color The color of border.
+ * @param isCircle True to draw circle, false to draw corner.
+ * @param radii Array of 8 values, 4 pairs of [X,Y] radii
+ * @param recycle True to recycle the source of bitmap, false otherwise.
+ * @return the bitmap with border
+ */
+ private static Bitmap addBorder(final Bitmap src,
+ @FloatRange(from = 1) final float borderSize,
+ @ColorInt final int color,
+ final boolean isCircle,
+ final float[] radii,
+ final boolean recycle) {
if (isEmptyBitmap(src)) return null;
Bitmap ret = recycle ? src : src.copy(src.getConfig(), true);
int width = ret.getWidth();
@@ -891,10 +1029,12 @@ private static Bitmap addBorder(final Bitmap src,
float radius = Math.min(width, height) / 2f - borderSize / 2f;
canvas.drawCircle(width / 2f, height / 2f, radius, paint);
} else {
- int halfBorderSize = borderSize >> 1;
- RectF rectF = new RectF(halfBorderSize, halfBorderSize,
- width - halfBorderSize, height - halfBorderSize);
- canvas.drawRoundRect(rectF, cornerRadius, cornerRadius, paint);
+ RectF rectF = new RectF(0, 0, width, height);
+ float halfBorderSize = borderSize / 2f;
+ rectF.inset(halfBorderSize, halfBorderSize);
+ Path path = new Path();
+ path.addRoundRect(rectF, radii, Path.Direction.CW);
+ canvas.drawPath(path, paint);
}
return ret;
}
@@ -1468,7 +1608,7 @@ public static Bitmap stackBlur(final Bitmap src, int radius, final boolean recyc
public static boolean save(final Bitmap src,
final String filePath,
final CompressFormat format) {
- return save(src, getFileByPath(filePath), format, false);
+ return save(src, filePath, format, 100, false);
}
/**
@@ -1480,7 +1620,7 @@ public static boolean save(final Bitmap src,
* @return {@code true}: successTarget APIs greater than 25 must hold
- * {@code
- *
- * @param filePath The path of file.
- * @param isNewTask True to add flag of new task, false otherwise.
- * @return the intent of install app
- */
- public static Intent getInstallAppIntent(final String filePath, final boolean isNewTask) {
- return getInstallAppIntent(getFileByPath(filePath), isNewTask);
+ if (!UtilsBridge.isFileExists(file)) return null;
+ Uri uri;
+ if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) {
+ uri = Uri.fromFile(file);
+ } else {
+ String authority = Utils.getApp().getPackageName() + ".utilcode.fileprovider";
+ uri = FileProvider.getUriForFile(Utils.getApp(), authority, file);
+ }
+ return getInstallAppIntent(uri);
}
/**
@@ -87,93 +85,68 @@ public static Intent getInstallAppIntent(final String filePath, final boolean is
* Target APIs greater than 25 must hold
* {@code
*
- * @param file The file.
- * @param isNewTask True to add flag of new task, false otherwise.
+ * @param uri The uri.
* @return the intent of install app
*/
- public static Intent getInstallAppIntent(final File file, final boolean isNewTask) {
- if (file == null) return null;
+ public static Intent getInstallAppIntent(final Uri uri) {
+ if (uri == null) return null;
Intent intent = new Intent(Intent.ACTION_VIEW);
- Uri data;
String type = "application/vnd.android.package-archive";
- if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) {
- data = Uri.fromFile(file);
- } else {
+ intent.setDataAndType(uri, type);
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
intent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
- String authority = Utils.getApp().getPackageName() + ".utilcode.provider";
- data = FileProvider.getUriForFile(Utils.getApp(), authority, file);
}
- intent.setDataAndType(data, type);
- return getIntent(intent, isNewTask);
- }
-
- /**
- * Return the intent of uninstall app.
- *
- * @param packageName The name of the package.
- * @return the intent of uninstall app
- */
- public static Intent getUninstallAppIntent(final String packageName) {
- return getUninstallAppIntent(packageName, false);
+ return intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
}
/**
* Return the intent of uninstall app.
+ * Target APIs greater than 25 must hold
+ * Must hold {@code
*
- * @param packageName The name of the package.
- * @param isNewTask True to add flag of new task, false otherwise.
+ * @param pkgName The name of the package.
* @return the intent of uninstall app
*/
- public static Intent getUninstallAppIntent(final String packageName, final boolean isNewTask) {
+ public static Intent getUninstallAppIntent(final String pkgName) {
Intent intent = new Intent(Intent.ACTION_DELETE);
- intent.setData(Uri.parse("package:" + packageName));
- return getIntent(intent, isNewTask);
+ intent.setData(Uri.parse("package:" + pkgName));
+ return intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
}
/**
* Return the intent of launch app.
*
- * @param packageName The name of the package.
+ * @param pkgName The name of the package.
* @return the intent of launch app
*/
- public static Intent getLaunchAppIntent(final String packageName) {
- return getLaunchAppIntent(packageName, false);
- }
-
- /**
- * Return the intent of launch app.
- *
- * @param packageName The name of the package.
- * @param isNewTask True to add flag of new task, false otherwise.
- * @return the intent of launch app
- */
- public static Intent getLaunchAppIntent(final String packageName, final boolean isNewTask) {
- Intent intent = Utils.getApp().getPackageManager().getLaunchIntentForPackage(packageName);
- if (intent == null) return null;
- return getIntent(intent, isNewTask);
+ public static Intent getLaunchAppIntent(final String pkgName) {
+ String launcherActivity = UtilsBridge.getLauncherActivity(pkgName);
+ if (UtilsBridge.isSpace(launcherActivity)) return null;
+ Intent intent = new Intent(Intent.ACTION_MAIN);
+ intent.addCategory(Intent.CATEGORY_LAUNCHER);
+ intent.setClassName(pkgName, launcherActivity);
+ return intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
}
/**
* Return the intent of launch app details settings.
*
- * @param packageName The name of the package.
+ * @param pkgName The name of the package.
* @return the intent of launch app details settings
*/
- public static Intent getLaunchAppDetailsSettingsIntent(final String packageName) {
- return getLaunchAppDetailsSettingsIntent(packageName, false);
+ public static Intent getLaunchAppDetailsSettingsIntent(final String pkgName) {
+ return getLaunchAppDetailsSettingsIntent(pkgName, false);
}
/**
* Return the intent of launch app details settings.
*
- * @param packageName The name of the package.
- * @param isNewTask True to add flag of new task, false otherwise.
+ * @param pkgName The name of the package.
* @return the intent of launch app details settings
*/
- public static Intent getLaunchAppDetailsSettingsIntent(final String packageName,
- final boolean isNewTask) {
+ public static Intent getLaunchAppDetailsSettingsIntent(final String pkgName, final boolean isNewTask) {
Intent intent = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
- intent.setData(Uri.parse("package:" + packageName));
+ intent.setData(Uri.parse("package:" + pkgName));
return getIntent(intent, isNewTask);
}
@@ -184,250 +157,223 @@ public static Intent getLaunchAppDetailsSettingsIntent(final String packageName,
* @return the intent of share text
*/
public static Intent getShareTextIntent(final String content) {
- return getShareTextIntent(content, false);
- }
-
- /**
- * Return the intent of share text.
- *
- * @param content The content.
- * @param isNewTask True to add flag of new task, false otherwise.
- * @return the intent of share text
- */
-
- public static Intent getShareTextIntent(final String content, final boolean isNewTask) {
Intent intent = new Intent(Intent.ACTION_SEND);
intent.setType("text/plain");
intent.putExtra(Intent.EXTRA_TEXT, content);
- return getIntent(intent, isNewTask);
+ intent = Intent.createChooser(intent, "");
+ return getIntent(intent, true);
}
/**
* Return the intent of share image.
*
- * @param content The content.
* @param imagePath The path of image.
* @return the intent of share image
*/
- public static Intent getShareImageIntent(final String content, final String imagePath) {
- return getShareImageIntent(content, imagePath, false);
+ public static Intent getShareImageIntent(final String imagePath) {
+ return getShareTextImageIntent("", imagePath);
}
/**
* Return the intent of share image.
*
- * @param content The content.
- * @param imagePath The path of image.
- * @param isNewTask True to add flag of new task, false otherwise.
+ * @param imageFile The file of image.
* @return the intent of share image
*/
- public static Intent getShareImageIntent(final String content,
- final String imagePath,
- final boolean isNewTask) {
- if (imagePath == null || imagePath.length() == 0) return null;
- return getShareImageIntent(content, new File(imagePath), isNewTask);
+ public static Intent getShareImageIntent(final File imageFile) {
+ return getShareTextImageIntent("", imageFile);
}
/**
* Return the intent of share image.
*
- * @param content The content.
- * @param image The file of image.
+ * @param imageUri The uri of image.
* @return the intent of share image
*/
- public static Intent getShareImageIntent(final String content, final File image) {
- return getShareImageIntent(content, image, false);
+ public static Intent getShareImageIntent(final Uri imageUri) {
+ return getShareTextImageIntent("", imageUri);
}
/**
* Return the intent of share image.
*
* @param content The content.
- * @param image The file of image.
- * @param isNewTask True to add flag of new task, false otherwise.
+ * @param imagePath The path of image.
* @return the intent of share image
*/
- public static Intent getShareImageIntent(final String content,
- final File image,
- final boolean isNewTask) {
- if (image == null || !image.isFile()) return null;
- return getShareImageIntent(content, file2Uri(image), isNewTask);
+ public static Intent getShareTextImageIntent(@Nullable final String content, final String imagePath) {
+ return getShareTextImageIntent(content, UtilsBridge.getFileByPath(imagePath));
}
/**
* Return the intent of share image.
*
- * @param content The content.
- * @param uri The uri of image.
+ * @param content The content.
+ * @param imageFile The file of image.
* @return the intent of share image
*/
- public static Intent getShareImageIntent(final String content, final Uri uri) {
- return getShareImageIntent(content, uri, false);
+ public static Intent getShareTextImageIntent(@Nullable final String content, final File imageFile) {
+ return getShareTextImageIntent(content, UtilsBridge.file2Uri(imageFile));
}
/**
* Return the intent of share image.
*
- * @param content The content.
- * @param uri The uri of image.
- * @param isNewTask True to add flag of new task, false otherwise.
+ * @param content The content.
+ * @param imageUri The uri of image.
* @return the intent of share image
*/
- public static Intent getShareImageIntent(final String content,
- final Uri uri,
- final boolean isNewTask) {
+ public static Intent getShareTextImageIntent(@Nullable final String content, final Uri imageUri) {
Intent intent = new Intent(Intent.ACTION_SEND);
intent.putExtra(Intent.EXTRA_TEXT, content);
- intent.putExtra(Intent.EXTRA_STREAM, uri);
+ intent.putExtra(Intent.EXTRA_STREAM, imageUri);
intent.setType("image/*");
- return getIntent(intent, isNewTask);
+ intent = Intent.createChooser(intent, "");
+ return getIntent(intent, true);
}
/**
* Return the intent of share images.
*
- * @param content The content.
* @param imagePaths The paths of images.
* @return the intent of share images
*/
- public static Intent getShareImageIntent(final String content, final LinkedList imagePaths) {
- return getShareImageIntent(content, imagePaths, false);
+ public static Intent getShareImageIntent(final LinkedList imagePaths) {
+ return getShareTextImageIntent("", imagePaths);
}
/**
* Return the intent of share images.
*
- * @param content The content.
- * @param imagePaths The paths of images.
- * @param isNewTask True to add flag of new task, false otherwise.
+ * @param images The files of images.
* @return the intent of share images
*/
- public static Intent getShareImageIntent(final String content,
- final LinkedList imagePaths,
- final boolean isNewTask) {
- if (imagePaths == null || imagePaths.isEmpty()) return null;
- List files = new ArrayList<>();
- for (String imagePath : imagePaths) {
- files.add(new File(imagePath));
- }
- return getShareImageIntent(content, files, isNewTask);
+ public static Intent getShareImageIntent(final List images) {
+ return getShareTextImageIntent("", images);
}
/**
* Return the intent of share images.
*
- * @param content The content.
- * @param images The files of images.
- * @return the intent of share images
+ * @param uris The uris of image.
+ * @return the intent of share image
*/
- public static Intent getShareImageIntent(final String content, final List images) {
- return getShareImageIntent(content, images, false);
+ public static Intent getShareImageIntent(final ArrayList uris) {
+ return getShareTextImageIntent("", uris);
}
/**
* Return the intent of share images.
*
- * @param content The content.
- * @param images The files of images.
- * @param isNewTask True to add flag of new task, false otherwise.
+ * @param content The content.
+ * @param imagePaths The paths of images.
* @return the intent of share images
*/
- public static Intent getShareImageIntent(final String content,
- final List images,
- final boolean isNewTask) {
- if (images == null || images.isEmpty()) return null;
- ArrayList uris = new ArrayList<>();
- for (File image : images) {
- if (!image.isFile()) continue;
- uris.add(file2Uri(image));
+ public static Intent getShareTextImageIntent(@Nullable final String content,
+ final LinkedList imagePaths) {
+ List files = new ArrayList<>();
+ if (imagePaths != null) {
+ for (String imagePath : imagePaths) {
+ File file = UtilsBridge.getFileByPath(imagePath);
+ if (file != null) {
+ files.add(file);
+ }
+ }
}
- return getShareImageIntent(content, uris, isNewTask);
+ return getShareTextImageIntent(content, files);
}
/**
* Return the intent of share images.
*
* @param content The content.
- * @param uris The uris of images.
+ * @param images The files of images.
* @return the intent of share images
*/
- public static Intent getShareImageIntent(final String content, final ArrayList uris) {
- return getShareImageIntent(content, uris, false);
+ public static Intent getShareTextImageIntent(@Nullable final String content, final List