Merge pull request #194 from joyplus/dev-helper

Dev helper

showkeyHelper/AndroidManifest.xml

@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.joyplus.tvhelper"
-    android:versionCode="19"
-    android:versionName="1.4.2apha" >
+    android:versionCode="22"
+    android:versionName="1.5" >
 
     <uses-sdk
         android:minSdkVersion="14"
         android:targetSdkVersion="17" />
 	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <!-- <uses-permission android:name="android.permission.INSTALL_PACKAGES" />
-    <uses-permission android:name="android.permission.DELETE_PACKAGES" /> -->
+    <uses-permission android:name="android.permission.INSTALL_PACKAGES" />
+    <!-- <uses-permission android:name="android.permission.DELETE_PACKAGES" /> -->
     <uses-permission android:name="android.permission.CLEAR_APP_CACHE" />
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
     <uses-permission android:name="android.permission.CLEAR_APP_USER_DATA" />
@@ -69,9 +69,19 @@
         <activity
             android:name="VideoPlayerJPActivity"
             android:configChanges="orientation|keyboardHidden|navigation"
-            android:launchMode="singleTop"
             android:screenOrientation="landscape" >
         </activity>
+        <activity
+            android:name="com.joyplus.JoyplusMediaPlayerActivity"
+            android:configChanges="orientation|keyboardHidden|navigation"
+            android:screenOrientation="landscape" >
+        </activity>
+        <activity
+            android:name="io.vov.vitamio.InitActivity"
+            android:configChanges="orientation|keyboardHidden|navigation"
+            android:launchMode="singleTop"
+            android:theme="@android:style/Theme.NoTitleBar"
+            android:windowSoftInputMode="stateAlwaysHidden" />        
         <activity
             android:name="ThirdPlayActivity"
             android:configChanges="orientation|keyboardHidden|navigation"
@@ -161,10 +171,21 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter> -->
         </activity>
+        <activity
+            android:name="com.joyplus.tvhelper.GuideActivity"
+            android:label="@string/app_name" 
+            android:theme="@android:style/Theme.NoTitleBar.Fullscreen">>
+
+            <!-- <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter> -->
+        </activity>
         <service android:name="com.joyplus.tvhelper.faye.FayeService" >
         </service>
 		<meta-data android:value="51e75b5956240ba99502e874" android:name="UMENG_APPKEY"></meta-data>
-		<meta-data android:value="t001001" android:name="UMENG_CHANNEL"/>
+		<meta-data android:value="j001" android:name="UMENG_CHANNEL"/>
         <service
             android:name="com.umeng.common.net.DownloadingService"
             android:exported="true"

showkeyHelper/res/anim/alpha_appear_dialog.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android" >
+<alpha
+	android:fromAlpha="0.1"
+	android:toAlpha="1.0"
+	android:duration="200"
+/> 
+<!-- 透明度控制动画效果 alpha
+        浮点型值：
+            fromAlpha 属性为动画起始时透明度
+            toAlpha   属性为动画结束时透明度
+            说明: 
+                0.0表示完全透明
+                1.0表示完全不透明
+            以上值取0.0-1.0之间的float数据类型的数字
+        
+        长整型值：
+            duration  属性为动画持续时间
+            说明:     
+                时间以毫秒为单位
+-->
+</set>

showkeyHelper/res/anim/alpha_disappear_dialog.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android" >
+<alpha
+	android:fromAlpha="1.0"
+	android:toAlpha="0.1"
+	android:duration="200"
+/> 
+<!-- 透明度控制动画效果 alpha
+        浮点型值：
+            fromAlpha 属性为动画起始时透明度
+            toAlpha   属性为动画结束时透明度
+            说明: 
+                0.0表示完全透明
+                1.0表示完全不透明
+            以上值取0.0-1.0之间的float数据类型的数字
+        
+        长整型值：
+            duration  属性为动画持续时间
+            说明:     
+                时间以毫秒为单位
+-->
+</set>

showkeyHelper/res/drawable/mediacontroller_pause_button.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:drawable="@drawable/mediacontroller_pause02" android:state_focused="true" android:state_pressed="false"/>
+    <item android:drawable="@drawable/mediacontroller_pause02" android:state_focused="true" android:state_pressed="true"/>
+    <item android:drawable="@drawable/mediacontroller_pause02" android:state_focused="false" android:state_pressed="true"/>
+    <item android:drawable="@drawable/mediacontroller_pause01"/>
+
+</selector>

showkeyHelper/res/drawable/mediacontroller_play_button.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:drawable="@drawable/mediacontroller_play02" android:state_focused="true" android:state_pressed="false"/>
+    <item android:drawable="@drawable/mediacontroller_play02" android:state_focused="true" android:state_pressed="true"/>
+    <item android:drawable="@drawable/mediacontroller_play02" android:state_focused="false" android:state_pressed="true"/>
+    <item android:drawable="@drawable/mediacontroller_play01"/>
+
+</selector>

showkeyHelper/res/drawable/mediacontroller_seekbar.xml

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item
+            android:id="@android:id/background"
+            android:drawable="@drawable/mediacontroller_seekbar02"/>
+    <item android:id="@android:id/secondaryProgress">
+        <clip>
+            <shape>
+                <solid android:color="#00000000"/>
+            </shape>
+        </clip>
+    </item>
+    <item android:id="@android:id/progress">
+        <clip>
+            <layer-list>
+                <item
+                        android:bottom="2.0dip"
+                        android:left="2.0dip"
+                        android:right="2.0dip"
+                        android:top="2.0dip">
+                    <bitmap
+                            android:gravity="center_vertical|fill_vertical|left"
+                            android:src="@drawable/mediacontroller_seekbar01"
+                            android:tileMode="disabled"/>
+                </item>
+            </layer-list>
+        </clip>
+    </item>
+
+</layer-list>

showkeyHelper/res/drawable/mediacontroller_seekbar_thumb.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+       android:shape="ring">
+
+    <solid android:color="#00000000"/>
+
+    <size
+            android:height="40dip"
+            android:width="40dip"/>
+
+</shape>

showkeyHelper/res/layout/activity_clouddate_display.xml

@@ -109,8 +109,17 @@
                 				android:paddingLeft="@dimen/list_padding_left"
 	       		                android:textSize="@dimen/max_text_size"
 	       		                android:textColor="#f0f0f0"/>
+	       		                <Button android:layout_width="133dp"
+               					android:layout_height="45dp"
+               					android:layout_gravity="center_vertical"
+		                        android:background="@drawable/xunlei_return_btn_bg"
+		                        android:textSize="@dimen/mid_text_size"
+		                        android:textColor="#ffffff"
+		                        android:id="@+id/clear_Button"
+		                        android:text="清空"/>
 	       		            <RelativeLayout android:layout_width="wrap_content"
-	                        android:layout_height="fill_parent">
+	                        android:layout_height="fill_parent"
+	                        android:layout_marginLeft="30dp">
 	                        <LinearLayout android:layout_width="wrap_content"
 	                            android:layout_height="fill_parent"
 	                            android:id="@+id/fistBtn_group">

showkeyHelper/res/layout/activity_guide.xml

@@ -0,0 +1,24 @@
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".MainActivity" >
+	<com.joyplus.tvhelper.ui.GuideScrollLayout 
+	    android:layout_width="fill_parent"
+	    android:id="@+id/layout"
+	    android:layout_height="fill_parent">
+	    <ImageView android:id="@+id/guide_page_1"
+	        android:layout_width="fill_parent"
+	    	android:layout_height="fill_parent"/>
+	    <ImageView android:id="@+id/guide_page_2"
+	        android:layout_width="fill_parent"
+	    	android:layout_height="fill_parent"/>
+	    <ImageView android:id="@+id/guide_page_3"
+	        android:layout_width="fill_parent"
+	    	android:layout_height="fill_parent"/>
+	    <ImageView android:id="@+id/guide_page_4"
+	        android:layout_width="fill_parent"
+	    	android:layout_height="fill_parent"/>
+	</com.joyplus.tvhelper.ui.GuideScrollLayout>
+
+</RelativeLayout>

showkeyHelper/res/layout/activity_main.xml

@@ -7,7 +7,7 @@
 
     <LinearLayout android:orientation="horizontal"
         android:layout_width="fill_parent"
-        android:id="@+id/title"
+        android:id="@+id/layout_title"
         android:layout_marginTop="90dp"
         android:paddingLeft="147dp"
         android:gravity="center_vertical"
@@ -41,7 +41,8 @@
     <include layout="@layout/layout_1"
         />
 <!--     <include layout="@layout/layout_2"/> -->
-    <include layout="@layout/layout_3"/>
+    <include layout="@layout/layout_3"
+        android:id="@+id/layout_page_3"/>
 </com.joyplus.tvhelper.ui.MyScrollLayout>
 <com.joyplus.tvhelper.ui.NotificationView android:layout_width="wrap_content"
     android:layout_height="wrap_content"

showkeyHelper/res/layout/activity_main_simple.xml

@@ -0,0 +1,63 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".MainActivity" xmlns:app="http://schemas.android.com/apk/res/com.joyplus.tvhelper">
+
+    <LinearLayout android:orientation="horizontal"
+        android:layout_width="fill_parent"
+        android:id="@+id/layout_title"
+        android:layout_marginTop="90dp"
+        android:paddingLeft="147dp"
+        android:gravity="center_vertical"
+        android:layout_height="wrap_content">
+        <TextView android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textSize="30dp"
+            android:id="@+id/title_1"
+            android:textColor="@color/main_title_selected"
+            android:text="转  屏 "/>
+        <ImageView android:layout_width="wrap_content"
+            android:layout_height="fill_parent"
+            android:scaleType="fitXY"
+            android:paddingTop="5dp"
+            android:paddingBottom="5dp"
+            android:layout_marginLeft="10dp"
+            android:src="@drawable/main_title_divider"/>
+        <TextView android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="10dp"
+            android:id="@+id/title_2"
+            android:textSize="30dp"
+            android:textColor="@color/main_title_unselected"
+            android:text=" 工  具 "/>
+    </LinearLayout>
+<com.joyplus.tvhelper.ui.MyScrollLayout 
+    android:layout_width="fill_parent"
+    android:id="@+id/layout"
+    android:layout_weight="1"
+    android:layout_height="fill_parent">
+    <include layout="@layout/layout_1_simple"
+        />
+<!--     <include layout="@layout/layout_2"/> -->
+    <include layout="@layout/layout_3"
+        android:id="@+id/layout_page_3"/>
+</com.joyplus.tvhelper.ui.MyScrollLayout>
+<com.joyplus.tvhelper.ui.NotificationView android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:paddingLeft="147dp"
+   	app:textColor="#f0f0f0"
+   	app:textSize="24dp"
+   	app:text="正在连接服务器···"
+    android:id="@+id/statue_connect"/>
+<TextView android:layout_width="fill_parent"
+    android:paddingBottom="20dp"
+    android:layout_height="90dp"
+    android:textSize="24dp"
+    android:visibility="invisible"
+    android:textColor="#ffffff"
+    android:gravity="right|center_vertical"
+    android:paddingRight="147dp"
+    android:text="今日已推送800次"/>
+</LinearLayout>

showkeyHelper/res/layout/activity_setting.xml

@@ -123,6 +123,28 @@
 	       		                    android:textColor="@color/common_list_content_textcolor"
 	       		                    android:text="B 5 P 6 2 J"/>
 	       		            </LinearLayout>
+	       		            <LinearLayout android:layout_width="fill_parent"
+	       		                android:layout_height="60dp"
+	       		                android:paddingLeft="20dp"
+	       		                android:paddingRight="20dp"
+	       		                android:gravity="center_vertical"
+	       		                android:focusable="true"
+	       		            	android:id="@+id/layout_player_decode_mode"
+	       		            	android:background="@drawable/bg_xunlei_content_setting_selector"
+	       		                android:orientation="horizontal"
+	       		                android:visibility="gone">
+	       		                <TextView android:layout_width="0dp"
+	       		                    android:layout_height="fill_parent"
+	       		                    android:gravity="center_vertical"
+	       		                    android:textSize="25dp"
+	       		                    android:textColor="@color/common_list_content_textcolor"
+	       		                    android:text="播放器解码模式"
+	       		                    android:layout_weight="1"/>
+	       		                <ImageView android:layout_width="wrap_content"
+	       		                    android:layout_height="wrap_content"
+	       		                    android:id="@+id/switch_player_decode_mode"
+	       		                    android:src="@drawable/switch_hard"/>
+	       		            </LinearLayout>
 	       		            <LinearLayout android:layout_width="fill_parent"
 	       		                android:layout_height="60dp"
 	       		                android:paddingLeft="20dp"
@@ -143,7 +165,7 @@
 	       		                <ImageView android:layout_width="wrap_content"
 	       		                    android:layout_height="wrap_content"
 	       		                    android:id="@+id/switch_deleteApk"
-	       		                    android:src="@drawable/swith_on"/>
+	       		                    android:src="@drawable/switch_on"/>
 	       		            </LinearLayout>
 	       		            <LinearLayout android:layout_width="fill_parent"
 	       		                android:layout_height="60dp"
@@ -165,7 +187,7 @@
 	       		                <ImageView android:layout_width="wrap_content"
 	       		                    android:layout_height="wrap_content"
 	       		                    android:id="@+id/switch_confirm"
-	       		                    android:src="@drawable/swith_off"/>
+	       		                    android:src="@drawable/switch_off"/>
 	       		            </LinearLayout>
 	       		        </LinearLayout>
        		            <ScrollView android:layout_width="fill_parent"
@@ -174,13 +196,18 @@
 	       		                android:paddingRight="20dp"
 	       		                android:visibility="gone"
 			                    android:id="@+id/layout_help">
-			                    <WebView android:layout_width="fill_parent"
+	       		            	<LinearLayout android:layout_width="fill_parent"
+			                        android:layout_height="wrap_content"
+			                        android:orientation="vertical"
+			                        android:id="@+id/layout_content">
+			                    </LinearLayout>
+			                    <!-- <WebView android:layout_width="fill_parent"
 			                    android:layout_height="wrap_content"
 			                    android:layerType="software"  
 			                    android:fadingEdge="@null"
 			                    android:focusable="false"
 			                    android:focusableInTouchMode="false"
-			                    android:id="@+id/webView"/>
+			                    android:id="@+id/webView"/> -->
                  		</ScrollView>
 	       		        <ScrollView android:layout_width="fill_parent"
 			                    android:layout_height="fill_parent"