Skip to content

Commit

Permalink
更新readme
Browse files Browse the repository at this point in the history
  • Loading branch information
AnJoiner committed Feb 9, 2021
1 parent 0b56a46 commit b40ade0
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 13 deletions.
2 changes: 1 addition & 1 deletion README-CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ android {

|方法 |功能 |
|:---|----|
|FFmpegCommand->setDebug(debug: Boolean)|Dubug模式,可打印日志,默认true|
|FFmpegCommand->setDebug(debug: Boolean)|Dubug模式,可打印日志|
|FFmpegCommand->runCmd(cmd: Array<String?>)|执行ffmpeg命令,无回调|
|FFmpegCommand->runCmd(cmd: Array<String?> callBack: IFFmpegCallBack?)|执行ffmpeg命令,并回调 开始,完成,取消,进度,错误|
|FFmpegCommand->getMediaInfo(path: String?, @MediaAttribute type: Int)|获取媒体信息:视频宽高、比特率...|
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ android {

|Method |Function |
|:---|----|
|FFmpegCommand->setDebug(debug: Boolean)|Debug mode, printable log, default true|
|FFmpegCommand->setDebug(debug: Boolean)|Debug mode, printable log|
|FFmpegCommand->runCmd(cmd: Array<String?>)|Execute ffmpeg command without callback|
|FFmpegCommand->runCmd(cmd: Array<String?> callBack: IFFmpegCallBack?)|Execute ffmpeg command and call back start, complete, cancel, progress, error|
|FFmpegCommand->getMediaInfo(path: String?, @MediaAttribute type: Int)|Get media information: video width and height, bit rate...|
Expand Down
4 changes: 0 additions & 4 deletions app/src/main/java/com/coder/ffmpegtest/ui/MainActivity.kt
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ import com.coder.ffmpegtest.service.FFmpegCommandService

@SuppressLint("NonConstantResourceId")
class MainActivity : AppCompatActivity(), View.OnClickListener {
var mServiceBtn :Button ? =null
var mCommandBtn: Button? = null
var mInfoBtn: Button? = null
var mFormatBtn: Button? = null
Expand All @@ -27,7 +26,6 @@ class MainActivity : AppCompatActivity(), View.OnClickListener {
}

private fun intiView() {
mServiceBtn = findViewById(R.id.btn_service)
mCommandBtn = findViewById(R.id.btn_command)
mInfoBtn = findViewById(R.id.btn_info)
mFormatBtn = findViewById(R.id.btn_format)
Expand All @@ -37,7 +35,6 @@ class MainActivity : AppCompatActivity(), View.OnClickListener {
}

private fun initListener() {
mServiceBtn!!.setOnClickListener(this)
mCommandBtn!!.setOnClickListener(this)
mInfoBtn!!.setOnClickListener(this)
mFormatBtn!!.setOnClickListener(this)
Expand All @@ -46,7 +43,6 @@ class MainActivity : AppCompatActivity(), View.OnClickListener {

override fun onClick(v: View) {
when (v.id) {
R.id.btn_service -> startService(Intent(this,FFmpegCommandService::class.java))
R.id.btn_command -> KFFmpegCommandActivity.start(this)
R.id.btn_info -> KFFmpegInfoActivity.start(this)
R.id.btn_format -> KFFmppegFormatActivity.start(this)
Expand Down
7 changes: 0 additions & 7 deletions app/src/main/res/layout/activity_main.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,6 @@
tools:context=".ui.MainActivity">


<Button
android:id="@+id/btn_service"
android:layout_width="100dp"
android:text="启动服务"
android:inputType="text"
android:background="@drawable/shape_button_border"
android:layout_height="100dp"/>

<LinearLayout
android:layout_width="wrap_content"
Expand Down

0 comments on commit b40ade0

Please sign in to comment.