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/AndroidManifest.xml | 58 ++++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 38 insertions(+), 20 deletions(-)
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 27998dc..cac457a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -34,39 +34,58 @@
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.WRITE_SETTINGS" />
<uses-permission android:name="com.android.launcher.permission.READ_SETTINGS" />
- <uses-permission android:name="android.permission.GET_ACCOUNTS"/>
- <uses-permission android:name="android.permission.MANAGE_ACCOUNTS"/>
+ <uses-permission android:name="android.permission.GET_ACCOUNTS" />
+ <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
<uses-permission android:name="android.permission.RECEIVE_USER_PRESENT" />
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" /> <!-- ������������ debug ������������������6.0 ��������� ������������������ -->
<uses-permission android:name="android.permission.ACCESS_LOCATION_EXTRA_COMMANDS" />
<uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
- <uses-permission android:name="android.permission.BLUETOOTH"/>
- <uses-permission android:name="android.permission.BLUETOOTH_ADMIN"/>
+ <uses-permission android:name="android.permission.BLUETOOTH" />
+ <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
<application
- android:allowBackup="true"
android:name="com.moral.yunfushao.MainApp"
+ android:allowBackup="true"
android:icon="@mipmap/icon"
- tools:replace="android:icon"
- android:label="@string/app_name"
+ android:label="${app_name}"
android:supportsRtl="true"
- android:theme="@style/AppTheme">
- <activity android:name=".activity.SplashActivity"
+ android:theme="@style/AppTheme"
+ tools:replace="android:icon,android:label">
+ <activity
+ android:name=".activity.SplashActivity"
android:theme="@style/AppWelcomeTheme">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
- <activity android:name="com.moral.yunfushao.MainActivity" android:screenOrientation="portrait"/>
- <activity android:name="com.moral.yunfushao.activity.ForgetPasswordActivity" android:screenOrientation="portrait"/>
- <activity android:name="com.moral.yunfushao.activity.LoginActivity" android:screenOrientation="portrait"/>
- <activity android:name="com.moral.yunfushao.activity.RegisterActivity" android:screenOrientation="portrait"/>
- <activity android:name="com.moral.yunfushao.activity.BLESearchActivity" android:screenOrientation="portrait"/>
- <activity android:name="com.moral.yunfushao.activity.VoiceSetActivity" android:screenOrientation="portrait"/>
- <activity android:name="com.moral.yunfushao.activity.ChartActivity" android:screenOrientation="portrait"/>
- <activity android:name="com.moral.yunfushao.activity.ChooseSongActivity" android:screenOrientation="portrait"/>
- <activity android:name="com.moral.yunfushao.activity.TestActivity" android:screenOrientation="portrait"/>
+ <activity
+ android:name="com.moral.yunfushao.MainActivity"
+ android:screenOrientation="portrait" />
+ <activity
+ android:name="com.moral.yunfushao.activity.ForgetPasswordActivity"
+ android:screenOrientation="portrait" />
+ <activity
+ android:name="com.moral.yunfushao.activity.LoginActivity"
+ android:screenOrientation="portrait" />
+ <activity
+ android:name="com.moral.yunfushao.activity.RegisterActivity"
+ android:screenOrientation="portrait" />
+ <activity
+ android:name="com.moral.yunfushao.activity.BLESearchActivity"
+ android:screenOrientation="portrait" />
+ <activity
+ android:name="com.moral.yunfushao.activity.VoiceSetActivity"
+ android:screenOrientation="portrait" />
+ <activity
+ android:name="com.moral.yunfushao.activity.ChartActivity"
+ android:screenOrientation="portrait" />
+ <activity
+ android:name="com.moral.yunfushao.activity.ChooseSongActivity"
+ android:screenOrientation="portrait" />
+ <activity
+ android:name="com.moral.yunfushao.activity.TestActivity"
+ android:screenOrientation="portrait" />
<service android:name=".ble.BluetoothService" />
<meta-data
@@ -75,8 +94,7 @@
<service
android:name="com.baidu.location.f"
android:enabled="true"
- android:process=":remote" >
- </service>
+ android:process=":remote"></service>
</application>
</manifest>
\ No newline at end of file
--
Gitblit v1.8.0