You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by lu...@apache.org on 2019/08/02 08:06:14 UTC
[incubator-weex] branch master updated: [Android] Add some
annotation to suppress android lint. (#2779)
This is an automated email from the ASF dual-hosted git repository.
luckychen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-weex.git
The following commit(s) were added to refs/heads/master by this push:
new 9ea64b9 [Android] Add some annotation to suppress android lint. (#2779)
9ea64b9 is described below
commit 9ea64b90a61b1e3f888d2bf18828acdd2f4c874a
Author: YorkShen <sh...@gmail.com>
AuthorDate: Fri Aug 2 16:06:09 2019 +0800
[Android] Add some annotation to suppress android lint. (#2779)
---
.../main/java/com/taobao/weex/ui/component/WXComponent.java | 1 +
.../src/main/java/com/taobao/weex/ui/component/WXSlider.java | 2 ++
.../com/taobao/weex/ui/component/list/BasicListComponent.java | 1 +
.../weex/ui/component/pesudo/TouchActivePseudoListener.java | 2 ++
.../com/taobao/weex/ui/component/richtext/WXRichTextView.java | 2 ++
.../main/java/com/taobao/weex/ui/view/WXCircleViewPager.java | 1 +
.../sdk/src/main/java/com/taobao/weex/ui/view/WXEditText.java | 1 +
.../java/com/taobao/weex/ui/view/WXHorizontalScrollView.java | 2 ++
.../sdk/src/main/java/com/taobao/weex/ui/view/WXImageView.java | 4 +---
.../src/main/java/com/taobao/weex/ui/view/WXScrollView.java | 1 +
.../src/main/java/com/taobao/weex/ui/view/WXSwitchView.java | 2 ++
.../sdk/src/main/java/com/taobao/weex/ui/view/WXTextView.java | 5 ++---
.../sdk/src/main/java/com/taobao/weex/ui/view/WXVideoView.java | 1 +
.../main/java/com/taobao/weex/ui/view/gesture/WXGesture.java | 10 +++++-----
.../java/com/taobao/weex/ui/view/listview/WXRecyclerView.java | 2 ++
.../src/main/java/com/taobao/weex/utils/WXSoInstallMgrSdk.java | 2 ++
16 files changed, 28 insertions(+), 11 deletions(-)
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java
index 7d4fdcb..e7be2ff 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java
@@ -1680,6 +1680,7 @@ public abstract class WXComponent<T extends View> extends WXBasicComponent imple
new int[]{rippleColor});
return new RippleDrawable(colorStateList, new ColorDrawable(colorInt), null) {
@Override
+ @SuppressLint("CanvasSize")
public void draw(@NonNull Canvas canvas) {
if (mBackgroundDrawable != null) {
Path border = mBackgroundDrawable.getContentPath(new RectF(0, 0, canvas.getWidth(), canvas.getHeight()));
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXSlider.java b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXSlider.java
index 6a91644..c2806fa 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXSlider.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXSlider.java
@@ -18,6 +18,7 @@
*/
package com.taobao.weex.ui.component;
+import android.annotation.SuppressLint;
import android.content.Context;
import android.support.annotation.NonNull;
import android.support.v4.view.ViewPager;
@@ -554,6 +555,7 @@ public class WXSlider extends WXVContainer<FrameLayout> {
}
}
+ @SuppressLint("ClickableViewAccessibility")
private void hackTwoItemsInfiniteScroll() {
if (mViewPager == null || mAdapter == null) {
return;
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/BasicListComponent.java b/android/sdk/src/main/java/com/taobao/weex/ui/component/list/BasicListComponent.java
index 3eeeb57..eba3b3f 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/BasicListComponent.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/component/list/BasicListComponent.java
@@ -939,6 +939,7 @@ public abstract class BasicListComponent<T extends ViewGroup & ListComponentView
if (anchorComponent != null && anchorComponent.getHostView() != null && !isExcluded) {
View anchor = anchorComponent.getHostView();
anchor.setOnTouchListener(new View.OnTouchListener() {
+ @SuppressLint("ClickableViewAccessibility")
@Override
public boolean onTouch(View v, MotionEvent event) {
if (MotionEventCompat.getActionMasked(event) == MotionEvent.ACTION_DOWN) {
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/pesudo/TouchActivePseudoListener.java b/android/sdk/src/main/java/com/taobao/weex/ui/component/pesudo/TouchActivePseudoListener.java
index 8caf3f2..1834675 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/component/pesudo/TouchActivePseudoListener.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/component/pesudo/TouchActivePseudoListener.java
@@ -18,6 +18,7 @@
*/
package com.taobao.weex.ui.component.pesudo;
+import android.annotation.SuppressLint;
import android.view.MotionEvent;
import android.view.View;
@@ -33,6 +34,7 @@ public class TouchActivePseudoListener implements View.OnTouchListener {
mIsConsumeOnTouch = consumeInTouch;
}
+ @SuppressLint("ClickableViewAccessibility")
@Override
public boolean onTouch(View v, MotionEvent event) {
int action = event.getAction();
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/richtext/WXRichTextView.java b/android/sdk/src/main/java/com/taobao/weex/ui/component/richtext/WXRichTextView.java
index 86f670b..4605201 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/component/richtext/WXRichTextView.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/component/richtext/WXRichTextView.java
@@ -18,6 +18,7 @@
*/
package com.taobao.weex.ui.component.richtext;
+import android.annotation.SuppressLint;
import android.content.Context;
import android.graphics.drawable.Drawable;
import android.text.Layout;
@@ -37,6 +38,7 @@ public class WXRichTextView extends WXTextView {
super(context);
}
+ @SuppressLint("ClickableViewAccessibility")
@Override
public boolean onTouchEvent(MotionEvent event) {
boolean superResult = super.onTouchEvent(event);
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/view/WXCircleViewPager.java b/android/sdk/src/main/java/com/taobao/weex/ui/view/WXCircleViewPager.java
index 6c19615..fc48fe4 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/view/WXCircleViewPager.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/view/WXCircleViewPager.java
@@ -150,6 +150,7 @@ public class WXCircleViewPager extends ViewPager implements WXGestureObservable
return false;
}
+ @SuppressLint("ClickableViewAccessibility")
@Override
public boolean onTouchEvent(MotionEvent ev) {
if(!scrollable) {
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/view/WXEditText.java b/android/sdk/src/main/java/com/taobao/weex/ui/view/WXEditText.java
index 5fa5dde..3607c41 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/view/WXEditText.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/view/WXEditText.java
@@ -67,6 +67,7 @@ public class WXEditText extends EditText implements WXGestureObservable {
mLines = lines;
}
+ @SuppressLint("ClickableViewAccessibility")
@Override
public boolean onTouchEvent(MotionEvent event) {
boolean result = super.onTouchEvent(event);
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/view/WXHorizontalScrollView.java b/android/sdk/src/main/java/com/taobao/weex/ui/view/WXHorizontalScrollView.java
index 9f4cdde..8ae842d 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/view/WXHorizontalScrollView.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/view/WXHorizontalScrollView.java
@@ -18,6 +18,7 @@
*/
package com.taobao.weex.ui.view;
+import android.annotation.SuppressLint;
import android.content.Context;
import android.graphics.Rect;
import android.util.AttributeSet;
@@ -105,6 +106,7 @@ public class WXHorizontalScrollView extends HorizontalScrollView implements IWXS
return result;
}
+ @SuppressLint("ClickableViewAccessibility")
@Override
public boolean onTouchEvent(MotionEvent ev) {
if(!scrollable) {
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/view/WXImageView.java b/android/sdk/src/main/java/com/taobao/weex/ui/view/WXImageView.java
index efe9468..5ef242f 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/view/WXImageView.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/view/WXImageView.java
@@ -23,20 +23,17 @@ import android.content.Context;
import android.graphics.Bitmap;
import android.graphics.drawable.BitmapDrawable;
import android.graphics.drawable.Drawable;
-import android.support.annotation.Keep;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.view.MotionEvent;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageView;
-
import com.taobao.weex.ui.component.WXImage;
import com.taobao.weex.ui.view.gesture.WXGesture;
import com.taobao.weex.ui.view.gesture.WXGestureObservable;
import com.taobao.weex.utils.ImageDrawable;
import com.taobao.weex.utils.WXLogUtils;
-
import java.lang.ref.WeakReference;
import java.util.Arrays;
@@ -108,6 +105,7 @@ public class WXImageView extends ImageView implements WXGestureObservable,
return wxGesture;
}
+ @SuppressLint("ClickableViewAccessibility")
@Override
public boolean onTouchEvent(MotionEvent event) {
boolean result = super.onTouchEvent(event);
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/view/WXScrollView.java b/android/sdk/src/main/java/com/taobao/weex/ui/view/WXScrollView.java
index ec69621..cc5b1c2 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/view/WXScrollView.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/view/WXScrollView.java
@@ -182,6 +182,7 @@ public class WXScrollView extends ScrollView implements Callback, IWXScroller,
}
}
+ @SuppressLint("ClickableViewAccessibility")
@Override
public boolean onTouchEvent(MotionEvent ev) {
if(!scrollable) {
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/view/WXSwitchView.java b/android/sdk/src/main/java/com/taobao/weex/ui/view/WXSwitchView.java
index abba9f8..dd64e7a 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/view/WXSwitchView.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/view/WXSwitchView.java
@@ -18,6 +18,7 @@
*/
package com.taobao.weex.ui.view;
+import android.annotation.SuppressLint;
import android.content.Context;
import android.support.v7.widget.SwitchCompat;
import android.view.Gravity;
@@ -46,6 +47,7 @@ public class WXSwitchView extends SwitchCompat implements WXGestureObservable {
return wxGesture;
}
+ @SuppressLint("ClickableViewAccessibility")
@Override
public boolean onTouchEvent(MotionEvent event) {
boolean result = super.onTouchEvent(event);
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/view/WXTextView.java b/android/sdk/src/main/java/com/taobao/weex/ui/view/WXTextView.java
index 314123c..73a84c9 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/view/WXTextView.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/view/WXTextView.java
@@ -18,11 +18,11 @@
*/
package com.taobao.weex.ui.view;
+import android.annotation.SuppressLint;
import android.content.ClipData;
import android.content.ClipboardManager;
import android.content.Context;
import android.graphics.Canvas;
-import android.graphics.Color;
import android.support.annotation.ColorInt;
import android.support.annotation.Nullable;
import android.support.v7.widget.PopupMenu;
@@ -31,11 +31,9 @@ import android.text.TextUtils;
import android.view.MenuItem;
import android.view.MotionEvent;
import android.view.View;
-
import com.taobao.weex.ui.component.WXText;
import com.taobao.weex.ui.view.gesture.WXGesture;
import com.taobao.weex.ui.view.gesture.WXGestureObservable;
-
import java.lang.ref.WeakReference;
/**
@@ -65,6 +63,7 @@ public class WXTextView extends View implements WXGestureObservable, IWXTextView
canvas.restore();
}
+ @SuppressLint("ClickableViewAccessibility")
@Override
public boolean onTouchEvent(MotionEvent event) {
boolean result = super.onTouchEvent(event);
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/view/WXVideoView.java b/android/sdk/src/main/java/com/taobao/weex/ui/view/WXVideoView.java
index 5abe212..6b671cb 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/view/WXVideoView.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/view/WXVideoView.java
@@ -64,6 +64,7 @@ public class WXVideoView extends VideoView implements WXGestureObservable {
mVideoPauseListener = listener;
}
+ @SuppressLint("ClickableViewAccessibility")
@Override
public boolean onTouchEvent(MotionEvent event) {
boolean result = super.onTouchEvent(event);
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/view/gesture/WXGesture.java b/android/sdk/src/main/java/com/taobao/weex/ui/view/gesture/WXGesture.java
index fecbb43..6e88d67 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/view/gesture/WXGesture.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/view/gesture/WXGesture.java
@@ -18,6 +18,10 @@
*/
package com.taobao.weex.ui.view.gesture;
+import static com.taobao.weex.common.Constants.Event.STOP_PROPAGATION;
+import static com.taobao.weex.common.Constants.Event.STOP_PROPAGATION_RAX;
+
+import android.annotation.SuppressLint;
import android.content.Context;
import android.graphics.Point;
import android.graphics.PointF;
@@ -30,7 +34,6 @@ import android.view.View;
import android.view.View.OnTouchListener;
import android.view.ViewGroup;
import android.view.ViewParent;
-
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.taobao.weex.bridge.EventResult;
@@ -44,16 +47,12 @@ import com.taobao.weex.ui.view.gesture.WXGestureType.LowLevelGesture;
import com.taobao.weex.utils.WXLogUtils;
import com.taobao.weex.utils.WXUtils;
import com.taobao.weex.utils.WXViewUtils;
-
import java.util.ArrayList;
import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
-import static com.taobao.weex.common.Constants.Event.STOP_PROPAGATION;
-import static com.taobao.weex.common.Constants.Event.STOP_PROPAGATION_RAX;
-
public class WXGesture extends GestureDetector.SimpleOnGestureListener implements OnTouchListener {
private final static String TAG = "Gesture";
@@ -207,6 +206,7 @@ public class WXGesture extends GestureDetector.SimpleOnGestureListener implement
return false;
}
+ @SuppressLint("ClickableViewAccessibility")
@Override
public boolean onTouch(View v, MotionEvent event) {
if(requestDisallowInterceptTouchEvent){
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/view/listview/WXRecyclerView.java b/android/sdk/src/main/java/com/taobao/weex/ui/view/listview/WXRecyclerView.java
index d29b7ae..3f0d990 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/view/listview/WXRecyclerView.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/view/listview/WXRecyclerView.java
@@ -18,6 +18,7 @@
*/
package com.taobao.weex.ui.view.listview;
+import android.annotation.SuppressLint;
import android.annotation.TargetApi;
import android.content.Context;
import android.os.Build;
@@ -88,6 +89,7 @@ public class WXRecyclerView extends RecyclerView implements WXGestureObservable
return mGesture;
}
+ @SuppressLint("ClickableViewAccessibility")
@Override
public boolean onTouchEvent(MotionEvent event) {
if(!scrollable) {
diff --git a/android/sdk/src/main/java/com/taobao/weex/utils/WXSoInstallMgrSdk.java b/android/sdk/src/main/java/com/taobao/weex/utils/WXSoInstallMgrSdk.java
index 463d1a6..35a3086 100644
--- a/android/sdk/src/main/java/com/taobao/weex/utils/WXSoInstallMgrSdk.java
+++ b/android/sdk/src/main/java/com/taobao/weex/utils/WXSoInstallMgrSdk.java
@@ -217,6 +217,7 @@ public class WXSoInstallMgrSdk {
/**
* copyStartUpSo
*/
+ @SuppressLint("SdCardPath")
public static void copyStartUpSo() {
try {
// copy libjsb.so to cache/weex/jsb/cputype
@@ -402,6 +403,7 @@ public class WXSoInstallMgrSdk {
* @param version the version of the so library
* @return the path of the so library
*/
+ @SuppressLint("SdCardPath")
static String _targetSoFile(String libName, int version) {
Context context = mContext;
if (null == context) {