Skip to content

Commit afd6a87

Browse files
xufuji456xufuji456
committed
choose kotlin or java
1 parent 7984cce commit afd6a87

10 files changed

Lines changed: 144 additions & 53 deletions

File tree

‎app/src/main/AndroidManifest.xml‎

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,15 @@
2020
android:screenOrientation="landscape"
2121
android:supportsRtl="true"
2222
android:theme="@style/AppTheme">
23-
<activity android:name=".activity.MainActivity">
23+
<activity android:name=".activity.LauncherActivity">
2424
<intent-filter>
2525
<action android:name="android.intent.action.MAIN" />
2626
<action android:name="android.intent.action.VIEW"/>
2727
<category android:name="android.intent.category.LAUNCHER" />
2828
</intent-filter>
2929
</activity>
30+
<activity android:name=".activity.MainActivity">
31+
</activity>
3032
<!-- 音频处理 -->
3133
<activity android:name=".activity.AudioHandleActivity" />
3234
<!-- 音视频处理 -->
@@ -54,6 +56,25 @@
5456
<!--检测多媒体格式数据-->
5557
<activity android:name=".activity.ProbeFormatActivity"
5658
android:screenOrientation="portrait" />
59+
60+
<activity android:name=".kotlin.activity.MainKotlinActivity">
61+
</activity>
62+
<activity android:name=".kotlin.activity.AudioHandleActivity" />
63+
<activity android:name=".kotlin.activity.MediaHandleActivity" />
64+
<activity android:name=".kotlin.activity.VideoHandleActivity" />
65+
<activity
66+
android:name=".kotlin.activity.MediaPlayerActivity"
67+
android:screenOrientation="landscape" />
68+
<activity android:name=".kotlin.activity.PushActivity" />
69+
<activity
70+
android:name=".kotlin.activity.LiveActivity"
71+
android:screenOrientation="portrait" />
72+
<activity
73+
android:name=".kotlin.activity.FilterActivity"
74+
android:screenOrientation="landscape" />
75+
<activity android:name=".kotlin.activity.VideoPreviewActivity" />
76+
<activity android:name=".kotlin.activity.ProbeFormatActivity" />
77+
5778
</application>
5879

5980
</manifest>

‎app/src/main/java/com/frank/ffmpeg/activity/LauncherActivity.java‎

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
package com.frank.ffmpeg.activity;
2+
3+
import android.content.Intent;
4+
import android.os.Bundle;
5+
import android.util.DisplayMetrics;
6+
import android.view.View;
7+
import android.view.animation.Animation;
8+
import android.view.animation.TranslateAnimation;
9+
import android.widget.ImageView;
10+
import android.widget.TextView;
11+
12+
import com.frank.ffmpeg.R;
13+
import com.frank.ffmpeg.kotlin.activity.MainKotlinActivity;
14+
15+
/**
16+
* 启动页面
17+
* Created by frank on 2020/2/28.
18+
*/
19+
public class LauncherActivity extends BaseActivity {
20+
21+
private final static boolean useKotlin = true;
22+
23+
@Override
24+
int getLayoutId() {
25+
return R.layout.activity_launcher;
26+
}
27+
28+
@Override
29+
protected void onCreate(Bundle savedInstanceState) {
30+
super.onCreate(savedInstanceState);
31+
32+
initView();
33+
}
34+
35+
private void initView() {
36+
ImageView imgFFmpeg = getView(R.id.img_ffmpeg);
37+
TextView txtAndroid = getView(R.id.txt_android);
38+
DisplayMetrics metrics = new DisplayMetrics();
39+
getWindowManager().getDefaultDisplay().getMetrics(metrics);
40+
int height = metrics.heightPixels;
41+
height /= 2;
42+
TranslateAnimation animationDown = new TranslateAnimation(0, 0, -height, 0);
43+
animationDown.setDuration(1500);
44+
imgFFmpeg.setAnimation(animationDown);
45+
animationDown.setAnimationListener(new Animation.AnimationListener() {
46+
@Override
47+
public void onAnimationStart(Animation animation) {
48+
49+
}
50+
51+
@Override
52+
public void onAnimationEnd(Animation animation) {
53+
LauncherActivity.this.finish();
54+
jumpToMain();
55+
}
56+
57+
@Override
58+
public void onAnimationRepeat(Animation animation) {
59+
60+
}
61+
});
62+
animationDown.start();
63+
TranslateAnimation animationUp = new TranslateAnimation(0, 0, height, 0);
64+
animationUp.setDuration(1500);
65+
txtAndroid.setAnimation(animationUp);
66+
animationUp.start();
67+
}
68+
69+
private void jumpToMain() {
70+
Intent intent = new Intent();
71+
intent.setClass(LauncherActivity.this, useKotlin ? MainKotlinActivity.class : MainActivity.class);
72+
startActivity(intent);
73+
}
74+
75+
@Override
76+
public void onViewClick(View v) {
77+
78+
}
79+
80+
@Override
81+
void onSelectedFile(String filePath) {
82+
83+
}
84+
85+
}

app/src/main/java/com/frank/ffmpeg/kotlin/activity/MainActivity.kt renamed to app/src/main/java/com/frank/ffmpeg/kotlin/activity/MainKotlinActivity.kt

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package com.frank.ffmpeg.kotlin.activity
22

33
import android.content.Intent
44
import android.os.Bundle
5+
import android.util.Log
56
import android.view.View
67

78
import com.frank.ffmpeg.R
@@ -10,7 +11,7 @@ import com.frank.ffmpeg.R
1011
* 使用ffmpeg进行音视频处理入口
1112
* Created by frank on 2018/1/23.
1213
*/
13-
class MainActivity : BaseActivity() {
14+
class MainKotlinActivity : BaseActivity() {
1415

1516
override val layoutId: Int
1617
get() = R.layout.activity_main
@@ -29,29 +30,30 @@ class MainActivity : BaseActivity() {
2930
R.id.btn_preview,
3031
R.id.btn_probe
3132
)
33+
Log.e("MainKotlinActivity", "Welcome to kotlin...")
3234
}
3335

3436
public override fun onViewClick(view: View) {
3537
val intent = Intent()
3638
when (view.id) {
3739
R.id.btn_audio//音频处理
38-
-> intent.setClass(this@MainActivity, AudioHandleActivity::class.java)
40+
-> intent.setClass(this@MainKotlinActivity, AudioHandleActivity::class.java)
3941
R.id.btn_video//视频处理
40-
-> intent.setClass(this@MainActivity, VideoHandleActivity::class.java)
42+
-> intent.setClass(this@MainKotlinActivity, VideoHandleActivity::class.java)
4143
R.id.btn_media//音视频处理
42-
-> intent.setClass(this@MainActivity, MediaHandleActivity::class.java)
44+
-> intent.setClass(this@MainKotlinActivity, MediaHandleActivity::class.java)
4345
R.id.btn_play//音视频播放
44-
-> intent.setClass(this@MainActivity, MediaPlayerActivity::class.java)
46+
-> intent.setClass(this@MainKotlinActivity, MediaPlayerActivity::class.java)
4547
R.id.btn_push//FFmpeg推流
46-
-> intent.setClass(this@MainActivity, PushActivity::class.java)
48+
-> intent.setClass(this@MainKotlinActivity, PushActivity::class.java)
4749
R.id.btn_live//实时推流直播:AAC音频编码、H264视频编码、RTMP推流
48-
-> intent.setClass(this@MainActivity, LiveActivity::class.java)
50+
-> intent.setClass(this@MainKotlinActivity, LiveActivity::class.java)
4951
R.id.btn_filter//滤镜特效
50-
-> intent.setClass(this@MainActivity, FilterActivity::class.java)
52+
-> intent.setClass(this@MainKotlinActivity, FilterActivity::class.java)
5153
R.id.btn_preview//视频拖动实时预览
52-
-> intent.setClass(this@MainActivity, VideoPreviewActivity::class.java)
54+
-> intent.setClass(this@MainKotlinActivity, VideoPreviewActivity::class.java)
5355
R.id.btn_probe//解析音视频多媒体格式
54-
-> intent.setClass(this@MainActivity, ProbeFormatActivity::class.java)
56+
-> intent.setClass(this@MainKotlinActivity, ProbeFormatActivity::class.java)
5557
else -> {
5658
}
5759
}

‎app/src/main/res/drawable/btn.xml‎

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎app/src/main/res/drawable/btn_circle.xml‎

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎app/src/main/res/drawable/btn_point.xml‎

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎app/src/main/res/drawable/icon_ffmpeg.jpeg‎

9.04 KB
Loading

‎app/src/main/res/drawable/white_background.xml‎

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎app/src/main/res/layout/activity_launcher.xml‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
3+
android:orientation="vertical" android:layout_width="match_parent"
4+
android:layout_height="match_parent">
5+
6+
<ImageView
7+
android:id="@+id/img_ffmpeg"
8+
android:layout_width="400dp"
9+
android:layout_height="300dp"
10+
android:src="@drawable/icon_ffmpeg"
11+
android:layout_centerInParent="true"/>
12+
13+
<TextView
14+
android:id="@+id/txt_android"
15+
android:layout_width="wrap_content"
16+
android:layout_height="wrap_content"
17+
android:layout_centerHorizontal="true"
18+
android:layout_below="@+id/img_ffmpeg"
19+
android:text="@string/text_android"
20+
android:textColor="@color/colorPrimary"
21+
android:textSize="35sp"
22+
android:textStyle="bold"/>
23+
24+
</RelativeLayout>

‎app/src/main/res/values/strings.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,5 +72,6 @@
7272
<string name="wrong_video_format">非视频文件</string>
7373
<string name="converting_video">正在反转视频&#8230;</string>
7474
<string name="tip_not_mp4_video">该视频不是mp4,无法进行moov前移操作</string>
75+
<string name="text_android">Android</string>
7576

7677
</resources>

0 commit comments

Comments
 (0)