From 0f58aa8ea118c3bd0b28396febc58fdbd94eef75 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期一, 27 十月 2025 17:33:33 +0800
Subject: [PATCH] 2025.10.27 1. 新增巡查场景历史详情界面（待完成）
---
app/src/main/java/cn/flightfeather/thirdappmodule/httpservice/ScenseService.java | 10
.gitignore | 2
app/release/release/output.json | 1
app/src/main/java/cn/flightfeather/thirdappmodule/repository/SceneRepository.kt | 67 ++
app/src/main/res/layout/dialog_scene_subinfo.xml | 16
app/src/main/java/cn/flightfeather/thirdappmodule/httpservice/EvaluationService.java | 15
app/src/main/java/cn/flightfeather/thirdappmodule/module/inspection/MenuGradeViewModel.kt | 2
app/src/main/res/drawable-hdpi/ic_info_black_24dp.png | 0
app/src/main/res/drawable-mdpi/ic_info_black_24dp.png | 0
app/src/main/res/drawable-xxhdpi/ic_info_black_24dp.png | 0
app/src/main/java/cn/flightfeather/thirdappmodule/module/inspection/InspectionDetailActivity.kt | 17
app/src/main/java/cn/flightfeather/thirdappmodule/module/inspection/MenuSceneInfoActivity.kt | 60 +
app/src/main/res/layout/dialog_scene_history.xml | 221 ++++++++
.idea/misc.xml | 16
app/src/main/java/cn/flightfeather/thirdappmodule/bean/vo/TypicalSceneVo.kt | 15
app/src/main/res/drawable-xhdpi/ic_info_black_24dp.png | 0
app/src/main/java/cn/flightfeather/thirdappmodule/module/inspection/MenuSceneHistoryActivity.kt | 56 ++
app/src/main/java/cn/flightfeather/thirdappmodule/repository/EvaluationRepository.kt | 33 +
.idea/assetWizardSettings.xml | 311 ++++++++++++
app/src/main/java/cn/flightfeather/thirdappmodule/bean/vo/SceneConstructionSite.kt | 97 +++
app/src/main/java/cn/flightfeather/thirdappmodule/module/inspection/MenuSceneHistoryViewModel.kt | 50 ++
app/src/main/java/cn/flightfeather/thirdappmodule/bean/vo/ChangeRateVo.kt | 8
app/src/main/java/cn/flightfeather/thirdappmodule/repository/CommonRepository.kt | 18
app/src/main/java/cn/flightfeather/thirdappmodule/httpservice/DomainItemService.kt | 3
app/release/release/supervision_1.1.14.18-release.apk | 0
app/src/main/java/cn/flightfeather/thirdappmodule/module/task/SceneDetailViewModel.kt | 63 ++
app/src/main/res/layout/fragment_inspection_content.xml | 323 +++++++-----
app/src/main/java/cn/flightfeather/thirdappmodule/bean/vo/SceneDetailStrVo.kt | 16
app/src/main/java/cn/flightfeather/thirdappmodule/model/bean/BaseResponse.kt | 21
app/src/main/java/cn/flightfeather/thirdappmodule/bean/vo/SceneDetailVo.kt | 16
app/src/main/res/drawable-anydpi-v24/ic_info_black_24dp.xml | 15
31 files changed, 1,300 insertions(+), 172 deletions(-)
diff --git a/.gitignore b/.gitignore
index 57e05a2..9c37407 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,4 +9,4 @@
/build
/captures
.externalNativeBuild
-/app/release/
+/app/release
diff --git a/.idea/assetWizardSettings.xml b/.idea/assetWizardSettings.xml
index 8f3f2fb..fbd90fb 100644
--- a/.idea/assetWizardSettings.xml
+++ b/.idea/assetWizardSettings.xml
@@ -5,7 +5,316 @@
<map>
<entry key="imageWizard">
<value>
- <PersistentState />
+ <PersistentState>
+ <option name="children">
+ <map>
+ <entry key="imageAssetPanel">
+ <value>
+ <PersistentState>
+ <option name="children">
+ <map>
+ <entry key="actionbar">
+ <value>
+ <PersistentState>
+ <option name="children">
+ <map>
+ <entry key="clipArt">
+ <value>
+ <PersistentState>
+ <option name="values">
+ <map>
+ <entry key="color" value="000000" />
+ <entry key="imagePath" value="C:\Users\feiyu\AppData\Local\Temp\ic_android_black_24dp.xml" />
+ <entry key="opacityPercent" value="60" />
+ </map>
+ </option>
+ </PersistentState>
+ </value>
+ </entry>
+ <entry key="text">
+ <value>
+ <PersistentState>
+ <option name="values">
+ <map>
+ <entry key="color" value="000000" />
+ </map>
+ </option>
+ </PersistentState>
+ </value>
+ </entry>
+ <entry key="textAsset">
+ <value>
+ <PersistentState>
+ <option name="values">
+ <map>
+ <entry key="color" value="000000" />
+ </map>
+ </option>
+ </PersistentState>
+ </value>
+ </entry>
+ </map>
+ </option>
+ </PersistentState>
+ </value>
+ </entry>
+ <entry key="launcher">
+ <value>
+ <PersistentState>
+ <option name="children">
+ <map>
+ <entry key="foregroundClipArt">
+ <value>
+ <PersistentState>
+ <option name="values">
+ <map>
+ <entry key="imagePath" value="C:\Users\feiyu\AppData\Local\Temp\ic_android_black_24dp.xml" />
+ </map>
+ </option>
+ </PersistentState>
+ </value>
+ </entry>
+ <entry key="foregroundImage">
+ <value>
+ <PersistentState>
+ <option name="values">
+ <map>
+ <entry key="color" value="000000" />
+ </map>
+ </option>
+ </PersistentState>
+ </value>
+ </entry>
+ <entry key="foregroundText">
+ <value>
+ <PersistentState>
+ <option name="values">
+ <map>
+ <entry key="color" value="000000" />
+ </map>
+ </option>
+ </PersistentState>
+ </value>
+ </entry>
+ <entry key="foregroundTextAsset">
+ <value>
+ <PersistentState>
+ <option name="values">
+ <map>
+ <entry key="color" value="000000" />
+ </map>
+ </option>
+ </PersistentState>
+ </value>
+ </entry>
+ </map>
+ </option>
+ </PersistentState>
+ </value>
+ </entry>
+ <entry key="launcherLegacy">
+ <value>
+ <PersistentState>
+ <option name="children">
+ <map>
+ <entry key="clipArt">
+ <value>
+ <PersistentState>
+ <option name="values">
+ <map>
+ <entry key="color" value="000000" />
+ <entry key="imagePath" value="C:\Users\feiyu\AppData\Local\Temp\ic_android_black_24dp.xml" />
+ </map>
+ </option>
+ </PersistentState>
+ </value>
+ </entry>
+ <entry key="text">
+ <value>
+ <PersistentState>
+ <option name="values">
+ <map>
+ <entry key="color" value="000000" />
+ </map>
+ </option>
+ </PersistentState>
+ </value>
+ </entry>
+ <entry key="textAsset">
+ <value>
+ <PersistentState>
+ <option name="values">
+ <map>
+ <entry key="color" value="000000" />
+ </map>
+ </option>
+ </PersistentState>
+ </value>
+ </entry>
+ </map>
+ </option>
+ </PersistentState>
+ </value>
+ </entry>
+ <entry key="notification">
+ <value>
+ <PersistentState>
+ <option name="children">
+ <map>
+ <entry key="clipArt">
+ <value>
+ <PersistentState>
+ <option name="values">
+ <map>
+ <entry key="color" value="000000" />
+ <entry key="imagePath" value="C:\Users\feiyu\AppData\Local\Temp\baseline_article_24.xml" />
+ </map>
+ </option>
+ </PersistentState>
+ </value>
+ </entry>
+ <entry key="clipartAsset">
+ <value>
+ <PersistentState>
+ <option name="values">
+ <map>
+ <entry key="url" value="file:/$PROJECT_DIR$/../../../../androidsdk/sdk_new/icons/material/materialicons/article/baseline_article_24.xml" />
+ </map>
+ </option>
+ </PersistentState>
+ </value>
+ </entry>
+ <entry key="image">
+ <value>
+ <PersistentState>
+ <option name="values">
+ <map>
+ <entry key="color" value="000000" />
+ </map>
+ </option>
+ </PersistentState>
+ </value>
+ </entry>
+ <entry key="text">
+ <value>
+ <PersistentState>
+ <option name="values">
+ <map>
+ <entry key="color" value="000000" />
+ </map>
+ </option>
+ </PersistentState>
+ </value>
+ </entry>
+ <entry key="textAsset">
+ <value>
+ <PersistentState>
+ <option name="values">
+ <map>
+ <entry key="color" value="000000" />
+ </map>
+ </option>
+ </PersistentState>
+ </value>
+ </entry>
+ </map>
+ </option>
+ <option name="values">
+ <map>
+ <entry key="outputName" value="ic_info_black_24dp" />
+ </map>
+ </option>
+ </PersistentState>
+ </value>
+ </entry>
+ <entry key="tvBanner">
+ <value>
+ <PersistentState>
+ <option name="children">
+ <map>
+ <entry key="foregroundText">
+ <value>
+ <PersistentState>
+ <option name="values">
+ <map>
+ <entry key="color" value="000000" />
+ </map>
+ </option>
+ </PersistentState>
+ </value>
+ </entry>
+ </map>
+ </option>
+ </PersistentState>
+ </value>
+ </entry>
+ <entry key="tvChannel">
+ <value>
+ <PersistentState>
+ <option name="children">
+ <map>
+ <entry key="foregroundClipArt">
+ <value>
+ <PersistentState>
+ <option name="values">
+ <map>
+ <entry key="imagePath" value="C:\Users\feiyu\AppData\Local\Temp\ic_android_black_24dp.xml" />
+ </map>
+ </option>
+ </PersistentState>
+ </value>
+ </entry>
+ <entry key="foregroundImage">
+ <value>
+ <PersistentState>
+ <option name="values">
+ <map>
+ <entry key="color" value="000000" />
+ </map>
+ </option>
+ </PersistentState>
+ </value>
+ </entry>
+ <entry key="foregroundText">
+ <value>
+ <PersistentState>
+ <option name="values">
+ <map>
+ <entry key="color" value="000000" />
+ </map>
+ </option>
+ </PersistentState>
+ </value>
+ </entry>
+ <entry key="foregroundTextAsset">
+ <value>
+ <PersistentState>
+ <option name="values">
+ <map>
+ <entry key="color" value="000000" />
+ </map>
+ </option>
+ </PersistentState>
+ </value>
+ </entry>
+ </map>
+ </option>
+ </PersistentState>
+ </value>
+ </entry>
+ </map>
+ </option>
+ <option name="values">
+ <map>
+ <entry key="outputIconType" value="NOTIFICATION" />
+ </map>
+ </option>
+ </PersistentState>
+ </value>
+ </entry>
+ </map>
+ </option>
+ </PersistentState>
</value>
</entry>
<entry key="vectorWizard">
diff --git a/.idea/misc.xml b/.idea/misc.xml
index c47246e..afd7dff 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,10 +3,13 @@
<component name="DesignSurface">
<option name="filePathToZoomLevelMap">
<map>
+ <entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/drawable-anydpi-v24/ic_info_black_24dp.xml" value="0.336" />
<entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/drawable-xhdpi/bg_ripple.xml" value="0.336" />
<entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/drawable/bg_btngroup.xml" value="0.175" />
<entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/drawable/ic_baseline_backspace_24.xml" value="0.175" />
<entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/drawable/ic_baseline_content_copy_24.xml" value="0.175" />
+ <entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/drawable/ic_group_black_24dp.xml" value="0.336" />
+ <entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/drawable/ic_playlist_add_check_blue_400_24dp.xml" value="0.336" />
<entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/drawable/ic_unfold_more_black_20dp.xml" value="0.175" />
<entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/drawable/point_background.xml" value="0.336" />
<entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/drawable/selector_bg_blue_or_white.xml" value="0.336" />
@@ -21,8 +24,15 @@
<entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/drawable/selector_show_hide_white.xml" value="0.336" />
<entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/drawable/shap_stroke_bottom.xml" value="0.336" />
<entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/drawable/shape_bg_gradient_reverse.xml" value="0.31145833333333334" />
+ <entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/drawable/shape_blue.xml" value="0.336" />
<entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/drawable/shape_button_green.xml" value="0.309375" />
<entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/drawable/shape_circle_board.xml" value="0.336" />
+ <entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/drawable/shape_gray.xml" value="0.336" />
+ <entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/drawable/shape_green.xml" value="0.336" />
+ <entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/drawable/shape_oval_blue.xml" value="0.336" />
+ <entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/drawable/shape_red_board.xml" value="0.336" />
+ <entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/drawable/shape_red_task_check.xml" value="0.336" />
+ <entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/drawable/shape_yellow.xml" value="0.336" />
<entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/layout/activity_base_map.xml" value="0.29739583333333336" />
<entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/layout/activity_camera.xml" value="0.33" />
<entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/layout/activity_main.xml" value="0.3338541666666667" />
@@ -40,17 +50,23 @@
<entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/layout/activity_share_problem.xml" value="0.33" />
<entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/layout/activity_task.xml" value="0.29739583333333336" />
<entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/layout/activity_upload_media_files.xml" value="0.3338541666666667" />
+ <entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/layout/dialog_adjust_task.xml" value="0.3338541666666667" />
<entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/layout/dialog_alert.xml" value="0.3338541666666667" />
<entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/layout/dialog_alert_2.xml" value="0.3338541666666667" />
+ <entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/layout/dialog_anysis_sub_progress.xml" value="0.3338541666666667" />
<entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/layout/dialog_bottom_sheet.xml" value="0.3338541666666667" />
<entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/layout/dialog_camera.xml" value="0.3338541666666667" />
<entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/layout/dialog_camera_2.xml" value="0.3338541666666667" />
<entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/layout/dialog_camera_3.xml" value="0.3338541666666667" />
+ <entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/layout/dialog_change_password.xml" value="0.3338541666666667" />
+ <entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/layout/dialog_new_photo.xml" value="0.3338541666666667" />
<entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/layout/dialog_problem_list.xml" value="0.3338541666666667" />
<entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/layout/dialog_scene_account.xml" value="0.3338541666666667" />
+ <entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/layout/dialog_scene_history.xml" value="0.3338541666666667" />
<entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/layout/dialog_scene_list.xml" value="0.3338541666666667" />
<entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/layout/dialog_scene_subinfo.xml" value="0.3338541666666667" />
<entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/layout/dialog_take_evidence.xml" value="0.3338541666666667" />
+ <entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/layout/fragment_analysis_over_view.xml" value="0.3338541666666667" />
<entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/layout/fragment_home.xml" value="0.3338541666666667" />
<entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/layout/fragment_inspection2.xml" value="0.3338541666666667" />
<entry key="..\:/AndroidStudioProjects/supervision_online/branches/customer_pollution_scene/app/src/main/res/layout/fragment_inspection_content.xml" value="0.3338541666666667" />
diff --git a/app/release/release/output.json b/app/release/release/output.json
new file mode 100644
index 0000000..cf3a20e
--- /dev/null
+++ b/app/release/release/output.json
@@ -0,0 +1 @@
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":34,"versionName":"1.1.14.18","enabled":true,"outputFile":"appsupervision-release.apk","fullName":"release","baseName":"release"},"path":"appsupervision-release.apk","properties":{}}]
\ No newline at end of file
diff --git a/app/release/release/supervision_1.1.14.18-release.apk b/app/release/release/supervision_1.1.14.18-release.apk
new file mode 100644
index 0000000..d36c4ce
--- /dev/null
+++ b/app/release/release/supervision_1.1.14.18-release.apk
Binary files differ
diff --git a/app/src/main/java/cn/flightfeather/thirdappmodule/bean/vo/ChangeRateVo.kt b/app/src/main/java/cn/flightfeather/thirdappmodule/bean/vo/ChangeRateVo.kt
new file mode 100644
index 0000000..3f083b1
--- /dev/null
+++ b/app/src/main/java/cn/flightfeather/thirdappmodule/bean/vo/ChangeRateVo.kt
@@ -0,0 +1,8 @@
+package cn.flightfeather.thirdappmodule.bean.vo
+
+/**
+ * @author riku
+ * Date: 2025/10/27
+ */
+class ChangeRateVo {
+}
\ No newline at end of file
diff --git a/app/src/main/java/cn/flightfeather/thirdappmodule/bean/vo/SceneConstructionSite.kt b/app/src/main/java/cn/flightfeather/thirdappmodule/bean/vo/SceneConstructionSite.kt
index 2a66932..7040fa7 100644
--- a/app/src/main/java/cn/flightfeather/thirdappmodule/bean/vo/SceneConstructionSite.kt
+++ b/app/src/main/java/cn/flightfeather/thirdappmodule/bean/vo/SceneConstructionSite.kt
@@ -1,10 +1,107 @@
package cn.flightfeather.thirdappmodule.bean.vo
+import org.greenrobot.greendao.annotation.Id
+import java.util.*
+
+
/**
* 寤虹瓚宸ュ湴淇℃伅
* @author riku
* Date: 2025/10/17
*/
class SceneConstructionSite : BaseSubScene {
+ /**
+ * 鍦烘櫙id锛屼富閿�
+ */
+ var sGuid: String? = null
+ /**
+ * 宸ョ▼绫诲瀷
+ */
+ var csProjectType: String? = null
+
+ /**
+ * 鏂藉伐闃舵
+ */
+ var csStatus: String? = null
+
+ /**
+ * 鏂藉伐寮�濮嬫椂闂�
+ */
+ var csStartTime: String? = null
+
+ /**
+ * 鏂藉伐缁撴潫鏃堕棿
+ */
+ var csEndTime: String? = null
+
+ /**
+ * 鍓╀綑宸ユ湡
+ */
+ var csLeftTime: String? = null
+
+ /**
+ * 鍗犲湴闈㈢Н
+ */
+ var csFloorSpace: String? = null
+
+ /**
+ * 鏂藉伐闈㈢Н
+ */
+ var csConstructionArea: String? = null
+
+ /**
+ * 姣忔湀鏂藉伐闈㈢Н
+ */
+ var csConstructionAreaPerMonth: String? = null
+
+ /**
+ * 涓氫富鍗曚綅
+ */
+ var csEmployerUnit: String? = null
+
+ /**
+ * 涓氫富鍗曚綅鑱旂郴浜�
+ */
+ var csEmployerContacts: String? = null
+
+ /**
+ * 涓氫富鍗曚綅鑱旂郴浜虹數璇�
+ */
+ var csEmployerContactsTel: String? = null
+
+ /**
+ * 鏂藉伐鍗曚綅
+ */
+ var csConstructionUnit: String? = null
+
+ /**
+ * 鏂藉伐鍗曚綅鑱旂郴浜�
+ */
+ var csConstructionContacts: String? = null
+
+ /**
+ * 鏂藉伐鍗曚綅鑱旂郴浜虹數璇�
+ */
+ var csConstructionContactsTel: String? = null
+
+ /**
+ * 瀹夊叏鍛�
+ */
+ var csSecurityOfficer: String? = null
+
+ /**
+ * 瀹夊叏鍛樼數璇�
+ */
+ var csSecurityOfficerTel: String? = null
+
+ var csUpdateTime: Date? = null
+
+ var siExtension1: String? = null
+
+ var siExtension2: String? = null
+
+ var siExtension3: String? = null
+
+ var siRemark: String? = null
}
\ No newline at end of file
diff --git a/app/src/main/java/cn/flightfeather/thirdappmodule/bean/vo/SceneDetailStrVo.kt b/app/src/main/java/cn/flightfeather/thirdappmodule/bean/vo/SceneDetailStrVo.kt
new file mode 100644
index 0000000..8c9f8d8
--- /dev/null
+++ b/app/src/main/java/cn/flightfeather/thirdappmodule/bean/vo/SceneDetailStrVo.kt
@@ -0,0 +1,16 @@
+package cn.flightfeather.thirdappmodule.bean.vo
+
+import cn.flightfeather.thirdappmodule.bean.entity.Scense
+
+/**
+ * @author riku
+ * Date: 2025/10/20
+ */
+class SceneDetailStrVo {
+
+ // 鍦烘櫙鍩烘湰淇℃伅
+ var scene:Scense? = null
+
+ // 鍦烘櫙鐗规湁淇℃伅锛屾牴鎹満鏅被鍨嬩笉鍚岋紝灞炴�у悇涓嶇浉鍚�
+ var subScene: String? = null
+}
\ No newline at end of file
diff --git a/app/src/main/java/cn/flightfeather/thirdappmodule/bean/vo/SceneDetailVo.kt b/app/src/main/java/cn/flightfeather/thirdappmodule/bean/vo/SceneDetailVo.kt
new file mode 100644
index 0000000..578eac2
--- /dev/null
+++ b/app/src/main/java/cn/flightfeather/thirdappmodule/bean/vo/SceneDetailVo.kt
@@ -0,0 +1,16 @@
+package cn.flightfeather.thirdappmodule.bean.vo
+
+import cn.flightfeather.thirdappmodule.bean.entity.Scense
+
+/**
+ * @author riku
+ * Date: 2025/10/20
+ */
+class SceneDetailVo<T : BaseSubScene> {
+
+ // 鍦烘櫙鍩烘湰淇℃伅
+ var scene:Scense? = null
+
+ // 鍦烘櫙鐗规湁淇℃伅锛屾牴鎹満鏅被鍨嬩笉鍚岋紝灞炴�у悇涓嶇浉鍚�
+ var subScene: T? = null
+}
\ No newline at end of file
diff --git a/app/src/main/java/cn/flightfeather/thirdappmodule/bean/vo/TypicalSceneVo.kt b/app/src/main/java/cn/flightfeather/thirdappmodule/bean/vo/TypicalSceneVo.kt
new file mode 100644
index 0000000..04d4684
--- /dev/null
+++ b/app/src/main/java/cn/flightfeather/thirdappmodule/bean/vo/TypicalSceneVo.kt
@@ -0,0 +1,15 @@
+package cn.flightfeather.thirdappmodule.bean.vo
+
+import java.util.*
+
+/**
+ * 鍦烘櫙鍏稿瀷宸ュ湴鎯呭喌
+ * @author riku
+ * Date: 2025/10/27
+ */
+class TypicalSceneVo {
+ // 璇勯�夋椂闂�
+ var time: Date? = null
+ // 鏄惁鏃跺吀鍨嬪伐鍦�
+ var typical: Boolean = false
+}
\ No newline at end of file
diff --git a/app/src/main/java/cn/flightfeather/thirdappmodule/httpservice/DomainItemService.kt b/app/src/main/java/cn/flightfeather/thirdappmodule/httpservice/DomainItemService.kt
index 849c125..90bf59c 100644
--- a/app/src/main/java/cn/flightfeather/thirdappmodule/httpservice/DomainItemService.kt
+++ b/app/src/main/java/cn/flightfeather/thirdappmodule/httpservice/DomainItemService.kt
@@ -23,4 +23,7 @@
*/
@GET("domainitem/mediaFileType")
fun getMediaFileType(@Query("sceneType") sceneType: Int): Observable<Response<Map<String?, String?>>>
+
+ @GET("domainitem/name")
+ fun getItemByName(@Query("name") name: String): Observable<Response<ArrayList<Domainitem>>>
}
\ No newline at end of file
diff --git a/app/src/main/java/cn/flightfeather/thirdappmodule/httpservice/EvaluationService.java b/app/src/main/java/cn/flightfeather/thirdappmodule/httpservice/EvaluationService.java
index 8f8391b..57439b8 100644
--- a/app/src/main/java/cn/flightfeather/thirdappmodule/httpservice/EvaluationService.java
+++ b/app/src/main/java/cn/flightfeather/thirdappmodule/httpservice/EvaluationService.java
@@ -4,6 +4,7 @@
import cn.flightfeather.thirdappmodule.bean.entity.Evaluation;
import cn.flightfeather.thirdappmodule.bean.entity.Itemevaluation;
+import cn.flightfeather.thirdappmodule.model.bean.BaseResponse;
import io.reactivex.Observable;
import okhttp3.ResponseBody;
import retrofit2.Call;
@@ -38,6 +39,20 @@
@POST("evaluation/rankoftown")
Call<List<Evaluation>> getRankofTown(@Query("tguid") String tguid, @Query("scensetypeid") String scensetypeid);
+ /**
+ * 鏍规嵁鍦烘櫙鑾峰彇鍘嗗彶璇勪及寰楀垎
+ * @param sceneId 鍦烘櫙涓婚敭id
+ * @param page 椤电爜
+ * @param pageSize 姣忛〉鏁伴噺
+ * @return 鍘嗗彶璇勪及寰楀垎
+ */
+ @GET("evaluation/byScene")
+ Observable<Response<BaseResponse<List<Evaluation>>>> getEvaluationListByScene(
+ @Query("sceneId") String sceneId,
+ @Query("page") int page,
+ @Query("pageSize") int pageSize
+ );
+
@PUT("itemevaluation/addlist/")
Call<ResponseBody> putItemEvaluationList(@Body List<Itemevaluation> itemevaluationList);
diff --git a/app/src/main/java/cn/flightfeather/thirdappmodule/httpservice/ScenseService.java b/app/src/main/java/cn/flightfeather/thirdappmodule/httpservice/ScenseService.java
index 4793f94..d38e56a 100644
--- a/app/src/main/java/cn/flightfeather/thirdappmodule/httpservice/ScenseService.java
+++ b/app/src/main/java/cn/flightfeather/thirdappmodule/httpservice/ScenseService.java
@@ -4,6 +4,10 @@
import cn.flightfeather.thirdappmodule.bean.entity.Scense;
import cn.flightfeather.thirdappmodule.bean.entity.Task;
+import cn.flightfeather.thirdappmodule.bean.vo.BaseSubScene;
+import cn.flightfeather.thirdappmodule.bean.vo.SceneDetailStrVo;
+import cn.flightfeather.thirdappmodule.bean.vo.SceneDetailVo;
+import cn.flightfeather.thirdappmodule.model.bean.BaseResponse;
import io.reactivex.Observable;
import okhttp3.ResponseBody;
import retrofit2.Call;
@@ -41,4 +45,10 @@
@POST("scense/getByTask")
Observable<Response<ArrayList<Scense>>> getByTaskId(@Body Task task, @Query("mode") int mode);
+ @GET("scense/detail")
+ <T extends BaseSubScene> Observable<Response<BaseResponse<SceneDetailVo<T>>>> getSceneDetail(@Query("sceneId") String sceneId);
+
+ @POST("scense/detail/update")
+ Observable<Response<BaseResponse<String>>> updateSceneDetail(@Query("sceneTypeId") int typeId, @Body SceneDetailStrVo vo);
+
}
diff --git a/app/src/main/java/cn/flightfeather/thirdappmodule/model/bean/BaseResponse.kt b/app/src/main/java/cn/flightfeather/thirdappmodule/model/bean/BaseResponse.kt
index d791696..bbc4962 100644
--- a/app/src/main/java/cn/flightfeather/thirdappmodule/model/bean/BaseResponse.kt
+++ b/app/src/main/java/cn/flightfeather/thirdappmodule/model/bean/BaseResponse.kt
@@ -5,14 +5,15 @@
* Date: 2020/8/4
* 缃戠粶璇锋眰杩斿洖鏁版嵁鍩虹被
*/
-data class BaseResponse<T>(
- val success: Boolean,
- val message: String,
- val head: DataHead? = null,
- val data: T?
-)
+class BaseResponse<T> {
+ var success: Boolean = false
+ var message: String? = null
+ var head: DataHead? = null
+ var data: T? = null
+}
-data class DataHead(
- var page: Int = 1,
- var totalPage: Int = 1
-)
\ No newline at end of file
+class DataHead {
+ var page: Int = 1
+ var totalPage: Int = 1
+ var totalCount: Int = 1
+}
\ No newline at end of file
diff --git a/app/src/main/java/cn/flightfeather/thirdappmodule/module/inspection/InspectionDetailActivity.kt b/app/src/main/java/cn/flightfeather/thirdappmodule/module/inspection/InspectionDetailActivity.kt
index 5e9ece9..709906b 100644
--- a/app/src/main/java/cn/flightfeather/thirdappmodule/module/inspection/InspectionDetailActivity.kt
+++ b/app/src/main/java/cn/flightfeather/thirdappmodule/module/inspection/InspectionDetailActivity.kt
@@ -461,6 +461,13 @@
CameraPosition(LatLng(s.latitude, s.longitude), zoomLevel, 0F, 0F)
)
)
+
+ // 2025.10.22 褰撳満鏅槸宸ュ湴绫诲瀷鏃讹紝鏄剧ず淇敼鏂藉伐闃舵鎸夐挳
+ if (s.typeid.toString() == Constant.SCENE_TYPE_SITE) {
+ scene_status.visibility = View.VISIBLE
+ } else {
+ scene_status.visibility = View.GONE
+ }
}
/**
@@ -820,6 +827,16 @@
override fun onClick(v: View?) {
when (v?.id) {
+ R.id.scene_detail -> {
+
+ }
+ // 淇敼宸ュ湴鏂藉伐闃舵
+ R.id.scene_status ->{
+ val intent = Intent(this, MenuSceneInfoActivity::class.java).apply {
+ putExtra("scene", viewModel.scene.value)
+ }
+ startActivity(intent)
+ }
// 鏌ョ湅鎴栬幏鍙栫敤鎴疯处鎴蜂俊鎭�
R.id.user_account -> {
val intent = Intent(this, MenuSceneAccountActivity::class.java).apply {
diff --git a/app/src/main/java/cn/flightfeather/thirdappmodule/module/inspection/MenuGradeViewModel.kt b/app/src/main/java/cn/flightfeather/thirdappmodule/module/inspection/MenuGradeViewModel.kt
index 74062dc..5a1f06d 100644
--- a/app/src/main/java/cn/flightfeather/thirdappmodule/module/inspection/MenuGradeViewModel.kt
+++ b/app/src/main/java/cn/flightfeather/thirdappmodule/module/inspection/MenuGradeViewModel.kt
@@ -19,7 +19,7 @@
*/
class MenuGradeViewModel : BaseViewModel() {
- private val evaluationRepository = EvaluationRepository()
+ private val evaluationRepository = EvaluationRepository.instance
val ruleItemList = MutableLiveData<ArrayList<EvaluationsubruleVo>>()
diff --git a/app/src/main/java/cn/flightfeather/thirdappmodule/module/inspection/MenuSceneHistoryActivity.kt b/app/src/main/java/cn/flightfeather/thirdappmodule/module/inspection/MenuSceneHistoryActivity.kt
new file mode 100644
index 0000000..2c6ef7a
--- /dev/null
+++ b/app/src/main/java/cn/flightfeather/thirdappmodule/module/inspection/MenuSceneHistoryActivity.kt
@@ -0,0 +1,56 @@
+package cn.flightfeather.thirdappmodule.module.inspection
+
+import android.arch.lifecycle.ViewModelProviders
+import android.os.Bundle
+import android.view.View
+import cn.flightfeather.thirdappmodule.R
+import cn.flightfeather.thirdappmodule.bean.entity.Scense
+import cn.flightfeather.thirdappmodule.module.base.BaseActivity
+import cn.flightfeather.thirdappmodule.module.task.SceneDetailViewModel
+import kotlinx.android.synthetic.main.dialog_scene_history.*
+import kotlinx.android.synthetic.main.fragment_analysis_over_view.*
+
+class MenuSceneHistoryActivity : BaseActivity() {
+
+ private var scene: Scense? = null
+
+ override fun getLayoutId(): Int = R.layout.dialog_scene_history
+
+ lateinit var viewModel: MenuSceneHistoryViewModel
+
+ override fun onCreate(savedInstanceState: Bundle?) {
+ super.onCreate(savedInstanceState)
+
+ viewModel = ViewModelProviders.of(this).get(SceneDetailViewModel::class.java)
+
+ scene = intent.getSerializableExtra("scene") as Scense?
+
+ initUI()
+ initObserver()
+ initListener()
+
+ viewModel.getSceneStatus {
+ scene?.let { viewModel.getSceneDetail(it) }
+ }
+ }
+
+ private fun initUI() {
+ view_waiting.visibility = View.VISIBLE
+ scene?.let {
+ tv_status.text = StringBuilder(it.type + getString(R.string.scene_status))
+ }
+ }
+
+ private fun initObserver() {
+
+ }
+
+ private fun initListener() {
+
+
+
+ fab_close.setOnClickListener {
+ this.finish()
+ }
+ }
+}
diff --git a/app/src/main/java/cn/flightfeather/thirdappmodule/module/inspection/MenuSceneHistoryViewModel.kt b/app/src/main/java/cn/flightfeather/thirdappmodule/module/inspection/MenuSceneHistoryViewModel.kt
new file mode 100644
index 0000000..97489ee
--- /dev/null
+++ b/app/src/main/java/cn/flightfeather/thirdappmodule/module/inspection/MenuSceneHistoryViewModel.kt
@@ -0,0 +1,50 @@
+package cn.flightfeather.thirdappmodule.module.inspection
+
+import android.arch.lifecycle.MutableLiveData
+import cn.flightfeather.thirdappmodule.bean.entity.Evaluation
+import cn.flightfeather.thirdappmodule.bean.vo.ChangeRateVo
+import cn.flightfeather.thirdappmodule.bean.vo.TypicalSceneVo
+import cn.flightfeather.thirdappmodule.common.net.ResultCallBack
+import cn.flightfeather.thirdappmodule.module.base.BaseViewModel
+import cn.flightfeather.thirdappmodule.repository.EvaluationRepository
+import org.jetbrains.anko.toast
+
+/**
+ * @author riku
+ * Date: 2025/10/27
+ */
+class MenuSceneHistoryViewModel : BaseViewModel() {
+ private val evaluationRepository = EvaluationRepository.instance
+
+ // 1. 鍘嗗彶璇勪及鎯呭喌
+ val evaluationList = MutableLiveData<List<Evaluation>>()
+
+ /**
+ * 鑾峰彇鍓嶄笁涓湀鐨勮瘎浼版�诲垎
+ */
+ fun getEvaluationList(sceneId:String) {
+ evaluationRepository.getEvaluationByScene(sceneId, resultCallBack = object : ResultCallBack<List<Evaluation>> {
+ override fun onSuccess(result: List<Evaluation>?) {
+ evaluationList.value = result
+ }
+
+ override fun onFailure() {
+ application.toast("鑾峰彇璇勫垎澶辫触")
+ }
+ })
+ }
+
+ // 2. 鍏稿瀷宸ュ湴鎯呭喌
+ val typicalScene = MutableLiveData<List<TypicalSceneVo>>()
+
+ fun getTypicalScene(sceneId: String) {
+ typicalScene.value = listOf()
+ }
+
+ // 3. 鏁存敼鏁堢巼
+ val changeRate = MutableLiveData<List<ChangeRateVo>>()
+ fun getChangeRate() {
+
+ }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/cn/flightfeather/thirdappmodule/module/inspection/MenuSceneInfoActivity.kt b/app/src/main/java/cn/flightfeather/thirdappmodule/module/inspection/MenuSceneInfoActivity.kt
index 2f6a1c1..d635164 100644
--- a/app/src/main/java/cn/flightfeather/thirdappmodule/module/inspection/MenuSceneInfoActivity.kt
+++ b/app/src/main/java/cn/flightfeather/thirdappmodule/module/inspection/MenuSceneInfoActivity.kt
@@ -1,17 +1,29 @@
package cn.flightfeather.thirdappmodule.module.inspection
+import android.annotation.SuppressLint
+import android.arch.lifecycle.Observer
import android.arch.lifecycle.ViewModelProviders
import android.os.Bundle
+import android.support.v7.widget.LinearLayoutManager
+import android.view.LayoutInflater
import android.view.View
import cn.flightfeather.thirdappmodule.R
+import cn.flightfeather.thirdappmodule.adapter.AllRecyclerViewAdapter
import cn.flightfeather.thirdappmodule.bean.entity.Scense
+import cn.flightfeather.thirdappmodule.bean.vo.RankVo
+import cn.flightfeather.thirdappmodule.bean.vo.SceneConstructionSite
+import cn.flightfeather.thirdappmodule.bean.vo.TaskFrequencyVo
import cn.flightfeather.thirdappmodule.module.base.BaseActivity
import cn.flightfeather.thirdappmodule.module.task.SceneDetailViewModel
+import cn.flightfeather.thirdappmodule.util.CommonUtils
+import cn.flightfeather.thirdappmodule.util.Constant
import kotlinx.android.synthetic.main.dialog_scene_subinfo.*
+import kotlinx.android.synthetic.main.fragment_analysis_over_view.*
class MenuSceneInfoActivity : BaseActivity() {
private var scene: Scense? = null
+ private var statusAdapter: AllRecyclerViewAdapter<String>? = null
override fun getLayoutId(): Int = R.layout.dialog_scene_subinfo
@@ -27,6 +39,10 @@
initUI()
initObserver()
initListener()
+
+ viewModel.getSceneStatus {
+ scene?.let { viewModel.getSceneDetail(it) }
+ }
}
private fun initUI() {
@@ -38,27 +54,47 @@
}
private fun initObserver() {
- viewModel.aName.observe(this, Observer {
+ viewModel.subScene.observe(this, Observer {
view_waiting.visibility = View.GONE
-
- if (it == null) {
- group_no_data.visibility = View.VISIBLE
- group_s_info.visibility = View.GONE
- } else {
- group_no_data.visibility = View.GONE
- group_s_info.visibility = View.VISIBLE
- tv_s_account_c.text = it
+ val status = when (scene?.typeid.toString()) {
+ Constant.SCENE_TYPE_SITE -> {
+ (it as SceneConstructionSite?)?.siExtension1
+ }
+ else -> ""
+ }
+ var index = viewModel.sceneStatus.indexOf(status)
+ if (index == -1) index = 0
+ statusAdapter?.run {
+ setSelected(true, index)
+ notifyItemChanged(index)
}
})
}
private fun initListener() {
- tv_create_account.setOnClickListener {
- view_waiting.visibility = View.VISIBLE
- sceneId?.let { viewModel.createAccount(it) }
+ statusAdapter = object : AllRecyclerViewAdapter<String>(viewModel.sceneStatus, android.R.layout.simple_list_item_single_choice, this) {
+ @SuppressLint("NotifyDataSetChanged")
+ override fun bindView(holder: MyViewHolder?, obj: String?, isSelected: Boolean, position: Int) {
+ holder?.setText(R.id.text1, obj)
+ ?.setOnItemClickListener {
+ setAllFalse()
+ setSelected(true, position)
+ notifyDataSetChanged()
+ (viewModel.subScene.value as SceneConstructionSite?)?.siExtension1 = obj
+ }
+ }
}
+ val lm = LinearLayoutManager(this)
+ lm.orientation = LinearLayoutManager.VERTICAL
+ rv_status!!.layoutManager = lm
+ rv_status!!.adapter = statusAdapter
+
+
fab_close.setOnClickListener {
this.finish()
}
+ fab_submit.setOnClickListener {
+ viewModel
+ }
}
}
diff --git a/app/src/main/java/cn/flightfeather/thirdappmodule/module/task/SceneDetailViewModel.kt b/app/src/main/java/cn/flightfeather/thirdappmodule/module/task/SceneDetailViewModel.kt
index 3f56f4d..1e68d90 100644
--- a/app/src/main/java/cn/flightfeather/thirdappmodule/module/task/SceneDetailViewModel.kt
+++ b/app/src/main/java/cn/flightfeather/thirdappmodule/module/task/SceneDetailViewModel.kt
@@ -2,10 +2,16 @@
import android.arch.lifecycle.MutableLiveData
import cn.flightfeather.thirdappmodule.bean.entity.*
+import cn.flightfeather.thirdappmodule.bean.vo.BaseSubScene
+import cn.flightfeather.thirdappmodule.bean.vo.SceneConstructionSite
+import cn.flightfeather.thirdappmodule.bean.vo.SceneDetailStrVo
+import cn.flightfeather.thirdappmodule.bean.vo.SceneDetailVo
import cn.flightfeather.thirdappmodule.common.net.ResultCallBack
import cn.flightfeather.thirdappmodule.model.event.SceneEvent
import cn.flightfeather.thirdappmodule.module.base.BaseViewModel
+import cn.flightfeather.thirdappmodule.repository.CommonRepository
import cn.flightfeather.thirdappmodule.repository.SceneRepository
+import com.google.gson.Gson
import okhttp3.ResponseBody
import org.greenrobot.eventbus.EventBus
import org.jetbrains.anko.toast
@@ -16,6 +22,7 @@
*/
class SceneDetailViewModel : BaseViewModel() {
private val sceneRepository = SceneRepository()
+ private val commonRepository = CommonRepository.instance
val allProvinceList = ArrayList<Province>()
val allCityList = ArrayList<City>()
@@ -29,8 +36,12 @@
val allSceneTypeList = MutableLiveData<ArrayList<Domainitem>>().apply { value = ArrayList() }
- val subScene = MutableLiveData<>
+ val subScene = MutableLiveData<BaseSubScene>()
+ val sceneStatus = ArrayList<String>()
+ /**
+ * 鑾峰彇琛屾斂鍖哄垝鍙�夐」
+ */
fun getData() {
sceneRepository.getDivision(object : ResultCallBack<Division> {
override fun onSuccess(result: Division?) {
@@ -57,6 +68,9 @@
})
}
+ /**
+ * 鑾峰彇鍦烘櫙绫诲瀷鍙�夐」
+ */
fun getSceneType() {
sceneRepository.getSceneType(object : ResultCallBack<ArrayList<Domainitem>> {
override fun onSuccess(result: ArrayList<Domainitem>?) {
@@ -109,6 +123,53 @@
})
}
}
+
+ fun getSceneDetail(scene: Scense?) {
+ scene?.let {
+ sceneRepository.getSceneDetail(it, object : ResultCallBack<SceneDetailVo<SceneConstructionSite>> {
+ override fun onSuccess(result: SceneDetailVo<SceneConstructionSite>?) {
+ result?.let { r -> subScene.value = r.subScene }
+ }
+
+ override fun onFailure() {
+ application.toast("鏂藉伐闃舵娌℃湁璁板綍")
+ }
+ })
+ }
+ }
+
+ fun updateSceneDetail(scene: Scense?, subScene: BaseSubScene) {
+ scene?.let {
+ val vo = SceneDetailStrVo().apply {
+ this.scene = it
+ this.subScene = Gson().toJson(subScene)
+ }
+ sceneRepository.updateSceneDetail(vo, object : ResultCallBack<String> {
+ override fun onSuccess(result: String?) {
+ application.toast("鏂藉伐闃舵淇敼鎴愬姛")
+ }
+
+ override fun onFailure() {
+ application.toast("鏂藉伐闃舵淇敼澶辫触")
+ }
+ })
+ }
+ }
+
+ fun getSceneStatus(success: () -> Unit) {
+ commonRepository.getDomainItem("宸ュ湴宸ユ湡", object : ResultCallBack<ArrayList<Domainitem>> {
+ override fun onSuccess(result: ArrayList<Domainitem>?) {
+ result?.let { arr ->
+ sceneStatus.addAll(arr.map { it.text })
+ success()
+ }
+ }
+
+ override fun onFailure() {
+ application.toast("鏂藉伐闃舵閫夐」鏃犺褰�")
+ }
+ })
+ }
}
data class Division(
diff --git a/app/src/main/java/cn/flightfeather/thirdappmodule/repository/CommonRepository.kt b/app/src/main/java/cn/flightfeather/thirdappmodule/repository/CommonRepository.kt
index 44dee2b..258837c 100644
--- a/app/src/main/java/cn/flightfeather/thirdappmodule/repository/CommonRepository.kt
+++ b/app/src/main/java/cn/flightfeather/thirdappmodule/repository/CommonRepository.kt
@@ -1,5 +1,6 @@
package cn.flightfeather.thirdappmodule.repository
+import cn.flightfeather.thirdappmodule.bean.entity.Domainitem
import cn.flightfeather.thirdappmodule.common.net.ResultCallBack
import cn.flightfeather.thirdappmodule.common.net.ResultObserver
import cn.flightfeather.thirdappmodule.common.net.RetrofitFactory
@@ -112,4 +113,21 @@
}
})
}
+
+ /**
+ * 鏍规嵁鍊煎煙绫诲埆鍚嶇О锛岃幏鍙栧叿浣撶殑閫夐」
+ */
+ fun getDomainItem(name: String, resultCallBack: ResultCallBack<ArrayList<Domainitem>>) {
+ val service = retrofit.create(DomainItemService::class.java).getItemByName(name)
+
+ RetrofitFactory.executeResult(service, object : ResultObserver<ArrayList<Domainitem>>() {
+ override fun onSuccess(result: ArrayList<Domainitem>?) {
+ resultCallBack.onSuccess(result)
+ }
+
+ override fun onFailure(e: Throwable, isNetWorkError: Boolean) {
+ resultCallBack.onFailure()
+ }
+ })
+ }
}
\ No newline at end of file
diff --git a/app/src/main/java/cn/flightfeather/thirdappmodule/repository/EvaluationRepository.kt b/app/src/main/java/cn/flightfeather/thirdappmodule/repository/EvaluationRepository.kt
index 8983881..19949b9 100644
--- a/app/src/main/java/cn/flightfeather/thirdappmodule/repository/EvaluationRepository.kt
+++ b/app/src/main/java/cn/flightfeather/thirdappmodule/repository/EvaluationRepository.kt
@@ -9,6 +9,7 @@
import cn.flightfeather.thirdappmodule.common.net.ResultObserver
import cn.flightfeather.thirdappmodule.common.net.RetrofitFactory
import cn.flightfeather.thirdappmodule.httpservice.EvaluationService
+import cn.flightfeather.thirdappmodule.model.bean.BaseResponse
import cn.flightfeather.thirdappmodule.repository.dao.EvaluationDao
import io.reactivex.Observable
import io.reactivex.functions.BiFunction
@@ -21,10 +22,17 @@
* 璇勫垎鐩稿叧鏁版嵁鎿嶄綔
*/
class EvaluationRepository {
+ companion object {
+ @JvmStatic
+ val instance: EvaluationRepository by lazy(LazyThreadSafetyMode.SYNCHRONIZED) { EvaluationRepository()}
+ }
private val retrofit = RetrofitFactory.instance.retrofit
private val evaluationDao = EvaluationDao()
+ /**
+ * 鑾峰彇璇勪及鎬昏鍒�
+ */
fun getEvaluationRule(
provinceCode: String, cityCode: String,
districtCode: String, sceneTypeId: Byte, resultCallBack: ResultCallBack<List<Evaluationrule>>) {
@@ -44,11 +52,36 @@
})
}
+ /**
+ * 鏍规嵁宸℃煡璁板綍id鑾峰彇璇勪及鎬诲垎
+ */
fun getEvaluation(inspectionGuid: String, resultCallBack: ResultCallBack<List<Evaluation>>) {
retrofit.create(EvaluationService::class.java)
.findByInspectionId(inspectionGuid).enqueue(ResponseBodyCallBack(resultCallBack))
}
+ /**
+ * 鏍规嵁鍦烘櫙id鑾峰彇璇勪及鎬诲垎
+ */
+ fun getEvaluationByScene(sceneId: String, page: Int = 1, pageSize: Int = 4, resultCallBack: ResultCallBack<List<Evaluation>>) {
+ val service = retrofit.create(EvaluationService::class.java).getEvaluationListByScene(sceneId, page, pageSize)
+
+ RetrofitFactory.executeResult(service, object : ResultObserver<BaseResponse<List<Evaluation>>>() {
+ override fun onPage(current: Int, total: Int) {
+ super.onPage(current, total)
+ resultCallBack.onPage(current, total)
+ }
+
+ override fun onSuccess(result: BaseResponse<List<Evaluation>>?) {
+ resultCallBack.onSuccess(result?.data)
+ }
+
+ override fun onFailure(e: Throwable, isNetWorkError: Boolean) {
+ resultCallBack.onFailure()
+ }
+ })
+ }
+
fun getRuleItem(evaluationruleGuid: String, subTaskGuid: String,resultCallBack: ResultCallBack<ArrayList<EvaluationsubruleVo>>) {
val dbService = evaluationDao.getEvaluationSubRule(evaluationruleGuid).map {
val list = it.map {
diff --git a/app/src/main/java/cn/flightfeather/thirdappmodule/repository/SceneRepository.kt b/app/src/main/java/cn/flightfeather/thirdappmodule/repository/SceneRepository.kt
index 8d709dd..e0c1c35 100644
--- a/app/src/main/java/cn/flightfeather/thirdappmodule/repository/SceneRepository.kt
+++ b/app/src/main/java/cn/flightfeather/thirdappmodule/repository/SceneRepository.kt
@@ -1,14 +1,19 @@
package cn.flightfeather.thirdappmodule.repository
import cn.flightfeather.thirdappmodule.bean.entity.*
+import cn.flightfeather.thirdappmodule.bean.vo.BaseSubScene
+import cn.flightfeather.thirdappmodule.bean.vo.SceneDetailStrVo
+import cn.flightfeather.thirdappmodule.bean.vo.SceneDetailVo
import cn.flightfeather.thirdappmodule.common.net.ResponseBodyCallBack
import cn.flightfeather.thirdappmodule.common.net.ResultCallBack
import cn.flightfeather.thirdappmodule.common.net.ResultObserver
import cn.flightfeather.thirdappmodule.common.net.RetrofitFactory
import cn.flightfeather.thirdappmodule.httpservice.ScenseService
+import cn.flightfeather.thirdappmodule.model.bean.BaseResponse
import cn.flightfeather.thirdappmodule.module.task.Division
import cn.flightfeather.thirdappmodule.repository.dao.DomainDao
import cn.flightfeather.thirdappmodule.repository.dao.SceneDao
+import cn.flightfeather.thirdappmodule.util.Constant
import io.reactivex.Observable
import io.reactivex.functions.Function4
import okhttp3.ResponseBody
@@ -55,16 +60,16 @@
val dbService4 = domainDao.getTown()
val zipService = Observable.zip(dbService1, dbService2, dbService3, dbService4,
- Function4<List<Province>, List<City>, List<District>, List<Town>, Response<Division>> { t1, t2, t3, t4 ->
- Response.success(
- Division(
- ArrayList(t1),
- ArrayList(t2),
- ArrayList(t3),
- ArrayList(t4)
- )
+ Function4<List<Province>, List<City>, List<District>, List<Town>, Response<Division>> { t1, t2, t3, t4 ->
+ Response.success(
+ Division(
+ ArrayList(t1),
+ ArrayList(t2),
+ ArrayList(t3),
+ ArrayList(t4)
)
- })
+ )
+ })
RetrofitFactory.executeResult(zipService, object : ResultObserver<Division>() {
override fun onSuccess(result: Division?) {
@@ -105,7 +110,7 @@
fun putScene(scene: Scense, resultCallBack: ResultCallBack<ResponseBody>) {
sceneDao.insert(scene)
retrofit.create(ScenseService::class.java).putScense(scene)
- .enqueue(ResponseBodyCallBack(resultCallBack))
+ .enqueue(ResponseBodyCallBack(resultCallBack))
}
/**
@@ -114,7 +119,7 @@
fun updateScene(scene: Scense, resultCallBack: ResultCallBack<ResponseBody>) {
sceneDao.update(scene)
retrofit.create(ScenseService::class.java).updateScense(scene)
- .enqueue(ResponseBodyCallBack(resultCallBack))
+ .enqueue(ResponseBodyCallBack(resultCallBack))
}
/**
@@ -125,6 +130,44 @@
sceneDao.update(it)
}
retrofit.create(ScenseService::class.java).updateSceneList(sceneList)
- .enqueue(ResponseBodyCallBack(resultCallBack))
+ .enqueue(ResponseBodyCallBack(resultCallBack))
+ }
+
+ /**
+ * 鑾峰彇鍦烘櫙璇︽儏锛屽寘鍚熀纭�淇℃伅鍜屽満鏅壒鏈変俊鎭�
+ */
+ fun <T : BaseSubScene> getSceneDetail(scene: Scense, resultCallBack: ResultCallBack<SceneDetailVo<T>>) {
+ val sceneService = when (scene.typeid.toString()) {
+ Constant.SCENE_TYPE_SITE -> retrofit.create(ScenseService::class.java).getSceneDetail<T>(scene.guid)
+ else -> retrofit.create(ScenseService::class.java).getSceneDetail<T>(scene.guid)
+ }
+
+ RetrofitFactory.executeResult(sceneService, object : ResultObserver<BaseResponse<SceneDetailVo<T>>>() {
+ override fun onSuccess(result: BaseResponse<SceneDetailVo<T>>?) {
+ resultCallBack.onSuccess(result?.data)
+ }
+
+ override fun onFailure(e: Throwable, isNetWorkError: Boolean) {
+ resultCallBack.onFailure()
+ }
+ })
+ }
+
+ /**
+ * 鏇存柊鍦烘櫙璇︽儏
+ */
+ fun updateSceneDetail(vo: SceneDetailStrVo, resultCallBack: ResultCallBack<String>) {
+ vo.scene ?: return
+ val sceneService = retrofit.create(ScenseService::class.java).updateSceneDetail(vo.scene!!.typeid.toInt(), vo)
+
+ RetrofitFactory.executeResult(sceneService, object : ResultObserver<BaseResponse<String>>() {
+ override fun onSuccess(result: BaseResponse<String>?) {
+ resultCallBack.onSuccess(result?.data)
+ }
+
+ override fun onFailure(e: Throwable, isNetWorkError: Boolean) {
+ resultCallBack.onFailure()
+ }
+ })
}
}
\ No newline at end of file
diff --git a/app/src/main/res/drawable-anydpi-v24/ic_info_black_24dp.xml b/app/src/main/res/drawable-anydpi-v24/ic_info_black_24dp.xml
new file mode 100644
index 0000000..5ea36ec
--- /dev/null
+++ b/app/src/main/res/drawable-anydpi-v24/ic_info_black_24dp.xml
@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24"
+ android:tint="#FFFFFF">
+ <group android:scaleX="0.92"
+ android:scaleY="0.92"
+ android:translateX="0.96"
+ android:translateY="0.96">
+ <path
+ android:fillColor="@android:color/white"
+ android:pathData="M19,3L5,3c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2zM14,17L7,17v-2h7v2zM17,13L7,13v-2h10v2zM17,9L7,9L7,7h10v2z"/>
+ </group>
+</vector>
diff --git a/app/src/main/res/drawable-hdpi/ic_info_black_24dp.png b/app/src/main/res/drawable-hdpi/ic_info_black_24dp.png
new file mode 100644
index 0000000..69c1f64
--- /dev/null
+++ b/app/src/main/res/drawable-hdpi/ic_info_black_24dp.png
Binary files differ
diff --git a/app/src/main/res/drawable-mdpi/ic_info_black_24dp.png b/app/src/main/res/drawable-mdpi/ic_info_black_24dp.png
new file mode 100644
index 0000000..8af1ee1
--- /dev/null
+++ b/app/src/main/res/drawable-mdpi/ic_info_black_24dp.png
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_info_black_24dp.png b/app/src/main/res/drawable-xhdpi/ic_info_black_24dp.png
new file mode 100644
index 0000000..f71428c
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_info_black_24dp.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_info_black_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_info_black_24dp.png
new file mode 100644
index 0000000..e4c2d7c
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_info_black_24dp.png
Binary files differ
diff --git a/app/src/main/res/layout/dialog_scene_history.xml b/app/src/main/res/layout/dialog_scene_history.xml
new file mode 100644
index 0000000..462ae83
--- /dev/null
+++ b/app/src/main/res/layout/dialog_scene_history.xml
@@ -0,0 +1,221 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="vertical">
+
+ <android.support.v7.widget.CardView
+ android:id="@+id/cv_dialog_main"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_marginLeft="12dp"
+ android:layout_marginTop="30dp"
+ android:layout_marginRight="12dp"
+ android:layout_marginBottom="40dp"
+ app:cardCornerRadius="6dp"
+ app:cardElevation="7dp">
+
+ <android.support.constraint.ConstraintLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="vertical"
+ android:padding="@dimen/dimen16">
+
+ <TextView
+ android:id="@+id/tv_title"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="鍘嗗彶鎯呭喌"
+ android:textColor="@color/primary_text"
+ android:textSize="@dimen/textSize_18"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
+
+ <ProgressBar
+ android:id="@+id/view_waiting"
+ android:layout_width="@dimen/fab_margin"
+ android:layout_height="@dimen/fab_margin"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
+
+ <android.support.constraint.ConstraintLayout
+ android:id="@+id/cl_1"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ app:layout_constraintTop_toBottomOf="@id/tv_title">
+
+ <TextView
+ android:id="@+id/tv_title_1"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:paddingTop="@dimen/dimen4"
+ android:paddingBottom="@dimen/dimen4"
+ android:text="1. 鐜板満璇勫垎"
+ android:textColor="@color/main_color_1"
+ android:textSize="@dimen/textSize_16"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent"
+ tools:ignore="UnusedAttribute" />
+ </android.support.constraint.ConstraintLayout>
+
+ <android.support.constraint.ConstraintLayout
+ android:id="@+id/cl_2"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ app:layout_constraintTop_toBottomOf="@id/cl_1">
+
+ <TextView
+ android:id="@+id/tv_title_2"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:paddingTop="@dimen/dimen4"
+ android:paddingBottom="@dimen/dimen4"
+ android:text="2. 鍏稿瀷宸ュ湴"
+ android:textColor="@color/main_color_1"
+ android:textSize="@dimen/textSize_16"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent"
+ tools:ignore="UnusedAttribute" />
+ </android.support.constraint.ConstraintLayout>
+
+ <android.support.constraint.ConstraintLayout
+ android:id="@+id/cl_3"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ app:layout_constraintTop_toBottomOf="@id/cl_2">
+
+ <TextView
+ android:id="@+id/tv_title_3"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:paddingTop="@dimen/dimen4"
+ android:paddingBottom="@dimen/dimen4"
+ android:text="3. 閲嶇偣鍖哄煙"
+ android:textColor="@color/main_color_1"
+ android:textSize="@dimen/textSize_16"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent"
+ tools:ignore="UnusedAttribute" />
+ </android.support.constraint.ConstraintLayout>
+ <android.support.constraint.ConstraintLayout
+ android:id="@+id/cl_4"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ app:layout_constraintTop_toBottomOf="@id/cl_3">
+
+ <TextView
+ android:id="@+id/tv_title_4"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:paddingTop="@dimen/dimen4"
+ android:paddingBottom="@dimen/dimen4"
+ android:text="4. 鑱斿悎鎵ф硶"
+ android:textColor="@color/main_color_1"
+ android:textSize="@dimen/textSize_16"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent"
+ tools:ignore="UnusedAttribute" />
+ </android.support.constraint.ConstraintLayout>
+ <android.support.constraint.ConstraintLayout
+ android:id="@+id/cl_5"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ app:layout_constraintTop_toBottomOf="@id/cl_4">
+
+ <TextView
+ android:id="@+id/tv_title_5"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:paddingTop="@dimen/dimen4"
+ android:paddingBottom="@dimen/dimen4"
+ android:text="5. 鏁存敼鏁堢巼"
+ android:textColor="@color/main_color_1"
+ android:textSize="@dimen/textSize_16"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent"
+ tools:ignore="UnusedAttribute" />
+ </android.support.constraint.ConstraintLayout>
+ <android.support.constraint.ConstraintLayout
+ android:id="@+id/cl_6"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ app:layout_constraintTop_toBottomOf="@id/cl_5">
+
+ <TextView
+ android:id="@+id/tv_title_6"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:paddingTop="@dimen/dimen4"
+ android:paddingBottom="@dimen/dimen4"
+ android:text="6. 鏂藉伐闃舵"
+ android:textColor="@color/main_color_1"
+ android:textSize="@dimen/textSize_16"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent"
+ tools:ignore="UnusedAttribute" />
+ </android.support.constraint.ConstraintLayout>
+ <android.support.constraint.ConstraintLayout
+ android:id="@+id/cl_7"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ app:layout_constraintTop_toBottomOf="@id/cl_6">
+
+ <TextView
+ android:id="@+id/tv_title_7"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:paddingTop="@dimen/dimen4"
+ android:paddingBottom="@dimen/dimen4"
+ android:text="7. 鐩戞祴鏁版嵁"
+ android:textColor="@color/main_color_1"
+ android:textSize="@dimen/textSize_16"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent"
+ tools:ignore="UnusedAttribute" />
+ </android.support.constraint.ConstraintLayout>
+ <android.support.constraint.ConstraintLayout
+ android:id="@+id/cl_8"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ app:layout_constraintTop_toBottomOf="@id/cl_7">
+
+ <TextView
+ android:id="@+id/tv_title_8"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:paddingTop="@dimen/dimen4"
+ android:paddingBottom="@dimen/dimen4"
+ android:text="8. 搴旀�ュ贰鏌�"
+ android:textColor="@color/main_color_1"
+ android:textSize="@dimen/textSize_16"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent"
+ tools:ignore="UnusedAttribute" />
+ </android.support.constraint.ConstraintLayout>
+
+
+ </android.support.constraint.ConstraintLayout>
+ </android.support.v7.widget.CardView>
+
+ <android.support.design.widget.FloatingActionButton
+ android:id="@+id/fab_close"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:contentDescription="@string/cancel"
+ android:src="@drawable/icon_close_white"
+ app:elevation="8dp"
+ app:fabSize="normal"
+ app:layout_anchor="@id/cv_dialog_main"
+ app:layout_anchorGravity="bottom|center" />
+
+</android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_scene_subinfo.xml b/app/src/main/res/layout/dialog_scene_subinfo.xml
index ee9a462..91b221f 100644
--- a/app/src/main/res/layout/dialog_scene_subinfo.xml
+++ b/app/src/main/res/layout/dialog_scene_subinfo.xml
@@ -84,9 +84,23 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:fabSize="normal"
+ android:layout_marginLeft="76dp"
app:elevation="8dp"
app:layout_anchor="@id/cv_dialog_main"
- app:layout_anchorGravity="bottom|center"
+ app:layout_anchorGravity="bottom|left"
android:contentDescription="@string/cancel" />
+ <android.support.design.widget.FloatingActionButton
+ android:src="@drawable/icon_right_white"
+ android:id="@+id/fab_submit"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ app:fabSize="normal"
+ android:layout_marginRight="76dp"
+ app:elevation="8dp"
+ app:backgroundTint="@color/lightGreen"
+ app:layout_anchor="@id/cv_dialog_main"
+ app:layout_anchorGravity="bottom|right"
+ />
+
</android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_inspection_content.xml b/app/src/main/res/layout/fragment_inspection_content.xml
index d57665b..f768e0a 100644
--- a/app/src/main/res/layout/fragment_inspection_content.xml
+++ b/app/src/main/res/layout/fragment_inspection_content.xml
@@ -12,7 +12,44 @@
android:layout_height="match_parent"
android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
- android:layout_marginBottom="20dp"></com.amap.api.maps.MapView>
+ android:layout_marginBottom="20dp" />
+
+ <TextView
+ android:id="@+id/scene_status"
+ android:visibility="gone"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentEnd="true"
+ android:layout_alignParentBottom="true"
+ android:layout_marginBottom="230dp"
+ android:background="@drawable/shape_yellow"
+ android:drawableStart="@drawable/ic_group_black_24dp"
+ android:drawableTint="@color/white"
+ android:elevation="@dimen/dimen4"
+ android:foreground="?android:attr/selectableItemBackground"
+ android:gravity="center"
+ android:padding="@dimen/dimen4"
+ android:text="@string/scene_status"
+ android:textColor="@color/white"
+ tools:ignore="UnusedAttribute" />
+
+ <TextView
+ android:id="@+id/scene_detail"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentEnd="true"
+ android:layout_alignParentBottom="true"
+ android:layout_marginBottom="230dp"
+ android:background="@drawable/shape_yellow"
+ android:drawableStart="@drawable/ic_info_black_24dp"
+ android:drawableTint="@color/white"
+ android:elevation="@dimen/dimen4"
+ android:foreground="?android:attr/selectableItemBackground"
+ android:gravity="center"
+ android:padding="@dimen/dimen4"
+ android:text="鐐逛綅鎯呭喌"
+ android:textColor="@color/white"
+ tools:ignore="UnusedAttribute" />
<TextView
android:id="@+id/user_account"
@@ -20,16 +57,16 @@
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_alignParentBottom="true"
- android:text="鐢ㄦ埛璐﹀彿"
- android:elevation="@dimen/dimen4"
android:layout_marginBottom="188dp"
- android:padding="@dimen/dimen4"
- android:gravity="center"
- android:textColor="@color/white"
android:background="@drawable/shape_green"
- android:foreground="?android:attr/selectableItemBackground"
android:drawableStart="@drawable/ic_group_black_24dp"
android:drawableTint="@color/white"
+ android:elevation="@dimen/dimen4"
+ android:foreground="?android:attr/selectableItemBackground"
+ android:gravity="center"
+ android:padding="@dimen/dimen4"
+ android:text="鐢ㄦ埛璐﹀彿"
+ android:textColor="@color/white"
tools:ignore="UnusedAttribute" />
<LinearLayout
@@ -184,203 +221,223 @@
</RelativeLayout>
<LinearLayout
- android:paddingTop="12dp"
- android:paddingBottom="14dp"
android:id="@+id/ll_patrol_task_detail"
- android:background="@drawable/shap_stroke_bottom"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:orientation="vertical"
android:layout_below="@+id/ln_patrol_subtask_detail"
- android:layout_alignParentStart="true">
+ android:layout_alignParentStart="true"
+ android:background="@drawable/shap_stroke_bottom"
+ android:orientation="vertical"
+ android:paddingTop="12dp"
+ android:paddingBottom="14dp">
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginLeft="16dp"
+ android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:orientation="vertical"
- android:layout_marginLeft="16dp">
- <LinearLayout
- android:layout_width="match_parent"
+ android:orientation="horizontal">
+
+ <TextView
+ android:id="@+id/textView3"
+ android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:orientation="horizontal">
+ android:text="@string/task_name2" />
- <TextView
- android:id="@+id/textView3"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/task_name2" />
-
- <TextView
- android:id="@+id/tv_subtask_name"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content" />
- </LinearLayout>
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="horizontal">
-
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/task_type2" />
-
- <TextView
- android:id="@+id/tv_subtask_type"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:singleLine="true" />
- </LinearLayout>
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="horizontal">
-
- <TextView
- android:id="@+id/textView"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/task_plan_time" />
-
- <TextView
- android:id="@+id/tv_subtask_plan_time"
- android:layout_width="wrap_content"
- android:singleLine="true"
- android:layout_height="wrap_content" />
- </LinearLayout>
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="horizontal">
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/task_execute_time"/>
- <TextView
- android:id="@+id/tv_subtask_execute_time"
- android:layout_width="wrap_content"
- android:singleLine="true"
- android:layout_height="wrap_content" />
- </LinearLayout>
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="horizontal">
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/task_executors"/>
- <TextView
- android:id="@+id/tv_subtask_executors"
- android:layout_width="wrap_content"
- android:singleLine="true"
- android:layout_height="wrap_content" />
- </LinearLayout>
-
+ <TextView
+ android:id="@+id/tv_subtask_name"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content" />
</LinearLayout>
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal">
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/task_type2" />
+
+ <TextView
+ android:id="@+id/tv_subtask_type"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:singleLine="true" />
+ </LinearLayout>
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal">
+
+ <TextView
+ android:id="@+id/textView"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/task_plan_time" />
+
+ <TextView
+ android:id="@+id/tv_subtask_plan_time"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:singleLine="true" />
+ </LinearLayout>
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal">
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/task_execute_time" />
+
+ <TextView
+ android:id="@+id/tv_subtask_execute_time"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:singleLine="true" />
+ </LinearLayout>
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal">
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/task_executors" />
+
+ <TextView
+ android:id="@+id/tv_subtask_executors"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:singleLine="true" />
+ </LinearLayout>
+
+ </LinearLayout>
+
<LinearLayout
- android:layout_marginTop="16dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:layout_marginTop="16dp"
android:orientation="horizontal">
+
<TextView
- android:layout_marginLeft="16dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="@string/scense_name"
- />
+ android:layout_marginLeft="16dp"
+ android:text="@string/scense_name" />
+
<TextView
android:id="@+id/tv_scense_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
</LinearLayout>
+
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
+
<TextView
- android:layout_marginLeft="16dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="@string/scense_type"
- />
+ android:layout_marginLeft="16dp"
+ android:text="@string/scense_type" />
+
<TextView
android:id="@+id/tv_scense_type"
android:layout_width="wrap_content"
- android:singleLine="true"
- android:layout_height="wrap_content" />
- </LinearLayout>
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="horizontal">
- <TextView
- android:layout_marginLeft="16dp"
- android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="@string/scense_address"
- />
- <TextView
- android:id="@+id/tv_scense_address"
- android:layout_width="wrap_content"
- android:singleLine="true"
- android:layout_height="wrap_content" />
+ android:singleLine="true" />
</LinearLayout>
<LinearLayout
- android:layout_marginTop="4dp"
- android:layout_marginLeft="16dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:orientation="horizontal">
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginLeft="16dp"
+ android:text="@string/scense_address" />
+
+ <TextView
+ android:id="@+id/tv_scense_address"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:singleLine="true" />
+ </LinearLayout>
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginLeft="16dp"
+ android:layout_marginTop="4dp"
android:gravity="center_vertical"
android:orientation="horizontal">
+
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="鑱旂郴浜� 1锛�"/>
+ android:text="鑱旂郴浜� 1锛�" />
+
<TextView
android:id="@+id/tv_scense_contact1"
- android:layout_weight="1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text=""/>
+ android:layout_weight="1"
+ android:text="" />
+
<TextView
android:id="@+id/tv_call_contact1"
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_marginRight="16dp"
- android:textColor="@color/colorPrimary"
android:background="@drawable/contactcompany"
- android:text=""/>
+ android:text=""
+ android:textColor="@color/colorPrimary" />
</LinearLayout>
+
<LinearLayout
- android:visibility="gone"
- android:layout_marginLeft="16dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:orientation="horizontal">
+ android:layout_marginLeft="16dp"
+ android:orientation="horizontal"
+ android:visibility="gone">
+
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="鑱旂郴浜� 2锛�"/>
+ android:text="鑱旂郴浜� 2锛�" />
+
<TextView
android:id="@+id/tv_scense_contact2"
- android:layout_weight="1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text=""/>
+ android:layout_weight="1"
+ android:text="" />
+
<TextView
android:id="@+id/tv_call_contact2"
android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
android:paddingLeft="9dp"
android:paddingRight="25dp"
- android:layout_height="wrap_content"
- android:textColor="@color/colorPrimary"
- android:text="鎵撶數璇�"/>
+ android:text="鎵撶數璇�"
+ android:textColor="@color/colorPrimary" />
</LinearLayout>
- </LinearLayout>
+ </LinearLayout>
--
Gitblit v1.9.3