diff --git a/app/build.gradle b/app/build.gradle index c3d70348..08d7ad05 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,4 +1,6 @@ apply plugin: 'com.android.application' +//apply plugin: 'com.android.library' +apply plugin: 'maven' android { compileSdkVersion cfgs.compileSdkVersion @@ -32,13 +34,34 @@ android { } } -dependencies { - implementation project(':picture_library') -// implementation 'me.jessyan:insgallery:0.7.0' +uploadArchives { + repositories.mavenDeployer { + repository(url: "http://nexus.carnegietechnologies.rs:8085/repository/android-library/") { + authentication(userName: "deployment", password: "deployment123") + pom.groupId = "com.carnegietechnologies.flutter" + pom.artifactId = "instagramGallery" + pom.version = "${cfgs.insGalleryVersion}" + + //generate pom nodes for dependencies + pom.withXml { + def dependenciesNode = asNode().appendNode('dependencies') + configurations.compile.allDependencies.each { dependency -> + def dependencyNode = dependenciesNode.appendNode('dependency') + dependencyNode.appendNode('groupId', dependency.group) + dependencyNode.appendNode('artifactId', dependency.name) + dependencyNode.appendNode('version', dependency.version) + } + } + } + } +} + +dependencies { implementation "androidx.appcompat:appcompat:${cfgs.version_appcompat}" implementation "androidx.recyclerview:recyclerview:${cfgs.version_recyclerview}" implementation "androidx.camera:camera-camera2:${cfgs.camerax_version}" implementation "com.github.bumptech.glide:glide:${cfgs.glide_version}" - debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.2' + implementation("com.carnegietechnologies.flutter:pictureLibrary:7.0.2") + implementation 'com.squareup.leakcanary:leakcanary-android:2.2' } diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 6bc10da4..3a48578a 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -113,6 +113,7 @@ #rxandroid -dontwarn sun.misc.** +-dontwarn com.yalantis.ucrop.** -keepclassmembers class rx.internal.util.unsafe.*ArrayQueue*Field* { long producerIndex; long consumerIndex; diff --git a/app/src/main/java/com/luck/pictureselector/MainActivity.java b/app/src/main/java/com/luck/pictureselector/MainActivity.java index ef171973..530ce44a 100644 --- a/app/src/main/java/com/luck/pictureselector/MainActivity.java +++ b/app/src/main/java/com/luck/pictureselector/MainActivity.java @@ -139,7 +139,7 @@ protected void onCreate(Bundle savedInstanceState) { PictureSelector.create(MainActivity.this) .themeStyle(R.style.picture_default_style) // xml设置主题 //.setPictureWindowAnimationStyle(animationStyle)// 自定义页面启动动画 - .setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT)// 设置相册Activity方向，不设置默认使用系统 + .setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED)// 设置相册Activity方向，不设置默认使用系统 .isNotPreviewDownload(true)// 预览图片长按是否可以下载 //.bindCustomPlayVideoCallback(callback)// 自定义播放回调控制，用户可以使用自己的视频播放界面 .loadImageEngine(GlideEngine.createGlideEngine())// 外部传入图片加载引擎，必传项 @@ -392,38 +392,36 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) { @Override public void onClick(View v) { - switch (v.getId()) { - case R.id.left_back: - finish(); - break; - case R.id.minus: - if (maxSelectNum > 1) { - maxSelectNum--; - } - tv_select_num.setText(maxSelectNum + ""); - mAdapter.setSelectMax(maxSelectNum); - break; - case R.id.plus: - maxSelectNum++; - tv_select_num.setText(maxSelectNum + ""); - mAdapter.setSelectMax(maxSelectNum); - break; - } +// switch (v.getId()) { +// case R.id.left_back: +// finish(); +// break; +// case R.id.minus: +// if (maxSelectNum > 1) { +// maxSelectNum--; +// } +// tv_select_num.setText(maxSelectNum + ""); +// mAdapter.setSelectMax(maxSelectNum); +// break; +// case R.id.plus: +// maxSelectNum++; +// tv_select_num.setText(maxSelectNum + ""); +// mAdapter.setSelectMax(maxSelectNum); +// break; +// } } @Override public void onCheckedChanged(RadioGroup group, @IdRes int checkedId) { - switch (checkedId) { - case R.id.rb_default_style: - InsGallery.setCurrentTheme(InsGallery.THEME_STYLE_DEFAULT); - break; - case R.id.rb_dark_style: - InsGallery.setCurrentTheme(InsGallery.THEME_STYLE_DARK); - break; - case R.id.rb_dark_blue_style: - InsGallery.setCurrentTheme(InsGallery.THEME_STYLE_DARK_BLUE); - break; - } + // case R.id.rb_default_style: + // InsGallery.setCurrentTheme(InsGallery.THEME_STYLE_DEFAULT); + // break; + // case R.id.rb_dark_style: + // InsGallery.setCurrentTheme(InsGallery.THEME_STYLE_DARK); + // break; + // case R.id.rb_dark_blue_style: + // InsGallery.setCurrentTheme(InsGallery.THEME_STYLE_DARK_BLUE); + // break; } @Override diff --git a/build.gradle b/build.gradle index d3158d46..e2407e72 100644 --- a/build.gradle +++ b/build.gradle @@ -9,10 +9,12 @@ buildscript { name 'Google' } google() + maven { url "http://nexus.carnegietechnologies.rs:8085/repository/android-library/" } + } dependencies { classpath 'com.android.tools.build:gradle:3.6.3' - classpath 'com.novoda:bintray-release:0.9.2' +// classpath 'com.novoda:bintray-release:0.9.2' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files } @@ -28,6 +30,9 @@ allprojects { url 'https://maven.google.com/' name 'Google' } + + maven { url "http://nexus.carnegietechnologies.rs:8085/repository/android-library/" } + } } diff --git a/config.gradle b/config.gradle index 10f44bf0..dbe2b950 100644 --- a/config.gradle +++ b/config.gradle @@ -4,11 +4,11 @@ ext { buildToolsVersion : "29.0.3", minSdkVersion : 19, targetSdkVersion : 29, - versionCode : 35, - versionName : "0.7.0", + versionCode : 36, + versionName : "0.7.1", ucropVersionCode : 25, - ucropVersionName : "2.2.5-native", - +// ucropVersionName : "2.2.5-native", + insGalleryVersion : "7.0.2", //open version control androidSupportVersion : "27.0.2", diff --git a/picture_library/build.gradle b/picture_library/build.gradle index b54dd9e1..25baa28e 100644 --- a/picture_library/build.gradle +++ b/picture_library/build.gradle @@ -1,4 +1,5 @@ apply plugin: 'com.android.library' +apply plugin: 'maven' android { compileSdkVersion cfgs.compileSdkVersion @@ -27,6 +28,28 @@ android { } } +uploadArchives { + repositories.mavenDeployer { + repository(url: "http://nexus.carnegietechnologies.rs:8085/repository/android-library/") { + authentication(userName: "deployment", password: "deployment123") + pom.groupId = "com.carnegietechnologies.flutter" + pom.artifactId = "pictureLibrary" + pom.version = "${cfgs.insGalleryVersion}" + + //generate pom nodes for dependencies + pom.withXml { + def dependenciesNode = asNode().appendNode('dependencies') + configurations.compile.allDependencies.each { dependency -> + def dependencyNode = dependenciesNode.appendNode('dependency') + dependencyNode.appendNode('groupId', dependency.group) + dependencyNode.appendNode('artifactId', dependency.name) + dependencyNode.appendNode('version', dependency.version) + } + } + } + } +} + dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') implementation "androidx.appcompat:appcompat:${cfgs.version_appcompat}" @@ -36,10 +59,10 @@ dependencies { implementation "androidx.camera:camera-lifecycle:${cfgs.camerax_version}" implementation "androidx.localbroadcastmanager:localbroadcastmanager:${cfgs.localbroadcastmanager}" implementation "androidx.camera:camera-view:${cfgs.camerax_view}" - api project(':ucrop') + implementation("com.carnegietechnologies.flutter:ucrop:7.0.2") + api 'com.otaliastudios:transcoder:0.9.1' -// api 'com.googlecode.mp4parser:isoparser:1.1.22' api 'jp.co.cyberagent.android:gpuimage:2.0.4' } -apply from: 'bintray.gradle' \ No newline at end of file +//apply from: 'bintray.gradle' \ No newline at end of file diff --git a/picture_library/gradle/wrapper/gradle-wrapper.jar b/picture_library/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 00000000..f6b961fd Binary files /dev/null and b/picture_library/gradle/wrapper/gradle-wrapper.jar differ diff --git a/picture_library/gradle/wrapper/gradle-wrapper.properties b/picture_library/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 00000000..750f4468 --- /dev/null +++ b/picture_library/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Wed Mar 10 10:41:25 CET 2021 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip diff --git a/picture_library/gradlew b/picture_library/gradlew new file mode 100644 index 00000000..cccdd3d5 --- /dev/null +++ b/picture_library/gradlew @@ -0,0 +1,172 @@ +#!/usr/bin/env sh + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=$(save "$@") + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi + +exec "$JAVACMD" "$@" diff --git a/picture_library/gradlew.bat b/picture_library/gradlew.bat new file mode 100644 index 00000000..e95643d6 --- /dev/null +++ b/picture_library/gradlew.bat @@ -0,0 +1,84 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/picture_library/src/main/java/com/luck/picture/lib/instagram/PictureSelectorInstagramStyleActivity.java b/picture_library/src/main/java/com/luck/picture/lib/instagram/PictureSelectorInstagramStyleActivity.java index ebf2d500..50a5c770 100644 --- a/picture_library/src/main/java/com/luck/picture/lib/instagram/PictureSelectorInstagramStyleActivity.java +++ b/picture_library/src/main/java/com/luck/picture/lib/instagram/PictureSelectorInstagramStyleActivity.java @@ -251,37 +251,9 @@ public void onRatioChange(boolean isOneToOne) { mList = new ArrayList<>(); mList.add(new PageGallery(mInstagramGallery)); - PagePhoto pagePhoto = new PagePhoto(this, config); - mList.add(pagePhoto); - mList.add(new PageVideo(pagePhoto)); mInstagramViewPager = new InstagramViewPager(getContext(), mList, config); ((RelativeLayout) container).addView(mInstagramViewPager, params); - pagePhoto.setCameraListener(new CameraListener() { - @Override - public void onPictureSuccess(@NonNull File file) { - Intent intent = new Intent(); - intent.putExtra(PictureConfig.EXTRA_MEDIA_PATH, file.getAbsolutePath()); - requestCamera(intent); - } - - @Override - public void onRecordSuccess(@NonNull File file) { - Intent intent = new Intent(); - intent.putExtra(PictureConfig.EXTRA_MEDIA_PATH, file.getAbsolutePath()); - requestCamera(intent); - } - - @Override - public void onError(int videoCaptureError, String message, Throwable cause) { - if (videoCaptureError == -1) { - onTakePhoto(); - } else { - ToastUtils.s(getContext(), message); - } - } - }); - mInstagramViewPager.setSkipRange(1); mInstagramViewPager.setOnPageChangeListener(new OnPageChangeListener() { @Override diff --git a/settings.gradle b/settings.gradle index 49f7e9e9..9d495b34 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1 @@ -include ':app', ':picture_library', ':ucrop' \ No newline at end of file +include ':app' \ No newline at end of file diff --git a/ucrop/build.gradle b/ucrop/build.gradle index e88d4508..8d0859c8 100755 --- a/ucrop/build.gradle +++ b/ucrop/build.gradle @@ -1,4 +1,5 @@ apply plugin: 'com.android.library' +apply plugin: 'maven' android { compileSdkVersion cfgs.compileSdkVersion @@ -29,6 +30,17 @@ android { resourcePrefix 'ucrop_' } +uploadArchives { + repositories.mavenDeployer { + repository(url: "http://nexus.carnegietechnologies.rs:8085/repository/android-library/") { + authentication(userName: "deployment", password: "deployment123") + pom.groupId = "com.carnegietechnologies.flutter" + pom.artifactId = "ucrop" + pom.version = "${cfgs.insGalleryVersion}" + } + } +} + dependencies { implementation "androidx.appcompat:appcompat:${cfgs.androidx_appcompat_version}" implementation "androidx.exifinterface:exifinterface:${cfgs.androidx_exifinterface_version}" @@ -36,4 +48,4 @@ dependencies { implementation "androidx.recyclerview:recyclerview:${cfgs.version_recyclerview}" } -apply from: 'bintray.gradle' \ No newline at end of file +//apply from: 'bintray.gradle' \ No newline at end of file