Skip to content

B
BluToysApplication
Commit 6e5345f6 by 韩飞虎
Options

新的编译

parent bf1f099d
Showing with 601 additions and 14 deletions
.gradle.zip 0 → 100644
File added
.idea/compiler.xml
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="CompilerConfiguration">
<bytecodeTargetLevel target="1.8" />
<bytecodeTargetLevel target="11" />
</component>
</project>
\ No newline at end of file
.idea/gradle.xml
......@@ -16,7 +16,6 @@
<option value="$PROJECT_DIR$/library" />
</set>
</option>
<option name="resolveModulePerSourceSet" value="false" />
</GradleProjectSettings>
</option>
</component>
......
.idea/misc.xml
......@@ -3,6 +3,15 @@
<component name="DesignSurface">
<option name="filePathToZoomLevelMap">
<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/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" />
......@@ -20,7 +29,7 @@
</map>
</option>
</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" />
</component>
<component name="ProjectType">
......
FastBleLib/build.gradle
......@@ -18,6 +18,7 @@ android {
buildTypes {
}
}
ndkVersion '21.0.6113669'
}
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
FastBleLib/build/intermediates/library_manifest/debug/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/library_manifest/release/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/local_only_symbol_list/debug/R-def.txt 0 → 100644
R_DEF: Internal format may change without notice
local
FastBleLib/build/intermediates/local_only_symbol_list/release/R-def.txt 0 → 100644
R_DEF: Internal format may change without notice
local
FastBleLib/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt 0 → 100644
1<?xml version="1.0" encoding="utf-8"?>
2<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3 package="com.clj.fastble"
4 android:versionCode="232"
5 android:versionName="2.3.2" >
6
7 <uses-sdk
8 android:minSdkVersion="14"
8-->D:\bleapp\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml
9 android:targetSdkVersion="30" />
9-->D:\bleapp\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml
10
11 <uses-permission android:name="android.permission.BLUETOOTH" />
11-->D:\bleapp\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml:4:5-68
11-->D:\bleapp\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml:4:22-65
12 <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
12-->D:\bleapp\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml:5:5-74
12-->D:\bleapp\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml:5:22-71
13 <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
13-->D:\bleapp\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml:6:5-81
13-->D:\bleapp\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml:6:22-78
14 <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
14-->D:\bleapp\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml:7:5-79
14-->D:\bleapp\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml:7:22-76
15
16</manifest>
FastBleLib/build/intermediates/manifest_merge_blame_file/release/manifest-merger-blame-release-report.txt 0 → 100644
1<?xml version="1.0" encoding="utf-8"?>
2<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3 package="com.clj.fastble"
4 android:versionCode="232"
5 android:versionName="2.3.2" >
6
7 <uses-sdk
8 android:minSdkVersion="14"
8-->D:\bleapp\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml
9 android:targetSdkVersion="30" />
9-->D:\bleapp\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml
10
11 <uses-permission android:name="android.permission.BLUETOOTH" />
11-->D:\bleapp\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml:4:5-68
11-->D:\bleapp\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml:4:22-65
12 <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
12-->D:\bleapp\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml:5:5-74
12-->D:\bleapp\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml:5:22-71
13 <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
13-->D:\bleapp\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml:6:5-81
13-->D:\bleapp\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml:6:22-78
14 <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
14-->D:\bleapp\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml:7:5-79
14-->D:\bleapp\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml:7:22-76
15
16</manifest>
FastBleLib/build/intermediates/merged_manifests/debug/output.json 0 → 100644
{
"version": 1,
"applicationId": "com.clj.fastble",
"variantType": "LIBRARY",
"elements": [
{
"outputType": {
"type": "MERGED_MANIFESTS"
},
"apkData": {
"type": "MAIN",
"splits": [],
"versionCode": 232,
"versionName": "2.3.2",
"outputFile": "FastBleLib-debug.aar",
"fullName": "debug",
"baseName": "debug",
"dirName": ""
},
"path": "../../library_manifest/debug/AndroidManifest.xml",
"properties": {
"packageId": "com.clj.fastble",
"split": ""
}
}
]
}
\ No newline at end of file
FastBleLib/build/intermediates/merged_manifests/release/output.json 0 → 100644
{
"version": 1,
"applicationId": "com.clj.fastble",
"variantType": "LIBRARY",
"elements": [
{
"outputType": {
"type": "MERGED_MANIFESTS"
},
"apkData": {
"type": "MAIN",
"splits": [],
"versionCode": 232,
"versionName": "2.3.2",
"outputFile": "FastBleLib-release.aar",
"fullName": "release",
"baseName": "release",
"dirName": ""
},
"path": "../../library_manifest/release/AndroidManifest.xml",
"properties": {
"packageId": "com.clj.fastble",
"split": ""
}
}
]
}
\ No newline at end of file
FastBleLib/build/outputs/logs/manifest-merger-debug-report.txt 0 → 100644
-- Merging decision tree log ---
manifest
ADDED from D:\bleapp\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml:1:1-9:12
INJECTED from D:\bleapp\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml:1:1-9:12
INJECTED from D:\bleapp\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml:1:1-9:12
INJECTED from D:\bleapp\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml:1:1-9:12
INJECTED from D:\bleapp\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml:1:1-9:12
INJECTED from D:\bleapp\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml:1:1-9:12
INJECTED from D:\bleapp\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml:1:1-9:12
package
ADDED from D:\bleapp\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml:2:5-30
INJECTED from D:\bleapp\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml
INJECTED from D:\bleapp\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml
android:versionName
INJECTED from D:\bleapp\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml
ADDED from D:\bleapp\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml:1:1-9:12
INJECTED from D:\bleapp\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml
android:versionCode
INJECTED from D:\bleapp\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml
ADDED from D:\bleapp\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml:1:1-9:12
INJECTED from D:\bleapp\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml
xmlns:android
ADDED from D:\bleapp\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml:1:11-69
uses-permission#android.permission.BLUETOOTH
ADDED from D:\bleapp\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml:4:5-68
android:name
ADDED from D:\bleapp\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml:4:22-65
uses-permission#android.permission.BLUETOOTH_ADMIN
ADDED from D:\bleapp\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml:5:5-74
android:name
ADDED from D:\bleapp\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml:5:22-71
uses-permission#android.permission.ACCESS_COARSE_LOCATION
ADDED from D:\bleapp\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml:6:5-81
android:name
ADDED from D:\bleapp\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml:6:22-78
uses-permission#android.permission.ACCESS_FINE_LOCATION
ADDED from D:\bleapp\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml:7:5-79
android:name
ADDED from D:\bleapp\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml:7:22-76
uses-sdk
INJECTED from D:\bleapp\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml reason: use-sdk injection requested
INJECTED from D:\bleapp\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml
INJECTED from D:\bleapp\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml
INJECTED from D:\bleapp\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml
INJECTED from D:\bleapp\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml
android:targetSdkVersion
INJECTED from D:\bleapp\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml
ADDED from D:\bleapp\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml
INJECTED from D:\bleapp\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml
android:minSdkVersion
INJECTED from D:\bleapp\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml
ADDED from D:\bleapp\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml
INJECTED from D:\bleapp\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml
FastBleLib/build/outputs/logs/manifest-merger-release-report.txt 0 → 100644
-- Merging decision tree log ---
manifest
ADDED from D:\bleapp\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml:1:1-9:12
INJECTED from D:\bleapp\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml:1:1-9:12
INJECTED from D:\bleapp\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml:1:1-9:12
INJECTED from D:\bleapp\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml:1:1-9:12
INJECTED from D:\bleapp\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml:1:1-9:12
INJECTED from D:\bleapp\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml:1:1-9:12
INJECTED from D:\bleapp\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml:1:1-9:12
package
ADDED from D:\bleapp\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml:2:5-30
INJECTED from D:\bleapp\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml
INJECTED from D:\bleapp\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml
android:versionName
INJECTED from D:\bleapp\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml
ADDED from D:\bleapp\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml:1:1-9:12
INJECTED from D:\bleapp\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml
android:versionCode
INJECTED from D:\bleapp\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml
ADDED from D:\bleapp\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml:1:1-9:12
INJECTED from D:\bleapp\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml
xmlns:android
ADDED from D:\bleapp\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml:1:11-69
uses-permission#android.permission.BLUETOOTH
ADDED from D:\bleapp\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml:4:5-68
android:name
ADDED from D:\bleapp\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml:4:22-65
uses-permission#android.permission.BLUETOOTH_ADMIN
ADDED from D:\bleapp\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml:5:5-74
android:name
ADDED from D:\bleapp\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml:5:22-71
uses-permission#android.permission.ACCESS_COARSE_LOCATION
ADDED from D:\bleapp\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml:6:5-81
android:name
ADDED from D:\bleapp\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml:6:22-78
uses-permission#android.permission.ACCESS_FINE_LOCATION
ADDED from D:\bleapp\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml:7:5-79
android:name
ADDED from D:\bleapp\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml:7:22-76
uses-sdk
INJECTED from D:\bleapp\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml reason: use-sdk injection requested
INJECTED from D:\bleapp\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml
INJECTED from D:\bleapp\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml
INJECTED from D:\bleapp\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml
INJECTED from D:\bleapp\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml
android:targetSdkVersion
INJECTED from D:\bleapp\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml
ADDED from D:\bleapp\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml
INJECTED from D:\bleapp\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml
android:minSdkVersion
INJECTED from D:\bleapp\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml
ADDED from D:\bleapp\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml
INJECTED from D:\bleapp\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml
app/build.gradle
......@@ -11,7 +11,12 @@ android {
versionCode 20230427
versionName "2.1"
multiDexEnabled true
}
externalNativeBuild {
cmake {
cppFlags ''
}
}
}
lintOptions {
checkReleaseBuilds false
......@@ -51,6 +56,12 @@ android {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
externalNativeBuild {
cmake {
path file('src/main/cpp/CMakeLists.txt')
version '3.18.1'
}
}
}
dependencies {
......
app/src/main/cpp/CMakeLists.txt 0 → 100644
# For more information about using CMake with Android Studio, read the
# documentation: https://d.android.com/studio/projects/add-native-code.html
# Sets the minimum version of CMake required to build the native library.
cmake_minimum_required(VERSION 3.18.1)
# Declares and names the project.
project("toys")
# Creates and names a library, sets it as either STATIC
# or SHARED, and provides the relative paths to its source code.
# You can define multiple libraries, and CMake builds them for you.
# Gradle automatically packages shared libraries with your APK.
add_library( # Sets the name of the library.
toys
# Sets the library as a shared library.
SHARED
# Provides a relative path to your source file(s).
toys.cpp )
# Searches for a specified prebuilt library and stores the path as a
# variable. Because CMake includes system libraries in the search path by
# default, you only need to specify the name of the public NDK library
# you want to add. CMake verifies that the library exists before
# completing its build.
find_library( # Sets the name of the path variable.
log-lib
# Specifies the name of the NDK library that
# you want CMake to locate.
log )
# Specifies libraries CMake should link to your target library. You
# can link multiple libraries, such as libraries you define in this
# build script, prebuilt third-party libraries, or system libraries.
target_link_libraries( # Specifies the target library.
toys
# Links the target library to the log library
# included in the NDK.
${log-lib} )
app/src/main/cpp/toys.cpp 0 → 100644
// Write C++ code here.
//
// Do not forget to dynamically load the C++ library into your application.
//
// For instance,
//
// In MainActivity.java:
// static {
// System.loadLibrary("toys");
// }
//
// Or, in MainActivity.kt:
// companion object {
// init {
// System.loadLibrary("toys")
// }
// }
\ No newline at end of file
app/src/main/java/com/stoplight/blu/toys/activity/PlayActivity.java
......@@ -217,7 +217,7 @@ public class PlayActivity extends BaseActivity {
AlertDialog.Builder builder=new AlertDialog.Builder(this);
builder.setTitle("Tip: Bluetooth connection will be disconnected");
builder.setPositiveButton("确定", new DialogInterface.OnClickListener() {
builder.setPositiveButton("Confirm", new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
// TODO Auto-generated method stub
......
app/src/main/java/com/stoplight/blu/toys/activity/SetTimeActivity.java
......@@ -480,9 +480,7 @@ public class SetTimeActivity extends BaseActivity {
int green = spUtils.getSPValue("green", 1);
int brightness = spUtils.getSPValue("brightness", 50);
TrafficLightBean trafficLightBean = new TrafficLightBean(
2, 1,
time, brightness, open, close, green, alarm);
byte[] bytes = trafficLightBean.toByte();
BlePlay.getInstance().sendStard(bytes, new BleWriteCallback() {
......
app/src/main/java/com/stoplight/blu/toys/utils/AlertDialogUtil.java
......@@ -34,7 +34,7 @@ public class AlertDialogUtil {
AlertDialog.Builder dialog = new AlertDialog.Builder(context);
dialog.setMessage(message);
dialog.setCancelable(false);//点击框外取消
dialog.setPositiveButton("确定", new DialogInterface.OnClickListener() {
dialog.setPositiveButton("Confirm", new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialogInterface, int i) {
if (listener != null) {
......@@ -43,7 +43,7 @@ public class AlertDialogUtil {
}
});
dialog.setNegativeButton("取消", null);
dialog.setNegativeButton("“Cancel", null);
dialog.show();
}
......
app/src/main/res/layout/activity_searching.xml
......@@ -97,7 +97,7 @@
<com.stoplight.blu.toys.view.TypefaceTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Srearching"
android:text="Searching"
android:textColor="@color/black"
android:textSize="@dimen/sp_22"
android:textStyle="bold" />
......
app/src/main/res/layout/activity_setting_music.xml
......@@ -8,6 +8,7 @@
android:orientation="vertical"
tools:context="com.stoplight.blu.toys.activity.SettingMusicActivity">
<com.stoplight.blu.toys.view.TypefaceTextView
android:id="@+id/back_but"
android:layout_width="wrap_content"
......@@ -23,7 +24,6 @@
android:textStyle="bold"
app:typeface="@string/LittleOrion" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recyclerView"
android:layout_width="match_parent"
......
gradle.properties
......@@ -16,4 +16,6 @@ org.gradle.jvmargs=-Xmx2048m
# 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
android.enableJetifier=true
ndk.dir=G\:/AndroidStudio/AndroidSDK/android-sdk/ndk/24.0.8215888
library/build.gradle
......@@ -12,6 +12,8 @@ android {
release {
consumerProguardFiles 'proguard-rules.pro'
}
buildTypes {
}
}
lintOptions {
abortOnError false
......
library/src/main/java/com/chad/library/adapter/base/loadmore/LoadMoreView.java
......@@ -71,6 +71,7 @@ public abstract class LoadMoreView {
}
public final void setLoadMoreEndGone(boolean loadMoreEndGone) {
this.mLoadMoreEndGone = loadMoreEndGone;
}
......
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