diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..aa724b7 --- /dev/null +++ b/.gitignore @@ -0,0 +1,15 @@ +*.iml +.gradle +/local.properties +/.idea/caches +/.idea/libraries +/.idea/modules.xml +/.idea/workspace.xml +/.idea/navEditor.xml +/.idea/assetWizardSettings.xml +.DS_Store +/build +/captures +.externalNativeBuild +.cxx +local.properties diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..26d3352 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,3 @@ +# Default ignored files +/shelf/ +/workspace.xml diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..fb7f4a8 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 0000000..9d0d2a8 --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,21 @@ + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..079974d --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/.gitignore b/app/.gitignore new file mode 100644 index 0000000..42afabf --- /dev/null +++ b/app/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle new file mode 100644 index 0000000..3a3acef --- /dev/null +++ b/app/build.gradle @@ -0,0 +1,35 @@ +plugins { + id 'com.android.application' +} + +android { + compileSdk 29 + + defaultConfig { + applicationId "com.york.locallogger" + minSdk 21 + targetSdk 29 + versionCode 1 + versionName "1.0" + + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } +} + +dependencies { + implementation 'androidx.appcompat:appcompat:1.2.0' + implementation 'com.google.android.material:material:1.3.0' + implementation 'androidx.constraintlayout:constraintlayout:2.0.4' + implementation project(':library') +} \ No newline at end of file diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro new file mode 100644 index 0000000..481bb43 --- /dev/null +++ b/app/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/app/src/androidTest/java/com/york/locallogger/ExampleInstrumentedTest.java b/app/src/androidTest/java/com/york/locallogger/ExampleInstrumentedTest.java new file mode 100644 index 0000000..6f9ec19 --- /dev/null +++ b/app/src/androidTest/java/com/york/locallogger/ExampleInstrumentedTest.java @@ -0,0 +1,26 @@ +package com.york.locallogger; + +import android.content.Context; + +import androidx.test.platform.app.InstrumentationRegistry; +import androidx.test.ext.junit.runners.AndroidJUnit4; + +import org.junit.Test; +import org.junit.runner.RunWith; + +import static org.junit.Assert.*; + +/** + * Instrumented test, which will execute on an Android device. + * + * @see Testing documentation + */ +@RunWith(AndroidJUnit4.class) +public class ExampleInstrumentedTest { + @Test + public void useAppContext() { + // Context of the app under test. + Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext(); + assertEquals("com.york.locallogger", appContext.getPackageName()); + } +} \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000..8facc93 --- /dev/null +++ b/app/src/main/AndroidManifest.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/com/york/locallogger/MainActivity.java b/app/src/main/java/com/york/locallogger/MainActivity.java new file mode 100644 index 0000000..4667df6 --- /dev/null +++ b/app/src/main/java/com/york/locallogger/MainActivity.java @@ -0,0 +1,30 @@ +package com.york.locallogger; + +import android.os.Bundle; +import android.view.View; + +import androidx.appcompat.app.AppCompatActivity; + +import com.york.library.ClientConfiguration; +import com.york.library.LogToFileUtils; +import com.york.library.YLog; + +public class MainActivity extends AppCompatActivity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_main); + ClientConfiguration clientConfiguration = new ClientConfiguration(); + clientConfiguration.setMaxLogSize(10 * 1024 * 1024); + //init log + LogToFileUtils.init(getApplicationContext(), clientConfiguration); + LogToFileUtils.getInstance().setUseSdCard(false); + //enable log + YLog.enableLog(); + //send a log +// YLog.logInfo("MainActivity开始写日志啦", true); + + findViewById(R.id.tv_add).setOnClickListener(v -> YLog.logInfo("MainActivity开始写日志啦"+System.currentTimeMillis(), true)); + } +} \ No newline at end of file diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml new file mode 100644 index 0000000..2b068d1 --- /dev/null +++ b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml new file mode 100644 index 0000000..07d5da9 --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,170 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml new file mode 100644 index 0000000..4d26d67 --- /dev/null +++ b/app/src/main/res/layout/activity_main.xml @@ -0,0 +1,19 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..eca70cf --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 0000000..eca70cf --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp new file mode 100644 index 0000000..c209e78 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp new file mode 100644 index 0000000..b2dfe3d Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp new file mode 100644 index 0000000..4f0f1d6 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp new file mode 100644 index 0000000..62b611d Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp new file mode 100644 index 0000000..948a307 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..1b9a695 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp new file mode 100644 index 0000000..28d4b77 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..9287f50 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp new file mode 100644 index 0000000..aa7d642 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..9126ae3 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml new file mode 100644 index 0000000..8399497 --- /dev/null +++ b/app/src/main/res/values-night/themes.xml @@ -0,0 +1,16 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml new file mode 100644 index 0000000..f8c6127 --- /dev/null +++ b/app/src/main/res/values/colors.xml @@ -0,0 +1,10 @@ + + + #FFBB86FC + #FF6200EE + #FF3700B3 + #FF03DAC5 + #FF018786 + #FF000000 + #FFFFFFFF + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml new file mode 100644 index 0000000..2c23f50 --- /dev/null +++ b/app/src/main/res/values/strings.xml @@ -0,0 +1,3 @@ + + LocalLogger + \ No newline at end of file diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml new file mode 100644 index 0000000..f6ad900 --- /dev/null +++ b/app/src/main/res/values/themes.xml @@ -0,0 +1,16 @@ + + + + \ No newline at end of file diff --git a/app/src/test/java/com/york/locallogger/ExampleUnitTest.java b/app/src/test/java/com/york/locallogger/ExampleUnitTest.java new file mode 100644 index 0000000..627074a --- /dev/null +++ b/app/src/test/java/com/york/locallogger/ExampleUnitTest.java @@ -0,0 +1,17 @@ +package com.york.locallogger; + +import org.junit.Test; + +import static org.junit.Assert.*; + +/** + * Example local unit test, which will execute on the development machine (host). + * + * @see Testing documentation + */ +public class ExampleUnitTest { + @Test + public void addition_isCorrect() { + assertEquals(4, 2 + 2); + } +} \ No newline at end of file diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..216d57c --- /dev/null +++ b/build.gradle @@ -0,0 +1,17 @@ +// Top-level build file where you can add configuration options common to all sub-projects/modules. +buildscript { + repositories { + google() + mavenCentral() + } + dependencies { + classpath "com.android.tools.build:gradle:7.0.0" + + // NOTE: Do not place your application dependencies here; they belong + // in the individual module build.gradle files + } +} + +task clean(type: Delete) { + delete rootProject.buildDir +} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..52f5917 --- /dev/null +++ b/gradle.properties @@ -0,0 +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. +org.gradle.jvmargs=-Xmx2048m -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 +# AndroidX package structure to make it clearer which packages are bundled with the +# Android operating system, and which are packaged with your app"s APK +# https://developer.android.com/topic/libraries/support-library/androidx-rn +android.useAndroidX=true +# Automatically convert third-party libraries to use AndroidX +android.enableJetifier=true \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..e708b1c Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..62dc380 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Mon May 22 15:17:53 CST 2023 +distributionBase=GRADLE_USER_HOME +distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip +distributionPath=wrapper/dists +zipStorePath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..4f906e0 --- /dev/null +++ b/gradlew @@ -0,0 +1,185 @@ +#!/usr/bin/env sh + +# +# Copyright 2015 the original author or authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +## +## 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='"-Xmx64m" "-Xms64m"' + +# 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 or MSYS, switch paths to Windows format before running java +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; 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=`expr $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" + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..ac1b06f --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,89 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@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 Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@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="-Xmx64m" "-Xms64m" + +@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 execute + +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 execute + +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 + +: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 %* + +: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/library/.gitignore b/library/.gitignore new file mode 100644 index 0000000..42afabf --- /dev/null +++ b/library/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/library/build.gradle b/library/build.gradle new file mode 100644 index 0000000..9e92b5c --- /dev/null +++ b/library/build.gradle @@ -0,0 +1,37 @@ +plugins { + id 'com.android.library' +} + +android { + compileSdk 33 + + defaultConfig { + minSdk 21 + targetSdk 33 + versionCode 1 + versionName "1.0" + + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + consumerProguardFiles "consumer-rules.pro" + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } +} + +dependencies { + + implementation 'androidx.appcompat:appcompat:1.2.0' + implementation 'com.google.android.material:material:1.3.0' + testImplementation 'junit:junit:4.+' + androidTestImplementation 'androidx.test.ext:junit:1.1.2' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0' +} \ No newline at end of file diff --git a/library/consumer-rules.pro b/library/consumer-rules.pro new file mode 100644 index 0000000..e69de29 diff --git a/library/proguard-rules.pro b/library/proguard-rules.pro new file mode 100644 index 0000000..481bb43 --- /dev/null +++ b/library/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/library/src/androidTest/java/com/york/library/ExampleInstrumentedTest.java b/library/src/androidTest/java/com/york/library/ExampleInstrumentedTest.java new file mode 100644 index 0000000..63d68f7 --- /dev/null +++ b/library/src/androidTest/java/com/york/library/ExampleInstrumentedTest.java @@ -0,0 +1,26 @@ +package com.york.library; + +import android.content.Context; + +import androidx.test.platform.app.InstrumentationRegistry; +import androidx.test.ext.junit.runners.AndroidJUnit4; + +import org.junit.Test; +import org.junit.runner.RunWith; + +import static org.junit.Assert.*; + +/** + * Instrumented test, which will execute on an Android device. + * + * @see Testing documentation + */ +@RunWith(AndroidJUnit4.class) +public class ExampleInstrumentedTest { + @Test + public void useAppContext() { + // Context of the app under test. + Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext(); + assertEquals("com.york.library.test", appContext.getPackageName()); + } +} \ No newline at end of file diff --git a/library/src/main/AndroidManifest.xml b/library/src/main/AndroidManifest.xml new file mode 100644 index 0000000..8669f6d --- /dev/null +++ b/library/src/main/AndroidManifest.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/library/src/main/java/com/york/library/ClientConfiguration.java b/library/src/main/java/com/york/library/ClientConfiguration.java new file mode 100644 index 0000000..7e9f39a --- /dev/null +++ b/library/src/main/java/com/york/library/ClientConfiguration.java @@ -0,0 +1,24 @@ +package com.york.library; + +/** + * @author : York + * @time : 2023/5/22 + * @Description: + */ +public class ClientConfiguration { + private long max_log_size = 5 * 1024 * 1024; + + public long getMaxLogSize() { + return max_log_size; + } + + /** + * set max log file size default 5mb + * + * @param max_log_size + */ + public void setMaxLogSize(long max_log_size) { + this.max_log_size = max_log_size; + } + +} diff --git a/library/src/main/java/com/york/library/LogThreadPoolManager.java b/library/src/main/java/com/york/library/LogThreadPoolManager.java new file mode 100644 index 0000000..dfe52a0 --- /dev/null +++ b/library/src/main/java/com/york/library/LogThreadPoolManager.java @@ -0,0 +1,75 @@ +package com.york.library; + +import java.util.LinkedList; +import java.util.Queue; +import java.util.concurrent.ArrayBlockingQueue; +import java.util.concurrent.Executors; +import java.util.concurrent.RejectedExecutionHandler; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.ScheduledFuture; +import java.util.concurrent.ThreadFactory; +import java.util.concurrent.ThreadPoolExecutor; +import java.util.concurrent.TimeUnit; + +/** + * @author : York + * @time : 2023/5/22 + * @Description: + */ +public class LogThreadPoolManager { + private static final int SIZE_CORE_POOL = 1; + private static final int SIZE_MAX_POOL = 1; + private static final int TIME_KEEP_ALIVE = 5000; + private static final int SIZE_WORK_QUEUE = 500; + private static final int PERIOD_TASK_QOS = 1000; + private static final int SIZE_CACHE_QUEUE = 200; + private static LogThreadPoolManager sThreadPoolManager = new LogThreadPoolManager(); + private final Queue mTaskQueue = new LinkedList(); + private final RejectedExecutionHandler mHandler = new RejectedExecutionHandler() { + @Override + public void rejectedExecution(Runnable task, ThreadPoolExecutor executor) { + if (mTaskQueue.size() >= SIZE_CACHE_QUEUE) { + mTaskQueue.poll();//remove old + } + mTaskQueue.offer(task); + } + }; + private final ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(1); + private final ThreadPoolExecutor mThreadPool = new ThreadPoolExecutor(SIZE_CORE_POOL, SIZE_MAX_POOL, + TIME_KEEP_ALIVE, TimeUnit.MILLISECONDS, new ArrayBlockingQueue(SIZE_WORK_QUEUE), new ThreadFactory() { + @Override + public Thread newThread(Runnable r) { + return new Thread(r, "oss-android-log-thread"); + } + }, mHandler); + private final Runnable mAccessBufferThread = new Runnable() { + @Override + public void run() { + if (hasMoreAcquire()) { + mThreadPool.execute(mTaskQueue.poll()); + } + } + }; + protected final ScheduledFuture mTaskHandler = scheduler.scheduleAtFixedRate(mAccessBufferThread, 0, + PERIOD_TASK_QOS, TimeUnit.MILLISECONDS); + + private LogThreadPoolManager() { + } + + public static LogThreadPoolManager newInstance() { + if (sThreadPoolManager == null) { + sThreadPoolManager = new LogThreadPoolManager(); + } + return sThreadPoolManager; + } + + private boolean hasMoreAcquire() { + return !mTaskQueue.isEmpty(); + } + + public void addExecuteTask(Runnable task) { + if (task != null) { + mThreadPool.execute(task); + } + } +} \ No newline at end of file diff --git a/library/src/main/java/com/york/library/LogToFileUtils.java b/library/src/main/java/com/york/library/LogToFileUtils.java new file mode 100644 index 0000000..4ed9f39 --- /dev/null +++ b/library/src/main/java/com/york/library/LogToFileUtils.java @@ -0,0 +1,297 @@ +package com.york.library; + +import android.content.Context; +import android.os.Environment; +import android.os.StatFs; + +import java.io.File; +import java.io.FileWriter; +import java.io.IOException; +import java.io.PrintWriter; +import java.text.SimpleDateFormat; +import java.util.Date; + +/** + * @author : York + * @time : 2023/5/22 + * @Description: + */ +public class LogToFileUtils { + + private static final String LOG_DIR_NAME = "YorkLog"; + private static LogThreadPoolManager logService = LogThreadPoolManager.newInstance(); + /** + * Context Object + */ + private static Context sContext; + /** + * FileLogUtils instance + */ + private static LogToFileUtils instance; + /** + * file for log + */ + private static File sLogFile; + /** + * time format + */ + private static SimpleDateFormat sLogSDF = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + /** + * default 5M + */ + private static long LOG_MAX_SIZE = 5 * 1024 * 1024; //5mb + private boolean useSdCard = true; + + private LogToFileUtils() { + } + + /** + * init + * + * @param context + */ + public static void init(Context context, ClientConfiguration cfg) { + YLog.logDebug("init ...", false); + if (cfg != null) { + LOG_MAX_SIZE = cfg.getMaxLogSize(); + } + if (null == sContext || null == instance || null == sLogFile || !sLogFile.exists()) { + sContext = context.getApplicationContext(); + instance = getInstance(); + logService.addExecuteTask(new Runnable() { + @Override + public void run() { + sLogFile = instance.getLogFile(); + if (sLogFile != null) { + YLog.logInfo("LogFilePath is: " + sLogFile.getPath(), false); + // 获取当前日志文件大小 + long logFileSize = getLogFileSize(sLogFile); + // 若日志文件超出了预设大小,则重置日志文件 + if (LOG_MAX_SIZE < logFileSize) { + YLog.logInfo("init reset log file", false); + instance.resetLogFile(); + } + } + } + }); + } else { + YLog.logDebug("LogToFileUtils has been init ...", false); + } + } + + public static LogToFileUtils getInstance() { + if (instance == null) { + synchronized (LogToFileUtils.class) { + if (instance == null) { + instance = new LogToFileUtils(); + } + } + } + return instance; + } + + public static void reset() { + sContext = null; + instance = null; + sLogFile = null; + } + + /** + * file length + * + * @param file 文件 + * @return + */ + public static long getLogFileSize(File file) { + long size = 0; + if (file != null && file.exists()) { + size = file.length(); + } + return size; + } + + /** + * log size + * + * @return + */ + public static long getLocalLogFileSize() { + return getLogFileSize(sLogFile); + } + + private long readSDCardSpace() { + long sdCardSize = 0; + String state = Environment.getExternalStorageState(); + if (Environment.MEDIA_MOUNTED.equals(state)) { + File sdcardDir = Environment.getExternalStorageDirectory(); + StatFs sf = new StatFs(sdcardDir.getPath()); + long blockSize = sf.getBlockSize(); + long availCount = sf.getAvailableBlocks(); + sdCardSize = availCount * blockSize; + } + YLog.logDebug("sd卡存储空间:" + String.valueOf(sdCardSize) + "kb", false); + return sdCardSize; + } + + private long readSystemSpace() { + File root = Environment.getRootDirectory(); + StatFs sf = new StatFs(root.getPath()); + long blockSize = sf.getBlockSize(); + long availCount = sf.getAvailableBlocks(); + long systemSpaceSize = availCount * blockSize / 1024; + YLog.logDebug("内部存储空间:" + String.valueOf(systemSpaceSize) + "kb", false); + return systemSpaceSize; + } + + public void setUseSdCard(boolean useSdCard) { + this.useSdCard = useSdCard; + } + + /** + * set log file + */ + public void resetLogFile() { + YLog.logDebug("Reset Log File ... ", false); + + // 创建log.csv,若存在则删除 + if (!sLogFile.getParentFile().exists()) { + YLog.logDebug("Reset Log make File dir ... ", false); + sLogFile.getParentFile().mkdir(); + } + File logFile = new File(sLogFile.getParent() + "/logs.csv"); + if (logFile.exists()) { + logFile.delete(); + } + // 新建日志文件 + createNewFile(logFile); + } + + public void deleteLogFile() { + // 创建log.csv,若存在则删除 + File logFile = new File(sLogFile.getParent() + "/logs.csv"); + if (logFile.exists()) { + YLog.logDebug("delete Log File ... ", false); + logFile.delete(); + } + } + + public void deleteLogFileDir() { + // 创建log.csv,若存在则删除 + deleteLogFile(); + File dir = new File(Environment.getExternalStorageDirectory().getPath() + File.separator + LOG_DIR_NAME); + if (dir.exists()) { + YLog.logDebug("delete Log FileDir ... ", false); + dir.delete(); + } + } + + /** + * get log file + * + * @return APP日志文件 + */ + private File getLogFile() { + File file; + boolean canStorage = true; + // 判断是否有SD卡或者外部存储器 +// if (useSdCard && Environment.getExternalStorageState().equals(Environment.MEDIA_MOUNTED)) { +// canStorage = readSDCardSpace() > LOG_MAX_SIZE / 1024; +// // 有SD卡则使用SD - PS:没SD卡但是有外部存储器,会使用外部存储器 +// // SD\OSSLog\logs.csv +// file = new File(Environment.getExternalStorageDirectory().getPath() + File.separator + LOG_DIR_NAME); +// } else { + // 没有SD卡或者外部存储器,使用内部存储器 + // \data\data\包名\files\OSSLog\logs.csv +// canStorage = readSystemSpace() > LOG_MAX_SIZE / 1024; + file = new File(sContext.getFilesDir().getPath() + File.separator + LOG_DIR_NAME); +// } + File logFile = null; + // 若目录不存在则创建目录 + if (canStorage) { + if (!file.exists()) { + file.mkdirs(); + } + logFile = new File(file.getPath() + "/logs.csv"); + if (!logFile.exists()) { + createNewFile(logFile); + } + } + return logFile; + } + + public void createNewFile(File logFile) { + try { + logFile.createNewFile(); + } catch (Exception e) { + YLog.logError("Create log file failure !!! " + e.toString(), false); + } + } + + + private String getFunctionInfo(StackTraceElement[] ste) { + String msg = null; + if (ste == null) { + msg = "[" + sLogSDF.format(new java.util.Date()) + "]"; + } + return msg; + } + + public synchronized void write(Object str) { + if (YLog.isEnableLog()) { + // 判断是否初始化或者初始化是否成功 + if (null == sContext || null == instance || null == sLogFile) { + return; + } + if (!sLogFile.exists()) { + resetLogFile(); + } + WriteCall writeCall = new WriteCall(str); + logService.addExecuteTask(writeCall); + } + } + + private static class WriteCall implements Runnable { + + private Object mStr; + + public WriteCall(Object mStr) { + this.mStr = mStr; + } + + @Override + public void run() { + if (sLogFile != null) { + long logFileSize = getInstance().getLogFileSize(sLogFile); + // 若日志文件超出了预设大小,则重置日志文件 + if (logFileSize > LOG_MAX_SIZE) { + getInstance().resetLogFile(); + } + //输出流操作 输出日志信息至本地存储空间内 + PrintWriter pw; + try { + pw = new PrintWriter(new FileWriter(sLogFile, true), true); + if (pw != null) { + if (mStr instanceof Throwable) { + //写入异常信息 + printEx(pw); + } else { + //写入普通log + pw.println(getInstance().getFunctionInfo(null) + " - " + mStr.toString()); + } + pw.println("------>end of log"); + pw.println(); + pw.close(); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + } + + private PrintWriter printEx(PrintWriter pw) { + pw.println("crash_time:" + sLogSDF.format(new Date())); + ((Throwable) mStr).printStackTrace(pw); + return pw; + } + } +} \ No newline at end of file diff --git a/library/src/main/java/com/york/library/YLog.java b/library/src/main/java/com/york/library/YLog.java new file mode 100644 index 0000000..58e12ef --- /dev/null +++ b/library/src/main/java/com/york/library/YLog.java @@ -0,0 +1,155 @@ +package com.york.library; + +import android.util.Log; + +/** + * @author : York + * @time : 2023/5/22 + * @Description: + */ +public class YLog { + + private static final String TAG = "YLog-Android"; + private static boolean enableLog = false; + + /** + * enable log + */ + public static void enableLog() { + enableLog = true; + } + + /** + * disable log + */ + public static void disableLog() { + enableLog = false; + } + + /** + * @return return log flag + */ + public static boolean isEnableLog() { + return enableLog; + } + + /** + * info level log + * + * @param msg + */ + public static void logInfo(String msg) { + logInfo(msg, true); + } + + public static void logInfo(String msg, boolean write2local) { + if (enableLog) { + Log.i(TAG, "[INFO]: ".concat(msg)); + log2Local(msg, write2local); + } + } + + /** + * verbose level log + * + * @param msg + */ + public static void logVerbose(String msg) { + logVerbose(msg, true); + } + + public static void logVerbose(String msg, boolean write2local) { + if (enableLog) { + Log.v(TAG, "[Verbose]: ".concat(msg)); + log2Local(msg, write2local); + } + } + + /** + * warning level log + * + * @param msg + */ + public static void logWarn(String msg) { + logWarn(msg, true); + } + + public static void logWarn(String msg, boolean write2local) { + if (enableLog) { + Log.w(TAG, "[Warn]: ".concat(msg)); + log2Local(msg, write2local); + } + } + + /** + * debug level log + * + * @param msg + */ + public static void logDebug(String msg) { + logDebug(TAG, msg); + } + + public static void logDebug(String tag, String msg) { + logDebug(tag, msg, true); + } + + /** + * debug级别log + * + * @param write2local 是否需要写入本地 + * @param msg + */ + public static void logDebug(String msg, boolean write2local) { + logDebug(TAG, msg, write2local); + } + + public static void logDebug(String tag, String msg, boolean write2local) { + if (enableLog) { + Log.d(tag, "[Debug]: ".concat(msg)); + log2Local(msg, write2local); + } + } + + /** + * error level log + * + * @param msg + */ + public static void logError(String msg) { + logError(TAG, msg); + } + + public static void logError(String tag, String msg) { + logDebug(tag, msg, true); + } + + /** + * error级别log + * + * @param msg + */ + public static void logError(String msg, boolean write2local) { + logError(TAG, msg, write2local); + } + + public static void logError(String tag, String msg, boolean write2local) { + if (enableLog) { + Log.d(tag, "[Error]: ".concat(msg)); + log2Local(msg, write2local); + } + } + + public static void logThrowable2Local(Throwable throwable) { + if (enableLog) { + LogToFileUtils.getInstance().write(throwable); + } + } + + private static void log2Local(String msg, boolean write2local) { + if (write2local) { + LogToFileUtils.getInstance().write(msg); + } + } + +} \ No newline at end of file diff --git a/library/src/test/java/com/york/library/ExampleUnitTest.java b/library/src/test/java/com/york/library/ExampleUnitTest.java new file mode 100644 index 0000000..2e3fcfe --- /dev/null +++ b/library/src/test/java/com/york/library/ExampleUnitTest.java @@ -0,0 +1,17 @@ +package com.york.library; + +import org.junit.Test; + +import static org.junit.Assert.*; + +/** + * Example local unit test, which will execute on the development machine (host). + * + * @see Testing documentation + */ +public class ExampleUnitTest { + @Test + public void addition_isCorrect() { + assertEquals(4, 2 + 2); + } +} \ No newline at end of file diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..ff0003e --- /dev/null +++ b/settings.gradle @@ -0,0 +1,11 @@ +dependencyResolutionManagement { + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + repositories { + google() + mavenCentral() + jcenter() // Warning: this repository is going to shut down soon + } +} +rootProject.name = "LocalLogger" +include ':app' +include ':library'