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 | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 6c1f951..cd58962 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -33,6 +33,7 @@
<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" />
@@ -42,6 +43,10 @@
<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.ACCESS_NETWORK_STATE" />
+
+ <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+
<application
android:name="com.moral.yunfushao.MainApp"
@@ -53,6 +58,7 @@
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" />
@@ -61,19 +67,20 @@
</activity>
<activity
android:name="com.moral.yunfushao.MainActivity"
- android:screenOrientation="portrait" />
+ 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:launchMode="singleInstance"
android:screenOrientation="portrait" />
<activity
android:name="com.moral.yunfushao.activity.VoiceSetActivity"
@@ -103,7 +110,6 @@
android:configChanges="keyboardHidden|orientation|screenSize|locale"
android:theme="@android:style/Theme.Translucent" />
-
<!--API 24������������-->
<provider
android:name="android.support.v4.content.FileProvider"
@@ -116,6 +122,12 @@
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