upgrade gradle settings, support cmake build

wysaid · wysaid · commit e5c8007cd457 · 2023-01-04T19:37:03.000+08:00
diff --git a/.gitignore b/.gitignore
@@ -9,4 +9,5 @@ target/
 tmp
 objs/
 obj/
-build/
+build/
+library/.cxx/
diff --git a/build.gradle b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.4.2'
+        classpath 'com.android.tools.build:gradle:7.2.2'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -23,13 +23,12 @@ allprojects {
 ext {
     android = [
             compileSdkVersion: 30,
-            buildToolsVersion: '30.0.2',
+            buildToolsVersion: '30.0.3',
             minSdkVersion    : 16,
             targetSdkVersion : 30,
             versionCode      : 1,
             versionName      : "1.0.0",
             applicationId    : "org.wysaid.cgeDemo",
-            appcompatV7      : "30.0.0",
             appcompatX       : "1.2.0"
     ]
 }
diff --git a/cgeDemo/build.gradle b/cgeDemo/build.gradle
@@ -23,6 +23,5 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation project(':library')
-    implementation 'com.android.support:appcompat-v7:' + rootProject.ext.android.appcompatV7
     implementation 'androidx.appcompat:appcompat:' + rootProject.ext.android.appcompatX
 }
diff --git a/cgeDemo/src/main/java/org/wysaid/cgeDemo/BasicImageDemoActivity.java b/cgeDemo/src/main/java/org/wysaid/cgeDemo/BasicImageDemoActivity.java
@@ -5,13 +5,16 @@
 import android.graphics.BitmapFactory;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.AppCompatButton;
+
+
 import android.util.Log;
 import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.SeekBar;
 
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.AppCompatButton;
+
 import org.wysaid.common.Common;
 import org.wysaid.myUtils.ImageUtil;
 import org.wysaid.myUtils.MsgUtil;
@@ -137,8 +140,8 @@ public void surfaceCreated() {
         mSeekBar.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
             @Override
             public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
-                if(mActiveConfig != null) {
-                    float intensity = progress / (float)seekBar.getMax();
+                if (mActiveConfig != null) {
+                    float intensity = progress / (float) seekBar.getMax();
                     mActiveConfig.setIntensity(intensity, true);
                 }
             }
@@ -156,7 +159,7 @@ public void onStopTrackingTouch(SeekBar seekBar) {
 
         LinearLayout menuLayout = (LinearLayout) findViewById(R.id.menuLayout);
 
-        if(BASIC_FILTER_NAMES.length == mAdjustConfigs.length) {
+        if (BASIC_FILTER_NAMES.length == mAdjustConfigs.length) {
 
             for (int i = 0; i != BASIC_FILTER_NAMES.length; ++i) {
                 MyButton btn = new MyButton(this, mAdjustConfigs[i]);
@@ -244,7 +247,7 @@ public void resetBtnClicked(View view) {
             public void run() {
 
                 CGEImageHandler handler = mImageView.getImageHandler();
-                for(AdjustConfig config : mAdjustConfigs) {
+                for (AdjustConfig config : mAdjustConfigs) {
 
                     handler.setFilterIntensityAtIndex(config.originValue, config.index, false);
                 }
diff --git a/cgeDemo/src/main/java/org/wysaid/cgeDemo/CameraDemoActivity.java b/cgeDemo/src/main/java/org/wysaid/cgeDemo/CameraDemoActivity.java
@@ -6,7 +6,7 @@
 import android.hardware.Camera;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -16,6 +16,8 @@
 import android.widget.LinearLayout;
 import android.widget.SeekBar;
 
+import androidx.appcompat.app.AppCompatActivity;
+
 import org.wysaid.camera.CameraInstance;
 import org.wysaid.myUtils.FileUtil;
 import org.wysaid.myUtils.ImageUtil;
diff --git a/cgeDemo/src/main/java/org/wysaid/cgeDemo/FaceTrackingDemoActivity.java b/cgeDemo/src/main/java/org/wysaid/cgeDemo/FaceTrackingDemoActivity.java
@@ -1,9 +1,11 @@
 package org.wysaid.cgeDemo;
 
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+
 import android.view.View;
 
+import androidx.appcompat.app.AppCompatActivity;
+
 import org.wysaid.camera.CameraInstance;
 import org.wysaid.cgeDemo.demoUtils.FaceTrackingDemo;
 import org.wysaid.view.CameraGLSurfaceView;
diff --git a/cgeDemo/src/main/java/org/wysaid/cgeDemo/ImageDeformActivity.java b/cgeDemo/src/main/java/org/wysaid/cgeDemo/ImageDeformActivity.java
@@ -5,12 +5,13 @@
 import android.graphics.BitmapFactory;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
 import android.util.Log;
 import android.view.MotionEvent;
 import android.view.View;
 import android.widget.SeekBar;
 
+import androidx.appcompat.app.AppCompatActivity;
+
 import org.wysaid.common.Common;
 import org.wysaid.myUtils.ImageUtil;
 import org.wysaid.myUtils.MsgUtil;
diff --git a/cgeDemo/src/main/java/org/wysaid/cgeDemo/ImageDemoActivity.java b/cgeDemo/src/main/java/org/wysaid/cgeDemo/ImageDemoActivity.java
@@ -10,7 +10,6 @@
 import android.media.FaceDetector;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -19,6 +18,8 @@
 import android.widget.LinearLayout;
 import android.widget.SeekBar;
 
+import androidx.appcompat.app.AppCompatActivity;
+
 import org.wysaid.common.Common;
 import org.wysaid.myUtils.ImageUtil;
 import org.wysaid.myUtils.MsgUtil;
diff --git a/cgeDemo/src/main/java/org/wysaid/cgeDemo/MainActivity.java b/cgeDemo/src/main/java/org/wysaid/cgeDemo/MainActivity.java
@@ -6,19 +6,22 @@
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.Button;
 import android.widget.LinearLayout;
 
+import androidx.appcompat.app.AppCompatActivity;
+
 import java.io.IOException;
 import java.io.InputStream;
 
 import org.wysaid.common.Common;
 import org.wysaid.myUtils.MsgUtil;
+import org.wysaid.myUtils.PermissionUtil;
 import org.wysaid.nativePort.CGENativeLibrary;
 
 
@@ -248,6 +251,7 @@ protected void onCreate(Bundle savedInstanceState) {
         //The second param will be passed as the second arg of the callback function.
         //第二个参数根据自身需要设置， 将作为 loadImage 第二个参数回传
         CGENativeLibrary.setLoadImageCallback(mLoadImageCallback, null);
+        PermissionUtil.verifyStoragePermissions(this);
     }
 
 //    @Override
diff --git a/cgeDemo/src/main/java/org/wysaid/cgeDemo/MultiInputActivity.java b/cgeDemo/src/main/java/org/wysaid/cgeDemo/MultiInputActivity.java
@@ -1,11 +1,12 @@
 package org.wysaid.cgeDemo;
 
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
 import android.util.Log;
 import android.view.MenuItem;
 import android.view.View;
 
+import androidx.appcompat.app.AppCompatActivity;
+
 import org.wysaid.camera.CameraInstance;
 import org.wysaid.cgeDemo.demoUtils.MultiInputDemo;
 import org.wysaid.common.Common;
diff --git a/cgeDemo/src/main/java/org/wysaid/cgeDemo/SimplePlayerDemoActivity.java b/cgeDemo/src/main/java/org/wysaid/cgeDemo/SimplePlayerDemoActivity.java
@@ -6,7 +6,6 @@
 import android.graphics.BitmapFactory;
 import android.media.MediaPlayer;
 import android.net.Uri;
-import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.Menu;
@@ -15,6 +14,8 @@
 import android.widget.Button;
 import android.widget.LinearLayout;
 
+import androidx.appcompat.app.AppCompatActivity;
+
 import org.wysaid.common.Common;
 import org.wysaid.myUtils.FileUtil;
 import org.wysaid.myUtils.ImageUtil;
diff --git a/cgeDemo/src/main/java/org/wysaid/cgeDemo/TestCaseActivity.java b/cgeDemo/src/main/java/org/wysaid/cgeDemo/TestCaseActivity.java
@@ -5,12 +5,14 @@
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.net.Uri;
-import android.support.v7.app.AppCompatActivity;
+
 import android.os.Bundle;
 import android.util.Log;
 import android.view.View;
 import android.widget.Toast;
 
+import androidx.appcompat.app.AppCompatActivity;
+
 import org.wysaid.common.Common;
 import org.wysaid.common.SharedContext;
 import org.wysaid.myUtils.FileUtil;
diff --git a/cgeDemo/src/main/java/org/wysaid/cgeDemo/VideoPlayerDemoActivity.java b/cgeDemo/src/main/java/org/wysaid/cgeDemo/VideoPlayerDemoActivity.java
@@ -6,7 +6,6 @@
 import android.graphics.BitmapFactory;
 import android.media.MediaPlayer;
 import android.net.Uri;
-import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.Menu;
@@ -16,6 +15,8 @@
 import android.widget.LinearLayout;
 import android.widget.SeekBar;
 
+import androidx.appcompat.app.AppCompatActivity;
+
 import org.wysaid.common.Common;
 import org.wysaid.myUtils.FileUtil;
 import org.wysaid.myUtils.ImageUtil;
diff --git a/gradle.properties b/gradle.properties
@@ -1,18 +1,19 @@
 # Project-wide Gradle settings.
-
 # IDE (e.g. Android Studio) users:
 # Gradle settings configured through the IDE *will override*
 # any settings specified in this file.
-
 # For more details on how to configure your build environment visit
 # http://www.gradle.org/docs/current/userguide/build_environment.html
-
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
 # Default value: -Xmx10248m -XX:MaxPermSize=256m
-# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+
+org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
 
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
-# org.gradle.parallel=true
+# org.gradle.parallel=true
+
+android.useAndroidX=true
+android.enableJetifier=true
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sat Aug 24 16:45:19 CST 2019
+#Wed Jan 04 11:21:04 CST 2023
 distributionBase=GRADLE_USER_HOME
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
 distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
+zipStoreBase=GRADLE_USER_HOME
diff --git a/library/build.gradle b/library/build.gradle
@@ -25,7 +25,8 @@ android {
                     arguments "-DCGE_USE_VIDEO_MODULE=1",
                             "-DANDROID_STL=c++_static",
                             "-DANDROID_ARM_NEON=TRUE",
-                            "-DANDROID_GRADLE=1"
+                            "-DANDROID_GRADLE=1",
+                            "-DCGE_USE_VIDEO_MODULE=1"
 
                     cppFlags "-frtti -std=c++14"
                 }
@@ -51,11 +52,10 @@ android {
     ////////////////////////////////////////
 
     sourceSets.main {
-        if (usingCMakeCompile()) {
-            jniLibs.srcDir 'src/main/libs' //set libs as .so's location instead of jni
-        } else {
-            jni.srcDirs = [] //disable automatic ndk-build call with auto-generated Android.mk file
-        }
+         if (!usingCMakeCompile()) {
+             jniLibs.srcDir 'src/main/libs' //set libs as .so's location instead of jni
+             jni.srcDirs = [] //disable automatic ndk-build call with auto-generated Android.mk file
+         }
     }
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
@@ -65,6 +65,5 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'com.android.support:appcompat-v7:' + rootProject.ext.android.appcompatV7
     implementation 'androidx.appcompat:appcompat:' + rootProject.ext.android.appcompatX
 }
diff --git a/library/src/main/java/org/wysaid/myUtils/PermissionUtil.java b/library/src/main/java/org/wysaid/myUtils/PermissionUtil.java
@@ -0,0 +1,36 @@
+package org.wysaid.myUtils;
+
+import android.Manifest;
+import android.app.Activity;
+import android.content.pm.PackageManager;
+import android.util.Log;
+import android.widget.Toast;
+
+import androidx.core.app.ActivityCompat;
+
+import org.wysaid.common.Common;
+
+public class PermissionUtil {
+    private static final int REQUEST_PERMISSION = 0;
+    private static String[] PERMISSIONS_STORAGE = {
+            Manifest.permission.CAMERA,
+            Manifest.permission.WRITE_EXTERNAL_STORAGE,
+            Manifest.permission.READ_EXTERNAL_STORAGE};
+
+    public static void verifyStoragePermissions(Activity activity) {
+        try {
+
+            for (int i = 0; i != PERMISSIONS_STORAGE.length; ++i) {
+                int reqCode = ActivityCompat.checkSelfPermission(activity, PERMISSIONS_STORAGE[i]);
+                if (reqCode != PackageManager.PERMISSION_GRANTED) {
+                    // 没有写的权限，去申请写的权限，会弹出对话框
+                    ActivityCompat.requestPermissions(activity, new String[]{PERMISSIONS_STORAGE[i]}, REQUEST_PERMISSION);
+                    Toast.makeText(activity, "request permission " + PERMISSIONS_STORAGE[i] + " ...", Toast.LENGTH_LONG).show();
+                }
+            }
+        } catch (Exception e) {
+            Log.e(Common.LOG_TAG, "Error: " + e.getMessage());
+            e.printStackTrace();
+        }
+    }
+}
diff --git a/library/src/main/jni/CMakeLists.txt b/library/src/main/jni/CMakeLists.txt
diff --git a/library/src/main/jni/cge/CMakeLists.txt b/library/src/main/jni/cge/CMakeLists.txt
diff --git a/library/src/main/jni/custom/CMakeLists.txt b/library/src/main/jni/custom/CMakeLists.txt
diff --git a/library/src/main/jni/interface/cgeFrameRecorder.cpp b/library/src/main/jni/interface/cgeFrameRecorder.cpp

-Original file line number
+Diff line change
 tmp
 objs/
 obj/
 -build/
 +build/
 +library/.cxx/
Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,5 @@ android {`
`23`	`23`	`dependencies {`
`24`	`24`	`implementation fileTree(dir: 'libs', include: ['*.jar'])`
`25`	`25`	`implementation project(':library')`
`26`		`- implementation 'com.android.support:appcompat-v7:' + rootProject.ext.android.appcompatV7`
`27`	`26`	`implementation 'androidx.appcompat:appcompat:' + rootProject.ext.android.appcompatX`
`28`	`27`	`}`