diff --git a/dragsloplayout/build.gradle b/dragsloplayout/build.gradle index ab4155d..0e38556 100644 --- a/dragsloplayout/build.gradle +++ b/dragsloplayout/build.gradle @@ -11,8 +11,8 @@ android { targetSdkVersion 23 versionCode 4 versionName "1.0.4" - renderscriptTargetApi 23 - renderscriptSupportModeEnabled true +// renderscriptTargetApi 23 +// renderscriptSupportModeEnabled true } buildTypes { release { diff --git a/dragsloplayout/src/main/java/com/dl7/drag/DragSlopLayout.java b/dragsloplayout/src/main/java/com/dl7/drag/DragSlopLayout.java index 9640a2a..e128aad 100644 --- a/dragsloplayout/src/main/java/com/dl7/drag/DragSlopLayout.java +++ b/dragsloplayout/src/main/java/com/dl7/drag/DragSlopLayout.java @@ -2,14 +2,6 @@ import android.content.Context; import android.content.res.TypedArray; -import android.graphics.Bitmap; -import android.graphics.Canvas; -import android.graphics.Color; -import android.graphics.drawable.BitmapDrawable; -import android.graphics.drawable.ClipDrawable; -import android.graphics.drawable.ColorDrawable; -import android.graphics.drawable.Drawable; -import android.os.Build; import android.support.annotation.IntDef; import android.support.v4.view.MotionEventCompat; import android.support.v4.view.ViewCompat; @@ -17,13 +9,8 @@ import android.support.v4.widget.NestedScrollView; import android.support.v4.widget.ScrollerCompat; import android.support.v4.widget.ViewDragHelper; -import android.support.v8.renderscript.Allocation; -import android.support.v8.renderscript.Element; -import android.support.v8.renderscript.RenderScript; -import android.support.v8.renderscript.ScriptIntrinsicBlur; import android.util.AttributeSet; import android.view.GestureDetector; -import android.view.Gravity; import android.view.MotionEvent; import android.view.View; import android.view.ViewConfiguration; @@ -260,10 +247,10 @@ protected void onDetachedFromWindow() { if (mAnimPresenter != null) { mAnimPresenter.stopAllAnimator(); } - if (mBitmapToBlur != null) { + /*if (mBitmapToBlur != null) { mBitmapToBlur.recycle(); mBitmapToBlur = null; - } + }*/ } /*********************************** @@ -607,7 +594,7 @@ private void _dragPositionChanged(int visibleHeight, float percent) { mIsUp = (mDragViewTop < mLastDragViewTop); mLastDragViewTop = mDragViewTop; } - if (mEnableBlur && mBlurDrawable != null) { + /*if (mEnableBlur && mBlurDrawable != null) { if (visibleHeight < mFixHeight) { return; } @@ -618,7 +605,7 @@ private void _dragPositionChanged(int visibleHeight, float percent) { mBlurDrawable.setLevel(blurLevel); } mBlurDrawable.setAlpha((int) (percent * 255)); - } + }*/ if (visibleHeight >= 0) { ViewCompat.setTranslationY(mMainView, -visibleHeight * (1 - mCollapseParallax)); } @@ -655,9 +642,9 @@ private boolean _isNeedIntercept(MotionEvent ev) { if (mDragHelper.isViewUnder(mAttachScrollView, (int) ev.getX(), y) && mMode != MODE_ANIMATE) { return true; } - if (mEnableBlur && mDragStatus == STATUS_EXPANDED) { + /*if (mEnableBlur && mDragStatus == STATUS_EXPANDED) { return true; - } + }*/ return false; } @@ -894,7 +881,7 @@ public void setCustomAnimator(CustomViewAnimator inAnimator, CustomViewAnimator /************************************* * Blur ********************************************/ - private final static int DEFAULT_SAMPLE_FACTOR = 4; + /*private final static int DEFAULT_SAMPLE_FACTOR = 4; private final static int DEFAULT_BLUR_RADIUS = 5; // 使能模糊 @@ -938,11 +925,11 @@ public void setBlurFull(boolean blurFull) { mIsBlurFull = blurFull; } - /** + *//** * 设置使能模糊效果 * * @param enableBlur - */ + *//* public void setEnableBlur(boolean enableBlur) { if (mEnableBlur == enableBlur) { return; @@ -973,9 +960,9 @@ public void run() { } } - /** + *//** * 刷新模糊视图 - */ + *//* public void updateBlurView() { if (mEnableBlur) { mBlurDrawable = null; @@ -983,11 +970,11 @@ public void updateBlurView() { } } - /** + *//** * 模糊视图 * * @param view - */ + *//* private void _blurView(View view) { final int width = view.getWidth(); final int height = view.getHeight(); @@ -1050,9 +1037,9 @@ private void _blurView(View view) { } } - /** + *//** * 在线程处理图片模糊 - */ + *//* @SuppressWarnings("deprecation") private void _handleBlurInThread() { new Thread(new Runnable() { @@ -1073,7 +1060,7 @@ public void run() { } }).start(); } - +*/ /** ================================ 监听器 ================================ */ // 监听器 diff --git a/simple/src/main/java/com/dl7/simple/drag/activity/DragBlurActivity.java b/simple/src/main/java/com/dl7/simple/drag/activity/DragBlurActivity.java index 1e54a15..2f593c2 100644 --- a/simple/src/main/java/com/dl7/simple/drag/activity/DragBlurActivity.java +++ b/simple/src/main/java/com/dl7/simple/drag/activity/DragBlurActivity.java @@ -46,7 +46,7 @@ protected void onCreate(Bundle savedInstanceState) { setContentView(R.layout.activity_drag_blur); ButterKnife.bind(this); initToolBar(mToolBar, true, ""); - mDragLayout.setEnableBlur(true); +// mDragLayout.setEnableBlur(true); } @Override @@ -60,10 +60,10 @@ public boolean onOptionsItemSelected(MenuItem item) { item.setChecked(true); switch (item.getItemId()) { case R.id.blur_local: - mDragLayout.setBlurFull(false); +// mDragLayout.setBlurFull(false); return true; case R.id.blur_full: - mDragLayout.setBlurFull(true); +// mDragLayout.setBlurFull(true); return true; } return super.onOptionsItemSelected(item); @@ -77,7 +77,7 @@ public void onClick(View view) { break; case R.id.ll_next: mIvPhoto.setImageResource(mImgRes[mIndex++ % mImgRes.length]); - mDragLayout.updateBlurView(); +// mDragLayout.updateBlurView(); break; case R.id.ll_download: Toast.makeText(this, "下载", Toast.LENGTH_SHORT).show();