Menu
▾
▴
[Mp-plugins-svn] SF.net SVN: mp-plugins:[3989] trunk/plugins/AndroidRemote
|
From: <kro...@us...> - 2010-12-01 18:50:49
|
Revision: 3989
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=3989&view=rev
Author: kroko_koenig
Date: 2010-12-01 18:50:41 +0000 (Wed, 01 Dec 2010)
Log Message:
-----------
more remote and gfx
Modified Paths:
--------------
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/AndroidManifest.xml
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/gen/mediaportal/remote/R.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/pictures.xml
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/picturesfullscreen.xml
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/remote01.xml
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/remote02.xml
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/splash.xml
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/values/strings.xml
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/MusicDir.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveDbHandler.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveDbXmlHandler.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveDirectoryXmlHandler.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/Remote_02.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/httpHandler.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/main.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicResults.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicSong.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/pictures.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/picturesfullscreen.java
trunk/plugins/AndroidRemote/Release/Android Server communication.docx
trunk/plugins/AndroidRemote/Server/AndroidRemote/Request.cs
trunk/plugins/AndroidRemote/Server/AndroidRemote.suo
Added Paths:
-----------
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/assets/cmd_exit.xml
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/assets/cmd_hibernate.xml
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/assets/cmd_restart.xml
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/assets/cmd_shutoff.xml
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/assets/cmd_suspend.xml
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/button_close_focus.png
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/button_close_nofocus.png
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/button_hibernate_focus.png
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/button_hibernate_nofocus.png
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/button_restart_focus.png
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/button_restart_nofocus.png
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/button_shutdown_focus.png
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/button_shutdown_nofocus.png
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/button_standby_focus.png
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/button_standby_nofocus.png
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/button_wakeup_focus.png
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/button_wakeup_nofocus.png
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/splash02.jpg
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/MediaPlayerControl.java
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/AndroidManifest.xml
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/AndroidManifest.xml 2010-11-30 12:17:31 UTC (rev 3988)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/AndroidManifest.xml 2010-12-01 18:50:41 UTC (rev 3989)
@@ -15,12 +15,12 @@
<category android:name="android.intent.category.VIEW" />
</intent-filter>
</activity>
- <activity android:name=".Remote_01"></activity>
- <activity android:name=".Remote_02"></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=".Picturesfullscreen"></activity>
<activity android:name=".MusicDir"></activity>
- <activity android:name=".Setup"></activity>
+ <activity android:name=".Setup" android:launchMode="singleInstance"></activity>
<activity android:name=".nowplaying"></activity>
<activity android:name=".nowplaylist"></activity>
<activity android:name=".MusicArtist"></activity>
@@ -32,5 +32,6 @@
<uses-sdk android:minSdkVersion="3" />
<uses-permission android:name="android.permission.INTERNET"></uses-permission>
-
+ <uses-permission android:name="android.permission.VIBRATE"></uses-permission>
+ <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"></uses-permission>
</manifest>
\ No newline at end of file
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/assets/cmd_exit.xml
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/assets/cmd_exit.xml (rev 0)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/assets/cmd_exit.xml 2010-12-01 18:50:41 UTC (rev 3989)
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<message>
+ <command>ACTION_EXIT</command>
+</message>
\ No newline at end of file
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/assets/cmd_hibernate.xml
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/assets/cmd_hibernate.xml (rev 0)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/assets/cmd_hibernate.xml 2010-12-01 18:50:41 UTC (rev 3989)
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<message>
+ <command>ACTION_HIBERNATE</command>
+</message>
\ No newline at end of file
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/assets/cmd_restart.xml
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/assets/cmd_restart.xml (rev 0)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/assets/cmd_restart.xml 2010-12-01 18:50:41 UTC (rev 3989)
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<message>
+ <command>ACTION_REBOOT</command>
+</message>
\ No newline at end of file
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/assets/cmd_shutoff.xml
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/assets/cmd_shutoff.xml (rev 0)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/assets/cmd_shutoff.xml 2010-12-01 18:50:41 UTC (rev 3989)
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<message>
+ <command>ACTION_POWER_OFF</command>
+</message>
\ No newline at end of file
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/assets/cmd_suspend.xml
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/assets/cmd_suspend.xml (rev 0)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/assets/cmd_suspend.xml 2010-12-01 18:50:41 UTC (rev 3989)
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<message>
+ <command>ACTION_SUSPEND</command>
+</message>
\ No newline at end of file
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/gen/mediaportal/remote/R.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/gen/mediaportal/remote/R.java 2010-11-30 12:17:31 UTC (rev 3988)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/gen/mediaportal/remote/R.java 2010-12-01 18:50:41 UTC (rev 3989)
@@ -20,36 +20,49 @@
public static final int back=0x7f020006;
public static final int back_icon=0x7f020007;
public static final int border=0x7f020008;
- public static final int cdcover=0x7f020009;
- public static final int close_icon=0x7f02000a;
- public static final int document=0x7f02000b;
- public static final int down_icon=0x7f02000c;
- public static final int folder=0x7f02000d;
- public static final int folderback=0x7f02000e;
- public static final int foldertab=0x7f02000f;
- public static final int foldertab_off=0x7f020010;
- public static final int forward=0x7f020011;
- public static final int ic_tab=0x7f020012;
- public static final int ic_tab1=0x7f020013;
- public static final int ic_tab2=0x7f020014;
- public static final int ic_tab3=0x7f020015;
- public static final int ic_tab4=0x7f020016;
- public static final int icon=0x7f020017;
- public static final int music_logo=0x7f020018;
- public static final int next_icon=0x7f020019;
- public static final int nowplaying_logo=0x7f02001a;
- public static final int pause=0x7f02001b;
- public static final int picture=0x7f02001c;
- public static final int pictures_logo=0x7f02001d;
- public static final int play=0x7f02001e;
- public static final int remote_logo=0x7f02001f;
- public static final int rewind=0x7f020020;
- public static final int song=0x7f020021;
- public static final int song_off=0x7f020022;
- public static final int splash=0x7f020023;
- public static final int stop=0x7f020024;
- public static final int up_icon=0x7f020025;
- public static final int videos_logo=0x7f020026;
+ public static final int button_close_focus=0x7f020009;
+ public static final int button_close_nofocus=0x7f02000a;
+ public static final int button_hibernate_focus=0x7f02000b;
+ public static final int button_hibernate_nofocus=0x7f02000c;
+ public static final int button_restart_focus=0x7f02000d;
+ public static final int button_restart_nofocus=0x7f02000e;
+ public static final int button_shutdown_focus=0x7f02000f;
+ public static final int button_shutdown_nofocus=0x7f020010;
+ public static final int button_standby_focus=0x7f020011;
+ public static final int button_standby_nofocus=0x7f020012;
+ public static final int button_wakeup_focus=0x7f020013;
+ public static final int button_wakeup_nofocus=0x7f020014;
+ public static final int cdcover=0x7f020015;
+ public static final int close_icon=0x7f020016;
+ public static final int document=0x7f020017;
+ public static final int down_icon=0x7f020018;
+ public static final int folder=0x7f020019;
+ public static final int folderback=0x7f02001a;
+ public static final int foldertab=0x7f02001b;
+ public static final int foldertab_off=0x7f02001c;
+ public static final int forward=0x7f02001d;
+ public static final int ic_tab=0x7f02001e;
+ public static final int ic_tab1=0x7f02001f;
+ public static final int ic_tab2=0x7f020020;
+ public static final int ic_tab3=0x7f020021;
+ public static final int ic_tab4=0x7f020022;
+ public static final int icon=0x7f020023;
+ public static final int music_logo=0x7f020024;
+ public static final int next_icon=0x7f020025;
+ public static final int nowplaying_logo=0x7f020026;
+ public static final int pause=0x7f020027;
+ public static final int picture=0x7f020028;
+ public static final int pictures_logo=0x7f020029;
+ public static final int play=0x7f02002a;
+ public static final int remote_logo=0x7f02002b;
+ public static final int rewind=0x7f02002c;
+ public static final int song=0x7f02002d;
+ public static final int song_off=0x7f02002e;
+ public static final int splash=0x7f02002f;
+ public static final int splash02=0x7f020030;
+ public static final int stop=0x7f020031;
+ public static final int up_icon=0x7f020032;
+ public static final int videos_logo=0x7f020033;
}
public static final class id {
public static final int GridView01=0x7f050010;
@@ -64,9 +77,13 @@
public static final int TextView01=0x7f050003;
public static final int TextView02=0x7f050004;
public static final int btnBack=0x7f050038;
+ public static final int btnChannelDown=0x7f05003d;
+ public static final int btnChannelUp=0x7f05003a;
public static final int btnDown=0x7f050037;
+ public static final int btnExit=0x7f05003e;
public static final int btnFBack=0x7f050025;
public static final int btnFForw=0x7f050027;
+ public static final int btnHibernate=0x7f050040;
public static final int btnHome=0x7f05002e;
public static final int btnInfo=0x7f050030;
public static final int btnLeft=0x7f050032;
@@ -74,11 +91,18 @@
public static final int btnOk=0x7f050033;
public static final int btnPause=0x7f05002b;
public static final int btnPlay=0x7f050026;
+ public static final int btnRestart=0x7f050041;
public static final int btnRight=0x7f050034;
+ public static final int btnShutOff=0x7f050042;
public static final int btnSkipBack=0x7f050029;
public static final int btnSkipForw=0x7f05002c;
public static final int btnStop=0x7f05002a;
+ public static final int btnSuspend=0x7f05003f;
public static final int btnUp=0x7f05002f;
+ public static final int btnVolumeDown=0x7f05003c;
+ public static final int btnVolumeMute=0x7f05003b;
+ public static final int btnVolumeUp=0x7f050039;
+ public static final int btnWakeOnLan=0x7f050043;
public static final int full_text=0x7f050011;
public static final int icon_image=0x7f050001;
public static final int icon_text=0x7f050002;
@@ -102,10 +126,10 @@
public static final int now_progress=0x7f050017;
public static final int now_stop=0x7f05001d;
public static final int now_title=0x7f05001a;
- public static final int server_ip=0x7f050039;
- public static final int server_macid=0x7f05003b;
- public static final int server_port=0x7f05003a;
- public static final int title=0x7f05003c;
+ public static final int server_ip=0x7f050044;
+ public static final int server_macid=0x7f050046;
+ public static final int server_port=0x7f050045;
+ public static final int title=0x7f050047;
public static final int widget0=0x7f05000a;
public static final int widget00=0x7f050024;
public static final int widget01=0x7f050028;
@@ -135,8 +159,7 @@
public static final int title=0x7f030011;
}
public static final class string {
- public static final int app_name=0x7f040001;
- public static final int hello=0x7f040000;
+ public static final int app_name=0x7f040000;
}
public static final class styleable {
/** Attributes that can be used with a Gallery1.
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/button_close_focus.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/button_close_focus.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/button_close_nofocus.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/button_close_nofocus.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/button_hibernate_focus.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/button_hibernate_focus.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/button_hibernate_nofocus.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/button_hibernate_nofocus.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/button_restart_focus.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/button_restart_focus.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/button_restart_nofocus.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/button_restart_nofocus.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/button_shutdown_focus.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/button_shutdown_focus.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/button_shutdown_nofocus.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/button_shutdown_nofocus.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/button_standby_focus.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/button_standby_focus.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/button_standby_nofocus.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/button_standby_nofocus.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/button_wakeup_focus.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/button_wakeup_focus.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/button_wakeup_nofocus.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/button_wakeup_nofocus.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/splash02.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/splash02.jpg
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/pictures.xml
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/pictures.xml 2010-11-30 12:17:31 UTC (rev 3988)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/pictures.xml 2010-12-01 18:50:41 UTC (rev 3989)
@@ -1,6 +1,6 @@
<AbsoluteLayout android:id="@+id/widget0"
android:layout_width="fill_parent" android:layout_height="wrap_content"
- android:background="@drawable/back" xmlns:android="http://schemas.android.com/apk/res/android">
+ xmlns:android="http://schemas.android.com/apk/res/android">
<GridView android:layout_y="0dip" android:layout_x="0dip"
android:id="@+id/GridView01" android:layout_width="fill_parent"
android:layout_height="fill_parent" android:columnWidth="90dp"
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/picturesfullscreen.xml
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/picturesfullscreen.xml 2010-11-30 12:17:31 UTC (rev 3988)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/picturesfullscreen.xml 2010-12-01 18:50:41 UTC (rev 3989)
@@ -1,6 +1,6 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:layout_width="fill_parent"
- android:layout_height="fill_parent" android:background="@drawable/back">
+ android:layout_height="fill_parent">
<TextView android:id="@+id/full_text" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:text="name"
android:gravity="center_horizontal" android:background="#FFFFFFFF"
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/remote01.xml
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/remote01.xml 2010-11-30 12:17:31 UTC (rev 3988)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/remote01.xml 2010-12-01 18:50:41 UTC (rev 3989)
@@ -3,7 +3,6 @@
android:id="@+id/widget0"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
- android:background="@drawable/back"
android:orientation="vertical"
xmlns:android="http://schemas.android.com/apk/res/android">
@@ -17,8 +16,7 @@
<LinearLayout
android:id="@+id/widget00"
android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- >
+ android:layout_height="wrap_content" android:layout_marginTop="5dip">
<Button android:id="@+id/btnFBack"
android:layout_width="80dip"
@@ -78,20 +76,16 @@
<Button android:id="@+id/btnHome"
android:layout_width="80dip"
- android:layout_height="60dip"
- android:text="Home">
+ android:text="Home" android:layout_height="50dip">
</Button>
<Button android:id="@+id/btnUp"
- android:layout_width="160dip"
- android:layout_height="60dip"
- android:background="@drawable/up_icon">
+ android:background="@drawable/up_icon" android:layout_width="160dip" android:layout_height="50dip">
</Button>
<Button android:id="@+id/btnInfo"
android:layout_width="80dip"
- android:layout_height="60dip"
- android:text="Info">
+ android:text="Info" android:layout_height="50dip">
</Button>
</LinearLayout>
@@ -108,9 +102,7 @@
</Button>
<Button android:id="@+id/btnOk"
- android:layout_width="160dip"
- android:layout_height="60dip"
- android:background="@drawable/accept_icon">
+ android:background="@drawable/accept_icon" android:layout_width="160dip" android:layout_height="80dip">
</Button>
<Button android:id="@+id/btnRight"
@@ -128,20 +120,17 @@
<Button android:id="@+id/btnMenu"
android:layout_width="80dip"
- android:layout_height="60dip"
- android:text="Menu">
+ android:text="Menu" android:layout_height="50dip">
</Button>
<Button android:id="@+id/btnDown"
android:layout_width="160dip"
- android:layout_height="60dip"
- android:background="@drawable/down_icon">
+ android:background="@drawable/down_icon" android:layout_height="50dip">
</Button>
<Button android:id="@+id/btnBack"
android:layout_width="80dip"
- android:layout_height="60dip"
- android:text="Back">
+ android:text="Back" android:layout_height="50dip">
</Button>
</LinearLayout>
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/remote02.xml
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/remote02.xml 2010-11-30 12:17:31 UTC (rev 3988)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/remote02.xml 2010-12-01 18:50:41 UTC (rev 3989)
@@ -1,17 +1,100 @@
<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
- android:id="@+id/widget0"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
- android:background="@drawable/back"
- android:orientation="vertical"
- xmlns:android="http://schemas.android.com/apk/res/android">
-
- <TextView android:id="@+id/naviRemote_text" android:layout_width="fill_parent"
- android:layout_height="wrap_content" android:text="Menu 02"
- android:gravity="center_horizontal" android:background="#FFFFFFFF"
- android:textSize="15dip"
+<LinearLayout android:id="@+id/widget0"
+ android:layout_width="fill_parent" android:layout_height="fill_parent"
+ android:orientation="vertical" xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <TextView android:id="@+id/naviRemote_text"
+ android:layout_width="fill_parent" android:layout_height="wrap_content"
+ android:text="Remote 02" android:gravity="center_horizontal"
+ android:background="#FFFFFFFF" android:textSize="15dip"
android:textColor="#FF000000" android:textColorHighlight="#FFFFFFFF">
</TextView>
-
+
+ <LinearLayout android:id="@+id/widget00"
+ android:layout_width="wrap_content" android:layout_height="wrap_content"
+ android:layout_marginTop="10dip" android:layout_gravity="center_horizontal">
+
+ <Button android:id="@+id/btnVolumeUp" android:layout_width="80dip"
+ android:layout_height="60dip" android:text="Vol. +">
+ </Button>
+
+ <Button android:id="@+id/btnChannelUp" android:layout_width="80dip"
+ android:layout_marginLeft="40dip" android:layout_height="60dip"
+ android:text="Ch. +">
+ </Button>
+ </LinearLayout>
+
+ <LinearLayout android:id="@+id/widget00"
+ android:layout_height="wrap_content" android:layout_width="wrap_content"
+ android:layout_gravity="center_vertical">
+
+ <Button android:layout_width="80dip" android:layout_height="60dip"
+ android:text="Mute" android:id="@+id/btnVolumeMute">
+ </Button>
+
+ </LinearLayout>
+
+ <LinearLayout android:id="@+id/widget00"
+ android:layout_height="wrap_content" android:layout_width="wrap_content"
+ android:layout_gravity="center_vertical">
+
+ <Button android:id="@+id/btnVolumeDown" android:layout_width="80dip"
+
+ android:layout_height="60dip" android:text="Vol.- -">
+ </Button>
+
+ <Button android:id="@+id/btnChannelDown" android:layout_width="80dip"
+ android:layout_marginLeft="40dip" android:layout_height="60dip"
+ android:text="Ch. -">
+ </Button>
+ </LinearLayout>
+
+ <LinearLayout android:id="@+id/widget00"
+ android:layout_width="fill_parent" android:layout_marginTop="20dip"
+ android:layout_height="wrap_content">
+
+ <Button android:layout_width="60dip" android:textSize="12dip"
+ android:layout_height="60dip" android:text="Exit" android:textColor="#FFFFFFFF"
+ android:id="@+id/btnExit" android:background="@drawable/button_close_nofocus"
+ android:gravity="bottom|center">
+ </Button>
+
+ <Button android:textSize="12dip" android:layout_height="60dip"
+ android:text="Suspend" android:textColor="#FFFFFFFF" android:id="@+id/btnSuspend"
+ android:background="@drawable/button_standby_focus" android:gravity="bottom|center"
+ android:layout_width="60dip">
+ </Button>
+
+ <Button android:layout_width="60dip" android:textSize="12dip"
+ android:layout_height="60dip" android:text="Hibernate"
+ android:textColor="#FFFFFFFF" android:id="@+id/btnHibernate"
+ android:background="@drawable/button_hibernate_focus"
+ android:gravity="bottom|center">
+ </Button>
+
+ <Button android:layout_width="60dip" android:textSize="12dip"
+ android:layout_height="60dip" android:text="Restart"
+ android:textColor="#FFFFFFFF" android:id="@+id/btnRestart"
+ android:background="@drawable/button_restart_focus"
+ android:gravity="bottom|center">
+ </Button>
+
+ <Button android:layout_width="60dip" android:textSize="12dip"
+ android:layout_height="60dip" android:text="Shut off"
+ android:textColor="#FFFFFFFF" android:id="@+id/btnShutOff"
+ android:background="@drawable/button_shutdown_focus" android:gravity="bottom|center">
+ </Button>
+ </LinearLayout>
+
+ <LinearLayout android:id="@+id/widget00"
+ android:layout_width="wrap_content" android:layout_height="wrap_content"
+ android:layout_marginTop="10dip" android:layout_gravity="center_horizontal">
+
+ <Button android:layout_width="60dip" android:textSize="12dip"
+ android:layout_height="60dip" android:text="Wake On Lan"
+ android:textColor="#FFFFFFFF" android:id="@+id/btnWakeOnLan"
+ android:background="@drawable/button_wakeup_focus" android:gravity="bottom|center">
+ </Button>
+ </LinearLayout>
+
</LinearLayout>
\ No newline at end of file
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/splash.xml
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/splash.xml 2010-11-30 12:17:31 UTC (rev 3988)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/splash.xml 2010-12-01 18:50:41 UTC (rev 3989)
@@ -3,7 +3,7 @@
android:orientation="vertical" android:layout_width="fill_parent"
android:layout_height="fill_parent">
<ImageView android:layout_width="fill_parent"
- android:layout_height="fill_parent" android:src="@drawable/splash"
+ android:layout_height="fill_parent" android:src="@drawable/splash02"
android:scaleType="fitXY">
</ImageView>
</LinearLayout>
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/values/strings.xml
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/values/strings.xml 2010-11-30 12:17:31 UTC (rev 3988)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/values/strings.xml 2010-12-01 18:50:41 UTC (rev 3989)
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
- <string name="hello">Hello World, main!</string>
<string name="app_name">MediaPortal Remote</string>
</resources>
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/MediaPlayerControl.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/MediaPlayerControl.java (rev 0)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/MediaPlayerControl.java 2010-12-01 18:50:41 UTC (rev 3989)
@@ -0,0 +1,44 @@
+package mediaportal.remote;
+
+import java.io.IOException;
+
+import android.media.MediaPlayer;
+
+public class MediaPlayerControl {
+
+ private static MediaPlayerControl instance;
+ private static MediaPlayer mp;
+
+ public static MediaPlayerControl getinstance() {
+ if (mp == null)
+ mp = new MediaPlayer();
+ if (instance == null)
+ instance = new MediaPlayerControl();
+ return instance;
+ }
+
+ public void Stop()
+ {
+ mp.stop();
+ }
+ public void Play(String Path)
+ {
+
+ try {
+// mp.stop();
+
+ mp.setDataSource(Path);
+ mp.prepare();
+ mp.start();
+ } catch (IllegalStateException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ } catch (IOException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+
+
+ }
+
+}
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/MusicDir.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/MusicDir.java 2010-11-30 12:17:31 UTC (rev 3988)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/MusicDir.java 2010-12-01 18:50:41 UTC (rev 3989)
@@ -32,17 +32,18 @@
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
+import android.widget.AdapterView;
import android.widget.BaseAdapter;
import android.widget.GridView;
import android.widget.ImageView;
import android.widget.TextView;
+import android.widget.AdapterView.OnItemClickListener;
import android.widget.Toast;
public class MusicDir extends Activity {
private Handler mHandler = new Handler();
private String actualDir = "";
-
private static ArrayList<ReceiveDirectoryXmlHandler.DirItems> musicList;
@Override
@@ -50,48 +51,59 @@
super.onCreate(savedInstanceState);
setContentView(R.layout.music);
+ mHandler.removeCallbacks(mUpdateTimeTask);
+ mHandler.postDelayed(mUpdateTimeTask, 100);
+
GridView gridview = (GridView) findViewById(R.id.music_grid);
gridview.setAdapter(new ImageAdapter2(MusicDir.this));
+ gridview.setOnItemClickListener(new OnItemClickListener() {
+ public void onItemClick(AdapterView<?> parent, View v,
+ int position, long id) {
- /*
- * gridview.setOnItemClickListener(new OnItemClickListener() { public
- * void onItemClick(AdapterView<?> parent, View v, int position, long
- * id) {
- *
- * // TextView tv = (TextView) v.findViewById(R.id.icon_text); ImageView
- * iv = (ImageView) v.findViewById(R.id.icon_image); musicItem item =
- * (musicItem) iv.getTag();
- *
- * if (item.typ == "item") { ReceiveDirHandler h =
- * ReceiveDirHandler.getinstance(); h.selectedMusic = position - 1; }
- *
- * if (item.typ == "folder") {
- *
- * musichandler h = musichandler.getinstance(); h.gotodir(item.title);
- *
- * GridView gridview = (GridView) findViewById(R.id.music_grid);
- * gridview.setAdapter(new ImageAdapter2(parent.getContext()));
- *
- * parent.invalidate(); }
- *
- * if (item.typ == "oneup") { musichandler h =
- * musichandler.getinstance(); h.oneup();
- *
- * GridView gridview = (GridView) findViewById(R.id.music_grid);
- * gridview.setAdapter(new ImageAdapter2(parent.getContext()));
- *
- * parent.invalidate(); }
- *
- * } });
- */
+ // TextView tv = (TextView) v.findViewById(R.id.icon_text);
+ // ImageView
+ ImageView iv = (ImageView) v.findViewById(R.id.icon_image);
+ musicItem music = (musicItem) iv.getTag();
+
+ if (music.typ == "item") {
+ // Picturesfullscreen.selectedPicture = position - 1;
+ // Intent myIntent = new Intent(MusicDir.this,
+ // Picturesfullscreen.class);
+ // startActivityForResult(myIntent, 0);
+ }
+
+ if (music.typ == "folder") {
+ actualDir += music.title + "/";
+
+ mHandler.removeCallbacks(mUpdateTimeTask);
+ mHandler.postDelayed(mUpdateTimeTask, 0);
+ }
+
+ if (music.typ == "oneup") {
+ if (actualDir.endsWith("/"))
+ actualDir = actualDir.substring(0,
+ actualDir.length() - 1);
+
+ int x = actualDir.lastIndexOf("/");
+ if (x >= 0) {
+ actualDir = actualDir.substring(0, x + 1);
+ } else
+ actualDir = "";
+
+ mHandler.removeCallbacks(mUpdateTimeTask);
+ mHandler.postDelayed(mUpdateTimeTask, 0);
+ }
+
+ }
+ });
}
@Override
public void onStart() {
super.onStart();
- mHandler.removeCallbacks(mUpdateTimeTask);
- mHandler.postDelayed(mUpdateTimeTask, 100);
+ // mHandler.removeCallbacks(mUpdateTimeTask);
+ // mHandler.postDelayed(mUpdateTimeTask, 100);
}
private Runnable mUpdateTimeTask = new Runnable() {
@@ -102,7 +114,7 @@
private void update() {
- Log.d("update music dir", "do update");
+ Log.d("update music dir", "do update folder : " + actualDir);
ReceiveDirHandler h = ReceiveDirHandler.getinstance();
musicList = h.getMusicDir(actualDir);
@@ -110,10 +122,10 @@
if (musicList.size() == 0) {
Toast.makeText(MusicDir.this, "TIME OUT SERVER", Toast.LENGTH_SHORT)
.show();
+ } else {
+ GridView gridview = (GridView) findViewById(R.id.music_grid);
+ gridview.invalidateViews();
}
-
- GridView gridview = (GridView) findViewById(R.id.music_grid);
- gridview.invalidateViews();
}
public class ImageAdapter2 extends BaseAdapter {
@@ -161,6 +173,7 @@
tv.setText(txtName);
ImageView iv = (ImageView) v.findViewById(R.id.icon_image);
+
if (isFolder) {
iv.setImageResource(R.drawable.folder);
musicItem item = new musicItem();
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveDbHandler.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveDbHandler.java 2010-11-30 12:17:31 UTC (rev 3988)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveDbHandler.java 2010-12-01 18:50:41 UTC (rev 3989)
@@ -21,6 +21,8 @@
package mediaportal.remote;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
import java.util.ArrayList;
import mediaportal.remote.ReceiveDbXmlHandler.DbItems;
@@ -56,8 +58,15 @@
ReceiveDbXmlHandler handler = new ReceiveDbXmlHandler();
ReceiveHandler hand = new ReceiveHandler(handler);
+
+ try {
+ Data = URLEncoder.encode(Data, "UTF-8");
+ } catch (UnsupportedEncodingException e1) {
+ // TODO Auto-generated catch block
+ e1.printStackTrace();
+ }
+
hand.readValues("/db_music/" + Data);
-
return handler.DbList;
}
}
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveDbXmlHandler.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveDbXmlHandler.java 2010-11-30 12:17:31 UTC (rev 3988)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveDbXmlHandler.java 2010-12-01 18:50:41 UTC (rev 3989)
@@ -41,6 +41,7 @@
public String AlbumArtist= "";
public String Track= "";
public String Rating= "";
+ public String Filename= "";
}
private DbItems currentDbItem;
@@ -73,6 +74,7 @@
if (localName == "AlbumArtist") {currentDbItem.AlbumArtist =currentValue;}
if (localName == "Track") {currentDbItem.Track =currentValue;}
if (localName == "Rating") {currentDbItem.Rating =currentValue;}
+ if (localName == "Filename") {currentDbItem.Filename =currentValue;}
if (localName == "Item")DbList.add(currentDbItem);
}
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveDirectoryXmlHandler.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveDirectoryXmlHandler.java 2010-11-30 12:17:31 UTC (rev 3988)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveDirectoryXmlHandler.java 2010-12-01 18:50:41 UTC (rev 3989)
@@ -26,6 +26,8 @@
import org.xml.sax.SAXException;
import org.xml.sax.helpers.DefaultHandler;
+import android.graphics.Bitmap;
+
public class ReceiveDirectoryXmlHandler extends DefaultHandler {
Boolean currentElement = false;
String currentValue = null;
@@ -36,6 +38,7 @@
{
public boolean isFolder = false;
public String File= "";
+ public Bitmap Picture = null;
}
private DirItems currentdirItem;
@@ -69,7 +72,7 @@
DirList.add(currentdirItem);
}
if (localName == "File") {
- currentdirItem.isFolder = true;
+ currentdirItem.isFolder = false;
currentdirItem.File = currentValue;
DirList.add(currentdirItem);
}
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/Remote_02.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/Remote_02.java 2010-11-30 12:17:31 UTC (rev 3988)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/Remote_02.java 2010-12-01 18:50:41 UTC (rev 3989)
@@ -31,7 +31,9 @@
import android.os.Bundle;
import android.view.GestureDetector;
import android.view.MotionEvent;
+import android.view.View;
import android.view.GestureDetector.OnGestureListener;
+import android.widget.Button;
public class Remote_02 extends Activity implements OnGestureListener {
@@ -57,7 +59,76 @@
HttpServer = settings.getString("Server", "192.168.0.30");
HttpPort = settings.getString("Port", "8200");
-
+
+ Button btnVolumeUp = (Button) findViewById(R.id.btnVolumeUp);
+ btnVolumeUp.setOnClickListener(new View.OnClickListener() {
+ public void onClick(View view) {
+ PostCommand("volumeUp");
+ }
+ });
+ Button btnVolumeDown = (Button) findViewById(R.id.btnVolumeDown);
+ btnVolumeDown.setOnClickListener(new View.OnClickListener() {
+ public void onClick(View view) {
+ PostCommand("volumeDown");
+ }
+ });
+ Button btnVolumeMute = (Button) findViewById(R.id.btnVolumeMute);
+ btnVolumeMute.setOnClickListener(new View.OnClickListener() {
+ public void onClick(View view) {
+ PostCommand("volumeMute");
+ }
+ });
+
+ Button btnChannelUp = (Button) findViewById(R.id.btnChannelUp);
+ btnChannelUp.setOnClickListener(new View.OnClickListener() {
+ public void onClick(View view) {
+ PostCommand("nextChannel");
+ }
+ });
+ Button btnChannelDown = (Button) findViewById(R.id.btnChannelDown);
+ btnChannelDown.setOnClickListener(new View.OnClickListener() {
+ public void onClick(View view) {
+ PostCommand("prevChannel");
+ }
+ });
+
+ Button btnExit = (Button) findViewById(R.id.btnExit);
+ btnExit.setOnClickListener(new View.OnClickListener() {
+ public void onClick(View view) {
+ PostCommand("exit");
+ }
+ });
+ Button btnSuspend = (Button) findViewById(R.id.btnSuspend);
+ btnSuspend.setOnClickListener(new View.OnClickListener() {
+ public void onClick(View view) {
+ PostCommand("suspend");
+ }
+ });
+ Button btnHibernate = (Button) findViewById(R.id.btnHibernate);
+ btnHibernate.setOnClickListener(new View.OnClickListener() {
+ public void onClick(View view) {
+ PostCommand("hibernate");
+ }
+ });
+ Button btnRestart = (Button) findViewById(R.id.btnRestart);
+ btnRestart.setOnClickListener(new View.OnClickListener() {
+ public void onClick(View view) {
+ PostCommand("restart");
+ }
+ });
+ Button btnShutOff = (Button) findViewById(R.id.btnShutOff);
+ btnShutOff.setOnClickListener(new View.OnClickListener() {
+ public void onClick(View view) {
+ PostCommand("shutoff");
+ }
+ });
+
+ Button btnWakeOnLan = (Button) findViewById(R.id.btnWakeOnLan);
+ btnWakeOnLan.setOnClickListener(new View.OnClickListener() {
+ public void onClick(View view) {
+ PostCommand("wakeonlan");
+ }
+ });
}
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/httpHandler.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/httpHandler.java 2010-11-30 12:17:31 UTC (rev 3988)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/httpHandler.java 2010-12-01 18:50:41 UTC (rev 3989)
@@ -82,7 +82,8 @@
.toString();
try {
- InputStream in = openHttpConnection("http://192.168.0.30:8200/music/Clementi_Sonatina_Op.36_No.1_Movement_1.mp3");
+ InputStream in = openHttpConnection("http://"+ Settings.Server + ":" + Settings.Port +
+ "/music/Clementi_Sonatina_Op.36_No.1_Movement_1.mp3");
// BufferedInputStream bis = new BufferedInputStream(in);
ByteArrayBuffer baf = new ByteArrayBuffer(50);
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/main.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/main.java 2010-11-30 12:17:31 UTC (rev 3988)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/main.java 2010-12-01 18:50:41 UTC (rev 3989)
@@ -21,10 +21,13 @@
package mediaportal.remote;
+import java.io.IOException;
+
import mediaportal.remote.R;
import android.app.Activity;
import android.content.Intent;
import android.content.SharedPreferences;
+import android.media.MediaPlayer;
import android.os.Bundle;
import android.view.Menu;
import android.view.MenuItem;
@@ -34,18 +37,22 @@
public class Main extends Activity {
private static final String PREFS_PRIVATE = "PREFS_MP_REMOTE";
-
+
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.main);
-
- SharedPreferences settings = getSharedPreferences(PREFS_PRIVATE, MODE_PRIVATE);
+ SharedPreferences settings = getSharedPreferences(PREFS_PRIVATE,
+ MODE_PRIVATE);
+
Settings.Server = settings.getString("Server", "192.168.0.30");
Settings.Port = settings.getString("Port", "8200");
Settings.MacId = settings.getString("MacId", "11-22-33-44-55-66");
-
+
+ Toast.makeText(getBaseContext(), "Press 'menu' for settings",
+ Toast.LENGTH_LONG).show();
+
Button btnPictures = (Button) findViewById(R.id.MainButton1);
btnPictures.setOnClickListener(new View.OnClickListener() {
public void onClick(View view) {
@@ -53,7 +60,7 @@
startActivityForResult(myIntent, 0);
}
});
-
+
Button btnMusic = (Button) findViewById(R.id.MainButton2);
btnMusic.setOnClickListener(new View.OnClickListener() {
public void onClick(View view) {
@@ -62,6 +69,31 @@
}
});
+ Button btnVideo = (Button) findViewById(R.id.MainButton3);
+ btnVideo.setOnClickListener(new View.OnClickListener() {
+ public void onClick(View view) {
+ MediaPlayer mp = new MediaPlayer();
+ try {
+ String p = "http://"
+ + Settings.Server
+ + ":"
+ + Settings.Port
+ + "/music/"
+ + "laserkraft_3d_-_nein_mann.mp3";
+ mp.setDataSource(p);
+ mp.prepare();
+ mp.start();
+ } catch (IllegalStateException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ } catch (IOException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+
+ }
+ });
+
Button btnRemote = (Button) findViewById(R.id.MainButton4);
btnRemote.setOnClickListener(new View.OnClickListener() {
public void onClick(View view) {
@@ -73,7 +105,8 @@
Button btnNowPlaying = (Button) findViewById(R.id.MainButton5);
btnNowPlaying.setOnClickListener(new View.OnClickListener() {
public void onClick(View view) {
- Intent myIntent = new Intent(view.getContext(), nowplaying.class);
+ Intent myIntent = new Intent(view.getContext(),
+ nowplaying.class);
startActivityForResult(myIntent, 0);
}
});
@@ -85,17 +118,17 @@
menu.add(0, 112, 0, "Exit");
return true;
}
-
+
@Override
- public boolean onOptionsItemSelected (MenuItem item){
- switch (item.getItemId()){
+ public boolean onOptionsItemSelected(MenuItem item) {
+ switch (item.getItemId()) {
case 111:
Intent myIntent = new Intent(this, Setup.class);
startActivityForResult(myIntent, 0);
- return true;
+ return true;
case 112:
this.finish();
- return true;
+ return true;
}
return true;
}
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicResults.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicResults.java 2010-11-30 12:17:31 UTC (rev 3988)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicResults.java 2010-12-01 18:50:41 UTC (rev 3989)
@@ -40,49 +40,60 @@
import android.widget.TextView;
import android.widget.Toast;
-public class MusicResults extends Activity{
-
+public class MusicResults extends Activity {
+
public static final String PREFS_PRIVATE = "PREFS_MP_REMOTE";
private Handler mHandler = new Handler();
-
+
private static ArrayList<ReceiveDbXmlHandler.DbItems> itemList;
-
+
public static String Select = "";
-
+
public void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.music_results);
-
- ListView l1 = (ListView) findViewById(R.id.list_result);
- l1.setAdapter(new EfficientAdapter(MusicResults.this));
-
- ColorDrawable divcolor = new ColorDrawable(Color.DKGRAY);
- l1.setDivider(divcolor);
- l1.setDividerHeight(2);
-
- registerForContextMenu(l1);
- }
-
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.music_results);
+
+ ListView l1 = (ListView) findViewById(R.id.list_result);
+ l1.setAdapter(new EfficientAdapter(MusicResults.this));
+
+ ColorDrawable divcolor = new ColorDrawable(Color.DKGRAY);
+ l1.setDivider(divcolor);
+ l1.setDividerHeight(2);
+
+ registerForContextMenu(l1);
+ }
+
@Override
public void onCreateContextMenu(ContextMenu menu, View v,
ContextMenuInfo menuInfo) {
super.onCreateContextMenu(menu, v, menuInfo);
menu.setHeaderTitle("Select action");
-
+
menu.add(0, 101, 0, "Add title to playlist");
menu.add(0, 102, 0, "Download title to SD");
menu.add(0, 103, 0, "Add all title to playlist");
menu.add(0, 104, 0, "Download all title to SD");
menu.add(0, 105, 0, "Close menu");
+
+ ListView l1 = (ListView) findViewById(R.id.list_result);
+ int x = l1.getSelectedItemPosition();
+ if (x == -1)
+ x = 0;
+ if (itemList.size() > 0) {
+ ReceiveDbXmlHandler.DbItems itm = itemList.get(x);
+
+ httpHandler http = new httpHandler();
+ http.DownloadFile();
+ }
+ x = 1;
}
-
+
@Override
public boolean onContextItemSelected(MenuItem item) {
// item.id ==
return true;
}
-
@Override
public void onStart() {
super.onStart();
@@ -90,30 +101,31 @@
mHandler.removeCallbacks(mUpdateTimeTask);
mHandler.postDelayed(mUpdateTimeTask, 100);
}
+
private Runnable mUpdateTimeTask = new Runnable() {
public void run() {
update();
}
};
-
+
private void update() {
-
+
Log.d("update search", "do update");
-
+
ReceiveDbHandler handler = ReceiveDbHandler.getinstance();
itemList = handler.GetSongsByArtist(Select);
-
+
if (itemList.size() == 0) {
Toast.makeText(MusicResults.this, "TIME OUT SERVER",
Toast.LENGTH_LONG).show();
}
-
+
ListView l1 = (ListView) findViewById(R.id.list_result);
- l1.invalidateViews();
+ l1.invalidateViews();
}
-
+
private static class EfficientAdapter extends BaseAdapter {
-
+
private LayoutInflater mInflater;
public EfficientAdapter(Context context) {
@@ -121,8 +133,10 @@
}
public int getCount() {
- if(itemList != null) return itemList.size();
- else return 0;
+ if (itemList != null)
+ return itemList.size();
+ else
+ return 0;
}
public Object getItem(int position) {
@@ -135,7 +149,7 @@
public View getView(int position, View convertView, ViewGroup parent) {
ViewHolder holder;
-
+
if (convertView == null) {
convertView = mInflater.inflate(R.layout.list_item, null);
holder = new ViewHolder();
@@ -148,10 +162,10 @@
} else {
holder = (ViewHolder) convertView.getTag();
}
-
+
ReceiveDbXmlHandler.DbItems item = itemList.get(position);
-
- holder.text.setText(String.valueOf(position +1));
+
+ holder.text.setText(String.valueOf(position + 1));
holder.text2.setText(item.Title + " - " + item.Artist);
convertView.setBackgroundColor((position & 1) == 1 ? Color.WHITE
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicSong.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicSong.java 2010-11-30 12:17:31 UTC (rev 3988)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicSong.java 2010-12-01 18:50:41 UTC (rev 3989)
@@ -24,6 +24,7 @@
import java.util.ArrayList;
import android.app.Activity;
import android.content.Context;
+import android.content.Intent;
import android.graphics.Color;
import android.graphics.drawable.ColorDrawable;
import android.os.Bundle;
@@ -32,31 +33,42 @@
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
+import android.widget.AdapterView;
import android.widget.BaseAdapter;
import android.widget.ListView;
import android.widget.TextView;
import android.widget.Toast;
-public class MusicSong extends Activity{
-
+public class MusicSong extends Activity {
+
private Handler mHandler = new Handler();
-
+
private static ArrayList<ReceiveDbXmlHandler.DbItems> songList;
-
+
public static String Select = "";
-
+
public void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.music_song);
-
- ListView l1 = (ListView) findViewById(R.id.list_song);
- l1.setAdapter(new EfficientAdapter(MusicSong.this));
-
- ColorDrawable divcolor = new ColorDrawable(Color.DKGRAY);
- l1.setDivider(divcolor);
- l1.setDividerHeight(2);
- }
-
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.music_song);
+
+ ListView l1 = (ListView) findViewById(R.id.list_song);
+ l1.setAdapter(new EfficientAdapter(MusicSong.this));
+
+ ColorDrawable divcolor = new ColorDrawable(Color.DKGRAY);
+ l1.setDivider(divcolor);
+ l1.setDividerHeight(2);
+
+ l1.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+ // @override
+ public void onItemClick(AdapterView<?> arg0, View arg1, int arg2,
+ long arg3) {
+
+ MediaPlayerControl mp = MediaPlayerControl.getinstance();
+ mp.Play("http://" + Settings.Server + ":" + Settings.Port + "/music/" + "song-marianne-plays-on-piano-sense-and-sensibilit.mp3");
+ }
+ });
+ }
+
@Override
public void onStart() {
super.onStart();
@@ -64,30 +76,31 @@
mHandler.removeCallbacks(mUpdateTimeTask);
mHandler.postDelayed(mUpdateTimeTask, 100);
}
+
private Runnable mUpdateTimeTask = new Runnable() {
public void run() {
update();
}
};
-
+
private void update() {
-
+
Log.d("update song", "do update");
-
+
ReceiveDbHandler handler = ReceiveDbHandler.getinstance();
songList = handler.GetSongs();
-
+
if (songList.size() == 0) {
- Toast.makeText(MusicSong.this, "TIME OUT SERVER",
- Toast.LENGTH_LONG).show();
+ Toast.makeText(MusicSong.this, "TIME OUT SERVER", Toast.LENGTH_LONG)
+ .show();
}
-
+
ListView l1 = (ListView) findViewById(R.id.list_song);
- l1.invalidateViews();
+ l1.invalidateViews();
}
-
+
private static class EfficientAdapter extends BaseAdapter {
-
+
private LayoutInflater mInflater;
public EfficientAdapter(Context context) {
@@ -95,8 +108,10 @@
}
public int getCount() {
- if(songList != null) return songList.size();
- else return 0;
+ if (songList != null)
+ return songList.size();
+ else
+ return 0;
}
public Object getItem(int position) {
@@ -109,7 +124,7 @@
public View getView(int position, View convertView, ViewGroup parent) {
ViewHolder holder;
-
+
if (convertView == null) {
convertView = mInflater.inflate(R.layout.list_item, null);
holder = new ViewHolder();
@@ -122,10 +137,10 @@
} else {
holder = (ViewHolder) convertView.getTag();
}
-
+
ReceiveDbXmlHandler.DbItems item = songList.get(position);
-
- holder.text.setText(String.valueOf(position +1));
+
+ holder.text.setText(String.valueOf(position + 1));
holder.text2.setText(item.Title + " - " + item.Artist);
convertView.setBackgroundColor((position & 1) == 1 ? Color.WHITE
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/pictures.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/pictures.java 2010-11-30 12:17:31 UTC (rev 3988)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/pictures.java 2010-12-01 18:50:41 UTC (rev 3989)
@@ -26,77 +26,84 @@
import mediaportal.remote.ReceiveDirectoryXmlHandler.DirItems;
import android.app.Activity;
import android.content.Context;
+import android.content.Intent;
import android.os.Bundle;
import android.os.Handler;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
+import android.widget.AdapterView;
import android.widget.BaseAdapter;
import android.widget.GridView;
import android.widget.ImageView;
import android.widget.TextView;
+import android.widget.AdapterView.OnItemClickListener;
import android.widget.Toast;
public class Pictures extends Activity {
private Handler mHandler = new Handler();
- private String actualDir = "";
+ public static String actualDir = "";
+ public static ArrayList<ReceiveDirectoryXmlHandler.DirItems> pictureList;
- private static ArrayList<ReceiveDirectoryXmlHandler.DirItems> pictureList;
-
- /** Called when the activity is first created. */
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.pictures);
+
+ mHandler.removeCallbacks(mUpdateTimeTask);
+ mHandler.postDelayed(mUpdateTimeTask, 100);
GridView gridview = (GridView) findViewById(R.id.GridView01);
- gridview.setAdapter(new ImageAdapter2(this));
+ gridview.setOnItemClickListener(new OnItemClickListener() {
+ public void onItemClick(AdapterView<?> parent, View v,
+ int position, long id) {
- /*
- * gridview.setOnItemClickListener(new OnItemClickListener() { public
- * void onItemClick(AdapterView<?> parent, View v, int position, long
- * id) {
- *
- * // TextView tv = (TextView) v.findViewById(R.id.icon_text); ImageView
- * iv = (ImageView) v.findViewById(R.id.icon_image); picItem pic =
- * (picItem) iv.getTag();
- *
- * if (pic.typ == "item") { picturehandler h =
- * picturehandler.getinstance(); h.selectedPicture = position - 1;
- *
- * Intent myIntent = new Intent(v.getContext(),
- * picturesfullscreen.class); startActivityForResult(myIntent, 0); }
- *
- * if (pic.typ == "folder") {
- *
- * picturehandler h = picturehandler.getinstance();
- * h.gotodir(pic...
[truncated message content] |
