From e27f54aa7e10836e2741dc590559e1039fbade78 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期五, 23 七月 2021 15:06:41 +0800
Subject: [PATCH] 1. 创建子任务时，执行用户默认为当前登录用户或执行组中的第一人 2. 修复部分企业类型问题图标错误 3. 新增场景账户自动生成功能
---
app/src/main/java/cn/flightfeather/thirdapp/module/inspection/InspectionDetailActivity.kt | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/module/inspection/InspectionDetailActivity.kt b/app/src/main/java/cn/flightfeather/thirdapp/module/inspection/InspectionDetailActivity.kt
index 3cde748..983b18f 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/module/inspection/InspectionDetailActivity.kt
+++ b/app/src/main/java/cn/flightfeather/thirdapp/module/inspection/InspectionDetailActivity.kt
@@ -3,7 +3,6 @@
import android.app.Activity
import android.arch.lifecycle.Observer
import android.arch.lifecycle.ViewModelProviders
-import android.content.DialogInterface
import android.content.Intent
import android.net.Uri
import android.os.Bundle
@@ -20,9 +19,9 @@
import cn.flightfeather.thirdapp.activity.ProblemDetailActivity
import cn.flightfeather.thirdapp.activity.PromiseActivity
import cn.flightfeather.thirdapp.adapter.IconsPageAdapter
-import cn.flightfeather.thirdapp.bean.Mediafile
-import cn.flightfeather.thirdapp.bean.Scense
-import cn.flightfeather.thirdapp.bean.Subtask
+import cn.flightfeather.thirdapp.bean.entity.Mediafile
+import cn.flightfeather.thirdapp.bean.entity.Scense
+import cn.flightfeather.thirdapp.bean.entity.Subtask
import cn.flightfeather.thirdapp.bean.vo.ProblemlistVo
import cn.flightfeather.thirdapp.model.event.InspectionEvent
import cn.flightfeather.thirdapp.model.event.ProblemEvent
@@ -136,6 +135,8 @@
ll_show_hide_detail.setOnClickListener(this)
iv_patrol_back.setOnClickListener(this)
ll_patrol_task_detail.visibility = View.GONE
+
+ user_account.setOnClickListener(this)
hideMenu()
@@ -378,7 +379,8 @@
//娣诲姞 鐢ㄦ埛绫诲瀷涓衡�滀富绠￠儴闂ㄢ�濇垨鈥滅鐞嗗憳鈥濓紝缂栧彿涓�2鎴�0鏃讹紝鎸夐挳iv_startEndTask娌℃湁鐐瑰嚮浜嬩欢
if (viewModel.userTypeId != Domain.USER_COMPTENT.toByte()
- && viewModel.userTypeId != Domain.USER_ADMIN.toByte()) {
+// && viewModel.userTypeId != Domain.USER_ADMIN.toByte()
+ ) {
iv_start_end_task.setOnClickListener(this)
} else {
iv_start_end_task.alpha = 0.5f
@@ -625,7 +627,7 @@
val l1 = LatLng(lat, lng)
val l2 = LatLng(last[1], last[0])
val distance = AMapUtils.calculateLineDistance(l1, l2)
- if (distance >= 1) {
+ if (distance >= 1 && distance < 1000 && lat != 0.0 && lng != 0.0) {
extension1 = "${extension1};${lng},${lat}"
//閬撹矾鐩戞祴鐐瑰拰閬撹矾绫诲瀷鐨勫満鏅紝鐩存帴灞曠ず杞ㄨ抗锛涘叾浣欏満鏅彧鏈夌鐞嗗憳鍜屾斂搴滈儴闂ㄥ彲浠ユ煡鐪�
if (
@@ -699,6 +701,14 @@
override fun onClick(v: View?) {
when (v?.id) {
+ // 鏌ョ湅鎴栬幏鍙栫敤鎴疯处鎴蜂俊鎭�
+ R.id.user_account -> {
+ val intent = Intent(this, MenuSceneAccountActivity::class.java).apply {
+ putExtra("sceneId", viewModel.scene.value?.guid)
+ putExtra("sceneName", viewModel.scene.value?.name)
+ }
+ startActivity(intent)
+ }
//搴曢儴viewPager闅愯棌
R.id.ll_patrol_hide -> hideMenu()
//搴曢儴viewPager鏄剧ず
--
Gitblit v1.9.3