Merge pull request #174 from KevinHuo/Release_310

Release v3.1.0

PLDroidShortVideoDemo/app/build.gradle

@@ -7,16 +7,17 @@ repositories {
 }
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion "25.0.2"
+    compileSdkVersion 28
+    buildToolsVersion "28.0.3"
 
     defaultConfig {
         applicationId "com.qiniu.pili.droid.shortvideo.demo"
         minSdkVersion 18
-        targetSdkVersion 25
-        versionCode 27
-        versionName "3.0.1"
+        targetSdkVersion 26
+        versionCode 28
+        versionName "3.1.0"
         multiDexEnabled true
+        vectorDrawables.useSupportLibrary = true
         buildConfigField "long", "BUILD_TIMESTAMP", System.currentTimeMillis() + "L"
         ndk {
             abiFilters 'armeabi-v7a'
@@ -31,20 +32,20 @@ android {
 }
 
 dependencies {
-    compile 'com.qiniu:qiniu-android-sdk:7.3.11'
-    compile files('libs/pldroid-shortvideo-3.0.1.jar')
-    compile files('libs/pldroid-player-2.1.8.jar')
-    compile files('libs/EasyAR.jar')
-    compile files('libs/EasyAR3D.jar')
+    implementation 'com.qiniu:qiniu-android-sdk:7.3.11'
+    implementation files('libs/pldroid-shortvideo-3.1.0.jar')
+    implementation files('libs/pldroid-player-2.1.8.jar')
+    implementation files('libs/EasyAR.jar')
+    implementation files('libs/EasyAR3D.jar')
 
-    compile 'com.android.support:multidex:1.0.1'
-    compile 'pl.droidsonroids.gif:android-gif-drawable:1.2.7'
-    compile 'com.android.support:recyclerview-v7:25.3.1'
-    compile 'com.android.support:appcompat-v7:25.3.1'
-    compile 'com.android.support:design:25.3.1'
-    compile 'com.android.support.constraint:constraint-layout:1.0.1'
+    implementation 'com.android.support:multidex:1.0.3'
+    implementation 'pl.droidsonroids.gif:android-gif-drawable:1.2.7'
+    implementation 'com.android.support:recyclerview-v7:28.0.0'
+    implementation 'com.android.support:appcompat-v7:28.0.0'
+    implementation 'com.android.support:design:28.0.0'
+    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
 
-    compile files('libs/universal-image-loader-1.9.4.jar')
-    compile 'com.h6ah4i.android.widget.advrecyclerview:advrecyclerview:0.10.6'
-    compile 'com.github.bumptech.glide:glide:3.7.0'
+    implementation files('libs/universal-image-loader-1.9.4.jar')
+    implementation 'com.h6ah4i.android.widget.advrecyclerview:advrecyclerview:0.10.6'
+    implementation 'com.github.bumptech.glide:glide:4.9.0'
 }

PLDroidShortVideoDemo/app/src/main/AndroidManifest.xml

@@ -14,6 +14,7 @@
     <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
 
     <application
+        android:name=".ShortVideoApplication"
         android:allowBackup="true"
         android:hardwareAccelerated="true"
         android:icon="@drawable/ic_launcher"

PLDroidShortVideoDemo/app/src/main/java/com/qiniu/pili/droid/shortvideo/demo/ShortVideoApplication.java

@@ -0,0 +1,15 @@
+package com.qiniu.pili.droid.shortvideo.demo;
+
+import android.app.Application;
+
+import com.qiniu.pili.droid.shortvideo.PLShortVideoEnv;
+
+public class ShortVideoApplication extends Application {
+
+    @Override
+    public void onCreate() {
+        super.onCreate();
+        // init resources needed by short video sdk
+        PLShortVideoEnv.init(getApplicationContext());
+    }
+}

PLDroidShortVideoDemo/app/src/main/java/com/qiniu/pili/droid/shortvideo/demo/activity/PlaybackActivity.java

@@ -104,6 +104,16 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         }
 
         mSurfaceView = (SurfaceView) findViewById(R.id.video);
+        mSurfaceView.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (!mMediaController.isShowing()) {
+                    mMediaController.show(0);
+                } else {
+                    mMediaController.hide();
+                }
+            }
+        });
         mSurfaceHolder = mSurfaceView.getHolder();
         mSurfaceHolder.addCallback(new SurfaceHolder.Callback() {
             @Override
@@ -171,16 +181,6 @@ private void makeUpVideoPlayingSize() {
         mSurfaceHolder.setFixedSize(displayWidth, displayHeight);
     }
 
-    @Override
-    public boolean onTouchEvent(MotionEvent event) {
-        if (!mMediaController.isShowing()) {
-            mMediaController.show(0);
-        } else {
-            mMediaController.hide();
-        }
-        return super.onTouchEvent(event);
-    }
-
     @Override
     public void finish() {
         if (0 == mPreviousOrientation) {