[Mp-plugins-svn] SF.net SVN: mp-plugins:[3990] trunk/plugins/AndroidRemote/Android/ MediaPortalRemote

[<kro...@us...>]

Revision: 3990
          http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=3990&view=rev
Author:   kroko_koenig
Date:     2010-12-03 07:03:11 +0000 (Fri, 03 Dec 2010)

Log Message:
-----------
pictures fixed and slightshow, single instance

Modified Paths:
--------------
    trunk/plugins/AndroidRemote/Android/MediaPortalRemote/AndroidManifest.xml
    trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/httpHandler.java
    trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/pictures.java
    trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/picturesfullscreen.java

Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/AndroidManifest.xml
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/AndroidManifest.xml	2010-12-01 18:50:41 UTC (rev 3989)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/AndroidManifest.xml	2010-12-03 07:03:11 UTC (rev 3990)
@@ -3,13 +3,13 @@
 	package="mediaportal.remote" android:versionCode="1"
 	android:versionName="1.0">
 	<application android:icon="@drawable/icon" android:theme="@android:style/Theme.NoTitleBar" android:debuggable="true">
-	    <activity android:name=".Splash" android:label="@string/app_name">
+	    <activity android:name=".Splash" android:label="@string/app_name" android:launchMode="singleInstance">
 	       <intent-filter>
 				<action android:name="android.intent.action.MAIN" />
 				<category android:name="android.intent.category.LAUNCHER" />
 			</intent-filter>   
 	    </activity>
-		<activity android:label="@string/app_name" android:name=".Main">
+		<activity android:label="@string/app_name" android:name=".Main" android:launchMode="singleInstance">
 			<intent-filter>
 				<action android:name="android.intent.action.DEFAULT" />
 				<category android:name="android.intent.category.VIEW" />
@@ -17,17 +17,17 @@
 		</activity>
 		<activity android:name=".Remote_01" android:launchMode="singleInstance"></activity>
 		<activity android:name=".Remote_02" android:launchMode="singleInstance"></activity>
-		<activity android:name=".Pictures"></activity>	
-		<activity android:name=".Picturesfullscreen"></activity>
-		<activity android:name=".MusicDir"></activity>	
+		<activity android:name=".Pictures" android:launchMode="singleInstance"></activity>	
+		<activity android:name=".Picturesfullscreen" android:launchMode="singleInstance"></activity>
+		<activity android:name=".MusicDir" android:launchMode="singleInstance"></activity>	
 		<activity android:name=".Setup" android:launchMode="singleInstance"></activity>
-		<activity android:name=".nowplaying"></activity>
-		<activity android:name=".nowplaylist"></activity>
-		<activity android:name=".MusicArtist"></activity>
-		<activity android:name=".MusicAlbum"></activity>
-		<activity android:name=".MusicSong"></activity>
-		<activity android:name=".MusicTab"></activity>
-		<activity android:name=".MusicResults"></activity>
+		<activity android:name=".nowplaying" android:launchMode="singleInstance"></activity>
+		<activity android:name=".nowplaylist" android:launchMode="singleInstance"></activity>
+		<activity android:name=".MusicArtist" android:launchMode="singleInstance"></activity>
+		<activity android:name=".MusicAlbum" android:launchMode="singleInstance"></activity>
+		<activity android:name=".MusicSong" android:launchMode="singleInstance"></activity>
+		<activity android:name=".MusicTab" android:launchMode="singleInstance"></activity>
+		<activity android:name=".MusicResults" android:launchMode="singleInstance"></activity>
 	</application>
 	<uses-sdk android:minSdkVersion="3" />
 

Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/httpHandler.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/httpHandler.java	2010-12-01 18:50:41 UTC (rev 3989)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/httpHandler.java	2010-12-03 07:03:11 UTC (rev 3990)
@@ -74,7 +74,6 @@
 		}
 
 		return bitmap;
-
 	}
 
 	public void DownloadFile() {

Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/pictures.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/pictures.java	2010-12-01 18:50:41 UTC (rev 3989)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/pictures.java	2010-12-03 07:03:11 UTC (rev 3990)
@@ -45,8 +45,10 @@
 
 	private Handler mHandler = new Handler();
 	public static String actualDir = "";
+	
 	public static ArrayList<ReceiveDirectoryXmlHandler.DirItems> pictureList;
-
+	public static int selectedPicture;
+	
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
@@ -66,7 +68,7 @@
 				picItem pic = (picItem) iv.getTag();
 				
 				if (pic.typ == "item") {
-					Picturesfullscreen.selectedPicture = position - 1;
+					selectedPicture = position - 1;
 					Intent myIntent = new Intent(Pictures.this,
 							Picturesfullscreen.class);
 					startActivityForResult(myIntent, 0);

Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/picturesfullscreen.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/picturesfullscreen.java	2010-12-01 18:50:41 UTC (rev 3989)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/picturesfullscreen.java	2010-12-03 07:03:11 UTC (rev 3990)
@@ -24,8 +24,16 @@
 import mediaportal.remote.R;
 import mediaportal.remote.ReceiveDirectoryXmlHandler.DirItems;
 import android.app.Activity;
+import android.content.Intent;
+import android.graphics.Bitmap;
 import android.os.Bundle;
+import android.os.Handler;
+import android.view.ContextMenu;
 import android.view.GestureDetector;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ContextMenu.ContextMenuInfo;
 import android.view.GestureDetector.OnGestureListener;
 import android.view.MotionEvent;
 import android.widget.ImageView;
@@ -39,8 +47,11 @@
 	private static final int SWIPE_THRESHOLD_VELOCITY = 200;
 
 	private GestureDetector gestureScanner;
-	public static int selectedPicture = 0;
+	private Handler mHandler = new Handler();
 
+	private boolean slideShow;
+	private boolean randomShow;
+
 	/** Called when the activity is first created. */
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
@@ -49,12 +60,21 @@
 
 		gestureScanner = new GestureDetector(this);
 
+		setPicture();
+		Toast.makeText(Picturesfullscreen.this, "left/right swipe possible",
+				Toast.LENGTH_SHORT).show();
+
+		// ImageView imagev = (ImageView) findViewById(R.id.ImageView01);
+		// registerForContextMenu(imagev);
+	}
+
+	private void setPicture() {
 		ImageView imagev = (ImageView) findViewById(R.id.ImageView01);
+		DirItems item = Pictures.pictureList.get(Pictures.selectedPicture);
 
-		DirItems item = Pictures.pictureList.get(selectedPicture);
-
 		httpHandler http = new httpHandler();
-		String file = "http://" + Settings.Server + ":" + Settings.Port + "/pictures/";
+		String file = "http://" + Settings.Server + ":" + Settings.Port
+				+ "/pictures/";
 		file += Pictures.actualDir + item.File;
 		item.Picture = http.DownloadImage(file);
 		imagev.setImageBitmap(item.Picture);
@@ -64,6 +84,77 @@
 	}
 
 	@Override
+	public boolean onCreateOptionsMenu(Menu menu) {
+		menu.add(0, 101, 0, "Slide show");
+		menu.add(0, 102, 1, "Random slide show");
+		menu.add(0, 103, 2, "Stop slide show");
+		return true;
+	}
+
+	@Override
+	public boolean onOptionsItemSelected(MenuItem item) {
+		switch (item.getItemId()) {
+		case 101:
+			slideShow = true;
+			randomShow = false;
+			return true;
+		case 102:
+			slideShow = true;
+			randomShow = true;
+			return true;
+		case 103:
+			slideShow = false;
+			randomShow = false;
+			return true;
+		}
+		return true;
+	}
+
+	@Override
+	public void onStart() {
+		super.onStart();
+
+		mHandler.removeCallbacks(mUpdateTimeTask);
+		mHandler.postDelayed(mUpdateTimeTask, 2000);
+	}
+
+	private Runnable mUpdateTimeTask = new Runnable() {
+		public void run() {
+
+			if (slideShow) {
+				if(!randomShow)
+				{
+				int max = Pictures.pictureList.size();
+
+				if (Pictures.selectedPicture < max - 1)
+					Pictures.selectedPicture++;
+				else
+					Pictures.selectedPicture = 0;
+				setPicture();
+				}
+				else
+				{
+					String req = "http://" + Settings.Server + ":" + Settings.Port +"/random/pictures/random.jpg";
+					httpHandler handler = new httpHandler();
+					
+					Bitmap pic = handler.DownloadImage(req);
+					
+					ImageView imagev = (ImageView) findViewById(R.id.ImageView01);
+					imagev.setImageBitmap(pic);
+				}
+			}
+
+			mHandler.postDelayed(mUpdateTimeTask, 2000);
+		}
+	};
+
+	@Override
+	public void onPause() {
+		super.onPause();
+		mHandler.removeCallbacks(mUpdateTimeTask);
+	}
+
+	@Override
 	public boolean onTouchEvent(MotionEvent me) {
 		return gestureScanner.onTouchEvent(me);
 	}
@@ -71,36 +162,32 @@
 	public boolean onFling(MotionEvent e1, MotionEvent e2, float velocityX,
 			float velocityY) {
 		try {
+
+			int max = Pictures.pictureList.size();
+
 			if (Math.abs(e1.getY() - e2.getY()) > SWIPE_MAX_OFF_PATH)
 				return false;
 			// right to left swipe
 			if (e1.getX() - e2.getX() > SWIPE_MIN_DISTANCE
 					&& Math.abs(velocityX) > SWIPE_THRESHOLD_VELOCITY) {
-				Toast.makeText(Picturesfullscreen.this, "Left Swipe",
-						Toast.LENGTH_SHORT).show();
-				// picturehandler pic = picturehandler.getinstance();
-				// pic.selectedPicture += 1;
-				// if(pic.selectedPicture>=pic.getpictures().gettitle().size())
-				// pic.selectedPicture = 0;
-				// ImageView imagev = (ImageView)
-				// findViewById(R.id.ImageView01);
-				// imagev.setImageBitmap(pic.getselectedPicture());
-				// TextView txt = (TextView) findViewById(R.id.full_text);
-				// txt.setText(pic.selectedPictureName);
 
+				if (Pictures.selectedPicture < max - 1) {
+					Pictures.selectedPicture++;
+					setPicture();
+				} else
+					Toast.makeText(Picturesfullscreen.this, "reached end +",
+							Toast.LENGTH_SHORT).show();
+
 			} else if (e2.getX() - e1.getX() > SWIPE_MIN_DISTANCE
 					&& Math.abs(velocityX) > SWIPE_THRESHOLD_VELOCITY) {
-				Toast.makeText(Picturesfullscreen.this, "Right Swipe",
+
+				if (Pictures.selectedPicture > 0) {
+					Pictures.selectedPicture--;
+					setPicture();
+				}
+				Toast.makeText(Picturesfullscreen.this, "reached end -",
 						Toast.LENGTH_SHORT).show();
-				// picturehandler pic = picturehandler.getinstance();
-				// pic.selectedPicture -= 1;
-				// if(pic.selectedPicture<=0)
-				// pic.selectedPicture = pic.getpictures().gettitle().size();
-				// ImageView imagev = (ImageView)
-				// findViewById(R.id.ImageView01);
-				// imagev.setImageBitmap(pic.getselectedPicture());
-				// TextView txt = (TextView) findViewById(R.id.full_text);
-				// txt.setText(pic.selectedPictureName);
+
 			}
 		} catch (Exception e) {
 			// nothing


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.