Skip to content

Commit

Permalink
完善功能;
Browse files Browse the repository at this point in the history
  • Loading branch information
Lei Xu committed Dec 14, 2021
1 parent 4384d01 commit 31b21d5
Show file tree
Hide file tree
Showing 20 changed files with 1,241 additions and 1,332 deletions.
5 changes: 5 additions & 0 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,11 @@ android {
jniLibs.srcDirs = ['libs']
}
}

buildFeatures {
viewBinding true
}

}

repositories {
Expand Down
26 changes: 14 additions & 12 deletions app/src/main/java/com/worldtech/camera2video/App.kt
Original file line number Diff line number Diff line change
@@ -1,16 +1,18 @@
package com.worldtech.camera2video;
package com.worldtech.camera2video

import android.app.Application;
import android.content.Context;
import android.annotation.SuppressLint
import android.app.Application
import android.content.Context

public class App extends Application {

public static Context context;

@Override
public void onCreate() {
super.onCreate();
context = getApplicationContext();
class App : Application() {
override fun onCreate() {
super.onCreate()
context = applicationContext
}

}
companion object {
@SuppressLint("StaticFieldLeak")
@JvmField
var context: Context? = null
}
}
10 changes: 7 additions & 3 deletions app/src/main/java/com/worldtech/camera2video/MainActivity.kt
Original file line number Diff line number Diff line change
@@ -1,23 +1,27 @@
package com.worldtech.camera2video

import android.Manifest
import android.annotation.SuppressLint
import android.content.Intent
import android.os.Bundle
import androidx.appcompat.app.AppCompatActivity
import com.tbruyelle.rxpermissions2.RxPermissions
import com.worldtech.camera2video.activity.RecordVideoActivity
import kotlinx.android.synthetic.main.activity_main.*
import com.worldtech.camera2video.databinding.ActivityMainBinding

class MainActivity : AppCompatActivity() {

private lateinit var currentBinding: ActivityMainBinding
private var rxPermissions: RxPermissions? = null

@SuppressLint("CheckResult")
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_main)
currentBinding = ActivityMainBinding.inflate(layoutInflater)
setContentView(currentBinding.root)

rxPermissions = RxPermissions(this)
tv_test1.setOnClickListener {
currentBinding.tvRecordVideo.setOnClickListener {
rxPermissions!!.request(
Manifest.permission.CAMERA,
Manifest.permission.RECORD_AUDIO,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,57 +1,49 @@
package com.worldtech.camera2video.activity;

import android.os.Build;
import android.os.Bundle;
import android.widget.ImageView;

import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentActivity;

import com.worldtech.camera2video.R;
import com.worldtech.camera2video.fragment.RecordVideo2Fragment;
import com.worldtech.camera2video.fragment.RecordVideoFragment;


public class RecordVideoActivity extends FragmentActivity {

private ImageView cancel;
private Fragment videoFragment;

@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_record_video);


cancel = findViewById(R.id.cancel);
cancel.setOnClickListener(v -> {
finishFragment();
});
videoFragment = getRecordVideoFragment();
getSupportFragmentManager().beginTransaction()
.replace(R.id.fl_container,videoFragment ,"RecordVideoFragment")
.addToBackStack(null)
.commit();
package com.worldtech.camera2video.activity

import android.os.Build
import android.os.Bundle
import android.view.View
import androidx.fragment.app.Fragment
import androidx.fragment.app.FragmentActivity
import com.worldtech.camera2video.R
import com.worldtech.camera2video.databinding.ActivityRecordVideoBinding
import com.worldtech.camera2video.fragment.RecordVideo2Fragment
import com.worldtech.camera2video.fragment.RecordVideoFragment

class RecordVideoActivity : FragmentActivity() {

private lateinit var currentBinding: ActivityRecordVideoBinding
private var videoFragment: Fragment? = null

override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
currentBinding = ActivityRecordVideoBinding.inflate(layoutInflater)
setContentView(currentBinding.root)

currentBinding.cancel.setOnClickListener(View.OnClickListener { v: View? -> finishFragment() })
videoFragment = recordVideoFragment
supportFragmentManager.beginTransaction()
.replace(R.id.fl_container, videoFragment!!, "RecordVideoFragment")
.addToBackStack(null)
.commit()
}

@Override
public void onBackPressed() {
finishFragment();
override fun onBackPressed() {
finishFragment()
}

public Fragment getRecordVideoFragment(){
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
return new RecordVideoFragment();
private val recordVideoFragment: Fragment
get() = if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
RecordVideoFragment()
} else {
return new RecordVideo2Fragment();
RecordVideo2Fragment()
}
}
public void finishFragment(){
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP){

private fun finishFragment() {
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
// ((RecordVideoFragment)videoFragment).exit();
}else {
finish();
} else {
finish()
}

}
}
}
Loading

0 comments on commit 31b21d5

Please sign in to comment.