From 17eb1d06e104bc1cd93498fe3a3eaecf14c9d734 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期四, 12 十一月 2020 13:57:35 +0800
Subject: [PATCH] 1. 修复现场整改时,问题状态是‘问题审核通过’而不是“整改未审核”的问题; 2. 修改任意拍照界面的多图片展示方式为Glide,减少内存溢出的可能性; 3. 新增图片类型枚举类,罗列原有的图片类型,并新增“铭牌”和“监测设备”; 4. 修复导航功能可能导致空指针的问题; 5. 任意拍界面新增按分类拍摄功能; 6. 修复现场整改界面打开崩溃问题;

---
 app/src/main/AndroidManifest.xml |   23 +++++++++++++++--------
 1 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 3791057..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,7 +192,8 @@
             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" />

--
Gitblit v1.9.3