Merge pull request #68 from Jhuster/dev

release 1.2.0

PLDroidPlayerDemo/.gitignore

@@ -1,6 +1,8 @@
+*.iml
 .gradle
 /local.properties
 /.idea/workspace.xml
 /.idea/libraries
 .DS_Store
 /build
+/captures

PLDroidPlayerDemo/app/build.gradle

@@ -1,13 +1,13 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 22
-    buildToolsVersion "22.0.1"
+    compileSdkVersion 23
+    buildToolsVersion "24.0.0 rc1"
 
     defaultConfig {
-        applicationId "com.pili.android.playerdemo"
+        applicationId "com.pili.pldroid.playerdemo"
         minSdkVersion 9
-        targetSdkVersion 22
+        targetSdkVersion 23
         versionCode 1
         versionName "1.0"
     }
@@ -20,8 +20,6 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:appcompat-v7:22.0.0'
-    compile files('libs/ijkmediaplayer.jar')
-    compile files('libs/pldroid-player-1.1.6.jar')
+    compile 'com.android.support:design:23.2.1'
+    compile files('libs/pldroid-player-1.2.0.jar')
 }

PLDroidPlayerDemo/app/proguard-rules.pro

@@ -1,6 +1,6 @@
 # Add project specific ProGuard rules here.
 # By default, the flags in this file are appended to flags specified
-# in /Users/jerikc/Library/Android/sdk/tools/proguard/proguard-android.txt
+# in /Users/lujun/Library/Android/sdk/tools/proguard/proguard-android.txt
 # You can edit the include path and order by changing the proguardFiles
 # directive in build.gradle.
 #
@@ -15,3 +15,5 @@
 #-keepclassmembers class fqcn.of.javascript.interface.for.webview {
 #   public *;
 #}
+
+-keep class com.pili.pldroid.player.** { *; }

PLDroidPlayerDemo/app/src/main/AndroidManifest.xml

@@ -3,46 +3,32 @@
     package="com.pili.pldroid.playerdemo" >
 
     <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
 
     <application
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
-        android:theme="@style/AppTheme" >
+        android:supportsRtl="true"
+        android:theme="@style/AppTheme">
         <activity
-            android:name=".MainActivity"
-            android:label="@string/app_name" >
+            android:name=".MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity
-            android:name=".VideoPlayerActivity"
-            android:configChanges="orientation|keyboardHidden|screenSize"
-            android:label="@string/app_name"
-            android:screenOrientation="landscape"
-            android:theme="@style/FullscreenTheme" >
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-
-                <data android:mimeType="video/*" />
-                <data android:mimeType="audio/*" />
-                <data android:scheme="http" />
-                <data android:scheme="file" />
-            </intent-filter>
-        </activity>
-        <activity
-            android:name=".AudioPlayerActivity"
-            android:label="@string/title_activity_audio_player" >
-        </activity>
+        <activity android:name=".PLMediaPlayerActivity"
+            android:theme="@style/AppThemeFullscreen" />
+        <activity android:name=".PLAudioPlayerActivity" />
+        <activity android:name=".PLVideoViewActivity"
+            android:theme="@style/AppThemeFullscreen" />
+        <activity android:name=".PLVideoTextureActivity"
+            android:theme="@style/AppThemeFullscreen" />
+        <activity android:name=".VideoViewActivity"
+            android:theme="@style/AppThemeFullscreen" />
+        <activity android:name=".VideoFileActivity" />
     </application>
 
-</manifest>
+</manifest>