Skip to content

B
BluToysApplication
Commit 297b65d7 by 韩飞虎
Options

fffMerge branch 'master' of http://gitlab.zhuzhux.com/chengchong/BluToysApplication

parents dd75b156 ee610bcf
Showing with 248 additions and 351 deletions
FastBleLib/build/.transforms/79b78bd89c17e5eeb00c1493c7471fdf/classes/keep_rules deleted 100644 → 0
-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/e35d17f96f3f8c40a60a698ef287eb55/classes/keep_rules deleted 100644 → 0
-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/intermediates/incremental/mergeReleaseJniLibFolders/merger.xml
<?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:\androidProject\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:\androidProject\BluToysApplication\FastBleLib\src\release\jniLibs"/></dataSet></merger>
\ No newline at end of file
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/hanfeihu/助利帮/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="/Users/hanfeihu/助利帮/BluToysApplication/FastBleLib/src/release/jniLibs"/></dataSet></merger>
\ No newline at end of file
FastBleLib/build/intermediates/incremental/mergeReleaseShaders/merger.xml
<?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:\androidProject\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:\androidProject\BluToysApplication\FastBleLib\src\release\shaders"/></dataSet></merger>
\ No newline at end of file
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/hanfeihu/助利帮/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="/Users/hanfeihu/助利帮/BluToysApplication/FastBleLib/src/release/shaders"/></dataSet></merger>
\ No newline at end of file
FastBleLib/build/intermediates/incremental/packageDebugResources/compile-file-map.properties
<<<<<<< HEAD
#Sat Dec 18 08:49:53 CST 2021
=======
#Sat May 22 18:28:17 CST 2021
>>>>>>> ee610bcfe666c5a8aee5df89f5948dec147a6d1f
FastBleLib/build/intermediates/incremental/packageReleaseAssets/merger.xml
<?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:\androidProject\BluToysApplication\FastBleLib\src\main\assets"/><source path="D:\androidProject\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:\androidProject\BluToysApplication\FastBleLib\src\release\assets"/></dataSet></merger>
\ No newline at end of file
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/hanfeihu/助利帮/BluToysApplication/FastBleLib/src/main/assets"/><source path="/Users/hanfeihu/助利帮/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="/Users/hanfeihu/助利帮/BluToysApplication/FastBleLib/src/release/assets"/></dataSet></merger>
\ No newline at end of file
FastBleLib/build/intermediates/incremental/packageReleaseResources/merger.xml
<?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:\androidProject\BluToysApplication\FastBleLib\src\main\res"/><source path="D:\androidProject\BluToysApplication\FastBleLib\build\generated\res\rs\release"/><source path="D:\androidProject\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:\androidProject\BluToysApplication\FastBleLib\src\main\res"/><source path="D:\androidProject\BluToysApplication\FastBleLib\build\generated\res\rs\release"/><source path="D:\androidProject\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:\androidProject\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:\androidProject\BluToysApplication\FastBleLib\src\release\res"/></dataSet><mergedItems/></merger>
\ No newline at end of file
<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="/Users/hanfeihu/助利帮/BluToysApplication/FastBleLib/src/main/res"/><source path="/Users/hanfeihu/助利帮/BluToysApplication/FastBleLib/build/generated/res/rs/release"/><source path="/Users/hanfeihu/助利帮/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="/Users/hanfeihu/助利帮/BluToysApplication/FastBleLib/src/main/res"/><source path="/Users/hanfeihu/助利帮/BluToysApplication/FastBleLib/build/generated/res/rs/release"/><source path="/Users/hanfeihu/助利帮/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="/Users/hanfeihu/助利帮/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="/Users/hanfeihu/助利帮/BluToysApplication/FastBleLib/src/release/res"/></dataSet><mergedItems/></merger>
\ No newline at end of file
FastBleLib/build/intermediates/manifest_merge_blame_file/release/manifest-merger-blame-release-report.txt
......@@ -6,21 +6,21 @@
6
7 <uses-sdk
8 android:minSdkVersion="14"
8-->D:\androidProject\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml
8-->/Users/hanfeihu/助利帮/BluToysApplication/FastBleLib/src/main/AndroidManifest.xml
9 android:targetSdkVersion="30" />
9-->D:\androidProject\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml
9-->/Users/hanfeihu/助利帮/BluToysApplication/FastBleLib/src/main/AndroidManifest.xml
10
11 <uses-permission android:name="android.permission.BLUETOOTH" />
11-->D:\androidProject\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml:4:5-68
11-->D:\androidProject\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml:4:22-65
11-->/Users/hanfeihu/助利帮/BluToysApplication/FastBleLib/src/main/AndroidManifest.xml:4:5-68
11-->/Users/hanfeihu/助利帮/BluToysApplication/FastBleLib/src/main/AndroidManifest.xml:4:22-65
12 <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
12-->D:\androidProject\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml:5:5-74
12-->D:\androidProject\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml:5:22-71
12-->/Users/hanfeihu/助利帮/BluToysApplication/FastBleLib/src/main/AndroidManifest.xml:5:5-74
12-->/Users/hanfeihu/助利帮/BluToysApplication/FastBleLib/src/main/AndroidManifest.xml:5:22-71
13 <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
13-->D:\androidProject\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml:6:5-81
13-->D:\androidProject\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml:6:22-78
13-->/Users/hanfeihu/助利帮/BluToysApplication/FastBleLib/src/main/AndroidManifest.xml:6:5-81
13-->/Users/hanfeihu/助利帮/BluToysApplication/FastBleLib/src/main/AndroidManifest.xml:6:22-78
14 <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
14-->D:\androidProject\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml:7:5-79
14-->D:\androidProject\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml:7:22-76
14-->/Users/hanfeihu/助利帮/BluToysApplication/FastBleLib/src/main/AndroidManifest.xml:7:5-79
14-->/Users/hanfeihu/助利帮/BluToysApplication/FastBleLib/src/main/AndroidManifest.xml:7:22-76
15
16</manifest>
FastBleLib/build/outputs/logs/manifest-merger-release-report.txt
-- Merging decision tree log ---
manifest
ADDED from D:\androidProject\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml:1:1-9:12
INJECTED from D:\androidProject\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml:1:1-9:12
INJECTED from D:\androidProject\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml:1:1-9:12
INJECTED from D:\androidProject\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml:1:1-9:12
INJECTED from D:\androidProject\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml:1:1-9:12
INJECTED from D:\androidProject\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml:1:1-9:12
INJECTED from D:\androidProject\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml:1:1-9:12
ADDED from /Users/hanfeihu/助利帮/BluToysApplication/FastBleLib/src/main/AndroidManifest.xml:1:1-9:12
INJECTED from /Users/hanfeihu/助利帮/BluToysApplication/FastBleLib/src/main/AndroidManifest.xml:1:1-9:12
INJECTED from /Users/hanfeihu/助利帮/BluToysApplication/FastBleLib/src/main/AndroidManifest.xml:1:1-9:12
INJECTED from /Users/hanfeihu/助利帮/BluToysApplication/FastBleLib/src/main/AndroidManifest.xml:1:1-9:12
INJECTED from /Users/hanfeihu/助利帮/BluToysApplication/FastBleLib/src/main/AndroidManifest.xml:1:1-9:12
INJECTED from /Users/hanfeihu/助利帮/BluToysApplication/FastBleLib/src/main/AndroidManifest.xml:1:1-9:12
INJECTED from /Users/hanfeihu/助利帮/BluToysApplication/FastBleLib/src/main/AndroidManifest.xml:1:1-9:12
package
ADDED from D:\androidProject\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml:2:5-30
INJECTED from D:\androidProject\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml
INJECTED from D:\androidProject\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml
ADDED from /Users/hanfeihu/助利帮/BluToysApplication/FastBleLib/src/main/AndroidManifest.xml:2:5-30
INJECTED from /Users/hanfeihu/助利帮/BluToysApplication/FastBleLib/src/main/AndroidManifest.xml
INJECTED from /Users/hanfeihu/助利帮/BluToysApplication/FastBleLib/src/main/AndroidManifest.xml
android:versionName
INJECTED from D:\androidProject\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml
ADDED from D:\androidProject\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml:1:1-9:12
INJECTED from D:\androidProject\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml
INJECTED from /Users/hanfeihu/助利帮/BluToysApplication/FastBleLib/src/main/AndroidManifest.xml
ADDED from /Users/hanfeihu/助利帮/BluToysApplication/FastBleLib/src/main/AndroidManifest.xml:1:1-9:12
INJECTED from /Users/hanfeihu/助利帮/BluToysApplication/FastBleLib/src/main/AndroidManifest.xml
android:versionCode
INJECTED from D:\androidProject\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml
ADDED from D:\androidProject\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml:1:1-9:12
INJECTED from D:\androidProject\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml
INJECTED from /Users/hanfeihu/助利帮/BluToysApplication/FastBleLib/src/main/AndroidManifest.xml
ADDED from /Users/hanfeihu/助利帮/BluToysApplication/FastBleLib/src/main/AndroidManifest.xml:1:1-9:12
INJECTED from /Users/hanfeihu/助利帮/BluToysApplication/FastBleLib/src/main/AndroidManifest.xml
xmlns:android
ADDED from D:\androidProject\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml:1:11-69
ADDED from /Users/hanfeihu/助利帮/BluToysApplication/FastBleLib/src/main/AndroidManifest.xml:1:11-69
uses-permission#android.permission.BLUETOOTH
ADDED from D:\androidProject\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml:4:5-68
ADDED from /Users/hanfeihu/助利帮/BluToysApplication/FastBleLib/src/main/AndroidManifest.xml:4:5-68
android:name
ADDED from D:\androidProject\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml:4:22-65
ADDED from /Users/hanfeihu/助利帮/BluToysApplication/FastBleLib/src/main/AndroidManifest.xml:4:22-65
uses-permission#android.permission.BLUETOOTH_ADMIN
ADDED from D:\androidProject\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml:5:5-74
ADDED from /Users/hanfeihu/助利帮/BluToysApplication/FastBleLib/src/main/AndroidManifest.xml:5:5-74
android:name
ADDED from D:\androidProject\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml:5:22-71
ADDED from /Users/hanfeihu/助利帮/BluToysApplication/FastBleLib/src/main/AndroidManifest.xml:5:22-71
uses-permission#android.permission.ACCESS_COARSE_LOCATION
ADDED from D:\androidProject\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml:6:5-81
ADDED from /Users/hanfeihu/助利帮/BluToysApplication/FastBleLib/src/main/AndroidManifest.xml:6:5-81
android:name
ADDED from D:\androidProject\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml:6:22-78
ADDED from /Users/hanfeihu/助利帮/BluToysApplication/FastBleLib/src/main/AndroidManifest.xml:6:22-78
uses-permission#android.permission.ACCESS_FINE_LOCATION
ADDED from D:\androidProject\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml:7:5-79
ADDED from /Users/hanfeihu/助利帮/BluToysApplication/FastBleLib/src/main/AndroidManifest.xml:7:5-79
android:name
ADDED from D:\androidProject\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml:7:22-76
ADDED from /Users/hanfeihu/助利帮/BluToysApplication/FastBleLib/src/main/AndroidManifest.xml:7:22-76
uses-sdk
INJECTED from D:\androidProject\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml reason: use-sdk injection requested
INJECTED from D:\androidProject\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml
INJECTED from D:\androidProject\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml
INJECTED from D:\androidProject\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml
INJECTED from D:\androidProject\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml
INJECTED from /Users/hanfeihu/助利帮/BluToysApplication/FastBleLib/src/main/AndroidManifest.xml reason: use-sdk injection requested
INJECTED from /Users/hanfeihu/助利帮/BluToysApplication/FastBleLib/src/main/AndroidManifest.xml
INJECTED from /Users/hanfeihu/助利帮/BluToysApplication/FastBleLib/src/main/AndroidManifest.xml
INJECTED from /Users/hanfeihu/助利帮/BluToysApplication/FastBleLib/src/main/AndroidManifest.xml
INJECTED from /Users/hanfeihu/助利帮/BluToysApplication/FastBleLib/src/main/AndroidManifest.xml
android:targetSdkVersion
INJECTED from D:\androidProject\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml
ADDED from D:\androidProject\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml
INJECTED from D:\androidProject\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml
INJECTED from /Users/hanfeihu/助利帮/BluToysApplication/FastBleLib/src/main/AndroidManifest.xml
ADDED from /Users/hanfeihu/助利帮/BluToysApplication/FastBleLib/src/main/AndroidManifest.xml
INJECTED from /Users/hanfeihu/助利帮/BluToysApplication/FastBleLib/src/main/AndroidManifest.xml
android:minSdkVersion
INJECTED from D:\androidProject\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml
ADDED from D:\androidProject\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml
INJECTED from D:\androidProject\BluToysApplication\FastBleLib\src\main\AndroidManifest.xml
INJECTED from /Users/hanfeihu/助利帮/BluToysApplication/FastBleLib/src/main/AndroidManifest.xml
ADDED from /Users/hanfeihu/助利帮/BluToysApplication/FastBleLib/src/main/AndroidManifest.xml
INJECTED from /Users/hanfeihu/助利帮/BluToysApplication/FastBleLib/src/main/AndroidManifest.xml
app/build.gradle
......@@ -5,11 +5,11 @@ android {
buildToolsVersion "30.0.2"
defaultConfig {
applicationId "com.example.blu.toys"
applicationId "com.stoplight.blu.toys"
minSdkVersion 19
targetSdkVersion 30
versionCode 1
versionName "1.0"
versionCode 2
versionName "1.2"
multiDexEnabled true
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
......
app/release/output-metadata.json
......@@ -4,15 +4,15 @@
"type": "APK",
"kind": "Directory"
},
"applicationId": "com.example.blu.toys",
"applicationId": "com.stoplight.blu.toys",
"variantName": "release",
"elements": [
{
"type": "SINGLE",
"filters": [],
"properties": [],
"versionCode": 1,
"versionName": "1.0",
"versionCode": 2,
"versionName": "1.2",
"enabled": true,
"outputFile": "app-release.apk"
}
......
app/src/main/AndroidManifest.xml
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="com.example.blu.toys">
package="com.stoplight.blu.toys">
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.READ_PHONE_STATE" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
<uses-permission android:name="android.permission.CAMERA" />
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
<uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
......@@ -36,7 +34,7 @@
android:required="true" />
<application
android:name=".app.App"
android:name="com.stoplight.blu.toys.app.App"
android:allowBackup="true"
android:icon="@mipmap/timerlogo"
android:label="@string/app_name"
......@@ -46,15 +44,15 @@
android:supportsRtl="true"
android:theme="@style/AppTheme"
tools:targetApi="n">
<activity android:name=".activity.SettingMusicActivity"></activity>
<activity android:name=".activity.MusicActivity" />
<activity android:name=".activity.SelectTimerActivity" />
<activity android:name=".activity.PlayActivity" />
<activity android:name=".activity.SetTimeActivity" />
<activity android:name=".activity.SelectDeviceActivity" />
<activity android:name=".activity.SearchingActivity" />
<activity android:name=".activity.AddDeviceActivity" />
<activity android:name=".MainActivity">
<activity android:name="com.stoplight.blu.toys.activity.SettingMusicActivity"></activity>
<activity android:name="com.stoplight.blu.toys.activity.MusicActivity" />
<activity android:name="com.stoplight.blu.toys.activity.SelectTimerActivity" />
<activity android:name="com.stoplight.blu.toys.activity.PlayActivity" />
<activity android:name="com.stoplight.blu.toys.activity.SetTimeActivity" />
<activity android:name="com.stoplight.blu.toys.activity.SelectDeviceActivity" />
<activity android:name="com.stoplight.blu.toys.activity.SearchingActivity" />
<activity android:name="com.stoplight.blu.toys.activity.AddDeviceActivity" />
<activity android:name="com.stoplight.blu.toys.MainActivity">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
......@@ -62,7 +60,7 @@
</intent-filter>
</activity>
<receiver android:name=".ble.receiver.BluetoothOpenAndClose">
<receiver android:name="com.stoplight.blu.toys.ble.receiver.BluetoothOpenAndClose">
<intent-filter>
<action android:name="android.bluetooth.adapter.action.STATE_CHANGED" />
</intent-filter>
......
app/src/main/java/com/example/blu/toys/MainActivity.java → app/src/main/java/com/stoplight/blu/toys/MainActivity.java
package com.example.blu.toys;
package com.stoplight.blu.toys;
import android.os.Bundle;
import android.os.Handler;
import com.example.blu.toys.activity.AddDeviceActivity;
import com.example.blu.toys.activity.BaseActivity;
import com.example.blu.toys.app.AppManager;
import com.stoplight.blu.toys.R;
import com.stoplight.blu.toys.activity.AddDeviceActivity;
import com.stoplight.blu.toys.activity.BaseActivity;
import com.stoplight.blu.toys.app.AppManager;
public class MainActivity extends BaseActivity {
......
app/src/main/java/com/example/blu/toys/activity/AddDeviceActivity.java → app/src/main/java/com/stoplight/blu/toys/activity/AddDeviceActivity.java
package com.example.blu.toys.activity;
import android.content.Intent;
package com.stoplight.blu.toys.activity;
import android.os.Bundle;
import android.view.KeyEvent;
import android.widget.Toast;
import androidx.appcompat.widget.AppCompatImageView;
import com.example.blu.toys.MainActivity;
import com.example.blu.toys.R;
import com.example.blu.toys.app.AppManager;
import com.stoplight.blu.toys.R;
import com.stoplight.blu.toys.app.AppManager;
import butterknife.BindView;
import butterknife.OnClick;
......@@ -45,7 +44,7 @@ public class AddDeviceActivity extends BaseActivity {
//退出方法
private void exit() {
if ((System.currentTimeMillis() - mExitTime) > 2000) {
Toast.makeText(AddDeviceActivity.this, "再按一次退出应用", Toast.LENGTH_SHORT).show();
Toast.makeText(AddDeviceActivity.this, "Press again to exit the app", Toast.LENGTH_SHORT).show();
mExitTime = System.currentTimeMillis();
} else {
//用户退出处理
......
app/src/main/java/com/example/blu/toys/activity/BaseActivity.java → app/src/main/java/com/stoplight/blu/toys/activity/BaseActivity.java
package com.example.blu.toys.activity;
package com.stoplight.blu.toys.activity;
import android.Manifest;
import android.content.Intent;
......@@ -8,9 +8,9 @@ import androidx.annotation.Nullable;
import androidx.appcompat.app.AppCompatActivity;
import androidx.recyclerview.widget.LinearLayoutManager;
import com.example.blu.toys.app.AppManager;
import com.example.blu.toys.utils.Utils;
import com.example.blu.toys.view.WrapContentGridLayoutManager;
import com.stoplight.blu.toys.app.AppManager;
import com.stoplight.blu.toys.utils.Utils;
import com.stoplight.blu.toys.view.WrapContentGridLayoutManager;
import com.hjq.permissions.OnPermission;
import com.hjq.permissions.Permission;
import com.hjq.permissions.XXPermissions;
......
app/src/main/java/com/example/blu/toys/activity/MusicActivity.java → app/src/main/java/com/stoplight/blu/toys/activity/MusicActivity.java
package com.example.blu.toys.activity;
package com.stoplight.blu.toys.activity;
import android.content.Intent;
import android.os.Bundle;
import android.view.View;
import com.example.blu.toys.R;
import com.example.blu.toys.app.AppManager;
import com.example.blu.toys.view.TypefaceTextView;
import com.stoplight.blu.toys.R;
import com.stoplight.blu.toys.app.AppManager;
import com.stoplight.blu.toys.view.TypefaceTextView;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
public class MusicActivity extends BaseActivity {
......
app/src/main/java/com/example/blu/toys/activity/PlayActivity.java → app/src/main/java/com/stoplight/blu/toys/activity/PlayActivity.java
package com.example.blu.toys.activity;
package com.stoplight.blu.toys.activity;
import android.app.AlertDialog;
import android.content.DialogInterface;
......@@ -11,14 +11,14 @@ import android.view.View;
import com.blankj.utilcode.util.LogUtils;
import com.clj.fastble.callback.BleWriteCallback;
import com.clj.fastble.exception.BleException;
import com.example.blu.toys.R;
import com.example.blu.toys.app.AppManager;
import com.example.blu.toys.ble.BlePlay;
import com.stoplight.blu.toys.R;
import com.stoplight.blu.toys.app.AppManager;
import com.stoplight.blu.toys.ble.BlePlay;
import com.example.blu.toys.ble.agreement.TrafficLightBean;
import com.example.blu.toys.utils.SpUtils;
import com.example.blu.toys.utils.TimeBean;
import com.example.blu.toys.utils.TimeUtil;
import com.example.blu.toys.view.TypefaceTextView;
import com.stoplight.blu.toys.utils.SpUtils;
import com.stoplight.blu.toys.utils.TimeBean;
import com.stoplight.blu.toys.utils.TimeUtil;
import com.stoplight.blu.toys.view.TypefaceTextView;
import com.hjq.toast.ToastUtils;
import butterknife.BindView;
......@@ -216,7 +216,7 @@ public class PlayActivity extends BaseActivity {
AlertDialog.Builder builder=new AlertDialog.Builder(this);
builder.setTitle("提示：将断开蓝牙连接");
builder.setTitle("Tip: Bluetooth connection will be disconnected");
builder.setPositiveButton("确定", new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
......@@ -229,7 +229,7 @@ public class PlayActivity extends BaseActivity {
BlePlay.getInstance().sendStard(bytes, new BleWriteCallback() {
@Override
public void onWriteSuccess(int current, int total, byte[] justWrite) {
ToastUtils.show("关机-发送成功");
ToastUtils.show("Power off - send successfully");
BlePlay.getInstance().closeBle();
Intent intent=new Intent(PlayActivity.this,AddDeviceActivity.class);
......
app/src/main/java/com/example/blu/toys/activity/SearchingActivity.java → app/src/main/java/com/stoplight/blu/toys/activity/SearchingActivity.java
package com.example.blu.toys.activity;
package com.stoplight.blu.toys.activity;
import android.os.Bundle;
import android.os.Handler;
......@@ -8,9 +8,9 @@ import android.widget.ImageView;
import androidx.appcompat.widget.AppCompatImageView;
import com.example.blu.toys.R;
import com.example.blu.toys.app.AppManager;
import com.example.blu.toys.ble.BlePlay;
import com.stoplight.blu.toys.R;
import com.stoplight.blu.toys.app.AppManager;
import com.stoplight.blu.toys.ble.BlePlay;
import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
......
app/src/main/java/com/example/blu/toys/activity/SelectDeviceActivity.java → app/src/main/java/com/stoplight/blu/toys/activity/SelectDeviceActivity.java
package com.example.blu.toys.activity;
package com.stoplight.blu.toys.activity;
import android.os.Bundle;
import android.text.TextUtils;
......@@ -8,11 +8,11 @@ import androidx.recyclerview.widget.RecyclerView;
import com.blankj.utilcode.util.CollectionUtils;
import com.clj.fastble.data.BleDevice;
import com.example.blu.toys.R;
import com.example.blu.toys.adapter.BleDeviceAdapter;
import com.example.blu.toys.app.AppManager;
import com.example.blu.toys.ble.BlePlay;
import com.example.blu.toys.view.TypefaceTextView;
import com.stoplight.blu.toys.R;
import com.stoplight.blu.toys.adapter.BleDeviceAdapter;
import com.stoplight.blu.toys.app.AppManager;
import com.stoplight.blu.toys.ble.BlePlay;
import com.stoplight.blu.toys.view.TypefaceTextView;
import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
......
app/src/main/java/com/example/blu/toys/activity/SelectTimerActivity.java → app/src/main/java/com/stoplight/blu/toys/activity/SelectTimerActivity.java
package com.example.blu.toys.activity;
package com.stoplight.blu.toys.activity;
import android.app.AlertDialog;
import android.content.DialogInterface;
import android.content.Intent;
import android.os.Bundle;
import android.widget.SeekBar;
import android.widget.Switch;
import com.blankj.utilcode.util.LogUtils;
import com.clj.fastble.callback.BleWriteCallback;
import com.clj.fastble.exception.BleException;
import com.example.blu.toys.R;
import com.example.blu.toys.app.AppManager;
import com.example.blu.toys.ble.BlePlay;
import com.stoplight.blu.toys.R;
import com.stoplight.blu.toys.app.AppManager;
import com.stoplight.blu.toys.ble.BlePlay;
import com.example.blu.toys.ble.agreement.TrafficLightBean;
import com.example.blu.toys.utils.SpUtils;
import com.example.blu.toys.view.TypefaceTextView;
import com.hjq.toast.ToastUtils;
import com.stoplight.blu.toys.utils.SpUtils;
import com.stoplight.blu.toys.view.TypefaceTextView;
import butterknife.BindView;
import butterknife.OnClick;
......
app/src/main/java/com/example/blu/toys/activity/SetTimeActivity.java → app/src/main/java/com/stoplight/blu/toys/activity/SetTimeActivity.java
package com.example.blu.toys.activity;
package com.stoplight.blu.toys.activity;
import android.app.AlertDialog;
import android.content.DialogInterface;
......@@ -13,16 +13,14 @@ import android.widget.RelativeLayout;
import com.blankj.utilcode.util.LogUtils;
import com.clj.fastble.callback.BleWriteCallback;
import com.clj.fastble.exception.BleException;
import com.example.blu.toys.R;
import com.example.blu.toys.app.AppManager;
import com.example.blu.toys.ble.BlePlay;
import com.stoplight.blu.toys.R;
import com.stoplight.blu.toys.ble.BlePlay;
import com.example.blu.toys.ble.agreement.TrafficLightBean;
import com.example.blu.toys.utils.LocalDateUtils;
import com.example.blu.toys.utils.SpUtils;
import com.example.blu.toys.utils.TimeBean;
import com.example.blu.toys.utils.TimeUtil;
import com.example.blu.toys.view.TypefaceTextView;
import com.example.blu.toys.view.WheelView;
import com.stoplight.blu.toys.utils.SpUtils;
import com.stoplight.blu.toys.utils.TimeBean;
import com.stoplight.blu.toys.utils.TimeUtil;
import com.stoplight.blu.toys.view.TypefaceTextView;
import com.stoplight.blu.toys.view.WheelView;
import com.hjq.toast.ToastUtils;
import java.text.SimpleDateFormat;
......@@ -375,9 +373,9 @@ public class SetTimeActivity extends BaseActivity {
AlertDialog.Builder builder=new AlertDialog.Builder(this);
builder.setTitle("提示:将断开蓝牙连接");
builder.setTitle("Tip: Bluetooth connection will be disconnected");
builder.setPositiveButton("确定", new DialogInterface.OnClickListener() {
builder.setPositiveButton("determine", new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
// TODO Auto-generated method stub
......@@ -390,7 +388,7 @@ public class SetTimeActivity extends BaseActivity {
}
});
builder.setNegativeButton("取消", new DialogInterface.OnClickListener() {
builder.setNegativeButton("cancel", new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
// TODO Auto-generated method stub
......@@ -424,9 +422,9 @@ public class SetTimeActivity extends BaseActivity {
break;
case R.id.back_but:
AlertDialog.Builder builder=new AlertDialog.Builder(this);
builder.setTitle("提示:将断开蓝牙连接");
builder.setTitle("Tip: Bluetooth connection will be disconnected");
builder.setPositiveButton("确定", new DialogInterface.OnClickListener() {
builder.setPositiveButton("determine", new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
// TODO Auto-generated method stub
......@@ -439,7 +437,7 @@ public class SetTimeActivity extends BaseActivity {
}
});
builder.setNegativeButton("取消", new DialogInterface.OnClickListener() {
builder.setNegativeButton("cancel", new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
// TODO Auto-generated method stub
......@@ -453,7 +451,7 @@ public class SetTimeActivity extends BaseActivity {
case R.id.start_but:
boolean bleOpen = BlePlay.getInstance().isBleOpen();
if (!bleOpen) {
ToastUtils.show("请打开蓝牙");
ToastUtils.show("Please turn on Bluetooth");
return;
}
String selectHour_dw = wheelHour_dw.getSeletedItem();
......@@ -466,7 +464,7 @@ public class SetTimeActivity extends BaseActivity {
int time = Integer.valueOf(selectHour_dw) * 3600 + Integer.valueOf(selectMin_dw) * 60 + Integer.valueOf(selectSec_dw);
if (time == 0) {
ToastUtils.show("请选择时间");
ToastUtils.show("Please select the time");
return;
}
......
app/src/main/java/com/example/blu/toys/activity/SettingMusicActivity.java → app/src/main/java/com/stoplight/blu/toys/activity/SettingMusicActivity.java
package com.example.blu.toys.activity;
package com.stoplight.blu.toys.activity;
import android.content.Intent;
import android.os.Bundle;
import androidx.recyclerview.widget.RecyclerView;
import com.example.blu.toys.R;
import com.example.blu.toys.adapter.MusicAdapter;
import com.example.blu.toys.app.AppManager;
import com.example.blu.toys.utils.SpUtils;
import com.example.blu.toys.view.TypefaceTextView;
import com.stoplight.blu.toys.R;
import com.stoplight.blu.toys.adapter.MusicAdapter;
import com.stoplight.blu.toys.app.AppManager;
import com.stoplight.blu.toys.utils.SpUtils;
import com.stoplight.blu.toys.view.TypefaceTextView;
import java.util.ArrayList;
import java.util.List;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
public class SettingMusicActivity extends BaseActivity {
......
app/src/main/java/com/example/blu/toys/activity/TimerManager.java → app/src/main/java/com/stoplight/blu/toys/activity/TimerManager.java
package com.example.blu.toys.activity;
package com.stoplight.blu.toys.activity;
import android.os.Handler;
import android.os.Message;
......
app/src/main/java/com/example/blu/toys/adapter/BleDeviceAdapter.java → app/src/main/java/com/stoplight/blu/toys/adapter/BleDeviceAdapter.java
package com.example.blu.toys.adapter;
package com.stoplight.blu.toys.adapter;
import android.text.TextUtils;
......@@ -8,7 +8,7 @@ import com.chad.library.adapter.base.BaseViewHolder;
import com.clj.fastble.data.BleDevice;
import com.example.blu.toys.R;
import com.stoplight.blu.toys.R;
import java.util.List;
......
app/src/main/java/com/example/blu/toys/adapter/MusicAdapter.java → app/src/main/java/com/stoplight/blu/toys/adapter/MusicAdapter.java
package com.example.blu.toys.adapter;
package com.stoplight.blu.toys.adapter;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.BaseViewHolder;
import com.example.blu.toys.R;
import com.example.blu.toys.utils.SpUtils;
import com.stoplight.blu.toys.R;
import com.stoplight.blu.toys.utils.SpUtils;
import java.util.List;
......
app/src/main/java/com/example/blu/toys/app/App.java → app/src/main/java/com/stoplight/blu/toys/app/App.java
package com.example.blu.toys.app;
package com.stoplight.blu.toys.app;
import android.app.Application;
import android.util.DisplayMetrics;
import com.clj.fastble.BleManager;
import com.example.blu.toys.utils.SpUtils;
import com.stoplight.blu.toys.utils.SpUtils;
import com.hjq.toast.ToastUtils;
public class App extends Application {
......
app/src/main/java/com/example/blu/toys/app/AppManager.java → app/src/main/java/com/stoplight/blu/toys/app/AppManager.java
package com.example.blu.toys.app;
package com.stoplight.blu.toys.app;
import android.app.Activity;
......
app/src/main/java/com/example/blu/toys/ble/BlePlay.java → app/src/main/java/com/stoplight/blu/toys/ble/BlePlay.java
package com.example.blu.toys.ble;
package com.stoplight.blu.toys.ble;
import android.bluetooth.BluetoothAdapter;
import android.bluetooth.BluetoothGatt;
......@@ -13,9 +13,8 @@ import com.clj.fastble.callback.BleWriteCallback;
import com.clj.fastble.data.BleDevice;
import com.clj.fastble.exception.BleException;
import com.clj.fastble.scan.BleScanRuleConfig;
import com.example.blu.toys.app.App;
import com.example.blu.toys.ble.agreement.HexStringUtils;
import com.example.blu.toys.utils.SpUtils;
import com.stoplight.blu.toys.app.App;
import com.stoplight.blu.toys.utils.SpUtils;
import org.greenrobot.eventbus.EventBus;
......
app/src/main/java/com/example/blu/toys/ble/Notify.java → app/src/main/java/com/stoplight/blu/toys/ble/Notify.java
package com.example.blu.toys.ble;
package com.stoplight.blu.toys.ble;
import android.bluetooth.BluetoothDevice;
......
app/src/main/java/com/example/blu/toys/ble/inter/IBTBoudListener.java → app/src/main/java/com/stoplight/blu/toys/ble/inter/IBTBoudListener.java
package com.example.blu.toys.ble.inter;
package com.stoplight.blu.toys.ble.inter;
import android.bluetooth.BluetoothDevice;
/**
......
app/src/main/java/com/example/blu/toys/ble/inter/IBTConnectListener.java → app/src/main/java/com/stoplight/blu/toys/ble/inter/IBTConnectListener.java
package com.example.blu.toys.ble.inter;
package com.stoplight.blu.toys.ble.inter;
import android.bluetooth.BluetoothDevice;
......
app/src/main/java/com/example/blu/toys/ble/inter/IBTScanListener.java → app/src/main/java/com/stoplight/blu/toys/ble/inter/IBTScanListener.java
package com.example.blu.toys.ble.inter;
package com.stoplight.blu.toys.ble.inter;
import android.bluetooth.BluetoothDevice;
......
app/src/main/java/com/example/blu/toys/ble/inter/IBluetoothHelper.java → app/src/main/java/com/stoplight/blu/toys/ble/inter/IBluetoothHelper.java
package com.example.blu.toys.ble.inter;
package com.stoplight.blu.toys.ble.inter;
import android.bluetooth.BluetoothDevice;
import android.content.Context;
......
app/src/main/java/com/example/blu/toys/ble/receiver/BluetoothOpenAndClose.java → app/src/main/java/com/stoplight/blu/toys/ble/receiver/BluetoothOpenAndClose.java
package com.example.blu.toys.ble.receiver;
package com.stoplight.blu.toys.ble.receiver;
import android.bluetooth.BluetoothAdapter;
import android.content.BroadcastReceiver;
......
app/src/main/java/com/example/blu/toys/ble/receiver/HexUtil.java → app/src/main/java/com/stoplight/blu/toys/ble/receiver/HexUtil.java
package com.example.blu.toys.ble.receiver;
package com.stoplight.blu.toys.ble.receiver;
@SuppressWarnings("all")
public class HexUtil {
......
app/src/main/java/com/example/blu/toys/utils/AlertDialogUtil.java → app/src/main/java/com/stoplight/blu/toys/utils/AlertDialogUtil.java
package com.example.blu.toys.utils;
package com.stoplight.blu.toys.utils;
import android.content.Context;
import android.content.DialogInterface;
......
app/src/main/java/com/example/blu/toys/utils/BigDecimalUtils.java → app/src/main/java/com/stoplight/blu/toys/utils/BigDecimalUtils.java
package com.example.blu.toys.utils;
package com.stoplight.blu.toys.utils;
import java.math.BigDecimal;
import java.math.RoundingMode;
......
app/src/main/java/com/example/blu/toys/utils/DateUtils.java → app/src/main/java/com/stoplight/blu/toys/utils/DateUtils.java
package com.example.blu.toys.utils;
package com.stoplight.blu.toys.utils;
import java.text.ParseException;
import java.text.SimpleDateFormat;
......
app/src/main/java/com/example/blu/toys/utils/JsonObjectUtil.java → app/src/main/java/com/stoplight/blu/toys/utils/JsonObjectUtil.java
package com.example.blu.toys.utils;
package com.stoplight.blu.toys.utils;
import android.text.TextUtils;
......
app/src/main/java/com/example/blu/toys/utils/LocalDateUtils.java → app/src/main/java/com/stoplight/blu/toys/utils/LocalDateUtils.java
package com.example.blu.toys.utils;
package com.stoplight.blu.toys.utils;
import java.text.DateFormat;
import java.text.ParseException;
......
app/src/main/java/com/example/blu/toys/utils/MathDataUtil.java → app/src/main/java/com/stoplight/blu/toys/utils/MathDataUtil.java
package com.example.blu.toys.utils;
package com.stoplight.blu.toys.utils;
import java.math.BigDecimal;
......
app/src/main/java/com/example/blu/toys/utils/NumberUtils.java → app/src/main/java/com/stoplight/blu/toys/utils/NumberUtils.java
package com.example.blu.toys.utils;
package com.stoplight.blu.toys.utils;
public class NumberUtils {
......
app/src/main/java/com/example/blu/toys/utils/RegularUtils.java → app/src/main/java/com/stoplight/blu/toys/utils/RegularUtils.java
package com.example.blu.toys.utils;
package com.stoplight.blu.toys.utils;
import android.text.TextUtils;
......
app/src/main/java/com/example/blu/toys/utils/SpUtils.java → app/src/main/java/com/stoplight/blu/toys/utils/SpUtils.java
package com.example.blu.toys.utils;
package com.stoplight.blu.toys.utils;
import android.content.Context;
import android.content.SharedPreferences;
......
app/src/main/java/com/example/blu/toys/utils/SpanUtil.java → app/src/main/java/com/stoplight/blu/toys/utils/SpanUtil.java
package com.example.blu.toys.utils;
package com.stoplight.blu.toys.utils;
import android.content.Context;
import android.graphics.MaskFilter;
......
app/src/main/java/com/example/blu/toys/utils/TimeBean.java → app/src/main/java/com/stoplight/blu/toys/utils/TimeBean.java
package com.example.blu.toys.utils;
package com.stoplight.blu.toys.utils;
import com.blankj.utilcode.util.LogUtils;
......
app/src/main/java/com/example/blu/toys/utils/TimeUtil.java → app/src/main/java/com/stoplight/blu/toys/utils/TimeUtil.java
package com.example.blu.toys.utils;
package com.stoplight.blu.toys.utils;
import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Date;
import java.util.Locale;
public class TimeUtil {
......
app/src/main/java/com/example/blu/toys/utils/Utils.java → app/src/main/java/com/stoplight/blu/toys/utils/Utils.java
package com.example.blu.toys.utils;
package com.stoplight.blu.toys.utils;
import android.content.ClipData;
import android.content.ClipboardManager;
......
app/src/main/java/com/example/blu/toys/view/PointWaitBar.java → app/src/main/java/com/stoplight/blu/toys/view/PointWaitBar.java
package com.example.blu.toys.view;
package com.stoplight.blu.toys.view;
import android.content.Context;
import android.graphics.Bitmap;
......@@ -13,7 +13,7 @@ import android.view.Gravity;
import android.widget.ImageView;
import android.widget.LinearLayout;
import com.example.blu.toys.R;
import com.stoplight.blu.toys.R;
import java.lang.ref.WeakReference;
......
app/src/main/java/com/example/blu/toys/view/TypefaceTextView.java → app/src/main/java/com/stoplight/blu/toys/view/TypefaceTextView.java
package com.example.blu.toys.view;
package com.stoplight.blu.toys.view;
import android.content.Context;
import android.content.res.TypedArray;
import android.graphics.Typeface;
import android.util.AttributeSet;
import com.example.blu.toys.R;
import com.stoplight.blu.toys.R;
public class TypefaceTextView extends androidx.appcompat.widget.AppCompatTextView {
public TypefaceTextView(Context context) {
......
app/src/main/java/com/example/blu/toys/view/WheelView.java → app/src/main/java/com/stoplight/blu/toys/view/WheelView.java
package com.example.blu.toys.view;
package com.stoplight.blu.toys.view;
import android.app.Activity;
import android.content.Context;
......
app/src/main/java/com/example/blu/toys/view/WrapContentGridLayoutManager.java → app/src/main/java/com/stoplight/blu/toys/view/WrapContentGridLayoutManager.java
package com.example.blu.toys.view;
package com.stoplight.blu.toys.view;
import android.content.Context;
import android.util.AttributeSet;
......
app/src/main/res/layout/activity_add_device.xml
......@@ -5,7 +5,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@mipmap/black"
tools:context=".activity.AddDeviceActivity">
tools:context="com.stoplight.blu.toys.activity.AddDeviceActivity">
<LinearLayout
android:layout_width="match_parent"
......@@ -16,7 +16,7 @@
android:orientation="vertical">
<com.example.blu.toys.view.TypefaceTextView
<com.stoplight.blu.toys.view.TypefaceTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
......@@ -29,7 +29,7 @@
<com.example.blu.toys.view.TypefaceTextView
<com.stoplight.blu.toys.view.TypefaceTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
......
app/src/main/res/layout/activity_main.xml
......@@ -5,7 +5,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@mipmap/black"
tools:context=".MainActivity">
tools:context="com.stoplight.blu.toys.MainActivity">
<LinearLayout
......@@ -23,7 +23,7 @@
android:src="@mipmap/timerlogo" />
<com.example.blu.toys.view.TypefaceTextView
<com.stoplight.blu.toys.view.TypefaceTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
......
app/src/main/res/layout/activity_music.xml
......@@ -6,9 +6,9 @@
android:layout_height="match_parent"
android:background="#FFCA05"
android:orientation="vertical"
tools:context=".activity.MusicActivity">
tools:context="com.stoplight.blu.toys.activity.MusicActivity">
<com.example.blu.toys.view.TypefaceTextView
<com.stoplight.blu.toys.view.TypefaceTextView
android:id="@+id/back_but"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -23,7 +23,7 @@
android:textStyle="bold"
app:typeface="@string/LittleOrion" />
<com.example.blu.toys.view.TypefaceTextView
<com.stoplight.blu.toys.view.TypefaceTextView
android:id="@+id/open_music"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -37,7 +37,7 @@
android:textStyle="bold"
app:typeface="@string/LittleOrion" />
<com.example.blu.toys.view.TypefaceTextView
<com.stoplight.blu.toys.view.TypefaceTextView
android:id="@+id/close_music"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......
app/src/main/res/layout/activity_play.xml
......@@ -5,10 +5,10 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#FFCA05"
tools:context=".activity.PlayActivity">
tools:context="com.stoplight.blu.toys.activity.PlayActivity">
<com.example.blu.toys.view.TypefaceTextView
<com.stoplight.blu.toys.view.TypefaceTextView
android:id="@+id/back_but"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -24,7 +24,7 @@
android:textStyle="bold" />
<com.example.blu.toys.view.TypefaceTextView
<com.stoplight.blu.toys.view.TypefaceTextView
android:id="@+id/task_time"
android:layout_width="match_parent"
android:layout_height="wrap_content"
......@@ -62,7 +62,7 @@
android:layout_centerHorizontal="true"
android:background="@mipmap/cancelbutton">
<com.example.blu.toys.view.TypefaceTextView
<com.stoplight.blu.toys.view.TypefaceTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
......@@ -85,7 +85,7 @@
android:layout_centerHorizontal="true"
android:background="@mipmap/pausebutton">
<com.example.blu.toys.view.TypefaceTextView
<com.stoplight.blu.toys.view.TypefaceTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
......@@ -108,7 +108,7 @@
android:layout_centerHorizontal="true"
android:background="@mipmap/resumebutton">
<com.example.blu.toys.view.TypefaceTextView
<com.stoplight.blu.toys.view.TypefaceTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
......
app/src/main/res/layout/activity_searching.xml
......@@ -5,7 +5,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@mipmap/black"
tools:context=".activity.SearchingActivity">
tools:context="com.stoplight.blu.toys.activity.SearchingActivity">
<LinearLayout
......@@ -17,7 +17,7 @@
android:background="@drawable/black_thumb"
android:gravity="center">
<com.example.blu.toys.view.TypefaceTextView
<com.stoplight.blu.toys.view.TypefaceTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="@dimen/dp_5"
......@@ -30,7 +30,7 @@
</LinearLayout>
<com.example.blu.toys.view.TypefaceTextView
<com.stoplight.blu.toys.view.TypefaceTextView
android:id="@+id/will"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -42,7 +42,7 @@
android:textColor="#E07A3A"
android:textSize="@dimen/sp_16" />
<com.example.blu.toys.view.TypefaceTextView
<com.stoplight.blu.toys.view.TypefaceTextView
android:id="@+id/animate"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -94,7 +94,7 @@
android:orientation="horizontal">
<com.example.blu.toys.view.TypefaceTextView
<com.stoplight.blu.toys.view.TypefaceTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Srearching"
......@@ -102,7 +102,7 @@
android:textSize="@dimen/sp_22"
android:textStyle="bold" />
<com.example.blu.toys.view.PointWaitBar
<com.stoplight.blu.toys.view.PointWaitBar
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
......
app/src/main/res/layout/activity_seleclt_device.xml
......@@ -5,10 +5,10 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@mipmap/black"
tools:context=".activity.SelectDeviceActivity">
tools:context="com.stoplight.blu.toys.activity.SelectDeviceActivity">
<com.example.blu.toys.view.TypefaceTextView
<com.stoplight.blu.toys.view.TypefaceTextView
android:id="@+id/back_but"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -32,7 +32,7 @@
android:orientation="vertical">
<com.example.blu.toys.view.TypefaceTextView
<com.stoplight.blu.toys.view.TypefaceTextView
android:id="@+id/will"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -59,7 +59,7 @@
app:layout_constraintTop_toBottomOf="@+id/include" />
<com.example.blu.toys.view.TypefaceTextView
<com.stoplight.blu.toys.view.TypefaceTextView
android:id="@+id/device_not_found"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......
app/src/main/res/layout/activity_select_timer.xml
......@@ -5,10 +5,10 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#FFCA05"
tools:context=".activity.SelectTimerActivity">
tools:context="com.stoplight.blu.toys.activity.SelectTimerActivity">
<com.example.blu.toys.view.TypefaceTextView
<com.stoplight.blu.toys.view.TypefaceTextView
android:id="@+id/back_but"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -36,7 +36,7 @@
android:orientation="vertical">
<com.example.blu.toys.view.TypefaceTextView
<com.stoplight.blu.toys.view.TypefaceTextView
android:id="@+id/will"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -59,7 +59,7 @@
android:background="@drawable/black_thumb"
android:padding="@dimen/dp_5">
<com.example.blu.toys.view.TypefaceTextView
<com.stoplight.blu.toys.view.TypefaceTextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
......@@ -98,7 +98,7 @@
android:background="@drawable/black_thumb"
android:padding="@dimen/dp_5">
<com.example.blu.toys.view.TypefaceTextView
<com.stoplight.blu.toys.view.TypefaceTextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
......@@ -137,7 +137,7 @@
android:background="@drawable/black_thumb"
android:padding="@dimen/dp_5">
<com.example.blu.toys.view.TypefaceTextView
<com.stoplight.blu.toys.view.TypefaceTextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
......@@ -168,7 +168,7 @@
</RelativeLayout>
<com.example.blu.toys.view.TypefaceTextView
<com.stoplight.blu.toys.view.TypefaceTextView
android:id="@+id/hiht_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......
app/src/main/res/layout/activity_set_time.xml
......@@ -5,10 +5,10 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#FFCA05"
tools:context=".activity.SetTimeActivity">
tools:context="com.stoplight.blu.toys.activity.SetTimeActivity">
<com.example.blu.toys.view.TypefaceTextView
<com.stoplight.blu.toys.view.TypefaceTextView
android:id="@+id/back_but"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -34,7 +34,7 @@
android:src="@mipmap/beecartoon" />
<com.example.blu.toys.view.TypefaceTextView
<com.stoplight.blu.toys.view.TypefaceTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/back_but"
......@@ -61,7 +61,7 @@
android:orientation="vertical">
<com.example.blu.toys.view.TypefaceTextView
<com.stoplight.blu.toys.view.TypefaceTextView
android:id="@+id/will"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -89,13 +89,13 @@
android:layout_centerVertical="true"
android:gravity="center">
<com.example.blu.toys.view.WheelView
<com.stoplight.blu.toys.view.WheelView
android:id="@+id/wheel_hour"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical" />
<com.example.blu.toys.view.TypefaceTextView
<com.stoplight.blu.toys.view.TypefaceTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/back_but"
......@@ -106,14 +106,14 @@
android:textSize="@dimen/sp_24"
app:typeface="@string/LittleOrion" />
<com.example.blu.toys.view.WheelView
<com.stoplight.blu.toys.view.WheelView
android:id="@+id/wheel_minute"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical" />
<com.example.blu.toys.view.TypefaceTextView
<com.stoplight.blu.toys.view.TypefaceTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/back_but"
......@@ -124,14 +124,14 @@
android:textSize="@dimen/sp_24"
app:typeface="@string/LittleOrion" />
<com.example.blu.toys.view.WheelView
<com.stoplight.blu.toys.view.WheelView
android:id="@+id/wheel_second"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical" />
<com.example.blu.toys.view.WheelView
<com.stoplight.blu.toys.view.WheelView
android:id="@+id/wheel_am_pm"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -145,7 +145,7 @@
</RelativeLayout>
<com.example.blu.toys.view.TypefaceTextView
<com.stoplight.blu.toys.view.TypefaceTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/back_but"
......@@ -172,13 +172,13 @@
android:layout_centerVertical="true"
android:gravity="center">
<com.example.blu.toys.view.WheelView
<com.stoplight.blu.toys.view.WheelView
android:id="@+id/wheel_hour_dw"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical" />
<com.example.blu.toys.view.TypefaceTextView
<com.stoplight.blu.toys.view.TypefaceTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/back_but"
......@@ -189,14 +189,14 @@
android:textSize="@dimen/sp_24"
app:typeface="@string/LittleOrion" />
<com.example.blu.toys.view.WheelView
<com.stoplight.blu.toys.view.WheelView
android:id="@+id/wheel_minute_dw"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical" />
<com.example.blu.toys.view.TypefaceTextView
<com.stoplight.blu.toys.view.TypefaceTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/back_but"
......@@ -207,7 +207,7 @@
android:textSize="@dimen/sp_24"
app:typeface="@string/LittleOrion" />
<com.example.blu.toys.view.WheelView
<com.stoplight.blu.toys.view.WheelView
android:id="@+id/wheel_second_dw"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -231,7 +231,7 @@
android:layout_marginTop="@dimen/dp_20"
android:background="@mipmap/resumebutton">
<com.example.blu.toys.view.TypefaceTextView
<com.stoplight.blu.toys.view.TypefaceTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
......
app/src/main/res/layout/activity_setting_music.xml
......@@ -6,9 +6,9 @@
android:layout_height="match_parent"
android:background="#FFCA05"
android:orientation="vertical"
tools:context=".activity.SettingMusicActivity">
tools:context="com.stoplight.blu.toys.activity.SettingMusicActivity">
<com.example.blu.toys.view.TypefaceTextView
<com.stoplight.blu.toys.view.TypefaceTextView
android:id="@+id/back_but"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......
app/src/main/res/layout/ble_devices_item.xml
<?xml version="1.0" encoding="utf-8"?>
<com.example.blu.toys.view.TypefaceTextView xmlns:android="http://schemas.android.com/apk/res/android"
<com.stoplight.blu.toys.view.TypefaceTextView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/dv_name"
......@@ -14,4 +14,4 @@
android:textSize="@dimen/sp_22"
android:textStyle="bold">
</com.example.blu.toys.view.TypefaceTextView>
\ No newline at end of file
</com.stoplight.blu.toys.view.TypefaceTextView>
\ No newline at end of file
app/src/main/res/layout/music_type.xml
......@@ -9,7 +9,7 @@
android:padding="@dimen/dp_10">
<com.example.blu.toys.view.TypefaceTextView
<com.stoplight.blu.toys.view.TypefaceTextView
android:id="@+id/dv_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
......
app/src/main/res/values/strings.xml
<resources>
<string name="app_name">BluToysApplication</string>
<string name="app_name">Stoplight Golight</string>
<string name="OCRAEXT">OCRAEXT</string>
<string name="LittleOrion">LittleOrion</string>
......
library/build.gradle
......@@ -5,8 +5,14 @@ android {
defaultConfig {
minSdkVersion 14
<<<<<<< HEAD
targetSdkVersion 32
=======
targetSdkVersion 28
versionCode 3
versionName "1.3"
>>>>>>> ee610bcfe666c5a8aee5df89f5948dec147a6d1f
}
buildTypes {
release {
......
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