Skip to content

Commit

Permalink
支持 AndroidX
Browse files Browse the repository at this point in the history
  • Loading branch information
@microshow
microshow committed Dec 6, 2019
1 parent 61dac68 commit 60815a5
Show file tree
Hide file tree
Showing 11 changed files with 107 additions and 19 deletions.
14 changes: 9 additions & 5 deletions app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,11 @@ android {
enabled = true
}

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}

sourceSets {
main {
jniLibs.srcDirs = ['libs']
Expand All @@ -60,17 +65,16 @@ android {

dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation "com.android.support:appcompat-v7:${rootProject.ext.supportLibValue}"
implementation 'com.android.support.constraint:constraint-layout:1.1.3'
testImplementation 'junit:junit:4.12'
androidTestImplementation 'com.android.support.test:runner:1.0.2'
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'

implementation 'androidx.constraintlayout:constraintlayout:1.1.3'

//动态权限
implementation 'com.github.tbruyelle:rxpermissions:0.10.2'
//baidu mtj-sdk
implementation 'com.baidu.mobstat:mtj-sdk-circle:3.9.3.9'

implementation 'com.airbnb.android:lottie:3.3.0'

implementation project(path: ':rxffmpeg')

// implementation 'com.github.microshow:RxFFmpeg:2.1.0'
Expand Down
6 changes: 5 additions & 1 deletion app/src/main/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,18 @@
android:supportsRtl="true"
android:theme="@style/AppTheme"
tools:ignore="GoogleAppIndexingWarning">
<activity android:name="io.microshow.rxffmpeg.app.MainActivity">

<activity android:name="io.microshow.rxffmpeg.app.LaunchActivity"
android:theme="@style/AppTheme.Launcher">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>

<activity android:name="io.microshow.rxffmpeg.app.MainActivity" />


<!-- 记录崩溃日志 -->
<!-- ########################## baidu mtj-sdk start ##########################-->
Expand Down
1 change: 1 addition & 0 deletions app/src/main/assets/colorline.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"v":"4.6.3","fr":25,"ip":0,"op":42,"w":240,"h":120,"nm":"colorLine_export","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"speedLine 8","ks":{"o":{"a":0,"k":100},"r":{"a":0,"k":0},"p":{"a":0,"k":[71.417,24.291,0]},"a":{"a":0,"k":[202.006,21,0]},"s":{"a":0,"k":[100,100,100]}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[143.14,58],[202.86,21]],"c":false}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"st","c":{"a":0,"k":[0.6823529,1,0,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":3},"lc":1,"lj":1,"ml":4,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke"},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Shape 1","np":3,"cix":2,"ix":1,"mn":"ADBE Vector Group"},{"ty":"tm","s":{"a":1,"k":[{"i":{"x":[0.1],"y":[1]},"o":{"x":[0.9],"y":[0]},"n":["0p1_1_0p9_0"],"t":1,"s":[0],"e":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.9],"y":[0.9]},"n":["0p833_0p833_0p9_0p9"],"t":9,"s":[100],"e":[100]},{"i":{"x":[0.1],"y":[1]},"o":{"x":[0.167],"y":[0]},"n":["0p1_1_0p167_0"],"t":11,"s":[100],"e":[0]},{"i":{"x":[0.1],"y":[1]},"o":{"x":[0.9],"y":[0]},"n":["0p1_1_0p9_0"],"t":12,"s":[0],"e":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.9],"y":[0.9]},"n":["0p833_0p833_0p9_0p9"],"t":20,"s":[100],"e":[100]},{"i":{"x":[0.1],"y":[1]},"o":{"x":[0.167],"y":[0]},"n":["0p1_1_0p167_0"],"t":22,"s":[100],"e":[0]},{"i":{"x":[0.1],"y":[1]},"o":{"x":[0.9],"y":[0]},"n":["0p1_1_0p9_0"],"t":23,"s":[0],"e":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.9],"y":[0.9]},"n":["0p833_0p833_0p9_0p9"],"t":31,"s":[100],"e":[100]},{"i":{"x":[0.1],"y":[1]},"o":{"x":[0.167],"y":[0]},"n":["0p1_1_0p167_0"],"t":33,"s":[100],"e":[0]},{"i":{"x":[0.1],"y":[1]},"o":{"x":[0.9],"y":[0]},"n":["0p1_1_0p9_0"],"t":34,"s":[0],"e":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.9],"y":[0.9]},"n":["0p833_0p833_0p9_0p9"],"t":42,"s":[100],"e":[100]},{"t":44}],"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":1,"s":[0],"e":[0]},{"i":{"x":[0.1],"y":[1]},"o":{"x":[0.9],"y":[0]},"n":["0p1_1_0p9_0"],"t":3,"s":[0],"e":[100]},{"i":{"x":[0.833],"y":[1]},"o":{"x":[0.167],"y":[0]},"n":["0p833_1_0p167_0"],"t":11,"s":[100],"e":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":12,"s":[0],"e":[0]},{"i":{"x":[0.1],"y":[1]},"o":{"x":[0.9],"y":[0]},"n":["0p1_1_0p9_0"],"t":14,"s":[0],"e":[100]},{"i":{"x":[0.833],"y":[1]},"o":{"x":[0.167],"y":[0]},"n":["0p833_1_0p167_0"],"t":22,"s":[100],"e":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":23,"s":[0],"e":[0]},{"i":{"x":[0.1],"y":[1]},"o":{"x":[0.9],"y":[0]},"n":["0p1_1_0p9_0"],"t":25,"s":[0],"e":[100]},{"i":{"x":[0.833],"y":[1]},"o":{"x":[0.167],"y":[0]},"n":["0p833_1_0p167_0"],"t":33,"s":[100],"e":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":34,"s":[0],"e":[0]},{"i":{"x":[0.1],"y":[1]},"o":{"x":[0.9],"y":[0]},"n":["0p1_1_0p9_0"],"t":36,"s":[0],"e":[100]},{"t":44}],"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim"}],"ip":1,"op":276,"st":-24,"bm":0,"sr":1},{"ddd":0,"ind":2,"ty":4,"nm":"speedLine 7","ks":{"o":{"a":0,"k":100},"r":{"a":0,"k":0},"p":{"a":0,"k":[130.412,40.291,0]},"a":{"a":0,"k":[167.027,43.2,0]},"s":{"a":0,"k":[100,100,100]}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[127,68],[219,11]],"c":false}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"st","c":{"a":0,"k":[0.4470591,0,1,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":3},"lc":1,"lj":1,"ml":4,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke"},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Shape 1","np":3,"cix":2,"ix":1,"mn":"ADBE Vector Group"},{"ty":"tm","s":{"a":1,"k":[{"i":{"x":[0.1],"y":[1]},"o":{"x":[0.9],"y":[0]},"n":["0p1_1_0p9_0"],"t":0.5,"s":[0],"e":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.9],"y":[0.9]},"n":["0p833_0p833_0p9_0p9"],"t":6.5,"s":[100],"e":[100]},{"i":{"x":[0.1],"y":[1]},"o":{"x":[0.167],"y":[0]},"n":["0p1_1_0p167_0"],"t":8.5,"s":[100],"e":[0]},{"i":{"x":[0.1],"y":[1]},"o":{"x":[0.9],"y":[0]},"n":["0p1_1_0p9_0"],"t":9,"s":[0],"e":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.9],"y":[0.9]},"n":["0p833_0p833_0p9_0p9"],"t":17,"s":[100],"e":[100]},{"i":{"x":[0.1],"y":[1]},"o":{"x":[0.167],"y":[0]},"n":["0p1_1_0p167_0"],"t":19,"s":[100],"e":[0]},{"i":{"x":[0.1],"y":[1]},"o":{"x":[0.9],"y":[0]},"n":["0p1_1_0p9_0"],"t":20,"s":[0],"e":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.9],"y":[0.9]},"n":["0p833_0p833_0p9_0p9"],"t":28,"s":[100],"e":[100]},{"i":{"x":[0.1],"y":[1]},"o":{"x":[0.167],"y":[0]},"n":["0p1_1_0p167_0"],"t":30,"s":[100],"e":[0]},{"i":{"x":[0.1],"y":[1]},"o":{"x":[0.9],"y":[0]},"n":["0p1_1_0p9_0"],"t":31,"s":[0],"e":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.9],"y":[0.9]},"n":["0p833_0p833_0p9_0p9"],"t":39,"s":[100],"e":[100]},{"i":{"x":[0.1],"y":[1]},"o":{"x":[0.167],"y":[0]},"n":["0p1_1_0p167_0"],"t":41,"s":[100],"e":[0]},{"i":{"x":[0.1],"y":[1]},"o":{"x":[0.9],"y":[0]},"n":["0p1_1_0p9_0"],"t":42,"s":[0],"e":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.9],"y":[0.9]},"n":["0p833_0p833_0p9_0p9"],"t":50,"s":[100],"e":[100]},{"t":52}],"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":0.5,"s":[0],"e":[0]},{"i":{"x":[0.1],"y":[1]},"o":{"x":[0.9],"y":[0]},"n":["0p1_1_0p9_0"],"t":2.5,"s":[0],"e":[100]},{"i":{"x":[0.833],"y":[1]},"o":{"x":[0.167],"y":[0]},"n":["0p833_1_0p167_0"],"t":8.5,"s":[100],"e":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":9,"s":[0],"e":[0]},{"i":{"x":[0.1],"y":[1]},"o":{"x":[0.9],"y":[0]},"n":["0p1_1_0p9_0"],"t":11,"s":[0],"e":[100]},{"i":{"x":[0.833],"y":[1]},"o":{"x":[0.167],"y":[0]},"n":["0p833_1_0p167_0"],"t":19,"s":[100],"e":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":20,"s":[0],"e":[0]},{"i":{"x":[0.1],"y":[1]},"o":{"x":[0.9],"y":[0]},"n":["0p1_1_0p9_0"],"t":22,"s":[0],"e":[100]},{"i":{"x":[0.833],"y":[1]},"o":{"x":[0.167],"y":[0]},"n":["0p833_1_0p167_0"],"t":30,"s":[100],"e":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":31,"s":[0],"e":[0]},{"i":{"x":[0.1],"y":[1]},"o":{"x":[0.9],"y":[0]},"n":["0p1_1_0p9_0"],"t":33,"s":[0],"e":[100]},{"i":{"x":[0.833],"y":[1]},"o":{"x":[0.167],"y":[0]},"n":["0p833_1_0p167_0"],"t":41,"s":[100],"e":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":42,"s":[0],"e":[0]},{"i":{"x":[0.1],"y":[1]},"o":{"x":[0.9],"y":[0]},"n":["0p1_1_0p9_0"],"t":44,"s":[0],"e":[100]},{"t":52}],"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim"}],"ip":0.5,"op":275.5,"st":-24.5,"bm":0,"sr":1},{"ddd":0,"ind":3,"ty":4,"nm":"speedLine 6","ks":{"o":{"a":0,"k":100},"r":{"a":0,"k":0},"p":{"a":0,"k":[147.439,66.491,0]},"a":{"a":0,"k":[167.027,43.2,0]},"s":{"a":0,"k":[100,100,100]}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[127,68],[219,11]],"c":false}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"st","c":{"a":0,"k":[0,1,0.9882352,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":3},"lc":1,"lj":1,"ml":4,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke"},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Shape 1","np":3,"cix":2,"ix":1,"mn":"ADBE Vector Group"},{"ty":"tm","s":{"a":1,"k":[{"i":{"x":[0.16],"y":[1]},"o":{"x":[0.84],"y":[0]},"n":["0p16_1_0p84_0"],"t":2,"s":[0],"e":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.9],"y":[0.9]},"n":["0p833_0p833_0p9_0p9"],"t":8,"s":[100],"e":[100]},{"i":{"x":[0.1],"y":[1]},"o":{"x":[0.167],"y":[0]},"n":["0p1_1_0p167_0"],"t":10,"s":[100],"e":[0]},{"i":{"x":[0.16],"y":[1]},"o":{"x":[0.84],"y":[0]},"n":["0p16_1_0p84_0"],"t":11,"s":[0],"e":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.9],"y":[0.9]},"n":["0p833_0p833_0p9_0p9"],"t":17,"s":[100],"e":[100]},{"i":{"x":[0.1],"y":[1]},"o":{"x":[0.167],"y":[0]},"n":["0p1_1_0p167_0"],"t":19,"s":[100],"e":[0]},{"i":{"x":[0.16],"y":[1]},"o":{"x":[0.84],"y":[0]},"n":["0p16_1_0p84_0"],"t":20,"s":[0],"e":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.9],"y":[0.9]},"n":["0p833_0p833_0p9_0p9"],"t":26,"s":[100],"e":[100]},{"i":{"x":[0.1],"y":[1]},"o":{"x":[0.167],"y":[0]},"n":["0p1_1_0p167_0"],"t":28,"s":[100],"e":[0]},{"i":{"x":[0.16],"y":[1]},"o":{"x":[0.84],"y":[0]},"n":["0p16_1_0p84_0"],"t":29,"s":[0],"e":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.9],"y":[0.9]},"n":["0p833_0p833_0p9_0p9"],"t":35,"s":[100],"e":[100]},{"t":37}],"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":2,"s":[0],"e":[0]},{"i":{"x":[0.16],"y":[1]},"o":{"x":[0.84],"y":[0]},"n":["0p16_1_0p84_0"],"t":4,"s":[0],"e":[100]},{"i":{"x":[0.833],"y":[1]},"o":{"x":[0.167],"y":[0]},"n":["0p833_1_0p167_0"],"t":10,"s":[100],"e":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":11,"s":[0],"e":[0]},{"i":{"x":[0.16],"y":[1]},"o":{"x":[0.84],"y":[0]},"n":["0p16_1_0p84_0"],"t":13,"s":[0],"e":[100]},{"i":{"x":[0.833],"y":[1]},"o":{"x":[0.167],"y":[0]},"n":["0p833_1_0p167_0"],"t":19,"s":[100],"e":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":20,"s":[0],"e":[0]},{"i":{"x":[0.16],"y":[1]},"o":{"x":[0.84],"y":[0]},"n":["0p16_1_0p84_0"],"t":22,"s":[0],"e":[100]},{"i":{"x":[0.833],"y":[1]},"o":{"x":[0.167],"y":[0]},"n":["0p833_1_0p167_0"],"t":28,"s":[100],"e":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":29,"s":[0],"e":[0]},{"i":{"x":[0.16],"y":[1]},"o":{"x":[0.84],"y":[0]},"n":["0p16_1_0p84_0"],"t":31,"s":[0],"e":[100]},{"t":37}],"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim"}],"ip":2,"op":277,"st":-23,"bm":0,"sr":1},{"ddd":0,"ind":4,"ty":4,"nm":"speedLine 5","ks":{"o":{"a":0,"k":100},"r":{"a":0,"k":0},"p":{"a":0,"k":[133.412,46.291,0]},"a":{"a":0,"k":[127,11,0]},"s":{"a":0,"k":[100,100,100]}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[127,68],[219,11]],"c":false}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"st","c":{"a":0,"k":[1,0.8499999,0,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":4},"lc":1,"lj":1,"ml":4,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke"},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Shape 1","np":3,"cix":2,"ix":1,"mn":"ADBE Vector Group"},{"ty":"tm","s":{"a":1,"k":[{"i":{"x":[0.16],"y":[1]},"o":{"x":[0.84],"y":[0]},"n":["0p16_1_0p84_0"],"t":0,"s":[0],"e":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.9],"y":[0.9]},"n":["0p833_0p833_0p9_0p9"],"t":5,"s":[100],"e":[100]},{"i":{"x":[0.1],"y":[1]},"o":{"x":[0.167],"y":[0]},"n":["0p1_1_0p167_0"],"t":7,"s":[100],"e":[0]},{"i":{"x":[0.16],"y":[1]},"o":{"x":[0.84],"y":[0]},"n":["0p16_1_0p84_0"],"t":8,"s":[0],"e":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.9],"y":[0.9]},"n":["0p833_0p833_0p9_0p9"],"t":13,"s":[100],"e":[100]},{"i":{"x":[0.1],"y":[1]},"o":{"x":[0.167],"y":[0]},"n":["0p1_1_0p167_0"],"t":15,"s":[100],"e":[0]},{"i":{"x":[0.16],"y":[1]},"o":{"x":[0.84],"y":[0]},"n":["0p16_1_0p84_0"],"t":16,"s":[0],"e":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.9],"y":[0.9]},"n":["0p833_0p833_0p9_0p9"],"t":21,"s":[100],"e":[100]},{"i":{"x":[0.1],"y":[1]},"o":{"x":[0.167],"y":[0]},"n":["0p1_1_0p167_0"],"t":23,"s":[100],"e":[0]},{"i":{"x":[0.16],"y":[1]},"o":{"x":[0.84],"y":[0]},"n":["0p16_1_0p84_0"],"t":24,"s":[0],"e":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.9],"y":[0.9]},"n":["0p833_0p833_0p9_0p9"],"t":29,"s":[100],"e":[100]},{"i":{"x":[0.1],"y":[1]},"o":{"x":[0.167],"y":[0]},"n":["0p1_1_0p167_0"],"t":31,"s":[100],"e":[0]},{"i":{"x":[0.16],"y":[1]},"o":{"x":[0.84],"y":[0]},"n":["0p16_1_0p84_0"],"t":32,"s":[0],"e":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.9],"y":[0.9]},"n":["0p833_0p833_0p9_0p9"],"t":37,"s":[100],"e":[100]},{"t":39}],"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":0,"s":[0],"e":[0]},{"i":{"x":[0.16],"y":[1]},"o":{"x":[0.84],"y":[0]},"n":["0p16_1_0p84_0"],"t":2,"s":[0],"e":[100]},{"i":{"x":[0.833],"y":[1]},"o":{"x":[0.167],"y":[0]},"n":["0p833_1_0p167_0"],"t":7,"s":[100],"e":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":8,"s":[0],"e":[0]},{"i":{"x":[0.16],"y":[1]},"o":{"x":[0.84],"y":[0]},"n":["0p16_1_0p84_0"],"t":10,"s":[0],"e":[100]},{"i":{"x":[0.833],"y":[1]},"o":{"x":[0.167],"y":[0]},"n":["0p833_1_0p167_0"],"t":15,"s":[100],"e":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":16,"s":[0],"e":[0]},{"i":{"x":[0.16],"y":[1]},"o":{"x":[0.84],"y":[0]},"n":["0p16_1_0p84_0"],"t":18,"s":[0],"e":[100]},{"i":{"x":[0.833],"y":[1]},"o":{"x":[0.167],"y":[0]},"n":["0p833_1_0p167_0"],"t":23,"s":[100],"e":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":24,"s":[0],"e":[0]},{"i":{"x":[0.16],"y":[1]},"o":{"x":[0.84],"y":[0]},"n":["0p16_1_0p84_0"],"t":26,"s":[0],"e":[100]},{"i":{"x":[0.833],"y":[1]},"o":{"x":[0.167],"y":[0]},"n":["0p833_1_0p167_0"],"t":31,"s":[100],"e":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":32,"s":[0],"e":[0]},{"i":{"x":[0.16],"y":[1]},"o":{"x":[0.84],"y":[0]},"n":["0p16_1_0p84_0"],"t":34,"s":[0],"e":[100]},{"t":39}],"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim"}],"ip":0,"op":275,"st":-25,"bm":0,"sr":1}]}
46 changes: 46 additions & 0 deletions app/src/main/java/io/microshow/rxffmpeg/app/LaunchActivity.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
package io.microshow.rxffmpeg.app;

import android.content.Intent;
import android.os.Bundle;

import java.util.concurrent.TimeUnit;

import androidx.annotation.Nullable;
import androidx.appcompat.app.AppCompatActivity;
import androidx.databinding.DataBindingUtil;
import io.reactivex.Flowable;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.disposables.Disposable;

/**
* 启动页
* Created by Super on 2019/12/6.
*/
public class LaunchActivity extends AppCompatActivity {

private Disposable mDisposable;

@Override
protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);

DataBindingUtil.setContentView(this, R.layout.activity_launch);

mDisposable = Flowable.timer(3500, TimeUnit.MILLISECONDS)
.observeOn(AndroidSchedulers.mainThread())
.subscribe(next -> {
startActivity(new Intent(LaunchActivity.this, MainActivity.class));
finish();
});

}

@Override
protected void onDestroy() {
super.onDestroy();
if (mDisposable != null) {
mDisposable.dispose();
}
}

}
4 changes: 2 additions & 2 deletions app/src/main/java/io/microshow/rxffmpeg/app/MainActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
import android.Manifest;
import android.annotation.SuppressLint;
import android.app.ProgressDialog;
import android.databinding.DataBindingUtil;
import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
import android.view.View;
import android.widget.Toast;

import com.baidu.mobstat.StatService;
import com.tbruyelle.rxpermissions2.RxPermissions;

import androidx.appcompat.app.AppCompatActivity;
import androidx.databinding.DataBindingUtil;
import io.microshow.rxffmpeg.RxFFmpegInvoke;
import io.microshow.rxffmpeg.RxFFmpegSubscriber;
import io.microshow.rxffmpeg.app.databinding.ActivityMainBinding;
Expand Down
21 changes: 21 additions & 0 deletions app/src/main/res/layout/activity_launch.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">

<FrameLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#FFF">

<com.airbnb.lottie.LottieAnimationView
android:id="@+id/lottieAnimationView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
app:lottie_fileName="colorline.json"
app:lottie_loop="true"
app:lottie_autoPlay="true" />

</FrameLayout>

</layout>
Loading

0 comments on commit 60815a5

Please sign in to comment.