Merge pull request #9240 from m1ga/6_2_X

[TIMOB-25007] (6_2_X) Android: repeatMode for VideoPlayer

android/modules/media/src/java/android/widget/TiVideoView8.java

@@ -117,6 +117,7 @@ public class TiVideoView8 extends SurfaceView implements MediaPlayerControl
 	// TITANIUM
 	private TiPlaybackListener mPlaybackListener;
 	private float mVolume = 1.0f;
+	private int mLoop = 0;
 
 	public TiVideoView8(Context context)
 	{
@@ -396,6 +397,11 @@ private void openVideo()
 			mMediaPlayer.setScreenOnWhilePlaying(true);
 			mMediaPlayer.prepareAsync();
 			mMediaPlayer.setVolume(mVolume, mVolume);
+			if (mLoop == 0) {
+				mMediaPlayer.setLooping(false);
+			} else {
+				mMediaPlayer.setLooping(true);
+			}
 			// we don't set the target state here either, but preserve the
 			// target state that was there before.
 			mCurrentState = STATE_PREPARING;
@@ -863,6 +869,23 @@ public void setScalingMode(int scalingMode)
 		mScalingMode = scalingMode;
 	}
 
+	public void setRepeatMode(int repeatMode)
+	{
+		mLoop = repeatMode;
+		if (mMediaPlayer != null) {
+			if (mLoop == 0) {
+				mMediaPlayer.setLooping(false);
+			} else {
+				mMediaPlayer.setLooping(true);
+			}
+		}
+	}
+
+	public int getRepeatMode()
+	{
+		return mLoop;
+	}
+
 	@Override
 	public int getAudioSessionId()
 	{

android/modules/media/src/java/ti/modules/titanium/media/MediaModule.java

@@ -114,6 +114,9 @@ public class MediaModule extends KrollModule
 	@Kroll.constant public static final int VIDEO_FINISH_REASON_PLAYBACK_ENDED = 0;
 	@Kroll.constant public static final int VIDEO_FINISH_REASON_PLAYBACK_ERROR = 1;
 	@Kroll.constant public static final int VIDEO_FINISH_REASON_USER_EXITED = 2;
+
+	@Kroll.constant public static final int VIDEO_REPEAT_MODE_NONE = 0;
+	@Kroll.constant public static final int VIDEO_REPEAT_MODE_ONE = 1;
 
 	@Kroll.constant public static final int VIDEO_TIME_OPTION_NEAREST_KEYFRAME = MediaMetadataRetriever.OPTION_CLOSEST;
 	@Kroll.constant public static final int VIDEO_TIME_OPTION_CLOSEST_SYNC = MediaMetadataRetriever.OPTION_CLOSEST_SYNC;

android/modules/media/src/java/ti/modules/titanium/media/TiUIVideoView.java

@@ -139,6 +139,9 @@ public void processProperties(KrollDict d)
 		if (d.containsKey(TiC.PROPERTY_VOLUME)) {
 			videoView.setVolume(TiConvert.toFloat(d, TiC.PROPERTY_VOLUME, 1.0f));
 		}
+		if (d.containsKey(TiC.PROPERTY_REPEAT_MODE)) {
+			videoView.setRepeatMode(TiConvert.toInt(d, TiC.PROPERTY_REPEAT_MODE));
+		}
 	}
 
 	@Override
@@ -166,6 +169,8 @@ public void propertyChanged(String key, Object oldValue, Object newValue, KrollP
 		} else if (key.equals(TiC.PROPERTY_VOLUME)) {
 			videoView.setVolume(TiConvert.toFloat(newValue));
 
+		} else if (key.equals(TiC.PROPERTY_REPEAT_MODE)) {
+			videoView.setRepeatMode(TiConvert.toInt(newValue));
 		} else {
 			super.propertyChanged(key, oldValue, newValue, proxy);
 		}
@@ -187,6 +192,15 @@ public void setScalingMode(int mode)
 
 		videoView.setScalingMode(mode);
 	}
+
+	public void setRepeatMode(int mode)
+	{
+		if (videoView == null) {
+			return;
+		}
+
+		videoView.setRepeatMode(mode);
+	}
 
 	public void setMediaControlStyle(int style)
 	{

android/modules/media/src/java/ti/modules/titanium/media/VideoPlayerProxy.java

@@ -35,7 +35,7 @@
 
 @Kroll.proxy(creatableInModule = MediaModule.class, propertyAccessors = {
 	"url", "initialPlaybackTime", "duration", "contentURL", "autoplay", "endPlaybackTime", "playableDuration",
-	TiC.PROPERTY_VOLUME
+	TiC.PROPERTY_VOLUME, TiC.PROPERTY_REPEAT_MODE
 })
 public class VideoPlayerProxy extends TiViewProxy implements TiLifecycle.OnLifecycleEvent
 {
@@ -56,6 +56,7 @@ public class VideoPlayerProxy extends TiViewProxy implements TiLifecycle.OnLifec
 	private static final int MSG_RELEASE = MSG_FIRST_ID + 109; // Call view.release() (more drastic)
 	private static final int MSG_HIDE_MEDIA_CONTROLLER = MSG_FIRST_ID + 110;
 	private static final int MSG_SET_VIEW_FROM_ACTIVITY = MSG_FIRST_ID + 111;
+	private static final int MSG_REPEAT_CHANGE = MSG_FIRST_ID + 112;
 
 	// Keeping these out of TiC because I believe we'll stop supporting them
 	// in favor of the documented property, which is "mediaControlStyle".
@@ -71,6 +72,7 @@ public class VideoPlayerProxy extends TiViewProxy implements TiLifecycle.OnLifec
 	protected int scalingMode = MediaModule.VIDEO_SCALING_ASPECT_FIT;
 	private int loadState = MediaModule.VIDEO_LOAD_STATE_UNKNOWN;
 	private int playbackState = MediaModule.VIDEO_PLAYBACK_STATE_STOPPED;
+	private int repeatMode = MediaModule.VIDEO_REPEAT_MODE_NONE;
 
 	// Used only if TiVideoActivity is used (fullscreen == true)
 	private Handler videoActivityHandler;
@@ -318,6 +320,26 @@ public int getPlaybackState()
 		return playbackState;
 	}
 
+	@Kroll.method @Kroll.getProperty
+	public int getRepeatMode()
+	{
+		return repeatMode;
+	}
+
+	@Kroll.method @Kroll.setProperty
+	public void setRepeatMode(int mode)
+	{
+		boolean alert = (mode != repeatMode);
+		repeatMode = mode;
+		if (alert && view != null) {
+			if (TiApplication.isUIThread()) {
+				getVideoView().setRepeatMode(mode);
+			} else {
+				getMainHandler().sendEmptyMessage(MSG_REPEAT_CHANGE);
+			}
+		}
+	}
+
 	@Override
 	public void hide(@Kroll.argument(optional=true) KrollDict options)
 	{
@@ -389,6 +411,12 @@ public boolean handleMessage(Message msg)
 				setVideoViewFromActivity((TiCompositeLayout) msg.obj);
 				handled = true;
 				break;
+			case MSG_REPEAT_CHANGE:
+				if (vv != null) {
+					vv.setRepeatMode(repeatMode);
+				}
+				handled = true;
+				break;				
 		}
 
 		if (!handled) {

android/titanium/src/java/org/appcelerator/titanium/TiC.java

@@ -2287,6 +2287,11 @@ public class TiC
 	 */
 	public static final String PROPERTY_REPEAT_COUNT = "repeatCount";
 
+	/**
+	 * @module.api
+	 */
+	public static final String PROPERTY_REPEAT_MODE = "repeatMode";
+
 	/**
 	 * @module.api
 	 */

apidoc/Titanium/Media/Media.yml

@@ -1336,12 +1336,14 @@ properties:
     summary: Constant for disabling repeat on video playback.
     type: Number
     permission: read-only
-    platforms: [iphone, ipad, mobileweb]
+    platforms: [android, iphone, ipad, mobileweb]
+    since: {android: "6.2.0", iphone: "0.9.0", ipad: "0.9.0", mobileweb: "1.8"}
   - name: VIDEO_REPEAT_MODE_ONE
     summary: Constant for repeating one video (i.e., the one video will repeat constantly) during playback.
     type: Number
     permission: read-only
-    platforms: [iphone, ipad, mobileweb]
+    platforms: [android, iphone, ipad, mobileweb]
+    since: {android: "6.2.0", iphone: "0.9.0", ipad: "0.9.0", mobileweb: "1.8"}
   - name: VIDEO_SCALING_ASPECT_FILL
     summary: Scale video to fill the screen, clipping edges if necessary.
     description: |

apidoc/Titanium/Media/VideoPlayer.yml

@@ -710,10 +710,11 @@ properties:
 
   - name: repeatMode
     summary: Determines how the movie player repeats when reaching the end of playback. 
-    platforms: [iphone, ipad, mobileweb]
+    platforms: [android, iphone, ipad, mobileweb]
     type: Number
     constants: Titanium.Media.VIDEO_REPEAT_MODE_*
     default: Titanium.Media.VIDEO_REPEAT_MODE_NONE
+    since: {android: "6.2.0", iphone: "0.9.0", ipad: "0.9.0", mobileweb: "1.8"}
 
   - name: scalingMode
     summary: Determines how the content scales to fit the view.