Skip to content

M
MxPad
Commit 8e7cea1e by 一giao
Options

1、刷新按钮；2、控制时的动画去除；3、本地、云端控制的逻辑修改

parent 37262ba1
Showing with 84 additions and 81 deletions
.DS_Store
No preview for this file type
app/.DS_Store
No preview for this file type
app/.cxx/ndkBuild/debug/armeabi-v7a/json_generation_record.json
...@@ -7,7 +7,61 @@ ...@@ -7,7 +7,61 @@
}, },
{ {
"level": "INFO", "level": "INFO",
"message": "JSON \u0027/Users/qaq/lierda/MxPadX_86/app/.cxx/ndkBuild/debug/armeabi-v7a/android_gradle_build.json\u0027 was up-to-date", "message": "rebuilding JSON /Users/qaq/lierda/MxPadX_86/app/.cxx/ndkBuild/debug/armeabi-v7a/android_gradle_build.json due to:",
"file": "/Users/qaq/lierda/MxPadX_86/app/src/main/jni/Android.mk",
"tag": "debug|armeabi-v7a"
},
{
"level": "INFO",
"message": "- force flag, will remove stale json folder",
"file": "/Users/qaq/lierda/MxPadX_86/app/src/main/jni/Android.mk",
"tag": "debug|armeabi-v7a"
},
{
"level": "INFO",
"message": "removing stale contents from \u0027/Users/qaq/lierda/MxPadX_86/app/.cxx/ndkBuild/debug/armeabi-v7a\u0027",
"file": "/Users/qaq/lierda/MxPadX_86/app/src/main/jni/Android.mk",
"tag": "debug|armeabi-v7a"
},
{
"level": "INFO",
"message": "created folder \u0027/Users/qaq/lierda/MxPadX_86/app/.cxx/ndkBuild/debug/armeabi-v7a\u0027",
"file": "/Users/qaq/lierda/MxPadX_86/app/src/main/jni/Android.mk",
"tag": "debug|armeabi-v7a"
},
{
"level": "INFO",
"message": "executing ndkBuild Executable : /Users/qaq/SDK/android-sdk-macosx/ndk/20.0.5594570/ndk-build\narguments : \nNDK_PROJECT_PATH\u003dnull\nAPP_BUILD_SCRIPT\u003d/Users/qaq/lierda/MxPadX_86/app/src/main/jni/Android.mk\nAPP_ABI\u003darmeabi-v7a\nNDK_ALL_ABIS\u003darmeabi-v7a\nNDK_DEBUG\u003d1\nAPP_PLATFORM\u003dandroid-19\nNDK_OUT\u003d/Users/qaq/lierda/MxPadX_86/app/build/intermediates/ndkBuild/debug/obj\nNDK_LIBS_OUT\u003d/Users/qaq/lierda/MxPadX_86/app/build/intermediates/ndkBuild/debug/lib\nAPP_SHORT_COMMANDS\u003dfalse\nLOCAL_SHORT_COMMANDS\u003dfalse\n-B\n-n\njvmArgs : \n\n",
"file": "/Users/qaq/lierda/MxPadX_86/app/src/main/jni/Android.mk",
"tag": "debug|armeabi-v7a"
},
{
"level": "INFO",
"message": "Executable : /Users/qaq/SDK/android-sdk-macosx/ndk/20.0.5594570/ndk-build\narguments : \nNDK_PROJECT_PATH\u003dnull\nAPP_BUILD_SCRIPT\u003d/Users/qaq/lierda/MxPadX_86/app/src/main/jni/Android.mk\nAPP_ABI\u003darmeabi-v7a\nNDK_ALL_ABIS\u003darmeabi-v7a\nNDK_DEBUG\u003d1\nAPP_PLATFORM\u003dandroid-19\nNDK_OUT\u003d/Users/qaq/lierda/MxPadX_86/app/build/intermediates/ndkBuild/debug/obj\nNDK_LIBS_OUT\u003d/Users/qaq/lierda/MxPadX_86/app/build/intermediates/ndkBuild/debug/lib\nAPP_SHORT_COMMANDS\u003dfalse\nLOCAL_SHORT_COMMANDS\u003dfalse\n-B\n-n\njvmArgs : \n\n",
"file": "/Users/qaq/lierda/MxPadX_86/app/src/main/jni/Android.mk",
"tag": "debug|armeabi-v7a"
},
{
"level": "INFO",
"message": "done executing ndkBuild",
"file": "/Users/qaq/lierda/MxPadX_86/app/src/main/jni/Android.mk",
"tag": "debug|armeabi-v7a"
},
{
"level": "INFO",
"message": "write build output /Users/qaq/lierda/MxPadX_86/app/.cxx/ndkBuild/debug/armeabi-v7a/build_output.txt",
"file": "/Users/qaq/lierda/MxPadX_86/app/src/main/jni/Android.mk",
"tag": "debug|armeabi-v7a"
},
{
"level": "INFO",
"message": "parse and convert ndk-build output to build configuration JSON",
"file": "/Users/qaq/lierda/MxPadX_86/app/src/main/jni/Android.mk",
"tag": "debug|armeabi-v7a"
},
{
"level": "INFO",
"message": "write command file /Users/qaq/lierda/MxPadX_86/app/.cxx/ndkBuild/debug/armeabi-v7a/build_command.txt",
"file": "/Users/qaq/lierda/MxPadX_86/app/src/main/jni/Android.mk", "file": "/Users/qaq/lierda/MxPadX_86/app/src/main/jni/Android.mk",
"tag": "debug|armeabi-v7a" "tag": "debug|armeabi-v7a"
}, },
......
app/.cxx/ndkBuild/release/armeabi-v7a/android_gradle_build_Serial_Port_armeabi-v7a.command.txt 0 → 100644
Executable : /Users/qaq/SDK/android-sdk-macosx/ndk/20.0.5594570/ndk-build
arguments :
NDK_PROJECT_PATH=null
APP_BUILD_SCRIPT=/Users/qaq/lierda/MxPadX_86/app/src/main/jni/Android.mk
APP_ABI=armeabi-v7a
NDK_ALL_ABIS=armeabi-v7a
NDK_DEBUG=0
APP_PLATFORM=android-19
NDK_OUT=/Users/qaq/lierda/MxPadX_86/app/build/intermediates/ndkBuild/release/obj
NDK_LIBS_OUT=/Users/qaq/lierda/MxPadX_86/app/build/intermediates/ndkBuild/release/lib
Serial_Port
jvmArgs :
app/.cxx/ndkBuild/release/armeabi-v7a/android_gradle_build_Serial_Port_armeabi-v7a.stdout.txt 0 → 100644
[armeabi-v7a] Compile thumb : Serial_Port <= SerialPort.c
[armeabi-v7a] SharedLibrary : libSerial_Port.so
app/.cxx/ndkBuild/release/armeabi-v7a/json_generation_record.json
...@@ -7,73 +7,7 @@ ...@@ -7,73 +7,7 @@
}, },
{ {
"level": "INFO", "level": "INFO",
"message": "rebuilding JSON /Users/qaq/lierda/MxPadX_86/app/.cxx/ndkBuild/release/armeabi-v7a/android_gradle_build.json due to:", "message": "JSON \u0027/Users/qaq/lierda/MxPadX_86/app/.cxx/ndkBuild/release/armeabi-v7a/android_gradle_build.json\u0027 was up-to-date",
"file": "/Users/qaq/lierda/MxPadX_86/app/src/main/jni/Android.mk",
"tag": "release|armeabi-v7a"
},
{
"level": "INFO",
"message": "- command changed from previous, will remove stale json folder",
"file": "/Users/qaq/lierda/MxPadX_86/app/src/main/jni/Android.mk",
"tag": "release|armeabi-v7a"
},
{
"level": "INFO",
"message": "- a dependent build file changed",
"file": "/Users/qaq/lierda/MxPadX_86/app/src/main/jni/Android.mk",
"tag": "release|armeabi-v7a"
},
{
"level": "INFO",
"message": " - /Users/qaq/lierda/mxpadX86/app/src/main/jni/Android.mk",
"file": "/Users/qaq/lierda/MxPadX_86/app/src/main/jni/Android.mk",
"tag": "release|armeabi-v7a"
},
{
"level": "INFO",
"message": "removing stale contents from \u0027/Users/qaq/lierda/MxPadX_86/app/.cxx/ndkBuild/release/armeabi-v7a\u0027",
"file": "/Users/qaq/lierda/MxPadX_86/app/src/main/jni/Android.mk",
"tag": "release|armeabi-v7a"
},
{
"level": "INFO",
"message": "created folder \u0027/Users/qaq/lierda/MxPadX_86/app/.cxx/ndkBuild/release/armeabi-v7a\u0027",
"file": "/Users/qaq/lierda/MxPadX_86/app/src/main/jni/Android.mk",
"tag": "release|armeabi-v7a"
},
{
"level": "INFO",
"message": "executing ndkBuild Executable : /Users/qaq/SDK/android-sdk-macosx/ndk/20.0.5594570/ndk-build\narguments : \nNDK_PROJECT_PATH\u003dnull\nAPP_BUILD_SCRIPT\u003d/Users/qaq/lierda/MxPadX_86/app/src/main/jni/Android.mk\nAPP_ABI\u003darmeabi-v7a\nNDK_ALL_ABIS\u003darmeabi-v7a\nNDK_DEBUG\u003d0\nAPP_PLATFORM\u003dandroid-19\nNDK_OUT\u003d/Users/qaq/lierda/MxPadX_86/app/build/intermediates/ndkBuild/release/obj\nNDK_LIBS_OUT\u003d/Users/qaq/lierda/MxPadX_86/app/build/intermediates/ndkBuild/release/lib\nAPP_SHORT_COMMANDS\u003dfalse\nLOCAL_SHORT_COMMANDS\u003dfalse\n-B\n-n\njvmArgs : \n\n",
"file": "/Users/qaq/lierda/MxPadX_86/app/src/main/jni/Android.mk",
"tag": "release|armeabi-v7a"
},
{
"level": "INFO",
"message": "Executable : /Users/qaq/SDK/android-sdk-macosx/ndk/20.0.5594570/ndk-build\narguments : \nNDK_PROJECT_PATH\u003dnull\nAPP_BUILD_SCRIPT\u003d/Users/qaq/lierda/MxPadX_86/app/src/main/jni/Android.mk\nAPP_ABI\u003darmeabi-v7a\nNDK_ALL_ABIS\u003darmeabi-v7a\nNDK_DEBUG\u003d0\nAPP_PLATFORM\u003dandroid-19\nNDK_OUT\u003d/Users/qaq/lierda/MxPadX_86/app/build/intermediates/ndkBuild/release/obj\nNDK_LIBS_OUT\u003d/Users/qaq/lierda/MxPadX_86/app/build/intermediates/ndkBuild/release/lib\nAPP_SHORT_COMMANDS\u003dfalse\nLOCAL_SHORT_COMMANDS\u003dfalse\n-B\n-n\njvmArgs : \n\n",
"file": "/Users/qaq/lierda/MxPadX_86/app/src/main/jni/Android.mk",
"tag": "release|armeabi-v7a"
},
{
"level": "INFO",
"message": "done executing ndkBuild",
"file": "/Users/qaq/lierda/MxPadX_86/app/src/main/jni/Android.mk",
"tag": "release|armeabi-v7a"
},
{
"level": "INFO",
"message": "write build output /Users/qaq/lierda/MxPadX_86/app/.cxx/ndkBuild/release/armeabi-v7a/build_output.txt",
"file": "/Users/qaq/lierda/MxPadX_86/app/src/main/jni/Android.mk",
"tag": "release|armeabi-v7a"
},
{
"level": "INFO",
"message": "parse and convert ndk-build output to build configuration JSON",
"file": "/Users/qaq/lierda/MxPadX_86/app/src/main/jni/Android.mk",
"tag": "release|armeabi-v7a"
},
{
"level": "INFO",
"message": "write command file /Users/qaq/lierda/MxPadX_86/app/.cxx/ndkBuild/release/armeabi-v7a/build_command.txt",
"file": "/Users/qaq/lierda/MxPadX_86/app/src/main/jni/Android.mk", "file": "/Users/qaq/lierda/MxPadX_86/app/src/main/jni/Android.mk",
"tag": "release|armeabi-v7a" "tag": "release|armeabi-v7a"
}, },
......
app/app.iml
...@@ -74,16 +74,16 @@ ...@@ -74,16 +74,16 @@
<exclude-output /> <exclude-output />
<content url="file://$MODULE_DIR$"> <content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/kapt/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" /> <sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debug/out" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debug/out" isTestSource="false" generated="true" /> <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debug/out" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" /> <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debug/out" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/kaptKotlin/debug" isTestSource="false" generated="true" /> <sourceFolder url="file://$MODULE_DIR$/build/generated/source/kaptKotlin/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/kapt/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" generated="true" /> <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debugAndroidTest/out" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debugAndroidTest/out" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/kapt/debugAndroidTest" isTestSource="true" generated="true" /> <sourceFolder url="file://$MODULE_DIR$/build/generated/source/kapt/debugAndroidTest" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debugAndroidTest/out" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debugAndroidTest/out" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" /> <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debugAndroidTest/out" isTestSource="true" generated="true" /> <sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debugAndroidTest/out" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" generated="true" /> <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" generated="true" />
...@@ -146,10 +146,10 @@ ...@@ -146,10 +146,10 @@
<library name="Gradle: kaptGeneratedClasses"> <library name="Gradle: kaptGeneratedClasses">
<CLASSES> <CLASSES>
<root url="file://$MODULE_DIR$/build/tmp/kapt3/classes/debugAndroidTest" /> <root url="file://$MODULE_DIR$/build/tmp/kapt3/classes/debugAndroidTest" />
<root url="file://$MODULE_DIR$/build/tmp/kapt3/classes/debugUnitTest" />
<root url="file://$MODULE_DIR$/build/tmp/kapt3/classes/debug" /> <root url="file://$MODULE_DIR$/build/tmp/kapt3/classes/debug" />
<root url="file://$MODULE_DIR$/build/tmp/kapt3/classes/releaseUnitTest" /> <root url="file://$MODULE_DIR$/build/tmp/kapt3/classes/debugUnitTest" />
<root url="file://$MODULE_DIR$/build/tmp/kapt3/classes/release" /> <root url="file://$MODULE_DIR$/build/tmp/kapt3/classes/release" />
<root url="file://$MODULE_DIR$/build/tmp/kapt3/classes/releaseUnitTest" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
......
app/build.gradle
...@@ -17,7 +17,7 @@ android { ...@@ -17,7 +17,7 @@ android {
minSdkVersion 19 minSdkVersion 19
targetSdkVersion 28 targetSdkVersion 28
versionCode 1 versionCode 1
versionName "1.0.1" versionName "1.0.2"
multiDexEnabled true multiDexEnabled true
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
......
app/release/output.json
[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"1.0.1","enabled":true,"outputFile":"MxPad1.0.1_release.apk","fullName":"release","baseName":"release","dirName":""},"path":"MxPad1.0.1_release.apk","properties":{}}] [{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"1.0.2","enabled":true,"outputFile":"MxPad1.0.2_release.apk","fullName":"release","baseName":"release","dirName":""},"path":"MxPad1.0.2_release.apk","properties":{}}]
\ No newline at end of file \ No newline at end of file
config.gradle
...@@ -7,7 +7,7 @@ ext { ...@@ -7,7 +7,7 @@ ext {
minSdkVersion : 19, minSdkVersion : 19,
targetSdkVersion : 29, targetSdkVersion : 29,
versionCode : 1, versionCode : 1,
versionName : "1.0.1", versionName : "1.0.2",
] ]
//androidx 版本 //androidx 版本
......
module_base/module_base.iml
...@@ -31,13 +31,13 @@ ...@@ -31,13 +31,13 @@
<output-test url="file://$MODULE_DIR$/build/intermediates/javac/debugUnitTest/classes" /> <output-test url="file://$MODULE_DIR$/build/intermediates/javac/debugUnitTest/classes" />
<exclude-output /> <exclude-output />
<content url="file://$MODULE_DIR$"> <content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debug/out" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" /> <sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debug/out" isTestSource="false" generated="true" /> <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debug/out" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debug/out" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" generated="true" /> <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debugAndroidTest/out" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debugAndroidTest/out" isTestSource="true" generated="true" /> <sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debugAndroidTest/out" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debugAndroidTest/out" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" /> <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debugAndroidTest/out" isTestSource="true" generated="true" /> <sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debugAndroidTest/out" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" generated="true" /> <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" generated="true" />
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment