diff --git a/.gitignore b/.gitignore
index 69ce5d9..013510d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
*.iml
.gradle
.idea
+.cxx
local.properties
.DS_Store
/build
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
deleted file mode 100644
index 9f29f4e..0000000
--- a/.idea/compiler.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
deleted file mode 100644
index 2456775..0000000
--- a/.idea/gradle.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
deleted file mode 100644
index aed6914..0000000
--- a/.idea/misc.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
deleted file mode 100644
index bf1189a..0000000
--- a/.idea/modules.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
deleted file mode 100644
index 7f68460..0000000
--- a/.idea/runConfigurations.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
deleted file mode 100644
index 35eb1dd..0000000
--- a/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
deleted file mode 100644
index 431362a..0000000
--- a/.idea/workspace.xml
+++ /dev/null
@@ -1,1159 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- sTexture
- y_texture
- wentian
- mInputSurface
- execute
- post
- mHandler
- this
- run(
- mEglCore
- mVideoEncoder
- MSG_START_RECORDING
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Android
-
-
- Android Lint
-
-
- Java
-
-
- Java language level migration aidsJava
-
-
-
-
- Android
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 1543564602371
-
-
- 1543564602371
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 1.8
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index d8ca806..6e8ce40 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -20,10 +20,10 @@ android {
}
dependencies {
- compile fileTree(dir: 'libs', include: ['*.jar'])
- androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
+ implementation fileTree(dir: 'libs', include: ['*.jar'])
+ androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
exclude group: 'com.android.support', module: 'support-annotations'
})
- compile 'com.android.support.constraint:constraint-layout:1.0.2'
- testCompile 'junit:junit:4.12'
+ implementation 'com.android.support.constraint:constraint-layout:1.0.2'
+ testImplementation 'junit:junit:4.12'
}
diff --git a/build.gradle b/build.gradle
index c36c483..51a7f05 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,13 +2,15 @@
buildscript {
repositories {
+ maven { url 'https://maven.aliyun.com/repository/public/' }
+ maven { url 'https://maven.aliyun.com/repository/google' }
jcenter()
maven {
url 'https://maven.google.com/'
}
}
dependencies {
- classpath 'com.android.tools.build:gradle:2.3.2'
+ classpath "com.android.tools.build:gradle:7.0.3"
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
@@ -18,6 +20,8 @@ buildscript {
allprojects {
repositories {
+ maven { url 'https://maven.aliyun.com/repository/public/' }
+ maven { url 'https://maven.aliyun.com/repository/google' }
jcenter()
maven {
url 'https://maven.google.com/'
diff --git a/glsurfacepreview/build.gradle b/glsurfacepreview/build.gradle
index 971a8bb..bc7c479 100644
--- a/glsurfacepreview/build.gradle
+++ b/glsurfacepreview/build.gradle
@@ -26,11 +26,12 @@ android {
}
dependencies {
- compile fileTree(dir: 'libs', include: ['*.jar'])
- androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
+ implementation fileTree(dir: 'libs', include: ['*.jar'])
+ androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
exclude group: 'com.android.support', module: 'support-annotations'
})
- compile 'com.android.support.constraint:constraint-layout:1.0.2'
- testCompile 'junit:junit:4.12'
- compile project(path: ':library')
+ implementation 'com.android.support:appcompat-v7:25.3.1'
+ implementation 'com.android.support.constraint:constraint-layout:1.0.2'
+ testImplementation 'junit:junit:4.12'
+ implementation project(path: ':library')
}
diff --git a/glsurfacepreview/src/main/java/com/inuker/glsurfacepreview/MainActivity.java b/glsurfacepreview/src/main/java/com/inuker/glsurfacepreview/MainActivity.java
index 6d06008..1c73b60 100644
--- a/glsurfacepreview/src/main/java/com/inuker/glsurfacepreview/MainActivity.java
+++ b/glsurfacepreview/src/main/java/com/inuker/glsurfacepreview/MainActivity.java
@@ -5,8 +5,8 @@
import android.content.Intent;
import android.opengl.GLSurfaceView;
import android.os.Bundle;
+import android.support.v4.app.ActivityCompat;
-import com.inuker.library.utils.Utils;
public class MainActivity extends Activity {
@@ -29,7 +29,7 @@ protected void onCreate(Bundle savedInstanceState) {
mGLSurfaceView.setRenderer(new CameraSurfaceRender(mGLSurfaceView));
mGLSurfaceView.setRenderMode(GLSurfaceView.RENDERMODE_WHEN_DIRTY);
- Utils.requestPermission(this, PERMISSIONS, 1);
+ ActivityCompat.requestPermissions(this, PERMISSIONS, REQUEST_CAMERA);
}
@Override
diff --git a/glsurfacepreview2/build.gradle b/glsurfacepreview2/build.gradle
index e7e769d..cc159e9 100644
--- a/glsurfacepreview2/build.gradle
+++ b/glsurfacepreview2/build.gradle
@@ -26,11 +26,11 @@ android {
}
dependencies {
- compile fileTree(dir: 'libs', include: ['*.jar'])
- androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
+ implementation fileTree(dir: 'libs', include: ['*.jar'])
+ androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
exclude group: 'com.android.support', module: 'support-annotations'
})
- compile 'com.android.support.constraint:constraint-layout:1.0.2'
- testCompile 'junit:junit:4.12'
- compile project(path: ':library')
+ implementation 'com.android.support.constraint:constraint-layout:1.0.2'
+ testImplementation 'junit:junit:4.12'
+ implementation project(path: ':library')
}
diff --git a/glsurfacepreview3/build.gradle b/glsurfacepreview3/build.gradle
index a287587..3e84de4 100644
--- a/glsurfacepreview3/build.gradle
+++ b/glsurfacepreview3/build.gradle
@@ -23,11 +23,11 @@ android {
}
dependencies {
- compile fileTree(dir: 'libs', include: ['*.jar'])
- androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
+ implementation fileTree(dir: 'libs', include: ['*.jar'])
+ androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
exclude group: 'com.android.support', module: 'support-annotations'
})
- compile 'com.android.support.constraint:constraint-layout:1.0.2'
- testCompile 'junit:junit:4.12'
- compile project(path: ':library')
+ implementation 'com.android.support.constraint:constraint-layout:1.0.2'
+ testImplementation 'junit:junit:4.12'
+ implementation project(path: ':library')
}
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 3b83fcd..0f80bbf 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Wed Aug 16 09:53:14 CST 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
diff --git a/library/build.gradle b/library/build.gradle
index 1b4b83d..90e377a 100644
--- a/library/build.gradle
+++ b/library/build.gradle
@@ -14,9 +14,9 @@ android {
externalNativeBuild {
cmake {
- arguments '-DANDROID_TOOLCHAIN=gcc', '-DANDROID_STL=gnustl_static',
- '-DANDROID_PLATFORM=android-19'
- cppFlags "-O3"
+// arguments '-DANDROID_TOOLCHAIN=gcc', '-DANDROID_STL=gnustl_static',
+// '-DANDROID_PLATFORM=android-19'
+// cppFlags "-O3"
}
}
@@ -41,10 +41,10 @@ android {
}
dependencies {
- compile fileTree(dir: 'libs', include: ['*.jar'])
- androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
+ implementation fileTree(dir: 'libs', include: ['*.jar'])
+ androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
exclude group: 'com.android.support', module: 'support-annotations'
})
- compile 'com.android.support:appcompat-v7:25.3.1'
- testCompile 'junit:junit:4.12'
+ implementation 'com.android.support:appcompat-v7:25.3.1'
+ testImplementation 'junit:junit:4.12'
}
diff --git a/multisurfacepreview/build.gradle b/multisurfacepreview/build.gradle
index 3f202ff..e07ab65 100644
--- a/multisurfacepreview/build.gradle
+++ b/multisurfacepreview/build.gradle
@@ -27,11 +27,11 @@ android {
}
dependencies {
- compile fileTree(dir: 'libs', include: ['*.jar'])
- androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
+ implementation fileTree(dir: 'libs', include: ['*.jar'])
+ androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
exclude group: 'com.android.support', module: 'support-annotations'
})
- compile 'com.android.support.constraint:constraint-layout:1.0.2'
- testCompile 'junit:junit:4.12'
- compile project(path: ':library')
+ implementation 'com.android.support.constraint:constraint-layout:1.0.2'
+ testImplementation 'junit:junit:4.12'
+ implementation project(path: ':library')
}
diff --git a/recorder1/build.gradle b/recorder1/build.gradle
index 1a3add6..bb4f631 100644
--- a/recorder1/build.gradle
+++ b/recorder1/build.gradle
@@ -23,11 +23,11 @@ android {
}
dependencies {
- compile fileTree(dir: 'libs', include: ['*.jar'])
- androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
+ implementation fileTree(dir: 'libs', include: ['*.jar'])
+ androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
exclude group: 'com.android.support', module: 'support-annotations'
})
- compile 'com.android.support.constraint:constraint-layout:1.0.2'
- testCompile 'junit:junit:4.12'
- compile project(path: ':library')
+ implementation 'com.android.support.constraint:constraint-layout:1.0.2'
+ testImplementation 'junit:junit:4.12'
+ implementation project(path: ':library')
}
diff --git a/recorder2/build.gradle b/recorder2/build.gradle
index 662931c..e475479 100644
--- a/recorder2/build.gradle
+++ b/recorder2/build.gradle
@@ -23,11 +23,11 @@ android {
}
dependencies {
- compile fileTree(dir: 'libs', include: ['*.jar'])
- androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
+ implementation fileTree(dir: 'libs', include: ['*.jar'])
+ androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
exclude group: 'com.android.support', module: 'support-annotations'
})
- compile 'com.android.support.constraint:constraint-layout:1.0.2'
- testCompile 'junit:junit:4.12'
- compile project(path: ':library')
+ implementation 'com.android.support.constraint:constraint-layout:1.0.2'
+ testImplementation 'junit:junit:4.12'
+ implementation project(path: ':library')
}
diff --git a/rgbconverter/build.gradle b/rgbconverter/build.gradle
index 8ed328f..bdd4eea 100644
--- a/rgbconverter/build.gradle
+++ b/rgbconverter/build.gradle
@@ -26,11 +26,11 @@ android {
}
dependencies {
- compile fileTree(dir: 'libs', include: ['*.jar'])
- androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
+ implementation fileTree(dir: 'libs', include: ['*.jar'])
+ androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
exclude group: 'com.android.support', module: 'support-annotations'
})
- compile 'com.android.support.constraint:constraint-layout:1.0.2'
- testCompile 'junit:junit:4.12'
- compile project(path: ':library')
+ implementation 'com.android.support.constraint:constraint-layout:1.0.2'
+ testImplementation 'junit:junit:4.12'
+ implementation project(path: ':library')
}
diff --git a/surfacepreview/build.gradle b/surfacepreview/build.gradle
index f5e0fb9..f20e807 100644
--- a/surfacepreview/build.gradle
+++ b/surfacepreview/build.gradle
@@ -26,11 +26,11 @@ android {
}
dependencies {
- compile fileTree(dir: 'libs', include: ['*.jar'])
- androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
+ implementation fileTree(dir: 'libs', include: ['*.jar'])
+ androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
exclude group: 'com.android.support', module: 'support-annotations'
})
- compile 'com.android.support.constraint:constraint-layout:1.0.2'
- testCompile 'junit:junit:4.12'
- compile project(path: ':library')
+ implementation 'com.android.support.constraint:constraint-layout:1.0.2'
+ testImplementation 'junit:junit:4.12'
+ implementation project(path: ':library')
}
diff --git a/surfacepreview2/build.gradle b/surfacepreview2/build.gradle
index 430983b..e7f9364 100644
--- a/surfacepreview2/build.gradle
+++ b/surfacepreview2/build.gradle
@@ -26,11 +26,11 @@ android {
}
dependencies {
- compile fileTree(dir: 'libs', include: ['*.jar'])
- androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
+ implementation fileTree(dir: 'libs', include: ['*.jar'])
+ androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
exclude group: 'com.android.support', module: 'support-annotations'
})
- compile 'com.android.support.constraint:constraint-layout:1.0.2'
- testCompile 'junit:junit:4.12'
- compile project(path: ':library')
+ implementation 'com.android.support.constraint:constraint-layout:1.0.2'
+ testImplementation 'junit:junit:4.12'
+ implementation project(path: ':library')
}