diff --git a/app/src/main/java/com/casic/app/smartwell/sanxi/extensions/String.kt b/app/src/main/java/com/casic/app/smartwell/sanxi/extensions/String.kt index 82995f2..28f2273 100644 --- a/app/src/main/java/com/casic/app/smartwell/sanxi/extensions/String.kt +++ b/app/src/main/java/com/casic/app/smartwell/sanxi/extensions/String.kt @@ -26,8 +26,6 @@ /** * String扩展方法 */ - -//将Toast扩展到String,任何线程都可以显示 fun String.show() { val context = BaseApplication.obtainInstance() val toast = Toast(context) diff --git a/app/src/main/java/com/casic/app/smartwell/sanxi/extensions/String.kt b/app/src/main/java/com/casic/app/smartwell/sanxi/extensions/String.kt index 82995f2..28f2273 100644 --- a/app/src/main/java/com/casic/app/smartwell/sanxi/extensions/String.kt +++ b/app/src/main/java/com/casic/app/smartwell/sanxi/extensions/String.kt @@ -26,8 +26,6 @@ /** * String扩展方法 */ - -//将Toast扩展到String,任何线程都可以显示 fun String.show() { val context = BaseApplication.obtainInstance() val toast = Toast(context) diff --git a/app/src/main/java/com/casic/app/smartwell/sanxi/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/sanxi/fragment/HomePageFragment.kt index 12cdd2d..94443b4 100644 --- a/app/src/main/java/com/casic/app/smartwell/sanxi/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/sanxi/fragment/HomePageFragment.kt @@ -186,11 +186,6 @@ ChartViewHelper.setPieChartData(devicePieChart, pieEntries) }) - //获取当前报警数据 - alarmViewModel.alarmCountModel.observe(viewLifecycleOwner, { - homeView.currentAlarmView.text = it.toString() - }) - //获取当前未完工单数据 workOrderViewModel.orderCountModel.observe(viewLifecycleOwner, { val beforeGet = it["beforeGet"]!! @@ -200,6 +195,11 @@ homeView.unCompleteOrderView.text = (beforeGet + beforeConfirm + inHandle).toString() }) + //获取当前报警数据 + alarmViewModel.alarmCountModel.observe(viewLifecycleOwner, { + homeView.currentAlarmView.text = it.toString() + }) + //获取闸井类别 wellViewModel.obtainWellType() wellViewModel.wellTypeModel.observe(viewLifecycleOwner, { @@ -316,6 +316,23 @@ ) } }) + + // 事件处理 + homeView.wellDataLayout.setOnClickListener { + + } + + homeView.deviceDataLayout.setOnClickListener { + + } + + homeView.orderDataLayout.setOnClickListener { + + } + + homeView.alarmDataLayout.setOnClickListener { + + } return homeView } @@ -450,9 +467,6 @@ ownerShipView.text = String.format("权属单位: ${well.deptid.toDeptName()}") val temp = String.format("详细位置: ${well.position}") - /** - * 20是xml里面设置的window的内边距 - * */ val textPaint = ownerShipView.paint if (textPaint.measureText(temp) <= availableWidth) { //如果整行宽度在控件可用宽度之内,就不处理了 diff --git a/app/src/main/java/com/casic/app/smartwell/sanxi/extensions/String.kt b/app/src/main/java/com/casic/app/smartwell/sanxi/extensions/String.kt index 82995f2..28f2273 100644 --- a/app/src/main/java/com/casic/app/smartwell/sanxi/extensions/String.kt +++ b/app/src/main/java/com/casic/app/smartwell/sanxi/extensions/String.kt @@ -26,8 +26,6 @@ /** * String扩展方法 */ - -//将Toast扩展到String,任何线程都可以显示 fun String.show() { val context = BaseApplication.obtainInstance() val toast = Toast(context) diff --git a/app/src/main/java/com/casic/app/smartwell/sanxi/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/sanxi/fragment/HomePageFragment.kt index 12cdd2d..94443b4 100644 --- a/app/src/main/java/com/casic/app/smartwell/sanxi/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/sanxi/fragment/HomePageFragment.kt @@ -186,11 +186,6 @@ ChartViewHelper.setPieChartData(devicePieChart, pieEntries) }) - //获取当前报警数据 - alarmViewModel.alarmCountModel.observe(viewLifecycleOwner, { - homeView.currentAlarmView.text = it.toString() - }) - //获取当前未完工单数据 workOrderViewModel.orderCountModel.observe(viewLifecycleOwner, { val beforeGet = it["beforeGet"]!! @@ -200,6 +195,11 @@ homeView.unCompleteOrderView.text = (beforeGet + beforeConfirm + inHandle).toString() }) + //获取当前报警数据 + alarmViewModel.alarmCountModel.observe(viewLifecycleOwner, { + homeView.currentAlarmView.text = it.toString() + }) + //获取闸井类别 wellViewModel.obtainWellType() wellViewModel.wellTypeModel.observe(viewLifecycleOwner, { @@ -316,6 +316,23 @@ ) } }) + + // 事件处理 + homeView.wellDataLayout.setOnClickListener { + + } + + homeView.deviceDataLayout.setOnClickListener { + + } + + homeView.orderDataLayout.setOnClickListener { + + } + + homeView.alarmDataLayout.setOnClickListener { + + } return homeView } @@ -450,9 +467,6 @@ ownerShipView.text = String.format("权属单位: ${well.deptid.toDeptName()}") val temp = String.format("详细位置: ${well.position}") - /** - * 20是xml里面设置的window的内边距 - * */ val textPaint = ownerShipView.paint if (textPaint.measureText(temp) <= availableWidth) { //如果整行宽度在控件可用宽度之内,就不处理了 diff --git a/app/src/main/res/layout/include_home_data_overview.xml b/app/src/main/res/layout/include_home_data_overview.xml index ce21397..7187c8c 100644 --- a/app/src/main/res/layout/include_home_data_overview.xml +++ b/app/src/main/res/layout/include_home_data_overview.xml @@ -23,7 +23,9 @@ android:layout_height="match_parent" android:orientation="horizontal"> - + - + - - - - - - - - + + + + + + + + \ No newline at end of file