Menu
▾
▴
[Mp-plugins-svn] SF.net SVN: mp-plugins:[3976] trunk/plugins/AndroidRemote
|
From: <kro...@us...> - 2010-11-24 21:07:28
|
Revision: 3976
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=3976&view=rev
Author: kroko_koenig
Date: 2010-11-24 21:07:20 +0000 (Wed, 24 Nov 2010)
Log Message:
-----------
more updates now playing and pictures
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/drawable/play.png
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/main.xml
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/splash.xml
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/pictures.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/picturesfullscreen.java
trunk/plugins/AndroidRemote/Server/AndroidRemote/Request.cs
trunk/plugins/AndroidRemote/Server/AndroidRemote.suo
Added Paths:
-----------
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/assets/cmd_next.xml
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/assets/cmd_pause.xml
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/assets/cmd_play.xml
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/assets/cmd_previous.xml
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/assets/cmd_stop.xml
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/cdcover.png
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/document.png
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/forward.png
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/pause.png
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/rewind.png
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/stop.png
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/playingnow.xml
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/nowplaying.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/nowplayingXmlHandler.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/nowplayinghandler.java
trunk/plugins/AndroidRemote/Release/nowplaying.jpg
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/AndroidManifest.xml
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/AndroidManifest.xml 2010-11-24 17:32:20 UTC (rev 3975)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/AndroidManifest.xml 2010-11-24 21:07:20 UTC (rev 3976)
@@ -19,6 +19,7 @@
<activity android:name=".pictures"></activity>
<activity android:name=".picturesfullscreen"></activity>
<activity android:name=".setup"></activity>
+ <activity android:name=".nowplaying"></activity>
</application>
<uses-sdk android:minSdkVersion="3" />
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/assets/cmd_next.xml
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/assets/cmd_next.xml (rev 0)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/assets/cmd_next.xml 2010-11-24 21:07:20 UTC (rev 3976)
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<message>
+ <command>ACTION_NEXT_ITEM</command>
+</message>
\ No newline at end of file
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/assets/cmd_pause.xml
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/assets/cmd_pause.xml (rev 0)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/assets/cmd_pause.xml 2010-11-24 21:07:20 UTC (rev 3976)
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<message>
+ <command>ACTION_PAUSE</command>
+</message>
\ No newline at end of file
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/assets/cmd_play.xml
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/assets/cmd_play.xml (rev 0)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/assets/cmd_play.xml 2010-11-24 21:07:20 UTC (rev 3976)
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<message>
+ <command>ACTION_PLAY</command>
+</message>
\ No newline at end of file
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/assets/cmd_previous.xml
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/assets/cmd_previous.xml (rev 0)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/assets/cmd_previous.xml 2010-11-24 21:07:20 UTC (rev 3976)
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<message>
+ <command>ACTION_PREV_ITEM</command>
+</message>
\ No newline at end of file
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/assets/cmd_stop.xml
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/assets/cmd_stop.xml (rev 0)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/assets/cmd_stop.xml 2010-11-24 21:07:20 UTC (rev 3976)
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<message>
+ <command>ACTION_STOP</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-24 17:32:20 UTC (rev 3975)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/gen/mediaportal/remote/R.java 2010-11-24 21:07:20 UTC (rev 3976)
@@ -14,43 +14,64 @@
public static final int accept_icon=0x7f020000;
public static final int back=0x7f020001;
public static final int back_icon=0x7f020002;
- public static final int close_icon=0x7f020003;
- public static final int down_icon=0x7f020004;
- public static final int folder=0x7f020005;
- public static final int folderback=0x7f020006;
- public static final int icon=0x7f020007;
- public static final int music_logo=0x7f020008;
- public static final int next_icon=0x7f020009;
- public static final int nowplaying_logo=0x7f02000a;
- public static final int picture=0x7f02000b;
- public static final int pictures_logo=0x7f02000c;
- public static final int play=0x7f02000d;
- public static final int remote_logo=0x7f02000e;
- public static final int splash=0x7f02000f;
- public static final int up_icon=0x7f020010;
- public static final int videos_logo=0x7f020011;
+ public static final int cdcover=0x7f020003;
+ public static final int close_icon=0x7f020004;
+ public static final int document=0x7f020005;
+ public static final int down_icon=0x7f020006;
+ public static final int folder=0x7f020007;
+ public static final int folderback=0x7f020008;
+ public static final int forward=0x7f020009;
+ public static final int icon=0x7f02000a;
+ public static final int music_logo=0x7f02000b;
+ public static final int next_icon=0x7f02000c;
+ public static final int nowplaying_logo=0x7f02000d;
+ public static final int pause=0x7f02000e;
+ public static final int picture=0x7f02000f;
+ public static final int pictures_logo=0x7f020010;
+ public static final int play=0x7f020011;
+ public static final int remote_logo=0x7f020012;
+ public static final int rewind=0x7f020013;
+ public static final int splash=0x7f020014;
+ public static final int stop=0x7f020015;
+ public static final int up_icon=0x7f020016;
+ public static final int videos_logo=0x7f020017;
}
public static final class id {
public static final int GridView01=0x7f050009;
public static final int ImageView01=0x7f05000b;
+ public static final int LinearLayout01=0x7f05000c;
public static final int MainButton1=0x7f050003;
public static final int MainButton2=0x7f050004;
public static final int MainButton3=0x7f050005;
public static final int MainButton4=0x7f050006;
public static final int MainButton5=0x7f050007;
- public static final int btnCancel=0x7f05000e;
- public static final int btnDown=0x7f050010;
- public static final int btnLeft=0x7f050012;
- public static final int btnOk=0x7f05000f;
- public static final int btnReturn=0x7f05000d;
- public static final int btnReturnSetup=0x7f050015;
- public static final int btnRight=0x7f050011;
- public static final int btnUp=0x7f05000c;
+ public static final int btnCancel=0x7f05001d;
+ public static final int btnDown=0x7f05001f;
+ public static final int btnLeft=0x7f050021;
+ public static final int btnOk=0x7f05001e;
+ public static final int btnReturn=0x7f05001c;
+ public static final int btnReturnSetup=0x7f050024;
+ public static final int btnRight=0x7f050020;
+ public static final int btnUp=0x7f05001b;
public static final int full_text=0x7f05000a;
public static final int icon_image=0x7f050001;
public static final int icon_text=0x7f050002;
- public static final int server_ip=0x7f050013;
- public static final int server_port=0x7f050014;
+ public static final int now_album=0x7f05000e;
+ public static final int now_artist=0x7f050014;
+ public static final int now_cd=0x7f05000f;
+ public static final int now_list=0x7f05001a;
+ public static final int now_next=0x7f050019;
+ public static final int now_pause=0x7f050017;
+ public static final int now_play=0x7f050018;
+ public static final int now_playing=0x7f05000d;
+ public static final int now_playing_right=0x7f050012;
+ public static final int now_playing_t_left=0x7f050011;
+ public static final int now_prev=0x7f050015;
+ public static final int now_progress=0x7f050010;
+ public static final int now_stop=0x7f050016;
+ public static final int now_title=0x7f050013;
+ public static final int server_ip=0x7f050022;
+ public static final int server_port=0x7f050023;
public static final int widget0=0x7f050008;
public static final int widget44=0x7f050000;
}
@@ -59,9 +80,10 @@
public static final int main=0x7f030001;
public static final int pictures=0x7f030002;
public static final int picturesfullscreen=0x7f030003;
- public static final int remote=0x7f030004;
- public static final int setup=0x7f030005;
- public static final int splash=0x7f030006;
+ public static final int playingnow=0x7f030004;
+ public static final int remote=0x7f030005;
+ public static final int setup=0x7f030006;
+ public static final int splash=0x7f030007;
}
public static final class string {
public static final int app_name=0x7f040001;
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/cdcover.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/cdcover.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/document.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/document.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/forward.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/forward.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/pause.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/pause.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/play.png
===================================================================
(Binary files differ)
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/rewind.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/rewind.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/stop.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/stop.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/main.xml
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/main.xml 2010-11-24 17:32:20 UTC (rev 3975)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/main.xml 2010-11-24 21:07:20 UTC (rev 3976)
@@ -1,47 +1,37 @@
-<?xml version="1.0" encoding="utf-8"?>
<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"
- >
-
-<Button android:id="@+id/MainButton1"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:padding="0dp"
+ android:orientation="vertical" android:layout_width="fill_parent"
+ android:layout_height="fill_parent" android:background="@drawable/back">
+
+ <Button android:id="@+id/MainButton1" android:layout_width="fill_parent"
+ android:layout_height="wrap_content" android:padding="0dp"
android:background="@drawable/pictures_logo" />
-
-<View android:layout_height="2dp" android:layout_width="fill_parent" android:background="#000"/>
-
-<Button android:id="@+id/MainButton2"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:padding="0dp"
+
+ <View android:layout_height="2dp" android:layout_width="fill_parent"
+ android:background="#000" />
+
+ <Button android:id="@+id/MainButton2" android:layout_width="fill_parent"
+ android:layout_height="wrap_content" android:padding="0dp"
android:background="@drawable/music_logo" />
-<View android:layout_height="2dp" android:layout_width="fill_parent" android:background="#000"/>
-
-<Button android:id="@+id/MainButton3"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:padding="0dp"
+ <View android:layout_height="2dp" android:layout_width="fill_parent"
+ android:background="#000" />
+
+ <Button android:id="@+id/MainButton3" android:layout_width="fill_parent"
+ android:layout_height="wrap_content" android:padding="0dp"
android:background="@drawable/videos_logo" />
-
-<View android:layout_height="2dp" android:layout_width="fill_parent" android:background="#000"/>
-
-<Button android:id="@+id/MainButton4"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:padding="0dp"
+
+ <View android:layout_height="2dp" android:layout_width="fill_parent"
+ android:background="#000" />
+
+ <Button android:id="@+id/MainButton4" android:layout_width="fill_parent"
+ android:layout_height="wrap_content" android:padding="0dp"
android:background="@drawable/remote_logo" />
-
-<View android:layout_height="2dp" android:layout_width="fill_parent" android:background="#000"/>
-
-<Button android:id="@+id/MainButton5"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:padding="0dp"
+
+ <View android:layout_height="2dp" android:layout_width="fill_parent"
+ android:background="#000" />
+
+ <Button android:id="@+id/MainButton5" android:layout_width="fill_parent"
+ android:layout_height="wrap_content" android:padding="0dp"
android:background="@drawable/nowplaying_logo" />
-
+
</LinearLayout>
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/pictures.xml
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/pictures.xml 2010-11-24 17:32:20 UTC (rev 3975)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/pictures.xml 2010-11-24 21:07:20 UTC (rev 3976)
@@ -1,22 +1,12 @@
-<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"
->
-<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"
- android:numColumns="auto_fit"
- android:verticalSpacing="10dp"
- android:horizontalSpacing="10dp"
- android:stretchMode="columnWidth"
- android:gravity="center"
- >
- </GridView>
+<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">
+ <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"
+ android:numColumns="auto_fit" android:verticalSpacing="10dp"
+ android:horizontalSpacing="10dp" android:stretchMode="columnWidth"
+ android:gravity="center">
+ </GridView>
</AbsoluteLayout>
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/picturesfullscreen.xml
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/picturesfullscreen.xml 2010-11-24 17:32:20 UTC (rev 3975)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/picturesfullscreen.xml 2010-11-24 21:07:20 UTC (rev 3976)
@@ -1,21 +1,12 @@
<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"
- >
-<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"
- android:textColor="#FF000000"
- android:textColorHighlight="#FFFFFFFF">
-</TextView>
+ android:orientation="vertical" android:layout_width="fill_parent"
+ android:layout_height="fill_parent" android:background="@drawable/back">
+ <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"
+ android:textColor="#FF000000" android:textColorHighlight="#FFFFFFFF">
+ </TextView>
-<ImageView android:id="@+id/ImageView01"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"></ImageView>
+ <ImageView android:id="@+id/ImageView01"
+ android:layout_width="wrap_content" android:layout_height="wrap_content"></ImageView>
</LinearLayout>
\ No newline at end of file
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/playingnow.xml
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/playingnow.xml (rev 0)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/playingnow.xml 2010-11-24 21:07:20 UTC (rev 3976)
@@ -0,0 +1,82 @@
+<LinearLayout android:id="@+id/LinearLayout01"
+ android:orientation="vertical" android:layout_width="fill_parent"
+ android:layout_height="fill_parent" xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <TextView android:id="@+id/now_playing" android:layout_width="fill_parent"
+ android:layout_height="wrap_content" android:text="NOW PLAYING"
+ android:gravity="center_horizontal" android:background="#FFFFFFFF"
+ android:textColor="#FF000000" android:textSize="18dip"
+ android:textColorHighlight="#FFFFFFFF">
+ </TextView>
+
+ <TextView android:id="@+id/now_album" android:layout_width="fill_parent"
+ android:layout_height="wrap_content" android:text="Album"
+ android:background="#F0F0F0FF" android:textColor="#FF000000"
+ android:textSize="18dip" android:textColorHighlight="#FFFFFFFF"
+ android:gravity="center_horizontal">
+ </TextView>
+
+ <ImageView android:id="@+id/now_cd" android:layout_width="250dip"
+ android:layout_height="250dip" android:scaleType="centerCrop"
+ android:background="@drawable/cdcover" android:layout_gravity="center_horizontal">
+ </ImageView>
+
+ <SeekBar android:id="@+id/now_progress" android:layout_width="fill_parent"
+ android:layout_height="wrap_content" android:max="100"
+ android:paddingLeft="20dip" android:paddingRight="10dip"
+ android:paddingTop="0dip" android:thumbOffset="20dip"
+ android:layout_marginTop="-10dip" />
+
+ <LinearLayout android:layout_width="fill_parent"
+ android:layout_height="wrap_content" android:orientation="vertical"
+ android:layout_marginTop="-9dip">
+ <RelativeLayout android:layout_width="fill_parent"
+ android:layout_height="wrap_content" android:layout_marginTop="10dip">
+ <TextView android:id="@+id/now_playing_t_left"
+ android:layout_width="wrap_content" android:layout_height="wrap_content"
+ android:textSize="12dip" android:textColor="#FF8080ff" android:text="left"
+ android:gravity="left" />
+ <TextView android:id="@+id/now_playing_right"
+ android:layout_width="wrap_content" android:layout_height="wrap_content"
+ android:layout_alignParentRight="true" android:textSize="12dip"
+ android:textColor="#FF8080ff" android:gravity="right" android:text="right"
+ android:singleLine="true" />
+ </RelativeLayout>
+ <TextView android:id="@+id/now_title" android:layout_width="fill_parent"
+ android:layout_height="wrap_content" android:textSize="16dip"
+ android:background="#F0F0F0FF" android:textColor="#FF000000"
+ android:text="Artist" android:gravity="center_horizontal"
+ android:ellipsize="end" android:paddingLeft="25dip"
+ android:paddingRight="22dip" android:layout_marginTop="0dip" />
+ <TextView android:id="@+id/now_artist" android:layout_width="fill_parent"
+ android:layout_height="wrap_content" android:gravity="center_horizontal"
+ android:textSize="18dip" android:textColor="#FF000000"
+ android:background="#FFFFFFFF" android:text="Title"
+ android:layout_marginTop="0dip" />
+ </LinearLayout>
+
+ <LinearLayout android:layout_height="wrap_content"
+ android:orientation="horizontal" android:layout_width="fill_parent">
+ <ImageButton android:id="@+id/now_prev"
+ android:layout_width="wrap_content" android:layout_height="wrap_content"
+ android:background="@drawable/rewind" />
+ <ImageButton android:id="@+id/now_stop"
+ android:layout_width="wrap_content" android:layout_height="wrap_content"
+ android:background="@drawable/stop" />
+ <ImageButton android:id="@+id/now_pause"
+ android:layout_width="wrap_content" android:layout_height="wrap_content"
+ android:background="@drawable/pause" />
+ <ImageButton android:id="@+id/now_play"
+ android:layout_width="wrap_content" android:layout_height="wrap_content"
+ android:background="@drawable/play" />
+ <ImageButton android:id="@+id/now_next"
+ android:layout_width="wrap_content" android:layout_height="wrap_content"
+ android:background="@drawable/forward" />
+ <ImageButton android:id="@+id/now_list"
+ android:layout_width="wrap_content" android:layout_height="wrap_content" android:background="@drawable/document"/>
+ </LinearLayout>
+
+</LinearLayout>
+
+
+
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/splash.xml
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/splash.xml 2010-11-24 17:32:20 UTC (rev 3975)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/splash.xml 2010-11-24 21:07:20 UTC (rev 3976)
@@ -1,12 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- 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: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:scaleType="fitXY">
- </ImageView>
+ </ImageView>
</LinearLayout>
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/httpHandler.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/httpHandler.java 2010-11-24 17:32:20 UTC (rev 3975)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/httpHandler.java 2010-11-24 21:07:20 UTC (rev 3976)
@@ -1,6 +1,5 @@
package mediaportal.remote;
-import java.io.BufferedInputStream;
import java.io.File;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
@@ -14,11 +13,12 @@
import org.apache.http.util.ByteArrayBuffer;
+
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.os.Environment;
-import android.widget.Toast;
+
public class httpHandler {
String extStorageDirectory;
@@ -86,16 +86,16 @@
try {
InputStream in = openHttpConnection("http://192.168.0.30:8200/music/Clementi_Sonatina_Op.36_No.1_Movement_1.mp3");
- //BufferedInputStream bis = new BufferedInputStream(in);
+ // BufferedInputStream bis = new BufferedInputStream(in);
ByteArrayBuffer baf = new ByteArrayBuffer(50);
int current = 0;
-
+
byte[] bb = new byte[1024];
- int l = in.read(bb,0,1024);
-
+ int l = in.read(bb, 0, 1024);
+
while (l > -0) {
baf.append(bb, 0, l);
- l = in.read(bb,0,1024);
+ l = in.read(bb, 0, 1024);
}
OutputStream outStream = null;
@@ -114,4 +114,5 @@
e.printStackTrace();
}
}
+
}
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/main.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/main.java 2010-11-24 17:32:20 UTC (rev 3975)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/main.java 2010-11-24 21:07:20 UTC (rev 3976)
@@ -36,8 +36,8 @@
Button btnNowPlaying = (Button) findViewById(R.id.MainButton5);
btnNowPlaying.setOnClickListener(new View.OnClickListener() {
public void onClick(View view) {
- httpHandler h = new httpHandler();
- h.DownloadFile();
+ Intent myIntent = new Intent(view.getContext(), nowplaying.class);
+ startActivityForResult(myIntent, 0);
}
});
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/nowplaying.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/nowplaying.java (rev 0)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/nowplaying.java 2010-11-24 21:07:20 UTC (rev 3976)
@@ -0,0 +1,158 @@
+package mediaportal.remote;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+import org.apache.http.client.ClientProtocolException;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.DefaultHttpClient;
+import org.apache.http.params.BasicHttpParams;
+import org.apache.http.params.HttpConnectionParams;
+import org.apache.http.params.HttpParams;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.content.res.AssetManager;
+import android.os.Bundle;
+import android.os.Handler;
+import android.view.View;
+import android.widget.Button;
+import android.widget.ImageButton;
+import android.widget.TextView;
+import android.widget.Toast;
+
+public class nowplaying extends Activity{
+
+ public static final String PREFS_PRIVATE = "PREFS_MP_REMOTE";
+
+ /** Called when the activity is first created. */
+ @Override
+ public void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.playingnow);
+
+ update();
+
+ ImageButton btn1 = (ImageButton) findViewById(R.id.now_prev);
+ ImageButton btn2 = (ImageButton) findViewById(R.id.now_stop);
+ ImageButton btn3 = (ImageButton) findViewById(R.id.now_pause);
+ ImageButton btn4 = (ImageButton) findViewById(R.id.now_play);
+ ImageButton btn5 = (ImageButton) findViewById(R.id.now_next);
+ ImageButton btn6 = (ImageButton) findViewById(R.id.now_list);
+
+ btn1.setOnClickListener(new View.OnClickListener() {
+ public void onClick(View view) {
+ PostCommand("previous");
+ }
+ });
+ btn2.setOnClickListener(new View.OnClickListener() {
+ public void onClick(View view) {
+ PostCommand("stop");
+ }
+ });
+ btn3.setOnClickListener(new View.OnClickListener() {
+ public void onClick(View view) {
+ PostCommand("pause");
+ }
+ });
+ btn4.setOnClickListener(new View.OnClickListener() {
+ public void onClick(View view) {
+ PostCommand("play");
+ }
+ });
+ btn5.setOnClickListener(new View.OnClickListener() {
+ public void onClick(View view) {
+ PostCommand("next");
+ }
+ });
+ btn6.setOnClickListener(new View.OnClickListener() {
+ public void onClick(View view) {
+ //show list
+ }
+ });
+
+ }
+
+ private void update()
+ {
+ SharedPreferences settings = getSharedPreferences(PREFS_PRIVATE,
+ MODE_PRIVATE);
+
+ String HttpServer = settings.getString("Server", "192.168.0.30");
+ String HttpPort = settings.getString("Port", "8200");
+
+ nowplayinghandler handler = nowplayinghandler.getinstance();
+ handler.setconnection(HttpServer, HttpPort);
+ handler.fetchdata();
+
+ TextView txt1 = (TextView) findViewById(R.id.now_artist);
+ txt1.setText(handler.Artist);
+ TextView txt2 = (TextView) findViewById(R.id.now_title);
+ txt2.setText(handler.Title);
+ TextView txt3 = (TextView) findViewById(R.id.now_album);
+ txt3.setText(handler.Album);
+
+ TextView txt4 = (TextView) findViewById(R.id.now_playing_t_left);
+ txt4.setText(handler.Actual);
+ TextView txt5 = (TextView) findViewById(R.id.now_playing_right);
+ txt5.setText(handler.Total);
+
+ //todo progressbar
+
+ }
+
+ public void PostCommand(String button) {
+
+ SharedPreferences settings = getSharedPreferences(PREFS_PRIVATE , MODE_PRIVATE);
+
+ String HttpServer = settings.getString("Server", "192.168.0.30");
+ String HttpPort = settings.getString("Port", "8200");
+
+ HttpParams httpParameters = new BasicHttpParams();
+ HttpConnectionParams.setConnectionTimeout(httpParameters, 3000);
+ HttpConnectionParams.setSoTimeout(httpParameters, 3000);
+
+ HttpClient httpclient = new DefaultHttpClient(httpParameters);
+ HttpPost httppost = new HttpPost("http://" + HttpServer + ":"
+ + HttpPort);
+
+ try {
+
+ AssetManager assetManager = getAssets();
+
+ InputStream inputStream = null;
+ inputStream = assetManager.open("cmd_" + button + ".xml");
+
+ int x = inputStream.read();
+
+ String xml = "";
+
+ while (x != -1) {
+ xml = xml + (char) x;
+ x = inputStream.read();
+ }
+
+ StringEntity se = new StringEntity(xml, "UTF-8");
+ se.setContentType("application/atom+xml");
+
+ httppost.setEntity(se);
+
+ // HttpResponse response;
+ // response = httpclient.execute(httppost);
+ httpclient.execute(httppost);
+
+ } catch (ClientProtocolException e) {
+ Toast.makeText(nowplaying.this, "ERROR CONNECTION SERVER",
+ Toast.LENGTH_LONG).show();
+ e.printStackTrace();
+ } catch (IOException e) {
+ Toast.makeText(nowplaying.this, "TIME OUT SERVER", Toast.LENGTH_LONG)
+ .show();
+ e.printStackTrace();
+ }
+ }
+
+}
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/nowplayingXmlHandler.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/nowplayingXmlHandler.java (rev 0)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/nowplayingXmlHandler.java 2010-11-24 21:07:20 UTC (rev 3976)
@@ -0,0 +1,60 @@
+package mediaportal.remote;
+
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+import org.xml.sax.helpers.DefaultHandler;
+
+public class nowplayingXmlHandler extends DefaultHandler {
+ Boolean currentElement = false;
+ String currentValue = null;
+
+ public static String Title;
+ public static String Artist;
+ public static String Album;
+ public static String Total;
+ public static String Actual;
+ public static String Track;
+
+ /**
+ * Called when tag starts ( example:- <name>AndroidPeople</name> -- <name> )
+ */
+ @Override
+ public void startElement(String uri, String localName, String qName,
+ Attributes attributes) throws SAXException {
+ currentElement = true;
+
+ }
+
+ /**
+ * Called when tag closing ( example:- <name>AndroidPeople</name> -- </name> )
+ */
+ @Override
+ public void endElement(String uri, String localName, String qName)
+ throws SAXException {
+
+ currentElement = false;
+
+ /** set value */
+ if (localName == "Artist") {Artist =currentValue;}
+ if (localName == "Title") {Title =currentValue;}
+ if (localName == "Album") {Album =currentValue;}
+ if (localName == "Track") {Track =currentValue;}
+ if (localName == "TotalTime") {Total =currentValue;}
+ if (localName == "ActualTime") {Actual =currentValue;}
+ }
+
+ /**
+ * Called to get tag characters ( example:- <name>AndroidPeople</name> -- to get
+ * AndroidPeople Character )
+ */
+ @Override
+ public void characters(char[] ch, int start, int length)
+ throws SAXException {
+ if (currentElement) {
+ currentValue = new String(ch, start, length);
+ currentElement = false;
+ }
+
+ }
+
+}
\ No newline at end of file
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/nowplayinghandler.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/nowplayinghandler.java (rev 0)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/nowplayinghandler.java 2010-11-24 21:07:20 UTC (rev 3976)
@@ -0,0 +1,120 @@
+package mediaportal.remote;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.UnsupportedEncodingException;
+import java.net.HttpURLConnection;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLEncoder;
+
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.parsers.SAXParser;
+import javax.xml.parsers.SAXParserFactory;
+
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+import org.xml.sax.XMLReader;
+
+import android.graphics.Bitmap;
+
+import mediaportal.remote.directoryItems;
+
+public class nowplayinghandler {
+
+ private static nowplayinghandler instance;
+
+ public static final String PREFS_PRIVATE = "PREFS_MP_REMOTE";
+
+ private String _server;
+ private String _port;
+
+ public String Title;
+ public String Artist;
+ public String Album;
+ public String Track;
+ public String Total;
+ public String Actual;
+ public String PlayerState;
+
+ public static nowplayinghandler getinstance() {
+ if (instance == null)
+ instance = new nowplayinghandler();
+ return instance;
+ }
+
+ private nowplayinghandler() {
+
+ }
+
+ public void setconnection(String server, String port) {
+ _server = server;
+ _port = port;
+ }
+
+ public void fetchdata() {
+
+ String fileUrl = "http://" + _server + ":" + _port + "/nowplaying";
+
+ URL myFileUrl = null;
+ try {
+ myFileUrl = new URL(fileUrl);
+ } catch (MalformedURLException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ try {
+ HttpURLConnection conn = (HttpURLConnection) myFileUrl
+ .openConnection();
+ conn.setReadTimeout(10000);
+ conn.setDoInput(true);
+ conn.connect();
+ // int length = conn.getContentLength();
+ InputStream is = conn.getInputStream();
+
+ SAXParserFactory spf = SAXParserFactory.newInstance();
+ SAXParser sp = null;
+ try {
+ sp = spf.newSAXParser();
+ } catch (ParserConfigurationException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ } catch (SAXException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+
+ XMLReader reader = null;
+ try {
+ reader = sp.getXMLReader();
+ } catch (SAXException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+
+ nowplayingXmlHandler handler = new nowplayingXmlHandler();
+
+ reader.setContentHandler(handler);
+ try {
+ reader.parse(new InputSource(is));
+ } catch (SAXException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ is.close();
+ sp.reset();
+
+ Artist = nowplayingXmlHandler.Artist;
+ Title = nowplayingXmlHandler.Title;
+ Track = nowplayingXmlHandler.Track;
+
+ Total = nowplayingXmlHandler.Total;
+ Actual = nowplayingXmlHandler.Actual;
+
+ } catch (IOException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ }
+
+}
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/pictures.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/pictures.java 2010-11-24 17:32:20 UTC (rev 3975)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/pictures.java 2010-11-24 21:07:20 UTC (rev 3976)
@@ -12,7 +12,6 @@
import android.view.ViewGroup;
import android.widget.AdapterView;
import android.widget.BaseAdapter;
-import android.widget.Button;
import android.widget.GridView;
import android.widget.ImageView;
import android.widget.TextView;
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/picturesfullscreen.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/picturesfullscreen.java 2010-11-24 17:32:20 UTC (rev 3975)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/picturesfullscreen.java 2010-11-24 21:07:20 UTC (rev 3976)
@@ -2,15 +2,10 @@
import mediaportal.remote.R;
import android.app.Activity;
-import android.content.Intent;
import android.os.Bundle;
import android.view.GestureDetector;
import android.view.GestureDetector.OnGestureListener;
-import android.view.GestureDetector.SimpleOnGestureListener;
-import android.view.LayoutInflater.Filter;
import android.view.MotionEvent;
-import android.view.View;
-import android.view.View.OnClickListener;
import android.widget.ImageView;
import android.widget.TextView;
import android.widget.Toast;
Added: trunk/plugins/AndroidRemote/Release/nowplaying.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/AndroidRemote/Release/nowplaying.jpg
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/plugins/AndroidRemote/Server/AndroidRemote/Request.cs
===================================================================
--- trunk/plugins/AndroidRemote/Server/AndroidRemote/Request.cs 2010-11-24 17:32:20 UTC (rev 3975)
+++ trunk/plugins/AndroidRemote/Server/AndroidRemote/Request.cs 2010-11-24 21:07:20 UTC (rev 3976)
@@ -180,6 +180,32 @@
private void ExceuteCommand(string Message)
{
+ if (Message.Contains("ACTION_PLAY"))
+ {
+ Action action = new Action(Action.ActionType.ACTION_PLAY, 0, 0);
+ GUIGraphicsContext.OnAction(action);
+ }
+ if (Message.Contains("ACTION_STOP"))
+ {
+ Action action = new Action(Action.ActionType.ACTION_STOP, 0, 0);
+ GUIGraphicsContext.OnAction(action);
+ }
+ if (Message.Contains("ACTION_PAUSE"))
+ {
+ Action action = new Action(Action.ActionType.ACTION_PAUSE, 0, 0);
+ GUIGraphicsContext.OnAction(action);
+ }
+ if (Message.Contains("ACTION_NEXT_ITEM"))
+ {
+ Action action = new Action(Action.ActionType.ACTION_NEXT_ITEM, 0, 0);
+ GUIGraphicsContext.OnAction(action);
+ }
+ if (Message.Contains("ACTION_PREV_ITEM"))
+ {
+ Action action = new Action(Action.ActionType.ACTION_PREV_ITEM, 0, 0);
+ GUIGraphicsContext.OnAction(action);
+ }
+
if (Message.Contains("ACTION_MOVE_RIGHT"))
{
Action action = new Action(Action.ActionType.ACTION_MOVE_RIGHT, 0, 0);
@@ -281,7 +307,7 @@
}
else
{
- SendServerError(filePath,"ReplyPictureFile");
+ SendServerError(filePath, "ReplyPictureFile");
}
}
else
@@ -398,6 +424,34 @@
private void ReplyNowPlaying()
{
+ string title = GUIPropertyManager.GetProperty("#Play.Current.Title");
+ string artist = GUIPropertyManager.GetProperty("#Play.Current.Artist");
+ string album = GUIPropertyManager.GetProperty("#Play.Current.Album");
+ string track = GUIPropertyManager.GetProperty("#Play.Current.Track");
+
+ string actual = GUIPropertyManager.GetProperty("#currentplaytime");
+ string total = GUIPropertyManager.GetProperty("#duration");
+
+ string state = "unknown";
+ if (MediaPortal.Player.g_Player.Player != null)
+ {
+ if (MediaPortal.Player.g_Player.Player.Playing) state = "playing";
+ if (MediaPortal.Player.g_Player.Player.Stopped) state = "stopped";
+ if (MediaPortal.Player.g_Player.Player.Paused) state = "paused";
+ if (MediaPortal.Player.g_Player.Player.Ended) state = "ended";
+ }
+ else
+ {
+ state = "no player active";
+ actual = string.Empty;
+ total = string.Empty;
+ }
+
+ artist = HttpUtility.HtmlEncode(artist);
+ album = HttpUtility.HtmlEncode(album);
+ title = HttpUtility.HtmlEncode(title);
+
+
string msg = string.Empty;
// header
msg += "HTTP/1.0 200 Ok\r\n";
@@ -408,14 +462,16 @@
msg += "<?xml version=\"1.0\"?>\r\n";
msg += "<NowPlaying>\r\n";
- msg += "<PlayerState></PlayerState>\r\n";
+ msg += "<PlayerState>" + state + "</PlayerState>\r\n";
- msg += "<Title></Title>\r\n";
- msg += "<Artist></Artist>\r\n";
+ msg += "<Title>" + title + "</Title>\r\n";
+ msg += "<Artist>" + artist + "</Artist>\r\n";
+ msg += "<Album>" + album + "</Album>\r\n";
+ msg += "<Track>" + track + "</Track>\r\n";
msg += "<Cover></Cover>\r\n";
- msg += "<ActualTime></ActualTime>\r\n";
- msg += "<TotalTime></TotalTime>\r\n";
+ msg += "<ActualTime>" + actual + "</ActualTime>\r\n";
+ msg += "<TotalTime>" + total + "</TotalTime>\r\n";
msg += "</NowPlaying>\r\n";
// send
Modified: trunk/plugins/AndroidRemote/Server/AndroidRemote.suo
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
