Skip to content

B
BluToysApplication
Commit 6e5345f6 by 韩飞虎
Options

新的编译

parent bf1f099d
Showing with 252 additions and 3 deletions
.gradle.zip 0 → 100644
File added
.idea/compiler.xml
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="CompilerConfiguration"> <component name="CompilerConfiguration">
<bytecodeTargetLevel target="1.8" /> <bytecodeTargetLevel target="11" />
</component> </component>
</project> </project>
\ No newline at end of file
.idea/gradle.xml
...@@ -16,7 +16,6 @@ ...@@ -16,7 +16,6 @@
<option value="$PROJECT_DIR$/library" /> <option value="$PROJECT_DIR$/library" />
</set> </set>
</option> </option>
<option name="resolveModulePerSourceSet" value="false" />
</GradleProjectSettings> </GradleProjectSettings>
</option> </option>
</component> </component>
......
.idea/misc.xml
...@@ -3,6 +3,15 @@ ...@@ -3,6 +3,15 @@
<component name="DesignSurface"> <component name="DesignSurface">
<option name="filePathToZoomLevelMap"> <option name="filePathToZoomLevelMap">
<map> <map>
<entry key="..\:/bleapp/BluToysApplication/app/src/main/res/layout/activity_add_device.xml" value="0.233984375" />
<entry key="..\:/bleapp/BluToysApplication/app/src/main/res/layout/activity_main.xml" value="0.31197916666666664" />
<entry key="..\:/bleapp/BluToysApplication/app/src/main/res/layout/activity_seleclt_device.xml" value="0.233984375" />
<entry key="..\:/bleapp/BluToysApplication/app/src/main/res/layout/activity_select_timer.xml" value="0.31197916666666664" />
<entry key="..\:/bleapp/BluToysApplication/app/src/main/res/layout/activity_set_time.xml" value="0.31197916666666664" />
<entry key="..\:/bleapp/BluToysApplication/app/src/main/res/layout/activity_setting_music.xml" value="0.31197916666666664" />
<entry key="..\:/bleapp/BluToysApplication/app/src/main/res/layout/ble_devices_item.xml" value="0.31197916666666664" />
<entry key="..\:/bleapp/BluToysApplication/app/src/main/res/layout/music_type.xml" value="0.31197916666666664" />
<entry key="..\:/bleapp/BluToysApplication/app/src/main/res/layout/pickerview_custom_time.xml" value="0.31197916666666664" />
<entry key="..\:/workspace_as_temp/BluToysApplication/app/src/main/res/layout/activity_main.xml" value="0.23802083333333332" /> <entry key="..\:/workspace_as_temp/BluToysApplication/app/src/main/res/layout/activity_main.xml" value="0.23802083333333332" />
<entry key="..\:/workspace_as_temp/BluToysApplication/library/src/main/res/layout/brvah_quick_view_load_more.xml" value="0.23802083333333332" /> <entry key="..\:/workspace_as_temp/BluToysApplication/library/src/main/res/layout/brvah_quick_view_load_more.xml" value="0.23802083333333332" />
<entry key="..\:/程序项目/蓝牙app/BluToysApplication/app/src/main/res/drawable/black_thumb.xml" value="0.20989583333333334" /> <entry key="..\:/程序项目/蓝牙app/BluToysApplication/app/src/main/res/drawable/black_thumb.xml" value="0.20989583333333334" />
...@@ -20,7 +29,7 @@ ...@@ -20,7 +29,7 @@
</map> </map>
</option> </option>
</component> </component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK"> <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" /> <output url="file://$PROJECT_DIR$/build/classes" />
</component> </component>
<component name="ProjectType"> <component name="ProjectType">
......
FastBleLib/build.gradle
...@@ -18,6 +18,7 @@ android { ...@@ -18,6 +18,7 @@ android {
buildTypes { buildTypes {
} }
} }
ndkVersion '21.0.6113669'
} }
dependencies { dependencies {
......
FastBleLib/build/.transforms/3e1bbd8fc74131c831988b31889960e7/classes/keep_rules 0 → 100644
-keep class java.util.function.ToDoubleFunction {
double applyAsDouble(java.lang.Object);
}
-keep class j$.util.Map { *; }
-keep class java.util.function.Function { *; }
-keep class j$.util.function.ToLongFunction { *; }
-keep class j$.util.function.BiConsumer { *; }
-keep class java.util.function.ToLongFunction {
long applyAsLong(java.lang.Object);
}
-keep class j$.util.function.Function { *; }
-keep class java.util.function.ToIntFunction {
int applyAsInt(java.lang.Object);
}
-keep class j$.util.function.ToDoubleFunction { *; }
-keep class j$.util.function.ToIntFunction { *; }
-keep class j$.util.Map$-CC {
boolean $default$replace(java.util.Map, java.lang.Object, java.lang.Object, java.lang.Object);
void $default$forEach(java.util.Map, j$.util.function.BiConsumer);
java.lang.Object $default$computeIfAbsent(java.util.Map, java.lang.Object, j$.util.function.Function);
java.lang.Object $default$putIfAbsent(java.util.Map, java.lang.Object, java.lang.Object);
java.lang.Object $default$getOrDefault(java.util.Map, java.lang.Object, java.lang.Object);
java.lang.Object $default$replace(java.util.Map, java.lang.Object, java.lang.Object);
java.lang.Object $default$computeIfPresent(java.util.Map, java.lang.Object, j$.util.function.BiFunction);
java.lang.Object $default$compute(java.util.Map, java.lang.Object, j$.util.function.BiFunction);
boolean $default$remove(java.util.Map, java.lang.Object, java.lang.Object);
java.lang.Object $default$merge(java.util.Map, java.lang.Object, java.lang.Object, j$.util.function.BiFunction);
void $default$replaceAll(java.util.Map, j$.util.function.BiFunction);
}
-keep class j$.util.function.BiFunction { *; }
-keep class j$.util.Comparator { *; }
-keep class java.util.function.BiConsumer { *; }
-keep class j$.util.Comparator$-CC {
java.util.Comparator $default$thenComparingLong(java.util.Comparator, j$.util.function.ToLongFunction);
java.util.Comparator $default$thenComparingDouble(java.util.Comparator, j$.util.function.ToDoubleFunction);
java.util.Comparator $default$reversed(java.util.Comparator);
java.util.Comparator $default$thenComparing(java.util.Comparator, j$.util.function.Function, java.util.Comparator);
java.util.Comparator $default$thenComparing(java.util.Comparator, j$.util.function.Function);
java.util.Comparator $default$thenComparingInt(java.util.Comparator, j$.util.function.ToIntFunction);
java.util.Comparator $default$thenComparing(java.util.Comparator, java.util.Comparator);
}
-keep class java.util.function.BiFunction {
java.util.function.BiFunction andThen(java.util.function.Function);
java.lang.Object apply(java.lang.Object, java.lang.Object);
}
FastBleLib/build/.transforms/bc5e686b5ea3a9f03bad74ae09019cdc/classes/keep_rules 0 → 100644
-keep class java.util.function.ToDoubleFunction {
double applyAsDouble(java.lang.Object);
}
-keep class j$.util.Map { *; }
-keep class java.util.function.Function { *; }
-keep class j$.util.function.ToLongFunction { *; }
-keep class j$.util.function.BiConsumer { *; }
-keep class java.util.function.ToLongFunction {
long applyAsLong(java.lang.Object);
}
-keep class j$.util.function.Function { *; }
-keep class java.util.function.ToIntFunction {
int applyAsInt(java.lang.Object);
}
-keep class j$.util.function.ToDoubleFunction { *; }
-keep class j$.util.function.ToIntFunction { *; }
-keep class j$.util.Map$-CC {
boolean $default$replace(java.util.Map, java.lang.Object, java.lang.Object, java.lang.Object);
void $default$forEach(java.util.Map, j$.util.function.BiConsumer);
java.lang.Object $default$computeIfAbsent(java.util.Map, java.lang.Object, j$.util.function.Function);
java.lang.Object $default$putIfAbsent(java.util.Map, java.lang.Object, java.lang.Object);
java.lang.Object $default$getOrDefault(java.util.Map, java.lang.Object, java.lang.Object);
java.lang.Object $default$replace(java.util.Map, java.lang.Object, java.lang.Object);
java.lang.Object $default$computeIfPresent(java.util.Map, java.lang.Object, j$.util.function.BiFunction);
java.lang.Object $default$compute(java.util.Map, java.lang.Object, j$.util.function.BiFunction);
boolean $default$remove(java.util.Map, java.lang.Object, java.lang.Object);
java.lang.Object $default$merge(java.util.Map, java.lang.Object, java.lang.Object, j$.util.function.BiFunction);
void $default$replaceAll(java.util.Map, j$.util.function.BiFunction);
}
-keep class j$.util.function.BiFunction { *; }
-keep class j$.util.Comparator { *; }
-keep class java.util.function.BiConsumer { *; }
-keep class j$.util.Comparator$-CC {
java.util.Comparator $default$thenComparingLong(java.util.Comparator, j$.util.function.ToLongFunction);
java.util.Comparator $default$thenComparingDouble(java.util.Comparator, j$.util.function.ToDoubleFunction);
java.util.Comparator $default$reversed(java.util.Comparator);
java.util.Comparator $default$thenComparing(java.util.Comparator, j$.util.function.Function, java.util.Comparator);
java.util.Comparator $default$thenComparing(java.util.Comparator, j$.util.function.Function);
java.util.Comparator $default$thenComparingInt(java.util.Comparator, j$.util.function.ToIntFunction);
java.util.Comparator $default$thenComparing(java.util.Comparator, java.util.Comparator);
}
-keep class java.util.function.BiFunction {
java.util.function.BiFunction andThen(java.util.function.Function);
java.lang.Object apply(java.lang.Object, java.lang.Object);
}
FastBleLib/build/generated/source/buildConfig/debug/com/clj/fastble/BuildConfig.java 0 → 100644
/**
* Automatically generated file. DO NOT MODIFY
*/
package com.clj.fastble;
public final class BuildConfig {
public static final boolean DEBUG = Boolean.parseBoolean("true");
public static final String LIBRARY_PACKAGE_NAME = "com.clj.fastble";
public static final String BUILD_TYPE = "debug";
public static final int VERSION_CODE = 232;
public static final String VERSION_NAME = "2.3.2";
}
FastBleLib/build/generated/source/buildConfig/release/com/clj/fastble/BuildConfig.java 0 → 100644
/**
* Automatically generated file. DO NOT MODIFY
*/
package com.clj.fastble;
public final class BuildConfig {
public static final boolean DEBUG = false;
public static final String LIBRARY_PACKAGE_NAME = "com.clj.fastble";
public static final String BUILD_TYPE = "release";
public static final int VERSION_CODE = 232;
public static final String VERSION_NAME = "2.3.2";
}
FastBleLib/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/AndroidManifest.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.clj.fastble"
android:versionCode="232"
android:versionName="2.3.2" >
<uses-sdk
android:minSdkVersion="14"
android:targetSdkVersion="30" />
<uses-permission android:name="android.permission.BLUETOOTH" />
<uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
</manifest>
\ No newline at end of file
FastBleLib/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/output.json 0 → 100644
{
"version": 1,
"applicationId": "com.clj.fastble",
"variantType": "LIBRARY",
"elements": [
{
"outputType": {
"type": "AAPT_FRIENDLY_MERGED_MANIFESTS"
},
"apkData": {
"type": "MAIN",
"splits": [],
"versionCode": 232,
"versionName": "2.3.2",
"outputFile": "FastBleLib-debug.aar",
"fullName": "debug",
"baseName": "debug",
"dirName": ""
},
"path": "AndroidManifest.xml",
"properties": {
"packageId": "com.clj.fastble",
"split": ""
}
}
]
}
\ No newline at end of file
FastBleLib/build/intermediates/aapt_friendly_merged_manifests/release/aapt/AndroidManifest.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.clj.fastble"
android:versionCode="232"
android:versionName="2.3.2" >
<uses-sdk
android:minSdkVersion="14"
android:targetSdkVersion="30" />
<uses-permission android:name="android.permission.BLUETOOTH" />
<uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
</manifest>
\ No newline at end of file
FastBleLib/build/intermediates/aapt_friendly_merged_manifests/release/aapt/output.json 0 → 100644
{
"version": 1,
"applicationId": "com.clj.fastble",
"variantType": "LIBRARY",
"elements": [
{
"outputType": {
"type": "AAPT_FRIENDLY_MERGED_MANIFESTS"
},
"apkData": {
"type": "MAIN",
"splits": [],
"versionCode": 232,
"versionName": "2.3.2",
"outputFile": "FastBleLib-release.aar",
"fullName": "release",
"baseName": "release",
"dirName": ""
},
"path": "AndroidManifest.xml",
"properties": {
"packageId": "com.clj.fastble",
"split": ""
}
}
]
}
\ No newline at end of file
FastBleLib/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\bleapp\BluToysApplication\FastBleLib\src\main\jniLibs"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\bleapp\BluToysApplication\FastBleLib\src\debug\jniLibs"/></dataSet></merger>
\ No newline at end of file
FastBleLib/build/intermediates/incremental/mergeDebugShaders/merger.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\bleapp\BluToysApplication\FastBleLib\src\main\shaders"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\bleapp\BluToysApplication\FastBleLib\src\debug\shaders"/></dataSet></merger>
\ No newline at end of file
FastBleLib/build/intermediates/incremental/mergeReleaseJniLibFolders/merger.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\bleapp\BluToysApplication\FastBleLib\src\main\jniLibs"/></dataSet><dataSet config="release" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\bleapp\BluToysApplication\FastBleLib\src\release\jniLibs"/></dataSet></merger>
\ No newline at end of file
FastBleLib/build/intermediates/incremental/mergeReleaseShaders/merger.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\bleapp\BluToysApplication\FastBleLib\src\main\shaders"/></dataSet><dataSet config="release" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\bleapp\BluToysApplication\FastBleLib\src\release\shaders"/></dataSet></merger>
\ No newline at end of file
FastBleLib/build/intermediates/incremental/packageDebugAssets/merger.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\bleapp\BluToysApplication\FastBleLib\src\main\assets"/><source path="D:\bleapp\BluToysApplication\FastBleLib\build\intermediates\shader_assets\debug\out"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\bleapp\BluToysApplication\FastBleLib\src\debug\assets"/></dataSet></merger>
\ No newline at end of file
FastBleLib/build/intermediates/incremental/packageDebugResources/merger.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\bleapp\BluToysApplication\FastBleLib\src\main\res"/><source path="D:\bleapp\BluToysApplication\FastBleLib\build\generated\res\rs\debug"/><source path="D:\bleapp\BluToysApplication\FastBleLib\build\generated\res\resValues\debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main" generated-set="main$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\bleapp\BluToysApplication\FastBleLib\src\main\res"/><source path="D:\bleapp\BluToysApplication\FastBleLib\build\generated\res\rs\debug"/><source path="D:\bleapp\BluToysApplication\FastBleLib\build\generated\res\resValues\debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\bleapp\BluToysApplication\FastBleLib\src\debug\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug" generated-set="debug$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\bleapp\BluToysApplication\FastBleLib\src\debug\res"/></dataSet><mergedItems/></merger>
\ No newline at end of file
FastBleLib/build/intermediates/incremental/packageReleaseAssets/merger.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\bleapp\BluToysApplication\FastBleLib\src\main\assets"/><source path="D:\bleapp\BluToysApplication\FastBleLib\build\intermediates\shader_assets\release\out"/></dataSet><dataSet config="release" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\bleapp\BluToysApplication\FastBleLib\src\release\assets"/></dataSet></merger>
\ No newline at end of file
FastBleLib/build/intermediates/incremental/packageReleaseResources/merger.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\bleapp\BluToysApplication\FastBleLib\src\main\res"/><source path="D:\bleapp\BluToysApplication\FastBleLib\build\generated\res\rs\release"/><source path="D:\bleapp\BluToysApplication\FastBleLib\build\generated\res\resValues\release"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main" generated-set="main$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\bleapp\BluToysApplication\FastBleLib\src\main\res"/><source path="D:\bleapp\BluToysApplication\FastBleLib\build\generated\res\rs\release"/><source path="D:\bleapp\BluToysApplication\FastBleLib\build\generated\res\resValues\release"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="release$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\bleapp\BluToysApplication\FastBleLib\src\release\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="release" generated-set="release$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\bleapp\BluToysApplication\FastBleLib\src\release\res"/></dataSet><mergedItems/></merger>
\ No newline at end of file
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