--no commit message

Imanol-Mikel Barba Sabariego
1 parent 46f3a709
Showing 16 changed files with 16 additions and 75 deletions
AndroidManifest.xml
VitamioBundle/AndroidManifest.xml
VitamioBundle/bin/AndroidManifest.xml
VitamioBundle/bin/io.vov.vitamio.activity.initactivity.jar
VitamioBundle/gen/io/vov/vitamio/BuildConfig.class
VitamioBundle/gen/io/vov/vitamio/BuildConfig.java
VitamioBundle/gen/io/vov/vitamio/R$attr.class
VitamioBundle/gen/io/vov/vitamio/R$drawable.class
VitamioBundle/gen/io/vov/vitamio/R$id.class
VitamioBundle/gen/io/vov/vitamio/R$layout.class
VitamioBundle/gen/io/vov/vitamio/R$raw.class
VitamioBundle/gen/io/vov/vitamio/R$string.class
VitamioBundle/gen/io/vov/vitamio/R$style.class
VitamioBundle/gen/io/vov/vitamio/R.class
VitamioBundle/gen/io/vov/vitamio/R.java
src/com/upc/pbe/upcnews/VideoActivity.java
@@ -36,6 +36,11 @@
         </activity>
         <activity android:name=".VideoActivity" >
         </activity>
+                <activity
+            android:name="io.vov.vitamio.activity.InitActivity"
+            android:launchMode="singleTop"
+            android:theme="@android:style/Theme.NoTitleBar"
+            android:windowSoftInputMode="stateAlwaysHidden" />
     </application>
 </manifest>
 \ No newline at end of file
@@ -10,12 +10,7 @@
     <application
         android:icon="@drawable/ic_launcher"
         android:label="@string/vitamio_name" >
-        <activity
-            android:name="io.vov.vitamio.activity.InitActivity"
-            android:configChanges="orientation|screenSize|smallestScreenSize|keyboard|keyboardHidden|navigation"
-            android:launchMode="singleTop"
-            android:theme="@android:style/Theme.NoTitleBar"
-            android:windowSoftInputMode="stateAlwaysHidden" />
+        
     </application>
 </manifest>
 \ No newline at end of file
@@ -10,12 +10,7 @@
     <application
         android:icon="@drawable/ic_launcher"
         android:label="@string/vitamio_name" >
-        <activity
-            android:name="io.vov.vitamio.activity.InitActivity"
-            android:configChanges="orientation|screenSize|smallestScreenSize|keyboard|keyboardHidden|navigation"
-            android:launchMode="singleTop"
-            android:theme="@android:style/Theme.NoTitleBar"
-            android:windowSoftInputMode="stateAlwaysHidden" />
+        
     </application>
 </manifest>
 \ No newline at end of file
-/** 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
-/* 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;
-    }
-}
@@ -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() {