[GitHub] YorkShen closed pull request #1663: * [android] Support attr controls

[GitBox <gi...@apache.org>]

YorkShen closed pull request #1663:  * [android] Support attr controls
URL: https://github.com/apache/incubator-weex/pull/1663
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/android/sdk/src/main/java/com/taobao/weex/common/Constants.java b/android/sdk/src/main/java/com/taobao/weex/common/Constants.java
index 3b540edfec..b311077515 100644
--- a/android/sdk/src/main/java/com/taobao/weex/common/Constants.java
+++ b/android/sdk/src/main/java/com/taobao/weex/common/Constants.java
@@ -120,6 +120,7 @@
     String AUTO_RECYCLE = "autoBitmapRecycle";
     String SHOW_INDICATORS = "showIndicators";
     String AUTO_PLAY = "autoPlay";
+    String CONTROLS = "controls";
     String SCROLL_DIRECTION = "scrollDirection";
     String SCOPE = "scope";
     String RECYCLE = "recycle";
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXVideo.java b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXVideo.java
index 22be6884cd..44b0d26000 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXVideo.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXVideo.java
@@ -65,7 +65,6 @@ public WXVideo(WXSDKInstance instance, WXVContainer parent, boolean isLazy, Basi
   @Override
   protected FrameLayout initComponentHostView(@NonNull Context context) {
     final WXVideoView.Wrapper video = new WXVideoView.Wrapper(context);
-
     video.setOnErrorListener(new MediaPlayer.OnErrorListener() {
 
       @Override
@@ -230,6 +229,15 @@ public void setAutoPlay(boolean autoPlay) {
     }
   }
 
+  @WXComponentProp(name = Constants.Name.CONTROLS)
+  public void setControls(String controls) {
+    if (TextUtils.equals("controls", controls)) {
+      mWrapper.setControls(true);
+    } else if (TextUtils.equals("nocontrols", controls)) {
+      mWrapper.setControls(false);
+    }
+  }
+
   private boolean mStopped;
 
   @WXComponentProp(name = Constants.Name.PLAY_STATUS)
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 bbd518115f..c88b2531a4 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
@@ -29,6 +29,7 @@
 import android.util.AttributeSet;
 import android.view.Gravity;
 import android.view.MotionEvent;
+import android.view.View;
 import android.view.ViewTreeObserver;
 import android.widget.FrameLayout;
 import android.widget.MediaController;
@@ -106,7 +107,7 @@ public void pause() {
     private MediaPlayer.OnErrorListener mOnErrorListener;
     private MediaPlayer.OnCompletionListener mOnCompletionListener;
     private WXVideoView.VideoPlayListener mVideoPlayListener;
-
+    private boolean mControls = true;
 
     public Wrapper(Context context) {
       super(context);
@@ -226,6 +227,17 @@ public void setOnVideoPauseListener(VideoPlayListener listener) {
       }
     }
 
+    public void setControls(boolean controls) {
+      mControls = controls;
+      if (mVideoView != null && mMediaController != null) {
+        if (!mControls) {
+          mMediaController.setVisibility(View.GONE);
+        } else {
+          mMediaController.setVisibility(View.VISIBLE);
+        }
+      }
+    }
+
     private synchronized void createVideoView() {
       if(mVideoView != null){
         return;
@@ -246,7 +258,11 @@ private synchronized void createVideoView() {
       controller.setAnchorView(this);
       video.setMediaController(controller);
       controller.setMediaPlayer(video);
-
+      if (!mControls) {
+        controller.setVisibility(View.GONE);
+      } else {
+        controller.setVisibility(View.VISIBLE);
+      }
       mMediaController = controller;
       mVideoView = video;
 


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services