From 3bd6e9023e011336da840e11a9d48bb31c7a0261 Mon Sep 17 00:00:00 2001
From: 陈奇 <1650699704@qq.com>
Date: Wed, 07 Nov 2018 09:31:59 +0800
Subject: [PATCH] [*]将电磁版本的唤醒心跳改成两秒，唤醒之后回到30一次心跳 [*]整体版本页面显示的绝对安全换成了安全 [*]自定义语音修改和优化，添加了无声的选择
---
app/src/main/java/com/moral/yunfushao/MainActivity.java | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/app/src/main/java/com/moral/yunfushao/MainActivity.java b/app/src/main/java/com/moral/yunfushao/MainActivity.java
index 2740b3f..3887a73 100644
--- a/app/src/main/java/com/moral/yunfushao/MainActivity.java
+++ b/app/src/main/java/com/moral/yunfushao/MainActivity.java
@@ -6,6 +6,7 @@
import android.content.Context;
import android.content.Intent;
import android.content.ServiceConnection;
+import android.content.pm.PackageManager;
import android.graphics.Color;
import android.graphics.drawable.ColorDrawable;
import android.os.AsyncTask;
@@ -43,6 +44,7 @@
import com.moral.yunfushao.model.EventMessage;
import com.moral.yunfushao.model.User;
import com.moral.yunfushao.update.UpdateManager;
+import com.moral.yunfushao.utils.PermissionUtil;
import org.greenrobot.eventbus.EventBus;
import org.json.JSONException;
@@ -86,6 +88,7 @@
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
bindService();
+ PermissionUtil.verifyStoragePermissions(this);
}
@Override
@@ -213,6 +216,20 @@
}
}
+ @Override
+ public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
+ super.onRequestPermissionsResult(requestCode, permissions, grantResults);
+
+ if (requestCode == 1) {
+ for (int i = 0; i < permissions.length; i++) {
+ if (grantResults[i] != PackageManager.PERMISSION_GRANTED) {
+ //������������
+ PermissionUtil.verifyStoragePermissions(this);
+ }
+ }
+ }
+ }
+
UpdateManager manager = new UpdateManager(MainActivity.this);
private class checkUpdateTask extends AsyncTask<String, Void, String> {
@@ -307,8 +324,6 @@
public void onServiceDisconnected(ComponentName name) {
mBluetoothService = null;
}
-
-
};
private BluetoothService.Callback callback = new BluetoothService.Callback() {
--
Gitblit v1.8.0