Skip to content

Commit 554e7ed

Browse files
committed
屏蔽模糊功能
1 parent 9316bdd commit 554e7ed

File tree

2 files changed

+20
-33
lines changed

2 files changed

+20
-33
lines changed

dragsloplayout/src/main/java/com/dl7/drag/DragSlopLayout.java

Lines changed: 16 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -2,28 +2,15 @@
22

33
import android.content.Context;
44
import android.content.res.TypedArray;
5-
import android.graphics.Bitmap;
6-
import android.graphics.Canvas;
7-
import android.graphics.Color;
8-
import android.graphics.drawable.BitmapDrawable;
9-
import android.graphics.drawable.ClipDrawable;
10-
import android.graphics.drawable.ColorDrawable;
11-
import android.graphics.drawable.Drawable;
12-
import android.os.Build;
135
import android.support.annotation.IntDef;
146
import android.support.v4.view.MotionEventCompat;
157
import android.support.v4.view.ViewCompat;
168
import android.support.v4.view.ViewPager;
179
import android.support.v4.widget.NestedScrollView;
1810
import android.support.v4.widget.ScrollerCompat;
1911
import android.support.v4.widget.ViewDragHelper;
20-
import android.support.v8.renderscript.Allocation;
21-
import android.support.v8.renderscript.Element;
22-
import android.support.v8.renderscript.RenderScript;
23-
import android.support.v8.renderscript.ScriptIntrinsicBlur;
2412
import android.util.AttributeSet;
2513
import android.view.GestureDetector;
26-
import android.view.Gravity;
2714
import android.view.MotionEvent;
2815
import android.view.View;
2916
import android.view.ViewConfiguration;
@@ -252,10 +239,10 @@ protected void onDetachedFromWindow() {
252239
if (mAnimPresenter != null) {
253240
mAnimPresenter.stopAllAnimator();
254241
}
255-
if (mBitmapToBlur != null) {
242+
/*if (mBitmapToBlur != null) {
256243
mBitmapToBlur.recycle();
257244
mBitmapToBlur = null;
258-
}
245+
}*/
259246
}
260247

261248
/***********************************
@@ -587,7 +574,7 @@ private void _dragPositionChanged(int visibleHeight, float percent) {
587574
mIsUp = (mDragViewTop < mLastDragViewTop);
588575
mLastDragViewTop = mDragViewTop;
589576
}
590-
if (mEnableBlur && mBlurDrawable != null) {
577+
/*if (mEnableBlur && mBlurDrawable != null) {
591578
if (visibleHeight < mFixHeight) {
592579
return;
593580
}
@@ -598,7 +585,7 @@ private void _dragPositionChanged(int visibleHeight, float percent) {
598585
mBlurDrawable.setLevel(blurLevel);
599586
}
600587
mBlurDrawable.setAlpha((int) (percent * 255));
601-
}
588+
}*/
602589
if (visibleHeight >= 0) {
603590
ViewCompat.setTranslationY(mMainView, -visibleHeight * (1 - mCollapseParallax));
604591
}
@@ -635,9 +622,9 @@ private boolean _isNeedIntercept(MotionEvent ev) {
635622
if (mDragHelper.isViewUnder(mAttachScrollView, (int) ev.getX(), y) && mMode != MODE_ANIMATE) {
636623
return true;
637624
}
638-
if (mEnableBlur && mDragStatus == STATUS_EXPANDED) {
625+
/*if (mEnableBlur && mDragStatus == STATUS_EXPANDED) {
639626
return true;
640-
}
627+
}*/
641628
return false;
642629
}
643630

@@ -874,7 +861,7 @@ public void setCustomAnimator(CustomViewAnimator inAnimator, CustomViewAnimator
874861
/*************************************
875862
* Blur
876863
********************************************/
877-
private final static int DEFAULT_SAMPLE_FACTOR = 4;
864+
/*private final static int DEFAULT_SAMPLE_FACTOR = 4;
878865
private final static int DEFAULT_BLUR_RADIUS = 5;
879866
880867
// 使能模糊
@@ -918,11 +905,11 @@ public void setBlurFull(boolean blurFull) {
918905
mIsBlurFull = blurFull;
919906
}
920907
921-
/**
908+
*//**
922909
* 设置使能模糊效果
923910
*
924911
* @param enableBlur
925-
*/
912+
*//*
926913
public void setEnableBlur(boolean enableBlur) {
927914
if (mEnableBlur == enableBlur) {
928915
return;
@@ -953,21 +940,21 @@ public void run() {
953940
}
954941
}
955942
956-
/**
943+
*//**
957944
* 刷新模糊视图
958-
*/
945+
*//*
959946
public void updateBlurView() {
960947
if (mEnableBlur) {
961948
mBlurDrawable = null;
962949
_handleBlurInThread();
963950
}
964951
}
965952
966-
/**
953+
*//**
967954
* 模糊视图
968955
*
969956
* @param view
970-
*/
957+
*//*
971958
private void _blurView(View view) {
972959
final int width = view.getWidth();
973960
final int height = view.getHeight();
@@ -1030,9 +1017,9 @@ private void _blurView(View view) {
10301017
}
10311018
}
10321019
1033-
/**
1020+
*//**
10341021
* 在线程处理图片模糊
1035-
*/
1022+
*//*
10361023
@SuppressWarnings("deprecation")
10371024
private void _handleBlurInThread() {
10381025
new Thread(new Runnable() {
@@ -1053,7 +1040,7 @@ public void run() {
10531040
}
10541041
}).start();
10551042
}
1056-
1043+
*/
10571044
/** ================================ 监听器 ================================ */
10581045

10591046
// 监听器

simple/src/main/java/com/dl7/simple/drag/activity/DragBlurActivity.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ protected void onCreate(Bundle savedInstanceState) {
4646
setContentView(R.layout.activity_drag_blur);
4747
ButterKnife.bind(this);
4848
initToolBar(mToolBar, true, "");
49-
mDragLayout.setEnableBlur(true);
49+
// mDragLayout.setEnableBlur(true);
5050
}
5151

5252
@Override
@@ -60,10 +60,10 @@ public boolean onOptionsItemSelected(MenuItem item) {
6060
item.setChecked(true);
6161
switch (item.getItemId()) {
6262
case R.id.blur_local:
63-
mDragLayout.setBlurFull(false);
63+
// mDragLayout.setBlurFull(false);
6464
return true;
6565
case R.id.blur_full:
66-
mDragLayout.setBlurFull(true);
66+
// mDragLayout.setBlurFull(true);
6767
return true;
6868
}
6969
return super.onOptionsItemSelected(item);
@@ -77,7 +77,7 @@ public void onClick(View view) {
7777
break;
7878
case R.id.ll_next:
7979
mIvPhoto.setImageResource(mImgRes[mIndex++ % mImgRes.length]);
80-
mDragLayout.updateBlurView();
80+
// mDragLayout.updateBlurView();
8181
break;
8282
case R.id.ll_download:
8383
Toast.makeText(this, "下载", Toast.LENGTH_SHORT).show();

0 commit comments

Comments
 (0)