Merge branch 'release/v1.5'

lipangit · Feb 24, 2016 · 3f8e416 · 3f8e416
2 parents 4c43355 + a3d1586
commit 3f8e416
Show file tree

Hide file tree

Showing 17 changed files with 42 additions and 29 deletions.
diff --git a/README.md b/README.md
@@ -13,7 +13,7 @@
 ##使用
 引入类库
 ```java
-compile 'fm.jiecao:jiecaovideoplayer:1.3'
+compile 'fm.jiecao:jiecaovideoplayer:1.5'
 ```
 
 添加布局
@@ -50,10 +50,10 @@ videoController.setSkin();//设置这一个播放器的皮肤
     如果JCVideoPlayer这个View能检测到自己的Activity或者Fragment的生命周期JCVideoPlayer.releaseAllVideo();这个接口暴露出来都略显多余
 
 ##下载
- * **[jiecaovideoplayer-1.3-demo.apk](https://raw.githubusercontent.com/lipangit/jiecaovideoplayer/develop/downloads/jiecaovideoplayer-1.3-demo.apk)**
- * **[jiecaovideoplayer-1.3.aar](https://raw.githubusercontent.com/lipangit/jiecaovideoplayer/develop/downloads/jiecaovideoplayer-1.3.aar)**
- * **[jiecaovideoplayer-1.3-javadoc.jar](https://raw.githubusercontent.com/lipangit/jiecaovideoplayer/develop/downloads/jiecaovideoplayer-1.3-javadoc.jar)**
- * **[jiecaovideoplayer-1.3-sources.jar](https://raw.githubusercontent.com/lipangit/jiecaovideoplayer/develop/downloads/jiecaovideoplayer-1.3-sources.jar)**
+ * **[jiecaovideoplayer-1.5-demo.apk](https://raw.githubusercontent.com/lipangit/jiecaovideoplayer/develop/downloads/jiecaovideoplayer-1.5-demo.apk)**
+ * **[jiecaovideoplayer-1.5.aar](https://raw.githubusercontent.com/lipangit/jiecaovideoplayer/develop/downloads/jiecaovideoplayer-1.5.aar)**
+ * **[jiecaovideoplayer-1.5-javadoc.jar](https://raw.githubusercontent.com/lipangit/jiecaovideoplayer/develop/downloads/jiecaovideoplayer-1.5-javadoc.jar)**
+ * **[jiecaovideoplayer-1.5-sources.jar](https://raw.githubusercontent.com/lipangit/jiecaovideoplayer/develop/downloads/jiecaovideoplayer-1.5-sources.jar)**
 
 ##效果
 

diff --git a/app/build.gradle b/app/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId "fm.jiecao.jiecaovideoplayer"
         minSdkVersion 16
         targetSdkVersion 23
-        versionCode 15
-        versionName "1.4"
+        versionCode 16
+        versionName "1.5"
     }
     buildTypes {
         release {

diff --git a/downloads/jiecaovideoplayer-1.3-demo.apk b/downloads/jiecaovideoplayer-1.3-demo.apk
diff --git a/downloads/jiecaovideoplayer-1.3-javadoc.jar b/downloads/jiecaovideoplayer-1.3-javadoc.jar
diff --git a/downloads/jiecaovideoplayer-1.3-sources.jar b/downloads/jiecaovideoplayer-1.3-sources.jar
diff --git a/downloads/jiecaovideoplayer-1.3.aar b/downloads/jiecaovideoplayer-1.3.aar
diff --git a/downloads/jiecaovideoplayer-1.5-demo.apk b/downloads/jiecaovideoplayer-1.5-demo.apk
diff --git a/downloads/jiecaovideoplayer-1.5-javadoc.jar b/downloads/jiecaovideoplayer-1.5-javadoc.jar
diff --git a/downloads/jiecaovideoplayer-1.5-sources.jar b/downloads/jiecaovideoplayer-1.5-sources.jar
diff --git a/downloads/jiecaovideoplayer-1.5.aar b/downloads/jiecaovideoplayer-1.5.aar
diff --git a/gradle/maven_push.gradle b/gradle/maven_push.gradle
@@ -21,7 +21,7 @@ signing {
 
 group = "fm.jiecao"
 archivesBaseName = "jiecaovideoplayer"
-version = "1.4"
+version = "1.5"
 
 uploadArchives {
     repositories {

diff --git a/jcvideoplayer-lib/build.gradle b/jcvideoplayer-lib/build.gradle
@@ -7,8 +7,8 @@ android {
     defaultConfig {
         minSdkVersion 14
         targetSdkVersion 23
-        versionCode 15
-        versionName "1.4"
+        versionCode 16
+        versionName "1.5"
     }
     buildTypes {
         release {

diff --git a/jcvideoplayer-lib/src/main/java/fm/jiecao/jcvideoplayer_lib/JCVideoPlayer.java b/jcvideoplayer-lib/src/main/java/fm/jiecao/jcvideoplayer_lib/JCVideoPlayer.java
@@ -731,6 +731,7 @@ private void loadMp3Thum() {
     /**
      * 只设置这一个播放器的皮肤
      * 这个需要在setUp播放器的属性之前调用，因为enlarge图标的原因
+     * 所有参数如果不需要修改的设为0
      *
      * @param titleColor              标题颜色
      * @param timeColor               时间颜色
@@ -748,6 +749,7 @@ public void setSkin(int titleColor, int timeColor, int seekDrawable, int bottomC
     /**
      * 设置所有播放器的皮肤
      * 这个只要在初始化想要换肤的播放器之前运行即可，可以在application中也可以在activity中
+     * 所有参数如果不需要修改的设为0
      *
      * @param titleColor              标题颜色
      * @param timeColor               时间颜色

diff --git a/jcvideoplayer-lib/src/main/res/drawable-xhdpi/video_loading_icon.png b/jcvideoplayer-lib/src/main/res/drawable-xhdpi/video_loading_icon.png
diff --git a/jcvideoplayer-lib/src/main/res/drawable/video_loading.xml b/jcvideoplayer-lib/src/main/res/drawable/video_loading.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<rotate xmlns:android="http://schemas.android.com/apk/res/android"
+    android:drawable="@drawable/video_loading_icon"
+    android:fromDegrees="0.0"
+    android:pivotX="50.0%"
+    android:pivotY="50.0%"
+    android:toDegrees="360.0" />
diff --git a/jcvideoplayer-lib/src/main/res/layout/video_control_view.xml b/jcvideoplayer-lib/src/main/res/layout/video_control_view.xml
@@ -39,14 +39,15 @@
 
     <ProgressBar
         android:id="@+id/loading"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="28dp"
+        android:layout_height="28dp"
         android:layout_centerHorizontal="true"
         android:layout_centerVertical="true"
+        android:indeterminateDrawable="@drawable/video_loading"
         android:visibility="invisible" />
 
 
-    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    <LinearLayout
         android:id="@+id/bottom_control"
         android:layout_width="match_parent"
         android:layout_height="@dimen/media_controller_view_height"
@@ -60,42 +61,45 @@
             android:id="@+id/current"
             android:layout_width="50dp"
             android:layout_height="wrap_content"
+            android:layout_marginLeft="16dp"
+            android:layout_marginRight="12dp"
             android:gravity="center"
             android:text="00:00"
             android:textColor="#ffffff" />
 
         <SeekBar
             android:id="@+id/progress"
-            android:layout_width="0.0dip"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_weight="1.0"
             android:max="100"
-            android:maxHeight="4.0dip"
-            android:minHeight="4.0dip"
-            android:paddingBottom="8.0dip"
-            android:paddingLeft="0.0dip"
-            android:paddingRight="0.0dip"
-            android:paddingTop="8.0dip"
+            android:maxHeight="4dp"
+            android:minHeight="4dp"
+            android:paddingBottom="8dp"
+            android:paddingLeft="0dp"
+            android:paddingRight="0dp"
+            android:paddingTop="8dp"
             android:progressDrawable="@drawable/seek_progress"
             android:thumb="@drawable/seek_thumb"
-            android:thumbOffset="0.0dip" />
+            android:thumbOffset="0dp" />
 
         <TextView
             android:id="@+id/total"
             android:layout_width="50dp"
             android:layout_height="wrap_content"
-            android:layout_marginRight="5dp"
+            android:layout_marginLeft="12.0dip"
             android:gravity="center"
             android:text="00:00"
             android:textColor="#ffffff" />
 
         <ImageView
             android:id="@+id/fullscreen"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
-            android:layout_marginRight="6dp"
-            android:padding="12dp"
+            android:layout_width="wrap_content"
+            android:layout_height="fill_parent"
+            android:paddingLeft="16.0dip"
+            android:paddingRight="16.0dip"
+            android:scaleType="center"
             android:src="@drawable/enlarge_video" />
     </LinearLayout>
 
@@ -138,8 +142,8 @@
 
     <ImageView
         android:id="@+id/start"
-        android:layout_width="65dp"
-        android:layout_height="65dp"
+        android:layout_width="60dp"
+        android:layout_height="60dp"
         android:layout_centerHorizontal="true"
         android:layout_centerVertical="true"
         android:layout_gravity="center_vertical"

diff --git a/jcvideoplayer-lib/src/main/res/values/dimens.xml b/jcvideoplayer-lib/src/main/res/values/dimens.xml
@@ -3,5 +3,5 @@
     <dimen name="activity_vertical_margin">16dp</dimen>
 
     <!-- MEDIA CONTROLLER -->
-    <dimen name="media_controller_view_height">38dip</dimen>
+    <dimen name="media_controller_view_height">40.0dip</dimen>
 </resources>