supervision-android.git

			@@ -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显示