From a5d862051462a5fcc2717b405896a6d424002e54 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期二, 22 十二月 2020 15:43:06 +0800
Subject: [PATCH] 1. 调整了数控实体的存储位置; 2. 新增数据表“媒体文件类型别名表”; 3. 修改任意拍模块,将图片分类改为根据场景类型动态生成,同时新增修改分类别名功能; 4. 优化子任务选择界面的任务排序方式,按照“待开始”、“执行中”、“未执行”的顺序进行排序;

---
 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