diff --git a/android/SensorMonitor/.gitignore b/android/SensorMonitor/.gitignore new file mode 100644 index 0000000..39fb081 --- /dev/null +++ b/android/SensorMonitor/.gitignore @@ -0,0 +1,9 @@ +*.iml +.gradle +/local.properties +/.idea/workspace.xml +/.idea/libraries +.DS_Store +/build +/captures +.externalNativeBuild diff --git a/android/SensorMonitor/.idea/gradle.xml b/android/SensorMonitor/.idea/gradle.xml new file mode 100644 index 0000000..7ac24c7 --- /dev/null +++ b/android/SensorMonitor/.idea/gradle.xml @@ -0,0 +1,18 @@ + + + + + + \ No newline at end of file diff --git a/android/SensorMonitor/.idea/misc.xml b/android/SensorMonitor/.idea/misc.xml new file mode 100644 index 0000000..ba7052b --- /dev/null +++ b/android/SensorMonitor/.idea/misc.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/android/SensorMonitor/.idea/modules.xml b/android/SensorMonitor/.idea/modules.xml new file mode 100644 index 0000000..6e6ea40 --- /dev/null +++ b/android/SensorMonitor/.idea/modules.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/android/SensorMonitor/.idea/runConfigurations.xml b/android/SensorMonitor/.idea/runConfigurations.xml new file mode 100644 index 0000000..7f68460 --- /dev/null +++ b/android/SensorMonitor/.idea/runConfigurations.xml @@ -0,0 +1,12 @@ + + + + + + \ No newline at end of file diff --git a/android/SensorMonitor/app/.gitignore b/android/SensorMonitor/app/.gitignore new file mode 100644 index 0000000..796b96d --- /dev/null +++ b/android/SensorMonitor/app/.gitignore @@ -0,0 +1 @@ +/build diff --git a/android/SensorMonitor/app/build.gradle b/android/SensorMonitor/app/build.gradle new file mode 100644 index 0000000..90064f9 --- /dev/null +++ b/android/SensorMonitor/app/build.gradle @@ -0,0 +1,33 @@ +apply plugin: 'com.android.application' + +apply plugin: 'kotlin-android' + +android { + compileSdkVersion 25 + buildToolsVersion "25.0.3" + defaultConfig { + applicationId "xyz.mtfos.sensormonitor" + minSdkVersion 15 + targetSdkVersion 25 + versionCode 1 + versionName "1.0" + testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + } + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + } + } +} + +dependencies { + 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' + }) + implementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version" + implementation 'com.android.support:appcompat-v7:25.3.1' + testImplementation 'junit:junit:4.12' + implementation 'com.android.support.constraint:constraint-layout:1.0.2' +} diff --git a/android/SensorMonitor/app/proguard-rules.pro b/android/SensorMonitor/app/proguard-rules.pro new file mode 100644 index 0000000..61fad41 --- /dev/null +++ b/android/SensorMonitor/app/proguard-rules.pro @@ -0,0 +1,25 @@ +# Add project specific ProGuard rules here. +# By default, the flags in this file are appended to flags specified +# in /Users/otakukaze/Library/Android/sdk/tools/proguard/proguard-android.txt +# You can edit the include path and order by changing the proguardFiles +# directive in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# Add any project specific keep options here: + +# 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 diff --git a/android/SensorMonitor/app/src/androidTest/java/xyz/mtfos/sensormonitor/ExampleInstrumentedTest.kt b/android/SensorMonitor/app/src/androidTest/java/xyz/mtfos/sensormonitor/ExampleInstrumentedTest.kt new file mode 100644 index 0000000..951014a --- /dev/null +++ b/android/SensorMonitor/app/src/androidTest/java/xyz/mtfos/sensormonitor/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package xyz.mtfos.sensormonitor + +import android.support.test.InstrumentationRegistry +import android.support.test.runner.AndroidJUnit4 + +import org.junit.Test +import org.junit.runner.RunWith + +import org.junit.Assert.* + +/** + * Instrumented test, which will execute on an Android device. + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +@RunWith(AndroidJUnit4::class) +class ExampleInstrumentedTest { + @Test + fun useAppContext() { + // Context of the app under test. + val appContext = InstrumentationRegistry.getTargetContext() + assertEquals("xyz.mtfos.sensormonitor", appContext.packageName) + } +} diff --git a/android/SensorMonitor/app/src/main/AndroidManifest.xml b/android/SensorMonitor/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000..5cdd3cc --- /dev/null +++ b/android/SensorMonitor/app/src/main/AndroidManifest.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/android/SensorMonitor/app/src/main/java/xyz/mtfos/sensormonitor/MainActivity.kt b/android/SensorMonitor/app/src/main/java/xyz/mtfos/sensormonitor/MainActivity.kt new file mode 100644 index 0000000..a8629e9 --- /dev/null +++ b/android/SensorMonitor/app/src/main/java/xyz/mtfos/sensormonitor/MainActivity.kt @@ -0,0 +1,12 @@ +package xyz.mtfos.sensormonitor + +import android.support.v7.app.AppCompatActivity +import android.os.Bundle + +class MainActivity : AppCompatActivity() { + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_main) + } +} diff --git a/android/SensorMonitor/app/src/main/res/layout/activity_main.xml b/android/SensorMonitor/app/src/main/res/layout/activity_main.xml new file mode 100644 index 0000000..50c190b --- /dev/null +++ b/android/SensorMonitor/app/src/main/res/layout/activity_main.xml @@ -0,0 +1,18 @@ + + + + + + diff --git a/android/SensorMonitor/app/src/main/res/mipmap-hdpi/ic_launcher.png b/android/SensorMonitor/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000..5507303 Binary files /dev/null and b/android/SensorMonitor/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/android/SensorMonitor/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/android/SensorMonitor/app/src/main/res/mipmap-hdpi/ic_launcher_round.png new file mode 100644 index 0000000..8fab6a3 Binary files /dev/null and b/android/SensorMonitor/app/src/main/res/mipmap-hdpi/ic_launcher_round.png differ diff --git a/android/SensorMonitor/app/src/main/res/mipmap-mdpi/ic_launcher.png b/android/SensorMonitor/app/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 0000000..6bc7fcd Binary files /dev/null and b/android/SensorMonitor/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/android/SensorMonitor/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/android/SensorMonitor/app/src/main/res/mipmap-mdpi/ic_launcher_round.png new file mode 100644 index 0000000..1eecc0e Binary files /dev/null and b/android/SensorMonitor/app/src/main/res/mipmap-mdpi/ic_launcher_round.png differ diff --git a/android/SensorMonitor/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/android/SensorMonitor/app/src/main/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 0000000..ec87dce Binary files /dev/null and b/android/SensorMonitor/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/android/SensorMonitor/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/android/SensorMonitor/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png new file mode 100644 index 0000000..05ca079 Binary files /dev/null and b/android/SensorMonitor/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ diff --git a/android/SensorMonitor/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/android/SensorMonitor/app/src/main/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 0000000..6f67f21 Binary files /dev/null and b/android/SensorMonitor/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/android/SensorMonitor/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/android/SensorMonitor/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png new file mode 100644 index 0000000..8bac0f2 Binary files /dev/null and b/android/SensorMonitor/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ diff --git a/android/SensorMonitor/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/android/SensorMonitor/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 0000000..0327e13 Binary files /dev/null and b/android/SensorMonitor/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/android/SensorMonitor/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/android/SensorMonitor/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png new file mode 100644 index 0000000..bacd3e7 Binary files /dev/null and b/android/SensorMonitor/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ diff --git a/android/SensorMonitor/app/src/main/res/values/colors.xml b/android/SensorMonitor/app/src/main/res/values/colors.xml new file mode 100644 index 0000000..3ab3e9c --- /dev/null +++ b/android/SensorMonitor/app/src/main/res/values/colors.xml @@ -0,0 +1,6 @@ + + + #3F51B5 + #303F9F + #FF4081 + diff --git a/android/SensorMonitor/app/src/main/res/values/strings.xml b/android/SensorMonitor/app/src/main/res/values/strings.xml new file mode 100644 index 0000000..925740b --- /dev/null +++ b/android/SensorMonitor/app/src/main/res/values/strings.xml @@ -0,0 +1,3 @@ + + SensorMonitor + diff --git a/android/SensorMonitor/app/src/main/res/values/styles.xml b/android/SensorMonitor/app/src/main/res/values/styles.xml new file mode 100644 index 0000000..5885930 --- /dev/null +++ b/android/SensorMonitor/app/src/main/res/values/styles.xml @@ -0,0 +1,11 @@ + + + + + + diff --git a/android/SensorMonitor/app/src/test/java/xyz/mtfos/sensormonitor/ExampleUnitTest.kt b/android/SensorMonitor/app/src/test/java/xyz/mtfos/sensormonitor/ExampleUnitTest.kt new file mode 100644 index 0000000..cdc140a --- /dev/null +++ b/android/SensorMonitor/app/src/test/java/xyz/mtfos/sensormonitor/ExampleUnitTest.kt @@ -0,0 +1,17 @@ +package xyz.mtfos.sensormonitor + +import org.junit.Test + +import org.junit.Assert.* + +/** + * Example local unit test, which will execute on the development machine (host). + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +class ExampleUnitTest { + @Test + fun addition_isCorrect() { + assertEquals(4, 2 + 2) + } +} diff --git a/android/SensorMonitor/build.gradle b/android/SensorMonitor/build.gradle new file mode 100644 index 0000000..f21634f --- /dev/null +++ b/android/SensorMonitor/build.gradle @@ -0,0 +1,28 @@ +// Top-level build file where you can add configuration options common to all sub-projects/modules. + +buildscript { + ext.kotlin_version = '1.1.2-4' + repositories { + maven { url 'https://maven.google.com' } + jcenter() + } + dependencies { + classpath 'com.android.tools.build:gradle:3.0.0-alpha3' + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" + + // NOTE: Do not place your application dependencies here; they belong + // in the individual module build.gradle files + } +} + +allprojects { + repositories { + maven { url 'https://maven.google.com' } + jcenter() + mavenCentral() + } +} + +task clean(type: Delete) { + delete rootProject.buildDir +} diff --git a/android/SensorMonitor/gradle.properties b/android/SensorMonitor/gradle.properties new file mode 100644 index 0000000..aac7c9b --- /dev/null +++ b/android/SensorMonitor/gradle.properties @@ -0,0 +1,17 @@ +# 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=-Xmx1536m + +# 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 diff --git a/android/SensorMonitor/gradle/wrapper/gradle-wrapper.jar b/android/SensorMonitor/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..13372ae Binary files /dev/null and b/android/SensorMonitor/gradle/wrapper/gradle-wrapper.jar differ diff --git a/android/SensorMonitor/gradle/wrapper/gradle-wrapper.properties b/android/SensorMonitor/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..3d6088b --- /dev/null +++ b/android/SensorMonitor/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Mon Jun 05 15:19:23 CST 2017 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-4.0-milestone-1-all.zip diff --git a/android/SensorMonitor/gradlew b/android/SensorMonitor/gradlew new file mode 100755 index 0000000..9d82f78 --- /dev/null +++ b/android/SensorMonitor/gradlew @@ -0,0 +1,160 @@ +#!/usr/bin/env bash + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# 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 +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; +esac + +# 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 + +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" ] ; 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 + +# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules +function splitJvmOpts() { + JVM_OPTS=("$@") +} +eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS +JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" + +exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" diff --git a/android/SensorMonitor/gradlew.bat b/android/SensorMonitor/gradlew.bat new file mode 100644 index 0000000..aec9973 --- /dev/null +++ b/android/SensorMonitor/gradlew.bat @@ -0,0 +1,90 @@ +@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 + +@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= + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@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 Windowz variants + +if not "%OS%" == "Windows_NT" goto win9xME_args +if "%@eval[2+2]" == "4" goto 4NT_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=%* +goto execute + +:4NT_args +@rem Get arguments from the 4NT Shell from JP Software +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/android/SensorMonitor/settings.gradle b/android/SensorMonitor/settings.gradle new file mode 100644 index 0000000..e7b4def --- /dev/null +++ b/android/SensorMonitor/settings.gradle @@ -0,0 +1 @@ +include ':app' diff --git a/server-api/route/api/account.js b/server-api/route/api/account.js index b86d99a..2139d14 100644 --- a/server-api/route/api/account.js +++ b/server-api/route/api/account.js @@ -152,8 +152,13 @@ router } if (user.length == 0) throw 'CE0007'; - let ramdomToken = crypto.random(10); - let + let randomToken = crypto.random(10); + try { + await mem.setVal(randomToken, JSON.stringify(user[0]), 7200); + } catch (err) { + c.serr = err; + throw 'SE0005'; + } }) diff --git a/server-api/route/api/errorManager/language/zh.js b/server-api/route/api/errorManager/language/zh.js index d94df97..34d19a8 100644 --- a/server-api/route/api/errorManager/language/zh.js +++ b/server-api/route/api/errorManager/language/zh.js @@ -16,5 +16,6 @@ module.exports = { SE0000: '資料查詢失敗', SE0001: '資料新增失敗', SE0002: '資料更新失敗', - SE0003: '資料刪除失敗' + SE0003: '資料刪除失敗', + SE0005: '快取資料設定失敗', } \ No newline at end of file