|
@@ -648,13 +648,12 @@ public class SensorTest extends AppCompatActivity
|
|
|
initTextView();
|
|
|
openDevices();
|
|
|
|
|
|
- // 检查是否有读取外部存储的权限
|
|
|
- if (ContextCompat.checkSelfPermission(this, Manifest.permission.READ_EXTERNAL_STORAGE)
|
|
|
- != PackageManager.PERMISSION_GRANTED) {
|
|
|
+ // 检查是否有读写外部存储的权限
|
|
|
+ if (ContextCompat.checkSelfPermission(this, Manifest.permission.READ_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED
|
|
|
+ || ContextCompat.checkSelfPermission(this, Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
|
|
|
// 如果没有权限,请求权限
|
|
|
- ActivityCompat.requestPermissions(this,
|
|
|
- new String[]{Manifest.permission.READ_EXTERNAL_STORAGE},
|
|
|
- PERMISSION_REQUEST_CODE);
|
|
|
+ ActivityCompat.requestPermissions(SensorTest.this, new String[]{android.Manifest.permission.WRITE_EXTERNAL_STORAGE,
|
|
|
+ android.Manifest.permission.READ_EXTERNAL_STORAGE}, PERMISSION_REQUEST_CODE);
|
|
|
} else {
|
|
|
// 如果已经有权限,读取文件
|
|
|
readFile();
|