Merge pull request #33 from ksvc/updateVer_1.0.2

update ver to 1.0.2
ksvc · Jul 17, 2017 · 7360d03 · 7360d03
2 parents 1b3a853 + 036f70d
commit 7360d03
Show file tree

Hide file tree

Showing 118 changed files with 4,901 additions and 3,623 deletions.
diff --git a/demo/app/build.gradle b/demo/app/build.gradle
@@ -7,8 +7,8 @@ android {
         applicationId "com.ksyun.media.shortvideo.demo"
         minSdkVersion 15
         targetSdkVersion 24
-        versionCode 82
-        versionName "0.8.2"
+        versionCode 102
+        versionName "1.0.2"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     sourceSets {
@@ -24,6 +24,12 @@ android {
     }
 }
 
+repositories {
+    flatDir {
+        dirs 'libs'
+    }
+}
+
 dependencies {
     compile fileTree(include: ['*.jar'], dir: 'libs')
     compile 'com.android.support:appcompat-v7:24.2.1'
@@ -33,4 +39,9 @@ dependencies {
     compile 'com.ksyun.ks3:ks3androidsdk:1.4.1'
     compile 'com.tencent.bugly:crashreport:latest.release'
     compile 'com.tencent.bugly:nativecrashreport:latest.release'
+    compile (name:'sensearsdk-release', ext: 'aar')
+    compile 'com.ksyun.media:libksylive-java:2.4.0'
+    compile 'com.ksyun.media:libksylive-arm64:2.4.0'
+    compile 'com.ksyun.media:libksylive-armv7a:2.4.0'
+    compile 'com.ksyun.media:libksylive-x86:2.4.0'
 }
diff --git a/demo/app/libs/arm64-v8a/libksylive.so b/demo/app/libs/arm64-v8a/libksylive.so
diff --git a/demo/app/libs/arm64-v8a/libnama.so b/demo/app/libs/arm64-v8a/libnama.so
diff --git a/demo/app/libs/armeabi-v7a/libksylive.so b/demo/app/libs/armeabi-v7a/libksylive.so
diff --git a/demo/app/libs/armeabi-v7a/libnama.so b/demo/app/libs/armeabi-v7a/libnama.so
diff --git a/demo/app/libs/armeabi/libksylive.so b/demo/app/libs/armeabi/libksylive.so
diff --git a/demo/app/libs/ksylive.jar b/demo/app/libs/ksylive.jar
diff --git a/demo/app/libs/libkmcfilter.jar b/demo/app/libs/libkmcfilter.jar
diff --git a/demo/app/libs/libksyplayer.jar b/demo/app/libs/libksyplayer.jar
diff --git a/demo/app/libs/libksystat.jar b/demo/app/libs/libksystat.jar
diff --git a/demo/app/libs/libksysv.jar b/demo/app/libs/libksysv.jar
diff --git a/demo/app/libs/nama.jar b/demo/app/libs/nama.jar
diff --git a/demo/app/libs/sensearsdk-release.aar b/demo/app/libs/sensearsdk-release.aar
diff --git a/demo/app/libs/x86/libksylive.so b/demo/app/libs/x86/libksylive.so
diff --git a/demo/app/libs/x86/libnama.so b/demo/app/libs/x86/libnama.so
diff --git a/demo/app/proguard-rules.pro b/demo/app/proguard-rules.pro
@@ -16,10 +16,51 @@
 #   public *;
 #}
 
+-optimizationpasses 5
+-dontusemixedcaseclassnames
+-dontskipnonpubliclibraryclasses
+-dontpreverify
+-allowaccessmodification
+-verbose
+-optimizations !code/simplification/arithmetic,!field/*,field/propagation/value,!class/merging/*,!code/allocation/variable
+
+-ignorewarnings
+-keepattributes EnclosingMethod
+-keepattributes InnerClasses
+-dontoptimize
+
 -keep class com.ksyun.** {
   *;
 }
 
 -keep class com.ksy.statlibrary.** {
   *;
 }
+
+-keep class com.ksyun.media.shortvideo.** {
+  *;
+}
+
+-keep class com.ksyun.media.kmcfilter.** {
+*;
+}
+
+-keep class com.sensetime.sensear.** {
+*;
+}
+
+-keep class com.sensetime.sensear.** {
+*;
+}
+
+-keep class com.googlecode.mp4parser.** {
+  *;
+}
+
+-keep class com.mp4parser.** {
+  *;
+}
+
+-keep class com.coremedia.iso.** {
+  *;
+}
diff --git a/demo/app/src/main/AndroidManifest.xml b/demo/app/src/main/AndroidManifest.xml
@@ -1,26 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="com.ksyun.media.shortvideo.demo"
-          xmlns:android="http://schemas.android.com/apk/res/android"
-          xmlns:tools="http://schemas.android.com/tools"
-          android:installLocation="preferExternal">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    package="com.ksyun.media.shortvideo.demo"
+    android:installLocation="preferExternal">
 
-    <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
-    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
-    <uses-permission android:name="android.permission.INTERNET"/>
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
-    <uses-permission android:name="android.permission.READ_PHONE_SINTERNETWIFI_STATE"/>
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
-    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
-    <uses-permission android:name="android.permission.CAMERA"/>
-    <uses-permission android:name="android.permission.RECORD_AUDIO"/>
-    <uses-permission android:name="android.permission.FLASHLIGHT"/>
+    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
+    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.READ_PHONE_SINTERNETWIFI_STATE" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+    <uses-permission android:name="android.permission.CAMERA" />
+    <uses-permission android:name="android.permission.RECORD_AUDIO" />
+    <uses-permission android:name="android.permission.FLASHLIGHT" />
     <uses-permission android:name="android.permission.READ_LOGS" />
 
-    <uses-feature android:name="android.hardware.camera"/>
-    <uses-feature android:name="android.hardware.camera.autofocus"/>
+    <uses-feature android:name="android.hardware.camera" />
+    <uses-feature android:name="android.hardware.camera.autofocus" />
 
-    <uses-permission android:name="android.permission.VIBRATE"/>
+    <uses-permission android:name="android.permission.VIBRATE" />
 
     <application
         android:name=".ExampleApplication"
@@ -38,41 +38,34 @@
         android:smallScreens="true"
         android:theme="@style/ThemeWithTitle"
         tools:replace="android:allowBackup,android:theme">
-
         <activity
-            android:name="com.ksyun.media.shortvideo.demo.ShortVideoActivity"
+            android:name=".ShortVideoActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:launchMode="singleTop"
             android:screenOrientation="portrait"
             android:theme="@style/Theme.RiseAnimation">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
+                <action android:name="android.intent.action.MAIN" />
 
-                <category android:name="android.intent.category.LAUNCHER"/>
+                <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-
         <activity
-            android:name="com.ksyun.media.shortvideo.demo.RecordActivity"
+            android:name=".RecordActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:launchMode="singleTop"
-            android:theme="@style/Theme.RiseAnimation">
-        </activity>
-
+            android:theme="@style/Theme.RiseAnimation"></activity>
         <activity
-            android:name="com.ksyun.media.shortvideo.demo.EditActivity"
+            android:name=".EditActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:launchMode="singleTop"
-            android:theme="@style/Theme.RiseAnimation">
-        </activity>
-
+            android:theme="@style/Theme.RiseAnimation"></activity>
         <activity
-            android:name="com.ksyun.media.shortvideo.demo.FileImportActivity"
+            android:name=".FileImportActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:launchMode="singleTop"
-            android:theme="@style/Theme.RiseAnimation">
-        </activity>
-
-
+            android:theme="@style/Theme.RiseAnimation"></activity>
+        <activity android:name=".ConfigActivity"></activity>
     </application>
+
 </manifest>
diff --git a/demo/app/src/main/assets/Faceunity/face_beautification.mp3 b/demo/app/src/main/assets/Faceunity/face_beautification.mp3
diff --git a/demo/app/src/main/assets/Faceunity/v3.mp3 b/demo/app/src/main/assets/Faceunity/v3.mp3