|
|
@@ -1,7 +1,10 @@
|
|
|
package com.slam.bboxble;
|
|
|
|
|
|
+import android.Manifest;
|
|
|
import android.app.Activity;
|
|
|
+import android.content.pm.PackageManager;
|
|
|
import android.os.Bundle;
|
|
|
+import android.support.v4.app.ActivityCompat;
|
|
|
import android.text.method.ScrollingMovementMethod;
|
|
|
import android.util.Log;
|
|
|
import android.view.View;
|
|
|
@@ -40,6 +43,21 @@ public class TestActivity extends Activity implements View.OnClickListener {
|
|
|
super.onCreate(savedInstanceState);
|
|
|
setContentView(R.layout.activity_test);
|
|
|
|
|
|
+ if(ActivityCompat.checkSelfPermission(this, Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED){
|
|
|
+ if (ActivityCompat.shouldShowRequestPermissionRationale(this,
|
|
|
+ Manifest.permission.ACCESS_FINE_LOCATION)) {
|
|
|
+
|
|
|
+ ActivityCompat.requestPermissions(this,
|
|
|
+ new String[]{Manifest.permission.ACCESS_FINE_LOCATION},
|
|
|
+ 0);
|
|
|
+ } else {
|
|
|
+
|
|
|
+ // Camera permission has not been granted yet. Request it directly.
|
|
|
+ ActivityCompat.requestPermissions(this, new String[]{Manifest.permission.ACCESS_FINE_LOCATION},
|
|
|
+ 8);
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
mButtonDisconnect = this.findViewById(R.id.button_dis_connect);
|
|
|
mButtonDisconnect.setOnClickListener(this);
|
|
|
|
|
|
@@ -189,10 +207,10 @@ public class TestActivity extends Activity implements View.OnClickListener {
|
|
|
//TODO 提供接口给webview 连接设备
|
|
|
/**
|
|
|
* 连接蓝牙设备
|
|
|
- * @param address
|
|
|
+ * @param name
|
|
|
*/
|
|
|
- public void onConnect(String address) {
|
|
|
- mainBluetooth.startConnectLeDevice(address);
|
|
|
+ public void onConnect(String name) {
|
|
|
+ mainBluetooth.startConnectLeDevice(name);
|
|
|
}
|
|
|
//写入特征值数值
|
|
|
//TODO 提供接口给webview 写入数据给设备
|