From 47f5d71a81a528aff225805d28bf181ce4d6f55d Mon Sep 17 00:00:00 2001
From: 陈奇 <1650699704@qq.com>
Date: Thu, 15 Nov 2018 13:14:43 +0800
Subject: [PATCH] [*]1.0.3.2版本

---
 app/src/main/AndroidManifest.xml |   81 ++++++++++++++++++++++++++++++----------
 1 files changed, 60 insertions(+), 21 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 27998dc..6c1f951 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -34,39 +34,59 @@
     <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:launchMode="singleInstance"
+            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 +95,27 @@
         <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>
+        <!-- Bugly������SDK������������-->
+    </application>
 </manifest>
\ No newline at end of file

--
Gitblit v1.8.0