diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt index 007f630..750a52c 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt @@ -37,7 +37,12 @@ rowsBean.data.toString() } holder.watchDataView.text = "${rowsBean.watchType}：$value" - holder.installDateView.text = String.format("安装时间：${rowsBean.installDate}") + val date = if (rowsBean.installDate.contains(".")) { + rowsBean.installDate.split(".")[0] + } else { + rowsBean.installDate + } + holder.installDateView.text = String.format("安装时间：$date") val time = rowsBean.logtime.toString() if (time.isBlank()) { holder.logTimeView.text = "最新数据上报时间：未知" diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt index 007f630..750a52c 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt @@ -37,7 +37,12 @@ rowsBean.data.toString() } holder.watchDataView.text = "${rowsBean.watchType}：$value" - holder.installDateView.text = String.format("安装时间：${rowsBean.installDate}") + val date = if (rowsBean.installDate.contains(".")) { + rowsBean.installDate.split(".")[0] + } else { + rowsBean.installDate + } + holder.installDateView.text = String.format("安装时间：$date") val time = rowsBean.logtime.toString() if (time.isBlank()) { holder.logTimeView.text = "最新数据上报时间：未知" diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt index 9e6d234..816d63c 100644 --- a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt +++ b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt @@ -78,7 +78,8 @@ "7" -> "路灯井" "8" -> "通信井" "9" -> "监控井" - "10" -> "其他" + "10" -> "给水井" + "11" -> "其他" else -> { "未知类型" } diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt index 007f630..750a52c 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt @@ -37,7 +37,12 @@ rowsBean.data.toString() } holder.watchDataView.text = "${rowsBean.watchType}：$value" - holder.installDateView.text = String.format("安装时间：${rowsBean.installDate}") + val date = if (rowsBean.installDate.contains(".")) { + rowsBean.installDate.split(".")[0] + } else { + rowsBean.installDate + } + holder.installDateView.text = String.format("安装时间：$date") val time = rowsBean.logtime.toString() if (time.isBlank()) { holder.logTimeView.text = "最新数据上报时间：未知" diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt index 9e6d234..816d63c 100644 --- a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt +++ b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt @@ -78,7 +78,8 @@ "7" -> "路灯井" "8" -> "通信井" "9" -> "监控井" - "10" -> "其他" + "10" -> "给水井" + "11" -> "其他" else -> { "未知类型" } diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt index 713d6d0..84386be 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt @@ -90,22 +90,10 @@ easyPopupWindow.showAsDropDown(homeView.rightOptionView, x, 0) } - //代码设置底部拉升距离 - val bottomSheetBehavior = BottomSheetBehavior.from(homeView.bottomBehaviorLayout) - homeView.coordinatorLayout.post { - bottomSheetBehavior.isFitToContents = false - bottomSheetBehavior.halfExpandedRatio = 0.23f - bottomSheetBehavior.isHideable = false - bottomSheetBehavior.peekHeight = 30f.dp2px(requireContext()) - bottomSheetBehavior.setExpandedOffset( - (requireContext().obtainScreenHeight() * 0.3).toInt() - ) - } - //初始化vm - wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java) + wellViewModel = ViewModelProvider(this)[WellViewModel::class.java] + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + wellListViewModel = ViewModelProvider(this)[WellListViewModel::class.java] //获取所有窨井数据 httpCountDownTimer.start() diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt index 007f630..750a52c 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt @@ -37,7 +37,12 @@ rowsBean.data.toString() } holder.watchDataView.text = "${rowsBean.watchType}：$value" - holder.installDateView.text = String.format("安装时间：${rowsBean.installDate}") + val date = if (rowsBean.installDate.contains(".")) { + rowsBean.installDate.split(".")[0] + } else { + rowsBean.installDate + } + holder.installDateView.text = String.format("安装时间：$date") val time = rowsBean.logtime.toString() if (time.isBlank()) { holder.logTimeView.text = "最新数据上报时间：未知" diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt index 9e6d234..816d63c 100644 --- a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt +++ b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt @@ -78,7 +78,8 @@ "7" -> "路灯井" "8" -> "通信井" "9" -> "监控井" - "10" -> "其他" + "10" -> "给水井" + "11" -> "其他" else -> { "未知类型" } diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt index 713d6d0..84386be 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt @@ -90,22 +90,10 @@ easyPopupWindow.showAsDropDown(homeView.rightOptionView, x, 0) } - //代码设置底部拉升距离 - val bottomSheetBehavior = BottomSheetBehavior.from(homeView.bottomBehaviorLayout) - homeView.coordinatorLayout.post { - bottomSheetBehavior.isFitToContents = false - bottomSheetBehavior.halfExpandedRatio = 0.23f - bottomSheetBehavior.isHideable = false - bottomSheetBehavior.peekHeight = 30f.dp2px(requireContext()) - bottomSheetBehavior.setExpandedOffset( - (requireContext().obtainScreenHeight() * 0.3).toInt() - ) - } - //初始化vm - wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java) + wellViewModel = ViewModelProvider(this)[WellViewModel::class.java] + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + wellListViewModel = ViewModelProvider(this)[WellListViewModel::class.java] //获取所有窨井数据 httpCountDownTimer.start() diff --git a/app/src/main/res/layout/activity_about_us.xml b/app/src/main/res/layout/activity_about_us.xml index 0fa2dab..2588055 100644 --- a/app/src/main/res/layout/activity_about_us.xml +++ b/app/src/main/res/layout/activity_about_us.xml @@ -28,7 +28,7 @@ android:fontFamily="sans-serif-black" android:gravity="center" android:paddingVertical="@dimen/dp_20" - android:text="智能窨井管理助手" + android:text="@string/app_name" android:textColor="@color/mainTextColor" android:textSize="@dimen/sp_16" /> diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt index 007f630..750a52c 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt @@ -37,7 +37,12 @@ rowsBean.data.toString() } holder.watchDataView.text = "${rowsBean.watchType}：$value" - holder.installDateView.text = String.format("安装时间：${rowsBean.installDate}") + val date = if (rowsBean.installDate.contains(".")) { + rowsBean.installDate.split(".")[0] + } else { + rowsBean.installDate + } + holder.installDateView.text = String.format("安装时间：$date") val time = rowsBean.logtime.toString() if (time.isBlank()) { holder.logTimeView.text = "最新数据上报时间：未知" diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt index 9e6d234..816d63c 100644 --- a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt +++ b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt @@ -78,7 +78,8 @@ "7" -> "路灯井" "8" -> "通信井" "9" -> "监控井" - "10" -> "其他" + "10" -> "给水井" + "11" -> "其他" else -> { "未知类型" } diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt index 713d6d0..84386be 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt @@ -90,22 +90,10 @@ easyPopupWindow.showAsDropDown(homeView.rightOptionView, x, 0) } - //代码设置底部拉升距离 - val bottomSheetBehavior = BottomSheetBehavior.from(homeView.bottomBehaviorLayout) - homeView.coordinatorLayout.post { - bottomSheetBehavior.isFitToContents = false - bottomSheetBehavior.halfExpandedRatio = 0.23f - bottomSheetBehavior.isHideable = false - bottomSheetBehavior.peekHeight = 30f.dp2px(requireContext()) - bottomSheetBehavior.setExpandedOffset( - (requireContext().obtainScreenHeight() * 0.3).toInt() - ) - } - //初始化vm - wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java) + wellViewModel = ViewModelProvider(this)[WellViewModel::class.java] + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + wellListViewModel = ViewModelProvider(this)[WellListViewModel::class.java] //获取所有窨井数据 httpCountDownTimer.start() diff --git a/app/src/main/res/layout/activity_about_us.xml b/app/src/main/res/layout/activity_about_us.xml index 0fa2dab..2588055 100644 --- a/app/src/main/res/layout/activity_about_us.xml +++ b/app/src/main/res/layout/activity_about_us.xml @@ -28,7 +28,7 @@ android:fontFamily="sans-serif-black" android:gravity="center" android:paddingVertical="@dimen/dp_20" - android:text="智能窨井管理助手" + android:text="@string/app_name" android:textColor="@color/mainTextColor" android:textSize="@dimen/sp_16" /> diff --git a/app/src/main/res/layout/activity_well_detail.xml b/app/src/main/res/layout/activity_well_detail.xml index 59c2bb4..a7b6189 100644 --- a/app/src/main/res/layout/activity_well_detail.xml +++ b/app/src/main/res/layout/activity_well_detail.xml @@ -29,6 +29,7 @@ @@ -36,6 +37,8 @@ android:id="@+id/wellCodeView" style="@style/textViewStyle" android:layout_alignParentEnd="true" + android:layout_toEndOf="@id/wellCodeTagView" + android:gravity="end|center_vertical" android:text="@string/unknown" android:textColor="@color/subTextColor" /> @@ -45,6 +48,7 @@ @@ -52,6 +56,8 @@ android:id="@+id/wellNameView" style="@style/textViewStyle" android:layout_alignParentEnd="true" + android:layout_toEndOf="@id/wellNameTagView" + android:gravity="end|center_vertical" android:text="@string/unknown" android:textColor="@color/subTextColor" /> diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt index 007f630..750a52c 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt @@ -37,7 +37,12 @@ rowsBean.data.toString() } holder.watchDataView.text = "${rowsBean.watchType}：$value" - holder.installDateView.text = String.format("安装时间：${rowsBean.installDate}") + val date = if (rowsBean.installDate.contains(".")) { + rowsBean.installDate.split(".")[0] + } else { + rowsBean.installDate + } + holder.installDateView.text = String.format("安装时间：$date") val time = rowsBean.logtime.toString() if (time.isBlank()) { holder.logTimeView.text = "最新数据上报时间：未知" diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt index 9e6d234..816d63c 100644 --- a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt +++ b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt @@ -78,7 +78,8 @@ "7" -> "路灯井" "8" -> "通信井" "9" -> "监控井" - "10" -> "其他" + "10" -> "给水井" + "11" -> "其他" else -> { "未知类型" } diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt index 713d6d0..84386be 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt @@ -90,22 +90,10 @@ easyPopupWindow.showAsDropDown(homeView.rightOptionView, x, 0) } - //代码设置底部拉升距离 - val bottomSheetBehavior = BottomSheetBehavior.from(homeView.bottomBehaviorLayout) - homeView.coordinatorLayout.post { - bottomSheetBehavior.isFitToContents = false - bottomSheetBehavior.halfExpandedRatio = 0.23f - bottomSheetBehavior.isHideable = false - bottomSheetBehavior.peekHeight = 30f.dp2px(requireContext()) - bottomSheetBehavior.setExpandedOffset( - (requireContext().obtainScreenHeight() * 0.3).toInt() - ) - } - //初始化vm - wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java) + wellViewModel = ViewModelProvider(this)[WellViewModel::class.java] + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + wellListViewModel = ViewModelProvider(this)[WellListViewModel::class.java] //获取所有窨井数据 httpCountDownTimer.start() diff --git a/app/src/main/res/layout/activity_about_us.xml b/app/src/main/res/layout/activity_about_us.xml index 0fa2dab..2588055 100644 --- a/app/src/main/res/layout/activity_about_us.xml +++ b/app/src/main/res/layout/activity_about_us.xml @@ -28,7 +28,7 @@ android:fontFamily="sans-serif-black" android:gravity="center" android:paddingVertical="@dimen/dp_20" - android:text="智能窨井管理助手" + android:text="@string/app_name" android:textColor="@color/mainTextColor" android:textSize="@dimen/sp_16" /> diff --git a/app/src/main/res/layout/activity_well_detail.xml b/app/src/main/res/layout/activity_well_detail.xml index 59c2bb4..a7b6189 100644 --- a/app/src/main/res/layout/activity_well_detail.xml +++ b/app/src/main/res/layout/activity_well_detail.xml @@ -29,6 +29,7 @@ @@ -36,6 +37,8 @@ android:id="@+id/wellCodeView" style="@style/textViewStyle" android:layout_alignParentEnd="true" + android:layout_toEndOf="@id/wellCodeTagView" + android:gravity="end|center_vertical" android:text="@string/unknown" android:textColor="@color/subTextColor" /> @@ -45,6 +48,7 @@ @@ -52,6 +56,8 @@ android:id="@+id/wellNameView" style="@style/textViewStyle" android:layout_alignParentEnd="true" + android:layout_toEndOf="@id/wellNameTagView" + android:gravity="end|center_vertical" android:text="@string/unknown" android:textColor="@color/subTextColor" /> diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index 30e607e..3225bd6 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -41,11 +41,14 @@ android:layout_height="match_parent" /> diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt index 007f630..750a52c 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/SensorListAdapter.kt @@ -37,7 +37,12 @@ rowsBean.data.toString() } holder.watchDataView.text = "${rowsBean.watchType}：$value" - holder.installDateView.text = String.format("安装时间：${rowsBean.installDate}") + val date = if (rowsBean.installDate.contains(".")) { + rowsBean.installDate.split(".")[0] + } else { + rowsBean.installDate + } + holder.installDateView.text = String.format("安装时间：$date") val time = rowsBean.logtime.toString() if (time.isBlank()) { holder.logTimeView.text = "最新数据上报时间：未知" diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt index 9e6d234..816d63c 100644 --- a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt +++ b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt @@ -78,7 +78,8 @@ "7" -> "路灯井" "8" -> "通信井" "9" -> "监控井" - "10" -> "其他" + "10" -> "给水井" + "11" -> "其他" else -> { "未知类型" } diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt index 713d6d0..84386be 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt @@ -90,22 +90,10 @@ easyPopupWindow.showAsDropDown(homeView.rightOptionView, x, 0) } - //代码设置底部拉升距离 - val bottomSheetBehavior = BottomSheetBehavior.from(homeView.bottomBehaviorLayout) - homeView.coordinatorLayout.post { - bottomSheetBehavior.isFitToContents = false - bottomSheetBehavior.halfExpandedRatio = 0.23f - bottomSheetBehavior.isHideable = false - bottomSheetBehavior.peekHeight = 30f.dp2px(requireContext()) - bottomSheetBehavior.setExpandedOffset( - (requireContext().obtainScreenHeight() * 0.3).toInt() - ) - } - //初始化vm - wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java) + wellViewModel = ViewModelProvider(this)[WellViewModel::class.java] + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + wellListViewModel = ViewModelProvider(this)[WellListViewModel::class.java] //获取所有窨井数据 httpCountDownTimer.start() diff --git a/app/src/main/res/layout/activity_about_us.xml b/app/src/main/res/layout/activity_about_us.xml index 0fa2dab..2588055 100644 --- a/app/src/main/res/layout/activity_about_us.xml +++ b/app/src/main/res/layout/activity_about_us.xml @@ -28,7 +28,7 @@ android:fontFamily="sans-serif-black" android:gravity="center" android:paddingVertical="@dimen/dp_20" - android:text="智能窨井管理助手" + android:text="@string/app_name" android:textColor="@color/mainTextColor" android:textSize="@dimen/sp_16" /> diff --git a/app/src/main/res/layout/activity_well_detail.xml b/app/src/main/res/layout/activity_well_detail.xml index 59c2bb4..a7b6189 100644 --- a/app/src/main/res/layout/activity_well_detail.xml +++ b/app/src/main/res/layout/activity_well_detail.xml @@ -29,6 +29,7 @@ @@ -36,6 +37,8 @@ android:id="@+id/wellCodeView" style="@style/textViewStyle" android:layout_alignParentEnd="true" + android:layout_toEndOf="@id/wellCodeTagView" + android:gravity="end|center_vertical" android:text="@string/unknown" android:textColor="@color/subTextColor" /> @@ -45,6 +48,7 @@ @@ -52,6 +56,8 @@ android:id="@+id/wellNameView" style="@style/textViewStyle" android:layout_alignParentEnd="true" + android:layout_toEndOf="@id/wellNameTagView" + android:gravity="end|center_vertical" android:text="@string/unknown" android:textColor="@color/subTextColor" /> diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index 30e607e..3225bd6 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -41,11 +41,14 @@ android:layout_height="match_parent" /> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index c64485e..2d870c8 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,5 +1,5 @@ - 智能闸井 + 章丘智慧燃气 中国航天科工集团 未知