Menu
▾
▴
[Mp-plugins-svn] SF.net SVN: mp-plugins:[4037] trunk/plugins/AndroidRemote
|
From: <kro...@us...> - 2010-12-16 16:53:30
|
Revision: 4037
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4037&view=rev
Author: kroko_koenig
Date: 2010-12-16 16:53:23 +0000 (Thu, 16 Dec 2010)
Log Message:
-----------
so hopefully better playing now, also change icon play/pause
Modified Paths:
--------------
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/gen/mediaportal/remote/R.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/main.xml
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/playingnow.xml
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/remote03.xml
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout-small/main.xml
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout-small/playingnow.xml
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/Remote_03.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/main.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/nowplaying.java
trunk/plugins/AndroidRemote/Server/AndroidRemote/Request.cs
trunk/plugins/AndroidRemote/Server/AndroidRemote.suo
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/gen/mediaportal/remote/R.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/gen/mediaportal/remote/R.java 2010-12-16 13:22:02 UTC (rev 4036)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/gen/mediaportal/remote/R.java 2010-12-16 16:53:23 UTC (rev 4037)
@@ -79,7 +79,6 @@
public static final int wake_on_lan=0x7f020041;
}
public static final class id {
- public static final int Button01=0x7f060060;
public static final int GridView01=0x7f060017;
public static final int ImageView01=0x7f060019;
public static final int LinearLayout00=0x7f06004a;
@@ -146,7 +145,21 @@
public static final int btnkey17=0x7f06005c;
public static final int btnkey18=0x7f06005d;
public static final int btnkey19=0x7f06005e;
- public static final int clearplaylist=0x7f060067;
+ public static final int btnkey20=0x7f060060;
+ public static final int btnkey21=0x7f060061;
+ public static final int btnkey22=0x7f060062;
+ public static final int btnkey23=0x7f060063;
+ public static final int btnkey24=0x7f060064;
+ public static final int btnkey25=0x7f060065;
+ public static final int btnkey26=0x7f060066;
+ public static final int btnkey27=0x7f060067;
+ public static final int btnkey28=0x7f060068;
+ public static final int btnkey29=0x7f060069;
+ public static final int btnkey30=0x7f06006a;
+ public static final int btnkey31=0x7f06006b;
+ public static final int btnkey32=0x7f06006c;
+ public static final int btnkey33=0x7f06006d;
+ public static final int clearplaylist=0x7f060074;
public static final int full_text=0x7f060018;
public static final int icon_image=0x7f060001;
public static final int icon_text=0x7f060002;
@@ -170,18 +183,18 @@
public static final int now_progress=0x7f06001e;
public static final int now_stop=0x7f060024;
public static final int now_title=0x7f060021;
- public static final int open=0x7f06006a;
- public static final int playlist=0x7f060066;
- public static final int rslide=0x7f06006d;
- public static final int save=0x7f060069;
- public static final int sdcard=0x7f060068;
- public static final int send=0x7f06006b;
- public static final int server_ip=0x7f060061;
- public static final int server_macid=0x7f060063;
- public static final int server_port=0x7f060062;
- public static final int slide=0x7f06006c;
- public static final int title=0x7f060065;
- public static final int vibration=0x7f060064;
+ public static final int open=0x7f060077;
+ public static final int playlist=0x7f060073;
+ public static final int rslide=0x7f06007a;
+ public static final int save=0x7f060076;
+ public static final int sdcard=0x7f060075;
+ public static final int send=0x7f060078;
+ public static final int server_ip=0x7f06006e;
+ public static final int server_macid=0x7f060070;
+ public static final int server_port=0x7f06006f;
+ public static final int slide=0x7f060079;
+ public static final int title=0x7f060072;
+ public static final int vibration=0x7f060071;
public static final int widget0=0x7f060011;
public static final int widget00=0x7f06002a;
public static final int widget01=0x7f06002e;
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/main.xml
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/main.xml 2010-12-16 13:22:02 UTC (rev 4036)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/main.xml 2010-12-16 16:53:23 UTC (rev 4037)
@@ -13,41 +13,41 @@
<TableRow android:layout_width="wrap_content" android:layout_height="wrap_content" android:padding="10dip" android:id="@+id/TableRow01">
- <ImageButton android:src="@drawable/main_pictures" android:scaleType="fitXY"
+ <Button android:background="@drawable/main_pictures" android:scaleType="fitXY"
android:layout_height="80dip" android:layout_width="80dip"
android:layout_marginRight="40dip" android:padding="5dip" android:id="@+id/btn_main_pictures">
- </ImageButton>
+ </Button>
- <ImageButton android:layout_height="80dip" android:layout_width="80dip"
+ <Button android:layout_height="80dip" android:layout_width="80dip"
android:scaleType="fitXY" android:padding="5dip"
- android:src="@drawable/main_music" android:id="@+id/btn_main_music">
- </ImageButton>
+ android:background="@drawable/main_music" android:id="@+id/btn_main_music">
+ </Button>
</TableRow>
<TableRow android:layout_width="wrap_content" android:layout_height="wrap_content" android:padding="10dip" android:id="@+id/TableRow01">
- <ImageButton android:scaleType="fitXY"
+ <Button android:scaleType="fitXY"
android:layout_height="80dip" android:layout_width="80dip"
- android:padding="5dip" android:layout_marginRight="40dip" android:src="@drawable/main_video" android:id="@+id/btn_main_video">
- </ImageButton>
+ android:padding="5dip" android:layout_marginRight="40dip" android:background="@drawable/main_video" android:id="@+id/btn_main_video">
+ </Button>
- <ImageButton android:layout_height="80dip" android:layout_width="80dip"
- android:scaleType="fitXY" android:padding="5dip" android:src="@drawable/main_remote" android:id="@+id/btn_main_remote">
- </ImageButton>
+ <Button android:layout_height="80dip" android:layout_width="80dip"
+ android:scaleType="fitXY" android:padding="5dip" android:background="@drawable/main_remote" android:id="@+id/btn_main_remote">
+ </Button>
</TableRow>
<TableRow android:layout_width="wrap_content" android:layout_height="wrap_content" android:padding="10dip" android:id="@+id/TableRow01">
- <ImageButton android:scaleType="fitXY"
+ <Button android:scaleType="fitXY"
android:layout_height="80dip" android:layout_width="80dip"
- android:padding="5dip" android:layout_marginRight="40dip" android:src="@drawable/main_now_playing" android:id="@+id/btn_main_now_playing">
- </ImageButton>
+ android:padding="5dip" android:layout_marginRight="40dip" android:background="@drawable/main_now_playing" android:id="@+id/btn_main_now_playing">
+ </Button>
- <ImageButton android:layout_height="80dip" android:layout_width="80dip"
- android:scaleType="fitXY" android:padding="5dip" android:src="@drawable/main_settings" android:id="@+id/btn_main_settings">
- </ImageButton>
+ <Button android:layout_height="80dip" android:layout_width="80dip"
+ android:scaleType="fitXY" android:padding="5dip" android:background="@drawable/main_settings" android:id="@+id/btn_main_settings">
+ </Button>
</TableRow>
@@ -61,20 +61,16 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="horizontal" android:background="#0FF0FFFF" android:layout_width="wrap_content" android:layout_gravity="center_horizontal" android:layout_height="wrap_content" android:padding="5dip">
-
-
-
-
- <ImageButton android:src="@drawable/main_skp_back" android:scaleType="fitXY"
+ <Button android:background="@drawable/main_skp_back" android:scaleType="fitXY"
android:layout_height="60dip" android:layout_width="60dip"
- android:id="@+id/btn_main_skp_back" android:padding="2dip" android:layout_marginRight="5dip"></ImageButton>
+ android:id="@+id/btn_main_skp_back" android:padding="2dip" android:layout_marginRight="5dip"></Button>
<ImageButton android:scaleType="fitXY"
android:layout_height="60dip" android:layout_width="60dip"
- android:id="@+id/btn_main_play" android:src="@drawable/main_play" android:padding="2dip" android:layout_marginRight="5dip"></ImageButton>
- <ImageButton android:scaleType="fitXY"
+ android:id="@+id/btn_main_play" android:background="@drawable/main_play" android:padding="2dip" android:layout_marginRight="5dip"></ImageButton>
+ <Button android:scaleType="fitXY"
android:layout_height="60dip" android:layout_width="60dip"
- android:id="@+id/btn_main_skp_forw" android:src="@drawable/main_skp_forw" android:padding="2dip"></ImageButton>
+ android:id="@+id/btn_main_skp_forw" android:background="@drawable/main_skp_forw" android:padding="2dip"></Button>
</LinearLayout>
</LinearLayout>
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/playingnow.xml
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/playingnow.xml 2010-12-16 13:22:02 UTC (rev 4036)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/playingnow.xml 2010-12-16 16:53:23 UTC (rev 4037)
@@ -63,7 +63,7 @@
<ImageButton android:id="@+id/now_stop"
android:background="@drawable/stop" android:layout_height="60dip" android:layout_width="60dip"/>
<ImageButton android:id="@+id/now_play"
- android:layout_height="60dip" android:background="@drawable/right" android:layout_width="60dip"/>
+ android:layout_height="60dip" android:background="@drawable/right" android:layout_width="60dip" android:scaleType="fitXY"/>
<ImageButton android:id="@+id/now_next"
android:layout_height="60dip" android:background="@drawable/skip_forward" android:layout_width="60dip"/>
<ImageButton android:id="@+id/now_list"
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/remote03.xml
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/remote03.xml 2010-12-16 13:22:02 UTC (rev 4036)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/remote03.xml 2010-12-16 16:53:23 UTC (rev 4037)
@@ -16,34 +16,34 @@
android:layout_width="fill_parent" android:paddingBottom="5dip" android:paddingTop="5dip">
<Button android:id="@+id/btnkey01" android:padding="0dip"
- android:text="Q" android:layout_width="32dip" android:layout_height="32dip">
+ android:text="Q" android:layout_width="32dip" android:layout_height="48dip">
</Button>
<Button android:id="@+id/btnkey02" android:padding="0dip"
- android:text="W" android:layout_height="32dip" android:layout_width="32dip">
+ android:text="W" android:layout_height="48dip" android:layout_width="32dip">
</Button>
<Button android:id="@+id/btnkey03" android:padding="0dip"
- android:text="E" android:layout_width="32dip" android:layout_height="32dip">
+ android:text="E" android:layout_width="32dip" android:layout_height="48dip">
</Button>
<Button android:id="@+id/btnkey04" android:padding="0dip"
- android:text="R" android:layout_width="32dip" android:layout_height="32dip">
+ android:text="R" android:layout_width="32dip" android:layout_height="48dip">
</Button>
<Button android:id="@+id/btnkey05" android:padding="0dip"
- android:text="T" android:layout_height="32dip" android:layout_width="32dip">
+ android:text="T" android:layout_height="48dip" android:layout_width="32dip">
</Button>
<Button android:id="@+id/btnkey06" android:padding="0dip"
- android:text="Y" android:layout_width="32dip" android:layout_height="32dip">
+ android:text="Y" android:layout_width="32dip" android:layout_height="48dip">
</Button>
<Button android:id="@+id/btnkey07" android:padding="0dip"
- android:text="U" android:layout_width="32dip" android:layout_height="32dip">
+ android:text="U" android:layout_width="32dip" android:layout_height="48dip">
</Button>
<Button android:id="@+id/btnkey08" android:padding="0dip"
- android:text="I" android:layout_height="32dip" android:layout_width="32dip">
+ android:text="I" android:layout_height="48dip" android:layout_width="32dip">
</Button>
<Button android:id="@+id/btnkey09" android:padding="0dip"
- android:text="O" android:layout_width="32dip" android:layout_height="32dip">
+ android:text="O" android:layout_width="32dip" android:layout_height="48dip">
</Button>
<Button android:id="@+id/btnkey10" android:padding="0dip"
- android:text="P" android:layout_width="32dip" android:layout_height="32dip">
+ android:text="P" android:layout_width="32dip" android:layout_height="48dip">
</Button>
</LinearLayout>
@@ -55,31 +55,31 @@
android:paddingBottom="5dip">
<Button android:id="@+id/btnkey11" android:padding="0dip"
- android:text="A" android:layout_width="32dip" android:layout_height="32dip">
+ android:text="A" android:layout_width="32dip" android:layout_height="48dip">
</Button>
<Button android:id="@+id/btnkey12" android:padding="0dip"
- android:text="S" android:layout_height="32dip" android:layout_width="32dip">
+ android:text="S" android:layout_height="48dip" android:layout_width="32dip">
</Button>
<Button android:id="@+id/btnkey13" android:padding="0dip"
- android:text="D" android:layout_width="32dip" android:layout_height="32dip">
+ android:text="D" android:layout_width="32dip" android:layout_height="48dip">
</Button>
<Button android:id="@+id/btnkey14" android:padding="0dip"
- android:text="F" android:layout_width="32dip" android:layout_height="32dip">
+ android:text="F" android:layout_width="32dip" android:layout_height="48dip">
</Button>
<Button android:id="@+id/btnkey15" android:padding="0dip"
- android:text="G" android:layout_height="32dip" android:layout_width="32dip">
+ android:text="G" android:layout_height="48dip" android:layout_width="32dip">
</Button>
<Button android:id="@+id/btnkey16" android:padding="0dip"
- android:text="H" android:layout_width="32dip" android:layout_height="32dip">
+ android:text="H" android:layout_width="32dip" android:layout_height="48dip">
</Button>
<Button android:id="@+id/btnkey17" android:padding="0dip"
- android:text="J" android:layout_width="32dip" android:layout_height="32dip">
+ android:text="J" android:layout_width="32dip" android:layout_height="48dip">
</Button>
<Button android:id="@+id/btnkey18" android:padding="0dip"
- android:text="K" android:layout_height="32dip" android:layout_width="32dip">
+ android:text="K" android:layout_height="48dip" android:layout_width="32dip">
</Button>
<Button android:id="@+id/btnkey19" android:padding="0dip"
- android:text="L" android:layout_width="32dip" android:layout_height="32dip">
+ android:text="L" android:layout_width="32dip" android:layout_height="48dip">
</Button>
</LinearLayout>
@@ -90,32 +90,32 @@
android:layout_width="wrap_content"
android:paddingBottom="5dip">
- <Button android:id="@+id/Button01" android:padding="0dip"
- android:text="Shift" android:layout_width="48dip" android:layout_height="32dip">
+ <Button android:id="@+id/btnkey20" android:padding="0dip"
+ android:text="Shift" android:layout_width="48dip" android:layout_height="48dip">
</Button>
- <Button android:id="@+id/Button01" android:padding="0dip"
- android:text="Z" android:layout_height="32dip" android:layout_width="32dip">
+ <Button android:id="@+id/btnkey21" android:padding="0dip"
+ android:text="Z" android:layout_height="48dip" android:layout_width="32dip">
</Button>
- <Button android:id="@+id/Button01" android:padding="0dip"
- android:text="X" android:layout_width="32dip" android:layout_height="32dip">
+ <Button android:id="@+id/btnkey22" android:padding="0dip"
+ android:text="X" android:layout_width="32dip" android:layout_height="48dip">
</Button>
- <Button android:id="@+id/Button01" android:padding="0dip"
- android:text="C" android:layout_width="32dip" android:layout_height="32dip">
+ <Button android:id="@+id/btnkey23" android:padding="0dip"
+ android:text="C" android:layout_width="32dip" android:layout_height="48dip">
</Button>
- <Button android:id="@+id/Button01" android:padding="0dip"
- android:text="V" android:layout_height="32dip" android:layout_width="32dip">
+ <Button android:id="@+id/btnkey24" android:padding="0dip"
+ android:text="V" android:layout_height="48dip" android:layout_width="32dip">
</Button>
- <Button android:id="@+id/Button01" android:padding="0dip"
- android:text="B" android:layout_width="32dip" android:layout_height="32dip">
+ <Button android:id="@+id/btnkey25" android:padding="0dip"
+ android:text="B" android:layout_width="32dip" android:layout_height="48dip">
</Button>
- <Button android:id="@+id/Button01" android:padding="0dip"
- android:text="N" android:layout_width="32dip" android:layout_height="32dip">
+ <Button android:id="@+id/btnkey26" android:padding="0dip"
+ android:text="N" android:layout_width="32dip" android:layout_height="48dip">
</Button>
- <Button android:id="@+id/Button01" android:padding="0dip"
- android:text="M" android:layout_height="32dip" android:layout_width="32dip">
+ <Button android:id="@+id/btnkey27" android:padding="0dip"
+ android:text="M" android:layout_height="48dip" android:layout_width="32dip">
</Button>
- <Button android:id="@+id/Button01" android:padding="0dip"
- android:text="DEL" android:layout_width="48dip" android:layout_height="32dip">
+ <Button android:id="@+id/btnkey28" android:padding="0dip"
+ android:text="DEL" android:layout_width="48dip" android:layout_height="48dip">
</Button>
</LinearLayout>
@@ -126,20 +126,20 @@
android:layout_width="wrap_content"
android:paddingBottom="5dip">
- <Button android:id="@+id/Button01" android:padding="0dip"
- android:text=".?123" android:layout_width="64dip" android:layout_height="32dip">
+ <Button android:id="@+id/btnkey29" android:padding="0dip"
+ android:text=".?123" android:layout_width="64dip" android:layout_height="48dip">
</Button>
- <Button android:id="@+id/Button01" android:padding="0dip"
- android:layout_height="32dip" android:layout_width="32dip" android:text="/">
+ <Button android:id="@+id/btnkey30" android:padding="0dip"
+ android:layout_height="48dip" android:layout_width="32dip" android:text="/">
</Button>
- <Button android:id="@+id/Button01" android:padding="0dip"
- android:text="Space" android:layout_height="32dip" android:layout_width="64dip">
+ <Button android:id="@+id/btnkey31" android:padding="0dip"
+ android:text="Space" android:layout_height="48dip" android:layout_width="64dip">
</Button>
- <Button android:id="@+id/Button01" android:padding="0dip"
- android:text="." android:layout_height="32dip" android:layout_width="32dip">
+ <Button android:id="@+id/btnkey32" android:padding="0dip"
+ android:text="." android:layout_height="48dip" android:layout_width="32dip">
</Button>
- <Button android:id="@+id/Button01" android:padding="0dip"
- android:text="www" android:layout_width="64dip" android:layout_height="32dip">
+ <Button android:id="@+id/btnkey33" android:padding="0dip"
+ android:text="www" android:layout_width="64dip" android:layout_height="48dip">
</Button>
</LinearLayout>
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout-small/main.xml
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout-small/main.xml 2010-12-16 13:22:02 UTC (rev 4036)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout-small/main.xml 2010-12-16 16:53:23 UTC (rev 4037)
@@ -13,41 +13,41 @@
<TableRow android:layout_width="wrap_content" android:layout_height="wrap_content" android:id="@+id/TableRow01" android:padding="5dip">
- <ImageButton android:src="@drawable/main_pictures" android:scaleType="fitXY"
+ <Button android:background="@drawable/main_pictures" android:scaleType="fitXY"
android:layout_height="80dip" android:layout_width="80dip"
android:layout_marginRight="40dip" android:padding="5dip" android:id="@+id/btn_main_pictures">
- </ImageButton>
+ </Button>
- <ImageButton android:layout_height="80dip" android:layout_width="80dip"
+ <Button android:layout_height="80dip" android:layout_width="80dip"
android:scaleType="fitXY" android:padding="5dip"
- android:src="@drawable/main_music" android:id="@+id/btn_main_music">
- </ImageButton>
+ android:background="@drawable/main_music" android:id="@+id/btn_main_music">
+ </Button>
</TableRow>
<TableRow android:layout_width="wrap_content" android:layout_height="wrap_content" android:id="@+id/TableRow01" android:padding="5dip">
- <ImageButton android:scaleType="fitXY"
+ <Button android:scaleType="fitXY"
android:layout_height="80dip" android:layout_width="80dip"
- android:padding="5dip" android:layout_marginRight="40dip" android:src="@drawable/main_video" android:id="@+id/btn_main_video">
- </ImageButton>
+ android:padding="5dip" android:layout_marginRight="40dip" android:background="@drawable/main_video" android:id="@+id/btn_main_video">
+ </Button>
- <ImageButton android:layout_height="80dip" android:layout_width="80dip"
- android:scaleType="fitXY" android:padding="5dip" android:src="@drawable/main_remote" android:id="@+id/btn_main_remote">
- </ImageButton>
+ <Button android:layout_height="80dip" android:layout_width="80dip"
+ android:scaleType="fitXY" android:padding="5dip" android:background="@drawable/main_remote" android:id="@+id/btn_main_remote">
+ </Button>
</TableRow>
<TableRow android:layout_width="wrap_content" android:layout_height="wrap_content" android:id="@+id/TableRow01" android:padding="5dip">
- <ImageButton android:scaleType="fitXY"
+ <Button android:scaleType="fitXY"
android:layout_height="80dip" android:layout_width="80dip"
- android:padding="5dip" android:layout_marginRight="40dip" android:src="@drawable/main_now_playing" android:id="@+id/btn_main_now_playing">
- </ImageButton>
+ android:padding="5dip" android:layout_marginRight="40dip" android:background="@drawable/main_now_playing" android:id="@+id/btn_main_now_playing">
+ </Button>
- <ImageButton android:layout_height="80dip" android:layout_width="80dip"
- android:scaleType="fitXY" android:padding="5dip" android:src="@drawable/main_settings" android:id="@+id/btn_main_settings">
- </ImageButton>
+ <Button android:layout_height="80dip" android:layout_width="80dip"
+ android:scaleType="fitXY" android:padding="5dip" android:background="@drawable/main_settings" android:id="@+id/btn_main_settings">
+ </Button>
</TableRow>
@@ -63,18 +63,14 @@
android:orientation="horizontal" android:background="#0FF0FFFF" android:layout_width="wrap_content" android:layout_gravity="center_horizontal" android:layout_height="wrap_content" android:padding="5dip">
-
-
-
-
- <ImageButton android:src="@drawable/main_skp_back" android:scaleType="fitXY"
+ <Button android:background="@drawable/main_skp_back" android:scaleType="fitXY"
android:layout_height="60dip" android:layout_width="60dip"
- android:id="@+id/btn_main_skp_back" android:padding="2dip" android:layout_marginRight="5dip"></ImageButton>
+ android:id="@+id/btn_main_skp_back" android:padding="2dip" android:layout_marginRight="5dip"></Button>
<ImageButton android:scaleType="fitXY"
android:layout_height="60dip" android:layout_width="60dip"
- android:id="@+id/btn_main_play" android:src="@drawable/main_play" android:padding="2dip" android:layout_marginRight="5dip"></ImageButton>
- <ImageButton android:scaleType="fitXY"
+ android:id="@+id/btn_main_play" android:background="@drawable/main_play" android:padding="2dip" android:layout_marginRight="5dip"></ImageButton>
+ <Button android:scaleType="fitXY"
android:layout_height="60dip" android:layout_width="60dip"
- android:id="@+id/btn_main_skp_forw" android:src="@drawable/main_skp_forw" android:padding="2dip"></ImageButton>
+ android:id="@+id/btn_main_skp_forw" android:background="@drawable/main_skp_forw" android:padding="2dip"></Button>
</LinearLayout>
</LinearLayout>
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout-small/playingnow.xml
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout-small/playingnow.xml 2010-12-16 13:22:02 UTC (rev 4036)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout-small/playingnow.xml 2010-12-16 16:53:23 UTC (rev 4037)
@@ -63,7 +63,7 @@
<ImageButton android:id="@+id/now_stop"
android:background="@drawable/stop" android:layout_width="60dip" android:layout_height="60dip"/>
<ImageButton android:id="@+id/now_play"
- android:background="@drawable/right" android:layout_width="60dip" android:layout_height="60dip"/>
+ android:background="@drawable/right" android:layout_width="60dip" android:layout_height="60dip" android:scaleType="fitXY"/>
<ImageButton android:id="@+id/now_next"
android:background="@drawable/skip_forward" android:layout_width="60dip" android:layout_height="60dip"/>
<ImageButton android:id="@+id/now_list"
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/Remote_03.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/Remote_03.java 2010-12-16 13:22:02 UTC (rev 4036)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/Remote_03.java 2010-12-16 16:53:23 UTC (rev 4037)
@@ -34,12 +34,13 @@
import android.view.MotionEvent;
import android.view.View;
import android.view.GestureDetector.OnGestureListener;
+import android.view.View.OnClickListener;
import android.widget.Button;
public class Remote_03 extends Activity implements OnGestureListener {
public static final String PREFS_PRIVATE = "PREFS_MP_REMOTE";
-
+
private GestureDetector gestureScanner;
private static final int SWIPE_MIN_DISTANCE = 120;
private static final int SWIPE_MAX_OFF_PATH = 250;
@@ -52,36 +53,91 @@
setContentView(R.layout.remote03);
gestureScanner = new GestureDetector(this);
+
+ OnClickListener mClickListener = new OnClickListener() {
+ public void onClick(View v) {
+ Button btn = (Button)v;
+ PostKey(btn.getText().toString());
+ }
+ };
+
+ Button btn01 = (Button) findViewById(R.id.btnkey01);
+ btn01.setOnClickListener(mClickListener);
+ Button btn02 = (Button) findViewById(R.id.btnkey02);
+ btn02.setOnClickListener(mClickListener);
+ Button btn03 = (Button) findViewById(R.id.btnkey03);
+ btn03.setOnClickListener(mClickListener);
+ Button btn04 = (Button) findViewById(R.id.btnkey04);
+ btn04.setOnClickListener(mClickListener);
+ Button btn05 = (Button) findViewById(R.id.btnkey05);
+ btn05.setOnClickListener(mClickListener);
+ Button btn06 = (Button) findViewById(R.id.btnkey06);
+ btn06.setOnClickListener(mClickListener);
+ Button btn07 = (Button) findViewById(R.id.btnkey07);
+ btn07.setOnClickListener(mClickListener);
+ Button btn08 = (Button) findViewById(R.id.btnkey08);
+ btn08.setOnClickListener(mClickListener);
+ Button btn09 = (Button) findViewById(R.id.btnkey09);
+ btn09.setOnClickListener(mClickListener);
+ Button btn10 = (Button) findViewById(R.id.btnkey10);
+ btn10.setOnClickListener(mClickListener);
+ Button btn11 = (Button) findViewById(R.id.btnkey11);
+ btn11.setOnClickListener(mClickListener);
+ Button btn12 = (Button) findViewById(R.id.btnkey12);
+ btn12.setOnClickListener(mClickListener);
+ Button btn13 = (Button) findViewById(R.id.btnkey13);
+ btn13.setOnClickListener(mClickListener);
+ Button btn14 = (Button) findViewById(R.id.btnkey14);
+ btn14.setOnClickListener(mClickListener);
+ Button btn15 = (Button) findViewById(R.id.btnkey15);
+ btn15.setOnClickListener(mClickListener);
+ Button btn16 = (Button) findViewById(R.id.btnkey16);
+ btn16.setOnClickListener(mClickListener);
+ Button btn17 = (Button) findViewById(R.id.btnkey17);
+ btn17.setOnClickListener(mClickListener);
+ Button btn18 = (Button) findViewById(R.id.btnkey18);
+ btn18.setOnClickListener(mClickListener);
+ Button btn19 = (Button) findViewById(R.id.btnkey19);
+ btn19.setOnClickListener(mClickListener);
+
+ Button btn21 = (Button) findViewById(R.id.btnkey21);
+ btn21.setOnClickListener(mClickListener);
+ Button btn22 = (Button) findViewById(R.id.btnkey22);
+ btn22.setOnClickListener(mClickListener);
+ Button btn23 = (Button) findViewById(R.id.btnkey23);
+ btn23.setOnClickListener(mClickListener);
+ Button btn24 = (Button) findViewById(R.id.btnkey24);
+ btn24.setOnClickListener(mClickListener);
+ Button btn25 = (Button) findViewById(R.id.btnkey25);
+ btn25.setOnClickListener(mClickListener);
+ Button btn26 = (Button) findViewById(R.id.btnkey26);
+ btn26.setOnClickListener(mClickListener);
+ Button btn27 = (Button) findViewById(R.id.btnkey27);
+ btn27.setOnClickListener(mClickListener);
}
- public void PostCommand(String button) {
-
+ private void PostKey(String Key) {
+ DoVibrate();
+
PostWebserver post = new PostWebserver(Settings.Server, Settings.Port);
- AssetManager assetManager = getAssets();
String xml = "";
- try {
- InputStream inputStream = null;
- inputStream = assetManager.open("cmd_" + button + ".xml");
+ xml += "<?xml version=\"1.0\" encoding=\"utf-8\"?>";
+ xml += "<message>";
+ xml += "<command>ACTION_KEY</command>";
+ xml += "<key>" + Key + "</key>";
+ xml += "</message>";
- int x = inputStream.read();
-
- while (x != -1) {
- xml = xml + (char) x;
- x = inputStream.read();
- }
- post.Post(xml);
- } catch (IOException e) {
- e.printStackTrace();
- }
+ post.Post(xml);
}
@Override
public boolean onTouchEvent(MotionEvent me) {
return gestureScanner.onTouchEvent(me);
- }
+ }
+
public boolean onFling(MotionEvent e1, MotionEvent e2, float velocityX,
float velocityY) {
try {
@@ -90,7 +146,7 @@
// right to left swipe
if (e1.getX() - e2.getX() > SWIPE_MIN_DISTANCE
&& Math.abs(velocityX) > SWIPE_THRESHOLD_VELOCITY) {
-
+
} else if (e2.getX() - e1.getX() > SWIPE_MIN_DISTANCE
&& Math.abs(velocityX) > SWIPE_THRESHOLD_VELOCITY) {
Intent myIntent = new Intent(this, Remote_02.class);
@@ -101,22 +157,26 @@
}
return false;
}
-
+
public boolean onDown(MotionEvent arg0) {
return true;
}
+
public void onLongPress(MotionEvent arg0) {
}
+
public boolean onScroll(MotionEvent arg0, MotionEvent arg1, float arg2,
float arg3) {
return false;
}
+
public void onShowPress(MotionEvent arg0) {
}
+
public boolean onSingleTapUp(MotionEvent arg0) {
return false;
}
-
+
public void DoVibrate() {
if (Settings.Vibrate) {
// Get instance of Vibrator from current Context
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/main.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/main.java 2010-12-16 13:22:02 UTC (rev 4036)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/main.java 2010-12-16 16:53:23 UTC (rev 4037)
@@ -47,6 +47,7 @@
private static final String PREFS_PRIVATE = "PREFS_MP_REMOTE";
private Handler mHandler = new Handler();
private static String display = "nothing playing";
+ private static String state = "";
@Override
public void onCreate(Bundle savedInstanceState) {
@@ -74,13 +75,9 @@
}
- Thread.setDefaultUncaughtExceptionHandler(new TopExceptionHandler(this));
-
+ Thread.setDefaultUncaughtExceptionHandler(new TopExceptionHandler(this));
chkStatus();
- mHandler.removeCallbacks(mUpdateTimeTask);
- mHandler.postDelayed(mUpdateTimeTask, 1000);
-
SharedPreferences settings = getSharedPreferences(PREFS_PRIVATE,
MODE_PRIVATE);
@@ -88,7 +85,7 @@
Settings.Port = settings.getString("Port", "8200");
Settings.MacId = settings.getString("MacId", "11-22-33-44-55-66");
- ImageButton btnPictures = (ImageButton) findViewById(R.id.btn_main_pictures);
+ Button btnPictures = (Button) findViewById(R.id.btn_main_pictures);
btnPictures.setOnClickListener(new View.OnClickListener() {
public void onClick(View view) {
DoVibrate();
@@ -97,7 +94,7 @@
}
});
- ImageButton btnMusic = (ImageButton) findViewById(R.id.btn_main_music);
+ Button btnMusic = (Button) findViewById(R.id.btn_main_music);
btnMusic.setOnClickListener(new View.OnClickListener() {
public void onClick(View view) {
DoVibrate();
@@ -106,7 +103,7 @@
}
});
- ImageButton btnVideo = (ImageButton) findViewById(R.id.btn_main_video);
+ Button btnVideo = (Button) findViewById(R.id.btn_main_video);
btnVideo.setOnClickListener(new View.OnClickListener() {
public void onClick(View view) {
DoVibrate();
@@ -114,15 +111,10 @@
Toast.makeText(view.getContext(),
"not implemented yet. Sorry !", Toast.LENGTH_LONG)
.show();
-
- int x = 0;
- int y = 1;
-
- int z = y / x; // we do a exception ;-)
}
});
- ImageButton btnRemote = (ImageButton) findViewById(R.id.btn_main_remote);
+ Button btnRemote = (Button) findViewById(R.id.btn_main_remote);
btnRemote.setOnClickListener(new View.OnClickListener() {
public void onClick(View view) {
DoVibrate();
@@ -131,7 +123,7 @@
}
});
- ImageButton btnNowPlaying = (ImageButton) findViewById(R.id.btn_main_now_playing);
+ Button btnNowPlaying = (Button) findViewById(R.id.btn_main_now_playing);
btnNowPlaying.setOnClickListener(new View.OnClickListener() {
public void onClick(View view) {
DoVibrate();
@@ -141,7 +133,7 @@
}
});
- ImageButton btnSettings = (ImageButton) findViewById(R.id.btn_main_settings);
+ Button btnSettings = (Button) findViewById(R.id.btn_main_settings);
btnSettings.setOnClickListener(new View.OnClickListener() {
public void onClick(View view) {
DoVibrate();
@@ -150,7 +142,7 @@
}
});
- ImageButton skipForw = (ImageButton) findViewById(R.id.btn_main_skp_forw);
+ Button skipForw = (Button) findViewById(R.id.btn_main_skp_forw);
skipForw.setOnClickListener(new View.OnClickListener() {
public void onClick(View view) {
DoVibrate();
@@ -158,7 +150,7 @@
}
});
- ImageButton skipBack = (ImageButton) findViewById(R.id.btn_main_skp_back);
+ Button skipBack = (Button) findViewById(R.id.btn_main_skp_back);
skipBack.setOnClickListener(new View.OnClickListener() {
public void onClick(View view) {
DoVibrate();
@@ -281,6 +273,14 @@
}
@Override
+ public void onStart() {
+ super.onStart();
+
+ mHandler.removeCallbacks(mUpdateTimeTask);
+ mHandler.postDelayed(mUpdateTimeTask, 1000);
+ }
+
+ @Override
public void onPause() {
super.onPause();
@@ -314,7 +314,9 @@
&& (!nowplayinghandler.PlayerState
.equals("no player active"))) {
display = nowplayinghandler.Artist + " - "
- + nowplayinghandler.Title;
+ + nowplayinghandler.Title +
+ " (" + nowplayinghandler.Actual + ")";
+ state = nowplayinghandler.PlayerState;
}
return null;
@@ -325,7 +327,19 @@
TextView txt0 = (TextView) findViewById(R.id.main_now_playing);
txt0.setText(display);
-
+
+ ImageButton play = (ImageButton) findViewById(R.id.btn_main_play);
+ if(state.equals("playing"))
+ {
+ play.setImageDrawable(getResources()
+ .getDrawable(R.drawable.pause));
+ }
+ else
+ {
+ play.setImageDrawable(getResources()
+ .getDrawable(R.drawable.right));
+ }
+
mHandler.postDelayed(mUpdateTimeTask, 1000);
}
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/nowplaying.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/nowplaying.java 2010-12-16 13:22:02 UTC (rev 4036)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/nowplaying.java 2010-12-16 16:53:23 UTC (rev 4037)
@@ -118,6 +118,18 @@
}
}
txt0.setText(display);
+
+ ImageButton play = (ImageButton) findViewById(R.id.now_play);
+ if(nowplayinghandler.PlayerState.equals("playing"))
+ {
+ play.setImageDrawable(getResources()
+ .getDrawable(R.drawable.pause));
+ }
+ else
+ {
+ play.setImageDrawable(getResources()
+ .getDrawable(R.drawable.right));
+ }
TextView txt1 = (TextView) findViewById(R.id.now_artist);
txt1.setText(nowplayinghandler.Artist);
Modified: trunk/plugins/AndroidRemote/Server/AndroidRemote/Request.cs
===================================================================
--- trunk/plugins/AndroidRemote/Server/AndroidRemote/Request.cs 2010-12-16 13:22:02 UTC (rev 4036)
+++ trunk/plugins/AndroidRemote/Server/AndroidRemote/Request.cs 2010-12-16 16:53:23 UTC (rev 4037)
@@ -34,6 +34,8 @@
using System.Xml;
using System.Drawing;
using System.Web;
+using System.Windows.Forms;
+using System.Runtime.InteropServices;
using MediaPortal.GUI.Library;
using MediaPortal.Utils;
@@ -51,6 +53,10 @@
{
public class Request
{
+ // Activate an application window.
+ [DllImport("USER32.DLL")]
+ public static extern bool SetForegroundWindow(IntPtr hWnd);
+
private Socket socket;
private byte[] read;
private byte[] buffer;
@@ -386,19 +392,9 @@
GUIGraphicsContext.OnAction(action);
}
else
- {
- if (playlistPlayer.CurrentPlaylistType == PlayListType.PLAYLIST_NONE)
- {
+ {
StartPlaylistPlayer del = new StartPlaylistPlayer(StartPlayer);
- GUIGraphicsContext.form.Invoke(del, new object[] { });
-
-
- }
- else
- {
- Action action = new Action(Action.ActionType.ACTION_PLAY, 0, 0);
- GUIGraphicsContext.OnAction(action);
- }
+ GUIGraphicsContext.form.Invoke(del, new object[] { });
}
}
if (data["command"] == ("ACTION_STOP"))
@@ -696,6 +692,16 @@
#endregion
#endregion
+
+ #region virtual keyboard
+ if (data["command"] == ("ACTION_KEY"))
+ {
+ IntPtr handle = GUIGraphicsContext.form.Handle;
+
+ SetForegroundWindow(handle);
+ SendKeys.SendWait(data["key"]);
+ }
+ #endregion
}
}
}
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.
|
