From 979d9cff22806f213b420452ab4a68fcbaf021b6 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期一, 31 五月 2021 17:43:49 +0800
Subject: [PATCH] 1. 修复多项可能引起空指针崩溃的bug; 2. 新建子任务时默认执行人员从全体人员改为当前用户; 3. 新建子任务时默认执行时间强制固定为总任务对应的时段内,确保子任务执行时间不会超出总任务范围。

---
 app/src/main/AndroidManifest.xml |   29 ++++++++++++++++++++++++++++-
 1 files changed, 28 insertions(+), 1 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index bc6cabe..1268b68 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -33,15 +33,18 @@
         android:name="android.permission.REQUEST_INSTALL_PACKAGES"
         tools:ignore="ProtectedPermissions" />
 
+    <!--    Android 9 绯荤粺涓婇粯璁ゆ墍鏈塇ttp璇锋眰琚姝紝娣诲姞android:usesCleartextTraffic="true" 锛岀‘淇滱ndroid 9涓婂彲浠ョ敤tbs鎵撳紑鏂囨。-->
     <application
         android:name=".CommonApplication"
         android:allowBackup="true"
+        tools:replace="android:allowBackup"
         android:hardwareAccelerated="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:networkSecurityConfig="@xml/network_config"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
+        android:usesCleartextTraffic="true"
         android:theme="@style/AppTheme.NoActionBar"
         tools:ignore="GoogleAppIndexingWarning, LockedOrientationActivity"
         tools:targetApi="n">
@@ -56,7 +59,7 @@
 
         <provider
             android:name="android.support.v4.content.FileProvider"
-            android:authorities="cn.flightfeather.thirdapp.fileProvider"
+            android:authorities="@string/file_provide"
             android:exported="false"
             android:grantUriPermissions="true">
             <meta-data
@@ -69,6 +72,21 @@
                 <action android:name="android.intent.action.DOWNLOAD_COMPLETE" />
             </intent-filter>
         </receiver>
+
+        <receiver
+            android:name=".util.push.MyMessageReceiver"
+            android:exported="false"> <!-- 涓轰繚璇乺eceiver瀹夊叏锛屽缓璁缃笉鍙鍑猴紝濡傞渶瀵瑰叾浠栧簲鐢ㄥ紑鏀惧彲閫氳繃android锛歱ermission杩涜闄愬埗 -->
+            <intent-filter>
+                <action android:name="com.alibaba.push2.action.NOTIFICATION_OPENED" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="com.alibaba.push2.action.NOTIFICATION_REMOVED" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="com.alibaba.sdk.android.push.RECEIVE" />
+            </intent-filter>
+        </receiver>
+        
 
         <activity
             android:name=".module.MainActivity"
@@ -191,6 +209,15 @@
             android:name=".module.task.SceneDetailActivity"
             android:theme="@style/AppTheme.NoActionBar" />
         <activity
+            android:name=".module.nightwork.NightWorkRecordActivity"
+            android:theme="@style/AppTheme.NoActionBar" />
+        <activity
+            android:name=".module.nightwork.NightWorkManageActivity"
+            android:theme="@style/AppTheme.NoActionBar" />
+        <activity
+            android:name=".module.common.OfficeFileManageActivity"
+            android:theme="@style/AppTheme.NoActionBar" />
+        <activity
             android:name=".module.inspection.MenuGradeActivity"
             android:screenOrientation="portrait"
             android:theme="@style/AppTheme"/>

--
Gitblit v1.9.3