From df3af70b33eb6372b56075bc9e45c23ccf3f82c6 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期二, 28 十月 2025 17:40:38 +0800
Subject: [PATCH] 2025.10.28 1. 新增巡查场景历史详情界面出版（完成）； 2. 巡查任务日历界面，任务条目中新增风险提示、巡查要点、应急巡查3种提示信息的提示图标逻辑（待完成）；
---
app/src/main/AndroidManifest.xml | 149 +++++++++++++++++++++++++++++--------------------
1 files changed, 89 insertions(+), 60 deletions(-)
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index bc6cabe..792cef5 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
- package="cn.flightfeather.thirdapp">
+ package="cn.flightfeather.thirdappmodule">
<uses-permission android:name="android.permission.CAMERA" />
<uses-permission android:name="android.permission.CALL_PHONE" />
@@ -34,21 +34,21 @@
tools:ignore="ProtectedPermissions" />
<application
- android:name=".CommonApplication"
+ android:name="cn.flightfeather.thirdappmodule.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">
<!-- 璋冭瘯鐗堥珮寰峰湴鍥綤ey锛屾牴鎹紑鍙戠數鑴戜笉鍚屽彲鑳芥湁鎵�鏀瑰彉 -->
- <meta-data
- android:name="com.amap.api.v2.apikey"
- android:value="bf77391d8502be39f44c93b1f233ca91" /> <!-- android:value="5639b2f9853e650f74b874b5f98fc4ba" /> -->
+ <!-- android:value="5639b2f9853e650f74b874b5f98fc4ba" /> -->
<!-- android:value="0d875b71afa9e207e64cc6a0ee9fbda8" /> -->
<!-- android:value="5639b2f9853e650f74b874b5f98fc4ba" linli -->
<!-- android:value="0d875b71afa9e207e64cc6a0ee9fbda8" 鏈嶅姟绔� -->
@@ -56,7 +56,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
@@ -64,55 +64,58 @@
android:resource="@xml/filepaths" />
</provider>
- <receiver android:name=".util.updateApp.DownLoadCompleteReceiver">
+ <receiver android:name="cn.flightfeather.thirdappmodule.util.updateApp.DownLoadCompleteReceiver">
<intent-filter>
<action android:name="android.intent.action.DOWNLOAD_COMPLETE" />
</intent-filter>
</receiver>
+<!-- <receiver-->
+<!-- android:name="cn.flightfeather.thirdappmodule.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"
+ android:name="cn.flightfeather.thirdappmodule.module.MainActivity"
android:label="@string/app_name"
android:screenOrientation="portrait"
android:theme="@style/AppTheme.NoActionBar" />
<activity
- android:name=".activity.LoginActivity"
+ android:name="cn.flightfeather.thirdappmodule.activity.LoginActivity"
android:screenOrientation="portrait"
android:theme="@style/AppTheme.NoActionBar" />
<activity
- android:name=".activity.NewMonthTaskActivity"
+ android:name="cn.flightfeather.thirdappmodule.activity.NewMonthTaskActivity"
android:screenOrientation="portrait"
android:theme="@style/AppTheme.NoActionBar" />
<activity
- android:name=".activity.SplashActivity"
- android:configChanges="keyboardHidden|orientation|screenSize"
- android:theme="@style/splashTheme">
- <intent-filter>
- <action android:name="android.intent.action.MAIN" />
-
- <category android:name="android.intent.category.LAUNCHER" />
- </intent-filter>
- </activity> <!-- <activity -->
- <!-- android:name=".activity.MonitorObjectVersionMap" -->
- <!-- android:theme="@style/AppTheme.NoActionBar" /> -->
- <activity
- android:name=".activity.PhotoViewerActivity"
+ android:name="cn.flightfeather.thirdappmodule.activity.PhotoViewerActivity"
android:screenOrientation="portrait"
android:theme="@style/AppFullScreenTheme" />
<activity
- android:name=".activity.ProblemDetailActivity"
+ android:name="cn.flightfeather.thirdappmodule.activity.ProblemDetailActivity"
android:screenOrientation="portrait"
android:theme="@style/AppTheme"/>
<activity
- android:name=".activity.UploadMediaFilesActivity"
+ android:name="cn.flightfeather.thirdappmodule.activity.UploadMediaFilesActivity"
android:screenOrientation="portrait"
android:theme="@style/AppTheme"/>
<activity
- android:name=".activity.ScenseMapActivity"
+ android:name="cn.flightfeather.thirdappmodule.activity.ScenseMapActivity"
android:screenOrientation="portrait"
android:theme="@style/AppTheme.NoActionBar" />
<activity
- android:name=".activity.TaskActivity"
+ android:name="cn.flightfeather.thirdappmodule.activity.TaskActivity"
android:screenOrientation="portrait"
android:theme="@style/AppTheme.NoActionBar" />
<!--<activity-->
@@ -120,107 +123,133 @@
<!--android:screenOrientation="portrait"-->
<!--android:theme="@style/AppTheme.NoActionBar" />-->
<activity
- android:name=".activity.SignActivity"
+ android:name="cn.flightfeather.thirdappmodule.activity.SignActivity"
android:screenOrientation="portrait"
android:theme="@style/AppTheme.NoActionBar" />
<activity
- android:name=".activity.GitDetailActivity"
+ android:name="cn.flightfeather.thirdappmodule.activity.GitDetailActivity"
android:screenOrientation="portrait"
android:theme="@style/AppTheme"/>
<activity
- android:name=".activity.GradeActivity"
+ android:name="cn.flightfeather.thirdappmodule.activity.GradeActivity"
android:screenOrientation="portrait"
android:theme="@style/AppTheme"/>
<activity
- android:name=".activity.TaskDetailActivity"
+ android:name="cn.flightfeather.thirdappmodule.activity.TaskDetailActivity"
android:screenOrientation="portrait"
android:theme="@style/AppTheme.NoActionBar" />
<activity
- android:name=".activity.SiteDetailActivity"
+ android:name="cn.flightfeather.thirdappmodule.activity.SiteDetailActivity"
android:screenOrientation="portrait"
android:theme="@style/AppTheme.NoActionBar" />
<activity
- android:name=".activity.PromiseActivity"
+ android:name="cn.flightfeather.thirdappmodule.activity.PromiseActivity"
android:screenOrientation="portrait"
android:theme="@style/AppTheme.NoActionBar" />
<activity
- android:name=".activity.SubTaskMapActivity"
+ android:name="cn.flightfeather.thirdappmodule.activity.SubTaskMapActivity"
android:screenOrientation="portrait"
android:theme="@style/AppTheme"/>
<activity
- android:name=".activity.MapActivity"
+ android:name="cn.flightfeather.thirdappmodule.activity.MapActivity"
android:screenOrientation="portrait"
android:theme="@style/AppTheme.NoActionBar" />
<activity
- android:name=".activity.DebugTransSiteLatlngActivity"
+ android:name="cn.flightfeather.thirdappmodule.activity.DebugTransSiteLatlngActivity"
android:screenOrientation="portrait"
android:theme="@style/AppTheme"/>
<activity
- android:name=".activity.MOVMapActivity"
+ android:name="cn.flightfeather.thirdappmodule.activity.MOVMapActivity"
android:screenOrientation="portrait"
android:theme="@style/AppTheme.NoActionBar" />
<activity
- android:name=".dataanalysis.AnalysisTabActivity"
+ android:name="cn.flightfeather.thirdappmodule.module.dataanalysis.AnalysisTabActivity"
android:screenOrientation="portrait"
android:theme="@style/AppTheme.NoActionBar" />
<activity
- android:name=".dataanalysis.rank.AnalysisRankActivity"
+ android:name="cn.flightfeather.thirdappmodule.module.dataanalysis.rank.AnalysisRankActivity"
android:screenOrientation="portrait"
android:theme="@style/AppTheme.NoActionBar" />
<activity
- android:name=".module.inspectioninfo.ProblemChangeActivity"
+ android:name="cn.flightfeather.thirdappmodule.module.inspectioninfo.ProblemChangeActivity"
android:screenOrientation="portrait"
android:theme="@style/AppTheme.NoActionBar" />
<activity
- android:name=".module.inspectioninfo.ProblemChangeDetailActivity"
+ android:name="cn.flightfeather.thirdappmodule.module.inspectioninfo.ProblemChangeDetailActivity"
android:screenOrientation="portrait"
android:theme="@style/AppTheme.NoActionBar" />
<activity
- android:name=".module.task.NewTopTaskActivity"
+ android:name="cn.flightfeather.thirdappmodule.module.task.NewTopTaskActivity"
android:theme="@style/AppTheme.NoActionBar" />
<activity
- android:name=".module.task.NewSubTaskActivity"
+ android:name="cn.flightfeather.thirdappmodule.module.task.NewSubTaskActivity"
android:theme="@style/AppTheme.NoActionBar" />
<activity
- android:name=".module.task.NewMonthTaskMapActivity"
+ android:name="cn.flightfeather.thirdappmodule.module.task.NewMonthTaskMapActivity"
android:theme="@style/AppTheme.NoActionBar" />
<activity
- android:name=".module.task.MonthTaskManagementActivity"
+ android:name="cn.flightfeather.thirdappmodule.module.task.MonthTaskManagementActivity"
android:theme="@style/AppTheme.NoActionBar" />
<activity
- android:name=".module.task.SceneDetailActivity"
+ android:name="cn.flightfeather.thirdappmodule.module.task.SceneDetailActivity"
android:theme="@style/AppTheme.NoActionBar" />
<activity
- android:name=".module.inspection.MenuGradeActivity"
+ android:name="cn.flightfeather.thirdappmodule.module.nightwork.NightWorkRecordActivity"
+ android:theme="@style/AppTheme.NoActionBar" />
+ <activity
+ android:name="cn.flightfeather.thirdappmodule.module.nightwork.NightWorkManageActivity"
+ android:theme="@style/AppTheme.NoActionBar" />
+ <activity
+ android:name="cn.flightfeather.thirdappmodule.module.common.OfficeFileManageActivity"
+ android:theme="@style/AppTheme.NoActionBar" />
+ <activity
+ android:name=".module.common.MapLocationActivity"
+ android:theme="@style/AppTheme.NoActionBar" />
+ <activity
+ android:name="cn.flightfeather.thirdappmodule.module.inspection.MenuGradeActivity"
android:screenOrientation="portrait"
android:theme="@style/AppTheme"/>
<activity
- android:name=".module.inspection.InspectionDetailActivity"
+ android:name="cn.flightfeather.thirdappmodule.module.inspection.InspectionDetailActivity"
android:theme="@style/AppTheme.NoActionBar" />
- <activity android:name=".module.inspection.MenuEvidenceActivity"
+ <activity android:name="cn.flightfeather.thirdappmodule.module.inspection.MenuEvidenceActivity"
android:theme="@style/TransparentTheme" />
- <activity android:name=".module.inspection.MenuProblemUpdateActivity"
+ <activity android:name="cn.flightfeather.thirdappmodule.module.inspection.MenuProblemUpdateActivity"
android:theme="@style/TransparentTheme" />
- <activity android:name=".module.inspection.MenuRecheckActivity"
+ <activity android:name="cn.flightfeather.thirdappmodule.module.inspection.MenuRecheckActivity"
android:theme="@style/TransparentTheme" />
- <activity android:name=".module.inspection.MenuProblemListActivity"
+ <activity android:name="cn.flightfeather.thirdappmodule.module.inspection.MenuProblemListActivity"
android:theme="@style/TransparentTheme" />
- <activity android:name=".module.inspection.MenuChangeActivity"
+ <activity android:name="cn.flightfeather.thirdappmodule.module.inspection.MenuChangeActivity"
android:theme="@style/TransparentTheme" />
- <activity android:name=".module.inspection.MenuCameraActivity"
+ <activity android:name="cn.flightfeather.thirdappmodule.module.inspection.MenuCameraActivity"
android:theme="@style/TransparentTheme" />
- <activity android:name=".module.inspection.MenuNewGitActivity"
+ <activity android:name="cn.flightfeather.thirdappmodule.module.inspection.MenuNewGitActivity"
android:theme="@style/TransparentTheme" />
- <activity android:name=".module.inspection.MenuProblemCheckActivity"
+ <activity android:name="cn.flightfeather.thirdappmodule.module.inspection.MenuProblemCheckActivity"
android:theme="@style/TransparentTheme" />
- <activity android:name=".module.inspection.MenuChangeCheckActivity"
+ <activity android:name="cn.flightfeather.thirdappmodule.module.inspection.MenuChangeCheckActivity"
android:theme="@style/TransparentTheme" />
- <activity android:name=".module.inspection.ShareProblemActivity"
+ <activity android:name="cn.flightfeather.thirdappmodule.module.inspection.MenuSceneAccountActivity"
+ android:theme="@style/TransparentTheme" />
+ <activity android:name="cn.flightfeather.thirdappmodule.module.inspection.MenuSceneHistoryActivity"
+ android:theme="@style/TransparentTheme" />
+ <activity android:name="cn.flightfeather.thirdappmodule.module.inspection.MenuSceneInfoActivity"
+ android:theme="@style/TransparentTheme" />
+ <activity android:name="cn.flightfeather.thirdappmodule.module.inspection.ShareProblemActivity"
android:theme="@style/AppTheme.NoActionBar" />
- <activity android:name=".module.inspection.ShareProblemPreViewActivity"
+ <activity android:name="cn.flightfeather.thirdappmodule.module.inspection.ShareProblemPreViewActivity"
android:theme="@style/AppTheme.NoActionBar" />
- <activity android:name=".module.common.CameraActivity"
+ <activity android:name="cn.flightfeather.thirdappmodule.module.inspection.PicEvidenceActivity"
+ android:theme="@style/AppTheme.NoActionBar" />
+ <activity android:name="cn.flightfeather.thirdappmodule.module.common.CameraActivity"
android:theme="@style/AppFullScreenTheme" />
+ <activity android:name="cn.flightfeather.thirdappmodule.module.common.SearchActivity"
+ android:theme="@style/AppTheme.NoActionBar" />
+ <activity android:name="cn.flightfeather.thirdappmodule.module.common.PhotoViewerActivity2"
+ android:theme="@style/AppTheme" />
+ <activity android:name="cn.flightfeather.thirdappmodule.activity.TestActivity"
+ android:theme="@style/AppTheme.NoActionBar" />
</application>
</manifest>
\ No newline at end of file
--
Gitblit v1.9.3