From 5771916ffb24807dd57c1969baa6371611c334da Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期六, 10 十月 2020 16:45:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'supervision/master'
---
app/src/main/AndroidManifest.xml | 25 +++++++++++++++++--------
1 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index fc63e4e..bc6cabe 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -42,7 +42,7 @@
android:networkSecurityConfig="@xml/network_config"
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
- android:theme="@style/AppTheme"
+ android:theme="@style/AppTheme.NoActionBar"
tools:ignore="GoogleAppIndexingWarning, LockedOrientationActivity"
tools:targetApi="n">
<!-- 璋冭瘯鐗堥珮寰峰湴鍥綤ey锛屾牴鎹紑鍙戠數鑴戜笉鍚屽彲鑳芥湁鎵�鏀瑰彉 -->
@@ -101,10 +101,12 @@
android:theme="@style/AppFullScreenTheme" />
<activity
android:name=".activity.ProblemDetailActivity"
- android:screenOrientation="portrait" />
+ android:screenOrientation="portrait"
+ android:theme="@style/AppTheme"/>
<activity
android:name=".activity.UploadMediaFilesActivity"
- android:screenOrientation="portrait" />
+ android:screenOrientation="portrait"
+ android:theme="@style/AppTheme"/>
<activity
android:name=".activity.ScenseMapActivity"
android:screenOrientation="portrait"
@@ -123,10 +125,12 @@
android:theme="@style/AppTheme.NoActionBar" />
<activity
android:name=".activity.GitDetailActivity"
- android:screenOrientation="portrait" />
+ android:screenOrientation="portrait"
+ android:theme="@style/AppTheme"/>
<activity
android:name=".activity.GradeActivity"
- android:screenOrientation="portrait" />
+ android:screenOrientation="portrait"
+ android:theme="@style/AppTheme"/>
<activity
android:name=".activity.TaskDetailActivity"
android:screenOrientation="portrait"
@@ -141,14 +145,16 @@
android:theme="@style/AppTheme.NoActionBar" />
<activity
android:name=".activity.SubTaskMapActivity"
- android:screenOrientation="portrait" />
+ android:screenOrientation="portrait"
+ android:theme="@style/AppTheme"/>
<activity
android:name=".activity.MapActivity"
android:screenOrientation="portrait"
android:theme="@style/AppTheme.NoActionBar" />
<activity
android:name=".activity.DebugTransSiteLatlngActivity"
- android:screenOrientation="portrait" />
+ android:screenOrientation="portrait"
+ android:theme="@style/AppTheme"/>
<activity
android:name=".activity.MOVMapActivity"
android:screenOrientation="portrait"
@@ -186,12 +192,15 @@
android:theme="@style/AppTheme.NoActionBar" />
<activity
android:name=".module.inspection.MenuGradeActivity"
- android:screenOrientation="portrait" />
+ android:screenOrientation="portrait"
+ android:theme="@style/AppTheme"/>
<activity
android:name=".module.inspection.InspectionDetailActivity"
android:theme="@style/AppTheme.NoActionBar" />
<activity android:name=".module.inspection.MenuEvidenceActivity"
android:theme="@style/TransparentTheme" />
+ <activity android:name=".module.inspection.MenuProblemUpdateActivity"
+ android:theme="@style/TransparentTheme" />
<activity android:name=".module.inspection.MenuRecheckActivity"
android:theme="@style/TransparentTheme" />
<activity android:name=".module.inspection.MenuProblemListActivity"
--
Gitblit v1.9.3