[6.6.0]数据闭环-故障原因、接管原因窗口修改
This commit is contained in:
@@ -20,8 +20,11 @@ import android.view.animation.ScaleAnimation
|
||||
import android.widget.EditText
|
||||
import android.widget.ImageView
|
||||
import android.widget.TextView
|
||||
import android.widget.ToggleButton
|
||||
import androidx.appcompat.widget.AppCompatEditText
|
||||
import androidx.constraintlayout.widget.ConstraintLayout
|
||||
import androidx.constraintlayout.widget.Group
|
||||
import androidx.core.content.ContextCompat
|
||||
import androidx.recyclerview.widget.LinearLayoutManager
|
||||
import androidx.recyclerview.widget.RecyclerView
|
||||
import com.iflytek.cloud.ErrorCode
|
||||
@@ -75,10 +78,8 @@ class FaultReasonWindow constructor(activity: Activity) : View.OnTouchListener{
|
||||
|
||||
private lateinit var tvFaultTitle: TextView
|
||||
private lateinit var tvFaultTime: TextView
|
||||
private lateinit var tvFaultType: TextView
|
||||
private lateinit var ivFaultTypeSelect: ImageView
|
||||
private lateinit var tvFaultReason: TextView
|
||||
private lateinit var ivFaultReasonSelect: ImageView
|
||||
private lateinit var tbFaultType: ToggleButton
|
||||
private lateinit var tbFaultReason: ToggleButton
|
||||
private lateinit var ivTimeReduce: ImageView
|
||||
private lateinit var tvOccurrenceTime: TextView
|
||||
private lateinit var ivTimeAdd: ImageView
|
||||
@@ -121,10 +122,8 @@ class FaultReasonWindow constructor(activity: Activity) : View.OnTouchListener{
|
||||
private fun initView(){
|
||||
tvFaultTitle = mFloatLayout.findViewById(R.id.tvFaultTitle)
|
||||
tvFaultTime = mFloatLayout.findViewById(R.id.tvFaultTime)
|
||||
tvFaultType = mFloatLayout.findViewById(R.id.tvFaultType)
|
||||
ivFaultTypeSelect = mFloatLayout.findViewById(R.id.ivFaultTypeSelect)
|
||||
tvFaultReason = mFloatLayout.findViewById(R.id.tvFaultReason)
|
||||
ivFaultReasonSelect = mFloatLayout.findViewById(R.id.ivFaultReasonSelect)
|
||||
tbFaultType = mFloatLayout.findViewById(R.id.tbFaultType)
|
||||
tbFaultReason = mFloatLayout.findViewById(R.id.tbFaultReason)
|
||||
ivTimeReduce = mFloatLayout.findViewById(R.id.ivTimeReduce)
|
||||
tvOccurrenceTime = mFloatLayout.findViewById(R.id.tvOccurrenceTime)
|
||||
ivTimeAdd = mFloatLayout.findViewById(R.id.ivTimeAdd)
|
||||
@@ -140,19 +139,91 @@ class FaultReasonWindow constructor(activity: Activity) : View.OnTouchListener{
|
||||
rvFaultList.layoutManager = linearLayoutManager
|
||||
orderReasonAdapter = OrderReasonAdapter()
|
||||
orderReasonAdapter.setListener(object: OrderReasonAdapter.ReasonSelectListener{
|
||||
override fun onSelectReason(reason: String) {
|
||||
|
||||
override fun onSelectReason(reason: String, mSource: Int) {
|
||||
if(mSource == 0){
|
||||
//类型
|
||||
tbFaultType.textOn = reason
|
||||
tbFaultType.textOff = reason
|
||||
tbFaultType.performClick()
|
||||
}else{
|
||||
//原因
|
||||
tbFaultReason.textOn = reason
|
||||
tbFaultReason.textOff = reason
|
||||
tbFaultReason.performClick()
|
||||
}
|
||||
}
|
||||
})
|
||||
rvFaultList.adapter = orderReasonAdapter
|
||||
}
|
||||
|
||||
@OptIn(DelicateCoroutinesApi::class)
|
||||
@SuppressLint("SetTextI18n")
|
||||
private fun initEvent(){
|
||||
val iconDown = ContextCompat.getDrawable(mActivity, R.drawable.icon_fault_expand)
|
||||
iconDown?.setBounds(0, 0, iconDown.minimumWidth, iconDown.minimumHeight)
|
||||
val iconUp = ContextCompat.getDrawable(mActivity, R.drawable.icon_fault_retract)
|
||||
iconUp?.setBounds(0, 0, iconUp.minimumWidth, iconUp.minimumHeight)
|
||||
//弹窗展示时间
|
||||
tvFaultTime.text = mActivity.resources.getString(R.string.take_over_time) +
|
||||
millis2String(System.currentTimeMillis(), TimeUtils.getHourMinSecondFormat())
|
||||
//故障类型选择
|
||||
tbFaultType.setOnCheckedChangeListener { buttonView, isChecked ->
|
||||
if (isChecked) {
|
||||
buttonView.setCompoundDrawables(null, null, iconUp, null)
|
||||
//展示列表
|
||||
rvFaultList.visibility = View.VISIBLE
|
||||
(rvFaultList.layoutParams as ConstraintLayout.LayoutParams).topToBottom = R.id.tbFaultType
|
||||
tbFaultReason.visibility = View.INVISIBLE
|
||||
|
||||
val list = ArrayList<String>()
|
||||
list.add("一级分类1")
|
||||
list.add("一级分类2")
|
||||
list.add("一级分类3")
|
||||
list.add("一级分类4")
|
||||
list.add("一级分类5")
|
||||
list.add("一级分类6")
|
||||
list.add("一级分类7")
|
||||
list.add("一级分类8")
|
||||
list.add("一级分类9")
|
||||
list.add("一级分类10")
|
||||
list.add("一级分类11")
|
||||
list.add("一级分类12")
|
||||
list.add("一级分类13")
|
||||
orderReasonAdapter.setData(list,0)
|
||||
} else {
|
||||
buttonView.setCompoundDrawables(null, null, iconDown, null)
|
||||
//隐藏列表
|
||||
rvFaultList.visibility = View.GONE
|
||||
tbFaultReason.visibility = View.VISIBLE
|
||||
}
|
||||
}
|
||||
//故障原因选择
|
||||
tbFaultReason.setOnCheckedChangeListener { buttonView, isChecked ->
|
||||
if (isChecked) {
|
||||
buttonView.setCompoundDrawables(null, null, iconUp, null)
|
||||
//展示列表
|
||||
rvFaultList.visibility = View.VISIBLE
|
||||
(rvFaultList.layoutParams as ConstraintLayout.LayoutParams).topToBottom = R.id.tbFaultReason
|
||||
val list = ArrayList<String>()
|
||||
list.add("二级分类1")
|
||||
list.add("二级分类2")
|
||||
list.add("二级分类3")
|
||||
list.add("二级分类4")
|
||||
list.add("二级分类5")
|
||||
list.add("二级分类6")
|
||||
list.add("二级分类7")
|
||||
list.add("二级分类8")
|
||||
list.add("二级分类9")
|
||||
list.add("二级分类10")
|
||||
list.add("二级分类11")
|
||||
list.add("二级分类12")
|
||||
list.add("二级分类13")
|
||||
orderReasonAdapter.setData(list,1)
|
||||
} else {
|
||||
buttonView.setCompoundDrawables(null, null, iconDown, null)
|
||||
//隐藏列表
|
||||
rvFaultList.visibility = View.GONE
|
||||
}
|
||||
}
|
||||
//发生时间
|
||||
tvOccurrenceTime.text = millis2String(workOrderOccurrenceTime, TimeUtils.getHourMinFormat())
|
||||
ivTimeReduce.setOnClickListener {
|
||||
|
||||
@@ -19,9 +19,12 @@ import android.view.animation.ScaleAnimation
|
||||
import android.widget.EditText
|
||||
import android.widget.ImageView
|
||||
import android.widget.TextView
|
||||
import android.widget.ToggleButton
|
||||
import androidx.appcompat.widget.AppCompatEditText
|
||||
import androidx.appcompat.widget.AppCompatTextView
|
||||
import androidx.constraintlayout.widget.ConstraintLayout
|
||||
import androidx.constraintlayout.widget.Group
|
||||
import androidx.core.content.ContextCompat
|
||||
import androidx.recyclerview.widget.LinearLayoutManager
|
||||
import androidx.recyclerview.widget.RecyclerView
|
||||
import com.iflytek.cloud.ErrorCode
|
||||
@@ -74,10 +77,8 @@ class TakeOverReasonWindow constructor(activity: Activity) : View.OnTouchListene
|
||||
private var clickListener: ClickListener? = null
|
||||
|
||||
private lateinit var tvTakeOverTime: TextView
|
||||
private lateinit var tvTakeOverType: TextView
|
||||
private lateinit var ivTakeOverTypeSelect: ImageView
|
||||
private lateinit var tvTakeOverReason: TextView
|
||||
private lateinit var ivTakeOverReasonSelect: ImageView
|
||||
private lateinit var tbTakeOverType: ToggleButton
|
||||
private lateinit var tbTakeOverReason: ToggleButton
|
||||
private lateinit var etNoteInput: AppCompatEditText
|
||||
private lateinit var ivNoteAudio: ImageView
|
||||
private lateinit var tvTakeOverReport: TextView
|
||||
@@ -116,10 +117,8 @@ class TakeOverReasonWindow constructor(activity: Activity) : View.OnTouchListene
|
||||
|
||||
private fun initView(){
|
||||
tvTakeOverTime = mFloatLayout.findViewById(R.id.tvTakeOverTime)
|
||||
tvTakeOverType = mFloatLayout.findViewById(R.id.tvTakeOverType)
|
||||
ivTakeOverTypeSelect = mFloatLayout.findViewById(R.id.ivTakeOverTypeSelect)
|
||||
tvTakeOverReason = mFloatLayout.findViewById(R.id.tvTakeOverReason)
|
||||
ivTakeOverReasonSelect = mFloatLayout.findViewById(R.id.ivTakeOverReasonSelect)
|
||||
tbTakeOverType = mFloatLayout.findViewById(R.id.tbTakeOverType)
|
||||
tbTakeOverReason = mFloatLayout.findViewById(R.id.tbTakeOverReason)
|
||||
etNoteInput = mFloatLayout.findViewById(R.id.etNoteInput)
|
||||
ivNoteAudio = mFloatLayout.findViewById(R.id.ivNoteAudio)
|
||||
tvTakeOverReport = mFloatLayout.findViewById(R.id.tvTakeOverReport)
|
||||
@@ -132,20 +131,91 @@ class TakeOverReasonWindow constructor(activity: Activity) : View.OnTouchListene
|
||||
rvTakeOverList.layoutManager = linearLayoutManager
|
||||
orderReasonAdapter = OrderReasonAdapter()
|
||||
orderReasonAdapter.setListener(object: OrderReasonAdapter.ReasonSelectListener{
|
||||
override fun onSelectReason(reason: String) {
|
||||
|
||||
override fun onSelectReason(reason: String, mSource: Int) {
|
||||
if(mSource == 0){
|
||||
//类型
|
||||
tbTakeOverType.textOn = reason
|
||||
tbTakeOverType.textOff = reason
|
||||
tbTakeOverType.performClick()
|
||||
}else{
|
||||
//原因
|
||||
tbTakeOverReason.textOn = reason
|
||||
tbTakeOverReason.textOff = reason
|
||||
tbTakeOverReason.performClick()
|
||||
}
|
||||
}
|
||||
})
|
||||
rvTakeOverList.adapter = orderReasonAdapter
|
||||
}
|
||||
|
||||
|
||||
@OptIn(DelicateCoroutinesApi::class)
|
||||
@SuppressLint("SetTextI18n")
|
||||
private fun initEvent(){
|
||||
val iconDown = ContextCompat.getDrawable(mActivity, R.drawable.icon_fault_expand)
|
||||
iconDown?.setBounds(0, 0, iconDown.minimumWidth, iconDown.minimumHeight)
|
||||
val iconUp = ContextCompat.getDrawable(mActivity, R.drawable.icon_fault_retract)
|
||||
iconUp?.setBounds(0, 0, iconUp.minimumWidth, iconUp.minimumHeight)
|
||||
//弹窗展示时间
|
||||
tvTakeOverTime.text = mActivity.resources.getString(R.string.take_over_time) +
|
||||
millis2String(System.currentTimeMillis(), TimeUtils.getHourMinSecondFormat())
|
||||
//接管类型选择
|
||||
tbTakeOverType.setOnCheckedChangeListener { buttonView, isChecked ->
|
||||
if (isChecked) {
|
||||
buttonView.setCompoundDrawables(null, null, iconUp, null)
|
||||
//展示列表
|
||||
rvTakeOverList.visibility = View.VISIBLE
|
||||
(rvTakeOverList.layoutParams as ConstraintLayout.LayoutParams).topToBottom = R.id.tbTakeOverType
|
||||
tbTakeOverReason.visibility = View.INVISIBLE
|
||||
|
||||
val list = ArrayList<String>()
|
||||
list.add("一级分类1")
|
||||
list.add("一级分类2")
|
||||
list.add("一级分类3")
|
||||
list.add("一级分类4")
|
||||
list.add("一级分类5")
|
||||
list.add("一级分类6")
|
||||
list.add("一级分类7")
|
||||
list.add("一级分类8")
|
||||
list.add("一级分类9")
|
||||
list.add("一级分类10")
|
||||
list.add("一级分类11")
|
||||
list.add("一级分类12")
|
||||
list.add("一级分类13")
|
||||
orderReasonAdapter.setData(list,0)
|
||||
} else {
|
||||
buttonView.setCompoundDrawables(null, null, iconDown, null)
|
||||
//隐藏列表
|
||||
rvTakeOverList.visibility = View.GONE
|
||||
tbTakeOverReason.visibility = View.VISIBLE
|
||||
}
|
||||
}
|
||||
//接管原因选择
|
||||
tbTakeOverReason.setOnCheckedChangeListener { buttonView, isChecked ->
|
||||
if (isChecked) {
|
||||
buttonView.setCompoundDrawables(null, null, iconUp, null)
|
||||
//展示列表
|
||||
rvTakeOverList.visibility = View.VISIBLE
|
||||
(rvTakeOverList.layoutParams as ConstraintLayout.LayoutParams).topToBottom = R.id.tbTakeOverReason
|
||||
val list = ArrayList<String>()
|
||||
list.add("二级分类1")
|
||||
list.add("二级分类2")
|
||||
list.add("二级分类3")
|
||||
list.add("二级分类4")
|
||||
list.add("二级分类5")
|
||||
list.add("二级分类6")
|
||||
list.add("二级分类7")
|
||||
list.add("二级分类8")
|
||||
list.add("二级分类9")
|
||||
list.add("二级分类10")
|
||||
list.add("二级分类11")
|
||||
list.add("二级分类12")
|
||||
list.add("二级分类13")
|
||||
orderReasonAdapter.setData(list,1)
|
||||
} else {
|
||||
buttonView.setCompoundDrawables(null, null, iconDown, null)
|
||||
//隐藏列表
|
||||
rvTakeOverList.visibility = View.GONE
|
||||
}
|
||||
}
|
||||
//补充描述
|
||||
etNoteInput.onFocusChangeListener = OnFocusChangeListener { v, hasFocus ->
|
||||
val edit = v as EditText
|
||||
|
||||
@@ -14,9 +14,11 @@ class OrderReasonAdapter: RecyclerView.Adapter<OrderReasonAdapter.ReasonHolder>(
|
||||
|
||||
private var data: List<String> ?= null
|
||||
private var selectListener: ReasonSelectListener ?= null
|
||||
private var mSource: Int = 0 //适配器数据来源,0:类型,1:原因
|
||||
|
||||
fun setData(data: List<String>){
|
||||
fun setData(data: List<String>,source: Int){
|
||||
this.data = data
|
||||
mSource = source
|
||||
notifyDataSetChanged()
|
||||
}
|
||||
|
||||
@@ -31,7 +33,7 @@ class OrderReasonAdapter: RecyclerView.Adapter<OrderReasonAdapter.ReasonHolder>(
|
||||
val reason = it[position]
|
||||
holder.tvReason.text = reason
|
||||
holder.tvReason.setOnClickListener {
|
||||
selectListener?.onSelectReason(reason)
|
||||
selectListener?.onSelectReason(reason,mSource)
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -48,7 +50,7 @@ class OrderReasonAdapter: RecyclerView.Adapter<OrderReasonAdapter.ReasonHolder>(
|
||||
|
||||
interface ReasonSelectListener{
|
||||
//选择原因
|
||||
fun onSelectReason(reason: String)
|
||||
fun onSelectReason(reason: String,mSource: Int)
|
||||
}
|
||||
|
||||
}
|
||||
@@ -3,10 +3,10 @@
|
||||
<item>
|
||||
<shape>
|
||||
<!-- 边框颜色 -->
|
||||
<solid android:color="#00FF00"/>
|
||||
<solid android:color="#8996C7"/>
|
||||
<corners
|
||||
android:bottomLeftRadius="32dp"
|
||||
android:bottomRightRadius="@dimen/dp_32"
|
||||
android:bottomLeftRadius="@dimen/dp_8"
|
||||
android:bottomRightRadius="@dimen/dp_8"
|
||||
android:topLeftRadius="@dimen/dp_0"
|
||||
android:topRightRadius="@dimen/dp_0"
|
||||
/>
|
||||
@@ -14,13 +14,16 @@
|
||||
|
||||
</item>
|
||||
<!-- 给View的上 左 右设置8dp的边框 -->
|
||||
<item android:bottom="8dp" android:left="8dp" android:right="8dp" >
|
||||
<item
|
||||
android:bottom="@dimen/dp_1"
|
||||
android:left="@dimen/dp_1"
|
||||
android:right="@dimen/dp_1" >
|
||||
<shape>
|
||||
<!-- View填充颜色 -->
|
||||
<solid android:color="#F2161927" />
|
||||
<corners
|
||||
android:bottomLeftRadius="32dp"
|
||||
android:bottomRightRadius="@dimen/dp_32"
|
||||
android:bottomLeftRadius="@dimen/dp_8"
|
||||
android:bottomRightRadius="@dimen/dp_8"
|
||||
android:topLeftRadius="@dimen/dp_0"
|
||||
android:topRightRadius="@dimen/dp_0"
|
||||
/>
|
||||
|
||||
@@ -65,8 +65,8 @@
|
||||
android:layout_marginStart="@dimen/dp_14"
|
||||
/>
|
||||
|
||||
<View
|
||||
android:id="@+id/viewFaultType"
|
||||
<ToggleButton
|
||||
android:id="@+id/tbFaultType"
|
||||
android:layout_width="@dimen/dp_781"
|
||||
android:layout_height="@dimen/dp_70"
|
||||
app:layout_constraintLeft_toLeftOf="parent"
|
||||
@@ -74,30 +74,15 @@
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
android:layout_marginTop="@dimen/dp_203"
|
||||
android:background="@drawable/bg_fault_type"
|
||||
/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tvFaultType"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
app:layout_constraintTop_toTopOf="@id/viewFaultType"
|
||||
app:layout_constraintBottom_toBottomOf="@id/viewFaultType"
|
||||
app:layout_constraintLeft_toLeftOf="@id/viewFaultType"
|
||||
android:layout_marginLeft="@dimen/dp_21"
|
||||
android:drawableEnd="@drawable/icon_fault_expand"
|
||||
android:textOff=""
|
||||
android:textOn=""
|
||||
android:gravity="start|center_vertical"
|
||||
android:elevation="@dimen/dp_10"
|
||||
android:textSize="@dimen/sp_30"
|
||||
android:textColor="@color/white"
|
||||
/>
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/ivFaultTypeSelect"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
app:layout_constraintTop_toTopOf="@id/viewFaultType"
|
||||
app:layout_constraintBottom_toBottomOf="@id/viewFaultType"
|
||||
app:layout_constraintRight_toRightOf="@id/viewFaultType"
|
||||
android:src="@drawable/icon_fault_expand"
|
||||
android:layout_marginRight="@dimen/dp_21"
|
||||
android:contentDescription="@string/fault_type_select"
|
||||
android:paddingStart="@dimen/dp_21"
|
||||
android:paddingEnd="@dimen/dp_21"
|
||||
/>
|
||||
|
||||
<View
|
||||
@@ -105,7 +90,7 @@
|
||||
android:layout_width="@dimen/dp_6"
|
||||
android:layout_height="@dimen/dp_29"
|
||||
android:background="#FF0176FF"
|
||||
app:layout_constraintTop_toBottomOf="@id/viewFaultType"
|
||||
app:layout_constraintTop_toBottomOf="@id/tbFaultType"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
android:layout_marginStart="@dimen/dp_32"
|
||||
android:layout_marginTop="@dimen/dp_48"
|
||||
@@ -125,8 +110,8 @@
|
||||
android:layout_marginStart="@dimen/dp_14"
|
||||
/>
|
||||
|
||||
<View
|
||||
android:id="@+id/viewFaultReason"
|
||||
<ToggleButton
|
||||
android:id="@+id/tbFaultReason"
|
||||
android:layout_width="@dimen/dp_781"
|
||||
android:layout_height="@dimen/dp_70"
|
||||
app:layout_constraintLeft_toLeftOf="parent"
|
||||
@@ -134,30 +119,15 @@
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
android:layout_marginTop="@dimen/dp_374"
|
||||
android:background="@drawable/bg_fault_type"
|
||||
/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tvFaultReason"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
app:layout_constraintTop_toTopOf="@id/viewFaultReason"
|
||||
app:layout_constraintBottom_toBottomOf="@id/viewFaultReason"
|
||||
app:layout_constraintLeft_toLeftOf="@id/viewFaultReason"
|
||||
android:layout_marginLeft="@dimen/dp_21"
|
||||
android:drawableEnd="@drawable/icon_fault_expand"
|
||||
android:textOff=""
|
||||
android:textOn=""
|
||||
android:gravity="start|center_vertical"
|
||||
android:elevation="@dimen/dp_10"
|
||||
android:textSize="@dimen/sp_30"
|
||||
android:textColor="@color/white"
|
||||
/>
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/ivFaultReasonSelect"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
app:layout_constraintTop_toTopOf="@id/viewFaultReason"
|
||||
app:layout_constraintBottom_toBottomOf="@id/viewFaultReason"
|
||||
app:layout_constraintRight_toRightOf="@id/viewFaultReason"
|
||||
android:src="@drawable/icon_fault_expand"
|
||||
android:layout_marginRight="@dimen/dp_21"
|
||||
android:contentDescription="@string/fault_type_select"
|
||||
android:paddingStart="@dimen/dp_21"
|
||||
android:paddingEnd="@dimen/dp_21"
|
||||
/>
|
||||
|
||||
<View
|
||||
@@ -165,7 +135,7 @@
|
||||
android:layout_width="@dimen/dp_6"
|
||||
android:layout_height="@dimen/dp_29"
|
||||
android:background="#FF0176FF"
|
||||
app:layout_constraintTop_toBottomOf="@id/viewFaultReason"
|
||||
app:layout_constraintTop_toBottomOf="@id/tbFaultReason"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
android:layout_marginStart="@dimen/dp_32"
|
||||
android:layout_marginTop="@dimen/dp_48"
|
||||
@@ -325,12 +295,15 @@
|
||||
android:id="@+id/rvFaultList"
|
||||
android:layout_width="@dimen/dp_0"
|
||||
android:layout_height="@dimen/dp_0"
|
||||
app:layout_constraintLeft_toLeftOf="@id/viewFaultType"
|
||||
app:layout_constraintRight_toRightOf="@id/viewFaultType"
|
||||
app:layout_constraintTop_toBottomOf="@id/viewFaultType"
|
||||
app:layout_constraintLeft_toLeftOf="@id/tbFaultType"
|
||||
app:layout_constraintRight_toRightOf="@id/tbFaultType"
|
||||
app:layout_constraintTop_toBottomOf="@id/tbFaultType"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
android:layout_marginBottom="@dimen/dp_39"
|
||||
android:background="@drawable/bg_reason_list"
|
||||
android:visibility="gone"
|
||||
android:layout_marginTop="@dimen/dp_m_5"
|
||||
android:paddingTop="@dimen/dp_5"
|
||||
/>
|
||||
|
||||
<androidx.appcompat.widget.AppCompatTextView
|
||||
@@ -353,11 +326,11 @@
|
||||
android:id="@+id/faultReasonGroup"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
app:constraint_referenced_ids="viewFaultTypeLabel,tvTypeTitle,viewFaultType,tvFaultType,ivFaultTypeSelect,
|
||||
viewFaultReasonLabel,tvFaultReasonTitle,viewFaultReason,tvFaultReason,ivFaultReasonSelect,
|
||||
viewFaultTimeLabel,tvFaultTimeTitle,ivTimeReduce,tvOccurrenceTime,ivTimeAdd,
|
||||
viewFaultNoteLabel,tvFaultNoteTitle,tvFaultNoteSupplement,etNoteInput,ivNoteAudio,
|
||||
tvFaultReport,tvFaultCancel,rvFaultList"
|
||||
app:constraint_referenced_ids="viewFaultTypeLabel,tvTypeTitle,tbFaultType,
|
||||
viewFaultReasonLabel,tvFaultReasonTitle,tbFaultReason,viewFaultTimeLabel,
|
||||
tvFaultTimeTitle,ivTimeReduce,tvOccurrenceTime,ivTimeAdd,
|
||||
viewFaultNoteLabel,tvFaultNoteTitle,tvFaultNoteSupplement,
|
||||
etNoteInput,ivNoteAudio,tvFaultReport,tvFaultCancel"
|
||||
/>
|
||||
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
@@ -65,8 +65,8 @@
|
||||
android:layout_marginStart="@dimen/dp_14"
|
||||
/>
|
||||
|
||||
<View
|
||||
android:id="@+id/viewTakeOverType"
|
||||
<ToggleButton
|
||||
android:id="@+id/tbTakeOverType"
|
||||
android:layout_width="@dimen/dp_781"
|
||||
android:layout_height="@dimen/dp_70"
|
||||
app:layout_constraintLeft_toLeftOf="parent"
|
||||
@@ -74,30 +74,15 @@
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
android:layout_marginTop="@dimen/dp_203"
|
||||
android:background="@drawable/bg_fault_type"
|
||||
/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tvTakeOverType"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
app:layout_constraintTop_toTopOf="@id/viewTakeOverType"
|
||||
app:layout_constraintBottom_toBottomOf="@id/viewTakeOverType"
|
||||
app:layout_constraintLeft_toLeftOf="@id/viewTakeOverType"
|
||||
android:layout_marginLeft="@dimen/dp_21"
|
||||
android:drawableEnd="@drawable/icon_fault_expand"
|
||||
android:textOff=""
|
||||
android:textOn=""
|
||||
android:gravity="start|center_vertical"
|
||||
android:textSize="@dimen/sp_30"
|
||||
android:textColor="@color/white"
|
||||
/>
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/ivTakeOverTypeSelect"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
app:layout_constraintTop_toTopOf="@id/viewTakeOverType"
|
||||
app:layout_constraintBottom_toBottomOf="@id/viewTakeOverType"
|
||||
app:layout_constraintRight_toRightOf="@id/viewTakeOverType"
|
||||
android:src="@drawable/icon_fault_expand"
|
||||
android:layout_marginRight="@dimen/dp_21"
|
||||
android:contentDescription="@string/take_over_type_select"
|
||||
android:elevation="@dimen/dp_10"
|
||||
android:paddingStart="@dimen/dp_21"
|
||||
android:paddingEnd="@dimen/dp_21"
|
||||
/>
|
||||
|
||||
<View
|
||||
@@ -105,7 +90,7 @@
|
||||
android:layout_width="@dimen/dp_6"
|
||||
android:layout_height="@dimen/dp_29"
|
||||
android:background="#FF0176FF"
|
||||
app:layout_constraintTop_toBottomOf="@id/viewTakeOverType"
|
||||
app:layout_constraintTop_toBottomOf="@id/tbTakeOverType"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
android:layout_marginStart="@dimen/dp_32"
|
||||
android:layout_marginTop="@dimen/dp_48"
|
||||
@@ -125,8 +110,8 @@
|
||||
android:layout_marginStart="@dimen/dp_14"
|
||||
/>
|
||||
|
||||
<View
|
||||
android:id="@+id/viewTakeOverReason"
|
||||
<ToggleButton
|
||||
android:id="@+id/tbTakeOverReason"
|
||||
android:layout_width="@dimen/dp_781"
|
||||
android:layout_height="@dimen/dp_70"
|
||||
app:layout_constraintLeft_toLeftOf="parent"
|
||||
@@ -134,38 +119,24 @@
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
android:layout_marginTop="@dimen/dp_374"
|
||||
android:background="@drawable/bg_fault_type"
|
||||
/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tvTakeOverReason"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
app:layout_constraintTop_toTopOf="@id/viewTakeOverReason"
|
||||
app:layout_constraintBottom_toBottomOf="@id/viewTakeOverReason"
|
||||
app:layout_constraintLeft_toLeftOf="@id/viewTakeOverReason"
|
||||
android:layout_marginLeft="@dimen/dp_21"
|
||||
android:drawableEnd="@drawable/icon_fault_expand"
|
||||
android:textOff=""
|
||||
android:textOn=""
|
||||
android:gravity="start|center_vertical"
|
||||
android:elevation="@dimen/dp_10"
|
||||
android:textSize="@dimen/sp_30"
|
||||
android:textColor="@color/white"
|
||||
android:paddingStart="@dimen/dp_21"
|
||||
android:paddingEnd="@dimen/dp_21"
|
||||
/>
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/ivTakeOverReasonSelect"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
app:layout_constraintTop_toTopOf="@id/viewTakeOverReason"
|
||||
app:layout_constraintBottom_toBottomOf="@id/viewTakeOverReason"
|
||||
app:layout_constraintRight_toRightOf="@id/viewTakeOverReason"
|
||||
android:src="@drawable/icon_fault_expand"
|
||||
android:layout_marginRight="@dimen/dp_21"
|
||||
android:contentDescription="@string/fault_type_select"
|
||||
/>
|
||||
|
||||
<View
|
||||
android:id="@+id/viewTakeOverNoteLabel"
|
||||
android:layout_width="@dimen/dp_6"
|
||||
android:layout_height="@dimen/dp_29"
|
||||
android:background="#FF0176FF"
|
||||
app:layout_constraintTop_toBottomOf="@id/viewTakeOverReason"
|
||||
app:layout_constraintTop_toBottomOf="@id/tbTakeOverReason"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
android:layout_marginStart="@dimen/dp_32"
|
||||
android:layout_marginTop="@dimen/dp_47"
|
||||
@@ -265,13 +236,15 @@
|
||||
android:id="@+id/rvTakeOverList"
|
||||
android:layout_width="@dimen/dp_0"
|
||||
android:layout_height="@dimen/dp_0"
|
||||
app:layout_constraintLeft_toLeftOf="@id/viewTakeOverType"
|
||||
app:layout_constraintRight_toRightOf="@id/viewTakeOverType"
|
||||
app:layout_constraintTop_toBottomOf="@id/viewTakeOverType"
|
||||
app:layout_constraintLeft_toLeftOf="@id/tbTakeOverType"
|
||||
app:layout_constraintRight_toRightOf="@id/tbTakeOverType"
|
||||
app:layout_constraintTop_toBottomOf="@id/tbTakeOverType"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
android:layout_marginBottom="@dimen/dp_39"
|
||||
android:background="@drawable/bg_reason_list"
|
||||
android:visibility="gone"
|
||||
android:layout_marginTop="@dimen/dp_m_5"
|
||||
android:paddingTop="@dimen/dp_5"
|
||||
/>
|
||||
|
||||
<androidx.appcompat.widget.AppCompatTextView
|
||||
@@ -294,10 +267,10 @@
|
||||
android:id="@+id/takeOverReasonGroup"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
app:constraint_referenced_ids="viewTakeOverTypeLabel,tvTypeTitle,viewTakeOverType,
|
||||
tvTakeOverType,ivTakeOverTypeSelect,viewTakeOverReasonLabel,tvTakeOverReasonTitle,
|
||||
viewTakeOverReason,tvTakeOverReason,ivTakeOverReasonSelect,viewTakeOverNoteLabel,
|
||||
tvTakeOverNoteTitle,tvTakeOverNoteSupplement,etNoteInput,ivNoteAudio,
|
||||
app:constraint_referenced_ids="viewTakeOverTypeLabel,tvTypeTitle,
|
||||
tbTakeOverType,viewTakeOverReasonLabel,tvTakeOverReasonTitle,
|
||||
tbTakeOverReason,viewTakeOverNoteLabel,tvTakeOverNoteTitle,
|
||||
tvTakeOverNoteSupplement,etNoteInput,ivNoteAudio,
|
||||
tvTakeOverReport,tvTakeOverCancel"
|
||||
/>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user