Merge pull request #81 from ksvc/updateVer_2.0.0

update ver to 2.0.0
ksvc · Dec 11, 2017 · a5341ff · a5341ff
2 parents 400e90c + 26ddaa5
commit a5341ff
Show file tree

Hide file tree

Showing 115 changed files with 39,623 additions and 3,645 deletions.
diff --git a/demo/app/build.gradle b/demo/app/build.gradle
@@ -1,14 +1,14 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 24
-    buildToolsVersion '25.0.0'
+    compileSdkVersion 27
+    buildToolsVersion '27.0.1'
     defaultConfig {
         applicationId "com.ksyun.media.shortvideo.demo"
         minSdkVersion 19
-        targetSdkVersion 24
-        versionCode 153
-        versionName "1.5.3"
+        targetSdkVersion 27
+        versionCode 200
+        versionName "2.0.0.2"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     sourceSets {
@@ -25,24 +25,24 @@ android {
 }
 
 dependencies {
-    compile fileTree(include: ['*.jar'], dir: 'libs')
-    compile 'com.android.support:appcompat-v7:24.2.1'
-    compile 'com.android.volley:volley:1.0.0'
-    compile 'com.android.support:recyclerview-v7:24.2.1'
-    compile 'com.nostra13.universalimageloader:universal-image-loader:1.9.4'
-    compile 'com.ksyun.ks3:ks3androidsdk:1.4.1'
-    compile 'com.tencent.bugly:crashreport:latest.release'
-    compile 'com.tencent.bugly:nativecrashreport:latest.release'
+    api fileTree(include: ['*.jar'], dir: 'libs')
+    implementation 'com.android.support:appcompat-v7:27.0.1'
+    implementation 'com.android.volley:volley:1.0.0'
+    implementation 'com.android.support:recyclerview-v7:27.0.1'
+    implementation 'com.nostra13.universalimageloader:universal-image-loader:1.9.4'
+    implementation 'com.ksyun.ks3:ks3androidsdk:1.4.1'
+    implementation 'com.tencent.bugly:crashreport:latest.release'
+    implementation 'com.tencent.bugly:nativecrashreport:latest.release'
     //录制魔方动态贴纸依赖库，若不使用，可以不依赖
-    compile 'com.ksyun.mc:libkmcfilter_sensetime:1.0.5'
-    compile 'com.ksyun.mc:SenseTimeAR:1.0.4'
+    implementation 'com.ksyun.mc:libkmcfilter_sensetime:1.0.5'
+    implementation 'com.ksyun.mc:SenseTimeAR:1.0.4'
     //动态贴纸依赖库，若不使用，使用provided
-    compile 'com.facebook.fresco:fresco:1.4.0'
-    compile 'com.facebook.fresco:animated-gif:1.4.0'
-    compile 'com.facebook.fresco:animated-webp:1.4.0'
-    compile 'com.lht:paintview:1.17'
-    compile 'com.ksyun.media:libksysv-java:1.5.3'
-    compile 'com.ksyun.media:libksysv-arm64:1.5.3'
-    compile 'com.ksyun.media:libksysv-armv7a:1.5.3'
-    compile 'com.ksyun.media:libksysv-x86:1.5.3'
+    implementation 'com.facebook.fresco:fresco:1.4.0'
+    implementation 'com.facebook.fresco:animated-gif:1.4.0'
+    implementation 'com.facebook.fresco:animated-webp:1.4.0'
+    implementation 'com.lht:paintview:1.17'
+    compile 'com.ksyun.media:libksysv-java:2.0.0'
+    compile 'com.ksyun.media:libksysv-arm64:2.0.0'
+    compile 'com.ksyun.media:libksysv-armv7a:2.0.0'
+    compile 'com.ksyun.media:libksysv-x86:2.0.0'
 }
diff --git a/demo/app/src/main/AndroidManifest.xml b/demo/app/src/main/AndroidManifest.xml
@@ -75,6 +75,12 @@
         <activity
             android:name=".MediaImportActivity"
             android:screenOrientation="portrait"/>
+        <activity
+            android:name=".MultiImportActivity"
+            android:configChanges="orientation|keyboardHidden|screenSize"
+            android:launchMode="singleTop"
+            android:screenOrientation="portrait"
+            android:theme="@style/Theme.RiseAnimation" />
     </application>
 
 </manifest>
diff --git a/demo/app/src/main/assets/AuthForTest.pkg b/demo/app/src/main/assets/AuthForTest.pkg
@@ -1 +1 @@
-h1iuRSzMW60Iwm2XzBzu40UnPMP4Td2X2Ab5JAKtfDD3kzmND4Hc6McUvbtvI+TVSRmMsXYCynqIqMnlzLtS+srE1B4bkh4ZQ5GxVttDe2ldWspDUxwBdEk+8fI3l11UhZXZZh2XEoJ2reqytoneKQbVIqt7UrZFd4Wx9a6Tpp4=Xui2+6P93Tqkc5tQjqsJA5rYa78Hup+XtbjfR60mlKYlKbzqJSWwIL1w+abS+9dg/8Cbzc3/DxplTq0ssYnL+RC+9kZMcml7B5ABB7Ua9KvongVvRwUbBjX9MDu5SA0JulsqK6COoGWf7zr0ln/OOHgIIW6/WD8sbpOoM6osmXE=
+gjratXxPSEOoqB5+iMYraj9VWs7N/Z2ak7rhvIAmEb+PD5kb/NF2b5GlT0XLnRfTjB90VrOWdAnkpCaPEEc2KMO0Sv0pzmOBkdVf5164RaVPPFaRjZyTgPrKC+KeebcbS+tbpuC2ub1MhjqjjC7xAy/+qvMviS8TmalJiYg/OZo=PrjZGIqFjrA3E/FWrm2tu6QgBBCTw5vYR36VxRKgWk6Wct3jFrzn6nU1XHcGxV5xuB7HpTQiiduLPUdve2gNgFN4ApcAx55as68DcdUXXiv+TGEeNwR0lmjFP0YtrqyJJ56Snc/Oc0E+2DN6H5dheb2LqIQ4dDHH/xnqbuyU1kI=