Menu
▾
▴
[Mp-plugins-svn] SF.net SVN: mp-plugins:[4101] trunk/plugins/AndroidRemote/Android/ MediaPortalRemote
|
From: <kro...@us...> - 2011-02-08 12:25:55
|
Revision: 4101
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4101&view=rev
Author: kroko_koenig
Date: 2011-02-08 12:25:43 +0000 (Tue, 08 Feb 2011)
Log Message:
-----------
more skins and so on
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/movies.xml
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/music.xml
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/pictures.xml
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/setup.xml
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/setup_ip.xml
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/skin.xml
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/communication/PostWebserver.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/communication/SendCommand.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/control/Remote_01.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/movies/Movies.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/music/MusicDir.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/pictures/Pictures.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/setup/SelectSkin.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/setup/Setup.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/setup/Setup_ip.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/utils/SAX_Parser.java
Added Paths:
-----------
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout-land/
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout-land/main.xml
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout-large-land/
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout-large-land/main.xml
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout-small-land/
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout-small-land/main.xml
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/gen/mediaportal/remote/R.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/gen/mediaportal/remote/R.java 2011-02-07 21:41:27 UTC (rev 4100)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/gen/mediaportal/remote/R.java 2011-02-08 12:25:43 UTC (rev 4101)
@@ -175,33 +175,33 @@
}
public static final class id {
public static final int GridView01=0x7f060015;
- public static final int ImageView01=0x7f06002a;
- public static final int LinearLayout00=0x7f060060;
- public static final int LinearLayout01=0x7f060031;
- public static final int LinearLayout02=0x7f06006b;
- public static final int LinearLayout03=0x7f060075;
- public static final int LinearLayout04=0x7f06007f;
- public static final int LinearLayout05=0x7f060085;
- public static final int ListView01=0x7f06003f;
- public static final int RadioGroup01=0x7f060099;
- public static final int Spinner01=0x7f060091;
- public static final int SurfaceView01=0x7f060030;
+ public static final int ImageView01=0x7f06002c;
+ public static final int LinearLayout00=0x7f060063;
+ public static final int LinearLayout01=0x7f060033;
+ public static final int LinearLayout02=0x7f06006e;
+ public static final int LinearLayout03=0x7f060078;
+ public static final int LinearLayout04=0x7f060082;
+ public static final int LinearLayout05=0x7f060088;
+ public static final int ListView01=0x7f060041;
+ public static final int RadioGroup01=0x7f0600a5;
+ public static final int Spinner01=0x7f060097;
+ public static final int SurfaceView01=0x7f060032;
public static final int TableLayout01=0x7f060007;
- public static final int TableLayout02=0x7f060051;
+ public static final int TableLayout02=0x7f060053;
public static final int TableRow01=0x7f060008;
- public static final int TableRow02=0x7f060056;
- public static final int TableRow03=0x7f06005b;
+ public static final int TableRow02=0x7f060058;
+ public static final int TableRow03=0x7f06005d;
public static final int TextView01=0x7f060003;
public static final int TextView02=0x7f060004;
- public static final int btnAlbumSelDown=0x7f060019;
- public static final int btnAlbumSelUp=0x7f06001b;
- public static final int btnArtistSelDown=0x7f06001d;
- public static final int btnArtistSelUp=0x7f06001f;
- public static final int btnResultSelDown=0x7f060021;
- public static final int btnResultSelUp=0x7f060023;
- public static final int btnSelectSkin=0x7f060093;
- public static final int btnSongSelDown=0x7f060025;
- public static final int btnSongSelUp=0x7f060027;
+ public static final int btnAlbumSelDown=0x7f06001a;
+ public static final int btnAlbumSelUp=0x7f06001c;
+ public static final int btnArtistSelDown=0x7f06001e;
+ public static final int btnArtistSelUp=0x7f060020;
+ public static final int btnResultSelDown=0x7f060022;
+ public static final int btnResultSelUp=0x7f060024;
+ public static final int btnSelectSkin=0x7f060099;
+ public static final int btnSongSelDown=0x7f060026;
+ public static final int btnSongSelUp=0x7f060028;
public static final int btn_main_music=0x7f06000a;
public static final int btn_main_now_playing=0x7f06000d;
public static final int btn_main_pictures=0x7f060009;
@@ -211,172 +211,184 @@
public static final int btn_main_skp_back=0x7f060010;
public static final int btn_main_skp_forw=0x7f060012;
public static final int btn_main_video=0x7f06000b;
- public static final int btn_plugins_radio=0x7f060041;
- public static final int btn_plugins_weather=0x7f060040;
- public static final int btnkey01=0x7f060061;
- public static final int btnkey02=0x7f060062;
- public static final int btnkey03=0x7f060063;
- public static final int btnkey04=0x7f060064;
- public static final int btnkey05=0x7f060065;
- public static final int btnkey06=0x7f060066;
- public static final int btnkey07=0x7f060067;
- public static final int btnkey08=0x7f060068;
- public static final int btnkey09=0x7f060069;
- public static final int btnkey10=0x7f06006a;
- public static final int btnkey11=0x7f06006c;
- public static final int btnkey12=0x7f06006d;
- public static final int btnkey13=0x7f06006e;
- public static final int btnkey14=0x7f06006f;
- public static final int btnkey15=0x7f060070;
- public static final int btnkey16=0x7f060071;
- public static final int btnkey17=0x7f060072;
- public static final int btnkey18=0x7f060073;
- public static final int btnkey19=0x7f060074;
- public static final int btnkey20=0x7f060076;
- public static final int btnkey21=0x7f060077;
- public static final int btnkey22=0x7f060078;
- public static final int btnkey23=0x7f060079;
- public static final int btnkey24=0x7f06007a;
- public static final int btnkey25=0x7f06007b;
- public static final int btnkey26=0x7f06007c;
- public static final int btnkey27=0x7f06007d;
- public static final int btnkey28=0x7f06007e;
- public static final int btnkey29=0x7f060080;
- public static final int btnkey30=0x7f060081;
- public static final int btnkey31=0x7f060082;
- public static final int btnkey32=0x7f060083;
- public static final int btnkey33=0x7f060084;
- public static final int btnkey41=0x7f060086;
- public static final int btnkey42=0x7f060087;
- public static final int btnkey43=0x7f060088;
- public static final int btnkey44=0x7f060089;
- public static final int btnkey45=0x7f06008a;
- public static final int btnkey46=0x7f06008b;
- public static final int btnkey47=0x7f06008c;
- public static final int btnkey48=0x7f06008d;
- public static final int btnkey49=0x7f06008e;
- public static final int btnkey50=0x7f06008f;
- public static final int button_open=0x7f06002d;
- public static final int button_stream=0x7f06002e;
- public static final int button_stream_stop=0x7f06002f;
- public static final int crtl_back=0x7f06004e;
- public static final int crtl_ch_m=0x7f06005a;
- public static final int crtl_ch_p=0x7f060055;
- public static final int crtl_down=0x7f06004d;
- public static final int crtl_full=0x7f060057;
- public static final int crtl_info=0x7f06005f;
- public static final int crtl_left=0x7f060048;
- public static final int crtl_menu=0x7f060059;
- public static final int crtl_mp=0x7f060044;
- public static final int crtl_osd=0x7f06005e;
- public static final int crtl_parent=0x7f06004c;
- public static final int crtl_play=0x7f060058;
- public static final int crtl_power=0x7f060046;
- public static final int crtl_ratio=0x7f06005d;
- public static final int crtl_right=0x7f06004a;
- public static final int crtl_select=0x7f060049;
- public static final int crtl_skip_back=0x7f060052;
- public static final int crtl_skip_forw=0x7f060054;
- public static final int crtl_stop=0x7f060053;
- public static final int crtl_sub=0x7f06005c;
- public static final int crtl_up=0x7f060045;
- public static final int crtl_vol_m=0x7f060050;
- public static final int crtl_vol_p=0x7f06004f;
- public static final int full_text=0x7f060029;
+ public static final int btn_plugins_radio=0x7f060043;
+ public static final int btn_plugins_weather=0x7f060042;
+ public static final int btnkey01=0x7f060064;
+ public static final int btnkey02=0x7f060065;
+ public static final int btnkey03=0x7f060066;
+ public static final int btnkey04=0x7f060067;
+ public static final int btnkey05=0x7f060068;
+ public static final int btnkey06=0x7f060069;
+ public static final int btnkey07=0x7f06006a;
+ public static final int btnkey08=0x7f06006b;
+ public static final int btnkey09=0x7f06006c;
+ public static final int btnkey10=0x7f06006d;
+ public static final int btnkey11=0x7f06006f;
+ public static final int btnkey12=0x7f060070;
+ public static final int btnkey13=0x7f060071;
+ public static final int btnkey14=0x7f060072;
+ public static final int btnkey15=0x7f060073;
+ public static final int btnkey16=0x7f060074;
+ public static final int btnkey17=0x7f060075;
+ public static final int btnkey18=0x7f060076;
+ public static final int btnkey19=0x7f060077;
+ public static final int btnkey20=0x7f060079;
+ public static final int btnkey21=0x7f06007a;
+ public static final int btnkey22=0x7f06007b;
+ public static final int btnkey23=0x7f06007c;
+ public static final int btnkey24=0x7f06007d;
+ public static final int btnkey25=0x7f06007e;
+ public static final int btnkey26=0x7f06007f;
+ public static final int btnkey27=0x7f060080;
+ public static final int btnkey28=0x7f060081;
+ public static final int btnkey29=0x7f060083;
+ public static final int btnkey30=0x7f060084;
+ public static final int btnkey31=0x7f060085;
+ public static final int btnkey32=0x7f060086;
+ public static final int btnkey33=0x7f060087;
+ public static final int btnkey41=0x7f060089;
+ public static final int btnkey42=0x7f06008a;
+ public static final int btnkey43=0x7f06008b;
+ public static final int btnkey44=0x7f06008c;
+ public static final int btnkey45=0x7f06008d;
+ public static final int btnkey46=0x7f06008e;
+ public static final int btnkey47=0x7f06008f;
+ public static final int btnkey48=0x7f060090;
+ public static final int btnkey49=0x7f060091;
+ public static final int btnkey50=0x7f060092;
+ public static final int button_open=0x7f06002f;
+ public static final int button_stream=0x7f060030;
+ public static final int button_stream_stop=0x7f060031;
+ public static final int crtl_back=0x7f060050;
+ public static final int crtl_ch_m=0x7f06005c;
+ public static final int crtl_ch_p=0x7f060057;
+ public static final int crtl_down=0x7f06004f;
+ public static final int crtl_full=0x7f060059;
+ public static final int crtl_info=0x7f060061;
+ public static final int crtl_left=0x7f06004a;
+ public static final int crtl_menu=0x7f06005b;
+ public static final int crtl_mp=0x7f060046;
+ public static final int crtl_osd=0x7f060060;
+ public static final int crtl_parent=0x7f06004e;
+ public static final int crtl_play=0x7f06005a;
+ public static final int crtl_power=0x7f060048;
+ public static final int crtl_ratio=0x7f06005f;
+ public static final int crtl_right=0x7f06004c;
+ public static final int crtl_select=0x7f06004b;
+ public static final int crtl_skip_back=0x7f060054;
+ public static final int crtl_skip_forw=0x7f060056;
+ public static final int crtl_stop=0x7f060055;
+ public static final int crtl_sub=0x7f06005e;
+ public static final int crtl_up=0x7f060047;
+ public static final int crtl_vol_m=0x7f060052;
+ public static final int crtl_vol_p=0x7f060051;
+ public static final int full_text=0x7f06002b;
public static final int icon_image=0x7f060001;
public static final int icon_text=0x7f060002;
+ public static final int lay_IPsettings=0x7f06009a;
+ public static final int lay_global=0x7f060093;
public static final int lay_main=0x7f060005;
- public static final int lay_pictures=0x7f060028;
- public static final int lay_remote01=0x7f060042;
- public static final int list_album=0x7f060018;
- public static final int list_artist=0x7f06001c;
- public static final int list_result=0x7f060020;
- public static final int list_song=0x7f060024;
+ public static final int lay_movies=0x7f060013;
+ public static final int lay_music=0x7f060016;
+ public static final int lay_pictures=0x7f060029;
+ public static final int lay_remote01=0x7f060044;
+ public static final int lay_selectSkin=0x7f0600a3;
+ public static final int list_album=0x7f060019;
+ public static final int list_artist=0x7f06001d;
+ public static final int list_result=0x7f060021;
+ public static final int list_song=0x7f060025;
public static final int main_instance=0x7f060006;
public static final int main_now_playing=0x7f06000f;
- public static final int music_grid=0x7f060017;
- public static final int now_album=0x7f060033;
- public static final int now_artist=0x7f060039;
- public static final int now_cd=0x7f060034;
- public static final int now_list=0x7f06003e;
- public static final int now_next=0x7f06003d;
- public static final int now_play=0x7f06003c;
- public static final int now_playing=0x7f060032;
- public static final int now_playing_right=0x7f060037;
- public static final int now_playing_t_left=0x7f060036;
- public static final int now_prev=0x7f06003a;
- public static final int now_progress=0x7f060035;
- public static final int now_stop=0x7f06003b;
- public static final int now_title=0x7f060038;
- public static final int radio01=0x7f0600c7;
- public static final int radio02=0x7f0600c8;
- public static final int radio03=0x7f0600c9;
- public static final int radio04=0x7f0600ca;
- public static final int radioStop=0x7f0600cb;
- public static final int selectSkin1=0x7f06009a;
- public static final int selectSkin2=0x7f06009c;
- public static final int selectSkin3=0x7f06009e;
- public static final int server_ip=0x7f060096;
- public static final int server_macid=0x7f060098;
- public static final int server_name=0x7f060095;
- public static final int server_port=0x7f060097;
- public static final int splash=0x7f0600a0;
- public static final int text_kb_streamed=0x7f06002b;
- public static final int title=0x7f0600a1;
- public static final int txtDbAlbum=0x7f06001a;
- public static final int txtDbArtist=0x7f06001e;
- public static final int txtDbResult=0x7f060022;
- public static final int txtDbSong=0x7f060026;
- public static final int txtDirMusic=0x7f060016;
- public static final int txtDirectory=0x7f060014;
- public static final int txtFile=0x7f06002c;
- public static final int txtIntanceName=0x7f060094;
- public static final int txtVersion=0x7f060090;
- public static final int vibration=0x7f060092;
- public static final int visitHome1=0x7f06009b;
- public static final int visitHome2=0x7f06009d;
- public static final int visitHome3=0x7f06009f;
- public static final int weather_0_cond=0x7f0600c2;
- public static final int weather_0_date=0x7f0600a9;
- public static final int weather_0_day=0x7f0600ae;
- public static final int weather_0_hi=0x7f0600b3;
- public static final int weather_0_img=0x7f0600bd;
- public static final int weather_0_lo=0x7f0600b8;
- public static final int weather_1_cond=0x7f0600c3;
- public static final int weather_1_date=0x7f0600aa;
- public static final int weather_1_day=0x7f0600af;
- public static final int weather_1_hi=0x7f0600b4;
- public static final int weather_1_img=0x7f0600be;
- public static final int weather_1_lo=0x7f0600b9;
- public static final int weather_2_cond=0x7f0600c4;
- public static final int weather_2_date=0x7f0600ab;
- public static final int weather_2_day=0x7f0600b0;
- public static final int weather_2_hi=0x7f0600b5;
- public static final int weather_2_img=0x7f0600bf;
- public static final int weather_2_lo=0x7f0600ba;
- public static final int weather_3_cond=0x7f0600c5;
- public static final int weather_3_date=0x7f0600ac;
- public static final int weather_3_day=0x7f0600b1;
- public static final int weather_3_hi=0x7f0600b6;
- public static final int weather_3_img=0x7f0600c0;
- public static final int weather_3_lo=0x7f0600bb;
- public static final int weather_4_cond=0x7f0600c6;
- public static final int weather_4_date=0x7f0600ad;
- public static final int weather_4_day=0x7f0600b2;
- public static final int weather_4_hi=0x7f0600b7;
- public static final int weather_4_img=0x7f0600c1;
- public static final int weather_4_lo=0x7f0600bc;
- public static final int weather_actFeel=0x7f0600a7;
- public static final int weather_actImage=0x7f0600a2;
- public static final int weather_actPlace=0x7f0600a5;
- public static final int weather_actTemp=0x7f0600a6;
- public static final int weather_actText=0x7f0600a3;
- public static final int weather_actTime=0x7f0600a4;
- public static final int weather_actWind=0x7f0600a8;
- public static final int widget0=0x7f060013;
- public static final int widget00=0x7f060043;
- public static final int widget01=0x7f060047;
- public static final int widget02=0x7f06004b;
+ public static final int music_grid=0x7f060018;
+ public static final int now_album=0x7f060035;
+ public static final int now_artist=0x7f06003b;
+ public static final int now_cd=0x7f060036;
+ public static final int now_list=0x7f060040;
+ public static final int now_next=0x7f06003f;
+ public static final int now_play=0x7f06003e;
+ public static final int now_playing=0x7f060034;
+ public static final int now_playing_right=0x7f060039;
+ public static final int now_playing_t_left=0x7f060038;
+ public static final int now_prev=0x7f06003c;
+ public static final int now_progress=0x7f060037;
+ public static final int now_stop=0x7f06003d;
+ public static final int now_title=0x7f06003a;
+ public static final int radio01=0x7f0600d3;
+ public static final int radio02=0x7f0600d4;
+ public static final int radio03=0x7f0600d5;
+ public static final int radio04=0x7f0600d6;
+ public static final int radioStop=0x7f0600d7;
+ public static final int selectSkin1=0x7f0600a6;
+ public static final int selectSkin2=0x7f0600a8;
+ public static final int selectSkin3=0x7f0600aa;
+ public static final int server_ip=0x7f06009e;
+ public static final int server_macid=0x7f0600a2;
+ public static final int server_name=0x7f06009c;
+ public static final int server_port=0x7f0600a0;
+ public static final int splash=0x7f0600ac;
+ public static final int text_kb_streamed=0x7f06002d;
+ public static final int title=0x7f0600ad;
+ public static final int txtDbAlbum=0x7f06001b;
+ public static final int txtDbArtist=0x7f06001f;
+ public static final int txtDbResult=0x7f060023;
+ public static final int txtDbSong=0x7f060027;
+ public static final int txtDirectoryMovies=0x7f060014;
+ public static final int txtDirectoryMusic=0x7f060017;
+ public static final int txtDirectoryPictures=0x7f06002a;
+ public static final int txtFile=0x7f06002e;
+ public static final int txtGlobal=0x7f060094;
+ public static final int txtIntanceName=0x7f06009b;
+ public static final int txtMediaPortalIP=0x7f06009d;
+ public static final int txtMediaPortalMAC=0x7f0600a1;
+ public static final int txtMediaPortalPort=0x7f06009f;
+ public static final int txtPowerMode=0x7f060096;
+ public static final int txtSelectSkin=0x7f0600a4;
+ public static final int txtVersion=0x7f060095;
+ public static final int vibration=0x7f060098;
+ public static final int visitHome1=0x7f0600a7;
+ public static final int visitHome2=0x7f0600a9;
+ public static final int visitHome3=0x7f0600ab;
+ public static final int weather_0_cond=0x7f0600ce;
+ public static final int weather_0_date=0x7f0600b5;
+ public static final int weather_0_day=0x7f0600ba;
+ public static final int weather_0_hi=0x7f0600bf;
+ public static final int weather_0_img=0x7f0600c9;
+ public static final int weather_0_lo=0x7f0600c4;
+ public static final int weather_1_cond=0x7f0600cf;
+ public static final int weather_1_date=0x7f0600b6;
+ public static final int weather_1_day=0x7f0600bb;
+ public static final int weather_1_hi=0x7f0600c0;
+ public static final int weather_1_img=0x7f0600ca;
+ public static final int weather_1_lo=0x7f0600c5;
+ public static final int weather_2_cond=0x7f0600d0;
+ public static final int weather_2_date=0x7f0600b7;
+ public static final int weather_2_day=0x7f0600bc;
+ public static final int weather_2_hi=0x7f0600c1;
+ public static final int weather_2_img=0x7f0600cb;
+ public static final int weather_2_lo=0x7f0600c6;
+ public static final int weather_3_cond=0x7f0600d1;
+ public static final int weather_3_date=0x7f0600b8;
+ public static final int weather_3_day=0x7f0600bd;
+ public static final int weather_3_hi=0x7f0600c2;
+ public static final int weather_3_img=0x7f0600cc;
+ public static final int weather_3_lo=0x7f0600c7;
+ public static final int weather_4_cond=0x7f0600d2;
+ public static final int weather_4_date=0x7f0600b9;
+ public static final int weather_4_day=0x7f0600be;
+ public static final int weather_4_hi=0x7f0600c3;
+ public static final int weather_4_img=0x7f0600cd;
+ public static final int weather_4_lo=0x7f0600c8;
+ public static final int weather_actFeel=0x7f0600b3;
+ public static final int weather_actImage=0x7f0600ae;
+ public static final int weather_actPlace=0x7f0600b1;
+ public static final int weather_actTemp=0x7f0600b2;
+ public static final int weather_actText=0x7f0600af;
+ public static final int weather_actTime=0x7f0600b0;
+ public static final int weather_actWind=0x7f0600b4;
+ public static final int widget0=0x7f060062;
+ public static final int widget00=0x7f060045;
+ public static final int widget01=0x7f060049;
+ public static final int widget02=0x7f06004d;
public static final int widget44=0x7f060000;
}
public static final class layout {
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/main.xml
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/main.xml 2011-02-07 21:41:27 UTC (rev 4100)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/main.xml 2011-02-08 12:25:43 UTC (rev 4101)
@@ -4,7 +4,11 @@
android:id="@+id/lay_main"
android:layout_height="fill_parent">
-<TextView android:layout_height="wrap_content" android:text="HTPC" android:textColor="#FF000000" android:textStyle="bold" android:textSize="20dip" android:gravity="center_horizontal" android:background="#FFA9A9A9" android:layout_width="fill_parent" android:id="@+id/main_instance"></TextView>
+<TextView android:layout_height="wrap_content" android:text="HTPC"
+ android:textColor="#FF000000" android:textStyle="bold"
+ android:textSize="20dip" android:gravity="center_horizontal"
+ android:background="#FFA9A9A9" android:layout_width="fill_parent"
+ android:id="@+id/main_instance"></TextView>
<TableLayout
android:id="@+id/TableLayout01"
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/movies.xml
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/movies.xml 2011-02-07 21:41:27 UTC (rev 4100)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/movies.xml 2011-02-08 12:25:43 UTC (rev 4101)
@@ -1,12 +1,12 @@
-<LinearLayout android:id="@+id/widget0"
- android:layout_width="fill_parent" android:layout_height="wrap_content"
+<LinearLayout android:id="@+id/lay_movies"
+ android:layout_width="fill_parent" android:layout_height="fill_parent"
xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical">
<TextView android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="Actual: ..." android:textColor="#FFFFFFFF"
android:textSize="20dip"
- android:id="@+id/txtDirectory" android:paddingBottom="5dip"></TextView>
+ android:id="@+id/txtDirectoryMovies" android:paddingBottom="5dip"></TextView>
<GridView android:layout_y="0dip" android:layout_x="0dip"
android:id="@+id/GridView01" android:layout_width="fill_parent"
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/music.xml
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/music.xml 2011-02-07 21:41:27 UTC (rev 4100)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/music.xml 2011-02-08 12:25:43 UTC (rev 4101)
@@ -1,11 +1,11 @@
-<LinearLayout android:id="@+id/widget0"
- android:layout_width="fill_parent" android:layout_height="wrap_content"
+<LinearLayout android:id="@+id/lay_music"
+ android:layout_width="fill_parent" android:layout_height="fill_parent"
xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical">
<TextView android:layout_width="fill_parent"
android:layout_height="wrap_content" android:text="Actual: ..."
- android:textColor="#FFFFFFFF" android:textSize="20dip" android:id="@+id/txtDirMusic"
+ android:textColor="#FFFFFFFF" android:textSize="20dip" android:id="@+id/txtDirectoryMusic"
android:paddingBottom="5dip"></TextView>
<GridView android:layout_y="0dip" android:layout_x="0dip"
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/pictures.xml
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/pictures.xml 2011-02-07 21:41:27 UTC (rev 4100)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/pictures.xml 2011-02-08 12:25:43 UTC (rev 4101)
@@ -1,5 +1,5 @@
<LinearLayout android:id="@+id/lay_pictures"
- android:layout_width="fill_parent" android:layout_height="wrap_content"
+ android:layout_width="fill_parent" android:layout_height="fill_parent"
xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical">
@@ -7,7 +7,7 @@
android:layout_height="wrap_content"
android:text="Actual: ..." android:textColor="#FFFFFFFF"
android:textSize="20dip"
- android:id="@+id/txtDirectory" android:paddingBottom="5dip"></TextView>
+ android:id="@+id/txtDirectoryPictures" android:paddingBottom="5dip"></TextView>
<GridView android:layout_y="0dip" android:layout_x="0dip"
android:id="@+id/GridView01" android:layout_width="fill_parent"
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/setup.xml
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/setup.xml 2011-02-07 21:41:27 UTC (rev 4100)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/setup.xml 2011-02-08 12:25:43 UTC (rev 4101)
@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent" android:layout_height="fill_parent"
- android:orientation="vertical" android:padding="15dip">
+ android:orientation="vertical" android:padding="15dip" android:id="@+id/lay_global">
<TextView android:layout_width="fill_parent"
- android:layout_height="wrap_content" android:textSize="24dip" android:text="Global settings" android:paddingBottom="10dip" android:textColor="#FFFFFFFF"></TextView>
+ android:layout_height="wrap_content" android:textSize="24dip" android:text="Global settings" android:paddingBottom="10dip" android:textColor="#FFFFFFFF" android:id="@+id/txtGlobal"></TextView>
<TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:textColor="#FFFFFFFF" android:text="Version" android:id="@+id/txtVersion"></TextView>
<TextView android:layout_width="fill_parent"
- android:layout_height="wrap_content" android:textSize="18dip" android:text="Power Mode" android:textColor="#FFFFFFFF" android:layout_marginTop="10dip"></TextView>
+ android:layout_height="wrap_content" android:textSize="18dip" android:text="Power Mode" android:textColor="#FFFFFFFF" android:layout_marginTop="10dip" android:id="@+id/txtPowerMode"></TextView>
<Spinner android:id="@+id/Spinner01" android:layout_width="fill_parent"
android:layout_height="wrap_content"></Spinner>
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/setup_ip.xml
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/setup_ip.xml 2011-02-07 21:41:27 UTC (rev 4100)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/setup_ip.xml 2011-02-08 12:25:43 UTC (rev 4101)
@@ -1,26 +1,26 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent" android:layout_height="fill_parent"
- android:orientation="vertical" android:padding="15dip">
+ android:orientation="vertical" android:padding="15dip" android:id="@+id/lay_IPsettings">
- <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:id="@+id/txtIntanceName" android:text="Instance Name : 0" android:textSize="20dip" android:textColor="#FFFFFFFF"></TextView>
+ <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:id="@+id/txtIntanceName" android:text="Instance Name : 0" android:textSize="20dip"></TextView>
<EditText android:id="@+id/server_name" android:layout_height="wrap_content"
android:layout_width="fill_parent" android:inputType="text" android:text="HTPC"></EditText>
<TextView android:layout_width="fill_parent"
android:layout_height="wrap_content" android:text="MediaPortal IP"
- android:textSize="18dip" android:textColor="#FFFFFFFF">
+ android:textSize="18dip" android:id="@+id/txtMediaPortalIP">
</TextView>
<EditText android:id="@+id/server_ip" android:layout_height="wrap_content"
android:layout_width="fill_parent" android:text="192.168.0.30" android:inputType="text"></EditText>
<TextView android:layout_width="fill_parent"
android:layout_height="wrap_content" android:text="MediaPortal Port"
- android:textSize="18dip" android:textColor="#FFFFFFFF"></TextView>
+ android:textSize="18dip" android:id="@+id/txtMediaPortalPort"></TextView>
<EditText android:id="@+id/server_port" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:text="8200"
android:inputType="phone"></EditText>
<TextView android:layout_width="fill_parent"
- android:layout_height="wrap_content" android:textSize="18dip" android:text="MediaPortal MAC (WakeOnLan)" android:textColor="#FFFFFFFF"></TextView>
+ android:layout_height="wrap_content" android:textSize="18dip" android:text="MediaPortal MAC (WakeOnLan)" android:id="@+id/txtMediaPortalMAC"></TextView>
<EditText android:id="@+id/server_macid" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:text="12-34-56-78-90-12"
android:inputType="text"></EditText>
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/skin.xml
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/skin.xml 2011-02-07 21:41:27 UTC (rev 4100)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/skin.xml 2011-02-08 12:25:43 UTC (rev 4101)
@@ -1,5 +1,5 @@
-<LinearLayout android:id="@+id/LinearLayout01" android:layout_width="fill_parent" android:layout_height="fill_parent" xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical">
-<TextView android:id="@+id/TextView01" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_horizontal" android:text="Select skin" android:textColor="#FFFFFFFF" android:layout_marginTop="5dip" android:textSize="24dip"></TextView>
+<LinearLayout android:layout_width="fill_parent" android:layout_height="fill_parent" xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" android:id="@+id/lay_selectSkin">
+<TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_horizontal" android:text="Select skin" android:textColor="#FFFFFFFF" android:layout_marginTop="5dip" android:textSize="24dip" android:id="@+id/txtSelectSkin"></TextView>
<RadioGroup android:id="@+id/RadioGroup01" android:layout_height="wrap_content" android:layout_width="fill_parent">
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout-land/main.xml
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout-land/main.xml (rev 0)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout-land/main.xml 2011-02-08 12:25:43 UTC (rev 4101)
@@ -0,0 +1,65 @@
+<?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:id="@+id/lay_main"
+ android:layout_height="fill_parent">
+
+<TextView android:layout_height="wrap_content" android:text="HTPC"
+ android:textColor="#FF000000" android:textStyle="bold"
+ android:textSize="20dip" android:gravity="center_horizontal"
+ android:background="#FFA9A9A9" android:layout_width="fill_parent"
+ android:id="@+id/main_instance"></TextView>
+
+<TableLayout
+ android:id="@+id/TableLayout01"
+ xmlns:android="http://schemas.android.com/apk/res/android"
+
+ android:layout_height="wrap_content"
+ android:layout_width="wrap_content" android:layout_gravity="center_horizontal">
+
+
+<TableRow android:layout_width="wrap_content" android:layout_height="wrap_content" android:id="@+id/TableRow01" android:padding="5dip" android:layout_gravity="center_horizontal">
+
+ <Button android:scaleType="fitXY"
+ android:id="@+id/btn_main_pictures" android:background="@drawable/ic_menu_skin1_pictures" android:layout_height="60dip" android:layout_width="60dip" android:layout_marginRight="20dip">
+ </Button>
+
+ <Button android:scaleType="fitXY" android:id="@+id/btn_main_music" android:background="@drawable/ic_menu_skin1_music" android:layout_height="60dip" android:layout_width="60dip">
+ </Button>
+ <Button android:background="@drawable/ic_menu_skin1_video" android:id="@+id/btn_main_video" android:layout_height="60dip" android:layout_width="60dip" android:layout_marginLeft="20dip"></Button>
+
+ </TableRow>
+
+ <TableRow android:layout_width="wrap_content" android:layout_height="wrap_content" android:id="@+id/TableRow01" android:padding="5dip">
+
+ <Button android:scaleType="fitXY" android:padding="5dip" android:id="@+id/btn_main_remote" android:background="@drawable/ic_menu_skin1_remote" android:layout_height="60dip" android:layout_width="60dip" android:layout_marginRight="20dip">
+ </Button>
+ <Button android:padding="5dip" android:background="@drawable/ic_menu_skin1_now_playing" android:id="@+id/btn_main_now_playing" android:layout_height="60dip" android:layout_width="60dip"></Button>
+ <Button android:padding="5dip" android:background="@drawable/ic_menu_skin1_plugins" android:id="@+id/btn_main_plugins" android:layout_height="60dip" android:layout_width="60dip" android:layout_marginLeft="20dip"></Button>
+
+
+</TableRow>
+
+</TableLayout>
+
+ <TextView android:layout_width="fill_parent"
+ android:layout_height="wrap_content" android:text="nothing playing"
+ android:gravity="center_horizontal" android:textSize="15dip"
+ android:textColor="#FF000000" android:textColorHighlight="#FFFFFFFF" android:background="#FFA9A9A9" android:padding="5dip" android:id="@+id/main_now_playing">
+ </TextView>
+
+ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:orientation="horizontal" android:layout_width="wrap_content" android:layout_gravity="center_horizontal" android:layout_height="wrap_content" android:padding="5dip">
+
+
+ <Button 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" android:background="@drawable/ic_menu_skin1_skip_backward"></Button>
+ <ImageButton android:scaleType="fitXY"
+ android:layout_height="60dip" android:layout_width="60dip"
+ android:id="@+id/btn_main_play" android:padding="2dip" android:layout_marginRight="5dip" android:background="@drawable/ic_menu_skin1_play"></ImageButton>
+ <Button android:scaleType="fitXY"
+ android:layout_height="60dip" android:layout_width="60dip"
+ android:id="@+id/btn_main_skp_forw" android:padding="2dip" android:background="@drawable/ic_menu_skin1_skip_forward"></Button>
+</LinearLayout>
+</LinearLayout>
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout-large-land/main.xml
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout-large-land/main.xml (rev 0)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout-large-land/main.xml 2011-02-08 12:25:43 UTC (rev 4101)
@@ -0,0 +1,57 @@
+<?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">
+
+<TextView android:layout_height="wrap_content" android:text="HTPC" android:textColor="#FF000000" android:textStyle="bold" android:gravity="center_horizontal" android:background="#FFA9A9A9" android:layout_width="fill_parent" android:id="@+id/main_instance" android:textSize="28dip"></TextView>
+
+<TableLayout
+ android:id="@+id/TableLayout01"
+ xmlns:android="http://schemas.android.com/apk/res/android"
+
+ android:layout_height="wrap_content"
+ android:layout_width="wrap_content" android:layout_gravity="center_horizontal">
+
+
+<TableRow android:layout_width="wrap_content" android:layout_height="wrap_content" android:padding="10dip" android:id="@+id/TableRow01">
+
+ <Button android:scaleType="fitXY"
+ android:layout_marginRight="40dip" android:padding="5dip" android:id="@+id/btn_main_pictures" android:background="@drawable/ic_menu_skin1_pictures" android:layout_height="110dip" android:layout_width="110dip">
+ </Button>
+
+ <Button android:scaleType="fitXY" android:padding="5dip"
+ android:id="@+id/btn_main_music" android:background="@drawable/ic_menu_skin1_music" android:layout_marginRight="40dip" android:layout_height="110dip" android:layout_width="110dip">
+ </Button>
+ <Button android:layout_marginRight="40dip" android:id="@+id/btn_main_video" android:padding="5dip" android:background="@drawable/ic_menu_skin1_video" android:layout_height="110dip" android:layout_width="110dip"></Button>
+
+ </TableRow>
+
+ <TableRow android:layout_width="wrap_content" android:layout_height="wrap_content" android:padding="10dip" android:id="@+id/TableRow01">
+
+ <Button android:scaleType="fitXY" android:padding="5dip" android:id="@+id/btn_main_remote" android:background="@drawable/ic_menu_skin1_remote" android:layout_marginRight="40dip" android:layout_height="110dip" android:layout_width="110dip">
+ </Button>
+ <Button android:layout_marginRight="40dip" android:id="@+id/btn_main_now_playing" android:padding="5dip" android:background="@drawable/ic_menu_skin1_now_playing" android:layout_height="100dip" android:layout_width="110dip"></Button>
+ <Button android:id="@+id/btn_main_plugins" android:padding="5dip" android:background="@drawable/ic_menu_skin1_plugins" android:layout_marginRight="40dip" android:layout_height="110dip" android:layout_width="110dip"></Button>
+
+
+</TableRow>
+
+</TableLayout>
+
+ <TextView android:layout_width="fill_parent"
+ android:layout_height="wrap_content" android:text="nothing playing"
+ android:gravity="center_horizontal" android:textColor="#FF000000" android:textColorHighlight="#FFFFFFFF" android:background="#FFA9A9A9" android:padding="5dip" android:id="@+id/main_now_playing" android:textSize="24dip">
+ </TextView>
+
+ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:orientation="horizontal" android:layout_width="wrap_content" android:layout_gravity="center_horizontal" android:layout_height="wrap_content" android:padding="5dip">
+
+
+ <Button android:scaleType="fitXY"
+ android:id="@+id/btn_main_skp_back" android:padding="2dip" android:background="@drawable/ic_menu_skin1_skip_backward" android:layout_height="80dip" android:layout_width="80dip" android:layout_marginRight="15dip"></Button>
+ <ImageButton android:scaleType="fitXY"
+ android:id="@+id/btn_main_play" android:padding="2dip" android:background="@drawable/ic_menu_skin1_play" android:layout_height="80dip" android:layout_width="80dip" android:layout_marginRight="15dip"></ImageButton>
+ <Button android:scaleType="fitXY"
+ android:id="@+id/btn_main_skp_forw" android:padding="2dip" android:background="@drawable/ic_menu_skin1_skip_forward" android:layout_height="80dip" android:layout_width="80dip" android:layout_marginRight="15dip"></Button>
+</LinearLayout>
+</LinearLayout>
Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout-small-land/main.xml
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout-small-land/main.xml (rev 0)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout-small-land/main.xml 2011-02-08 12:25:43 UTC (rev 4101)
@@ -0,0 +1,57 @@
+<?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">
+
+<TextView android:layout_height="wrap_content" android:text="HTPC" android:textColor="#FF000000" android:textStyle="bold" android:textSize="20dip" android:gravity="center_horizontal" android:background="#FFA9A9A9" android:layout_width="fill_parent" android:id="@+id/main_instance"></TextView>
+
+<TableLayout
+ android:id="@+id/TableLayout01"
+ xmlns:android="http://schemas.android.com/apk/res/android"
+
+ android:layout_height="wrap_content"
+ android:layout_width="wrap_content" android:layout_gravity="center_horizontal">
+
+
+<TableRow android:layout_width="wrap_content" android:layout_height="wrap_content" android:id="@+id/TableRow01" android:padding="3dip">
+
+ <Button android:scaleType="fitXY"
+ android:padding="5dip" android:id="@+id/btn_main_pictures" android:background="@drawable/ic_menu_skin1_pictures" android:layout_height="70dip" android:layout_width="70dip" android:layout_marginRight="10dip">
+ </Button>
+
+ <Button android:scaleType="fitXY" android:padding="5dip"
+ android:id="@+id/btn_main_music" android:background="@drawable/ic_menu_skin1_music" android:layout_height="70dip" android:layout_width="70dip">
+ </Button>
+ <Button android:padding="5dip" android:background="@drawable/ic_menu_skin1_video" android:id="@+id/btn_main_video" android:layout_height="70dip" android:layout_width="70dip" android:layout_marginLeft="10dip"></Button>
+
+ </TableRow>
+
+ <TableRow android:layout_width="wrap_content" android:layout_height="wrap_content" android:id="@+id/TableRow01" android:padding="3dip">
+
+ <Button android:scaleType="fitXY" android:id="@+id/btn_main_remote" android:padding="5dip" android:background="@drawable/ic_menu_skin1_remote" android:layout_height="70dip" android:layout_width="70dip" android:layout_marginRight="10dip">
+ </Button>
+ <Button android:padding="5dip" android:background="@drawable/ic_menu_skin1_now_playing" android:id="@+id/btn_main_now_playing" android:layout_height="70dip" android:layout_width="70dip"></Button>
+ <Button android:padding="5dip" android:background="@drawable/ic_menu_skin1_plugins" android:id="@+id/btn_main_plugins" android:layout_height="70dip" android:layout_width="70dip" android:layout_marginLeft="10dip"></Button>
+
+ </TableRow>
+
+</TableLayout>
+
+ <TextView android:layout_width="fill_parent"
+ android:layout_height="wrap_content" android:text="nothing playing"
+ android:gravity="center_horizontal" android:textSize="15dip"
+ android:textColor="#FF000000" android:textColorHighlight="#FFFFFFFF" android:background="#FFA9A9A9" android:id="@+id/main_now_playing" android:padding="3dip">
+ </TextView>
+
+ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:orientation="horizontal" android:layout_width="wrap_content" android:layout_gravity="center_horizontal" android:layout_height="wrap_content" android:padding="2dip">
+
+
+ <Button android:scaleType="fitXY"
+ android:id="@+id/btn_main_skp_back" android:background="@drawable/ic_menu_skin1_skip_backward" android:layout_marginRight="5dip" android:layout_height="55dip" android:layout_width="55dip"></Button>
+ <ImageButton android:scaleType="fitXY"
+ android:id="@+id/btn_main_play" android:layout_marginRight="0dip" android:background="@drawable/ic_menu_skin1_play" android:layout_height="55dip" android:layout_width="55dip"></ImageButton>
+ <Button android:scaleType="fitXY"
+ android:id="@+id/btn_main_skp_forw" android:background="@drawable/ic_menu_skin1_skip_forward" android:layout_marginLeft="5dip" android:layout_height="55dip" android:layout_width="55dip"></Button>
+</LinearLayout>
+</LinearLayout>
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/communication/PostWebserver.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/communication/PostWebserver.java 2011-02-07 21:41:27 UTC (rev 4100)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/communication/PostWebserver.java 2011-02-08 12:25:43 UTC (rev 4101)
@@ -27,7 +27,9 @@
import java.io.InputStreamReader;
import java.io.OutputStreamWriter;
import java.net.InetAddress;
+import java.net.InetSocketAddress;
import java.net.Socket;
+import java.net.SocketAddress;
import mediaportal.remote.utils.AppSettings;
@@ -60,8 +62,11 @@
try {
InetAddress addr = InetAddress.getByName(AppSettings.getServer());
- Socket socket = new Socket(addr, Integer.parseInt(AppSettings.getPort()));
-
+
+ Socket socket = new Socket();
+ SocketAddress adr = new InetSocketAddress(addr, Integer.parseInt(AppSettings.getPort()));
+ socket.connect(adr, 5000);
+
// Send header String
String path = "/";
BufferedWriter wr = new BufferedWriter(new OutputStreamWriter(
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/communication/SendCommand.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/communication/SendCommand.java 2011-02-07 21:41:27 UTC (rev 4100)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/communication/SendCommand.java 2011-02-08 12:25:43 UTC (rev 4101)
@@ -40,8 +40,10 @@
manager = asset;
}
- public static void PostCommandButton(String button)
+ public static boolean PostCommandButton(String button)
{
+ boolean result = false;
+
Log.d("MediaPortal", "PostCommandButton :" + button);
Vibration.vibrateShort();
@@ -59,12 +61,13 @@
xml = xml + (char) x;
x = inputStream.read();
}
- post.Post(xml);
+ result = post.Post(xml);
} catch (IOException e) {
e.printStackTrace();
}
+ return result;
}
- public static void PostKey(String Key) {
+ public static boolean PostKey(String Key) {
Log.d("MediaPortal", "PostKey :" + Key);
@@ -79,7 +82,7 @@
xml += "<key>" + Key + "</key>\r\n";
xml += "</message>\r\n";
- post.Post(xml);
+ return post.Post(xml);
}
public static void PostClearPlaylist() {
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/control/Remote_01.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/control/Remote_01.java 2011-02-07 21:41:27 UTC (rev 4100)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/control/Remote_01.java 2011-02-08 12:25:43 UTC (rev 4101)
@@ -32,6 +32,7 @@
import android.content.Intent;
import android.content.res.Resources;
import android.graphics.Color;
+import android.os.AsyncTask;
import android.os.Bundle;
import android.util.Log;
import android.view.KeyEvent;
@@ -43,39 +44,42 @@
public class Remote_01 extends Activity {
private static String action;
-
+
private LinearLayout layout;
-
+
private ImageButton btnPower;
-
+
private ImageButton btnUp;
private ImageButton btnDown;
private ImageButton btnLeft;
private ImageButton btnRight;
private ImageButton btnOk;
-
+
private ImageButton btnVolUp;
private ImageButton btnVolDown;
-
+
private ImageButton btnBack;
private ImageButton btnHome;
-
+
private ImageButton btnSkipBack;
private ImageButton btnStop;
private ImageButton btnSkipForw;
private ImageButton btnChannel_p;
-
+
private ImageButton btnFull;
private ImageButton btnPlay;
private ImageButton btnMenu;
private ImageButton btnChannel_m;
-
+
private ImageButton btnSub;
private ImageButton btnAspect;
private ImageButton btnOsd;
private ImageButton btnInfo;
-
-
+
+ private sendKeystroke taskSendKeyStroke;
+ private static boolean active;
+ private static boolean result;
+
/** Called when the activity is first created. */
@Override
public void onCreate(Bundle savedInstanceState) {
@@ -85,7 +89,7 @@
Log.d("MediaPortal", "start remote 1");
layout = (LinearLayout) findViewById(R.id.lay_remote01);
-
+
btnPower = (ImageButton) findViewById(R.id.crtl_power);
btnUp = (ImageButton) findViewById(R.id.crtl_up);
@@ -93,93 +97,96 @@
btnLeft = (ImageButton) findViewById(R.id.crtl_left);
btnRight = (ImageButton) findViewById(R.id.crtl_right);
btnOk = (ImageButton) findViewById(R.id.crtl_select);
-
+
btnVolUp = (ImageButton) findViewById(R.id.crtl_vol_p);
btnVolDown = (ImageButton) findViewById(R.id.crtl_vol_m);
-
+
btnBack = (ImageButton) findViewById(R.id.crtl_back);
btnHome = (ImageButton) findViewById(R.id.crtl_parent);
-
+
btnSkipBack = (ImageButton) findViewById(R.id.crtl_skip_back);
btnStop = (ImageButton) findViewById(R.id.crtl_stop);
btnSkipForw = (ImageButton) findViewById(R.id.crtl_skip_forw);
btnChannel_p = (ImageButton) findViewById(R.id.crtl_ch_p);
-
+
btnFull = (ImageButton) findViewById(R.id.crtl_full);
btnPlay = (ImageButton) findViewById(R.id.crtl_play);
btnMenu = (ImageButton) findViewById(R.id.crtl_menu);
btnChannel_m = (ImageButton) findViewById(R.id.crtl_ch_m);
-
+
btnSub = (ImageButton) findViewById(R.id.crtl_sub);
btnAspect = (ImageButton) findViewById(R.id.crtl_ratio);
btnOsd = (ImageButton) findViewById(R.id.crtl_osd);
btnInfo = (ImageButton) findViewById(R.id.crtl_info);
-
+
// buttons
// first row
-
+
btnUp.setOnClickListener(new View.OnClickListener() {
public void onClick(View view) {
SendCommand.PostCommandButton("moveUp");
}
});
-
+
ImageButton power = (ImageButton) findViewById(R.id.crtl_power);
-
+
power.setOnClickListener(new View.OnClickListener() {
public void onClick(View view) {
-
+
Wol w = new Wol();
w.sendMagicPacket(AppSettings.getMacId(), 9);
-
- Toast.makeText(Remote_01.this, "power on", Toast.LENGTH_SHORT).show();
+
+ Toast.makeText(Remote_01.this, "power on", Toast.LENGTH_SHORT)
+ .show();
}
});
power.setOnLongClickListener(new View.OnLongClickListener() {
public boolean onLongClick(View view) {
-
+
int x = AppSettings.getPowerMode();
-
+
Resources res = getResources();
String[] actions = res.getStringArray(R.array.shutdown);
-
+
action = actions[x];
-
- AlertDialog.Builder builder = new AlertDialog.Builder(Remote_01.this);
- builder.setMessage("Do you really want to " + action + " ?")
+
+ AlertDialog.Builder builder = new AlertDialog.Builder(
+ Remote_01.this);
+ builder.setMessage("Do you really want to " + action + " ?")
.setTitle("Please confirm")
.setPositiveButton("Yes",
new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog,
int item) {
-
- switch (AppSettings.getPowerMode())
- {
+
+ switch (AppSettings.getPowerMode()) {
case 0:
// Exit
- SendCommand.PostCommandButton("exit");
+ sendKeyStroke("exit");
break;
case 1:
// Suspend
- SendCommand.PostCommandButton("suspend");
+ sendKeyStroke("suspend");
break;
case 2:
// Hibernate
- SendCommand.PostCommandButton("hibernate");
+ sendKeyStroke("hibernate");
break;
case 3:
// Restart
- SendCommand.PostCommandButton("restart");
+ sendKeyStroke("restart");
break;
case 4:
// Shut Off
- SendCommand.PostCommandButton("shutoff");
+ sendKeyStroke("shutoff");
break;
}
-
- Toast.makeText(Remote_01.this, "Please wait , " + action, Toast.LENGTH_SHORT).show();
-
+
+ Toast.makeText(Remote_01.this,
+ "Please wait , " + action,
+ Toast.LENGTH_SHORT).show();
+
}
})
.setNegativeButton("No",
@@ -193,132 +200,132 @@
return true;
}
});
-
-
+
// second row
-
+
btnLeft.setOnClickListener(new View.OnClickListener() {
public void onClick(View view) {
- SendCommand.PostCommandButton("moveLeft");
+ sendKeyStroke("moveLeft");
}
});
-
+
btnOk.setOnClickListener(new View.OnClickListener() {
public void onClick(View view) {
- SendCommand.PostCommandButton("selectItem");
+ sendKeyStroke("selectItem");
}
});
btnRight.setOnClickListener(new View.OnClickListener() {
public void onClick(View view) {
- SendCommand.PostCommandButton("moveRight");
+ sendKeyStroke("moveRight");
}
});
-
+
// third row
-
+
btnHome.setOnClickListener(new View.OnClickListener() {
public void onClick(View view) {
- SendCommand.PostCommandButton("parentDir");
+ sendKeyStroke("parentDir");
}
- });
+ });
btnDown.setOnClickListener(new View.OnClickListener() {
public void onClick(View view) {
- SendCommand.PostCommandButton("moveDown");
+ sendKeyStroke("moveDown");
}
});
btnBack.setOnClickListener(new View.OnClickListener() {
public void onClick(View view) {
- SendCommand.PostCommandButton("previousMenu");
+ sendKeyStroke("previousMenu");
}
});
-
+
// volume
btnVolUp.setOnClickListener(new View.OnClickListener() {
public void onClick(View view) {
- SendCommand.PostCommandButton("volumeUp");
+ sendKeyStroke("volumeUp");
}
});
btnVolDown.setOnClickListener(new View.OnClickListener() {
public void onClick(View view) {
- SendCommand.PostCommandButton("volumeDown");
+ sendKeyStroke("volumeDown");
}
});
-
+
// fourth row
-
+
btnSkipBack.setOnClickListener(new View.OnClickListener() {
public void onClick(View view) {
- SendCommand.PostCommandButton("prevItem");
+ sendKeyStroke("prevItem");
}
- });
+ });
btnStop.setOnClickListener(new View.OnClickListener() {
public void onClick(View view) {
- SendCommand.PostCommandButton("stop");
+ sendKeyStroke("stop");
}
- });
+ });
btnSkipForw.setOnClickListener(new View.OnClickListener() {
public void onClick(View view) {
- SendCommand.PostCommandButton("nextItem");
+ sendKeyStroke("nextItem");
}
});
btnChannel_p.setOnClickListener(new View.OnClickListener() {
public void onClick(View view) {
- SendCommand.PostCommandButton("nextChannel");
+ sendKeyStroke("nextChannel");
}
});
-
+
// fifth row
-
+
btnFull.setOnClickListener(new View.OnClickListener() {
public void onClick(View view) {
- SendCommand.PostCommandButton("fullscreen");
+ sendKeyStroke("fullscreen");
}
});
btnPlay.setOnClickListener(new View.OnClickListener() {
public void onClick(View view) {
- SendCommand.PostCommandButton("play");
+ sendKeyStroke("play");
}
});
btnMenu.setOnClickListener(new View.OnClickLis...
[truncated message content] |
