Commit 0170f810 authored by Brian Lee's avatar Brian Lee
Browse files

a

parent 66ea60d8
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$" vcs="Git" />
</component>
</project>
\ No newline at end of file
......@@ -29,5 +29,6 @@ dependencies {
implementation 'com.android.support:design:28.0.0'
implementation 'androidx.fragment:fragment:1.1.0'
implementation 'com.google.code.gson:gson:2.8.5'
compile 'com.jaredrummler:android-device-names:1.1.9'
}
......@@ -15,6 +15,7 @@
<uses-permission android:name="android.permission.READ_PHONE_STATE"/>
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
<uses-permission android:name="android.permission.CHANGE_NETWORK_STATE"/>
<uses-feature android:name="android.hardware.camera"/>
<uses-feature android:name="android.hardware.camera.autofocus"/>
......@@ -31,7 +32,8 @@
android:label="@string/app_name"
android:roundIcon="@mipmap/logo"
android:supportsRtl="true"
android:theme="@style/AppTheme">
android:theme="@style/AppTheme"
android:usesCleartextTraffic="true">
<activity android:name=".MainActivity"
android:theme="@style/AppTheme.NoActionBar">
<intent-filter>
......
......@@ -67,6 +67,7 @@ public class BleService implements IBleService {
if (advtimes < 3) {
mHandler.postDelayed(advtime, 1000);
} else {
Log.d("advtime","deaaa");
bluetoothDeviceArrayList.clear();
stopAction();
startScan();
......@@ -89,9 +90,9 @@ public class BleService implements IBleService {
public void run() {
scanGeneratorCount++;
if(scanGeneratorCount < 60){
scanGeneratorHandler.postDelayed(scanGenerator,1000);
Log.d("testabc",Integer.toString(scanGeneratorCount));
scanGeneratorHandler.postDelayed(scanGenerator,1000);
}
else{
......
Supports Markdown
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