Skip to content

Commit f10ec9b

Browse files
cangwangcangwang
committed
1.to fix android X
1 parent bfc721f commit f10ec9b

39 files changed

+282
-134
lines changed

‎.idea/caches/build_file_checksums.ser‎

-7 Bytes
Binary file not shown.

‎.idea/codeStyles/Project.xml‎

Lines changed: 109 additions & 25 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/gradle.xml‎

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/modules.xml‎

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,14 @@ android {
4545
}
4646

4747
publishNonDefault true
48-
dynamicFeatures = [":player"]
48+
// dynamicFeatures = [":player"]
4949

5050

5151
}
5252

5353
dependencies {
5454
implementation fileTree(include: ['*.jar'], dir: 'libs')
55-
implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.21'
55+
implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.50'
5656
implementation 'com.android.support.constraint:constraint-layout:1.1.3'
5757
implementation ('io.reactivex.rxjava2:rxandroid:2.1.0',{
5858
exclude group: 'org.jetbrains.kotlin'

‎app/src/main/java/com/cangwang/magic/CameraActivity.kt‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,15 @@ import android.content.pm.PackageManager
66
import android.graphics.Point
77
import android.hardware.Camera
88
import android.os.Bundle
9-
import android.support.v4.app.ActivityCompat
10-
import android.support.v4.content.PermissionChecker
11-
import android.support.v7.app.AppCompatActivity
9+
1210
import android.view.*
1311
import android.view.animation.Animation
1412
import android.view.animation.Transformation
1513
import android.widget.FrameLayout
1614
import android.widget.RelativeLayout
15+
import androidx.appcompat.app.AppCompatActivity
16+
import androidx.core.app.ActivityCompat
17+
import androidx.core.content.PermissionChecker
1718
import com.cangwang.magic.camera.CameraTouch
1819
import com.cangwang.magic.util.CameraHelper
1920
import com.cangwang.magic.view.CameraSurfaceCallback
@@ -23,7 +24,7 @@ import kotlinx.android.synthetic.main.activity_camera.*
2324
/**
2425
* Created by cangwang on 2018/9/12.
2526
*/
26-
class CameraActivity:AppCompatActivity(){
27+
class CameraActivity: AppCompatActivity(){
2728
private val MODE_PIC = 1
2829
private var CAMERA_PERMISSION_REQ = 1
2930

‎app/src/main/java/com/cangwang/magic/CameraFilterActivity.kt‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,32 +7,34 @@ import android.animation.ObjectAnimator
77
import android.app.AlertDialog
88
import android.content.DialogInterface
99
import android.content.pm.ActivityInfo
10-
import android.content.pm.PackageManager
10+
1111
import android.graphics.Point
1212
import android.hardware.Camera
1313
import android.os.Build
1414
import android.os.Bundle
1515
import android.os.Environment
16-
import android.support.v4.app.ActivityCompat
17-
import android.support.v4.content.PermissionChecker
18-
import android.support.v7.app.AppCompatActivity
19-
import android.support.v7.widget.LinearLayoutManager
16+
2017
import android.view.SurfaceHolder
2118
import android.view.View
2219
import android.view.Window
2320
import android.view.WindowManager
2421
import android.widget.RelativeLayout
22+
import androidx.appcompat.app.AppCompatActivity
23+
import androidx.core.app.ActivityCompat
24+
import androidx.core.content.PermissionChecker
25+
import androidx.recyclerview.widget.LinearLayoutManager
2526
import com.cangwang.magic.adapter.FilterAdapter
2627
import com.cangwang.magic.util.CameraHelper
2728
import com.cangwang.magic.util.OpenGLJniLib
2829
import com.cangwang.magic.view.CameraFilterSurfaceCallback
2930
import kotlinx.android.synthetic.main.activity_camera.*
3031
import kotlinx.android.synthetic.main.filter_layout.*
32+
import java.security.Permission
3133

3234
/**
3335
* Created by cangwang on 2018/9/12.
3436
*/
35-
class CameraFilterActivity:AppCompatActivity(){
37+
class CameraFilterActivity: AppCompatActivity(){
3638

3739
private var isRecording = false
3840
private val MODE_PIC = 1
@@ -57,12 +59,12 @@ class CameraFilterActivity:AppCompatActivity(){
5759
requestWindowFeature(Window.FEATURE_NO_TITLE)
5860
requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
5961
setContentView(R.layout.activity_camera)
60-
if (PermissionChecker.checkSelfPermission(this, Manifest.permission.CAMERA) == PackageManager.PERMISSION_DENIED) run {
62+
if (PermissionChecker.checkSelfPermission(this, Manifest.permission.CAMERA) == PermissionChecker.PERMISSION_DENIED) run {
6163
ActivityCompat.requestPermissions(this, arrayOf(Manifest.permission.CAMERA),CAMERA_PERMISSION_REQ)
6264
}else {
6365
initView()
6466
}
65-
if (PermissionChecker.checkSelfPermission(this, Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_DENIED) run {
67+
if (PermissionChecker.checkSelfPermission(this, Manifest.permission.WRITE_EXTERNAL_STORAGE) == PermissionChecker.PERMISSION_DENIED) run {
6668
ActivityCompat.requestPermissions(this, arrayOf(Manifest.permission.WRITE_EXTERNAL_STORAGE),STORGE_PERMISSION_REQ)
6769
}
6870
}
@@ -157,7 +159,7 @@ class CameraFilterActivity:AppCompatActivity(){
157159
// }
158160
// }
159161
// super.onRequestPermissionsResult(requestCode, permissions, grantResults)
160-
if (requestCode == CAMERA_PERMISSION_REQ &&(grantResults.size != 1 || grantResults[0] == PackageManager.PERMISSION_GRANTED)) {
162+
if (requestCode == CAMERA_PERMISSION_REQ &&(grantResults.size != 1 || grantResults[0] == PermissionChecker.PERMISSION_GRANTED)) {
161163
initView()
162164
initCamera()
163165
} else {
@@ -189,7 +191,7 @@ class CameraFilterActivity:AppCompatActivity(){
189191

190192

191193
fun openCamera(holder: SurfaceHolder?):Camera?{
192-
if (ActivityCompat.checkSelfPermission(this, Manifest.permission.CAMERA) != PackageManager.PERMISSION_GRANTED) {
194+
if (ActivityCompat.checkSelfPermission(this, Manifest.permission.CAMERA) != PermissionChecker.PERMISSION_GRANTED) {
193195
return null
194196
}
195197

‎app/src/main/java/com/cangwang/magic/CameraFilterV2Activity.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ import android.app.AlertDialog
88
import android.content.pm.ActivityInfo
99
import android.graphics.Point
1010
import android.os.Bundle
11-
import android.support.v7.app.AppCompatActivity
12-
import android.support.v7.widget.LinearLayoutManager
1311
import android.util.Log
1412
import android.view.View
1513
import android.view.Window
1614
import android.view.WindowManager
1715
import android.widget.RelativeLayout
16+
import androidx.appcompat.app.AppCompatActivity
17+
import androidx.recyclerview.widget.LinearLayoutManager
1818
import com.cangwang.magic.adapter.FilterAdapter
1919
import com.cangwang.magic.camera.CameraCompat
2020
import com.cangwang.magic.util.OpenGLJniLib
@@ -30,7 +30,7 @@ import java.util.concurrent.TimeUnit
3030
* 滤镜录制
3131
* Created by cangwang on 2018/9/12.
3232
*/
33-
class CameraFilterV2Activity:AppCompatActivity(){
33+
class CameraFilterV2Activity: AppCompatActivity(){
3434
private val TAG = CameraFilterV2Activity::class.java.simpleName
3535
private val MODE_PIC = 1
3636
private val MODE_VIDEO = 2

‎app/src/main/java/com/cangwang/magic/ImageEditActivity.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ import android.animation.AnimatorListenerAdapter
55
import android.animation.ObjectAnimator
66
import android.content.pm.ActivityInfo
77
import android.os.Bundle
8-
import android.support.v7.app.AlertDialog
9-
import android.support.v7.app.AppCompatActivity
10-
import android.support.v7.widget.LinearLayoutManager
118
import android.view.View
129
import android.view.Window
1310
import android.view.WindowManager
11+
import androidx.appcompat.app.AlertDialog
12+
import androidx.appcompat.app.AppCompatActivity
13+
import androidx.recyclerview.widget.LinearLayoutManager
1414
import com.cangwang.magic.adapter.FilterAdapter
1515
import com.cangwang.magic.util.OpenGLJniLib
1616
import com.cangwang.magic.view.ImageFilterSurfaceCallback
@@ -22,7 +22,7 @@ import kotlinx.android.synthetic.main.filter_layout.*
2222
/**
2323
* 图片编辑
2424
*/
25-
class ImageEditActivity:AppCompatActivity(){
25+
class ImageEditActivity: AppCompatActivity(){
2626

2727
private var mAdapter: FilterAdapter? = null
2828
private var mSurfaceCallback: ImageFilterSurfaceCallback?=null

‎app/src/main/java/com/cangwang/magic/MainActivity.kt‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ package com.cangwang.magic
33
import android.Manifest
44
import android.content.Intent
55
import android.content.pm.PackageManager
6-
import android.support.v7.app.AppCompatActivity
76
import android.os.Bundle
8-
import android.support.v4.app.ActivityCompat
9-
import android.support.v4.content.PermissionChecker
107
import android.widget.Toast
8+
import androidx.appcompat.app.AppCompatActivity
9+
import androidx.core.app.ActivityCompat
10+
import androidx.core.content.PermissionChecker
1111
import com.werb.pickphotoview.PickPhotoView
1212
import com.werb.pickphotoview.model.SelectModel
1313
import com.werb.pickphotoview.util.PickConfig
@@ -25,23 +25,23 @@ class MainActivity : AppCompatActivity() {
2525
super.onCreate(savedInstanceState)
2626
setContentView(R.layout.activity_main)
2727
button_camera.setOnClickListener { v ->
28-
if (PermissionChecker.checkSelfPermission(this@MainActivity, Manifest.permission.CAMERA) == PackageManager.PERMISSION_DENIED) {
28+
if (PermissionChecker.checkSelfPermission(this@MainActivity, Manifest.permission.CAMERA) == PermissionChecker.PERMISSION_DENIED) {
2929
ActivityCompat.requestPermissions(this@MainActivity, arrayOf(Manifest.permission.CAMERA), CAMERA_REQ)
3030
} else {
3131
startActivity(CAMERA_REQ)
3232
}
3333
}
3434
button_filter.setOnClickListener {
35-
if (PermissionChecker.checkSelfPermission(this@MainActivity, Manifest.permission.CAMERA) == PackageManager.PERMISSION_DENIED ||
36-
PermissionChecker.checkSelfPermission(this@MainActivity, Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_DENIED ||
37-
PermissionChecker.checkSelfPermission(this@MainActivity, Manifest.permission.RECORD_AUDIO) == PackageManager.PERMISSION_DENIED) {
35+
if (PermissionChecker.checkSelfPermission(this@MainActivity, Manifest.permission.CAMERA) == PermissionChecker.PERMISSION_DENIED ||
36+
PermissionChecker.checkSelfPermission(this@MainActivity, Manifest.permission.WRITE_EXTERNAL_STORAGE) == PermissionChecker.PERMISSION_DENIED ||
37+
PermissionChecker.checkSelfPermission(this@MainActivity, Manifest.permission.RECORD_AUDIO) == PermissionChecker.PERMISSION_DENIED) {
3838
ActivityCompat.requestPermissions(this@MainActivity, arrayOf(Manifest.permission.CAMERA,Manifest.permission.WRITE_EXTERNAL_STORAGE,Manifest.permission.RECORD_AUDIO), CAMERA_FILTER)
3939
} else {
4040
startActivity(CAMERA_FILTER)
4141
}
4242
}
4343
button_album.setOnClickListener {
44-
if (PermissionChecker.checkSelfPermission(this@MainActivity, Manifest.permission.CAMERA) == PackageManager.PERMISSION_DENIED) {
44+
if (PermissionChecker.checkSelfPermission(this@MainActivity, Manifest.permission.CAMERA) == PermissionChecker.PERMISSION_DENIED) {
4545
ActivityCompat.requestPermissions(this@MainActivity, arrayOf(Manifest.permission.CAMERA), ALBUM_REQ)
4646
} else {
4747
startActivity(ALBUM_REQ)

0 commit comments

Comments
 (0)