diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 27e5d05..283272a 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -36,6 +36,11 @@ + \ No newline at end of file diff --git a/VitamioBundle/AndroidManifest.xml b/VitamioBundle/AndroidManifest.xml index 7c25e07..9141817 100644 --- a/VitamioBundle/AndroidManifest.xml +++ b/VitamioBundle/AndroidManifest.xml @@ -10,12 +10,7 @@ - + \ No newline at end of file diff --git a/VitamioBundle/bin/AndroidManifest.xml b/VitamioBundle/bin/AndroidManifest.xml index 7c25e07..9141817 100644 --- a/VitamioBundle/bin/AndroidManifest.xml +++ b/VitamioBundle/bin/AndroidManifest.xml @@ -10,12 +10,7 @@ - + \ No newline at end of file diff --git a/VitamioBundle/bin/io.vov.vitamio.activity.initactivity.jar b/VitamioBundle/bin/io.vov.vitamio.activity.initactivity.jar index f5138a3..dd68a5e 100644 --- a/VitamioBundle/bin/io.vov.vitamio.activity.initactivity.jar +++ b/VitamioBundle/bin/io.vov.vitamio.activity.initactivity.jar diff --git a/VitamioBundle/gen/io/vov/vitamio/BuildConfig.class b/VitamioBundle/gen/io/vov/vitamio/BuildConfig.class new file mode 100644 index 0000000..cb1bdb5 --- /dev/null +++ b/VitamioBundle/gen/io/vov/vitamio/BuildConfig.class diff --git a/VitamioBundle/gen/io/vov/vitamio/BuildConfig.java b/VitamioBundle/gen/io/vov/vitamio/BuildConfig.java deleted file mode 100644 index 9ebfacc..0000000 --- a/VitamioBundle/gen/io/vov/vitamio/BuildConfig.java +++ /dev/null @@ -1,6 +0,0 @@ -/** Automatically generated file. DO NOT MODIFY */ -package io.vov.vitamio; - -public final class BuildConfig { - public final static boolean DEBUG = true; -} \ No newline at end of file diff --git a/VitamioBundle/gen/io/vov/vitamio/R$attr.class b/VitamioBundle/gen/io/vov/vitamio/R$attr.class new file mode 100644 index 0000000..88e927c --- /dev/null +++ b/VitamioBundle/gen/io/vov/vitamio/R$attr.class diff --git a/VitamioBundle/gen/io/vov/vitamio/R$drawable.class b/VitamioBundle/gen/io/vov/vitamio/R$drawable.class new file mode 100644 index 0000000..738d696 --- /dev/null +++ b/VitamioBundle/gen/io/vov/vitamio/R$drawable.class diff --git a/VitamioBundle/gen/io/vov/vitamio/R$id.class b/VitamioBundle/gen/io/vov/vitamio/R$id.class new file mode 100644 index 0000000..017cdea --- /dev/null +++ b/VitamioBundle/gen/io/vov/vitamio/R$id.class diff --git a/VitamioBundle/gen/io/vov/vitamio/R$layout.class b/VitamioBundle/gen/io/vov/vitamio/R$layout.class new file mode 100644 index 0000000..4bd1073 --- /dev/null +++ b/VitamioBundle/gen/io/vov/vitamio/R$layout.class diff --git a/VitamioBundle/gen/io/vov/vitamio/R$raw.class b/VitamioBundle/gen/io/vov/vitamio/R$raw.class new file mode 100644 index 0000000..14d7425 --- /dev/null +++ b/VitamioBundle/gen/io/vov/vitamio/R$raw.class diff --git a/VitamioBundle/gen/io/vov/vitamio/R$string.class b/VitamioBundle/gen/io/vov/vitamio/R$string.class new file mode 100644 index 0000000..92fe851 --- /dev/null +++ b/VitamioBundle/gen/io/vov/vitamio/R$string.class diff --git a/VitamioBundle/gen/io/vov/vitamio/R$style.class b/VitamioBundle/gen/io/vov/vitamio/R$style.class new file mode 100644 index 0000000..3360818 --- /dev/null +++ b/VitamioBundle/gen/io/vov/vitamio/R$style.class diff --git a/VitamioBundle/gen/io/vov/vitamio/R.class b/VitamioBundle/gen/io/vov/vitamio/R.class new file mode 100644 index 0000000..8718568 --- /dev/null +++ b/VitamioBundle/gen/io/vov/vitamio/R.class diff --git a/VitamioBundle/gen/io/vov/vitamio/R.java b/VitamioBundle/gen/io/vov/vitamio/R.java deleted file mode 100644 index 4a79fc8..0000000 --- a/VitamioBundle/gen/io/vov/vitamio/R.java +++ /dev/null @@ -1,53 +0,0 @@ -/* AUTO-GENERATED FILE. DO NOT MODIFY. - * - * This class was automatically generated by the - * aapt tool from the resource data it found. It - * should not be modified by hand. - */ - -package io.vov.vitamio; - -public final class R { - public static final class attr { - } - public static final class drawable { - public static int ic_launcher=0x7f020000; - public static int mediacontroller_bg=0x7f020001; - public static int mediacontroller_pause01=0x7f020002; - public static int mediacontroller_pause02=0x7f020003; - public static int mediacontroller_pause_button=0x7f020004; - public static int mediacontroller_play01=0x7f020005; - public static int mediacontroller_play02=0x7f020006; - public static int mediacontroller_play_button=0x7f020007; - public static int mediacontroller_seekbar=0x7f020008; - public static int mediacontroller_seekbar01=0x7f020009; - public static int mediacontroller_seekbar02=0x7f02000a; - public static int mediacontroller_seekbar_thumb=0x7f02000b; - } - public static final class id { - public static int mediacontroller_file_name=0x7f070004; - public static int mediacontroller_play_pause=0x7f070000; - public static int mediacontroller_seekbar=0x7f070003; - public static int mediacontroller_time_current=0x7f070001; - public static int mediacontroller_time_total=0x7f070002; - } - public static final class layout { - public static int mediacontroller=0x7f030000; - } - public static final class raw { - public static int libarm=0x7f040000; - } - public static final class string { - public static int mediacontroller_play_pause=0x7f050006; - public static int vitamio_init_decoders=0x7f050001; - public static int vitamio_name=0x7f050000; - public static int vitamio_videoview_error_button=0x7f050005; - public static int vitamio_videoview_error_text_invalid_progressive_playback=0x7f050003; - public static int vitamio_videoview_error_text_unknown=0x7f050004; - public static int vitamio_videoview_error_title=0x7f050002; - } - public static final class style { - public static int MediaController_SeekBar=0x7f060000; - public static int MediaController_Text=0x7f060001; - } -} diff --git a/src/com/upc/pbe/upcnews/VideoActivity.java b/src/com/upc/pbe/upcnews/VideoActivity.java index 6aa7c0b..d3a9d20 100644 --- a/src/com/upc/pbe/upcnews/VideoActivity.java +++ b/src/com/upc/pbe/upcnews/VideoActivity.java @@ -5,7 +5,6 @@ import java.io.IOException; import io.vov.vitamio.widget.VideoView; import android.app.Activity; import io.vov.vitamio.MediaPlayer; -import android.net.Uri; import android.os.Bundle; import android.util.Log; import android.view.Menu; @@ -21,8 +20,13 @@ public class VideoActivity extends Activity { @Override public void onCreate(Bundle savedInstanceState) { + //Creem el layout super.onCreate(savedInstanceState); + if (!io.vov.vitamio.LibsChecker.checkVitamioLibs(this)) + { + return; + } setContentView(R.layout.activity_video); video = (VideoView) findViewById(R.id.videoView1); //Creem un listener associat al fi de l'activitat (el fi de cada ts) @@ -45,10 +49,11 @@ public class VideoActivity extends Activity { return; } Log.d(TAG,url); - video.setVideoURI(Uri.parse(url)); + video.setVideoPath(url); + video.setVideoQuality(MediaPlayer.VIDEOQUALITY_HIGH); video.setMediaController(new MediaController(this)); - video.start(); - video.requestFocus(); + /*video.start(); + video.requestFocus();*/ } public void playNext() {