From c5bf501d8b507d1e3e79541e7ac9b45910860b4d Mon Sep 17 00:00:00 2001
From: 陈奇 <1650699704@qq.com>
Date: Wed, 29 May 2019 16:17:07 +0800
Subject: [PATCH] 添加新功能
---
app/src/main/AndroidManifest.xml | 93 ++++++++++++++++++++++++++++++++++++----------
1 files changed, 72 insertions(+), 21 deletions(-)
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 27998dc..cd58962 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -33,40 +33,67 @@
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.WRITE_SETTINGS" />
+ <uses-permission android:name="com.huawei.android.launcher.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" />
+ <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+
+ <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+
<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:launchMode="singleInstance"
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>
+ <activity
+ android:name="com.moral.yunfushao.activity.ForgetPasswordActivity"
+ android:screenOrientation="portrait" />
+ <activity
+ android:name="com.moral.yunfushao.activity.LoginActivity"
+ android:launchMode="singleTask"
+ 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 +102,32 @@
<service
android:name="com.baidu.location.f"
android:enabled="true"
- android:process=":remote" >
- </service>
- </application>
+ android:process=":remote"></service>
+ <!-- Bugly������SDK������������ -->
+ <activity
+ android:name="com.tencent.bugly.beta.ui.BetaActivity"
+ android:configChanges="keyboardHidden|orientation|screenSize|locale"
+ android:theme="@android:style/Theme.Translucent" />
+
+ <!--API 24������������-->
+ <provider
+ android:name="android.support.v4.content.FileProvider"
+ android:authorities="com.moral.yunfushao.fileProvider"
+ android:exported="false"
+ android:grantUriPermissions="true"
+ tools:replace="name,authorities,exported,grantUriPermissions">
+ <meta-data
+ android:name="android.support.FILE_PROVIDER_PATHS"
+ android:resource="@xml/provider_paths"
+ tools:replace="name,resource" />
+ </provider>
+ <activity
+ android:name=".wxapi.WXEntryActivity"
+ android:exported="true"
+ android:launchMode="singleTask"
+ android:taskAffinity="com.moral.yunfushao"
+ android:theme="@android:style/Theme.Translucent.NoTitleBar"></activity>
+ <!-- Bugly������SDK������������-->
+ </application>
</manifest>
\ No newline at end of file
--
Gitblit v1.8.0